summaryrefslogtreecommitdiff
path: root/java/openjdk7
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2015-09-09 09:40:53 +0000
committerGreg Lewis <glewis@FreeBSD.org>2015-09-09 09:40:53 +0000
commit9472c7f5ccf4a56917f2a3c6fe9d3032849f26bd (patch)
treea0a31c6adebc33bf8e7a7f021d9894dab0acdd86 /java/openjdk7
parent. Switch to xz for the new remote patches to decrease download size. (diff)
. Move the large patches which contain the changes between updates of the
JDK to being fetched remotely using PATCHFILES and PATCH_SITES. This cuts the size taken by openjdk7 in the ports repository.
Notes
Notes: svn path=/head/; revision=396460
Diffstat (limited to 'java/openjdk7')
-rw-r--r--java/openjdk7/Makefile9
-rw-r--r--java/openjdk7/distinfo16
-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-7u80-b32109450
10 files changed, 25 insertions, 294686 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 9d9cde9f5c50..1e4c295f9d8a 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -14,10 +14,19 @@ MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MIN
https://java.net/downloads/jax-ws/JDK7/:jaf \
http://icedtea.classpath.org/download/drops/:jaf \
APACHE/ant/binaries/:ant
+PATCH_SITES= LOCAL/glewis/openjdk7
DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${ANT_DISTFILE}${EXTRACT_SUFX}:ant
EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${ANT_DISTFILE}${EXTRACT_SUFX}
+PATCHFILES= patch-7u45-b30.xz \
+ patch-7u51-b30.xz \
+ patch-7u55-b31.xz \
+ patch-7u60-b30.xz \
+ patch-7u65-b31.xz \
+ patch-7u71-b14.xz \
+ patch-7u76-b31.xz \
+ patch-7u80-b32.xz
MAINTAINER?= glewis@FreeBSD.org
COMMENT?= Java Development Kit 7
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index fe6e401981ee..6729305acc68 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -2,3 +2,19 @@ SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9
SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
SHA256 (apache-ant-1.9.4-bin.zip) = 973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8
SIZE (apache-ant-1.9.4-bin.zip) = 8309406
+SHA256 (patch-7u45-b30.xz) = f0ab28db8819a72b82236d98c6780a0fa063cf4d2f45f26105545559e630a1b3
+SIZE (patch-7u45-b30.xz) = 156968
+SHA256 (patch-7u51-b30.xz) = af1143952a0f67535c2bdf586b7089af1d525f544974e989fe7b273a925b8359
+SIZE (patch-7u51-b30.xz) = 170476
+SHA256 (patch-7u55-b31.xz) = 30d4ae0e98e639dca060f7dc8289fe8af345e93258c8642cad1378725330afa9
+SIZE (patch-7u55-b31.xz) = 109908
+SHA256 (patch-7u60-b30.xz) = 1132c6c32f515b735b7b3f78670ec81c3161b7afe8a10f21f68f851c2e776a4c
+SIZE (patch-7u60-b30.xz) = 324180
+SHA256 (patch-7u65-b31.xz) = acde33caa1691a6a1bcb4cab71ea01ce73df616d02d023bda053e3f728850d72
+SIZE (patch-7u65-b31.xz) = 87776
+SHA256 (patch-7u71-b14.xz) = 2fa4622c55d55e27679ef99ce5d528210d66982abdfae53bf7fa9850e160db27
+SIZE (patch-7u71-b14.xz) = 66484
+SHA256 (patch-7u76-b31.xz) = a9ddaf7ee121b29bff9cd0300e7939640f6933223d81a484fa2db575cbb7f3de
+SIZE (patch-7u76-b31.xz) = 315184
+SHA256 (patch-7u80-b32.xz) = 095e2f074125a3804710b7276fd96b743befb0472c3a3b5fd3a695511a10ff23
+SIZE (patch-7u80-b32.xz) = 674268
diff --git a/java/openjdk7/files/patch-7u45-b30 b/java/openjdk7/files/patch-7u45-b30
deleted file mode 100644
index f5bc5cf41366..000000000000
--- a/java/openjdk7/files/patch-7u45-b30
+++ /dev/null
@@ -1,20623 +0,0 @@
---- ./.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
deleted file mode 100644
index 976298c71863..000000000000
--- a/java/openjdk7/files/patch-7u51-b30
+++ /dev/null
@@ -1,31693 +0,0 @@
---- ./.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
deleted file mode 100644
index 3ad355a0eb09..000000000000
--- a/java/openjdk7/files/patch-7u55-b31
+++ /dev/null
@@ -1,17206 +0,0 @@
---- ./.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
deleted file mode 100644
index 2431e158feba..000000000000
--- a/java/openjdk7/files/patch-7u60-b30
+++ /dev/null
@@ -1,52678 +0,0 @@
---- ./.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
deleted file mode 100644
index 90705302ecb0..000000000000
--- a/java/openjdk7/files/patch-7u65-b31
+++ /dev/null
@@ -1,13021 +0,0 @@
---- ./.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
deleted file mode 100644
index 669d64046671..000000000000
--- a/java/openjdk7/files/patch-7u71-b14
+++ /dev/null
@@ -1,7855 +0,0 @@
---- ./.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
deleted file mode 100644
index fc2391ef18ee..000000000000
--- a/java/openjdk7/files/patch-7u76-b31
+++ /dev/null
@@ -1,42160 +0,0 @@
---- ./.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-7u80-b32 b/java/openjdk7/files/patch-7u80-b32
deleted file mode 100644
index 7820ee0f54d4..000000000000
--- a/java/openjdk7/files/patch-7u80-b32
+++ /dev/null
@@ -1,109450 +0,0 @@
---- ./.hgtags Mon Jan 05 11:48:37 2015 -0800
-+++ ./.hgtags Fri Apr 10 09:18:39 2015 -0700
-@@ -525,6 +525,10 @@
- fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14
- f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30
- 891bb800d7b2abff392669276f9e55ff30ba9962 jdk7u72-b31
-+cc4b22b0bc1810d6bb1367f08c47707923a89b0e jdk7u72-b32
-+9179bba54a0d43be8a5325152acd29ac2852c4d5 jdk7u72-b33
-+8c92ab4f302fea71b378a0eb8912d2321acdae68 jdk7u72-b34
-+8d5af53bb3926fac6aa21e2f02a8df7c6718c5c2 jdk7u72-b35
- 569e053e97b4fecaf1371f7cf2645394edb8a11a jdk7u75-b00
- 618b221a71a962f1d62a5b02db1b4256bad9441a jdk7u75-b01
- eb36016211cb5d412c779836bd8efbf133cbf6f5 jdk7u75-b02
-@@ -556,3 +560,37 @@
- 01d1d34f82f30de97a61f8b0048c61aa17d0dd12 jdk7u76-b12
- a9728fbea214dbf6f58567e729fdc5276f3c704f jdk7u76-b13
- a788e9c5671436bb711f0e185cd74b17220d6e35 jdk7u76-b30
-+ed58c355d118cb3d9713de41ecb105cca3175472 jdk7u76-b31
-+79a5a54289ef52fc67d5447bacc60610282b1e3c jdk7u76-b32
-+dcc07fe8d380a63c22086abeb62a5a9780b3639c jdk7u79-b00
-+9d7b2508882acda9da48a0f52490e1b31111fcd6 jdk7u79-b01
-+fc70c5c1a1c0cfd7fd11237a5a7fcce6a1cd2cd8 jdk7u79-b02
-+6842b297466cf696cca4ac6f776183bd74e8f52f jdk7u79-b03
-+7d851d1726c67146e491575e905aaa3f1eb90083 jdk7u79-b06
-+9e76c64141e8b65d64d0defbe12094d6c9eb8f03 jdk7u79-b07
-+52a09e691b39ab0f23ca0830fbb2a372e157990c jdk7u79-b08
-+5127e5f6909283ade8de12d0a912b82383cd0084 jdk7u79-b09
-+83f6693e12e6265e914ad07b5fe137ab01c2dbbf jdk7u79-b10
-+be4cf73f2c91c252c84fb1799e68585027eab3b0 jdk7u79-b11
-+fae704111ce1257c66c80e1221cf89522fd2d52e jdk7u79-b12
-+434885f8214fd2671ea6b4708663fc9a14505872 jdk7u79-b13
-+4dc3a33c7c9d3a88ee566554ffd8253b777aa6a4 jdk7u79-b14
-+ee3b3ebecd737ff98883e4f15471887dfdfa8dce jdk7u79-b30
-+127bfeeddc9cf2f8cbf58052f32f6c8676fb8840 jdk7u79-b15
-+d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00
-+90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01
-+36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02
-+4093bbbc90009bfd9311ccd6373c7a2f2755c9d9 jdk7u80-b03
-+928d01695cd2b65119bbfcd51032ae427a66f83d jdk7u80-b04
-+46d516760a680deaeffdb03e3221648bc14c0818 jdk7u80-b05
-+8fffdc2d1faaf2c61abff00ee41f50d28da2174a jdk7u80-b06
-+6d0aaea852b04d7270fde5c289827b00f2391374 jdk7u80-b07
-+e8daab5fb25eb513c53d6d766d50caf662131d79 jdk7u80-b08
-+8c0f70ebdfbd5b06c759ab762b093e8c3ee6558e jdk7u80-b09
-+67dafced5999152f5f88ace0a84122909049182c jdk7u80-b10
-+7a31b13266333dbc62825b827fb5730417d7212c jdk7u80-b11
-+96d3f807999b5c2d8b07ebf0b79fdbc1952d1109 jdk7u80-b12
-+5bd350f497873137786dc6ff5abcae1207bcc30b jdk7u80-b13
-+4da82068f37e17858d318d24a5a6284d48627e68 jdk7u80-b14
-+611f7d38d9346243b558dc78409b813241eb426f jdk7u80-b30
-+f19659de2034611095d307ccc68f777abc8b008e jdk7u80-b15
---- ./THIRD_PARTY_README Mon Jan 05 11:48:37 2015 -0800
-+++ ./THIRD_PARTY_README Fri Apr 10 09:18:39 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
-@@ -1912,35 +1912,6 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to Sparkle v.1.5,
--which is included with JRE 7 on Mac OS X.
--
----- begin of LICENSE ---
--
--Copyright (c) 2012 Sparkle.org and Andy Matuschak
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
----- end of LICENSE ---
--
---------------------------------------------------------------------------------
--
- %% Portions licensed from Taligent, Inc.
-
- -------------------------------------------------------------------------------
-@@ -3198,12 +3169,12 @@
- %% This notice is provided with respect to the following which is
- included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
-
-- Apache Derby 10.8.3.0 [included with JDK 7 only]
-+ Apache Derby 10.8.1.2 [included with JDK 7 only]
- Apache Jakarta BCEL 5.2
- Apache Jakarta Regexp 1.4
- Apache Santuario XMLSec-Java 1.4.2
- Apache Xalan-Java 2.7.1
-- Apache Xerces2 Java 2.11.0
-+ Apache Xerces2 Java 2.10.0
- Apache XML Resolver 1.1
-
-
---- ./make/jprt.properties Mon Jan 05 11:48:37 2015 -0800
-+++ ./make/jprt.properties Fri Apr 10 09:18:39 2015 -0700
-@@ -83,6 +83,7 @@
- ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
-+ ${jprt.my.test.target.set:TESTNAME=jdk_security4}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
---- ./test/Makefile Mon Jan 05 11:48:37 2015 -0800
-+++ ./test/Makefile Fri Apr 10 09:18:39 2015 -0700
-@@ -63,7 +63,7 @@
- jdk_other \
- jdk_net \
- jdk_nio \
-- jdk_security1 jdk_security2 jdk_security3 \
-+ jdk_security1 jdk_security2 jdk_security3 jdk_security4 \
- jdk_sound \
- jdk_text \
- jdk_tools \
---- ./corba/.hgtags Mon Jan 05 11:49:17 2015 -0800
-+++ ./corba/.hgtags Fri Apr 10 09:18:50 2015 -0700
-@@ -527,6 +527,10 @@
- bd80d0c18ccd97669dd8392dbde5cd91f647ee1d jdk7u72-b14
- 66da7f46eff05df2aa3bb9b5c1f7ee47a75828a5 jdk7u72-b30
- 4fefe5c11ddb650e681e2dd5e8ac8dfeb15e6afd jdk7u72-b31
-+c8d42c36b2ab3db65bcd7497ca87e3b2c191f3f7 jdk7u72-b32
-+a3070ed2ab6aa1542e5e545e9e19684dcd056945 jdk7u72-b33
-+5d1445139b101e045fd389578df8825d5b2d0dad jdk7u72-b34
-+acc110e88fc38ed6118ed1fe44a3211f5b4a6337 jdk7u72-b35
- 88772da384953fed254492c3ea9da498381081f2 jdk7u75-b00
- 0466441d71122c9af252ec17f597f228dbf64578 jdk7u75-b01
- 9aa7fe309fa584ff782ab9d557632321747ba11e jdk7u75-b02
-@@ -558,3 +562,37 @@
- 14f0846f4d1b8373e3e3cce10901f37341bf6980 jdk7u76-b12
- 0db41b697138ce89f15c49eef1dc670f94a27d89 jdk7u76-b13
- 71a8665159f2f014b1869f3d723d3b6fbe878a16 jdk7u76-b30
-+7a566e2b22722a59174c7cced744bdda3709ce2e jdk7u76-b31
-+dbbdf5e8b66e6fccd36977016d38683346c5d107 jdk7u76-b32
-+f55967c261230a4fcc8d71ecfe58f2f47ea50393 jdk7u79-b00
-+d2a032b5389366fdff24b8a5ba52931da14d2a8d jdk7u79-b01
-+0a8522745129e647c3b1fe9ef7b5f7d84e063938 jdk7u79-b02
-+df1f9eb105ed2b05c0d15b08abded72e8e4a76c5 jdk7u79-b03
-+f2c5c65d2d7f2153370429ebc8dfded9f9ada43e jdk7u79-b06
-+3f5ddba1c4f1f5268d2419360c9b83f303166f4f jdk7u79-b07
-+65366f746473f25f9ccda87e5c77f04247050a86 jdk7u79-b08
-+58c0e28636cd1b3e947e71a40693f57f65a48ba4 jdk7u79-b09
-+b36cf254eef39119d817eef3344b98c5a79c30b8 jdk7u79-b10
-+0ebb0413e7d9f8352bdb92552f5fc1056049c9dd jdk7u79-b11
-+2ae2ecbcdd17641b8eb4d97fa2324ef41a2fddb7 jdk7u79-b12
-+ec5c1e656d0383c697c7a3a7f3c6839d225ea649 jdk7u79-b13
-+4262b390c9460e6dbeb6968a60ac6356452d47a9 jdk7u79-b14
-+89b8b9610d476843e696cdad5d8d238f83e00c94 jdk7u79-b30
-+59faa52493939dccdf6ff9efe86371101769b8f9 jdk7u79-b15
-+1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00
-+df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01
-+2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02
-+fc6a39d6be24e0c1f7d9193e4f3ea4e474bb4dc3 jdk7u80-b03
-+d9ddd2aec6bee31e3bd8bb4eb258c27a624162c3 jdk7u80-b04
-+6696348644df30f1807acd3a38a603ebdf09480c jdk7u80-b05
-+4362d8c11c43fb414a75b03616252cf8007eea61 jdk7u80-b06
-+1191862bb140612cc458492a0ffac5969f48c4df jdk7u80-b07
-+6a12979724faeb9abe3e6af347c64f173713e8a4 jdk7u80-b08
-+f09d8e79d1e970a583677987f2baa2a030903441 jdk7u80-b09
-+d4abe9013712af965bc7284efaa7f8d3cc90dde8 jdk7u80-b10
-+7c5957c3d8d6d5c2e9562267bf2db68dec775fb1 jdk7u80-b11
-+fa884531a1a32d78fb6b4e5253dae275eaaddd2c jdk7u80-b12
-+8e4a2983e0d085331c7281d90f23c43bfdab5ed4 jdk7u80-b13
-+90e140a093262c0ca0b408a5997074fbd87639c0 jdk7u80-b14
-+52b7bbe24e490090f98bee27dbd5ec5715b31243 jdk7u80-b30
-+353be4a0a6ec19350d18e0e9ded5544ed5d7433f jdk7u80-b15
---- ./corba/THIRD_PARTY_README Mon Jan 05 11:49:17 2015 -0800
-+++ ./corba/THIRD_PARTY_README Fri Apr 10 09:18:50 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
-@@ -1912,35 +1912,6 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to Sparkle v.1.5,
--which is included with JRE 7 on Mac OS X.
--
----- begin of LICENSE ---
--
--Copyright (c) 2012 Sparkle.org and Andy Matuschak
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
----- end of LICENSE ---
--
---------------------------------------------------------------------------------
--
- %% Portions licensed from Taligent, Inc.
-
- -------------------------------------------------------------------------------
-@@ -3198,12 +3169,12 @@
- %% This notice is provided with respect to the following which is
- included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
-
-- Apache Derby 10.8.3.0 [included with JDK 7 only]
-+ Apache Derby 10.8.1.2 [included with JDK 7 only]
- Apache Jakarta BCEL 5.2
- Apache Jakarta Regexp 1.4
- Apache Santuario XMLSec-Java 1.4.2
- Apache Xalan-Java 2.7.1
-- Apache Xerces2 Java 2.11.0
-+ Apache Xerces2 Java 2.10.0
- Apache XML Resolver 1.1
-
-
---- ./hotspot/.hgtags Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/.hgtags Fri Apr 10 09:19:25 2015 -0700
-@@ -752,6 +752,10 @@
- d9b56c6bdddb6f9d8242230f5fdd58f9c7d30ea5 jdk7u72-b14
- a6ae698522bfab3c595a4f8c2c3ee7e8939eb1bb jdk7u72-b30
- 492a2abed4ca015459e24f7348233531b7e929d2 jdk7u72-b31
-+61dacdb82145abe6cb5911e5a06fd8d8622fb55f jdk7u72-b32
-+64cbcac4027843d0292f262520a8945161cc1657 jdk7u72-b33
-+bcb9613e07e212f3103a3bcc5e5085b4d69ad5e1 jdk7u72-b34
-+f9c89a617dac063054749d1880807f6700f04c8a jdk7u72-b35
- e6b6d91b3934c281086f8efacb0926e7451cc18b jdk7u75-b00
- 9096ac248b379a0f3012f18c7289ec47cdef8459 jdk7u75-b01
- a6964b2822d906eab9c923cdd723cf3dd4facfcd jdk7u75-b02
-@@ -783,3 +787,44 @@
- e375023d196199ffb263cb15739f7218e1621be6 jdk7u76-b12
- a395c29532e5322657c542d54dd957940cf2f523 jdk7u76-b13
- 98f0c5279ba76eb1b5741dc67f7b5f10e7508449 jdk7u76-b30
-+875d0ccc97fe7a46a0a9996e897827022db58200 jdk7u76-b31
-+dfc50bbce42cff3d17d4d8780646dedac8d3dad0 jdk7u76-b32
-+2480d9d778301a3f88b0ab8ee35a585df82528e5 jdk7u79-b00
-+ae6723b35de91e3e964cc92d832e17743e4f43c6 jdk7u79-b01
-+653c92d16c45392cd7a5073528c8b8396c1f087c jdk7u79-b02
-+e6d47ed41881381a212faf9e394011cf10d76509 jdk7u79-b03
-+c5486f8bb2dbc5ab176235adc999d31ad5f413fb jdk7u79-b06
-+5439057a4c7fd26de2fe129eb5d695dda7f42dcf jdk7u79-b07
-+e65e02cf3523bf5c5ea4df6d17a7b60b456c53b5 jdk7u79-b08
-+641e2adae9d455ef8a41b319e86c4ed8148735b9 jdk7u79-b09
-+e5512513c35ccd3f3552039b0cf6352cce0af9f2 jdk7u79-b10
-+5cef060f38caed08ea20a08d40735a5395d3f73e jdk7u79-b11
-+8f34a2992faa8a2592fc15a5309340635a423fd5 jdk7u79-b12
-+08c8504cd6ce900078d2187ca8f0545328872cba jdk7u79-b13
-+30e5853fcd717f6284b916b2c8fe388408e055f0 jdk7u79-b14
-+4d4936bc95f47c3b6591b163ae06e4952ef66344 jdk7u79-b30
-+78dcbf58e349beaafeed97f7e897832d28a3403f jdk7u79-b15
-+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
-+9d2b485d2a58ea57ab2b3c06b2128f456ab39a38 jdk7u80-b03
-+a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04
-+00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05
-+87d4354a3ce8aafccf1f1cd9cb9d88a58731dde8 jdk7u80-b06
-+d496bd71dc129828c2b5962e2072cdb591454e4a jdk7u80-b07
-+5ce33a4444cf74e04c22fb11b1e1b76b68a6477a jdk7u80-b08
-+48af02f3c56ceefc4a1b16a4bdb6d54e416b2171 jdk7u80-b09
-+502c24b2ffaed2e2a209c7d84bb53a98c062e5ef jdk7u80-b10
-+c59862e92fb3f919da426efa01b4c699ce122517 jdk7u80-b11
-+a0572b740d79d089de854e498f57a55c9a59c9ad jdk7u80-b12
-+a550ec1c311fe9c3393597cae620b02fa9e1dfa1 jdk7u80-b13
-+c63aa8d5e8ab6e86df1f5d54bcf7a54ec325667c jdk7u80-b14
-+27e0103f3b11f06bc3277914564ed9a1976fb3d5 jdk7u80-b30
-+426e09df7eda980317d1308af15c29ef691cd471 jdk7u80-b15
---- ./hotspot/THIRD_PARTY_README Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/THIRD_PARTY_README Fri Apr 10 09:19:25 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
-@@ -1912,35 +1912,6 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to Sparkle v.1.5,
--which is included with JRE 7 on Mac OS X.
--
----- begin of LICENSE ---
--
--Copyright (c) 2012 Sparkle.org and Andy Matuschak
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
----- end of LICENSE ---
--
---------------------------------------------------------------------------------
--
- %% Portions licensed from Taligent, Inc.
-
- -------------------------------------------------------------------------------
-@@ -3198,12 +3169,12 @@
- %% This notice is provided with respect to the following which is
- included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
-
-- Apache Derby 10.8.3.0 [included with JDK 7 only]
-+ Apache Derby 10.8.1.2 [included with JDK 7 only]
- Apache Jakarta BCEL 5.2
- Apache Jakarta Regexp 1.4
- Apache Santuario XMLSec-Java 1.4.2
- Apache Xalan-Java 2.7.1
-- Apache Xerces2 Java 2.11.0
-+ Apache Xerces2 Java 2.10.0
- Apache XML Resolver 1.1
-
-
---- ./hotspot/make/hotspot_version Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/make/hotspot_version Fri Apr 10 09:19:25 2015 -0700
-@@ -34,8 +34,8 @@
- HOTSPOT_VM_COPYRIGHT=Copyright 2015
-
- HS_MAJOR_VER=24
--HS_MINOR_VER=76
--HS_BUILD_NUMBER=04
-+HS_MINOR_VER=80
-+HS_BUILD_NUMBER=11
-
- JDK_MAJOR_VER=1
- JDK_MINOR_VER=7
---- ./hotspot/make/jprt.properties Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/make/jprt.properties Fri Apr 10 09:19:25 2015 -0700
-@@ -38,7 +38,7 @@
-
- # This tells jprt what default release we want to build
-
--jprt.hotspot.default.release=jdk7u60
-+jprt.hotspot.default.release=jdk7u72
-
- jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
-
-@@ -54,92 +54,94 @@
- # 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.jdk7u60=${jprt.my.solaris.sparc.jdk7}
-+jprt.my.solaris.sparc.jdk7u72=${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.jdk7u60=${jprt.my.solaris.sparcv9.jdk7}
-+jprt.my.solaris.sparcv9.jdk7u72=${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.jdk7u60=${jprt.my.solaris.i586.jdk7}
-+jprt.my.solaris.i586.jdk7u72=${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.jdk7u60=${jprt.my.solaris.x64.jdk7}
-+jprt.my.solaris.x64.jdk7u72=${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.jdk7u60=${jprt.my.linux.i586.jdk7}
-+jprt.my.linux.i586.jdk7u72=${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.jdk7u60=${jprt.my.linux.x64.jdk7}
-+jprt.my.linux.x64.jdk7u72=${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.jdk7u60=${jprt.my.linux.ppc.jdk7}
-+jprt.my.linux.ppc.jdk7u72=${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.jdk7u60=${jprt.my.linux.ppcv2.jdk7}
-+jprt.my.linux.ppcv2.jdk7u72=${jprt.my.linux.ppcv2.jdk7}
- jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${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.jdk7u60=${jprt.my.linux.armvfp.jdk7}
-+jprt.my.linux.armvfp.jdk7u72=${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.jdk7u60=${jprt.my.linux.armvfpsflt.jdk7}
-+jprt.my.linux.armvfpsflt.jdk7u72=${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.jdk7u60=${jprt.my.linux.armvfphflt.jdk7}
-+jprt.my.linux.armvfphflt.jdk7u72=${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.jdk7u60=${jprt.my.linux.armv6.jdk7}
-+jprt.my.linux.armv6.jdk7u72=${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.jdk7u60=${jprt.my.linux.armvs.jdk7}
-+jprt.my.linux.armvs.jdk7u72=${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.jdk7u60=${jprt.my.linux.armvh.jdk7}
-+jprt.my.linux.armvh.jdk7u72=${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.jdk7u60=${jprt.my.linux.armsflt.jdk7}
-+jprt.my.linux.armsflt.jdk7u72=${jprt.my.linux.armsflt.jdk7}
- jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
-
-+jprt.my.linux.sparcv9=linux_sparcv9_3.8
-+
- jprt.my.macosx.x64.jdk8=macosx_x64_10.7
- jprt.my.macosx.x64.jdk7=macosx_x64_10.7
--jprt.my.macosx.x64.jdk7u60=${jprt.my.macosx.x64.jdk7}
-+jprt.my.macosx.x64.jdk7u72=${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.jdk7u60=${jprt.my.windows.i586.jdk7}
-+jprt.my.windows.i586.jdk7u72=${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.jdk7u60=${jprt.my.windows.x64.jdk7}
-+jprt.my.windows.x64.jdk7u72=${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
-@@ -151,6 +153,7 @@
- ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \
- ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
- ${jprt.my.linux.x64}-{product|fastdebug}, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}, \
- ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
- ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
- ${jprt.my.windows.x64}-{product|fastdebug|debug}, \
-@@ -177,7 +180,7 @@
-
- jprt.build.targets.jdk8=${jprt.build.targets.all}
- jprt.build.targets.jdk7=${jprt.build.targets.all}
--jprt.build.targets.jdk7u60=${jprt.build.targets.all}
-+jprt.build.targets.jdk7u72=${jprt.build.targets.all}
- jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
-
- # Subset lists of test targets for this source tree
-@@ -352,6 +355,30 @@
- ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \
- ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParOldGC
-
-+jprt.my.linux.sparcv9.test.targets = \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jvm98, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-scimark, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_default, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_G1, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_default, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_SerialGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_ParallelGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_ParNewGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_CMS, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_G1, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_ParOldGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_default, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_default_nontiered, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_G1, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_ParOldGC
-+
- jprt.my.macosx.x64.test.targets = \
- ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \
- ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
-@@ -452,6 +479,7 @@
- ${jprt.my.solaris.x64.test.targets}, \
- ${jprt.my.linux.i586.test.targets}, \
- ${jprt.my.linux.x64.test.targets}, \
-+ ${jprt.my.linux.sparcv9.test.targets}, \
- ${jprt.my.macosx.x64.test.targets}, \
- ${jprt.my.windows.i586.test.targets}, \
- ${jprt.my.windows.x64.test.targets}, \
-@@ -470,7 +498,7 @@
-
- jprt.test.targets.jdk8=${jprt.test.targets.standard}
- jprt.test.targets.jdk7=${jprt.test.targets.standard}
--jprt.test.targets.jdk7u60=${jprt.test.targets.jdk7}
-+jprt.test.targets.jdk7u72=${jprt.test.targets.jdk7}
- jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
-
- # The default test/Makefile targets that should be run
-@@ -490,6 +518,7 @@
- ${jprt.my.solaris.x64}-*-c2-servertest, \
- ${jprt.my.linux.i586}-*-c2-servertest, \
- ${jprt.my.linux.x64}-*-c2-servertest, \
-+ ${jprt.my.linux.sparcv9}-*-c2-servertest, \
- ${jprt.my.macosx.x64}-*-c2-servertest, \
- ${jprt.my.windows.i586}-*-c2-servertest, \
- ${jprt.my.windows.x64}-*-c2-servertest
-@@ -501,6 +530,7 @@
- ${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \
- ${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \
- ${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \
-+ ${jprt.my.linux.sparcv9}-fastdebug-c2-internalvmtests, \
- ${jprt.my.macosx.x64}-fastdebug-c2-internalvmtests, \
- ${jprt.my.windows.i586}-fastdebug-c2-internalvmtests, \
- ${jprt.my.windows.x64}-fastdebug-c2-internalvmtests
-@@ -512,6 +542,7 @@
- ${jprt.my.solaris.x64}-{product|fastdebug}-c2-wbapitest, \
- ${jprt.my.linux.i586}-{product|fastdebug}-c2-wbapitest, \
- ${jprt.my.linux.x64}-{product|fastdebug}-c2-wbapitest, \
-+ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-wbapitest, \
- ${jprt.my.windows.i586}-{product|fastdebug}-c2-wbapitest, \
- ${jprt.my.windows.x64}-{product|fastdebug}-c2-wbapitest, \
- ${jprt.my.solaris.sparc}-{product|fastdebug}-c1-wbapitest, \
-@@ -530,7 +561,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.jdk7u60=${jprt.make.rule.test.targets.jdk7}
-+jprt.make.rule.test.targets.jdk7u72=${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/src/cpu/sparc/vm/assembler_sparc.inline.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -119,7 +119,15 @@
- inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); }
- inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); }
-
--inline void Assembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) { relocate(a.rspec(offset)); ldf( w, a.base(), a.disp() + offset, d); }
-+inline void Assembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) {
-+ relocate(a.rspec(offset));
-+ if (a.has_index()) {
-+ assert(offset == 0, "");
-+ ldf(w, a.base(), a.index(), d);
-+ } else {
-+ ldf(w, a.base(), a.disp() + offset, d);
-+ }
-+}
-
- inline void Assembler::ldfsr( Register s1, Register s2) { v9_dep(); emit_long( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); }
- inline void Assembler::ldfsr( Register s1, int simm13a) { v9_dep(); emit_data( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
---- ./hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -614,8 +614,8 @@
- // Save the regs and make space for a C call
- __ save(SP, -96, SP);
- __ save_all_globals_into_locals();
-- BLOCK_COMMENT("call os::naked_sleep");
-- __ call(CAST_FROM_FN_PTR(address, os::naked_sleep));
-+ BLOCK_COMMENT("call os::naked_short_sleep");
-+ __ call(CAST_FROM_FN_PTR(address, os::naked_short_sleep));
- __ delayed()->nop();
- __ restore_globals_from_locals();
- __ restore();
---- ./hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -98,6 +98,27 @@
- _supports_cx8 = has_v9();
- _supports_atomic_getset4 = true; // swap instruction
-
-+ // There are Fujitsu Sparc64 CPUs which support blk_init as well so
-+ // we have to take this check out of the 'is_niagara()' block below.
-+ if (has_blk_init()) {
-+ // When using CMS or G1, we cannot use memset() in BOT updates
-+ // because the sun4v/CMT version in libc_psr uses BIS which
-+ // exposes "phantom zeros" to concurrent readers. See 6948537.
-+ if (FLAG_IS_DEFAULT(UseMemSetInBOT) && (UseConcMarkSweepGC || UseG1GC)) {
-+ FLAG_SET_DEFAULT(UseMemSetInBOT, false);
-+ }
-+ // Issue a stern warning if the user has explicitly set
-+ // UseMemSetInBOT (it is known to cause issues), but allow
-+ // use for experimentation and debugging.
-+ if (UseConcMarkSweepGC || UseG1GC) {
-+ if (UseMemSetInBOT) {
-+ assert(!FLAG_IS_DEFAULT(UseMemSetInBOT), "Error");
-+ warning("Experimental flag -XX:+UseMemSetInBOT is known to cause instability"
-+ " on sun4v; please understand that you are using at your own risk!");
-+ }
-+ }
-+ }
-+
- if (is_niagara()) {
- // Indirect branch is the same cost as direct
- if (FLAG_IS_DEFAULT(UseInlineCaches)) {
-@@ -107,12 +128,6 @@
- if (FLAG_IS_DEFAULT(OptoLoopAlignment)) {
- FLAG_SET_DEFAULT(OptoLoopAlignment, 4);
- }
-- // When using CMS or G1, we cannot use memset() in BOT updates
-- // because the sun4v/CMT version in libc_psr uses BIS which
-- // exposes "phantom zeros" to concurrent readers. See 6948537.
-- if (FLAG_IS_DEFAULT(UseMemSetInBOT) && (UseConcMarkSweepGC || UseG1GC)) {
-- FLAG_SET_DEFAULT(UseMemSetInBOT, false);
-- }
- #ifdef _LP64
- // 32-bit oops don't make sense for the 64-bit VM on sparc
- // since the 32-bit VM has the same registers and smaller objects.
---- ./hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -96,7 +96,13 @@
- static bool is_M_family(int features) { return (features & M_family_m) != 0; }
- static bool is_T_family(int features) { return (features & T_family_m) != 0; }
- static bool is_niagara() { return is_T_family(_features); }
-- DEBUG_ONLY( static bool is_niagara(int features) { return (features & sun4v_m) != 0; } )
-+#ifdef ASSERT
-+ static bool is_niagara(int features) {
-+ // 'sun4v_m' may be defined on both Sun/Oracle Sparc CPUs as well as
-+ // on Fujitsu Sparc64 CPUs, but only Sun/Oracle Sparcs can be 'niagaras'.
-+ return (features & sun4v_m) != 0 && (features & sparc64_family_m) == 0;
-+ }
-+#endif
-
- // Returns true if it is niagara1 (T1).
- static bool is_T1_model(int features) { return is_T_family(features) && ((features & T1_model_m) != 0); }
---- ./hotspot/src/cpu/x86/vm/assembler_x86.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -7641,10 +7641,12 @@
- // if fast computation is not possible, result is NaN. Requires
- // fallback from user of this macro.
- // increase precision for intermediate steps of the computation
-+ BLOCK_COMMENT("fast_pow {");
- increase_precision();
- fyl2x(); // Stack: (Y*log2(X)) ...
- pow_exp_core_encoding(); // Stack: exp(X) ...
- restore_precision();
-+ BLOCK_COMMENT("} fast_pow");
- }
-
- void MacroAssembler::fast_exp() {
---- ./hotspot/src/cpu/x86/vm/frame_x86.inline.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/x86/vm/frame_x86.inline.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -292,14 +292,18 @@
- return true;
- }
-
-+inline oop frame::saved_oop_result(RegisterMap* map) const {
-+ oop* result_adr = (oop *)map->location(rax->as_VMReg());
-+ guarantee(result_adr != NULL, "bad register save location");
-
--
--inline oop frame::saved_oop_result(RegisterMap* map) const {
-- return *((oop*) map->location(rax->as_VMReg()));
-+ return (*result_adr);
- }
-
- inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
-- *((oop*) map->location(rax->as_VMReg())) = obj;
-+ oop* result_adr = (oop *)map->location(rax->as_VMReg());
-+ guarantee(result_adr != NULL, "bad register save location");
-+
-+ *result_adr = obj;
- }
-
- #endif // CPU_X86_VM_FRAME_X86_INLINE_HPP
---- ./hotspot/src/cpu/x86/vm/vm_version_x86.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/cpu/x86/vm/vm_version_x86.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -499,10 +499,12 @@
- static uint cores_per_cpu() {
- uint result = 1;
- if (is_intel()) {
-- if (supports_processor_topology()) {
-+ bool supports_topology = supports_processor_topology();
-+ if (supports_topology) {
- result = _cpuid_info.tpl_cpuidB1_ebx.bits.logical_cpus /
- _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus;
-- } else {
-+ }
-+ if (!supports_topology || result == 0) {
- result = (_cpuid_info.dcp_cpuid4_eax.bits.cores_per_cpu + 1);
- }
- } else if (is_amd()) {
---- ./hotspot/src/os/bsd/dtrace/libjvm_db.c Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/bsd/dtrace/libjvm_db.c Fri Apr 10 09:19:25 2015 -0700
-@@ -261,6 +261,9 @@
- uint64_t base;
- int err;
-
-+ /* Clear *vmp now in case we jump to fail: */
-+ memset(vmp, 0, sizeof(VMStructEntry));
-+
- err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
- CHECK_FAIL(err);
- err = read_pointer(J, sym_addr, &gHotSpotVMStructs);
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -3711,9 +3711,21 @@
- }
- }
-
--int os::naked_sleep() {
-- // %% make the sleep time an integer flag. for now use 1 millisec.
-- return os::sleep(Thread::current(), 1, false);
-+void os::naked_short_sleep(jlong ms) {
-+ struct timespec req;
-+
-+ assert(ms < 1000, "Un-interruptable sleep, short time use only");
-+ req.tv_sec = 0;
-+ if (ms > 0) {
-+ req.tv_nsec = (ms % 1000) * 1000000;
-+ }
-+ else {
-+ req.tv_nsec = 1;
-+ }
-+
-+ nanosleep(&req, NULL);
-+
-+ return;
- }
-
- // Sleep forever; naked call to OS-specific sleep; use with CAUTION
---- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/linux/vm/os_linux.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -3866,9 +3866,33 @@
- }
- }
-
--int os::naked_sleep() {
-- // %% make the sleep time an integer flag. for now use 1 millisec.
-- return os::sleep(Thread::current(), 1, false);
-+//
-+// Short sleep, direct OS call.
-+//
-+// Note: certain versions of Linux CFS scheduler (since 2.6.23) do not guarantee
-+// sched_yield(2) will actually give up the CPU:
-+//
-+// * Alone on this pariticular CPU, keeps running.
-+// * Before the introduction of "skip_buddy" with "compat_yield" disabled
-+// (pre 2.6.39).
-+//
-+// So calling this with 0 is an alternative.
-+//
-+void os::naked_short_sleep(jlong ms) {
-+ struct timespec req;
-+
-+ assert(ms < 1000, "Un-interruptable sleep, short time use only");
-+ req.tv_sec = 0;
-+ if (ms > 0) {
-+ req.tv_nsec = (ms % 1000) * 1000000;
-+ }
-+ else {
-+ req.tv_nsec = 1;
-+ }
-+
-+ nanosleep(&req, NULL);
-+
-+ return;
- }
-
- // Sleep forever; naked call to OS-specific sleep; use with CAUTION
-@@ -6041,26 +6065,57 @@
- #define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59)
- #endif
-
-+#if defined(SPARC)
-+// This assembly code makes the call to "syscall(__NR_fork)" and then
-+// gets the values for "pid" and "is_child" from the correct registers.
-+// This was done to make sure the compiler does not change the order
-+// of the instructions while optimizing.
-+void sparc_fork(int nr_fork, pid_t *pid, int *ischild) {
-+ asm volatile (
-+ " mov %2, %%o0\n\t"
-+ " call syscall, 0\n\t"
-+ " nop\n\t"
-+ " mov %%o0, %0\n\t"
-+ " mov %%o1, %1\n\t"
-+ : "=r" (*pid), "=r" (*ischild)
-+ : "r" (nr_fork) :
-+ );
-+}
-+#endif
-+
- // Run the specified command in a separate process. Return its exit value,
- // or -1 on failure (e.g. can't fork a new process).
- // Unlike system(), this function can be called from signal handler. It
- // doesn't block SIGINT et al.
- int os::fork_and_exec(char* cmd) {
- const char * argv[4] = {"sh", "-c", cmd, NULL};
-+ int is_child;
-+ pid_t pid;
-
- // fork() in LinuxThreads/NPTL is not async-safe. It needs to run
- // pthread_atfork handlers and reset pthread library. All we need is a
- // separate process to execve. Make a direct syscall to fork process.
- // On IA64 there's no fork syscall, we have to use fork() and hope for
- // the best...
-- pid_t pid = NOT_IA64(syscall(__NR_fork);)
-+#if defined(SPARC)
-+ sparc_fork(__NR_fork, &pid, &is_child);
-+#else
-+ pid = NOT_IA64(syscall(__NR_fork);)
- IA64_ONLY(fork();)
-
-+ // set the is_child flag by checking the pid
-+ if (pid == 0) {
-+ is_child = 1;
-+ } else {
-+ is_child = 0;
-+ }
-+#endif
-+
- if (pid < 0) {
- // fork failed
- return -1;
-
-- } else if (pid == 0) {
-+ } else if (is_child) {
- // child process
-
- // execve() in LinuxThreads will call pthread_kill_other_threads_np()
---- ./hotspot/src/os/solaris/dtrace/libjvm_db.c Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/solaris/dtrace/libjvm_db.c Fri Apr 10 09:19:25 2015 -0700
-@@ -261,6 +261,9 @@
- uint64_t base;
- int err;
-
-+ /* Clear *vmp now in case we jump to fail: */
-+ memset(vmp, 0, sizeof(VMStructEntry));
-+
- err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
- CHECK_FAIL(err);
- err = read_pointer(J, sym_addr, &gHotSpotVMStructs);
---- ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -2311,8 +2311,8 @@
- st->cr();
- status = true;
- }
-- ::close(fd);
- }
-+ ::close(fd);
- }
- return status;
- }
-@@ -2336,13 +2336,18 @@
- "ILL_ILLTRP", "ILL_PRVOPC", "ILL_PRVREG",
- "ILL_COPROC", "ILL_BADSTK" };
-
-+const size_t ill_names_length = (sizeof(ill_names)/sizeof(char *));
-+
- const char *fpe_names[] = { "FPE0", "FPE_INTDIV", "FPE_INTOVF", "FPE_FLTDIV",
- "FPE_FLTOVF", "FPE_FLTUND", "FPE_FLTRES",
- "FPE_FLTINV", "FPE_FLTSUB" };
-+const size_t fpe_names_length = (sizeof(fpe_names)/sizeof(char *));
-
- const char *segv_names[] = { "SEGV0", "SEGV_MAPERR", "SEGV_ACCERR" };
-+const size_t segv_names_length = (sizeof(segv_names)/sizeof(char *));
-
- const char *bus_names[] = { "BUS0", "BUS_ADRALN", "BUS_ADRERR", "BUS_OBJERR" };
-+const size_t bus_names_length = (sizeof(bus_names)/sizeof(char *));
-
- void os::print_siginfo(outputStream* st, void* siginfo) {
- st->print("siginfo:");
-@@ -2361,19 +2366,23 @@
- assert(c > 0, "unexpected si_code");
- switch (si->si_signo) {
- case SIGILL:
-- st->print(", si_code=%d (%s)", c, c > 8 ? "" : ill_names[c]);
-+ st->print(", si_code=%d (%s)", c,
-+ c >= ill_names_length ? "" : ill_names[c]);
- st->print(", si_addr=" PTR_FORMAT, si->si_addr);
- break;
- case SIGFPE:
-- st->print(", si_code=%d (%s)", c, c > 9 ? "" : fpe_names[c]);
-+ st->print(", si_code=%d (%s)", c,
-+ c >= fpe_names_length ? "" : fpe_names[c]);
- st->print(", si_addr=" PTR_FORMAT, si->si_addr);
- break;
- case SIGSEGV:
-- st->print(", si_code=%d (%s)", c, c > 2 ? "" : segv_names[c]);
-+ st->print(", si_code=%d (%s)", c,
-+ c >= segv_names_length ? "" : segv_names[c]);
- st->print(", si_addr=" PTR_FORMAT, si->si_addr);
- break;
- case SIGBUS:
-- st->print(", si_code=%d (%s)", c, c > 3 ? "" : bus_names[c]);
-+ st->print(", si_code=%d (%s)", c,
-+ c >= bus_names_length ? "" : bus_names[c]);
- st->print(", si_addr=" PTR_FORMAT, si->si_addr);
- break;
- default:
-@@ -3094,7 +3103,7 @@
- char *os::scan_pages(char *start, char* end, page_info* page_expected, page_info* page_found) {
- const uint_t info_types[] = { MEMINFO_VLGRP, MEMINFO_VPAGESIZE };
- const size_t types = sizeof(info_types) / sizeof(info_types[0]);
-- uint64_t addrs[MAX_MEMINFO_CNT], outdata[types * MAX_MEMINFO_CNT];
-+ uint64_t addrs[MAX_MEMINFO_CNT], outdata[types * MAX_MEMINFO_CNT + 1];
- uint_t validity[MAX_MEMINFO_CNT];
-
- size_t page_size = MAX2((size_t)os::vm_page_size(), page_expected->size);
-@@ -3133,7 +3142,7 @@
- }
- }
-
-- if (i != addrs_count) {
-+ if (i < addrs_count) {
- if ((validity[i] & 2) != 0) {
- page_found->lgrp_id = outdata[types * i];
- } else {
-@@ -3742,9 +3751,14 @@
- return os_sleep(millis, interruptible);
- }
-
--int os::naked_sleep() {
-- // %% make the sleep time an integer flag. for now use 1 millisec.
-- return os_sleep(1, false);
-+void os::naked_short_sleep(jlong ms) {
-+ assert(ms < 1000, "Un-interruptable sleep, short time use only");
-+
-+ // usleep is deprecated and removed from POSIX, in favour of nanosleep, but
-+ // Solaris requires -lrt for this.
-+ usleep((ms * 1000));
-+
-+ return;
- }
-
- // Sleep forever; naked call to OS-specific sleep; use with CAUTION
---- ./hotspot/src/os/solaris/vm/perfMemory_solaris.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/solaris/vm/perfMemory_solaris.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -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
-@@ -623,10 +623,12 @@
-
- RESTARTABLE(::read(fd, addr, remaining), result);
- if (result == OS_ERR) {
-+ ::close(fd);
- THROW_MSG_0(vmSymbols::java_io_IOException(), "Read error");
-+ } else {
-+ remaining-=result;
-+ addr+=result;
- }
-- remaining-=result;
-- addr+=result;
- }
-
- RESTARTABLE(::close(fd), result);
-@@ -1129,8 +1131,16 @@
- FREE_C_HEAP_ARRAY(char, filename, mtInternal);
-
- // open the shared memory file for the give vmid
-- fd = open_sharedmem_file(rfilename, file_flags, CHECK);
-- assert(fd != OS_ERR, "unexpected value");
-+ fd = open_sharedmem_file(rfilename, file_flags, THREAD);
-+
-+ if (fd == OS_ERR) {
-+ return;
-+ }
-+
-+ if (HAS_PENDING_EXCEPTION) {
-+ ::close(fd);
-+ return;
-+ }
-
- if (*sizep == 0) {
- size = sharedmem_filesize(fd, CHECK);
---- ./hotspot/src/os/windows/vm/os_windows.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os/windows/vm/os_windows.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -3421,6 +3421,16 @@
- return result;
- }
-
-+//
-+// Short sleep, direct OS call.
-+//
-+// ms = 0, means allow others (if any) to run.
-+//
-+void os::naked_short_sleep(jlong ms) {
-+ assert(ms < 1000, "Un-interruptable sleep, short time use only");
-+ Sleep(ms);
-+}
-+
- // Sleep forever; naked call to OS-specific sleep; use with CAUTION
- void os::infinite_sleep() {
- while (true) { // sleep forever ...
---- ./hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -26,8 +26,8 @@
- #include "runtime/os.hpp"
- #include "vm_version_sparc.hpp"
-
--static bool detect_niagara() {
-- char cpu[128];
-+static bool cpuinfo_field_contains(const char* field, const char* value) {
-+ char line[1024];
- bool rv = false;
-
- FILE* fp = fopen("/proc/cpuinfo", "r");
-@@ -35,9 +35,10 @@
- return rv;
- }
-
-- while (!feof(fp)) {
-- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
-- if (strstr(cpu, "Niagara") != NULL) {
-+ while (fgets(line, sizeof(line), fp) != NULL) {
-+ assert(strlen(line) < sizeof(line) - 1, "buffer line[1024] is too small.");
-+ if (strncmp(line, field, strlen(field)) == 0) {
-+ if (strstr(line, value) != NULL) {
- rv = true;
- }
- break;
-@@ -45,8 +46,15 @@
- }
-
- fclose(fp);
-+ return rv;
-+}
-
-- return rv;
-+static bool detect_niagara() {
-+ return cpuinfo_field_contains("cpu", "Niagara");
-+}
-+
-+static bool detect_blkinit() {
-+ return cpuinfo_field_contains("cpucaps", "blkinit");
- }
-
- int VM_Version::platform_features(int features) {
-@@ -58,5 +66,9 @@
- features = niagara1_m | T_family_m;
- }
-
-+ if (detect_blkinit()) {
-+ features |= blk_init_instructions_m;
-+ }
-+
- return features;
- }
---- ./hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Fri Apr 10 09:19:25 2015 -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
-@@ -490,9 +490,11 @@
- // here if the underlying file has been truncated.
- // Do not crash the VM in such a case.
- CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
-- nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
-- if (nm != NULL && nm->has_unsafe_access()) {
-- stub = StubRoutines::handler_for_unsafe_access();
-+ if (cb != NULL) {
-+ nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
-+ if (nm != NULL && nm->has_unsafe_access()) {
-+ stub = StubRoutines::handler_for_unsafe_access();
-+ }
- }
- }
- else
-@@ -739,6 +741,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return false;
- }
-
- void os::print_context(outputStream *st, void *context) {
---- ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -3663,6 +3663,7 @@
-
- // now perform tests that are based on flag settings
- if (callee->force_inline()) {
-+ if (inline_level() > MaxForceInlineLevel) INLINE_BAILOUT("MaxForceInlineLevel");
- print_inlining(callee, "force inline by annotation");
- } else if (callee->should_inline()) {
- print_inlining(callee, "force inline by CompileOracle");
---- ./hotspot/src/share/vm/c1/c1_globals.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/c1/c1_globals.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -269,9 +269,6 @@
- develop(bool, InstallMethods, true, \
- "Install methods at the end of successful compilations") \
- \
-- product(intx, CompilationRepeat, 0, \
-- "Number of times to recompile method before returning result") \
-- \
- develop(intx, NMethodSizeLimit, (64*K)*wordSize, \
- "Maximum size of a compiled method.") \
- \
---- ./hotspot/src/share/vm/classfile/classFileParser.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/classfile/classFileParser.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -3747,7 +3747,7 @@
- }
-
- // Allocate mirror and initialize static fields
-- java_lang_Class::create_mirror(this_klass, CHECK_(nullHandle));
-+ java_lang_Class::create_mirror(this_klass, class_loader, CHECK_(nullHandle));
-
- ClassLoadingService::notify_class_loaded(instanceKlass::cast(this_klass()),
- false /* not shared class */);
---- ./hotspot/src/share/vm/classfile/classLoader.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/classfile/classLoader.cpp Fri Apr 10 09:19:25 2015 -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
-@@ -197,7 +197,7 @@
- }
-
-
--ClassFileStream* ClassPathDirEntry::open_stream(const char* name) {
-+ClassFileStream* ClassPathDirEntry::open_stream(const char* name, TRAPS) {
- // construct full path name
- char path[JVM_MAXPATHLEN];
- if (jio_snprintf(path, sizeof(path), "%s%s%s", _dir, os::file_separator(), name) == -1) {
-@@ -240,7 +240,7 @@
- FREE_C_HEAP_ARRAY(char, _zip_name, mtClass);
- }
-
--ClassFileStream* ClassPathZipEntry::open_stream(const char* name) {
-+ClassFileStream* ClassPathZipEntry::open_stream(const char* name, TRAPS) {
- // enable call to C land
- JavaThread* thread = JavaThread::current();
- ThreadToNativeFromVM ttn(thread);
-@@ -284,24 +284,24 @@
- }
- }
-
--LazyClassPathEntry::LazyClassPathEntry(char* path, struct stat st) : ClassPathEntry() {
-+LazyClassPathEntry::LazyClassPathEntry(char* path, const struct stat* st) : ClassPathEntry() {
- _path = strdup(path);
-- _st = st;
-+ _st = *st;
- _meta_index = NULL;
- _resolved_entry = NULL;
-+ _has_error = false;
- }
-
- bool LazyClassPathEntry::is_jar_file() {
- return ((_st.st_mode & S_IFREG) == S_IFREG);
- }
-
--ClassPathEntry* LazyClassPathEntry::resolve_entry() {
-+ClassPathEntry* LazyClassPathEntry::resolve_entry(TRAPS) {
- if (_resolved_entry != NULL) {
- return (ClassPathEntry*) _resolved_entry;
- }
- ClassPathEntry* new_entry = NULL;
-- ClassLoader::create_class_path_entry(_path, _st, &new_entry, false);
-- assert(new_entry != NULL, "earlier code should have caught this");
-+ new_entry = ClassLoader::create_class_path_entry(_path, &_st, false, CHECK_NULL);
- {
- ThreadCritical tc;
- if (_resolved_entry == NULL) {
-@@ -314,12 +314,21 @@
- return (ClassPathEntry*) _resolved_entry;
- }
-
--ClassFileStream* LazyClassPathEntry::open_stream(const char* name) {
-+ClassFileStream* LazyClassPathEntry::open_stream(const char* name, TRAPS) {
- if (_meta_index != NULL &&
- !_meta_index->may_contain(name)) {
- return NULL;
- }
-- return resolve_entry()->open_stream(name);
-+ if (_has_error) {
-+ return NULL;
-+ }
-+ ClassPathEntry* cpe = resolve_entry(THREAD);
-+ if (cpe == NULL) {
-+ _has_error = true;
-+ return NULL;
-+ } else {
-+ return cpe->open_stream(name, THREAD);
-+ }
- }
-
- bool LazyClassPathEntry::is_lazy() {
-@@ -465,20 +474,19 @@
- }
- }
-
--void ClassLoader::create_class_path_entry(char *path, struct stat st, ClassPathEntry **new_entry, bool lazy) {
-+ClassPathEntry* ClassLoader::create_class_path_entry(char *path, const struct stat* st, bool lazy, TRAPS) {
- JavaThread* thread = JavaThread::current();
- if (lazy) {
-- *new_entry = new LazyClassPathEntry(path, st);
-- return;
-+ return new LazyClassPathEntry(path, st);
- }
-- if ((st.st_mode & S_IFREG) == S_IFREG) {
-+ ClassPathEntry* new_entry = NULL;
-+ if ((st->st_mode & S_IFREG) == S_IFREG) {
- // Regular file, should be a zip file
- // Canonicalized filename
- char canonical_path[JVM_MAXPATHLEN];
- if (!get_canonical_path(path, canonical_path, JVM_MAXPATHLEN)) {
- // This matches the classic VM
-- EXCEPTION_MARK;
-- THROW_MSG(vmSymbols::java_io_IOException(), "Bad pathname");
-+ THROW_MSG_(vmSymbols::java_io_IOException(), "Bad pathname", NULL);
- }
- char* error_msg = NULL;
- jzfile* zip;
-@@ -489,7 +497,7 @@
- zip = (*ZipOpen)(canonical_path, &error_msg);
- }
- if (zip != NULL && error_msg == NULL) {
-- *new_entry = new ClassPathZipEntry(zip, path);
-+ new_entry = new ClassPathZipEntry(zip, path);
- if (TraceClassLoading) {
- tty->print_cr("[Opened %s]", path);
- }
-@@ -504,16 +512,16 @@
- msg = NEW_RESOURCE_ARRAY(char, len); ;
- jio_snprintf(msg, len - 1, "error in opening JAR file <%s> %s", error_msg, path);
- }
-- EXCEPTION_MARK;
-- THROW_MSG(vmSymbols::java_lang_ClassNotFoundException(), msg);
-+ THROW_MSG_(vmSymbols::java_lang_ClassNotFoundException(), msg, NULL);
- }
- } else {
- // Directory
-- *new_entry = new ClassPathDirEntry(path);
-+ new_entry = new ClassPathDirEntry(path);
- if (TraceClassLoading) {
- tty->print_cr("[Path %s]", path);
- }
- }
-+ return new_entry;
- }
-
-
-@@ -572,13 +580,14 @@
- }
- }
-
--void ClassLoader::update_class_path_entry_list(const char *path,
-+void ClassLoader::update_class_path_entry_list(char *path,
- bool check_for_duplicates) {
- struct stat st;
-- if (os::stat((char *)path, &st) == 0) {
-+ if (os::stat(path, &st) == 0) {
- // File or directory found
- ClassPathEntry* new_entry = NULL;
-- create_class_path_entry((char *)path, st, &new_entry, LazyBootClassLoader);
-+ Thread* THREAD = Thread::current();
-+ new_entry = create_class_path_entry(path, &st, LazyBootClassLoader, CHECK);
- // The kernel VM adds dynamically to the end of the classloader path and
- // doesn't reorder the bootclasspath which would break java.lang.Package
- // (see PackageInfo).
-@@ -895,7 +904,7 @@
- PerfClassTraceTime::CLASS_LOAD);
- ClassPathEntry* e = _first_entry;
- while (e != NULL) {
-- stream = e->open_stream(name);
-+ stream = e->open_stream(name, CHECK_(instanceKlassHandle()));
- if (stream != NULL) {
- break;
- }
-@@ -1258,11 +1267,16 @@
- }
-
- void LazyClassPathEntry::compile_the_world(Handle loader, TRAPS) {
-- resolve_entry()->compile_the_world(loader, CHECK);
-+ ClassPathEntry* cpe = resolve_entry(THREAD);
-+ if (cpe != NULL) {
-+ cpe->compile_the_world(loader, CHECK);
-+ }
- }
-
- bool LazyClassPathEntry::is_rt_jar() {
-- return resolve_entry()->is_rt_jar();
-+ Thread* THREAD = Thread::current();
-+ ClassPathEntry* cpe = resolve_entry(THREAD);
-+ return (cpe != NULL) ? cpe->is_jar_file() : false;
- }
-
- void ClassLoader::compile_the_world() {
---- ./hotspot/src/share/vm/classfile/classLoader.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/classfile/classLoader.hpp Fri Apr 10 09:19:25 2015 -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
-@@ -63,7 +63,7 @@
- ClassPathEntry();
- // Attempt to locate file_name through this class path entry.
- // Returns a class file parsing stream if successfull.
-- virtual ClassFileStream* open_stream(const char* name) = 0;
-+ virtual ClassFileStream* open_stream(const char* name, TRAPS) = 0;
- // Debugging
- NOT_PRODUCT(virtual void compile_the_world(Handle loader, TRAPS) = 0;)
- NOT_PRODUCT(virtual bool is_rt_jar() = 0;)
-@@ -77,7 +77,7 @@
- bool is_jar_file() { return false; }
- const char* name() { return _dir; }
- ClassPathDirEntry(char* dir);
-- ClassFileStream* open_stream(const char* name);
-+ ClassFileStream* open_stream(const char* name, TRAPS);
- // Debugging
- NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
- NOT_PRODUCT(bool is_rt_jar();)
-@@ -107,7 +107,7 @@
- const char* name() { return _zip_name; }
- ClassPathZipEntry(jzfile* zip, const char* zip_name);
- ~ClassPathZipEntry();
-- ClassFileStream* open_stream(const char* name);
-+ ClassFileStream* open_stream(const char* name, TRAPS);
- void contents_do(void f(const char* name, void* context), void* context);
- // Debugging
- NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
-@@ -125,13 +125,14 @@
- char* _path; // dir or file
- struct stat _st;
- MetaIndex* _meta_index;
-+ bool _has_error;
- volatile ClassPathEntry* _resolved_entry;
-- ClassPathEntry* resolve_entry();
-+ ClassPathEntry* resolve_entry(TRAPS);
- public:
- bool is_jar_file();
- const char* name() { return _path; }
-- LazyClassPathEntry(char* path, struct stat st);
-- ClassFileStream* open_stream(const char* name);
-+ LazyClassPathEntry(char* path, const struct stat* st);
-+ ClassFileStream* open_stream(const char* name, TRAPS);
- void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; }
- virtual bool is_lazy();
- // Debugging
-@@ -207,14 +208,15 @@
- static void setup_meta_index();
- static void setup_bootstrap_search_path();
- static void load_zip_library();
-- static void create_class_path_entry(char *path, struct stat st, ClassPathEntry **new_entry, bool lazy);
-+ static ClassPathEntry* create_class_path_entry(char *path, const struct stat* st,
-+ bool lazy, TRAPS);
-
- // Canonicalizes path names, so strcmp will work properly. This is mainly
- // to avoid confusing the zip library
- static bool get_canonical_path(char* orig, char* out, int len);
- public:
- // Used by the kernel jvm.
-- static void update_class_path_entry_list(const char *path,
-+ static void update_class_path_entry_list(char *path,
- bool check_for_duplicates);
- static void print_bootclasspath();
-
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -42,6 +42,7 @@
- #include "oops/methodOop.hpp"
- #include "oops/symbol.hpp"
- #include "oops/typeArrayOop.hpp"
-+#include "prims/jvmtiRedefineClassesTrace.hpp"
- #include "runtime/fieldDescriptor.hpp"
- #include "runtime/handles.inline.hpp"
- #include "runtime/interfaceSupport.hpp"
-@@ -530,10 +531,10 @@
- }
- }
- }
-- create_mirror(k, CHECK);
-+ create_mirror(k, Handle(NULL), CHECK);
- }
-
--oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) {
-+oop java_lang_Class::create_mirror(KlassHandle k, Handle class_loader, TRAPS) {
- assert(k->java_mirror() == NULL, "should only assign mirror once");
- // Use this moment of initialization to cache modifier_flags also,
- // to support Class.getModifiers(). Instance classes recalculate
-@@ -574,6 +575,9 @@
- // Initialize static fields
- instanceKlass::cast(k())->do_local_static_fields(&initialize_static_field, CHECK_NULL);
- }
-+ // set the classLoader field in the java_lang_Class instance
-+ assert(class_loader() == k->class_loader(), "should be same");
-+ set_class_loader(mirror(), class_loader());
- return mirror();
- } else {
- return NULL;
-@@ -599,6 +603,18 @@
- java_class->int_field_put(_static_oop_field_count_offset, size);
- }
-
-+void java_lang_Class::set_class_loader(oop java_class, oop loader) {
-+ // jdk7 runs Queens in bootstrapping and jdk8-9 has no coordinated pushes yet.
-+ if (_class_loader_offset != 0) {
-+ java_class->obj_field_put(_class_loader_offset, loader);
-+ }
-+}
-+
-+oop java_lang_Class::class_loader(oop java_class) {
-+ assert(_class_loader_offset != 0, "must be set");
-+ return java_class->obj_field(_class_loader_offset);
-+}
-+
- oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
- // This should be improved by adding a field at the Java level or by
- // introducing a new VM klass (see comment in ClassFileParser)
-@@ -762,6 +778,12 @@
- compute_optional_offset(classRedefinedCount_offset,
- klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature());
-
-+ // Needs to be optional because the old build runs Queens during bootstrapping
-+ // and jdk8-9 doesn't have coordinated pushes yet.
-+ compute_optional_offset(_class_loader_offset,
-+ klass_oop, vmSymbols::classClassLoader_name(),
-+ vmSymbols::classloader_signature());
-+
- CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
- }
-
-@@ -2517,11 +2539,35 @@
- return mname->obj_field(_vmtarget_offset);
- }
-
-+bool java_lang_invoke_MemberName::is_method(oop mname) {
-+ assert(is_instance(mname), "must be MemberName");
-+ return (flags(mname) & (MN_IS_METHOD | MN_IS_CONSTRUCTOR)) > 0;
-+}
-+
- // 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");
-+void java_lang_invoke_MemberName::adjust_vmtarget(oop mname, methodOop old_method,
-+ methodOop new_method, bool* trace_name_printed) {
-+ assert(is_method(mname), "wrong type");
- assert(Thread::current()->is_VM_thread(), "not VM thread");
-- mname->address_field_put(_vmtarget_offset, (address)ref);
-+
-+ methodOop target = (methodOop) mname->obj_field(_vmtarget_offset);
-+
-+ if (target == old_method) {
-+ mname->obj_field_put(_vmtarget_offset, 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",
-+ instanceKlass::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()));
-+ }
-+ }
- }
-
- void java_lang_invoke_MemberName::set_vmtarget(oop mname, oop ref) {
-@@ -2830,6 +2876,7 @@
- int java_lang_Class::_resolved_constructor_offset;
- int java_lang_Class::_oop_size_offset;
- int java_lang_Class::_static_oop_field_count_offset;
-+int java_lang_Class::_class_loader_offset;
- int java_lang_Throwable::backtrace_offset;
- int java_lang_Throwable::detailMessage_offset;
- int java_lang_Throwable::cause_offset;
-@@ -3277,3 +3324,4 @@
- JavaClasses::check_offsets();
- FilteredFieldsMap::initialize(); // must be done after computing offsets.
- }
-+
---- ./hotspot/src/share/vm/classfile/javaClasses.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/classfile/javaClasses.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -28,6 +28,7 @@
- #include "classfile/systemDictionary.hpp"
- #include "jvmtifiles/jvmti.h"
- #include "oops/oop.hpp"
-+#include "oops/methodOop.hpp"
- #include "runtime/os.hpp"
- #include "utilities/utf8.hpp"
-
-@@ -224,14 +225,21 @@
- static int _oop_size_offset;
- static int _static_oop_field_count_offset;
-
-+ static int _class_loader_offset;
-+
- static bool offsets_computed;
- static int classRedefinedCount_offset;
-
-+ static void set_class_loader(oop java_class, oop class_loader);
- public:
- static void compute_offsets();
-
- // Instance creation
-- static oop create_mirror(KlassHandle k, TRAPS);
-+ static oop create_mirror(KlassHandle k, Handle class_loader, TRAPS);
-+ static oop create_mirror(KlassHandle k, TRAPS) {
-+ return create_mirror(k, Handle(), THREAD);
-+ }
-+
- static void fixup_mirror(KlassHandle k, TRAPS);
- static oop create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS);
- // Conversion
-@@ -267,6 +275,8 @@
- static int classRedefinedCount(oop the_class_mirror);
- static void set_classRedefinedCount(oop the_class_mirror, int value);
-
-+ static oop class_loader(oop java_class);
-+
- static int oop_size(oop java_class);
- static void set_oop_size(oop java_class, int size);
- static int static_oop_field_count(oop java_class);
-@@ -1014,7 +1024,8 @@
-
- static oop vmtarget(oop mname);
- static void set_vmtarget(oop mname, oop target);
-- static void adjust_vmtarget(oop mname, oop target);
-+ static void adjust_vmtarget(oop mname, methodOop old_method, methodOop new_method,
-+ bool* trace_name_printed);
-
- static intptr_t vmindex(oop mname);
- static void set_vmindex(oop mname, intptr_t index);
-@@ -1027,6 +1038,8 @@
- return obj != NULL && is_subclass(obj->klass());
- }
-
-+ static bool is_method(oop obj);
-+
- // Relevant integer codes (keep these in synch. with MethodHandleNatives.Constants):
- enum {
- MN_IS_METHOD = 0x00010000, // method (not constructor)
---- ./hotspot/src/share/vm/classfile/vmSymbols.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/classfile/vmSymbols.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -547,6 +547,7 @@
- template(serializePropertiesToByteArray_signature, "()[B") \
- template(serializeAgentPropertiesToByteArray_name, "serializeAgentPropertiesToByteArray") \
- template(classRedefinedCount_name, "classRedefinedCount") \
-+ template(classClassLoader_name, "classLoader") \
- \
- /* trace signatures */ \
- TRACE_TEMPLATES(template) \
---- ./hotspot/src/share/vm/compiler/compileBroker.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/compiler/compileBroker.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1594,22 +1594,6 @@
- if (method()->number_of_breakpoints() == 0) {
- // Compile the method.
- if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
--#ifdef COMPILER1
-- // Allow repeating compilations for the purpose of benchmarking
-- // compile speed. This is not useful for customers.
-- if (CompilationRepeat != 0) {
-- int compile_count = CompilationRepeat;
-- while (compile_count > 0) {
-- invoke_compiler_on_method(task);
-- nmethod* nm = method->code();
-- if (nm != NULL) {
-- nm->make_zombie();
-- method->clear_code();
-- }
-- compile_count--;
-- }
-- }
--#endif /* COMPILER1 */
- invoke_compiler_on_method(task);
- } else {
- // After compilation is disabled, remove remaining methods from queue
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -492,7 +492,7 @@
- // heap remains parsable.
- const bool limit_exceeded = size_policy()->gc_overhead_limit_exceeded();
- const bool softrefs_clear = collector_policy()->all_soft_refs_clear();
-- assert(!limit_exceeded || softrefs_clear, "Should have been cleared");
-+
- if (limit_exceeded && softrefs_clear) {
- *gc_overhead_limit_was_exceeded = true;
- size_policy()->set_gc_overhead_limit_exceeded(false);
---- ./hotspot/src/share/vm/memory/collectorPolicy.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -642,7 +642,7 @@
-
- const bool limit_exceeded = size_policy()->gc_overhead_limit_exceeded();
- const bool softrefs_clear = all_soft_refs_clear();
-- assert(!limit_exceeded || softrefs_clear, "Should have been cleared");
-+
- if (limit_exceeded && softrefs_clear) {
- *gc_overhead_limit_was_exceeded = true;
- size_policy()->set_gc_overhead_limit_exceeded(false);
---- ./hotspot/src/share/vm/memory/referenceProcessor.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/memory/referenceProcessor.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -256,7 +256,7 @@
- // 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,
-+ process_discovered_reflist(_discoveredCleanerRefs, NULL, true,
- is_alive, keep_alive, complete_gc, task_executor);
- }
-
---- ./hotspot/src/share/vm/oops/arrayKlass.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/arrayKlass.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -124,7 +124,7 @@
- ResourceMark rm(THREAD);
- k->initialize_supers(super_klass(), CHECK);
- k->vtable()->initialize_vtable(false, CHECK);
-- java_lang_Class::create_mirror(k, CHECK);
-+ java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), CHECK);
- }
-
- objArrayOop arrayKlass::compute_secondary_supers(int num_extra_slots, TRAPS) {
---- ./hotspot/src/share/vm/oops/cpCacheOop.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/cpCacheOop.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -615,7 +615,9 @@
- m = f1_as_method();
- }
-
-- assert(m != NULL && m->is_method(), "sanity check");
-+ // Secondary entry can have vfinal flag and a NULL _f2, giving m==NULL here:
-+ assert(is_secondary_entry() || (m != NULL && m->is_method()), "sanity check");
-+
- if (m == NULL || !m->is_method() || (k != NULL && m->method_holder() != k)) {
- // robustness for above sanity checks or method is not in
- // the interesting class
---- ./hotspot/src/share/vm/oops/instanceKlass.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/instanceKlass.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -2344,28 +2344,27 @@
- return NULL;
- }
-
--void instanceKlass::add_member_name(int index, Handle mem_name) {
-+bool instanceKlass::add_member_name(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);
-
-+ // Check if method has been redefined while taking out MemberNameTable_lock, if so
-+ // return false. We cannot cache obsolete methods. They will crash when the function
-+ // is called!
-+ methodOop method = (methodOop) java_lang_invoke_MemberName::vmtarget(mem_name());
-+ if (method->is_obsolete()) {
-+ return false;
-+ } else if (method->is_old()) {
-+ // Replace method with redefined version
-+ java_lang_invoke_MemberName::set_vmtarget(mem_name(), method_with_idnum(method->method_idnum()));
-+ }
-+
- 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;
-+ _member_names->add_member_name(mem_name_wref);
-+ return true;
- }
-
- // -----------------------------------------------------------------------------------------------------
---- ./hotspot/src/share/vm/oops/instanceKlass.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/instanceKlass.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -977,8 +977,7 @@
- // 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);
-+ bool add_member_name(Handle member_name);
-
- public:
- // JVMTI support
---- ./hotspot/src/share/vm/oops/methodDataOop.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/methodDataOop.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1203,7 +1203,7 @@
- // Whole-method sticky bits and flags
- public:
- enum {
-- _trap_hist_limit = 17, // decoupled from Deoptimization::Reason_LIMIT
-+ _trap_hist_limit = 18, // decoupled from Deoptimization::Reason_LIMIT
- _trap_hist_mask = max_jubyte,
- _extra_data_count = 4 // extra DataLayout headers, for trap history
- }; // Public flag values
---- ./hotspot/src/share/vm/oops/objArrayKlass.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/objArrayKlass.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -202,6 +202,15 @@
- }
- }
-
-+// Protect against _bottom_klass being null, when called from Universe::fixup_mirrors
-+oop objArrayKlass::class_loader() const {
-+ if (bottom_klass() != NULL) {
-+ return Klass::cast(bottom_klass())->class_loader();
-+ } else {
-+ return NULL;
-+ }
-+}
-+
-
- klassOop objArrayKlass::array_klass_impl(bool or_null, int n, TRAPS) {
- objArrayKlassHandle h_this(THREAD, as_klassOop());
---- ./hotspot/src/share/vm/oops/objArrayKlass.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/oops/objArrayKlass.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -68,7 +68,7 @@
- // Compute protection domain
- oop protection_domain() { return Klass::cast(bottom_klass())->protection_domain(); }
- // Compute class loader
-- oop class_loader() const { return Klass::cast(bottom_klass())->class_loader(); }
-+ oop class_loader() const;
-
- private:
- // Either oop or narrowOop depending on UseCompressedOops.
---- ./hotspot/src/share/vm/opto/bytecodeInfo.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/bytecodeInfo.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -364,6 +364,13 @@
- set_msg("not an accessor");
- return false;
- }
-+
-+ // Limit inlining depth in case inlining is forced or
-+ // _max_inline_level was increased to compensate for lambda forms.
-+ if (inline_level() > MaxForceInlineLevel) {
-+ set_msg("MaxForceInlineLevel");
-+ return false;
-+ }
- if (inline_level() > _max_inline_level) {
- if (!callee_method->force_inline() || !IncrementalInline) {
- set_msg("inlining too deep");
---- ./hotspot/src/share/vm/opto/c2_globals.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/c2_globals.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -448,6 +448,9 @@
- product(bool, DoEscapeAnalysis, true, \
- "Perform escape analysis") \
- \
-+ product(double, EscapeAnalysisTimeout, 20. DEBUG_ONLY(+40.), \
-+ "Abort EA when it reaches time limit (in sec)") \
-+ \
- develop(bool, ExitEscapeAnalysisOnTimeout, true, \
- "Exit or throw assert in EA when it reaches time limit") \
- \
---- ./hotspot/src/share/vm/opto/callGenerator.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/callGenerator.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -742,7 +742,7 @@
- guarantee(!target->is_method_handle_intrinsic(), "should not happen"); // XXX remove
- const int vtable_index = methodOopDesc::invalid_vtable_index;
- CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS, true, true);
-- assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
-+ assert(cg == NULL || !cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
- if (cg != NULL && cg->is_inline())
- return cg;
- }
-@@ -808,7 +808,7 @@
- }
-
- CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms, true, PROB_ALWAYS, true, true);
-- assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
-+ assert(cg == NULL || !cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
- if (cg != NULL && cg->is_inline())
- return cg;
- }
---- ./hotspot/src/share/vm/opto/connode.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/connode.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -439,6 +439,102 @@
- return this;
- }
-
-+uint CastIINode::size_of() const {
-+ return sizeof(*this);
-+}
-+
-+uint CastIINode::cmp(const Node &n) const {
-+ return TypeNode::cmp(n) && ((CastIINode&)n)._carry_dependency == _carry_dependency;
-+}
-+
-+Node *CastIINode::Identity(PhaseTransform *phase) {
-+ if (_carry_dependency) {
-+ return this;
-+ }
-+ return ConstraintCastNode::Identity(phase);
-+}
-+
-+const Type *CastIINode::Value(PhaseTransform *phase) const {
-+ const Type *res = ConstraintCastNode::Value(phase);
-+
-+ // Try to improve the type of the CastII if we recognize a CmpI/If
-+ // pattern.
-+ if (_carry_dependency) {
-+ if (in(0) != NULL && in(0)->in(0) != NULL && in(0)->in(0)->is_If()) {
-+ assert(in(0)->is_IfFalse() || in(0)->is_IfTrue(), "should be If proj");
-+ Node* proj = in(0);
-+ if (proj->in(0)->in(1)->is_Bool()) {
-+ Node* b = proj->in(0)->in(1);
-+ if (b->in(1)->Opcode() == Op_CmpI) {
-+ Node* cmp = b->in(1);
-+ if (cmp->in(1) == in(1) && phase->type(cmp->in(2))->isa_int()) {
-+ const TypeInt* in2_t = phase->type(cmp->in(2))->is_int();
-+ const Type* t = TypeInt::INT;
-+ BoolTest test = b->as_Bool()->_test;
-+ if (proj->is_IfFalse()) {
-+ test = test.negate();
-+ }
-+ BoolTest::mask m = test._test;
-+ jlong lo_long = min_jint;
-+ jlong hi_long = max_jint;
-+ if (m == BoolTest::le || m == BoolTest::lt) {
-+ hi_long = in2_t->_hi;
-+ if (m == BoolTest::lt) {
-+ hi_long -= 1;
-+ }
-+ } else if (m == BoolTest::ge || m == BoolTest::gt) {
-+ lo_long = in2_t->_lo;
-+ if (m == BoolTest::gt) {
-+ lo_long += 1;
-+ }
-+ } else if (m == BoolTest::eq) {
-+ lo_long = in2_t->_lo;
-+ hi_long = in2_t->_hi;
-+ } else if (m == BoolTest::ne) {
-+ // can't do any better
-+ } else {
-+ stringStream ss;
-+ test.dump_on(&ss);
-+ fatal(err_msg_res("unexpected comparison %s", ss.as_string()));
-+ }
-+ int lo_int = (int)lo_long;
-+ int hi_int = (int)hi_long;
-+
-+ if (lo_long != (jlong)lo_int) {
-+ lo_int = min_jint;
-+ }
-+ if (hi_long != (jlong)hi_int) {
-+ hi_int = max_jint;
-+ }
-+
-+ t = TypeInt::make(lo_int, hi_int, Type::WidenMax);
-+
-+ res = res->filter(t);
-+
-+ return res;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ return res;
-+}
-+
-+Node *CastIINode::Ideal_DU_postCCP(PhaseCCP *ccp) {
-+ if (_carry_dependency) {
-+ return NULL;
-+ }
-+ return ConstraintCastNode::Ideal_DU_postCCP(ccp);
-+}
-+
-+#ifndef PRODUCT
-+void CastIINode::dump_spec(outputStream *st) const {
-+ TypeNode::dump_spec(st);
-+ if (_carry_dependency) {
-+ st->print(" carry dependency");
-+ }
-+}
-+#endif
-
- //=============================================================================
-
---- ./hotspot/src/share/vm/opto/connode.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/connode.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -233,10 +233,25 @@
- //------------------------------CastIINode-------------------------------------
- // cast integer to integer (different range)
- class CastIINode: public ConstraintCastNode {
-+ private:
-+ // Can this node be removed post CCP or does it carry a required dependency?
-+ const bool _carry_dependency;
-+
-+ protected:
-+ virtual uint cmp( const Node &n ) const;
-+ virtual uint size_of() const;
-+
- public:
-- CastIINode (Node *n, const Type *t ): ConstraintCastNode(n,t) {}
-+ CastIINode(Node *n, const Type *t, bool carry_dependency = false)
-+ : ConstraintCastNode(n,t), _carry_dependency(carry_dependency) {}
- virtual int Opcode() const;
- virtual uint ideal_reg() const { return Op_RegI; }
-+ virtual Node *Identity( PhaseTransform *phase );
-+ virtual const Type *Value( PhaseTransform *phase ) const;
-+ virtual Node *Ideal_DU_postCCP( PhaseCCP * );
-+#ifndef PRODUCT
-+ virtual void dump_spec(outputStream *st) const;
-+#endif
- };
-
- //------------------------------CastPPNode-------------------------------------
---- ./hotspot/src/share/vm/opto/doCall.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/doCall.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -735,10 +735,16 @@
- // each arm of the Phi. If I know something clever about the exceptions
- // I'm loading the class from, I can replace the LoadKlass with the
- // klass constant for the exception oop.
-- if( ex_node->is_Phi() ) {
-- ex_klass_node = new (C) PhiNode( ex_node->in(0), TypeKlassPtr::OBJECT );
-- for( uint i = 1; i < ex_node->req(); i++ ) {
-- Node* p = basic_plus_adr( ex_node->in(i), ex_node->in(i), oopDesc::klass_offset_in_bytes() );
-+ if (ex_node->is_Phi()) {
-+ ex_klass_node = new (C) PhiNode(ex_node->in(0), TypeKlassPtr::OBJECT);
-+ for (uint i = 1; i < ex_node->req(); i++) {
-+ Node* ex_in = ex_node->in(i);
-+ if (ex_in == top() || ex_in == NULL) {
-+ // This path was not taken.
-+ ex_klass_node->init_req(i, top());
-+ continue;
-+ }
-+ Node* p = basic_plus_adr(ex_in, ex_in, oopDesc::klass_offset_in_bytes());
- Node* k = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeInstPtr::KLASS, TypeKlassPtr::OBJECT) );
- ex_klass_node->init_req( i, k );
- }
---- ./hotspot/src/share/vm/opto/escape.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/escape.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -37,6 +37,8 @@
-
- ConnectionGraph::ConnectionGraph(Compile * C, PhaseIterGVN *igvn) :
- _nodes(C->comp_arena(), C->unique(), C->unique(), NULL),
-+ _in_worklist(C->comp_arena()),
-+ _next_pidx(0),
- _collecting(true),
- _verify(false),
- _compile(C),
-@@ -120,13 +122,19 @@
- if (C->root() != NULL) {
- ideal_nodes.push(C->root());
- }
-+ // Processed ideal nodes are unique on ideal_nodes list
-+ // but several ideal nodes are mapped to the phantom_obj.
-+ // To avoid duplicated entries on the following worklists
-+ // add the phantom_obj only once to them.
-+ ptnodes_worklist.append(phantom_obj);
-+ java_objects_worklist.append(phantom_obj);
- for( uint next = 0; next < ideal_nodes.size(); ++next ) {
- Node* n = ideal_nodes.at(next);
- // Create PointsTo nodes and add them to Connection Graph. Called
- // only once per ideal node since ideal_nodes is Unique_Node list.
- add_node_to_connection_graph(n, &delayed_worklist);
- PointsToNode* ptn = ptnode_adr(n->_idx);
-- if (ptn != NULL) {
-+ if (ptn != NULL && ptn != phantom_obj) {
- ptnodes_worklist.append(ptn);
- if (ptn->is_JavaObject()) {
- java_objects_worklist.append(ptn->as_JavaObject());
-@@ -395,7 +403,7 @@
- }
- case Op_CreateEx: {
- // assume that all exception objects globally escape
-- add_java_object(n, PointsToNode::GlobalEscape);
-+ map_ideal_node(n, phantom_obj);
- break;
- }
- case Op_LoadKlass:
-@@ -1016,13 +1024,8 @@
- // on graph complexity. Observed 8 passes in jvm2008 compiler.compiler.
- // Set limit to 20 to catch situation when something did go wrong and
- // bailout Escape Analysis.
-- // Also limit build time to 30 sec (60 in debug VM).
-+ // Also limit build time to 20 sec (60 in debug VM), EscapeAnalysisTimeout flag.
- #define CG_BUILD_ITER_LIMIT 20
--#ifdef ASSERT
--#define CG_BUILD_TIME_LIMIT 60.0
--#else
--#define CG_BUILD_TIME_LIMIT 30.0
--#endif
-
- // Propagate GlobalEscape and ArgEscape escape states and check that
- // we still have non-escaping objects. The method pushs on _worklist
-@@ -1033,12 +1036,13 @@
- // Now propagate references to all JavaObject nodes.
- int java_objects_length = java_objects_worklist.length();
- elapsedTimer time;
-+ bool timeout = false;
- int new_edges = 1;
- int iterations = 0;
- do {
- while ((new_edges > 0) &&
-- (iterations++ < CG_BUILD_ITER_LIMIT) &&
-- (time.seconds() < CG_BUILD_TIME_LIMIT)) {
-+ (iterations++ < CG_BUILD_ITER_LIMIT)) {
-+ double start_time = time.seconds();
- time.start();
- new_edges = 0;
- // Propagate references to phantom_object for nodes pushed on _worklist
-@@ -1047,7 +1051,26 @@
- for (int next = 0; next < java_objects_length; ++next) {
- JavaObjectNode* ptn = java_objects_worklist.at(next);
- new_edges += add_java_object_edges(ptn, true);
-+
-+#define SAMPLE_SIZE 4
-+ if ((next % SAMPLE_SIZE) == 0) {
-+ // Each 4 iterations calculate how much time it will take
-+ // to complete graph construction.
-+ time.stop();
-+ double stop_time = time.seconds();
-+ double time_per_iter = (stop_time - start_time) / (double)SAMPLE_SIZE;
-+ double time_until_end = time_per_iter * (double)(java_objects_length - next);
-+ if ((start_time + time_until_end) >= EscapeAnalysisTimeout) {
-+ timeout = true;
-+ break; // Timeout
-+ }
-+ start_time = stop_time;
-+ time.start();
-+ }
-+#undef SAMPLE_SIZE
-+
- }
-+ if (timeout) break;
- if (new_edges > 0) {
- // Update escape states on each iteration if graph was updated.
- if (!find_non_escaped_objects(ptnodes_worklist, non_escaped_worklist)) {
-@@ -1055,9 +1078,12 @@
- }
- }
- time.stop();
-+ if (time.seconds() >= EscapeAnalysisTimeout) {
-+ timeout = true;
-+ break;
-+ }
- }
-- if ((iterations < CG_BUILD_ITER_LIMIT) &&
-- (time.seconds() < CG_BUILD_TIME_LIMIT)) {
-+ if ((iterations < CG_BUILD_ITER_LIMIT) && !timeout) {
- time.start();
- // Find fields which have unknown value.
- int fields_length = oop_fields_worklist.length();
-@@ -1070,18 +1096,21 @@
- }
- }
- time.stop();
-+ if (time.seconds() >= EscapeAnalysisTimeout) {
-+ timeout = true;
-+ break;
-+ }
- } else {
- new_edges = 0; // Bailout
- }
- } while (new_edges > 0);
-
- // Bailout if passed limits.
-- if ((iterations >= CG_BUILD_ITER_LIMIT) ||
-- (time.seconds() >= CG_BUILD_TIME_LIMIT)) {
-+ if ((iterations >= CG_BUILD_ITER_LIMIT) || timeout) {
- Compile* C = _compile;
- if (C->log() != NULL) {
- C->log()->begin_elem("connectionGraph_bailout reason='reached ");
-- C->log()->text("%s", (iterations >= CG_BUILD_ITER_LIMIT) ? "iterations" : "time");
-+ C->log()->text("%s", timeout ? "time" : "iterations");
- C->log()->end_elem(" limit'");
- }
- assert(ExitEscapeAnalysisOnTimeout, err_msg_res("infinite EA connection graph build (%f sec, %d iterations) with %d nodes and worklist size %d",
-@@ -1098,7 +1127,6 @@
- #endif
-
- #undef CG_BUILD_ITER_LIMIT
--#undef CG_BUILD_TIME_LIMIT
-
- // Find fields initialized by NULL for non-escaping Allocations.
- int non_escaped_length = non_escaped_worklist.length();
-@@ -1222,8 +1250,8 @@
- }
- }
- }
-- while(_worklist.length() > 0) {
-- PointsToNode* use = _worklist.pop();
-+ for (int l = 0; l < _worklist.length(); l++) {
-+ PointsToNode* use = _worklist.at(l);
- if (PointsToNode::is_base_use(use)) {
- // Add reference from jobj to field and from field to jobj (field's base).
- use = PointsToNode::get_use_node(use)->as_Field();
-@@ -1270,6 +1298,8 @@
- add_field_uses_to_worklist(use->as_Field());
- }
- }
-+ _worklist.clear();
-+ _in_worklist.Reset();
- return new_edges;
- }
-
-@@ -1838,7 +1868,7 @@
- return;
- }
- Compile* C = _compile;
-- ptadr = new (C->comp_arena()) LocalVarNode(C, n, es);
-+ ptadr = new (C->comp_arena()) LocalVarNode(this, n, es);
- _nodes.at_put(n->_idx, ptadr);
- }
-
-@@ -1849,7 +1879,7 @@
- return;
- }
- Compile* C = _compile;
-- ptadr = new (C->comp_arena()) JavaObjectNode(C, n, es);
-+ ptadr = new (C->comp_arena()) JavaObjectNode(this, n, es);
- _nodes.at_put(n->_idx, ptadr);
- }
-
-@@ -1865,7 +1895,7 @@
- es = PointsToNode::GlobalEscape;
- }
- Compile* C = _compile;
-- FieldNode* field = new (C->comp_arena()) FieldNode(C, n, es, offset, is_oop);
-+ FieldNode* field = new (C->comp_arena()) FieldNode(this, n, es, offset, is_oop);
- _nodes.at_put(n->_idx, field);
- }
-
-@@ -1879,7 +1909,7 @@
- return;
- }
- Compile* C = _compile;
-- ptadr = new (C->comp_arena()) ArraycopyNode(C, n, es);
-+ ptadr = new (C->comp_arena()) ArraycopyNode(this, n, es);
- _nodes.at_put(n->_idx, ptadr);
- // Add edge from arraycopy node to source object.
- (void)add_edge(ptadr, src);
---- ./hotspot/src/share/vm/opto/escape.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/escape.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -125,6 +125,8 @@
- class FieldNode;
- class ArraycopyNode;
-
-+class ConnectionGraph;
-+
- // ConnectionGraph nodes
- class PointsToNode : public ResourceObj {
- GrowableArray<PointsToNode*> _edges; // List of nodes this node points to
-@@ -137,6 +139,7 @@
-
- Node* const _node; // Ideal node corresponding to this PointsTo node.
- const int _idx; // Cached ideal node's _idx
-+ const uint _pidx; // Index of this node
-
- public:
- typedef enum {
-@@ -165,17 +168,9 @@
- } NodeFlags;
-
-
-- PointsToNode(Compile *C, Node* n, EscapeState es, NodeType type):
-- _edges(C->comp_arena(), 2, 0, NULL),
-- _uses (C->comp_arena(), 2, 0, NULL),
-- _node(n),
-- _idx(n->_idx),
-- _type((u1)type),
-- _escape((u1)es),
-- _fields_escape((u1)es),
-- _flags(ScalarReplaceable) {
-- assert(n != NULL && es != UnknownEscape, "sanity");
-- }
-+ inline PointsToNode(ConnectionGraph* CG, Node* n, EscapeState es, NodeType type);
-+
-+ uint pidx() const { return _pidx; }
-
- Node* ideal_node() const { return _node; }
- int idx() const { return _idx; }
-@@ -243,14 +238,14 @@
-
- class LocalVarNode: public PointsToNode {
- public:
-- LocalVarNode(Compile *C, Node* n, EscapeState es):
-- PointsToNode(C, n, es, LocalVar) {}
-+ LocalVarNode(ConnectionGraph *CG, Node* n, EscapeState es):
-+ PointsToNode(CG, n, es, LocalVar) {}
- };
-
- class JavaObjectNode: public PointsToNode {
- public:
-- JavaObjectNode(Compile *C, Node* n, EscapeState es):
-- PointsToNode(C, n, es, JavaObject) {
-+ JavaObjectNode(ConnectionGraph *CG, Node* n, EscapeState es):
-+ PointsToNode(CG, n, es, JavaObject) {
- if (es > NoEscape)
- set_scalar_replaceable(false);
- }
-@@ -262,8 +257,8 @@
- const bool _is_oop; // Field points to object
- bool _has_unknown_base; // Has phantom_object base
- public:
-- FieldNode(Compile *C, Node* n, EscapeState es, int offs, bool is_oop):
-- PointsToNode(C, n, es, Field),
-+ FieldNode(ConnectionGraph *CG, Node* n, EscapeState es, int offs, bool is_oop):
-+ PointsToNode(CG, n, es, Field),
- _offset(offs), _is_oop(is_oop),
- _has_unknown_base(false) {}
-
-@@ -284,8 +279,8 @@
-
- class ArraycopyNode: public PointsToNode {
- public:
-- ArraycopyNode(Compile *C, Node* n, EscapeState es):
-- PointsToNode(C, n, es, Arraycopy) {}
-+ ArraycopyNode(ConnectionGraph *CG, Node* n, EscapeState es):
-+ PointsToNode(CG, n, es, Arraycopy) {}
- };
-
- // Iterators for PointsTo node's edges:
-@@ -323,11 +318,14 @@
-
-
- class ConnectionGraph: public ResourceObj {
-+ friend class PointsToNode;
- private:
- GrowableArray<PointsToNode*> _nodes; // Map from ideal nodes to
- // ConnectionGraph nodes.
-
- GrowableArray<PointsToNode*> _worklist; // Nodes to be processed
-+ VectorSet _in_worklist;
-+ uint _next_pidx;
-
- bool _collecting; // Indicates whether escape information
- // is still being collected. If false,
-@@ -353,6 +351,8 @@
- }
- uint nodes_size() const { return _nodes.length(); }
-
-+ uint next_pidx() { return _next_pidx++; }
-+
- // Add nodes to ConnectionGraph.
- void add_local_var(Node* n, PointsToNode::EscapeState es);
- void add_java_object(Node* n, PointsToNode::EscapeState es);
-@@ -396,15 +396,26 @@
- int add_java_object_edges(JavaObjectNode* jobj, bool populate_worklist);
-
- // Put node on worklist if it is (or was) not there.
-- void add_to_worklist(PointsToNode* pt) {
-- _worklist.push(pt);
-- return;
-+ inline void add_to_worklist(PointsToNode* pt) {
-+ PointsToNode* ptf = pt;
-+ uint pidx_bias = 0;
-+ if (PointsToNode::is_base_use(pt)) {
-+ // Create a separate entry in _in_worklist for a marked base edge
-+ // because _worklist may have an entry for a normal edge pointing
-+ // to the same node. To separate them use _next_pidx as bias.
-+ ptf = PointsToNode::get_use_node(pt)->as_Field();
-+ pidx_bias = _next_pidx;
-+ }
-+ if (!_in_worklist.test_set(ptf->pidx() + pidx_bias)) {
-+ _worklist.append(pt);
-+ }
- }
-
- // Put on worklist all uses of this node.
-- void add_uses_to_worklist(PointsToNode* pt) {
-- for (UseIterator i(pt); i.has_next(); i.next())
-- _worklist.push(i.get());
-+ inline void add_uses_to_worklist(PointsToNode* pt) {
-+ for (UseIterator i(pt); i.has_next(); i.next()) {
-+ add_to_worklist(i.get());
-+ }
- }
-
- // Put on worklist all field's uses and related field nodes.
-@@ -517,8 +528,8 @@
- }
- // Helper functions
- bool is_oop_field(Node* n, int offset, bool* unsafe);
-- static Node* get_addp_base(Node *addp);
-- static Node* find_second_addp(Node* addp, Node* n);
-+ static Node* get_addp_base(Node *addp);
-+ static Node* find_second_addp(Node* addp, Node* n);
- // offset of a field reference
- int address_offset(Node* adr, PhaseTransform *phase);
-
-@@ -587,4 +598,17 @@
- #endif
- };
-
-+inline PointsToNode::PointsToNode(ConnectionGraph *CG, Node* n, EscapeState es, NodeType type):
-+ _edges(CG->_compile->comp_arena(), 2, 0, NULL),
-+ _uses (CG->_compile->comp_arena(), 2, 0, NULL),
-+ _node(n),
-+ _idx(n->_idx),
-+ _pidx(CG->next_pidx()),
-+ _type((u1)type),
-+ _escape((u1)es),
-+ _fields_escape((u1)es),
-+ _flags(ScalarReplaceable) {
-+ assert(n != NULL && es != UnknownEscape, "sanity");
-+}
-+
- #endif // SHARE_VM_OPTO_ESCAPE_HPP
---- ./hotspot/src/share/vm/opto/graphKit.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/graphKit.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -2746,17 +2746,23 @@
- }
-
- Node* cast_obj = NULL;
-- if (data != NULL &&
-- // Counter has never been decremented (due to cast failure).
-- // ...This is a reasonable thing to expect. It is true of
-- // all casts inserted by javac to implement generic types.
-- data->as_CounterData()->count() >= 0) {
-- cast_obj = maybe_cast_profiled_receiver(not_null_obj, data, tk->klass());
-- if (cast_obj != NULL) {
-- if (failure_control != NULL) // failure is now impossible
-- (*failure_control) = top();
-- // adjust the type of the phi to the exact klass:
-- phi->raise_bottom_type(_gvn.type(cast_obj)->meet(TypePtr::NULL_PTR));
-+ if (tk->klass_is_exact()) {
-+ // The following optimization tries to statically cast the speculative type of the object
-+ // (for example obtained during profiling) to the type of the superklass and then do a
-+ // dynamic check that the type of the object is what we expect. To work correctly
-+ // for checkcast and aastore the type of superklass should be exact.
-+ if (data != NULL &&
-+ // Counter has never been decremented (due to cast failure).
-+ // ...This is a reasonable thing to expect. It is true of
-+ // all casts inserted by javac to implement generic types.
-+ data->as_CounterData()->count() >= 0) {
-+ cast_obj = maybe_cast_profiled_receiver(not_null_obj, data, tk->klass());
-+ if (cast_obj != NULL) {
-+ if (failure_control != NULL) // failure is now impossible
-+ (*failure_control) = top();
-+ // adjust the type of the phi to the exact klass:
-+ phi->raise_bottom_type(_gvn.type(cast_obj)->meet(TypePtr::NULL_PTR));
-+ }
- }
- }
-
---- ./hotspot/src/share/vm/opto/ifg.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/ifg.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -571,15 +571,35 @@
- if( !n->is_Proj() ||
- // Could also be a flags-projection of a dead ADD or such.
- (n2lidx(def) && !liveout.member(n2lidx(def)) ) ) {
-- b->_nodes.remove(j - 1);
-- if( lrgs(r)._def == n ) lrgs(r)._def = 0;
-- n->disconnect_inputs(NULL, C);
-- _cfg._bbs.map(n->_idx,NULL);
-- n->replace_by(C->top());
-- // Since yanking a Node from block, high pressure moves up one
-- hrp_index[0]--;
-- hrp_index[1]--;
-- continue;
-+ bool remove = true;
-+ if (n->is_MachProj()) {
-+ // Don't remove KILL projections if their "defining" nodes have
-+ // memory effects (have SCMemProj projection node) -
-+ // they are not dead even when their result is not used.
-+ // For example, compareAndSwapL (and other CAS) and EncodeISOArray nodes.
-+ // The method add_input_to_liveout() keeps such nodes alive (put them on liveout list)
-+ // when it sees SCMemProj node in a block. Unfortunately SCMemProj node could be placed
-+ // in block in such order that KILL MachProj nodes are processed first.
-+ uint cnt = def->outcnt();
-+ for (uint i = 0; i < cnt; i++) {
-+ Node* proj = def->raw_out(i);
-+ if (proj->Opcode() == Op_SCMemProj) {
-+ remove = false;
-+ break;
-+ }
-+ }
-+ }
-+ if (remove) {
-+ b->_nodes.remove(j - 1);
-+ if( lrgs(r)._def == n ) lrgs(r)._def = 0;
-+ n->disconnect_inputs(NULL, C);
-+ _cfg._bbs.map(n->_idx,NULL);
-+ n->replace_by(C->top());
-+ // Since yanking a Node from block, high pressure moves up one
-+ hrp_index[0]--;
-+ hrp_index[1]--;
-+ continue;
-+ }
- }
-
- // Fat-projections kill many registers which cannot be used to
---- ./hotspot/src/share/vm/opto/ifnode.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/ifnode.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -819,6 +819,11 @@
-
- static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff);
-
-+struct RangeCheck {
-+ Node* ctl;
-+ jint off;
-+};
-+
- //------------------------------Ideal------------------------------------------
- // Return a node which is more "ideal" than the current node. Strip out
- // control copies
-@@ -860,83 +865,141 @@
- jint offset1;
- int flip1 = is_range_check(range1, index1, offset1);
- if( flip1 ) {
-- Node *first_prev_dom = NULL;
--
- // Try to remove extra range checks. All 'up_one_dom' gives up at merges
- // so all checks we inspect post-dominate the top-most check we find.
- // If we are going to fail the current check and we reach the top check
- // then we are guaranteed to fail, so just start interpreting there.
-- // We 'expand' the top 2 range checks to include all post-dominating
-+ // We 'expand' the top 3 range checks to include all post-dominating
- // checks.
-
-- // The top 2 range checks seen
-- Node *prev_chk1 = NULL;
-- Node *prev_chk2 = NULL;
-+ // The top 3 range checks seen
-+ const int NRC =3;
-+ RangeCheck prev_checks[NRC];
-+ int nb_checks = 0;
-+
- // Low and high offsets seen so far
- jint off_lo = offset1;
- jint off_hi = offset1;
-
-- // Scan for the top 2 checks and collect range of offsets
-- for( int dist = 0; dist < 999; dist++ ) { // Range-Check scan limit
-- if( dom->Opcode() == Op_If && // Not same opcode?
-- prev_dom->in(0) == dom ) { // One path of test does dominate?
-- if( dom == this ) return NULL; // dead loop
-+ bool found_immediate_dominator = false;
-+
-+ // Scan for the top checks and collect range of offsets
-+ for (int dist = 0; dist < 999; dist++) { // Range-Check scan limit
-+ if (dom->Opcode() == Op_If && // Not same opcode?
-+ prev_dom->in(0) == dom) { // One path of test does dominate?
-+ if (dom == this) return NULL; // dead loop
- // See if this is a range check
- Node *index2, *range2;
- jint offset2;
- int flip2 = dom->as_If()->is_range_check(range2, index2, offset2);
- // See if this is a _matching_ range check, checking against
- // the same array bounds.
-- if( flip2 == flip1 && range2 == range1 && index2 == index1 &&
-- dom->outcnt() == 2 ) {
-+ if (flip2 == flip1 && range2 == range1 && index2 == index1 &&
-+ dom->outcnt() == 2) {
-+ if (nb_checks == 0 && dom->in(1) == in(1)) {
-+ // Found an immediately dominating test at the same offset.
-+ // This kind of back-to-back test can be eliminated locally,
-+ // and there is no need to search further for dominating tests.
-+ assert(offset2 == offset1, "Same test but different offsets");
-+ found_immediate_dominator = true;
-+ break;
-+ }
- // Gather expanded bounds
- off_lo = MIN2(off_lo,offset2);
- off_hi = MAX2(off_hi,offset2);
-- // Record top 2 range checks
-- prev_chk2 = prev_chk1;
-- prev_chk1 = prev_dom;
-- // If we match the test exactly, then the top test covers
-- // both our lower and upper bounds.
-- if( dom->in(1) == in(1) )
-- prev_chk2 = prev_chk1;
-+ // Record top NRC range checks
-+ prev_checks[nb_checks%NRC].ctl = prev_dom;
-+ prev_checks[nb_checks%NRC].off = offset2;
-+ nb_checks++;
- }
- }
- prev_dom = dom;
-- dom = up_one_dom( dom );
-- if( !dom ) break;
-+ dom = up_one_dom(dom);
-+ if (!dom) break;
- }
-
-+ if (!found_immediate_dominator) {
-+ // Attempt to widen the dominating range check to cover some later
-+ // ones. Since range checks "fail" by uncommon-trapping to the
-+ // interpreter, widening a check can make us speculatively enter
-+ // the interpreter. If we see range-check deopt's, do not widen!
-+ if (!phase->C->allow_range_check_smearing()) return NULL;
-
-- // Attempt to widen the dominating range check to cover some later
-- // ones. Since range checks "fail" by uncommon-trapping to the
-- // interpreter, widening a check can make us speculative enter the
-- // interpreter. If we see range-check deopt's, do not widen!
-- if (!phase->C->allow_range_check_smearing()) return NULL;
--
-- // Constant indices only need to check the upper bound.
-- // Non-constance indices must check both low and high.
-- if( index1 ) {
-- // Didn't find 2 prior covering checks, so cannot remove anything.
-- if( !prev_chk2 ) return NULL;
-- // 'Widen' the offsets of the 1st and 2nd covering check
-- adjust_check( prev_chk1, range1, index1, flip1, off_lo, igvn );
-- // Do not call adjust_check twice on the same projection
-- // as the first call may have transformed the BoolNode to a ConI
-- if( prev_chk1 != prev_chk2 ) {
-- adjust_check( prev_chk2, range1, index1, flip1, off_hi, igvn );
-+ // Didn't find prior covering check, so cannot remove anything.
-+ if (nb_checks == 0) {
-+ return NULL;
- }
-- // Test is now covered by prior checks, dominate it out
-- prev_dom = prev_chk2;
-- } else {
-- // Didn't find prior covering check, so cannot remove anything.
-- if( !prev_chk1 ) return NULL;
-- // 'Widen' the offset of the 1st and only covering check
-- adjust_check( prev_chk1, range1, index1, flip1, off_hi, igvn );
-- // Test is now covered by prior checks, dominate it out
-- prev_dom = prev_chk1;
-+ // Constant indices only need to check the upper bound.
-+ // Non-constant indices must check both low and high.
-+ int chk0 = (nb_checks - 1) % NRC;
-+ if (index1) {
-+ if (nb_checks == 1) {
-+ return NULL;
-+ } else {
-+ // If the top range check's constant is the min or max of
-+ // all constants we widen the next one to cover the whole
-+ // range of constants.
-+ RangeCheck rc0 = prev_checks[chk0];
-+ int chk1 = (nb_checks - 2) % NRC;
-+ RangeCheck rc1 = prev_checks[chk1];
-+ if (rc0.off == off_lo) {
-+ adjust_check(rc1.ctl, range1, index1, flip1, off_hi, igvn);
-+ prev_dom = rc1.ctl;
-+ } else if (rc0.off == off_hi) {
-+ adjust_check(rc1.ctl, range1, index1, flip1, off_lo, igvn);
-+ prev_dom = rc1.ctl;
-+ } else {
-+ // If the top test's constant is not the min or max of all
-+ // constants, we need 3 range checks. We must leave the
-+ // top test unchanged because widening it would allow the
-+ // accesses it protects to successfully read/write out of
-+ // bounds.
-+ if (nb_checks == 2) {
-+ return NULL;
-+ }
-+ int chk2 = (nb_checks - 3) % NRC;
-+ RangeCheck rc2 = prev_checks[chk2];
-+ // The top range check a+i covers interval: -a <= i < length-a
-+ // The second range check b+i covers interval: -b <= i < length-b
-+ if (rc1.off <= rc0.off) {
-+ // if b <= a, we change the second range check to:
-+ // -min_of_all_constants <= i < length-min_of_all_constants
-+ // Together top and second range checks now cover:
-+ // -min_of_all_constants <= i < length-a
-+ // which is more restrictive than -b <= i < length-b:
-+ // -b <= -min_of_all_constants <= i < length-a <= length-b
-+ // The third check is then changed to:
-+ // -max_of_all_constants <= i < length-max_of_all_constants
-+ // so 2nd and 3rd checks restrict allowed values of i to:
-+ // -min_of_all_constants <= i < length-max_of_all_constants
-+ adjust_check(rc1.ctl, range1, index1, flip1, off_lo, igvn);
-+ adjust_check(rc2.ctl, range1, index1, flip1, off_hi, igvn);
-+ } else {
-+ // if b > a, we change the second range check to:
-+ // -max_of_all_constants <= i < length-max_of_all_constants
-+ // Together top and second range checks now cover:
-+ // -a <= i < length-max_of_all_constants
-+ // which is more restrictive than -b <= i < length-b:
-+ // -b < -a <= i < length-max_of_all_constants <= length-b
-+ // The third check is then changed to:
-+ // -max_of_all_constants <= i < length-max_of_all_constants
-+ // so 2nd and 3rd checks restrict allowed values of i to:
-+ // -min_of_all_constants <= i < length-max_of_all_constants
-+ adjust_check(rc1.ctl, range1, index1, flip1, off_hi, igvn);
-+ adjust_check(rc2.ctl, range1, index1, flip1, off_lo, igvn);
-+ }
-+ prev_dom = rc2.ctl;
-+ }
-+ }
-+ } else {
-+ RangeCheck rc0 = prev_checks[chk0];
-+ // 'Widen' the offset of the 1st and only covering check
-+ adjust_check(rc0.ctl, range1, index1, flip1, off_hi, igvn);
-+ // Test is now covered by prior checks, dominate it out
-+ prev_dom = rc0.ctl;
-+ }
- }
-
--
- } else { // Scan for an equivalent test
-
- Node *cmp;
---- ./hotspot/src/share/vm/opto/library_call.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/library_call.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -201,7 +201,7 @@
- bool inline_math(vmIntrinsics::ID id);
- bool inline_exp();
- bool inline_pow();
-- void finish_pow_exp(Node* result, Node* x, Node* y, const TypeFunc* call_type, address funcAddr, const char* funcName);
-+ Node* finish_pow_exp(Node* result, Node* x, Node* y, const TypeFunc* call_type, address funcAddr, const char* funcName);
- bool inline_min_max(vmIntrinsics::ID id);
- Node* generate_min_max(vmIntrinsics::ID id, Node* x, Node* y);
- // This returns Type::AnyPtr, RawPtr, or OopPtr.
-@@ -1580,7 +1580,7 @@
- return true;
- }
-
--void LibraryCallKit::finish_pow_exp(Node* result, Node* x, Node* y, const TypeFunc* call_type, address funcAddr, const char* funcName) {
-+Node* LibraryCallKit::finish_pow_exp(Node* result, Node* x, Node* y, const TypeFunc* call_type, address funcAddr, const char* funcName) {
- //-------------------
- //result=(result.isNaN())? funcAddr():result;
- // Check: If isNaN() by checking result!=result? then either trap
-@@ -1596,7 +1596,7 @@
- uncommon_trap(Deoptimization::Reason_intrinsic,
- Deoptimization::Action_make_not_entrant);
- }
-- set_result(result);
-+ return result;
- } else {
- // If this inlining ever returned NaN in the past, we compile a call
- // to the runtime to properly handle corner cases
-@@ -1626,9 +1626,10 @@
-
- result_region->init_req(2, control());
- result_val->init_req(2, value);
-- set_result(result_region, result_val);
-+ set_control(_gvn.transform(result_region));
-+ return _gvn.transform(result_val);
- } else {
-- set_result(result);
-+ return result;
- }
- }
- }
-@@ -1640,7 +1641,8 @@
- Node* arg = round_double_node(argument(0));
- Node* n = _gvn.transform(new (C) ExpDNode(C, control(), arg));
-
-- finish_pow_exp(n, arg, NULL, OptoRuntime::Math_D_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::dexp), "EXP");
-+ n = finish_pow_exp(n, arg, NULL, OptoRuntime::Math_D_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::dexp), "EXP");
-+ set_result(n);
-
- C->set_has_split_ifs(true); // Has chance for split-if optimization
- return true;
-@@ -1650,27 +1652,48 @@
- // Inline power instructions, if possible.
- bool LibraryCallKit::inline_pow() {
- // Pseudocode for pow
-- // if (x <= 0.0) {
-- // long longy = (long)y;
-- // if ((double)longy == y) { // if y is long
-- // if (y + 1 == y) longy = 0; // huge number: even
-- // result = ((1&longy) == 0)?-DPow(abs(x), y):DPow(abs(x), y);
-+ // if (y == 2) {
-+ // return x * x;
-+ // } else {
-+ // if (x <= 0.0) {
-+ // long longy = (long)y;
-+ // if ((double)longy == y) { // if y is long
-+ // if (y + 1 == y) longy = 0; // huge number: even
-+ // result = ((1&longy) == 0)?-DPow(abs(x), y):DPow(abs(x), y);
-+ // } else {
-+ // result = NaN;
-+ // }
- // } else {
-- // result = NaN;
-+ // result = DPow(x,y);
- // }
-- // } else {
-- // result = DPow(x,y);
-+ // if (result != result)? {
-+ // result = uncommon_trap() or runtime_call();
-+ // }
-+ // return result;
- // }
-- // if (result != result)? {
-- // result = uncommon_trap() or runtime_call();
-- // }
-- // return result;
-
- Node* x = round_double_node(argument(0));
- Node* y = round_double_node(argument(2));
-
- Node* result = NULL;
-
-+ Node* const_two_node = makecon(TypeD::make(2.0));
-+ Node* cmp_node = _gvn.transform(new (C) CmpDNode(y, const_two_node));
-+ Node* bool_node = _gvn.transform(new (C) BoolNode(cmp_node, BoolTest::eq));
-+ IfNode* if_node = create_and_xform_if(control(), bool_node, PROB_STATIC_INFREQUENT, COUNT_UNKNOWN);
-+ Node* if_true = _gvn.transform(new (C) IfTrueNode(if_node));
-+ Node* if_false = _gvn.transform(new (C) IfFalseNode(if_node));
-+
-+ RegionNode* region_node = new (C) RegionNode(3);
-+ region_node->init_req(1, if_true);
-+
-+ Node* phi_node = new (C) PhiNode(region_node, Type::DOUBLE);
-+ // special case for x^y where y == 2, we can convert it to x * x
-+ phi_node->init_req(1, _gvn.transform(new (C) MulDNode(x, x)));
-+
-+ // set control to if_false since we will now process the false branch
-+ set_control(if_false);
-+
- if (!too_many_traps(Deoptimization::Reason_intrinsic)) {
- // Short form: skip the fancy tests and just check for NaN result.
- result = _gvn.transform(new (C) PowDNode(C, control(), x, y));
-@@ -1794,7 +1817,15 @@
- result = _gvn.transform(phi);
- }
-
-- finish_pow_exp(result, x, y, OptoRuntime::Math_DD_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::dpow), "POW");
-+ result = finish_pow_exp(result, x, y, OptoRuntime::Math_DD_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::dpow), "POW");
-+
-+ // control from finish_pow_exp is now input to the region node
-+ region_node->set_req(2, control());
-+ // the result from finish_pow_exp is now input to the phi node
-+ phi_node->init_req(2, result);
-+ set_control(_gvn.transform(region_node));
-+ record_for_igvn(region_node);
-+ set_result(_gvn.transform(phi_node));
-
- C->set_has_split_ifs(true); // Has chance for split-if optimization
- return true;
---- ./hotspot/src/share/vm/opto/loopTransform.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/loopTransform.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -863,6 +863,20 @@
- return n;
- }
-
-+bool PhaseIdealLoop::cast_incr_before_loop(Node* incr, Node* ctrl, Node* loop) {
-+ Node* castii = new (C) CastIINode(incr, TypeInt::INT, true);
-+ castii->set_req(0, ctrl);
-+ register_new_node(castii, ctrl);
-+ for (DUIterator_Fast imax, i = incr->fast_outs(imax); i < imax; i++) {
-+ Node* n = incr->fast_out(i);
-+ if (n->is_Phi() && n->in(0) == loop) {
-+ int nrep = n->replace_edge(incr, castii);
-+ return true;
-+ }
-+ }
-+ return false;
-+}
-+
- //------------------------------insert_pre_post_loops--------------------------
- // Insert pre and post loops. If peel_only is set, the pre-loop can not have
- // more iterations added. It acts as a 'peel' only, no lower-bound RCE, no
-@@ -1060,6 +1074,24 @@
- }
- }
-
-+ // Nodes inside the loop may be control dependent on a predicate
-+ // that was moved before the preloop. If the back branch of the main
-+ // or post loops becomes dead, those nodes won't be dependent on the
-+ // test that guards that loop nest anymore which could lead to an
-+ // incorrect array access because it executes independently of the
-+ // test that was guarding the loop nest. We add a special CastII on
-+ // the if branch that enters the loop, between the input induction
-+ // variable value and the induction variable Phi to preserve correct
-+ // dependencies.
-+
-+ // CastII for the post loop:
-+ bool inserted = cast_incr_before_loop(zer_opaq->in(1), zer_taken, post_head);
-+ assert(inserted, "no castII inserted");
-+
-+ // CastII for the main loop:
-+ inserted = cast_incr_before_loop(pre_incr, min_taken, main_head);
-+ assert(inserted, "no castII inserted");
-+
- // Step B4: Shorten the pre-loop to run only 1 iteration (for now).
- // RCE and alignment may change this later.
- Node *cmp_end = pre_end->cmp_node();
---- ./hotspot/src/share/vm/opto/loopnode.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/loopnode.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -602,6 +602,8 @@
- return ctrl;
- }
-
-+ bool cast_incr_before_loop(Node* incr, Node* ctrl, Node* loop);
-+
- public:
- bool has_node( Node* n ) const { return _nodes[n->_idx] != NULL; }
- // check if transform created new nodes that need _ctrl recorded
---- ./hotspot/src/share/vm/opto/loopopts.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/loopopts.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -234,8 +234,13 @@
- // for lower and upper bounds.
- ProjNode* unc_proj = iff->as_If()->proj_out(1 - dp->as_Proj()->_con)->as_Proj();
- if (exclude_loop_predicate &&
-- is_uncommon_trap_proj(unc_proj, Deoptimization::Reason_predicate))
-+ (is_uncommon_trap_proj(unc_proj, Deoptimization::Reason_predicate) ||
-+ is_uncommon_trap_proj(unc_proj, Deoptimization::Reason_range_check))) {
-+ // If this is a range check (IfNode::is_range_check), do not
-+ // reorder because Compile::allow_range_check_smearing might have
-+ // changed the check.
- return; // Let IGVN transformation change control dependence.
-+ }
-
- IdealLoopTree *old_loop = get_loop(dp);
-
-@@ -888,23 +893,23 @@
- int n_op = n->Opcode();
-
- // Check for an IF being dominated by another IF same test
-- if( n_op == Op_If ) {
-+ if (n_op == Op_If) {
- Node *bol = n->in(1);
- uint max = bol->outcnt();
- // Check for same test used more than once?
-- if( n_op == Op_If && max > 1 && bol->is_Bool() ) {
-+ if (max > 1 && bol->is_Bool()) {
- // Search up IDOMs to see if this IF is dominated.
- Node *cutoff = get_ctrl(bol);
-
- // Now search up IDOMs till cutoff, looking for a dominating test
- Node *prevdom = n;
- Node *dom = idom(prevdom);
-- while( dom != cutoff ) {
-- if( dom->req() > 1 && dom->in(1) == bol && prevdom->in(0) == dom ) {
-+ while (dom != cutoff) {
-+ if (dom->req() > 1 && dom->in(1) == bol && prevdom->in(0) == dom) {
- // Replace the dominated test with an obvious true or false.
- // Place it on the IGVN worklist for later cleanup.
- C->set_major_progress();
-- dominated_by( prevdom, n, false, true );
-+ dominated_by(prevdom, n, false, true);
- #ifndef PRODUCT
- if( VerifyLoopOptimizations ) verify();
- #endif
-@@ -1393,7 +1398,8 @@
- // loop. Happens if people set a loop-exit flag; then test the flag
- // in the loop to break the loop, then test is again outside of the
- // loop to determine which way the loop exited.
-- if( use->is_If() || use->is_CMove() ) {
-+ // Loop predicate If node connects to Bool node through Opaque1 node.
-+ if (use->is_If() || use->is_CMove() || C->is_predicate_opaq(use)) {
- // Since this code is highly unlikely, we lazily build the worklist
- // of such Nodes to go split.
- if( !split_if_set )
-@@ -2754,11 +2760,11 @@
- // Hit! Refactor use to use the post-incremented tripcounter.
- // Compute a post-increment tripcounter.
- Node *opaq = new (C) Opaque2Node( C, cle->incr() );
-- register_new_node( opaq, u_ctrl );
-+ register_new_node(opaq, exit);
- Node *neg_stride = _igvn.intcon(-cle->stride_con());
- set_ctrl(neg_stride, C->root());
- Node *post = new (C) AddINode( opaq, neg_stride);
-- register_new_node( post, u_ctrl );
-+ register_new_node(post, exit);
- _igvn.rehash_node_delayed(use);
- for (uint j = 1; j < use->req(); j++) {
- if (use->in(j) == phi)
---- ./hotspot/src/share/vm/opto/parse.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/parse.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -528,8 +528,9 @@
-
- float dynamic_branch_prediction(float &cnt);
- float branch_prediction(float &cnt, BoolTest::mask btest, int target_bci);
-- bool seems_never_taken(float prob);
-- bool seems_stable_comparison(BoolTest::mask btest, Node* c);
-+ bool seems_never_taken(float prob) const;
-+ bool path_is_suitable_for_uncommon_trap(float prob) const;
-+ bool seems_stable_comparison() const;
-
- void do_ifnull(BoolTest::mask btest, Node* c);
- void do_if(BoolTest::mask btest, Node* c);
---- ./hotspot/src/share/vm/opto/parse2.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/parse2.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -884,7 +884,7 @@
- // some branches (e.g., _213_javac.Assembler.eliminate) validly produce
- // very small but nonzero probabilities, which if confused with zero
- // counts would keep the program recompiling indefinitely.
--bool Parse::seems_never_taken(float prob) {
-+bool Parse::seems_never_taken(float prob) const {
- return prob < PROB_MIN;
- }
-
-@@ -895,53 +895,12 @@
- // if a path is never taken, its controlling comparison is
- // already acting in a stable fashion. If the comparison
- // seems stable, we will put an expensive uncommon trap
--// on the untaken path. To be conservative, and to allow
--// partially executed counted loops to be compiled fully,
--// we will plant uncommon traps only after pointer comparisons.
--bool Parse::seems_stable_comparison(BoolTest::mask btest, Node* cmp) {
-- for (int depth = 4; depth > 0; depth--) {
-- // The following switch can find CmpP here over half the time for
-- // dynamic language code rich with type tests.
-- // Code using counted loops or array manipulations (typical
-- // of benchmarks) will have many (>80%) CmpI instructions.
-- switch (cmp->Opcode()) {
-- case Op_CmpP:
-- // A never-taken null check looks like CmpP/BoolTest::eq.
-- // These certainly should be closed off as uncommon traps.
-- if (btest == BoolTest::eq)
-- return true;
-- // A never-failed type check looks like CmpP/BoolTest::ne.
-- // Let's put traps on those, too, so that we don't have to compile
-- // unused paths with indeterminate dynamic type information.
-- if (ProfileDynamicTypes)
-- return true;
-- return false;
--
-- case Op_CmpI:
-- // A small minority (< 10%) of CmpP are masked as CmpI,
-- // as if by boolean conversion ((p == q? 1: 0) != 0).
-- // Detect that here, even if it hasn't optimized away yet.
-- // Specifically, this covers the 'instanceof' operator.
-- if (btest == BoolTest::ne || btest == BoolTest::eq) {
-- if (_gvn.type(cmp->in(2))->singleton() &&
-- cmp->in(1)->is_Phi()) {
-- PhiNode* phi = cmp->in(1)->as_Phi();
-- int true_path = phi->is_diamond_phi();
-- if (true_path > 0 &&
-- _gvn.type(phi->in(1))->singleton() &&
-- _gvn.type(phi->in(2))->singleton()) {
-- // phi->region->if_proj->ifnode->bool->cmp
-- BoolNode* bol = phi->in(0)->in(1)->in(0)->in(1)->as_Bool();
-- btest = bol->_test._test;
-- cmp = bol->in(1);
-- continue;
-- }
-- }
-- }
-- return false;
-- }
-+// on the untaken path.
-+bool Parse::seems_stable_comparison() const {
-+ if (C->too_many_traps(method(), bci(), Deoptimization::Reason_unstable_if)) {
-+ return false;
- }
-- return false;
-+ return true;
- }
-
- //-------------------------------repush_if_args--------------------------------
-@@ -1166,6 +1125,14 @@
- }
- }
-
-+bool Parse::path_is_suitable_for_uncommon_trap(float prob) const {
-+ // Don't want to speculate on uncommon traps when running with -Xcomp
-+ if (!UseInterpreter) {
-+ return false;
-+ }
-+ return (seems_never_taken(prob) && seems_stable_comparison());
-+}
-+
- //----------------------------adjust_map_after_if------------------------------
- // Adjust the JVM state to reflect the result of taking this path.
- // Basically, it means inspecting the CmpNode controlling this
-@@ -1179,33 +1146,9 @@
-
- bool is_fallthrough = (path == successor_for_bci(iter().next_bci()));
-
-- if (seems_never_taken(prob) && seems_stable_comparison(btest, c)) {
-- // If this might possibly turn into an implicit null check,
-- // and the null has never yet been seen, we need to generate
-- // an uncommon trap, so as to recompile instead of suffering
-- // with very slow branches. (We'll get the slow branches if
-- // the program ever changes phase and starts seeing nulls here.)
-- //
-- // We do not inspect for a null constant, since a node may
-- // optimize to 'null' later on.
-- //
-- // Null checks, and other tests which expect inequality,
-- // show btest == BoolTest::eq along the non-taken branch.
-- // On the other hand, type tests, must-be-null tests,
-- // and other tests which expect pointer equality,
-- // show btest == BoolTest::ne along the non-taken branch.
-- // We prune both types of branches if they look unused.
-+ if (path_is_suitable_for_uncommon_trap(prob)) {
- repush_if_args();
-- // We need to mark this branch as taken so that if we recompile we will
-- // see that it is possible. In the tiered system the interpreter doesn't
-- // do profiling and by the time we get to the lower tier from the interpreter
-- // the path may be cold again. Make sure it doesn't look untaken
-- if (is_fallthrough) {
-- profile_not_taken_branch(!ProfileInterpreter);
-- } else {
-- profile_taken_branch(iter().get_dest(), !ProfileInterpreter);
-- }
-- uncommon_trap(Deoptimization::Reason_unreached,
-+ uncommon_trap(Deoptimization::Reason_unstable_if,
- Deoptimization::Action_reinterpret,
- NULL,
- (is_fallthrough ? "taken always" : "taken never"));
---- ./hotspot/src/share/vm/opto/phaseX.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/phaseX.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1323,15 +1323,27 @@
- }
- }
-
-- if( use->is_Cmp() ) { // Enable CMP/BOOL optimization
-+ uint use_op = use->Opcode();
-+ if(use->is_Cmp()) { // Enable CMP/BOOL optimization
- add_users_to_worklist(use); // Put Bool on worklist
-- // Look for the 'is_x2logic' pattern: "x ? : 0 : 1" and put the
-- // phi merging either 0 or 1 onto the worklist
- if (use->outcnt() > 0) {
- Node* bol = use->raw_out(0);
- if (bol->outcnt() > 0) {
- Node* iff = bol->raw_out(0);
-- if (iff->outcnt() == 2) {
-+ if (use_op == Op_CmpI &&
-+ iff->is_CountedLoopEnd()) {
-+ CountedLoopEndNode* cle = iff->as_CountedLoopEnd();
-+ if (cle->limit() == n && cle->phi() != NULL) {
-+ // If an opaque node feeds into the limit condition of a
-+ // CountedLoop, we need to process the Phi node for the
-+ // induction variable when the opaque node is removed:
-+ // the range of values taken by the Phi is now known and
-+ // so its type is also known.
-+ _worklist.push(cle->phi());
-+ }
-+ } else if (iff->outcnt() == 2) {
-+ // Look for the 'is_x2logic' pattern: "x ? : 0 : 1" and put the
-+ // phi merging either 0 or 1 onto the worklist
- Node* ifproj0 = iff->raw_out(0);
- Node* ifproj1 = iff->raw_out(1);
- if (ifproj0->outcnt() > 0 && ifproj1->outcnt() > 0) {
-@@ -1343,9 +1355,26 @@
- }
- }
- }
-+ if (use_op == Op_CmpI) {
-+ Node* in1 = use->in(1);
-+ for (uint i = 0; i < in1->outcnt(); i++) {
-+ if (in1->raw_out(i)->Opcode() == Op_CastII) {
-+ Node* castii = in1->raw_out(i);
-+ if (castii->in(0) != NULL && castii->in(0)->in(0) != NULL && castii->in(0)->in(0)->is_If()) {
-+ Node* ifnode = castii->in(0)->in(0);
-+ if (ifnode->in(1) != NULL && ifnode->in(1)->is_Bool() && ifnode->in(1)->in(1) == use) {
-+ // Reprocess a CastII node that may depend on an
-+ // opaque node value when the opaque node is
-+ // removed. In case it carries a dependency we can do
-+ // a better job of computing its type.
-+ _worklist.push(castii);
-+ }
-+ }
-+ }
-+ }
-+ }
- }
-
-- uint use_op = use->Opcode();
- // If changed Cast input, check Phi users for simple cycles
- if( use->is_ConstraintCast() || use->is_CheckCastPP() ) {
- for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
---- ./hotspot/src/share/vm/opto/subnode.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/subnode.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1066,12 +1066,10 @@
-
- //------------------------------dump_spec-------------------------------------
- // Print special per-node info
--#ifndef PRODUCT
- void BoolTest::dump_on(outputStream *st) const {
- const char *msg[] = {"eq","gt","??","lt","ne","le","??","ge"};
- st->print(msg[_test]);
- }
--#endif
-
- //=============================================================================
- uint BoolNode::hash() const { return (Node::hash() << 3)|(_test._test+1); }
---- ./hotspot/src/share/vm/opto/subnode.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/opto/subnode.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -273,9 +273,7 @@
- mask commute( ) const { return mask("038147858"[_test]-'0'); }
- mask negate( ) const { return mask(_test^4); }
- bool is_canonical( ) const { return (_test == BoolTest::ne || _test == BoolTest::lt || _test == BoolTest::le); }
--#ifndef PRODUCT
- void dump_on(outputStream *st) const;
--#endif
- };
-
- //------------------------------BoolNode---------------------------------------
---- ./hotspot/src/share/vm/prims/jvm.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/prims/jvm.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -597,12 +597,12 @@
-
- // Make shallow object copy
- const int size = obj->size();
-- oop new_obj = NULL;
-+ oop new_obj_oop = NULL;
- if (obj->is_javaArray()) {
- const int length = ((arrayOop)obj())->length();
-- new_obj = CollectedHeap::array_allocate(klass, size, length, CHECK_NULL);
-+ new_obj_oop = CollectedHeap::array_allocate(klass, size, length, CHECK_NULL);
- } else {
-- new_obj = CollectedHeap::obj_allocate(klass, size, CHECK_NULL);
-+ new_obj_oop = CollectedHeap::obj_allocate(klass, size, CHECK_NULL);
- }
- // 4839641 (4840070): We must do an oop-atomic copy, because if another thread
- // is modifying a reference field in the clonee, a non-oop-atomic copy might
-@@ -614,24 +614,39 @@
- // The same is true of StubRoutines::object_copy and the various oop_copy
- // variants, and of the code generated by the inline_native_clone intrinsic.
- assert(MinObjAlignmentInBytes >= BytesPerLong, "objects misaligned");
-- Copy::conjoint_jlongs_atomic((jlong*)obj(), (jlong*)new_obj,
-+ Copy::conjoint_jlongs_atomic((jlong*)obj(), (jlong*)new_obj_oop,
- (size_t)align_object_size(size) / HeapWordsPerLong);
- // Clear the header
-- new_obj->init_mark();
-+ new_obj_oop->init_mark();
-
- // Store check (mark entire object and let gc sort it out)
- BarrierSet* bs = Universe::heap()->barrier_set();
- assert(bs->has_write_region_opt(), "Barrier set does not have write_region");
-- bs->write_region(MemRegion((HeapWord*)new_obj, size));
-+ bs->write_region(MemRegion((HeapWord*)new_obj_oop, size));
-+
-+ Handle new_obj(THREAD, new_obj_oop);
-+ // Special handling for MemberNames. Since they contain Method* metadata, they
-+ // must be registered so that RedefineClasses can fix metadata contained in them.
-+ if (java_lang_invoke_MemberName::is_instance(new_obj()) &&
-+ java_lang_invoke_MemberName::is_method(new_obj())) {
-+ methodOop method = (methodOop)java_lang_invoke_MemberName::vmtarget(new_obj());
-+ // MemberName may be unresolved, so doesn't need registration until resolved.
-+ if (method != NULL) {
-+ // add_member_name() can safepoint: use Handle for method and new_obj:
-+ methodHandle m(THREAD, method);
-+ instanceKlass::cast(m->method_holder())->add_member_name(new_obj);
-+ }
-+ }
-
- // Caution: this involves a java upcall, so the clone should be
- // "gc-robust" by this stage.
- if (klass->has_finalizer()) {
- assert(obj->is_instance(), "should be instanceOop");
-- new_obj = instanceKlass::register_finalizer(instanceOop(new_obj), CHECK_NULL);
-+ new_obj_oop = instanceKlass::register_finalizer(instanceOop(new_obj()), CHECK_NULL);
-+ new_obj = Handle(THREAD, new_obj_oop);
- }
-
-- return JNIHandles::make_local(env, oop(new_obj));
-+ return JNIHandles::make_local(env, new_obj());
- JVM_END
-
- // java.lang.Compiler ////////////////////////////////////////////////////
-@@ -4611,7 +4626,7 @@
-
- JVM_ENTRY(void, JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size))
- {
-- memset(info, 0, sizeof(info_size));
-+ memset(info, 0, info_size);
-
- info->jvm_version = Abstract_VM_Version::jvm_version();
- info->update_version = 0; /* 0 in HotSpot Express VM */
---- ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -68,11 +68,11 @@
-
- ~JvmtiConstantPoolReconstituter() {
- if (_symmap != NULL) {
-- os::free(_symmap, mtClass);
-+ delete _symmap;
- _symmap = NULL;
- }
- if (_classmap != NULL) {
-- os::free(_classmap, mtClass);
-+ delete _classmap;
- _classmap = NULL;
- }
- }
---- ./hotspot/src/share/vm/prims/methodHandles.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/prims/methodHandles.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -29,6 +29,7 @@
- #include "interpreter/oopMapCache.hpp"
- #include "memory/allocation.inline.hpp"
- #include "memory/oopFactory.hpp"
-+#include "oops/methodOop.hpp"
- #include "prims/jvmtiRedefineClassesTrace.hpp"
- #include "prims/methodHandles.hpp"
- #include "runtime/compilationPolicy.hpp"
-@@ -252,9 +253,13 @@
- // 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.
-- instanceKlass::cast(m->method_holder())->add_member_name(m->method_idnum(), mname);
-
-- return mname();
-+ if (instanceKlass::cast(m->method_holder())->add_member_name(mname)) {
-+ return mname();
-+ } else {
-+ // Redefinition caused this to fail. Return NULL (and an exception?)
-+ return NULL;
-+ }
- }
-
- Handle MethodHandles::init_method_MemberName(Handle mname, CallInfo& info, TRAPS) {
-@@ -993,62 +998,27 @@
- }
- }
-
--void MemberNameTable::add_member_name(int index, jweak mem_name_wref) {
-+void MemberNameTable::add_member_name(jweak mem_name_wref) {
- assert_locked_or_safepoint(MemberNameTable_lock);
-- this->at_put_grow(index, mem_name_wref);
-+ this->push(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
-+// It is called at safepoint only for RedefineClasses
- 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 each redefined method
- 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()));
-- }
-+ // search the MemberNameTable for uses of either obsolete or EMCP methods
-+ for (int idx = 0; idx < length(); idx++) {
-+ oop mem_name = JNIHandles::resolve(this->at(idx));
-+ if (mem_name != NULL) {
-+ java_lang_invoke_MemberName::adjust_vmtarget(mem_name, old_method, new_method,
-+ trace_name_printed);
-+ }
- }
- }
- }
---- ./hotspot/src/share/vm/prims/methodHandles.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/prims/methodHandles.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -238,8 +238,7 @@
- MemberNameTable(int methods_cnt);
- ~MemberNameTable();
-
-- void add_member_name(int index, jweak mem_name_ref);
-- oop get_member_name(int index);
-+ void add_member_name(jweak mem_name_ref);
-
- public:
- // RedefineClasses() API support:
-@@ -247,8 +246,6 @@
- // 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 Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/prims/whitebox.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -133,6 +133,10 @@
- return MemTracker::wbtest_wait_for_data_merge();
- WB_END
-
-+WB_ENTRY(jboolean, WB_NMTIsDetailSupported(JNIEnv* env))
-+ return MemTracker::tracking_level() == MemTracker::NMT_detail;
-+WB_END
-+
- WB_ENTRY(void, WB_DeoptimizeAll(JNIEnv* env, jobject o))
- MutexLockerEx mu(Compile_lock);
- CodeCache::mark_all_nmethods_for_deoptimization();
-@@ -213,6 +217,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"NMTIsDetailSupported",CC"()Z", (void*)&WB_NMTIsDetailSupported},
- {CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
- };
-
---- ./hotspot/src/share/vm/runtime/arguments.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/arguments.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -266,6 +266,7 @@
- { "Tier1MaxInlineSize", JDK_Version::jdk_update(7,40), JDK_Version::jdk(8) },
- { "Tier1LoopOptsCount", JDK_Version::jdk_update(7,40), JDK_Version::jdk(8) },
- { "UseSpinning", JDK_Version::jdk_update(7,40), JDK_Version::jdk(8) },
-+ { "CompilationRepeat", JDK_Version::jdk_update(7,80), JDK_Version::jdk(9) },
- #ifdef PRODUCT
- { "DesiredMethodLimit",
- JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
-@@ -2064,7 +2065,7 @@
- "G1ConcMarkStepDurationMillis");
- status = status && verify_interval(G1ConcRSHotCardLimit, 0, max_jubyte,
- "G1ConcRSHotCardLimit");
-- status = status && verify_interval(G1ConcRSLogCacheSize, 0, 31,
-+ status = status && verify_interval(G1ConcRSLogCacheSize, 0, 27,
- "G1ConcRSLogCacheSize");
- }
- #endif
-@@ -2080,19 +2081,9 @@
- 1, 100, "TLABWasteTargetPercent");
-
- status = status && verify_object_alignment();
--
--#ifdef SPARC
-- if (UseConcMarkSweepGC || UseG1GC) {
-- // Issue a stern warning if the user has explicitly set
-- // UseMemSetInBOT (it is known to cause issues), but allow
-- // use for experimentation and debugging.
-- if (VM_Version::is_sun4v() && UseMemSetInBOT) {
-- assert(!FLAG_IS_DEFAULT(UseMemSetInBOT), "Error");
-- warning("Experimental flag -XX:+UseMemSetInBOT is known to cause instability"
-- " on sun4v; please understand that you are using at your own risk!");
-- }
-- }
--#endif // SPARC
-+#ifdef COMPILER1
-+ status = status && verify_min_value(ValueMapInitialSize, 1, "ValueMapInitialSize");
-+#endif
-
- // check native memory tracking flags
- if (PrintNMTStatistics && MemTracker::tracking_level() == MemTracker::NMT_off) {
-@@ -2495,6 +2486,23 @@
- #endif
- // -D
- } else if (match_option(option, "-D", &tail)) {
-+ if (CheckEndorsedAndExtDirs) {
-+ if (match_option(option, "-Djava.endorsed.dirs=", &tail)) {
-+ // abort if -Djava.endorsed.dirs is set
-+ jio_fprintf(defaultStream::output_stream(),
-+ "-Djava.endorsed.dirs will not be supported in a future release.\n"
-+ "Refer to JEP 220 for details (http://openjdk.java.net/jeps/220).\n");
-+ return JNI_EINVAL;
-+ }
-+ if (match_option(option, "-Djava.ext.dirs=", &tail)) {
-+ // abort if -Djava.ext.dirs is set
-+ jio_fprintf(defaultStream::output_stream(),
-+ "-Djava.ext.dirs will not be supported in a future release.\n"
-+ "Refer to JEP 220 for details (http://openjdk.java.net/jeps/220).\n");
-+ return JNI_EINVAL;
-+ }
-+ }
-+
- if (!add_property(tail)) {
- return JNI_ENOMEM;
- }
-@@ -2884,6 +2892,146 @@
- return JNI_OK;
- }
-
-+static bool has_jar_files(const char* directory) {
-+ DIR* dir = os::opendir(directory);
-+ if (dir == NULL) return false;
-+
-+ struct dirent *entry;
-+ char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(directory), mtInternal);
-+ bool hasJarFile = false;
-+ while (!hasJarFile && (entry = os::readdir(dir, (dirent *) dbuf)) != NULL) {
-+ const char* name = entry->d_name;
-+ const char* ext = name + strlen(name) - 4;
-+ hasJarFile = ext > name && (os::file_name_strcmp(ext, ".jar") == 0);
-+ }
-+ FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
-+ os::closedir(dir);
-+ return hasJarFile ;
-+}
-+
-+// returns the number of directories in the given path containing JAR files
-+// If the skip argument is not NULL, it will skip that directory
-+static int check_non_empty_dirs(const char* path, const char* type, const char* skip) {
-+ const char separator = *os::path_separator();
-+ const char* const end = path + strlen(path);
-+ int nonEmptyDirs = 0;
-+ while (path < end) {
-+ const char* tmp_end = strchr(path, separator);
-+ if (tmp_end == NULL) {
-+ if ((skip == NULL || strcmp(path, skip) != 0) && has_jar_files(path)) {
-+ nonEmptyDirs++;
-+ jio_fprintf(defaultStream::output_stream(),
-+ "Non-empty %s directory: %s\n", type, path);
-+ }
-+ path = end;
-+ } else {
-+ char* dirpath = NEW_C_HEAP_ARRAY(char, tmp_end - path + 1, mtInternal);
-+ memcpy(dirpath, path, tmp_end - path);
-+ dirpath[tmp_end - path] = '\0';
-+ if ((skip == NULL || strcmp(dirpath, skip) != 0) && has_jar_files(dirpath)) {
-+ nonEmptyDirs++;
-+ jio_fprintf(defaultStream::output_stream(),
-+ "Non-empty %s directory: %s\n", type, dirpath);
-+ }
-+ FREE_C_HEAP_ARRAY(char, dirpath, mtInternal);
-+ path = tmp_end + 1;
-+ }
-+ }
-+ return nonEmptyDirs;
-+}
-+
-+// Returns true if endorsed standards override mechanism and extension mechanism
-+// are not used.
-+static bool check_endorsed_and_ext_dirs() {
-+ if (!CheckEndorsedAndExtDirs)
-+ return true;
-+
-+ char endorsedDir[JVM_MAXPATHLEN];
-+ char extDir[JVM_MAXPATHLEN];
-+ const char* fileSep = os::file_separator();
-+ jio_snprintf(endorsedDir, sizeof(endorsedDir), "%s%slib%sendorsed",
-+ Arguments::get_java_home(), fileSep, fileSep);
-+ jio_snprintf(extDir, sizeof(extDir), "%s%slib%sext",
-+ Arguments::get_java_home(), fileSep, fileSep);
-+
-+ // check endorsed directory
-+ int nonEmptyDirs = check_non_empty_dirs(Arguments::get_endorsed_dir(), "endorsed", NULL);
-+
-+ // check the extension directories but skip the default lib/ext directory
-+ nonEmptyDirs += check_non_empty_dirs(Arguments::get_ext_dirs(), "extension", extDir);
-+
-+ // List of JAR files installed in the default lib/ext directory.
-+ // -XX:+CheckEndorsedAndExtDirs checks if any non-JDK file installed
-+ static const char* jdk_ext_jars[] = {
-+ "access-bridge-32.jar",
-+ "access-bridge-64.jar",
-+ "access-bridge.jar",
-+ "cldrdata.jar",
-+ "dnsns.jar",
-+ "jaccess.jar",
-+ "jfxrt.jar",
-+ "localedata.jar",
-+ "nashorn.jar",
-+ "sunec.jar",
-+ "sunjce_provider.jar",
-+ "sunmscapi.jar",
-+ "sunpkcs11.jar",
-+ "ucrypto.jar",
-+ "zipfs.jar",
-+ NULL
-+ };
-+
-+ // check if the default lib/ext directory has any non-JDK jar files; if so, error
-+ DIR* dir = os::opendir(extDir);
-+ if (dir != NULL) {
-+ int num_ext_jars = 0;
-+ struct dirent *entry;
-+ char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(extDir), mtInternal);
-+ while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL) {
-+ const char* name = entry->d_name;
-+ const char* ext = name + strlen(name) - 4;
-+ if (ext > name && (os::file_name_strcmp(ext, ".jar") == 0)) {
-+ bool is_jdk_jar = false;
-+ const char* jarfile = NULL;
-+ for (int i=0; (jarfile = jdk_ext_jars[i]) != NULL; i++) {
-+ if (os::file_name_strcmp(name, jarfile) == 0) {
-+ is_jdk_jar = true;
-+ break;
-+ }
-+ }
-+ if (!is_jdk_jar) {
-+ jio_fprintf(defaultStream::output_stream(),
-+ "%s installed in <JAVA_HOME>/lib/ext\n", name);
-+ num_ext_jars++;
-+ }
-+ }
-+ }
-+ FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
-+ os::closedir(dir);
-+ if (num_ext_jars > 0) {
-+ nonEmptyDirs += 1;
-+ }
-+ }
-+
-+ // check if the default lib/endorsed directory exists; if so, error
-+ dir = os::opendir(endorsedDir);
-+ if (dir != NULL) {
-+ jio_fprintf(defaultStream::output_stream(), "<JAVA_HOME>/lib/endorsed exists\n");
-+ os::closedir(dir);
-+ nonEmptyDirs += 1;
-+ }
-+
-+ if (nonEmptyDirs > 0) {
-+ jio_fprintf(defaultStream::output_stream(),
-+ "Endorsed standards override mechanism and extension mechanism "
-+ "will not be supported in a future release.\n"
-+ "Refer to JEP 220 for details (http://openjdk.java.net/jeps/220).\n");
-+ return false;
-+ }
-+
-+ return true;
-+}
-+
- jint Arguments::finalize_vm_init_args(SysClassPath* scp_p, bool scp_assembly_required) {
- // This must be done after all -D arguments have been processed.
- scp_p->expand_endorsed();
-@@ -2893,6 +3041,10 @@
- Arguments::set_sysclasspath(scp_p->combined_path());
- }
-
-+ if (!check_endorsed_and_ext_dirs()) {
-+ return JNI_ERR;
-+ }
-+
- // This must be done after all arguments have been processed.
- // java_compiler() true means set to "NONE" or empty.
- if (java_compiler() && !xdebug_mode()) {
---- ./hotspot/src/share/vm/runtime/arguments.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/arguments.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -543,6 +543,7 @@
- static char *get_sysclasspath() { return _sun_boot_class_path->value(); }
- static char* get_meta_index_path() { return _meta_index_path; }
- static char* get_meta_index_dir() { return _meta_index_dir; }
-+ static char* get_ext_dirs() { return _java_ext_dirs->value(); }
-
- // Operation modi
- static Mode mode() { return _mode; }
---- ./hotspot/src/share/vm/runtime/deoptimization.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/deoptimization.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1796,7 +1796,8 @@
- "div0_check",
- "age",
- "predicate",
-- "loop_limit_check"
-+ "loop_limit_check",
-+ "unstable_if"
- };
- const char* Deoptimization::_trap_action_name[Action_LIMIT] = {
- // Note: Keep this in sync. with enum DeoptAction.
---- ./hotspot/src/share/vm/runtime/deoptimization.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/deoptimization.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -59,6 +59,7 @@
- Reason_age, // nmethod too old; tier threshold reached
- Reason_predicate, // compiler generated predicate failed
- Reason_loop_limit_check, // compiler generated loop limits check failed
-+ Reason_unstable_if, // a branch predicted always false was taken
- Reason_LIMIT,
- // Note: Keep this enum in sync. with _trap_reason_name.
- Reason_RECORDED_LIMIT = Reason_bimorphic // some are not recorded per bc
-@@ -311,6 +312,8 @@
- return reason;
- else if (reason == Reason_div0_check) // null check due to divide-by-zero?
- return Reason_null_check; // recorded per BCI as a null check
-+ else if (reason == Reason_unstable_if)
-+ return Reason_intrinsic;
- else
- return Reason_none;
- }
---- ./hotspot/src/share/vm/runtime/globals.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/globals.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -1154,6 +1154,9 @@
- product(bool, CheckJNICalls, false, \
- "Verify all arguments to JNI calls") \
- \
-+ product(bool, CheckEndorsedAndExtDirs, false, \
-+ "Verify the endorsed and extension directories are not used") \
-+ \
- product(bool, UseFastJNIAccessors, true, \
- "Use optimized versions of Get<Primitive>Field") \
- \
-@@ -2866,6 +2869,9 @@
- product(intx, MaxRecursiveInlineLevel, 1, \
- "maximum number of nested recursive calls that are inlined") \
- \
-+ develop(intx, MaxForceInlineLevel, 100, \
-+ "maximum number of nested @ForceInline calls that are inlined") \
-+ \
- product_pd(intx, InlineSmallCode, \
- "Only inline already compiled methods if their code size is " \
- "less than this") \
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -421,6 +421,15 @@
- jt->java_suspend_self();
- }
- Self->set_current_pending_monitor(NULL);
-+
-+ // We cleared the pending monitor info since we've just gotten past
-+ // the enter-check-for-suspend dance and we now own the monitor free
-+ // and clear, i.e., it is no longer pending. The ThreadBlockInVM
-+ // destructor can go to a safepoint at the end of this block. If we
-+ // do a thread dump during that safepoint, then this thread will show
-+ // as having "-locked" the monitor, but the OS and java.lang.Thread
-+ // states will still report that the thread is blocked trying to
-+ // acquire it.
- }
-
- Atomic::dec_ptr(&_count);
-@@ -1603,6 +1612,25 @@
- // post monitor waited event. Note that this is past-tense, we are done waiting.
- if (JvmtiExport::should_post_monitor_waited()) {
- JvmtiExport::post_monitor_waited(jt, this, ret == OS_TIMEOUT);
-+
-+ 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();
-+ }
- }
-
- // Without the fix for 8028280, it is possible for the above call:
---- ./hotspot/src/share/vm/runtime/os.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/os.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -420,7 +420,10 @@
- static intx current_thread_id();
- static int current_process_id();
- static int sleep(Thread* thread, jlong ms, bool interruptable);
-- static int naked_sleep();
-+ // Short standalone OS sleep suitable for slow path spin loop.
-+ // Ignores Thread.interrupt() (so keep it short).
-+ // ms = 0, will sleep for the least amount of time allowed by the OS.
-+ static void naked_short_sleep(jlong ms);
- static void infinite_sleep(); // never returns, use with CAUTION
- static void yield(); // Yields to all threads with same priority
- enum YieldResult {
---- ./hotspot/src/share/vm/runtime/park.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/park.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -59,58 +59,22 @@
-
- // Start by trying to recycle an existing but unassociated
- // ParkEvent from the global free list.
-- for (;;) {
-- ev = FreeList ;
-- if (ev == NULL) break ;
-- // 1: Detach - sequester or privatize the list
-- // Tantamount to ev = Swap (&FreeList, NULL)
-- if (Atomic::cmpxchg_ptr (NULL, &FreeList, ev) != ev) {
-- continue ;
-+ // Using a spin lock since we are part of the mutex impl.
-+ // 8028280: using concurrent free list without memory management can leak
-+ // pretty badly it turns out.
-+ Thread::SpinAcquire(&ListLock, "ParkEventFreeListAllocate");
-+ {
-+ ev = FreeList;
-+ if (ev != NULL) {
-+ FreeList = ev->FreeNext;
- }
--
-- // We've detached the list. The list in-hand is now
-- // local to this thread. This thread can operate on the
-- // list without risk of interference from other threads.
-- // 2: Extract -- pop the 1st element from the list.
-- ParkEvent * List = ev->FreeNext ;
-- if (List == NULL) break ;
-- for (;;) {
-- // 3: Try to reattach the residual list
-- guarantee (List != NULL, "invariant") ;
-- ParkEvent * Arv = (ParkEvent *) Atomic::cmpxchg_ptr (List, &FreeList, NULL) ;
-- if (Arv == NULL) break ;
--
-- // New nodes arrived. Try to detach the recent arrivals.
-- if (Atomic::cmpxchg_ptr (NULL, &FreeList, Arv) != Arv) {
-- continue ;
-- }
-- guarantee (Arv != NULL, "invariant") ;
-- // 4: Merge Arv into List
-- ParkEvent * Tail = List ;
-- while (Tail->FreeNext != NULL) Tail = Tail->FreeNext ;
-- Tail->FreeNext = Arv ;
-- }
-- break ;
- }
-+ Thread::SpinRelease(&ListLock);
-
- if (ev != NULL) {
- guarantee (ev->AssociatedWith == NULL, "invariant") ;
- } else {
- // Do this the hard way -- materialize a new ParkEvent.
-- // In rare cases an allocating thread might detach a long list --
-- // installing null into FreeList -- and then stall or be obstructed.
-- // A 2nd thread calling Allocate() would see FreeList == null.
-- // The list held privately by the 1st thread is unavailable to the 2nd thread.
-- // In that case the 2nd thread would have to materialize a new ParkEvent,
-- // even though free ParkEvents existed in the system. In this case we end up
-- // with more ParkEvents in circulation than we need, but the race is
-- // rare and the outcome is benign. Ideally, the # of extant ParkEvents
-- // is equal to the maximum # of threads that existed at any one time.
-- // Because of the race mentioned above, segments of the freelist
-- // can be transiently inaccessible. At worst we may end up with the
-- // # of ParkEvents in circulation slightly above the ideal.
-- // Note that if we didn't have the TSM/immortal constraint, then
-- // when reattaching, above, we could trim the list.
- ev = new ParkEvent () ;
- guarantee ((intptr_t(ev) & 0xFF) == 0, "invariant") ;
- }
-@@ -124,13 +88,14 @@
- if (ev == NULL) return ;
- guarantee (ev->FreeNext == NULL , "invariant") ;
- ev->AssociatedWith = NULL ;
-- for (;;) {
-- // Push ev onto FreeList
-- // The mechanism is "half" lock-free.
-- ParkEvent * List = FreeList ;
-- ev->FreeNext = List ;
-- if (Atomic::cmpxchg_ptr (ev, &FreeList, List) == List) break ;
-+ // Note that if we didn't have the TSM/immortal constraint, then
-+ // when reattaching we could trim the list.
-+ Thread::SpinAcquire(&ListLock, "ParkEventFreeListRelease");
-+ {
-+ ev->FreeNext = FreeList;
-+ FreeList = ev;
- }
-+ Thread::SpinRelease(&ListLock);
- }
-
- // Override operator new and delete so we can ensure that the
-@@ -164,56 +129,21 @@
-
- // Start by trying to recycle an existing but unassociated
- // Parker from the global free list.
-- for (;;) {
-- p = FreeList ;
-- if (p == NULL) break ;
-- // 1: Detach
-- // Tantamount to p = Swap (&FreeList, NULL)
-- if (Atomic::cmpxchg_ptr (NULL, &FreeList, p) != p) {
-- continue ;
-+ // 8028280: using concurrent free list without memory management can leak
-+ // pretty badly it turns out.
-+ Thread::SpinAcquire(&ListLock, "ParkerFreeListAllocate");
-+ {
-+ p = FreeList;
-+ if (p != NULL) {
-+ FreeList = p->FreeNext;
- }
--
-- // We've detached the list. The list in-hand is now
-- // local to this thread. This thread can operate on the
-- // list without risk of interference from other threads.
-- // 2: Extract -- pop the 1st element from the list.
-- Parker * List = p->FreeNext ;
-- if (List == NULL) break ;
-- for (;;) {
-- // 3: Try to reattach the residual list
-- guarantee (List != NULL, "invariant") ;
-- Parker * Arv = (Parker *) Atomic::cmpxchg_ptr (List, &FreeList, NULL) ;
-- if (Arv == NULL) break ;
--
-- // New nodes arrived. Try to detach the recent arrivals.
-- if (Atomic::cmpxchg_ptr (NULL, &FreeList, Arv) != Arv) {
-- continue ;
-- }
-- guarantee (Arv != NULL, "invariant") ;
-- // 4: Merge Arv into List
-- Parker * Tail = List ;
-- while (Tail->FreeNext != NULL) Tail = Tail->FreeNext ;
-- Tail->FreeNext = Arv ;
-- }
-- break ;
- }
-+ Thread::SpinRelease(&ListLock);
-
- if (p != NULL) {
- guarantee (p->AssociatedWith == NULL, "invariant") ;
- } else {
- // Do this the hard way -- materialize a new Parker..
-- // In rare cases an allocating thread might detach
-- // a long list -- installing null into FreeList --and
-- // then stall. Another thread calling Allocate() would see
-- // FreeList == null and then invoke the ctor. In this case we
-- // end up with more Parkers in circulation than we need, but
-- // the race is rare and the outcome is benign.
-- // Ideally, the # of extant Parkers is equal to the
-- // maximum # of threads that existed at any one time.
-- // Because of the race mentioned above, segments of the
-- // freelist can be transiently inaccessible. At worst
-- // we may end up with the # of Parkers in circulation
-- // slightly above the ideal.
- p = new Parker() ;
- }
- p->AssociatedWith = t ; // Associate p with t
-@@ -227,11 +157,12 @@
- guarantee (p->AssociatedWith != NULL, "invariant") ;
- guarantee (p->FreeNext == NULL , "invariant") ;
- p->AssociatedWith = NULL ;
-- for (;;) {
-- // Push p onto FreeList
-- Parker * List = FreeList ;
-- p->FreeNext = List ;
-- if (Atomic::cmpxchg_ptr (p, &FreeList, List) == List) break ;
-+
-+ Thread::SpinAcquire(&ListLock, "ParkerFreeListRelease");
-+ {
-+ p->FreeNext = FreeList;
-+ FreeList = p;
- }
-+ Thread::SpinRelease(&ListLock);
- }
-
---- ./hotspot/src/share/vm/runtime/thread.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/thread.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -4412,9 +4412,7 @@
- ++ctr ;
- if ((ctr & 0xFFF) == 0 || !os::is_MP()) {
- if (Yields > 5) {
-- // Consider using a simple NakedSleep() instead.
-- // Then SpinAcquire could be called by non-JVM threads
-- Thread::current()->_ParkEvent->park(1) ;
-+ os::naked_short_sleep(1);
- } else {
- os::NakedYield() ;
- ++Yields ;
---- ./hotspot/src/share/vm/runtime/vframe.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/vframe.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -197,6 +197,7 @@
- continue;
- }
- if (monitor->owner() != NULL) {
-+ // the monitor is associated with an object, i.e., it is locked
-
- // First, assume we have the monitor locked. If we haven't found an
- // owned monitor before and this is the first frame, then we need to
-@@ -207,7 +208,11 @@
- if (!found_first_monitor && frame_count == 0) {
- markOop mark = monitor->owner()->mark();
- if (mark->has_monitor() &&
-- mark->monitor() == thread()->current_pending_monitor()) {
-+ ( // we have marked ourself as pending on this monitor
-+ mark->monitor() == thread()->current_pending_monitor() ||
-+ // we are not the owner of this monitor
-+ !mark->monitor()->is_entered(thread())
-+ )) {
- lock_state = "waiting to lock";
- }
- }
---- ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -2433,6 +2433,7 @@
- declare_constant(Deoptimization::Reason_age) \
- declare_constant(Deoptimization::Reason_predicate) \
- declare_constant(Deoptimization::Reason_loop_limit_check) \
-+ declare_constant(Deoptimization::Reason_unstable_if) \
- declare_constant(Deoptimization::Reason_LIMIT) \
- declare_constant(Deoptimization::Reason_RECORDED_LIMIT) \
- \
---- ./hotspot/src/share/vm/services/runtimeService.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/services/runtimeService.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -44,6 +44,7 @@
- PerfCounter* RuntimeService::_thread_interrupt_signaled_count = NULL;
- PerfCounter* RuntimeService::_interrupted_before_count = NULL;
- PerfCounter* RuntimeService::_interrupted_during_count = NULL;
-+double RuntimeService::_last_safepoint_sync_time_sec = 0.0;
-
- void RuntimeService::init() {
- // Make sure the VM version is initialized
-@@ -123,6 +124,7 @@
-
- // update the time stamp to begin recording safepoint time
- _safepoint_timer.update();
-+ _last_safepoint_sync_time_sec = 0.0;
- if (UsePerfData) {
- _total_safepoints->inc();
- if (_app_timer.is_updated()) {
-@@ -135,6 +137,9 @@
- if (UsePerfData) {
- _sync_time_ticks->inc(_safepoint_timer.ticks_since_update());
- }
-+ if (PrintGCApplicationStoppedTime) {
-+ _last_safepoint_sync_time_sec = last_safepoint_time_sec();
-+ }
- }
-
- void RuntimeService::record_safepoint_end() {
-@@ -150,8 +155,10 @@
- gclog_or_tty->date_stamp(PrintGCDateStamps);
- gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("Total time for which application threads "
-- "were stopped: %3.7f seconds",
-- last_safepoint_time_sec());
-+ "were stopped: %3.7f seconds, "
-+ "Stopping threads took: %3.7f seconds",
-+ last_safepoint_time_sec(),
-+ _last_safepoint_sync_time_sec);
- }
-
- // update the time stamp to begin recording app time
---- ./hotspot/src/share/vm/services/runtimeService.hpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/services/runtimeService.hpp Fri Apr 10 09:19:25 2015 -0700
-@@ -40,6 +40,7 @@
-
- static TimeStamp _safepoint_timer;
- static TimeStamp _app_timer;
-+ static double _last_safepoint_sync_time_sec;
-
- public:
- static void init();
---- ./hotspot/src/share/vm/utilities/ostream.cpp Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/src/share/vm/utilities/ostream.cpp Fri Apr 10 09:19:25 2015 -0700
-@@ -356,7 +356,6 @@
-
- #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);
-@@ -390,7 +389,6 @@
- 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);
-
-@@ -583,9 +581,16 @@
- _bytes_written = 0L;
- _file_name = make_log_name(file_name, NULL);
-
-+ if (_file_name == NULL) {
-+ warning("Cannot open file %s: file name is too long.\n", file_name);
-+ _need_close = false;
-+ UseGCLogFileRotation = false;
-+ return;
-+ }
-+
- // gc log file rotation
- if (UseGCLogFileRotation && NumberOfGCLogFiles > 1) {
-- char tempbuf[FILENAMEBUFLEN];
-+ char tempbuf[JVM_MAXPATHLEN];
- jio_snprintf(tempbuf, sizeof(tempbuf), "%s.%d" CURRENTAPPX, _file_name, _cur_file_num);
- _file = fopen(tempbuf, "w");
- } else {
-@@ -617,10 +622,10 @@
- // concurrent GC threads to run parallel with VMThread at safepoint, write and rotate_log
- // must be synchronized.
- void gcLogFileStream::rotate_log(bool force, outputStream* out) {
-- char time_msg[FILENAMEBUFLEN];
-+ char time_msg[O_BUFLEN];
- char time_str[EXTRACHARLEN];
-- char current_file_name[FILENAMEBUFLEN];
-- char renamed_file_name[FILENAMEBUFLEN];
-+ char current_file_name[JVM_MAXPATHLEN];
-+ char renamed_file_name[JVM_MAXPATHLEN];
-
- if (!should_rotate(force)) {
- return;
-@@ -659,12 +664,15 @@
- // 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) {
-- jio_snprintf(renamed_file_name, filename_len + EXTRACHARLEN, "%s.%d",
-+ jio_snprintf(renamed_file_name, JVM_MAXPATHLEN, "%s.%d",
- _file_name, _cur_file_num);
-- jio_snprintf(current_file_name, filename_len + EXTRACHARLEN, "%s.%d" CURRENTAPPX,
-- _file_name, _cur_file_num);
-+ int result = jio_snprintf(current_file_name, JVM_MAXPATHLEN,
-+ "%s.%d" CURRENTAPPX, _file_name, _cur_file_num);
-+ if (result >= JVM_MAXPATHLEN) {
-+ warning("Cannot create new log file name: %s: file name is too long.\n", current_file_name);
-+ return;
-+ }
-
- const char* msg = force ? "GC log rotation request has been received."
- : "GC log file has reached the maximum size.";
-@@ -703,19 +711,23 @@
-
- _cur_file_num++;
- if (_cur_file_num > NumberOfGCLogFiles - 1) _cur_file_num = 0;
-- jio_snprintf(current_file_name, filename_len + EXTRACHARLEN, "%s.%d" CURRENTAPPX,
-+ int result = jio_snprintf(current_file_name, JVM_MAXPATHLEN, "%s.%d" CURRENTAPPX,
- _file_name, _cur_file_num);
-+ if (result >= JVM_MAXPATHLEN) {
-+ warning("Cannot create new log file name: %s: file name is too long.\n", current_file_name);
-+ return;
-+ }
-+
- _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,
-+ jio_snprintf(current_file_name, JVM_MAXPATHLEN,
- "%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);
-+ os::local_time_string((char *)time_str, sizeof(time_str)), current_file_name);
- write(time_msg, strlen(time_msg));
-
- if (out != NULL) {
-@@ -804,7 +816,7 @@
-
- void defaultStream::init_log() {
- // %%% Need a MutexLocker?
-- const char* log_name = LogFile != NULL ? LogFile : "hotspot.log";
-+ const char* log_name = LogFile != NULL ? LogFile : "hotspot_%p.log";
- fileStream* file = open_file(log_name);
-
- if (file != NULL) {
-@@ -1236,14 +1248,55 @@
-
- #ifndef PRODUCT
- void test_loggc_filename() {
-+ int pid;
-+ char tms[32];
-+ char i_result[JVM_MAXPATHLEN];
- const char* o_result;
-+ get_datetime_string(tms, sizeof(tms));
-+ pid = os::current_process_id();
-+
-+ // test.log
-+ jio_snprintf(i_result, JVM_MAXPATHLEN, "test.log", tms);
-+ o_result = make_log_name_internal("test.log", NULL, pid, tms);
-+ assert(strcmp(i_result, o_result) == 0, "failed on testing make_log_name(\"test.log\", NULL)");
-+ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
-+
-+ // test-%t-%p.log
-+ jio_snprintf(i_result, JVM_MAXPATHLEN, "test-%s-pid%u.log", tms, pid);
-+ o_result = make_log_name_internal("test-%t-%p.log", NULL, pid, tms);
-+ assert(strcmp(i_result, o_result) == 0, "failed on testing make_log_name(\"test-%%t-%%p.log\", NULL)");
-+ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
-+
-+ // test-%t%p.log
-+ jio_snprintf(i_result, JVM_MAXPATHLEN, "test-%spid%u.log", tms, pid);
-+ o_result = make_log_name_internal("test-%t%p.log", NULL, pid, tms);
-+ assert(strcmp(i_result, o_result) == 0, "failed on testing make_log_name(\"test-%%t%%p.log\", NULL)");
-+ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
-+
-+ // %p%t.log
-+ jio_snprintf(i_result, JVM_MAXPATHLEN, "pid%u%s.log", pid, tms);
-+ o_result = make_log_name_internal("%p%t.log", NULL, pid, tms);
-+ assert(strcmp(i_result, o_result) == 0, "failed on testing make_log_name(\"%%p%%t.log\", NULL)");
-+ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
-+
-+ // %p-test.log
-+ jio_snprintf(i_result, JVM_MAXPATHLEN, "pid%u-test.log", pid);
-+ o_result = make_log_name_internal("%p-test.log", NULL, pid, tms);
-+ assert(strcmp(i_result, o_result) == 0, "failed on testing make_log_name(\"%%p-test.log\", NULL)");
-+ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
-+
-+ // %t.log
-+ jio_snprintf(i_result, JVM_MAXPATHLEN, "%s.log", tms);
-+ o_result = make_log_name_internal("%t.log", NULL, pid, tms);
-+ assert(strcmp(i_result, o_result) == 0, "failed on testing make_log_name(\"%%t.log\", NULL)");
-+ FREE_C_HEAP_ARRAY(char, o_result, mtInternal);
-
- {
- // 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);
-+ o_result = make_log_name_internal((const char*)&longest_name, NULL, pid, tms);
- 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);
- }
-@@ -1254,29 +1307,30 @@
- 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);
-+ o_result = make_log_name_internal((const char*)&too_long_name, NULL, pid, tms);
- assert(o_result == NULL, err_msg("Too long file name should return NULL, but got '%s'", o_result));
- }
-
- {
-+ // too long with timestamp
-+ char longest_name[JVM_MAXPATHLEN];
-+ memset(longest_name, 'a', JVM_MAXPATHLEN);
-+ longest_name[JVM_MAXPATHLEN - 3] = '%';
-+ longest_name[JVM_MAXPATHLEN - 2] = 't';
-+ longest_name[JVM_MAXPATHLEN - 1] = '\0';
-+ o_result = make_log_name_internal((const char*)&longest_name, NULL, pid, tms);
-+ assert(o_result == NULL, err_msg("Too long file name after timestamp expansion 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));
-+ o_result = make_log_name_internal((const char*)&longest_name, NULL, pid, tms);
-+ assert(o_result == NULL, err_msg("Too long file name after pid expansion should return NULL, but got '%s'", o_result));
- }
- }
-
---- ./hotspot/test/Makefile Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/test/Makefile Fri Apr 10 09:19:25 2015 -0700
-@@ -173,8 +173,8 @@
- JTREG_TESTDIRS = $(TESTDIRS)
- endif
-
--# Default JTREG to run (win32 script works for everybody)
--JTREG = $(JT_HOME)/win32/bin/jtreg
-+# Default JTREG to run
-+JTREG = $(JT_HOME)/bin/jtreg
-
- # Option to tell jtreg to not run tests marked with "ignore"
- ifeq ($(PLATFORM), windows)
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/compiler/exceptions/CatchInlineExceptions.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,81 @@
-+/*
-+ * 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 8059299
-+ * @summary assert(adr_type != NULL) failed: expecting TypeKlassPtr
-+ * @run main/othervm -Xbatch CatchInlineExceptions
-+ */
-+
-+class Exception1 extends Exception {};
-+class Exception2 extends Exception {};
-+
-+public class CatchInlineExceptions {
-+ private static int counter0;
-+ private static int counter1;
-+ private static int counter2;
-+ private static int counter;
-+
-+ static void foo(int i) throws Exception {
-+ if ((i & 1023) == 2) {
-+ counter0++;
-+ throw new Exception2();
-+ }
-+ }
-+
-+ static void test(int i) throws Exception {
-+ try {
-+ foo(i);
-+ }
-+ catch (Exception e) {
-+ if (e instanceof Exception1) {
-+ counter1++;
-+ } else if (e instanceof Exception2) {
-+ counter2++;
-+ }
-+ counter++;
-+ throw e;
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Throwable {
-+ for (int i = 0; i < 15000; i++) {
-+ try {
-+ test(i);
-+ } catch (Exception e) {
-+ // expected
-+ }
-+ }
-+ if (counter1 != 0) {
-+ throw new RuntimeException("Failed: counter1(" + counter1 + ") != 0");
-+ }
-+ if (counter2 != counter0) {
-+ throw new RuntimeException("Failed: counter2(" + counter2 + ") != counter0(" + counter0 + ")");
-+ }
-+ if (counter2 != counter) {
-+ throw new RuntimeException("Failed: counter2(" + counter2 + ") != counter(" + counter + ")");
-+ }
-+ System.out.println("TEST PASSED");
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/compiler/jsr292/RedefineMethodUsedByMultipleMethodHandlesNoASM.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,246 @@
-+/*
-+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/**
-+ * @test
-+ * @bug 8042235
-+ * @summary redefining method used by multiple MethodHandles crashes VM
-+ * @compile -XDignore.symbol.file RedefineMethodUsedByMultipleMethodHandlesNoASM.java
-+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+EnableInvokeDynamic RedefineMethodUsedByMultipleMethodHandlesNoASM
-+ */
-+
-+import java.io.*;
-+import java.lang.instrument.*;
-+import java.lang.invoke.*;
-+import java.lang.invoke.MethodHandles.Lookup;
-+import java.lang.management.*;
-+import java.lang.reflect.*;
-+import java.nio.file.*;
-+import java.security.*;
-+import java.util.jar.*;
-+
-+import javax.tools.*;
-+
-+public class RedefineMethodUsedByMultipleMethodHandlesNoASM {
-+
-+ static class Foo {
-+ public static Object getName() {
-+ int fooInt = 1;
-+ if (true) {
-+ // We "just know" that this creates bytecodes:
-+ // bipush 0x7 0x10 0x7
-+ // ishl 0x78
-+ fooInt <<= 0x7;
-+ }
-+ return "foo" + fooInt;
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Throwable {
-+
-+ Lookup lookup = MethodHandles.lookup();
-+ Method fooMethod = Foo.class.getDeclaredMethod("getName");
-+
-+ // fooMH2 displaces fooMH1 from the MemberNamesTable
-+ MethodHandle fooMH1 = lookup.unreflect(fooMethod);
-+ MethodHandle fooMH2 = lookup.unreflect(fooMethod);
-+
-+ System.out.println("Foo.getName() = " + Foo.getName());
-+ System.out.println("fooMH1.invoke = " + fooMH1.invokeExact());
-+ System.out.println("fooMH2.invoke = " + fooMH2.invokeExact());
-+
-+ // Redefining Foo.getName() causes vmtarget to be updated
-+ // in fooMH2 but not fooMH1
-+ redefineFoo();
-+
-+ // Full GC causes fooMH1.vmtarget to be deallocated
-+ System.gc();
-+
-+ // Calling fooMH1.vmtarget crashes the VM on JDK8, on JDK7 we see
-+ // the wrong method invoked, we execute the old code.
-+ Object newResult = fooMH1.invokeExact();
-+ System.out.println("fooMH1.invoke = " + fooMH1.invokeExact());
-+ if (!((String) newResult).equals("foo32")) {
-+ throw new RuntimeException("failed, fooMH1 invoke gets '" + newResult + "'");
-+ }
-+ }
-+
-+ /**
-+ * Adds the class file bytes for {@code c} to {@code jar}.
-+ */
-+ static void add(JarOutputStream jar, Class<?> c) throws IOException {
-+ String classAsPath = c.getName().replace('.', '/') + ".class";
-+ jar.putNextEntry(new JarEntry(classAsPath));
-+ InputStream stream = c.getClassLoader().getResourceAsStream(classAsPath);
-+
-+ int b;
-+ while ((b = stream.read()) != -1) {
-+ jar.write(b);
-+ }
-+ }
-+
-+ static void redefineFoo() throws Exception {
-+ Manifest manifest = new Manifest();
-+ manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
-+ Attributes mainAttrs = manifest.getMainAttributes();
-+ mainAttrs.putValue("Agent-Class", FooAgent.class.getName());
-+ mainAttrs.putValue("Can-Redefine-Classes", "true");
-+ mainAttrs.putValue("Can-Retransform-Classes", "true");
-+
-+ Path jar = Files.createTempFile("myagent", ".jar");
-+ try {
-+ JarOutputStream jarStream = new JarOutputStream(new FileOutputStream(jar.toFile()), manifest);
-+ add(jarStream, FooAgent.class);
-+ add(jarStream, FooTransformer.class);
-+ jarStream.close();
-+ runAgent(jar);
-+ } finally {
-+ Files.deleteIfExists(jar);
-+ }
-+ }
-+
-+ public static void runAgent(Path agent) throws Exception {
-+ String vmName = ManagementFactory.getRuntimeMXBean().getName();
-+ int p = vmName.indexOf('@');
-+ assert p != -1 : "VM name not in <pid>@<host> format: " + vmName;
-+ String pid = vmName.substring(0, p);
-+ ClassLoader cl = ToolProvider.getSystemToolClassLoader();
-+ Class<?> c = Class.forName("com.sun.tools.attach.VirtualMachine", true, cl);
-+ Method attach = c.getDeclaredMethod("attach", String.class);
-+ Method loadAgent = c.getDeclaredMethod("loadAgent", String.class);
-+ Method detach = c.getDeclaredMethod("detach");
-+ Object vm = attach.invoke(null, pid);
-+ loadAgent.invoke(vm, agent.toString());
-+ detach.invoke(vm);
-+ }
-+
-+ public static class FooAgent {
-+
-+ public static void agentmain(@SuppressWarnings("unused") String args, Instrumentation inst) throws Exception {
-+ assert inst.isRedefineClassesSupported();
-+ assert inst.isRetransformClassesSupported();
-+ inst.addTransformer(new FooTransformer(), true);
-+ Class<?>[] classes = inst.getAllLoadedClasses();
-+ for (int i = 0; i < classes.length; i++) {
-+ Class<?> c = classes[i];
-+ if (c == Foo.class) {
-+ inst.retransformClasses(new Class[]{c});
-+ }
-+ }
-+ }
-+ }
-+
-+
-+ /**
-+ * This method will only be called on the class Foo, above, and that class
-+ * only has the method getName().
-+ * Avoid using the objectweb ASM library as we do in jdk8, by
-+ * looking for a specific bytecode pattern (which this method does not really
-+ * understand).
-+ */
-+ static class FooTransformer implements ClassFileTransformer {
-+
-+ @Override
-+ public byte[] transform(ClassLoader cl, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
-+ byte[] classfileBuffer) throws IllegalClassFormatException {
-+
-+
-+ if (Foo.class.equals(classBeingRedefined)) {
-+
-+ try {
-+ System.out.println("redefining " + classBeingRedefined);
-+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
-+ InputStream is = new ByteArrayInputStream(classfileBuffer);
-+ copyWithSubstitution(is, new byte[] {(byte)0x10,(byte)0x07,(byte)0x78},
-+ new byte[] {(byte)0x10,(byte)0x05,(byte)0x78},
-+ baos);
-+ return baos.toByteArray();
-+ } catch(Exception e) {
-+ e.printStackTrace();
-+ }
-+ }
-+ return classfileBuffer;
-+ }
-+
-+ /**
-+ * Copy bytes from a Reader to an OutputStream. If a sequence of bytes
-+ * matches the given oldBytes byte array, write the newBytes array instead.
-+ */
-+ public void copyWithSubstitution(InputStream is, byte[] oldBytes, byte [] newBytes, OutputStream out) throws Exception {
-+
-+ byte[] buffer = new byte[oldBytes.length];
-+
-+ while (is.available() > 0) {
-+ int i = 0xff & is.read();
-+ if (i != oldBytes[0]) {
-+ out.write(i);
-+ continue;
-+ }
-+ int pos = 0;
-+ while (pos < oldBytes.length && oldBytes[pos] == (byte) i) {
-+ buffer[pos] = (byte) i;
-+ pos++;
-+ i = is.read();
-+ }
-+ // We have read as much as matches oldBytes, plus one byte (now in i).
-+ // Write out:
-+ // buffer it if did not match fully
-+ // new bytes if it was a full match
-+ if (pos > 0) {
-+ if (pos == oldBytes.length) {
-+ System.out.println("copyWithSubstitution: replacing: ");
-+ printBytesOn(System.out, buffer);
-+ System.out.println("copyWithSubstitution: with:");
-+ printBytesOn(System.out, newBytes);
-+ out.write(newBytes, 0, newBytes.length);
-+ } else {
-+ out.write(buffer, 0, pos);
-+ }
-+ }
-+ // Does not handle two sequential occurrences of oldBytes.
-+ out.write(i);
-+ }
-+ out.close();
-+ }
-+
-+
-+ public static void printBytesOn(PrintStream out, byte[] bytes) {
-+ int numColumns = 16;
-+ int column = 0;
-+ for (int i = 0; i < bytes.length; i++) {
-+ if (column == 0) {
-+ out.print(i);
-+ out.print("\t");
-+ }
-+ out.print("0x" + Integer.toHexString(255 & bytes[i])
-+ /* + " (" + (char) bytes[i] + */ + "\t");
-+ column++;
-+ if (column == numColumns) {
-+ out.println();
-+ column = 0;
-+ }
-+ }
-+ out.println();
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/compiler/loopopts/TestDeadBackbranchArrayAccess.java Fri Apr 10 09:19:25 2015 -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 8054478
-+ * @summary dead backbranch in main loop results in erroneous array access
-+ * @run main/othervm -XX:CompileOnly=TestDeadBackbranchArrayAccess -XX:+TieredCompilation -Xcomp TestDeadBackbranchArrayAccess
-+ *
-+ */
-+
-+public class TestDeadBackbranchArrayAccess {
-+ static char[] pattern0 = {0};
-+ static char[] pattern1 = {1};
-+
-+ static void test(char[] array) {
-+ if (pattern1 == null) return;
-+
-+ int i = 0;
-+ int pos = 0;
-+ char c = array[pos];
-+
-+ while (i >= 0 && (c == pattern0[i] || c == pattern1[i])) {
-+ i--;
-+ pos--;
-+ if (pos != -1) {
-+ c = array[pos];
-+ }
-+ }
-+ }
-+
-+ public static void main(String[] args) {
-+ for (int i = 0; i < 1000000; i++) {
-+ test(new char[1]);
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/compiler/loopopts/TestLogSum.java Fri Apr 10 09:19:25 2015 -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 8046516
-+ * @summary Segmentation fault in JVM (easily reproducible)
-+ * @run main/othervm -XX:-TieredCompilation -Xbatch TestLogSum
-+ * @author jackkamm@gmail.com
-+ */
-+
-+import java.util.Arrays;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+public class TestLogSum {
-+ public static void main(String[] args) {
-+ double sum;
-+
-+ for (int i = 0; i < 6; i++) {
-+ for (int n = 2; n < 30; n++) {
-+ for (int j = 1; j <= n; j++) {
-+ for (int k = 1; k <= j; k++) {
-+ // System.out.println(computeSum(k, j));
-+ sum = computeSum(k, j);
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ private static Map<List<Integer>, Double> cache = new HashMap<List<Integer>, Double>();
-+ public static double computeSum(int x, int y) {
-+ List<Integer> key = Arrays.asList(new Integer[] {x, y});
-+
-+ if (!cache.containsKey(key)) {
-+
-+ // explicitly creating/updating a double[] array, instead of using the LogSumArray wrapper object, will prevent the error
-+ LogSumArray toReturn = new LogSumArray(x);
-+
-+ // changing loop indices will prevent the error
-+ // in particular, for(z=0; z<x-1; z++), and then using z+1 in place of z, will not produce error
-+ for (int z = 1; z < x+1; z++) {
-+ double logSummand = Math.log(z + x + y);
-+ toReturn.addLogSummand(logSummand);
-+ }
-+
-+ // returning the value here without cacheing it will prevent the segfault
-+ cache.put(key, toReturn.retrieveLogSum());
-+ }
-+ return cache.get(key);
-+ }
-+
-+ /*
-+ * Given a bunch of logarithms log(X),log(Y),log(Z),...
-+ * This class is used to compute the log of the sum, log(X+Y+Z+...)
-+ */
-+ private static class LogSumArray {
-+ private double[] logSummandArray;
-+ private int currSize;
-+
-+ private double maxLogSummand;
-+
-+ public LogSumArray(int maxEntries) {
-+ this.logSummandArray = new double[maxEntries];
-+
-+ this.currSize = 0;
-+ this.maxLogSummand = Double.NEGATIVE_INFINITY;
-+ }
-+
-+ public void addLogSummand(double logSummand) {
-+ logSummandArray[currSize] = logSummand;
-+ currSize++;
-+ // removing this line will prevent the error
-+ maxLogSummand = Math.max(maxLogSummand, logSummand);
-+ }
-+
-+ public double retrieveLogSum() {
-+ if (maxLogSummand == Double.NEGATIVE_INFINITY) return Double.NEGATIVE_INFINITY;
-+
-+ assert currSize <= logSummandArray.length;
-+
-+ double factorSum = 0;
-+ for (int i = 0; i < currSize; i++) {
-+ factorSum += Math.exp(logSummandArray[i] - maxLogSummand);
-+ }
-+
-+ return Math.log(factorSum) + maxLogSummand;
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,403 @@
-+/*
-+ * 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 8066103
-+ * @summary C2's range check smearing allows out of bound array accesses
-+ * @run main/othervm -ea -Xmixed -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckSmearing
-+ *
-+ */
-+
-+import java.lang.annotation.*;
-+import java.lang.reflect.*;
-+import java.util.*;
-+
-+public class TestRangeCheckSmearing {
-+ @Retention(RetentionPolicy.RUNTIME)
-+ @interface Args { int[] value(); }
-+
-+ // first range check is i + max of all constants
-+ @Args({0, 8})
-+ static int m1(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+9];
-+ if (allaccesses) {
-+ res += array[i+8];
-+ res += array[i+7];
-+ res += array[i+6];
-+ res += array[i+5];
-+ res += array[i+4];
-+ res += array[i+3];
-+ res += array[i+2];
-+ res += array[i+1];
-+ }
-+ return res;
-+ }
-+
-+ // first range check is i + min of all constants
-+ @Args({0, -9})
-+ static int m2(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+1];
-+ if (allaccesses) {
-+ res += array[i+2];
-+ res += array[i+3];
-+ res += array[i+4];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ // first range check is not i + min/max of all constants
-+ @Args({0, 8})
-+ static int m3(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ if (allaccesses) {
-+ res += array[i+2];
-+ res += array[i+1];
-+ res += array[i+4];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ @Args({0, -9})
-+ static int m4(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ if (allaccesses) {
-+ res += array[i+4];
-+ res += array[i+1];
-+ res += array[i+2];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ @Args({0, -3})
-+ static int m5(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i+2];
-+ if (allaccesses) {
-+ res += array[i+1];
-+ res += array[i+4];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ @Args({0, 6})
-+ static int m6(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i+4];
-+ if (allaccesses) {
-+ res += array[i+2];
-+ res += array[i+1];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ @Args({0, 6})
-+ static int m7(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i+2];
-+ res += array[i+4];
-+ if (allaccesses) {
-+ res += array[i+1];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ @Args({0, -3})
-+ static int m8(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i+4];
-+ res += array[i+2];
-+ if (allaccesses) {
-+ res += array[i+1];
-+ res += array[i+5];
-+ res += array[i+6];
-+ res += array[i+7];
-+ res += array[i+8];
-+ res += array[i+9];
-+ }
-+ return res;
-+ }
-+
-+ @Args({6, 15})
-+ static int m9(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ if (allaccesses) {
-+ res += array[i-2];
-+ res += array[i-1];
-+ res += array[i-4];
-+ res += array[i-5];
-+ res += array[i-6];
-+ }
-+ return res;
-+ }
-+
-+ @Args({3, 12})
-+ static int m10(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ if (allaccesses) {
-+ res += array[i-2];
-+ res += array[i-1];
-+ res += array[i-3];
-+ res += array[i+4];
-+ res += array[i+5];
-+ res += array[i+6];
-+ }
-+ return res;
-+ }
-+
-+ @Args({3, -3})
-+ static int m11(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i-2];
-+ if (allaccesses) {
-+ res += array[i+5];
-+ res += array[i+6];
-+ }
-+ return res;
-+ }
-+
-+ @Args({3, 6})
-+ static int m12(int[] array, int i, boolean allaccesses) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i+6];
-+ if (allaccesses) {
-+ res += array[i-2];
-+ res += array[i-3];
-+ }
-+ return res;
-+ }
-+
-+ // check that identical range check is replaced by dominating one
-+ // only when correct
-+ @Args({0})
-+ static int m13(int[] array, int i, boolean ignore) {
-+ int res = 0;
-+ res += array[i+3];
-+ res += array[i+3];
-+ return res;
-+ }
-+
-+ @Args({2, 0})
-+ static int m14(int[] array, int i, boolean ignore) {
-+ int res = 0;
-+
-+ res += array[i];
-+ res += array[i-2];
-+ res += array[i]; // If range check below were to be removed first this cannot be considered identical to first range check
-+ res += array[i-1]; // range check removed so i-1 array access depends on previous check
-+
-+ return res;
-+ }
-+
-+ static int[] m15_dummy = new int[10];
-+ @Args({2, 0})
-+ static int m15(int[] array, int i, boolean ignore) {
-+ int res = 0;
-+ res += array[i];
-+
-+ // When the loop is optimized out we don't want the
-+ // array[i-1] access which is dependent on array[i]'s
-+ // range check to become dependent on the identical range
-+ // check above.
-+
-+ int[] array2 = m15_dummy;
-+ int j = 0;
-+ for (; j < 10; j++);
-+ if (j == 10) {
-+ array2 = array;
-+ }
-+
-+ res += array2[i-2];
-+ res += array2[i];
-+ res += array2[i-1]; // range check removed so i-1 array access depends on previous check
-+
-+ return res;
-+ }
-+
-+ @Args({2, 0})
-+ static int m16(int[] array, int i, boolean ignore) {
-+ int res = 0;
-+
-+ res += array[i];
-+ res += array[i-1];
-+ res += array[i-1];
-+ res += array[i-2];
-+
-+ return res;
-+ }
-+
-+ @Args({2, 0})
-+ static int m17(int[] array, int i, boolean ignore) {
-+ int res = 0;
-+
-+ res += array[i];
-+ res += array[i-2];
-+ res += array[i-2];
-+ res += array[i+2];
-+ res += array[i+2];
-+ res += array[i-1];
-+ res += array[i-1];
-+
-+ return res;
-+ }
-+
-+ static public void main(String[] args) {
-+ new TestRangeCheckSmearing().doTests();
-+ }
-+ boolean success = true;
-+ boolean exception = false;
-+ final int[] array = new int[10];
-+ final HashMap<String,Method> tests = new HashMap<>();
-+ {
-+ final Class<?> TEST_PARAM_TYPES[] = { int[].class, int.class, boolean.class };
-+ for (Method m : this.getClass().getDeclaredMethods()) {
-+ if (m.getName().matches("m[0-9]+")) {
-+ assert(Modifier.isStatic(m.getModifiers())) : m;
-+ assert(m.getReturnType() == int.class) : m;
-+ assert(Arrays.equals(m.getParameterTypes(), TEST_PARAM_TYPES)) : m;
-+ tests.put(m.getName(), m);
-+ }
-+ }
-+ }
-+
-+ void invokeTest(Method m, int[] array, int index, boolean z) {
-+ try {
-+ m.invoke(null, array, index, z);
-+ } catch (ReflectiveOperationException roe) {
-+ Throwable ex = roe.getCause();
-+ if (ex instanceof ArrayIndexOutOfBoundsException)
-+ throw (ArrayIndexOutOfBoundsException) ex;
-+ throw new AssertionError(roe);
-+ }
-+ }
-+
-+ void doTest(String name) {
-+ Method m = tests.get(name);
-+ tests.remove(name);
-+ int[] args = m.getAnnotation(Args.class).value();
-+ int index0 = args[0], index1;
-+ boolean exceptionRequired = true;
-+ if (args.length == 2) {
-+ index1 = args[1];
-+ } else {
-+ // no negative test for this one
-+ assert(args.length == 1);
-+ assert(name.equals("m13"));
-+ exceptionRequired = false;
-+ index1 = index0;
-+ }
-+ // Get the method compiled.
-+ // valid access
-+ for (int i = 0; i < 20000; i++) {
-+ invokeTest(m, array, index0, true);
-+ }
-+
-+ exception = false;
-+ boolean test_success = true;
-+ try {
-+ invokeTest(m, array, index1, false);
-+ } catch(ArrayIndexOutOfBoundsException aioob) {
-+ exception = true;
-+ System.out.println("ArrayIndexOutOfBoundsException thrown in "+name);
-+ }
-+ if (!exception) {
-+ System.out.println("ArrayIndexOutOfBoundsException was not thrown in "+name);
-+ }
-+
-+ if (exception != exceptionRequired) {
-+ System.out.println((exceptionRequired?"exception required but not thrown":"not exception required but thrown") + " in "+name);
-+ test_success = false;
-+ }
-+
-+ if (!test_success) {
-+ success = false;
-+ System.out.println("TEST FAILED: "+name);
-+ }
-+
-+ }
-+ void doTests() {
-+ doTest("m1");
-+ doTest("m2");
-+ doTest("m3");
-+ doTest("m4");
-+ doTest("m5");
-+ doTest("m6");
-+ doTest("m7");
-+ doTest("m8");
-+ doTest("m9");
-+ doTest("m10");
-+ doTest("m11");
-+ doTest("m12");
-+ doTest("m13");
-+ doTest("m14");
-+ doTest("m15");
-+ doTest("m16");
-+ doTest("m17");
-+ if (!success) {
-+ throw new RuntimeException("Some tests failed");
-+ }
-+ assert(tests.isEmpty()) : tests;
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/compiler/rangechecks/TestRangeCheckSmearingLoopOpts.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,76 @@
-+/*
-+ * 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 8048170
-+ * @summary Following range check smearing, range check cannot be replaced by dominating identical test.
-+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckSmearingLoopOpts
-+ *
-+ */
-+public class TestRangeCheckSmearingLoopOpts {
-+
-+ static int dummy;
-+
-+ static int m1(int[] array, int i) {
-+ for (;;) {
-+ for (;;) {
-+ if (array[i] < 0) { // range check (i+0) dominates equivalent check below
-+ break;
-+ }
-+ i++;
-+ }
-+
-+ // A control flow that stops IfNode::up_one_dom()
-+ if ((i % 2)== 0) {
-+ if ((array[i] % 2) == 0) {
-+ dummy = i;
-+ }
-+ }
-+
-+ // IfNode::Ideal will rewrite some range checks if Compile::allow_range_check_smearing
-+ if (array[i-1] == 9) { // range check (i-1) unchanged
-+ int res = array[i-3]; // range check (i-3) unchanged
-+ res += array[i]; // range check (i+0) unchanged
-+ res += array[i-2]; // removed redundant range check
-+ // the previous access might be hoisted by
-+ // PhaseIdealLoop::split_if_with_blocks_post because
-+ // it appears to have the same guard, but it also
-+ // depends on the previous guards
-+ return res;
-+ }
-+ i++;
-+ }
-+ }
-+
-+ static public void main(String[] args) {
-+ int[] array = { 0, 1, 2, -3, 4, 5, -2, 7, 8, 9, -1 };
-+ for (int i = 0; i < 20000; i++) {
-+ m1(array, 0);
-+ }
-+ array[0] = -1;
-+ try {
-+ m1(array, 0);
-+ } catch(ArrayIndexOutOfBoundsException aioobe) {}
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/CheckEndorsedAndExtDirs/EndorsedExtDirs.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,96 @@
-+/*
-+ * 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 8064667
-+ * @summary Sanity test for -XX:+CheckEndorsedAndExtDirs
-+ * @library /testlibrary
-+ * @run main/othervm EndorsedExtDirs
-+ */
-+
-+import com.oracle.java.testlibrary.*;
-+import java.io.File;
-+import java.io.IOException;
-+import java.nio.file.DirectoryStream;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+public class EndorsedExtDirs {
-+ static final String cpath = System.getProperty("test.classes", ".");
-+ public static void main(String arg[]) throws Exception {
-+ fatalError("-XX:+CheckEndorsedAndExtDirs", "-Djava.endorsed.dirs=foo");
-+ fatalError("-XX:+CheckEndorsedAndExtDirs", "-Djava.ext.dirs=bar");
-+ testNonEmptySystemExtDirs();
-+ }
-+
-+ static void testNonEmptySystemExtDirs() throws Exception {
-+ String home = System.getProperty("java.home");
-+ Path ext = Paths.get(home, "lib", "ext");
-+ String extDirs = System.getProperty("java.ext.dirs");
-+ String[] dirs = extDirs.split(File.pathSeparator);
-+ long count = 0;
-+ for (String d : dirs) {
-+ Path path = Paths.get(d);
-+ if (Files.notExists(path) || path.equals(ext)) continue;
-+ try (DirectoryStream<Path> jars =
-+ Files.newDirectoryStream(path, "*.jar"))
-+ {
-+ for (Path j : jars) {
-+ count++;
-+ }
-+ }
-+ }
-+ if (count > 0) {
-+ fatalError("-XX:+CheckEndorsedAndExtDirs");
-+ }
-+ }
-+
-+ static ProcessBuilder newProcessBuilder(String... args) {
-+ List<String> commands = new ArrayList<>();
-+ String java = System.getProperty("java.home") + "/bin/java";
-+ commands.add(java);
-+ for (String s : args) {
-+ commands.add(s);
-+ }
-+ commands.add("-cp");
-+ commands.add(cpath);
-+ commands.add("EndorsedExtDirs");
-+
-+ System.out.println("Process " + commands);
-+ return new ProcessBuilder(commands);
-+ }
-+
-+ static void fatalError(String... args) throws Exception {
-+ fatalError(newProcessBuilder(args));
-+ }
-+
-+ static void fatalError(ProcessBuilder pb) throws Exception {
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+ output.shouldContain("Could not create the Java Virtual Machine");
-+ output.shouldHaveExitValue(1);
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/LoadClass/LoadClassNegative.java Fri Apr 10 09:19:25 2015 -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
-+ * @key regression
-+ * @bug 8020675
-+ * @summary make sure there is no fatal error if a class is loaded from an invalid jar file which is in the bootclasspath
-+ * @library /testlibrary
-+ * @build TestForName
-+ * @build LoadClassNegative
-+ * @run main LoadClassNegative
-+ */
-+
-+import java.io.File;
-+import com.oracle.java.testlibrary.*;
-+
-+public class LoadClassNegative {
-+
-+ public static void main(String args[]) throws Exception {
-+ String bootCP = "-Xbootclasspath/a:" + System.getProperty("test.src")
-+ + File.separator + "dummy.jar";
-+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-+ bootCP,
-+ "TestForName");
-+
-+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
-+ output.shouldContain("ClassNotFoundException");
-+ output.shouldHaveExitValue(0);
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/LoadClass/ShowClassLoader.java Fri Apr 10 09:19:25 2015 -0700
-@@ -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.
-+ */
-+
-+/*
-+ * @test
-+ * @key regression
-+ * @bug 8058927
-+ * @summary Make sure array class has the right class loader
-+ * @run main ShowClassLoader
-+ */
-+
-+public class ShowClassLoader {
-+
-+ public static void main(String[] args) {
-+ Object[] oa = new Object[0];
-+ ShowClassLoader[] sa = new ShowClassLoader[0];
-+
-+ System.out.println("Classloader for Object[] is " + oa.getClass().getClassLoader());
-+ System.out.println("Classloader for SCL[] is " + sa.getClass().getClassLoader() );
-+
-+ if (sa.getClass().getClassLoader() == null) {
-+ throw new RuntimeException("Wrong class loader");
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/LoadClass/TestForName.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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 TestForName {
-+ public static void main(String[] args) {
-+ try {
-+ Class cls = Class.forName("xxx");
-+ System.out.println("Class = " + cls.getName());
-+ } catch (ClassNotFoundException cnfe) {
-+ cnfe.printStackTrace();
-+ }
-+ }
-+}
---- ./hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java Fri Apr 10 09:19:25 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -45,6 +45,13 @@
- String pid = Integer.toString(ProcessTools.getProcessId());
- ProcessBuilder pb = new ProcessBuilder();
-
-+ boolean has_nmt_detail = wb.NMTIsDetailSupported();
-+ if (has_nmt_detail) {
-+ System.out.println("NMT detail support detected.");
-+ } else {
-+ System.out.println("NMT detail support not detected.");
-+ }
-+
- Thread reserveThread = new Thread() {
- public void run() {
- addr = wb.NMTReserveMemory(reserveSize);
-@@ -58,7 +65,9 @@
- pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
- output = new OutputAnalyzer(pb.start());
- output.shouldContain("Test (reserved=512KB, committed=0KB)");
-- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 512KB for Test");
-+ if (has_nmt_detail) {
-+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 512KB for Test");
-+ }
-
- Thread commitThread = new Thread() {
- public void run() {
-@@ -72,7 +81,9 @@
-
- output = new OutputAnalyzer(pb.start());
- output.shouldContain("Test (reserved=512KB, committed=128KB)");
-- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
-+ if (has_nmt_detail) {
-+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
-+ }
-
- Thread uncommitThread = new Thread() {
- public void run() {
---- ./hotspot/test/runtime/NMT/VirtualAllocTestType.java Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/test/runtime/NMT/VirtualAllocTestType.java Fri Apr 10 09:19:25 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -46,13 +46,23 @@
- String pid = Integer.toString(ProcessTools.getProcessId());
- ProcessBuilder pb = new ProcessBuilder();
-
-+ boolean has_nmt_detail = wb.NMTIsDetailSupported();
-+ if (has_nmt_detail) {
-+ System.out.println("NMT detail support detected.");
-+ } else {
-+ System.out.println("NMT detail support not detected.");
-+ }
-+
- addr = wb.NMTReserveMemory(reserveSize);
- mergeData();
-+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
-
-- pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
- output = new OutputAnalyzer(pb.start());
- output.shouldContain("Test (reserved=256KB, committed=0KB)");
-- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 256KB for Test");
-+ if (has_nmt_detail) {
-+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved 256KB for Test");
-+ }
-+
-
- wb.NMTCommitMemory(addr, commitSize);
-
-@@ -60,7 +70,9 @@
-
- output = new OutputAnalyzer(pb.start());
- output.shouldContain("Test (reserved=256KB, committed=128KB)");
-- output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
-+ if (has_nmt_detail) {
-+ output.shouldMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed 128KB");
-+ }
-
- wb.NMTUncommitMemory(addr, commitSize);
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/Thread/TestThreadDumpMonitorContention.java Fri Apr 10 09:19:25 2015 -0700
-@@ -0,0 +1,534 @@
-+/*
-+ * 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 8036823
-+ * @bug 8046287
-+ * @summary Creates two threads contending for the same lock and checks
-+ * whether jstack reports "locked" by more than one thread.
-+ *
-+ * @library /testlibrary
-+ * @run main/othervm TestThreadDumpMonitorContention
-+ */
-+
-+import java.io.BufferedReader;
-+import java.io.InputStreamReader;
-+import java.lang.management.ManagementFactory;
-+import java.lang.management.RuntimeMXBean;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+
-+import com.oracle.java.testlibrary.*;
-+
-+public class TestThreadDumpMonitorContention {
-+ // jstack tends to be closely bound to the VM that we are running
-+ // so use getTestJDKTool() instead of getCompileJDKTool() or even
-+ // getJDKTool() which can fall back to "compile.jdk".
-+ final static String JSTACK = JDKToolFinder.getTestJDKTool("jstack");
-+ final static String PID = getPid();
-+
-+ // looking for header lines with these patterns:
-+ // "ContendingThread-1" #19 prio=5 os_prio=64 tid=0x000000000079c000 nid=0x23 runnable [0xffff80ffb8b87000]
-+ // "ContendingThread-2" #21 prio=5 os_prio=64 tid=0x0000000000780000 nid=0x2f waiting for monitor entry [0xfffffd7fc1111000]
-+ // "ContendingThread-2" #24 prio=5 os_prio=64 tid=0x0000000000ec8800 nid=0x31 waiting on condition [0xfffffd7bbfffe000]
-+ final static Pattern HEADER_PREFIX_PATTERN = Pattern.compile(
-+ "^\"ContendingThread-.*");
-+ final static Pattern HEADER_WAITING_PATTERN1 = Pattern.compile(
-+ "^\"ContendingThread-.* waiting for monitor entry .*");
-+ final static Pattern HEADER_WAITING_PATTERN2 = Pattern.compile(
-+ "^\"ContendingThread-.* waiting on condition .*");
-+ final static Pattern HEADER_RUNNABLE_PATTERN = Pattern.compile(
-+ "^\"ContendingThread-.* runnable .*");
-+
-+ // looking for thread state lines with these patterns:
-+ // java.lang.Thread.State: RUNNABLE
-+ // java.lang.Thread.State: BLOCKED (on object monitor)
-+ final static Pattern THREAD_STATE_PREFIX_PATTERN = Pattern.compile(
-+ " *java\\.lang\\.Thread\\.State: .*");
-+ final static Pattern THREAD_STATE_BLOCKED_PATTERN = Pattern.compile(
-+ " *java\\.lang\\.Thread\\.State: BLOCKED \\(on object monitor\\)");
-+ final static Pattern THREAD_STATE_RUNNABLE_PATTERN = Pattern.compile(
-+ " *java\\.lang\\.Thread\\.State: RUNNABLE");
-+
-+ // looking for duplicates of this pattern:
-+ // - locked <0x000000076ac59e20> (a TestThreadDumpMonitorContention$1)
-+ final static Pattern LOCK_PATTERN = Pattern.compile(
-+ ".* locked \\<.*\\(a TestThreadDumpMonitorContention.*");
-+
-+ // sanity checking header and thread state lines associated
-+ // with this pattern:
-+ // - waiting to lock <0x000000076ac59e20> (a TestThreadDumpMonitorContention$1)
-+ final static Pattern WAITING_PATTERN = Pattern.compile(
-+ ".* waiting to lock \\<.*\\(a TestThreadDumpMonitorContention.*");
-+
-+ final static Object barrier = new Object();
-+ volatile static boolean done = false;
-+
-+ static int barrier_cnt = 0;
-+ static int blank_line_match_cnt = 0;
-+ static int error_cnt = 0;
-+ static boolean have_header_line = false;
-+ static boolean have_thread_state_line = false;
-+ static String header_line = null;
-+ static int header_prefix_match_cnt = 0;
-+ static int locked_line_match_cnt = 0;
-+ static String[] locked_match_list = new String[2];
-+ static int n_samples = 15;
-+ static int sum_both_running_cnt = 0;
-+ static int sum_both_waiting_cnt = 0;
-+ static int sum_contended_cnt = 0;
-+ static int sum_locked_hdr_runnable_cnt = 0;
-+ static int sum_locked_hdr_waiting1_cnt = 0;
-+ static int sum_locked_hdr_waiting2_cnt = 0;
-+ static int sum_locked_thr_state_blocked_cnt = 0;
-+ static int sum_locked_thr_state_runnable_cnt = 0;
-+ static int sum_one_waiting_cnt = 0;
-+ static int sum_uncontended_cnt = 0;
-+ static int sum_waiting_hdr_waiting1_cnt = 0;
-+ static int sum_waiting_thr_state_blocked_cnt = 0;
-+ static String thread_state_line = null;
-+ static boolean verbose = false;
-+ static int waiting_line_match_cnt = 0;
-+
-+ public static void main(String[] args) throws Exception {
-+ if (args.length != 0) {
-+ int arg_i = 0;
-+ if (args[arg_i].equals("-v")) {
-+ verbose = true;
-+ arg_i++;
-+ }
-+
-+ try {
-+ n_samples = Integer.parseInt(args[arg_i]);
-+ } catch (NumberFormatException nfe) {
-+ System.err.println(nfe);
-+ usage();
-+ }
-+ }
-+
-+ Runnable runnable = new Runnable() {
-+ public void run() {
-+ synchronized (barrier) {
-+ // let the main thread know we're running
-+ barrier_cnt++;
-+ barrier.notify();
-+ }
-+ while (!done) {
-+ synchronized (this) { }
-+ }
-+ }
-+ };
-+ Thread[] thread_list = new Thread[2];
-+ thread_list[0] = new Thread(runnable, "ContendingThread-1");
-+ thread_list[1] = new Thread(runnable, "ContendingThread-2");
-+ synchronized (barrier) {
-+ thread_list[0].start();
-+ thread_list[1].start();
-+
-+ // Wait until the contending threads are running so that
-+ // we don't sample any thread init states.
-+ while (barrier_cnt < 2) {
-+ barrier.wait();
-+ }
-+ }
-+
-+ doSamples();
-+
-+ done = true;
-+
-+ thread_list[0].join();
-+ thread_list[1].join();
-+
-+ if (error_cnt == 0) {
-+ System.out.println("Test PASSED.");
-+ } else {
-+ System.out.println("Test FAILED.");
-+ throw new AssertionError("error_cnt=" + error_cnt);
-+ }
-+ }
-+
-+ // Reached a blank line which is the end of the
-+ // stack trace without matching either LOCK_PATTERN
-+ // or WAITING_PATTERN. Rare, but it's not an error.
-+ //
-+ // Example:
-+ // "ContendingThread-1" #21 prio=5 os_prio=64 tid=0x00000000007b9000 nid=0x2f runnable [0xfffffd7fc1111000]
-+ // java.lang.Thread.State: RUNNABLE
-+ // at TestThreadDumpMonitorContention$1.run(TestThreadDumpMonitorContention.java:140)
-+ // at java.lang.Thread.run(Thread.java:745)
-+ //
-+ static boolean checkBlankLine(String line) {
-+ if (line.length() == 0) {
-+ blank_line_match_cnt++;
-+ have_header_line = false;
-+ have_thread_state_line = false;
-+ return true;
-+ }
-+
-+ return false;
-+ }
-+
-+ // Process the locked line here if we found one.
-+ //
-+ // Example 1:
-+ // "ContendingThread-1" #21 prio=5 os_prio=64 tid=0x00000000007b9000 nid=0x2f runnable [0xfffffd7fc1111000]
-+ // java.lang.Thread.State: RUNNABLE
-+ // at TestThreadDumpMonitorContention$1.run(TestThreadDumpMonitorContention.java:140)
-+ // - locked <0xfffffd7e6a2912f8> (a TestThreadDumpMonitorContention$1)
-+ // at java.lang.Thread.run(Thread.java:745)
-+ //
-+ // Example 2:
-+ // "ContendingThread-1" #21 prio=5 os_prio=64 tid=0x00000000007b9000 nid=0x2f waiting for monitor entry [0xfffffd7fc1111000]
-+ // java.lang.Thread.State: BLOCKED (on object monitor)
-+ // at TestThreadDumpMonitorContention$1.run(TestThreadDumpMonitorContention.java:140)
-+ // - locked <0xfffffd7e6a2912f8> (a TestThreadDumpMonitorContention$1)
-+ // at java.lang.Thread.run(Thread.java:745)
-+ //
-+ // Example 3:
-+ // "ContendingThread-2" #24 prio=5 os_prio=64 tid=0x0000000000ec8800 nid=0x31 waiting on condition [0xfffffd7bbfffe000]
-+ // java.lang.Thread.State: RUNNABLE
-+ // JavaThread state: _thread_blocked
-+ // Thread: 0x0000000000ec8800 [0x31] State: _at_safepoint _has_called_back 0 _at_poll_safepoint 0
-+ // JavaThread state: _thread_blocked
-+ // at TestThreadDumpMonitorContention$1.run(TestThreadDumpMonitorContention.java:140)
-+ // - locked <0xfffffd7e6d03eb28> (a TestThreadDumpMonitorContention$1)
-+ // at java.lang.Thread.run(Thread.java:745)
-+ //
-+ static boolean checkLockedLine(String line) {
-+ Matcher matcher = LOCK_PATTERN.matcher(line);
-+ if (matcher.matches()) {
-+ if (verbose) {
-+ System.out.println("locked_line='" + line + "'");
-+ }
-+ locked_match_list[locked_line_match_cnt] = new String(line);
-+ locked_line_match_cnt++;
-+
-+ matcher = HEADER_RUNNABLE_PATTERN.matcher(header_line);
-+ if (matcher.matches()) {
-+ sum_locked_hdr_runnable_cnt++;
-+ } else {
-+ // It's strange, but a locked line can also
-+ // match the HEADER_WAITING_PATTERN{1,2}.
-+ matcher = HEADER_WAITING_PATTERN1.matcher(header_line);
-+ if (matcher.matches()) {
-+ sum_locked_hdr_waiting1_cnt++;
-+ } else {
-+ matcher = HEADER_WAITING_PATTERN2.matcher(header_line);
-+ if (matcher.matches()) {
-+ sum_locked_hdr_waiting2_cnt++;
-+ } else {
-+ System.err.println();
-+ System.err.println("ERROR: header line does " +
-+ "not match runnable or waiting patterns.");
-+ System.err.println("ERROR: header_line='" +
-+ header_line + "'");
-+ System.err.println("ERROR: locked_line='" + line +
-+ "'");
-+ error_cnt++;
-+ }
-+ }
-+ }
-+
-+ matcher = THREAD_STATE_RUNNABLE_PATTERN.matcher(thread_state_line);
-+ if (matcher.matches()) {
-+ sum_locked_thr_state_runnable_cnt++;
-+ } else {
-+ // It's strange, but a locked line can also
-+ // match the THREAD_STATE_BLOCKED_PATTERN.
-+ matcher = THREAD_STATE_BLOCKED_PATTERN.matcher(
-+ thread_state_line);
-+ if (matcher.matches()) {
-+ sum_locked_thr_state_blocked_cnt++;
-+ } else {
-+ System.err.println();
-+ System.err.println("ERROR: thread state line does not " +
-+ "match runnable or waiting patterns.");
-+ System.err.println("ERROR: " + "thread_state_line='" +
-+ thread_state_line + "'");
-+ System.err.println("ERROR: locked_line='" + line + "'");
-+ error_cnt++;
-+ }
-+ }
-+
-+ // Have everything we need from this thread stack
-+ // that matches the LOCK_PATTERN.
-+ have_header_line = false;
-+ have_thread_state_line = false;
-+ return true;
-+ }
-+
-+ return false;
-+ }
-+
-+ // Process the waiting line here if we found one.
-+ //
-+ // Example:
-+ // "ContendingThread-2" #22 prio=5 os_prio=64 tid=0x00000000007b9800 nid=0x30 waiting for monitor entry [0xfffffd7fc1010000]
-+ // java.lang.Thread.State: BLOCKED (on object monitor)
-+ // at TestThreadDumpMonitorContention$1.run(TestThreadDumpMonitorContention.java:140)
-+ // - waiting to lock <0xfffffd7e6a2912f8> (a TestThreadDumpMonitorContention$1)
-+ // at java.lang.Thread.run(Thread.java:745)
-+ //
-+ static boolean checkWaitingLine(String line) {
-+ Matcher matcher = WAITING_PATTERN.matcher(line);
-+ if (matcher.matches()) {
-+ waiting_line_match_cnt++;
-+ if (verbose) {
-+ System.out.println("waiting_line='" + line + "'");
-+ }
-+
-+ matcher = HEADER_WAITING_PATTERN1.matcher(header_line);
-+ if (matcher.matches()) {
-+ sum_waiting_hdr_waiting1_cnt++;
-+ } else {
-+ System.err.println();
-+ System.err.println("ERROR: header line does " +
-+ "not match a waiting pattern.");
-+ System.err.println("ERROR: header_line='" + header_line + "'");
-+ System.err.println("ERROR: waiting_line='" + line + "'");
-+ error_cnt++;
-+ }
-+
-+ matcher = THREAD_STATE_BLOCKED_PATTERN.matcher(thread_state_line);
-+ if (matcher.matches()) {
-+ sum_waiting_thr_state_blocked_cnt++;
-+ } else {
-+ System.err.println();
-+ System.err.println("ERROR: thread state line " +
-+ "does not match a waiting pattern.");
-+ System.err.println("ERROR: thread_state_line='" +
-+ thread_state_line + "'");
-+ System.err.println("ERROR: waiting_line='" + line + "'");
-+ error_cnt++;
-+ }
-+
-+ // Have everything we need from this thread stack
-+ // that matches the WAITING_PATTERN.
-+ have_header_line = false;
-+ have_thread_state_line = false;
-+ return true;
-+ }
-+
-+ return false;
-+ }
-+
-+ static void doSamples() throws Exception {
-+ for (int count = 0; count < n_samples; count++) {
-+ blank_line_match_cnt = 0;
-+ header_prefix_match_cnt = 0;
-+ locked_line_match_cnt = 0;
-+ waiting_line_match_cnt = 0;
-+ // verbose mode or an error has a lot of output so add more space
-+ if (verbose || error_cnt > 0) System.out.println();
-+ System.out.println("Sample #" + count);
-+
-+ // We don't use the ProcessTools, OutputBuffer or
-+ // OutputAnalyzer classes from the testlibrary because
-+ // we have a complicated multi-line parse to perform
-+ // on a narrow subset of the JSTACK output.
-+ //
-+ // - we only care about stack traces that match
-+ // HEADER_PREFIX_PATTERN; only two should match
-+ // - we care about at most three lines from each stack trace
-+ // - if both stack traces match LOCKED_PATTERN, then that's
-+ // a failure and we report it
-+ // - for a stack trace that matches LOCKED_PATTERN, we verify:
-+ // - the header line matches HEADER_RUNNABLE_PATTERN
-+ // or HEADER_WAITING_PATTERN{1,2}
-+ // - the thread state line matches THREAD_STATE_BLOCKED_PATTERN
-+ // or THREAD_STATE_RUNNABLE_PATTERN
-+ // - we report any mismatches as failures
-+ // - for a stack trace that matches WAITING_PATTERN, we verify:
-+ // - the header line matches HEADER_WAITING_PATTERN1
-+ // - the thread state line matches THREAD_STATE_BLOCKED_PATTERN
-+ // - we report any mismatches as failures
-+ // - the stack traces that match HEADER_PREFIX_PATTERN may
-+ // not match either LOCKED_PATTERN or WAITING_PATTERN
-+ // because we might observe the thread outside of
-+ // monitor operations; this is not considered a failure
-+ //
-+ // When we do observe LOCKED_PATTERN or WAITING_PATTERN,
-+ // then we are checking the header and thread state patterns
-+ // that occurred earlier in the current stack trace that
-+ // matched HEADER_PREFIX_PATTERN. We don't use data from
-+ // stack traces that don't match HEADER_PREFIX_PATTERN and
-+ // we don't mix data between the two stack traces that do
-+ // match HEADER_PREFIX_PATTERN.
-+ //
-+ Process process = new ProcessBuilder(JSTACK, PID)
-+ .redirectErrorStream(true).start();
-+
-+ BufferedReader reader = new BufferedReader(new InputStreamReader(
-+ process.getInputStream()));
-+ String line;
-+ while ((line = reader.readLine()) != null) {
-+ Matcher matcher = null;
-+
-+ // process the header line here
-+ if (!have_header_line) {
-+ matcher = HEADER_PREFIX_PATTERN.matcher(line);
-+ if (matcher.matches()) {
-+ header_prefix_match_cnt++;
-+ if (verbose) {
-+ System.out.println();
-+ System.out.println("header='" + line + "'");
-+ }
-+ header_line = new String(line);
-+ have_header_line = true;
-+ continue;
-+ }
-+ continue; // skip until have a header line
-+ }
-+
-+ // process the thread state line here
-+ if (!have_thread_state_line) {
-+ matcher = THREAD_STATE_PREFIX_PATTERN.matcher(line);
-+ if (matcher.matches()) {
-+ if (verbose) {
-+ System.out.println("thread_state='" + line + "'");
-+ }
-+ thread_state_line = new String(line);
-+ have_thread_state_line = true;
-+ continue;
-+ }
-+ continue; // skip until we have a thread state line
-+ }
-+
-+ // process the locked line here if we find one
-+ if (checkLockedLine(line)) {
-+ continue;
-+ }
-+
-+ // process the waiting line here if we find one
-+ if (checkWaitingLine(line)) {
-+ continue;
-+ }
-+
-+ // process the blank line here if we find one
-+ if (checkBlankLine(line)) {
-+ continue;
-+ }
-+ }
-+ process.waitFor();
-+
-+ if (header_prefix_match_cnt != 2) {
-+ System.err.println();
-+ System.err.println("ERROR: should match exactly two headers.");
-+ System.err.println("ERROR: header_prefix_match_cnt=" +
-+ header_prefix_match_cnt);
-+ error_cnt++;
-+ }
-+
-+ if (locked_line_match_cnt == 2) {
-+ if (locked_match_list[0].equals(locked_match_list[1])) {
-+ System.err.println();
-+ System.err.println("ERROR: matching lock lines:");
-+ System.err.println("ERROR: line[0]'" +
-+ locked_match_list[0] + "'");
-+ System.err.println("ERROR: line[1]'" +
-+ locked_match_list[1] + "'");
-+ error_cnt++;
-+ }
-+ }
-+
-+ if (locked_line_match_cnt == 1) {
-+ // one thread has the lock
-+ if (waiting_line_match_cnt == 1) {
-+ // and the other contended for it
-+ sum_contended_cnt++;
-+ } else {
-+ // and the other is just running
-+ sum_uncontended_cnt++;
-+ }
-+ } else if (waiting_line_match_cnt == 1) {
-+ // one thread is waiting
-+ sum_one_waiting_cnt++;
-+ } else if (waiting_line_match_cnt == 2) {
-+ // both threads are waiting
-+ sum_both_waiting_cnt++;
-+ } else {
-+ // both threads are running
-+ sum_both_running_cnt++;
-+ }
-+
-+ // slight delay between jstack launches
-+ Thread.sleep(500);
-+ }
-+
-+ if (error_cnt != 0) {
-+ // skip summary info since there were errors
-+ return;
-+ }
-+
-+ System.out.println("INFO: Summary for all samples:");
-+ System.out.println("INFO: both_running_cnt=" + sum_both_running_cnt);
-+ System.out.println("INFO: both_waiting_cnt=" + sum_both_waiting_cnt);
-+ System.out.println("INFO: contended_cnt=" + sum_contended_cnt);
-+ System.out.println("INFO: one_waiting_cnt=" + sum_one_waiting_cnt);
-+ System.out.println("INFO: uncontended_cnt=" + sum_uncontended_cnt);
-+ System.out.println("INFO: locked_hdr_runnable_cnt=" +
-+ sum_locked_hdr_runnable_cnt);
-+ System.out.println("INFO: locked_hdr_waiting1_cnt=" +
-+ sum_locked_hdr_waiting1_cnt);
-+ System.out.println("INFO: locked_hdr_waiting2_cnt=" +
-+ sum_locked_hdr_waiting2_cnt);
-+ System.out.println("INFO: locked_thr_state_blocked_cnt=" +
-+ sum_locked_thr_state_blocked_cnt);
-+ System.out.println("INFO: locked_thr_state_runnable_cnt=" +
-+ sum_locked_thr_state_runnable_cnt);
-+ System.out.println("INFO: waiting_hdr_waiting1_cnt=" +
-+ sum_waiting_hdr_waiting1_cnt);
-+ System.out.println("INFO: waiting_thr_state_blocked_cnt=" +
-+ sum_waiting_thr_state_blocked_cnt);
-+
-+ if (sum_contended_cnt == 0) {
-+ System.err.println("WARNING: the primary scenario for 8036823" +
-+ " has not been exercised by this test run.");
-+ }
-+ }
-+
-+ // This helper relies on RuntimeMXBean.getName() returning a string
-+ // that looks like this: 5436@mt-haku
-+ //
-+ // The testlibrary has tryFindJvmPid(), but that uses a separate
-+ // process which is much more expensive for finding out your own PID.
-+ //
-+ static String getPid() {
-+ RuntimeMXBean runtimebean = ManagementFactory.getRuntimeMXBean();
-+ String vmname = runtimebean.getName();
-+ int i = vmname.indexOf('@');
-+ if (i != -1) {
-+ vmname = vmname.substring(0, i);
-+ }
-+ return vmname;
-+ }
-+
-+ static void usage() {
-+ System.err.println("Usage: " +
-+ "java TestThreadDumpMonitorContention [-v] [n_samples]");
-+ System.exit(1);
-+ }
-+}
---- ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Mon Jan 05 11:51:17 2015 -0800
-+++ ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Fri Apr 10 09:19:25 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -78,6 +78,8 @@
- public native void NMTUncommitMemory(long addr, long size);
- public native void NMTReleaseMemory(long addr, long size);
- public native boolean NMTWaitForDataMerge();
-+ public native boolean NMTIsDetailSupported();
-+
-
- // Compiler
- public native void deoptimizeAll();
---- ./jaxp/.hgtags Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/.hgtags Fri Apr 10 09:20:34 2015 -0700
-@@ -528,6 +528,10 @@
- fec38133453a8d70d4c528595ae1cab47909c4bd jdk7u72-b14
- e8ab19435208726b1334ba8e7928ea154e0959b3 jdk7u72-b30
- d8246774af472f617033202d2c58c7572da08dcd jdk7u72-b31
-+5746a9dc6d98c5eaab46abe75046b2fcec2615cf jdk7u72-b32
-+abfb7aff6d5e8751329f190606f174716e071142 jdk7u72-b33
-+ad3595ac75f0439da4e06ace8e304505ab42a332 jdk7u72-b34
-+5b30e9e24618919b163bee78f80cd72953c9efd0 jdk7u72-b35
- 4173f90038ff1764576d08efa34109a7895f106b jdk7u75-b00
- b9eaa7d194dd5e23bd2d53be4d57b25fdcb08e31 jdk7u75-b01
- 98eaae4f301779861be3f9a8b0854ec83074615a jdk7u75-b02
-@@ -559,3 +563,37 @@
- 7167fcf821b00424c0464086f4047a7209dc9e59 jdk7u76-b12
- 6262c3d41bb13f58338c4bc7946468ba70825046 jdk7u76-b13
- d3907dca5ffc798076f44cc63f01f7beb41343a9 jdk7u76-b30
-+ddfc89ace6cc33a2d50d5faf100e83b05c9bc89f jdk7u76-b31
-+3cc58d4693ba7c2207265a50ae47f59610b3bb95 jdk7u76-b32
-+908a056c8d8fa65864cbf5745a050f675be35288 jdk7u79-b00
-+186146d5ce15b9478e520d9a44eb520572a66214 jdk7u79-b01
-+acb3bc40a605ab2502c46b92c63a6954bf7c4426 jdk7u79-b02
-+8d582e90be853e4fff06decc0d1f3bc384f28565 jdk7u79-b03
-+9d2f3145e62f4a65541ffaf818d4f200258a54ee jdk7u79-b06
-+c078b41da91eeef6f2a7a9740603ffa597282cf2 jdk7u79-b07
-+5a9ebb8b61b6b97b0f7a56ff822ff3780f848f9b jdk7u79-b08
-+96f58e926ff3e058094ad98bb8d01c4583e50f1f jdk7u79-b09
-+74b91551a3812d6bbb6d75c969b13d0df60fc292 jdk7u79-b10
-+953714f7b347a3253188e88df32a6de98d035d68 jdk7u79-b11
-+c7d64c66bd125b22b0dd03f0191e400b254171ee jdk7u79-b12
-+73bc7d77706a857d71459e9869cc87c734818d7e jdk7u79-b13
-+42032dfbad5ff5d9c9378cb25530e5fa1f226b9a jdk7u79-b14
-+cc39af7b95bb2e96b512b09ecb6dc55bbced4cb6 jdk7u79-b30
-+6abf26813c3bd6047d5425e41dbc9dd1fd51cc63 jdk7u79-b15
-+7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
-+4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
-+25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
-+1853995499cef61fc16e0e4b840276223314669b jdk7u80-b03
-+3f6f053831796f654ad8fd77a6e4f99163742649 jdk7u80-b04
-+b93c3e02132fd13971aea6df3c5f6fcd4c3b1780 jdk7u80-b05
-+d220098f4f327db250263b6c2b460fecec19331a jdk7u80-b06
-+535bdb640a91a8562b96799cefe9de94724ed761 jdk7u80-b07
-+3999f9baa3f0a28f82c6a7a073ad2f7a8e12866d jdk7u80-b08
-+76c9692a8e0a5c083840ca71a82711d1c6407230 jdk7u80-b09
-+a2175451904c4a58441ddb8433cee13bc5f0e81c jdk7u80-b10
-+7a4d5aa53c358761036c8f9c0aa0730991f03c8a jdk7u80-b11
-+b16012262d1fa91f2d09631f923130f35b8e34a0 jdk7u80-b12
-+99e388ae0080339b5369ff7b2b1e2c0c0c17be6a jdk7u80-b13
-+127be49051292a2f1af3375f7c433fa19e1b8898 jdk7u80-b14
-+1b435d2f2050ac43a7f89aadd0fdaa9bf0441e3d jdk7u80-b30
-+acfe75cb9d7a723fbaae0bf7e1b0fb3429df4ff8 jdk7u80-b15
---- ./jaxp/THIRD_PARTY_README Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/THIRD_PARTY_README Fri Apr 10 09:20:34 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
-@@ -1912,35 +1912,6 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to Sparkle v.1.5,
--which is included with JRE 7 on Mac OS X.
--
----- begin of LICENSE ---
--
--Copyright (c) 2012 Sparkle.org and Andy Matuschak
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
----- end of LICENSE ---
--
---------------------------------------------------------------------------------
--
- %% Portions licensed from Taligent, Inc.
-
- -------------------------------------------------------------------------------
-@@ -3198,12 +3169,12 @@
- %% This notice is provided with respect to the following which is
- included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
-
-- Apache Derby 10.8.3.0 [included with JDK 7 only]
-+ Apache Derby 10.8.1.2 [included with JDK 7 only]
- Apache Jakarta BCEL 5.2
- Apache Jakarta Regexp 1.4
- Apache Santuario XMLSec-Java 1.4.2
- Apache Xalan-Java 2.7.1
-- Apache Xerces2 Java 2.11.0
-+ Apache Xerces2 Java 2.10.0
- Apache XML Resolver 1.1
-
-
---- ./jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java Fri Apr 10 09:20:34 2015 -0700
-@@ -213,6 +213,10 @@
- public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {
- stack.push(obj);
- obj.accept(visitor);
-+
-+ LocalVariable[] vars = obj.getLocalVariableTypeTable();
-+ for(int i=0; i < vars.length; i++)
-+ vars[i].accept(this);
- stack.pop();
- }
-
---- ./jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java Fri Apr 10 09:20:34 2015 -0700
-@@ -87,6 +87,7 @@
- private boolean strip_attributes;
-
- private ArrayList variable_vec = new ArrayList();
-+ private ArrayList type_vec = new ArrayList();
- private ArrayList line_number_vec = new ArrayList();
- private ArrayList exception_vec = new ArrayList();
- private ArrayList throws_vec = new ArrayList();
-@@ -260,7 +261,7 @@
- }
- } else if (a instanceof LocalVariableTypeTable) {
- LocalVariable[] lv = ((LocalVariableTypeTable) a).getLocalVariableTypeTable();
-- removeLocalVariables();
-+ removeLocalVariableTypes();
- for (int k = 0; k < lv.length; k++) {
- LocalVariable l = lv[k];
- InstructionHandle start = il.findHandle(l.getStartPC());
-@@ -272,7 +273,7 @@
- if (null == end) {
- end = il.getEnd();
- }
-- addLocalVariable(l.getName(), Type.getType(l.getSignature()), l
-+ addLocalVariableType(l.getName(), Type.getType(l.getSignature()), l
- .getIndex(), start, end);
- }
- } else
-@@ -406,6 +407,31 @@
- return lg;
- }
-
-+ /*
-+ * If the range of the variable has not been set yet, it will be set to be
-+ * val id from the start to the end of the instruction list.
-+ *
-+ * @return array of declared local variable types sorted by index
-+ */
-+ private LocalVariableGen[] getLocalVariableTypes() {
-+ int size = type_vec.size();
-+ LocalVariableGen[] lg = new LocalVariableGen[size];
-+ type_vec.toArray(lg);
-+
-+ for(int i=0; i < size; i++) {
-+ if(lg[i].getStart() == null)
-+ lg[i].setStart(il.getStart());
-+
-+ if(lg[i].getEnd() == null)
-+ lg[i].setEnd(il.getEnd());
-+ }
-+
-+ if(size > 1)
-+ sort(lg, 0, size - 1);
-+
-+ return lg;
-+ }
-+
- /**
- * @return `LocalVariableTable' attribute of all the local variables of this method.
- */
-@@ -422,6 +448,68 @@
- }
-
- /**
-+ * @return `LocalVariableTypeTable' attribute of all the local variable
-+ * types of this method.
-+ */
-+ public LocalVariableTypeTable getLocalVariableTypeTable(ConstantPoolGen cp) {
-+ LocalVariableGen[] lg = getLocalVariableTypes();
-+ int size = lg.length;
-+ LocalVariable[] lv = new LocalVariable[size];
-+
-+ for(int i=0; i < size; i++)
-+ lv[i] = lg[i].getLocalVariable(cp);
-+
-+ return new LocalVariableTypeTable(cp.addUtf8("LocalVariableTypeTable"),
-+ 2 + lv.length * 10, lv, cp.getConstantPool());
-+ }
-+
-+ /**
-+ * Adds a local variable type to this method.
-+ *
-+ * @param name variable name
-+ * @param type variable type
-+ * @param slot the index of the local variable, if type is long or double, the next available
-+ * index is slot+2
-+ * @param start from where the variable is valid
-+ * @param end until where the variable is valid
-+ * @return new local variable object
-+ * @see LocalVariable
-+ */
-+ private LocalVariableGen addLocalVariableType(String name, Type type, int slot,
-+ InstructionHandle start,
-+ InstructionHandle end) {
-+ byte t = type.getType();
-+
-+ if(t != Constants.T_ADDRESS) {
-+ int add = type.getSize();
-+
-+ if(slot + add > max_locals)
-+ max_locals = slot + add;
-+
-+ LocalVariableGen l = new LocalVariableGen(slot, name, type, start, end);
-+ int i;
-+
-+ if((i = type_vec.indexOf(l)) >= 0) // Overwrite if necessary
-+ type_vec.set(i, l);
-+ else
-+ type_vec.add(l);
-+
-+ return l;
-+ } else {
-+ throw new IllegalArgumentException("Can not use " + type +
-+ " as type for local variable");
-+
-+ }
-+ }
-+
-+ /**
-+ * Remove all local variable types.
-+ */
-+ private void removeLocalVariableTypes() {
-+ type_vec.clear();
-+ }
-+
-+ /**
- * Give an instruction a line number corresponding to the source code line.
- *
- * @param ih instruction to tag
-@@ -637,12 +725,17 @@
-
- LineNumberTable lnt = null;
- LocalVariableTable lvt = null;
-+ LocalVariableTypeTable lvtt = null;
-
-- /* Create LocalVariableTable and LineNumberTable attributes (for debuggers, e.g.)
-+ /* Create LocalVariableTable, LocalvariableTypeTable, and LineNumberTable
-+ * attributes (for debuggers, e.g.)
- */
- if((variable_vec.size() > 0) && !strip_attributes)
- addCodeAttribute(lvt = getLocalVariableTable(cp));
-
-+ if((type_vec.size() > 0) && !strip_attributes)
-+ addCodeAttribute(lvtt = getLocalVariableTypeTable(cp));
-+
- if((line_number_vec.size() > 0) && !strip_attributes)
- addCodeAttribute(lnt = getLineNumberTable(cp));
-
-@@ -691,6 +784,7 @@
-
- // Undo effects of adding attributes
- if(lvt != null) removeCodeAttribute(lvt);
-+ if(lvtt != null) removeCodeAttribute(lvtt);
- if(lnt != null) removeCodeAttribute(lnt);
- if(code != null) removeAttribute(code);
- if(et != null) removeAttribute(et);
---- ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java Fri Apr 10 09:20:34 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -151,6 +151,16 @@
- */
- public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth";
-
-+ /**
-+ * JDK TransformerFactory and Transformer attribute that specifies a class
-+ * loader that will be used for extension functions class loading
-+ * Value: a "null", the default value, means that the default EF class loading
-+ * path will be used.
-+ * Instance of ClassLoader: the specified instance of ClassLoader will be used
-+ * for extension functions loading during translation process
-+ */
-+ public static final String JDK_EXTENSION_CLASSLOADER = "jdk.xml.transform.extensionClassLoader";
-+
- //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/res/XSLTErrorResources_de.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_de.java,v 1.2.4.1 2005/09/13 10:08:18 pvedula Exp $
-+ * $Id: XSLTErrorResources_de.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -1016,7 +1016,7 @@
- "Systemeigenschaft \"org.xml.sax.parser\" nicht angegeben"},
-
- { ER_PARSER_ARG_CANNOT_BE_NULL,
-- "Parser-Argument darf nicht null sein"},
-+ "Parserargument darf nicht null sein"},
-
- { ER_FEATURE,
- "Feature: {0}"},
-@@ -1213,7 +1213,7 @@
- "Funktionsname darf nicht null sein."},
-
- { ER_XPATH_RESOLVER_NEGATIVE_ARITY,
-- "Anzahl von Argumenten darf nicht negativ sein."},
-+ "Argumentanzahl darf nicht negativ sein."},
- // Warnings...
-
- { WG_FOUND_CURLYBRACE,
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (Stiller Modus)]"},
- { "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"},
- { "optionCR", " [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (Escape-Zeichen {Standard ist <>&\"\'\r\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"},
- { "optionINDENT", " [-INDENT (Steuern, wie viele Leerzeichen der Einzug enthalten soll {Standard ist 0})]"},
- { "optionTT", " [-TT (Vorlagen verfolgen, wenn diese aufgerufen werden.)]"},
- { "optionTG", " [-TG (Jedes Generierungsereignis verfolgen.)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_es.java,v 1.2.4.1 2005/09/13 10:16:43 pvedula Exp $
-+ * $Id: XSLTErrorResources_es.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (Modo Silencioso)]"},
- { "optionLF", " [-LF (Utilizar saltos de l\u00EDnea s\u00F3lo en la salida {el valor por defecto es CR/LF})]"},
- { "optionCR", " [-CR (Utilizar retornos de carro s\u00F3lo en la salida {el valor por defecto es CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (Caracteres para introducir escape {el valor por defecto es <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (Caracteres para introducir escape {el valor por defecto es <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (Control del n\u00FAmero de espacios para el sangrado {el valor por defecto es 0})]"},
- { "optionTT", " [-TT (Rastrear las plantillas como si se estuviesen llamando.)]"},
- { "optionTG", " [-TG (Rastrear cada evento de generaci\u00F3n.)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_fr.java,v 1.2.4.1 2005/09/13 10:20:30 pvedula Exp $
-+ * $Id: XSLTErrorResources_fr.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -931,7 +931,7 @@
- "Gestionnaire de contenu NULL"},
-
- { ER_NULL_ERROR_HANDLER,
-- "Gestionnaire d'erreur NULL"},
-+ "Gestionnaire d'erreurs NULL"},
-
- { ER_CANNOT_CALL_PARSE,
- "impossible d'appeler l'analyse si le gestionnaire de contenu n'est pas d\u00E9fini"},
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (Mode silencieux)]"},
- { "optionLF", " [-LF (Utiliser les retours \u00E0 la ligne uniquement en sortie {valeur par d\u00E9faut : CR/LF})]"},
- { "optionCR", " [-CR (Utiliser les retours chariot uniquement en sortie {valeur par d\u00E9faut : CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (Avec caract\u00E8res d'espacement {valeur par d\u00E9faut : <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (Avec caract\u00E8res d'espacement {valeur par d\u00E9faut : <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (Contr\u00F4ler le nombre d'espaces \u00E0 mettre en retrait {valeur par d\u00E9faut : 0})]"},
- { "optionTT", " [-TT (G\u00E9n\u00E9rer une trace des mod\u00E8les pendant qu'ils sont appel\u00E9s.)]"},
- { "optionTG", " [-TG (G\u00E9n\u00E9rer une trace de chaque \u00E9v\u00E9nement de g\u00E9n\u00E9ration.)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_it.java,v 1.2.4.1 2005/09/13 10:23:57 pvedula Exp $
-+ * $Id: XSLTErrorResources_it.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (modalit\u00E0 silenziosa)]"},
- { "optionLF", " [-LF (usa avanzamenti riga solo nell'output {il valore predefinito \u00E8 CR/LF})]"},
- { "optionCR", " [-CR (usa ritorni a capo solo nell'output {il valore predefinito \u00E8 CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (caratteri da sottoporre a escape {il valore predefinito \u00E8 <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (caratteri da sottoporre a escape {il valore predefinito \u00E8 <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (determina il numero di spazi da indentare {il valore predefinito \u00E8 0})]"},
- { "optionTT", " [-TT (tiene traccia dei modelli mentre vengono richiamati.)]"},
- { "optionTG", " [-TG (tiene traccia di ogni evento di generazione.)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_ja.java,v 1.2.4.1 2005/09/13 10:34:30 pvedula Exp $
-+ * $Id: XSLTErrorResources_ja.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -775,7 +775,7 @@
- "\u5165\u529BDOM\u30CE\u30FC\u30C9\u306BDTMLiaison\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093...\u304B\u308F\u308A\u306Bcom.sun.org.apache.xpath.internal.DOM2Helper\u3092\u6E21\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-
- { ER_CALL_TO_EXT_FAILED,
-- "\u62E1\u5F35\u8981\u7D20\u306E\u547C\u51FA\u3057\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}"},
-+ "\u62E1\u5F35\u8981\u7D20\u306E\u547C\u51FA\u3057\u304C\u5931\u6557\u3057\u307E\u3057\u305F: {0}"},
-
- { ER_PREFIX_MUST_RESOLVE,
- "\u63A5\u982D\u8F9E\u306F\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u89E3\u6C7A\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}"},
-@@ -1337,8 +1337,8 @@
- // Note to translators: The following messages provide usage information
- // for the Xalan Process command line. "Process" is the name of a Java class,
- // and should not be translated.
-- { "xslProc_option", "Xalan-J\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30D7\u30ED\u30BB\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:"},
-- { "xslProc_option", "Xalan-J\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30D7\u30ED\u30BB\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:"},
-+ { "xslProc_option", "Xalan-J\u30B3\u30DE\u30F3\u30C9\u884C\u30D7\u30ED\u30BB\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:"},
-+ { "xslProc_option", "Xalan-J\u30B3\u30DE\u30F3\u30C9\u884C\u30D7\u30ED\u30BB\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u30AA\u30D7\u30B7\u30E7\u30F3:"},
- { "xslProc_invalid_xsltc_option", "\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306FXSLTC\u30E2\u30FC\u30C9\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
- { "xslProc_invalid_xalan_option", "\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F-XSLTC\u3068\u3068\u3082\u306B\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002"},
- { "xslProc_no_input", "\u30A8\u30E9\u30FC: \u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u307E\u305F\u306F\u5165\u529Bxml\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u4F7F\u7528\u65B9\u6CD5\u306E\u6307\u793A\u306B\u3064\u3044\u3066\u306F\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4ED8\u3051\u305A\u306B\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (\u6291\u5236\u30E2\u30FC\u30C9)]"},
- { "optionLF", " [-LF (\u51FA\u529B\u3067\u306E\u307F\u6539\u884C\u3092\u4F7F\u7528{\u30C7\u30D5\u30A9\u30EB\u30C8\u306FCR/LF})]"},
- { "optionCR", " [-CR (\u51FA\u529B\u3067\u306E\u307F\u6539\u884C\u3092\u4F7F\u7528{\u30C7\u30D5\u30A9\u30EB\u30C8\u306FCR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (\u30A8\u30B9\u30B1\u30FC\u30D7\u3059\u308B\u6587\u5B57{\u30C7\u30D5\u30A9\u30EB\u30C8\u306F<>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (\u30A8\u30B9\u30B1\u30FC\u30D7\u3059\u308B\u6587\u5B57{\u30C7\u30D5\u30A9\u30EB\u30C8\u306F<>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (\u30A4\u30F3\u30C7\u30F3\u30C8\u3059\u308B\u7A7A\u767D\u6587\u5B57\u6570\u3092\u5236\u5FA1{\u30C7\u30D5\u30A9\u30EB\u30C8\u306F0})]"},
- { "optionTT", " [-TT (\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u547C\u3073\u51FA\u3055\u308C\u305F\u3068\u304D\u306B\u30C8\u30EC\u30FC\u30B9\u3059\u308B\u3002)]"},
- { "optionTG", " [-TG (\u5404\u751F\u6210\u30A4\u30D9\u30F3\u30C8\u3092\u30C8\u30EC\u30FC\u30B9\u3059\u308B\u3002)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_ko.java,v 1.2.4.1 2005/09/13 11:03:57 pvedula Exp $
-+ * $Id: XSLTErrorResources_ko.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:58 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q(\uC790\uB3D9 \uBAA8\uB4DC)]"},
- { "optionLF", " [-LF(\uCD9C\uB825\uC5D0\uB9CC \uC904 \uBC14\uAFC8 \uC0AC\uC6A9 {\uAE30\uBCF8\uAC12: CR/LF})]"},
- { "optionCR", " [-CR(\uCD9C\uB825\uC5D0\uB9CC \uCE90\uB9AC\uC9C0 \uB9AC\uD134 \uC0AC\uC6A9 {\uAE30\uBCF8\uAC12: CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE(\uC774\uC2A4\uCF00\uC774\uD504 \uBB38\uC790 {\uAE30\uBCF8\uAC12: <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE(\uC774\uC2A4\uCF00\uC774\uD504 \uBB38\uC790 {\uAE30\uBCF8\uAC12: <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT(\uB4E4\uC5EC \uC4F8 \uACF5\uBC31 \uC218 \uC81C\uC5B4 {\uAE30\uBCF8\uAC12: 0})]"},
- { "optionTT", " [-TT(\uD15C\uD50C\uB9AC\uD2B8 \uD638\uCD9C \uC2DC \uCD94\uC801)]"},
- { "optionTG", " [-TG(\uAC01 \uC0DD\uC131 \uC774\uBCA4\uD2B8 \uCD94\uC801)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -17,9 +17,8 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--
- /*
-- * $Id: XSLTErrorResources_pt_BR.java 3023 2011-03-01 00:53:34Z joehw $
-+ * $Id: XSLTErrorResources_pt_BR.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -631,7 +630,7 @@
- "Falha ao processar a folha de estilos!"},
-
- { ER_COULDNT_PARSE_DOC,
-- "N\u00E3o foi poss\u00EDvel fazer parse do documento {0}!"},
-+ "N\u00E3o foi poss\u00EDvel fazer parsing do documento {0}!"},
-
- { ER_COULDNT_FIND_FRAGMENT,
- "N\u00E3o foi poss\u00EDvel localizar o fragmento: {0}"},
-@@ -673,7 +672,7 @@
- "result-ns n\u00E3o \u00E9 mais suportado! Em vez disso, use xsl:output."},
-
- { ER_DEFAULTSPACE_NOT_SUPPORTED,
-- "default-space n\u00E3o \u00E9 mais suportado! Em vez disso, use xsl:strip-space ou xsl:preserve-space."},
-+ "padr\u00E3o-space n\u00E3o \u00E9 mais suportado! Em vez disso, use xsl:strip-space ou xsl:preserve-space."},
-
- { ER_INDENTRESULT_NOT_SUPPORTED,
- "indent-result n\u00E3o \u00E9 mais suportado! Em vez disso, use xsl:output."},
-@@ -908,10 +907,10 @@
- "2 ou 3"},
-
- { ER_COULD_NOT_LOAD_RESOURCE,
-- "N\u00E3o foi poss\u00EDvel carregar {0} (verificar CLASSPATH); usando agora apenas os defaults"},
-+ "N\u00E3o foi poss\u00EDvel carregar {0} (verificar CLASSPATH); usando agora apenas os padr\u00F5es"},
-
- { ER_CANNOT_INIT_DEFAULT_TEMPLATES,
-- "N\u00E3o \u00E9 poss\u00EDvel inicializar os modelos default"},
-+ "N\u00E3o \u00E9 poss\u00EDvel inicializar os modelos padr\u00E3o"},
-
- { ER_RESULT_NULL,
- "O resultado n\u00E3o deve ser nulo"},
-@@ -935,7 +934,7 @@
- "Handler de erro nulo"},
-
- { ER_CANNOT_CALL_PARSE,
-- "o parse n\u00E3o poder\u00E1 ser chamado se o ContentHandler n\u00E3o tiver sido definido"},
-+ "o parsing n\u00E3o poder\u00E1 ser chamado se o ContentHandler n\u00E3o tiver sido definido"},
-
- { ER_NO_PARENT_FOR_FILTER,
- "Nenhum pai para o filtro"},
-@@ -969,7 +968,7 @@
- //in locale specific files like XSLTErrorResources_de.java, XSLTErrorResources_fr.java etc.
- //NOTE: Not only the key name but message has also been changed.
- { ER_VALUE_SHOULD_BE_NUMBER,
-- "O valor para {0} deve conter um n\u00FAmero pass\u00EDvel de parse"},
-+ "O valor para {0} deve conter um n\u00FAmero pass\u00EDvel de parsing"},
-
- { ER_VALUE_SHOULD_EQUAL,
- "O valor para {0} deve ser igual a sim ou n\u00E3o"},
-@@ -1187,7 +1186,7 @@
- "O valor do par\u00E2metro {0} deve ser um Objeto Java v\u00E1lido"},
-
- { ER_INVALID_NAMESPACE_URI_VALUE_FOR_RESULT_PREFIX_FOR_DEFAULT,
-- "O atributo result-prefix de um elemento xsl:namespace-alias tem o valor '#default', mas n\u00E3o h\u00E1 declara\u00E7\u00E3o do namespace default no escopo do elemento"},
-+ "O atributo result-prefix de um elemento xsl:namespace-alias tem o valor '#padr\u00E3o', mas n\u00E3o h\u00E1 declara\u00E7\u00E3o do namespace padr\u00E3o no escopo do elemento"},
-
- { ER_INVALID_NAMESPACE_URI_VALUE_FOR_RESULT_PREFIX,
- "O atributo result-prefix de um elemento xsl:namespace-alias tem o valor ''{0}'', mas n\u00E3o h\u00E1 declara\u00E7\u00E3o de namespace para o prefixo ''{0}'' no escopo do elemento."},
-@@ -1254,7 +1253,7 @@
- "Conflitos de especificidade encontrados: {0} Ser\u00E1 usado o \u00FAltimo encontrado na folha de estilos."},
-
- { WG_PARSING_AND_PREPARING,
-- "========= Fazendo parse e preparando {0} =========="},
-+ "========= Fazendo parsing e preparando {0} =========="},
-
- { WG_ATTR_TEMPLATE,
- "Modelo do Atributo, {0}"},
-@@ -1272,7 +1271,7 @@
- "Namespace de XSLT n\u00E3o encontrado ou incorreto. "},
-
- { WG_ONE_DEFAULT_XSLDECIMALFORMAT_ALLOWED,
-- "\u00C9 permitida somente uma declara\u00E7\u00E3o de xsl:decimal-format default."},
-+ "\u00C9 permitida somente uma declara\u00E7\u00E3o de xsl:decimal-format padr\u00E3o."},
-
- { WG_XSLDECIMALFORMAT_NAMES_MUST_BE_UNIQUE,
- "os nomes de xsl:decimal-format devem ser exclusivos. O nome \"{0}\" foi duplicado."},
-@@ -1364,16 +1363,16 @@
- { "optionV", " [-E (N\u00E3o expandir refer\u00EAncias da entidade)]"},
- { "optionQC", " [-QC (Advert\u00EAncias de Conflitos do Padr\u00E3o Silencioso)]"},
- { "optionQ", " [-Q (Modo Silencioso)]"},
-- { "optionLF", " [-LF (Usar alimenta\u00E7\u00F5es de linha somente na sa\u00EDda {o default \u00E9 CR/LF})]"},
-- { "optionCR", " [-CR (Use retornos de carro somente na sa\u00EDda {o default \u00E9 CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (Quais caracteres devem ser identificados como escape {o default \u00E9 <>&\"\'\\r\\n}]"},
-- { "optionINDENT", " [-INDENT (Controla quantos espa\u00E7os devem ser recuados {o default \u00E9 0})]"},
-+ { "optionLF", " [-LF (Usar alimenta\u00E7\u00F5es de linha somente na sa\u00EDda {o padr\u00E3o \u00E9 CR/LF})]"},
-+ { "optionCR", " [-CR (Use retornos de carro somente na sa\u00EDda {o padr\u00E3o \u00E9 CR/LF})]"},
-+ { "optionESCAPE", " [-ESCAPE (Quais caracteres devem ser identificados como escape {o padr\u00E3o \u00E9 <>&\"'\\r\\n}]"},
-+ { "optionINDENT", " [-INDENT (Controla quantos espa\u00E7os devem ser recuados {o padr\u00E3o \u00E9 0})]"},
- { "optionTT", " [-TT (Rastreia os modelos \u00E0 medida que s\u00E3o chamados.)]"},
- { "optionTG", " [-TG (Rastreia cada evento de gera\u00E7\u00E3o.)]"},
- { "optionTS", " [-TS (Rastreia cada evento de sele\u00E7\u00E3o.)]"},
- { "optionTTC", " [-TTC (Rastreia os filhos do modelo \u00E0 medida que s\u00E3o processados.)]"},
- { "optionTCLASS", " [-TCLASS (Classe TraceListener para extens\u00F5es de rastreamento.)]"},
-- { "optionVALIDATE", " [-VALIDATE (Define se ocorre valida\u00E7\u00E3o. Por default, a valida\u00E7\u00E3o fica desativada.)]"},
-+ { "optionVALIDATE", " [-VALIDATE (Define se ocorre valida\u00E7\u00E3o. Por padr\u00E3o, a valida\u00E7\u00E3o fica desativada.)]"},
- { "optionEDUMP", " [-EDUMP {nome do arquivo opcional} (Execute um dump de pilha em caso de erro.)]"},
- { "optionXML", " [-XML (Use o formatador XML e adicione o cabe\u00E7alho XML.)]"},
- { "optionTEXT", " [-TEXT (Use o formatador de Texto simples.)]"},
-@@ -1402,7 +1401,7 @@
- { "optionXO", " [-XO [transletName] (atribui o nome ao translet gerado)]"},
- { "optionXD", " [-XD destinationDirectory (especificar um diret\u00F3rio de destino para translet)]"},
- { "optionXJ", " [-XJ jarfile (empacotar classes do translet em um arquivo jar com o nome <jarfile>)]"},
-- { "optionXP", " [-XP package (especifica um prefixo de nome do pacote para todas as classes translet geradas)]"},
-+ { "optionXP", " [-XP pacote (especifica um prefixo de nome do pacote para todas as classes translet geradas)]"},
-
- //AddITIONAL STRINGS that need L10n
- // Note to translators: The following message describes usage of a particular
-@@ -1448,5 +1447,4 @@
- public static final String QUERY_HEADER = "PATTERN ";
-
-
--
--}
-+ }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_sv.java,v 1.2.4.1 2005/09/13 11:12:11 pvedula Exp $
-+ * $Id: XSLTErrorResources_sv.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -501,7 +501,7 @@
- "{0} m\u00E5ste ha ett namnattribut."},
-
- {ER_TEMPLATE_NOT_FOUND,
-- "Kunde inte hitta mallen med namnet: {0}"},
-+ "Hittade inte mallen med namnet: {0}"},
-
- {ER_CANT_RESOLVE_NAME_AVT,
- "Kunde inte matcha namn-AVT i xsl:call-template."},
-@@ -516,10 +516,10 @@
- "Felaktigt v\u00E4rde i niv\u00E5attribut: {0}"},
-
- {ER_PROCESSINGINSTRUCTION_NAME_CANT_BE_XML,
-- "Namn p\u00E5 processing-instruction kan inte vara 'xml'"},
-+ "Namn p\u00E5 bearbetningsinstruktion kan inte vara 'xml'"},
-
- { ER_PROCESSINGINSTRUCTION_NOTVALID_NCNAME,
-- "Namn p\u00E5 processing-instruction m\u00E5ste vara ett giltigt NCName: {0}"},
-+ "Namn p\u00E5 bearbetningsinstruktion m\u00E5ste vara ett giltigt NCName: {0}"},
-
- { ER_NEED_MATCH_ATTRIB,
- "{0} m\u00E5ste ha ett matchningsattribut n\u00E4r det anger ett l\u00E4ge."},
-@@ -594,7 +594,7 @@
- "Fick IO-undantag med formatmallfil: {0}"},
-
- { ER_NO_HREF_ATTRIB,
-- "(StylesheetHandler) Kunde inte hitta href-attribut f\u00F6r {0}"},
-+ "(StylesheetHandler) Hittade inte href-attribut f\u00F6r {0}"},
-
- { ER_STYLESHEET_INCLUDES_ITSELF,
- "(StylesheetHandler) {0} inkluderar, direkt eller indirekt, sig sj\u00E4lv!"},
-@@ -633,7 +633,7 @@
- "Kunde inte tolka dokumentet {0}!"},
-
- { ER_COULDNT_FIND_FRAGMENT,
-- "Kunde inte hitta fragment: {0}"},
-+ "Hittade inte fragment: {0}"},
-
- { ER_NODE_NOT_ELEMENT,
- "Nod som pekades p\u00E5 av fragment-identifierare var inte ett element: {0}"},
-@@ -802,7 +802,7 @@
- "Ogiltigt funktionsanrop: rekursiva key()-anrop \u00E4r inte till\u00E5tna"},
-
- { ER_REFERENCING_ITSELF,
-- "Variabel {0} h\u00E4nvisar, direkt eller indirekt, till sig sj\u00E4lv!"},
-+ "Variabeln {0} refererar, direkt eller indirekt, till sig sj\u00E4lv!"},
-
- { ER_ILLEGAL_DOMSOURCE_INPUT,
- "Indatanoden till en DOMSource f\u00F6r newTemplates f\u00E5r inte vara null!"},
-@@ -1001,7 +1001,7 @@
- "F\u00F6rs\u00F6ker formatera ett tal som \u00E4r st\u00F6rre \u00E4n det st\u00F6rsta l\u00E5nga heltalet"},
-
- { ER_CANNOT_FIND_SAX1_DRIVER,
-- "Kan inte hitta SAX1-drivrutinen klass {0}"},
-+ "Hittar inte SAX1-drivrutinen klass {0}"},
-
- { ER_SAX1_DRIVER_NOT_LOADED,
- "SAX1-drivrutinen klass {0} hittades, men kan inte laddas"},
-@@ -1064,7 +1064,7 @@
- // 'RedundentExprEliminator' is the name of a class, and should not be
- // translated.
- { ER_ASSERT_REDUNDENT_EXPR_ELIMINATOR,
-- "Programmerarverifiering i RedundentExprEliminator: {0}"},
-+ "Programmerarens utsaga i RedundentExprEliminator: {0}"},
-
- { ER_NOT_ALLOWED_IN_POSITION,
- "{0} \u00E4r inte till\u00E5ten i denna position i formatmallen!"},
-@@ -1229,7 +1229,7 @@
- "Xalan hanterar \u00E4nnu inte spr\u00E5knamnet i funktionen format-number."},
-
- { WG_LOCALE_NOT_FOUND,
-- "Varning: Kunde inte hitta spr\u00E5kinst\u00E4llning f\u00F6r xml:lang={0}"},
-+ "Varning: Hittade inte spr\u00E5kinst\u00E4llning f\u00F6r xml:lang={0}"},
-
- { WG_CANNOT_MAKE_URL_FROM,
- "Kan inte skapa URL fr\u00E5n: {0}"},
-@@ -1238,7 +1238,7 @@
- "Kan inte ladda beg\u00E4rt dokument: {0}"},
-
- { WG_CANNOT_FIND_COLLATOR,
-- "Hittade inte uppsamlare f\u00F6r <sort xml:lang={0}"},
-+ "Hittade inte kollationering f\u00F6r <sort xml:lang={0}"},
-
- { WG_FUNCTIONS_SHOULD_USE_URL,
- "Gammal syntax: funktionsinstruktionen b\u00F6r anv\u00E4nda url:en {0}"},
-@@ -1250,7 +1250,7 @@
- "kodning underst\u00F6ds inte: {0}, anv\u00E4nder Java {1}"},
-
- { WG_SPECIFICITY_CONFLICTS,
-- "Specificitetkonflikter hittades: {0} Senast hittade i formatmall kommer att anv\u00E4ndas."},
-+ "Specifika konflikter hittades: {0} Senast hittade i formatmall kommer att anv\u00E4ndas."},
-
- { WG_PARSING_AND_PREPARING,
- "========= Tolkar och f\u00F6rbereder {0} =========="},
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (Tyst l\u00E4ge)]"},
- { "optionLF", " [-LF (Anv\u00E4nd radmatningar endast f\u00F6r utdata {standard \u00E4r CR/LF})]"},
- { "optionCR", " [-CR (Anv\u00E4nd radmatningar endast f\u00F6r utdata {standard \u00E4r CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (Vilka tecken \u00E4r skiftningstecken {standard \u00E4r <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (Vilka tecken \u00E4r skiftningstecken {standard \u00E4r <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (Best\u00E4m antal blanksteg f\u00F6r indrag {standard \u00E4r 0})]"},
- { "optionTT", " [-TT (Sp\u00E5ra mallar vid anrop.)]"},
- { "optionTG", " [-TG (Sp\u00E5ra varje generationsh\u00E4ndelse.)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_zh_CN.java,v 1.2.4.1 2005/09/13 11:14:39 pvedula Exp $
-+ * $Id: XSLTErrorResources_zh_CN.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -630,7 +630,7 @@
- "\u65E0\u6CD5\u5904\u7406\u6837\u5F0F\u8868!"},
-
- { ER_COULDNT_PARSE_DOC,
-- "\u65E0\u6CD5\u5BF9{0}\u6587\u6863\u8FDB\u884C\u8BED\u6CD5\u5206\u6790!"},
-+ "\u65E0\u6CD5\u89E3\u6790{0}\u6587\u6863!"},
-
- { ER_COULDNT_FIND_FRAGMENT,
- "\u627E\u4E0D\u5230\u7247\u6BB5: {0}"},
-@@ -968,7 +968,7 @@
- //in locale specific files like XSLTErrorResources_de.java, XSLTErrorResources_fr.java etc.
- //NOTE: Not only the key name but message has also been changed.
- { ER_VALUE_SHOULD_BE_NUMBER,
-- "{0}\u7684\u503C\u5E94\u5305\u542B\u53EF\u8BED\u6CD5\u5206\u6790\u7684\u6570\u5B57"},
-+ "{0}\u7684\u503C\u5E94\u5305\u542B\u53EF\u89E3\u6790\u7684\u6570\u5B57"},
-
- { ER_VALUE_SHOULD_EQUAL,
- "{0}\u7684\u503C\u5E94\u7B49\u4E8E\u201C\u662F\u201D\u6216\u201C\u5426\u201D"},
-@@ -1016,7 +1016,7 @@
- "\u672A\u6307\u5B9A\u7CFB\u7EDF\u5C5E\u6027 org.xml.sax.parser"},
-
- { ER_PARSER_ARG_CANNOT_BE_NULL,
-- "\u8BED\u6CD5\u5206\u6790\u5668\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u503C"},
-+ "\u89E3\u6790\u5668\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u503C"},
-
- { ER_FEATURE,
- "\u529F\u80FD: {0}"},
-@@ -1253,7 +1253,7 @@
- "\u53D1\u73B0\u7279\u5F81\u51B2\u7A81: \u5C06\u4F7F\u7528\u4E0A\u6B21\u5728\u6837\u5F0F\u8868\u4E2D\u627E\u5230\u7684{0}\u3002"},
-
- { WG_PARSING_AND_PREPARING,
-- "========= \u8BED\u6CD5\u5206\u6790\u548C\u51C6\u5907{0} =========="},
-+ "========= \u89E3\u6790\u548C\u51C6\u5907{0} =========="},
-
- { WG_ATTR_TEMPLATE,
- "\u5C5E\u6027\u6A21\u677F{0}"},
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (\u65E0\u63D0\u793A\u6A21\u5F0F)]"},
- { "optionLF", " [-LF (\u4EC5\u5728\u8F93\u51FA\u65F6\u4F7F\u7528\u6362\u884C\u7B26 {\u9ED8\u8BA4\u503C\u4E3A CR/LF})]"},
- { "optionCR", " [-CR (\u4EC5\u5728\u8F93\u51FA\u65F6\u4F7F\u7528\u56DE\u8F66 {\u9ED8\u8BA4\u503C\u4E3A CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (\u8981\u8F6C\u79FB\u7684\u5B57\u7B26 {\u9ED8\u8BA4\u503C\u4E3A <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (\u8981\u8F6C\u79FB\u7684\u5B57\u7B26 {\u9ED8\u8BA4\u503C\u4E3A <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (\u63A7\u5236\u8981\u7F29\u8FDB\u7684\u7A7A\u683C\u6570 {\u9ED8\u8BA4\u503C\u4E3A 0})]"},
- { "optionTT", " [-TT (\u5728\u8C03\u7528\u6A21\u677F\u65F6\u8DDF\u8E2A\u6A21\u677F\u3002)]"},
- { "optionTG", " [-TG (\u8DDF\u8E2A\u6BCF\u4E2A\u751F\u6210\u4E8B\u4EF6\u3002)]"},
-@@ -1379,7 +1379,7 @@
- { "optionHTML", " [-HTML (\u4F7F\u7528 HTML \u683C\u5F0F\u8BBE\u7F6E\u5DE5\u5177\u3002)]"},
- { "optionPARAM", " [-PARAM \u540D\u79F0\u8868\u8FBE\u5F0F (\u8BBE\u7F6E\u6837\u5F0F\u8868\u53C2\u6570)]"},
- { "noParsermsg1", "XSL \u8FDB\u7A0B\u672A\u6210\u529F\u3002"},
-- { "noParsermsg2", "** \u627E\u4E0D\u5230\u8BED\u6CD5\u5206\u6790\u5668 **"},
-+ { "noParsermsg2", "** \u627E\u4E0D\u5230\u89E3\u6790\u5668 **"},
- { "noParsermsg3", "\u8BF7\u68C0\u67E5\u60A8\u7684\u7C7B\u8DEF\u5F84\u3002"},
- { "noParsermsg4", "\u5982\u679C\u6CA1\u6709 IBM \u63D0\u4F9B\u7684 XML Parser for Java, \u5219\u53EF\u4EE5\u4ECE"},
- { "noParsermsg5", "IBM AlphaWorks \u8FDB\u884C\u4E0B\u8F7D, \u7F51\u5740\u4E3A: http://www.alphaworks.ibm.com/formula/xml"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XSLTErrorResources_zh_TW.java,v 1.2.4.1 2005/09/13 11:19:31 pvedula Exp $
-+ * $Id: XSLTErrorResources_zh_TW.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
- */
- package com.sun.org.apache.xalan.internal.res;
-
-@@ -1365,7 +1365,7 @@
- { "optionQ", " [-Q (\u975C\u97F3\u6A21\u5F0F)]"},
- { "optionLF", " [-LF (\u8F38\u51FA\u4E0A\u50C5\u4F7F\u7528\u63DB\u884C\u5B57\u5143 {\u9810\u8A2D\u70BA CR/LF})]"},
- { "optionCR", " [-CR (\u8F38\u51FA\u4E0A\u50C5\u4F7F\u7528\u6B78\u4F4D\u5B57\u5143 {\u9810\u8A2D\u70BA CR/LF})]"},
-- { "optionESCAPE", " [-ESCAPE (\u8981\u9041\u96E2\u7684\u5B57\u5143 {\u9810\u8A2D\u70BA <>&\"\'\\r\\n}]"},
-+ { "optionESCAPE", " [-ESCAPE (\u8981\u9041\u96E2\u7684\u5B57\u5143 {\u9810\u8A2D\u70BA <>&\"'\\r\\n}]"},
- { "optionINDENT", " [-INDENT (\u63A7\u5236\u8981\u7E2E\u6392\u7684\u7A7A\u9593 {\u9810\u8A2D\u70BA 0})]"},
- { "optionTT", " [-TT (\u8FFD\u8E64\u547C\u53EB\u7684\u6A23\u677F\u3002)]"},
- { "optionTG", " [-TG (\u8FFD\u8E64\u6BCF\u500B\u7522\u751F\u4E8B\u4EF6\u3002)]"},
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Fri Apr 10 09:20:34 2015 -0700
-@@ -104,6 +104,9 @@
- protected final static String EXSLT_STRINGS =
- "http://exslt.org/strings";
-
-+ protected final static String XALAN_CLASSPACKAGE_NAMESPACE =
-+ "xalan://";
-+
- // Namespace format constants
- protected final static int NAMESPACE_FORMAT_JAVA = 0;
- protected final static int NAMESPACE_FORMAT_CLASS = 1;
-@@ -900,8 +903,22 @@
- if (_className != null && _className.length() > 0) {
- final int nArgs = _arguments.size();
- try {
-- if (_clazz == null) {
-- _clazz = ObjectFactory.findProviderClass(_className, true);
-+ if (_clazz == null) {
-+ final boolean isSecureProcessing = getXSLTC().isSecureProcessing();
-+ final boolean isExtensionFunctionEnabled = getXSLTC()
-+ .getFeature(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION);
-+
-+ //Check if FSP and SM - only then proceed with loading
-+ if (namespace != null && isSecureProcessing
-+ && isExtensionFunctionEnabled
-+ && (namespace.equals(JAVA_EXT_XALAN)
-+ || namespace.equals(JAVA_EXT_XSLTC)
-+ || namespace.equals(JAVA_EXT_XALAN_OLD)
-+ || namespace.startsWith(XALAN_CLASSPACKAGE_NAMESPACE))) {
-+ _clazz = getXSLTC().loadExternalFunction(_className);
-+ } else {
-+ _clazz = ObjectFactory.findProviderClass(_className, true);
-+ }
-
- if (_clazz == null) {
- final ErrorMsg msg =
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Fri Apr 10 09:20:34 2015 -0700
-@@ -23,24 +23,6 @@
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler;
-
--import java.io.BufferedOutputStream;
--import java.io.ByteArrayOutputStream;
--import java.io.File;
--import java.io.FileOutputStream;
--import java.io.IOException;
--import java.io.InputStream;
--import java.net.URL;
--import java.util.Date;
--import java.util.Enumeration;
--import java.util.Hashtable;
--import java.util.Map;
--import java.util.Properties;
--import java.util.Vector;
--import java.util.jar.JarEntry;
--import java.util.jar.JarOutputStream;
--import java.util.jar.Manifest;
--import javax.xml.XMLConstants;
--
- 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;
-@@ -50,7 +32,27 @@
- 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 java.io.BufferedOutputStream;
-+import java.io.ByteArrayOutputStream;
-+import java.io.File;
-+import java.io.FileOutputStream;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.net.URL;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-+import java.util.Collections;
-+import java.util.Date;
-+import java.util.Enumeration;
-+import java.util.HashMap;
-+import java.util.Hashtable;
-+import java.util.Map;
-+import java.util.Properties;
-+import java.util.Vector;
-+import java.util.jar.JarEntry;
-+import java.util.jar.JarOutputStream;
-+import java.util.jar.Manifest;
-+import javax.xml.XMLConstants;
- import org.xml.sax.InputSource;
- import org.xml.sax.XMLReader;
-
-@@ -153,11 +155,25 @@
- private final FeatureManager _featureManager;
-
- /**
-+ * Extension function class loader variables
-+ */
-+
-+ /* Class loader reference that will be used for external extension functions loading */
-+ private ClassLoader _extensionClassLoader;
-+
-+ /**
-+ * HashMap with the loaded classes
-+ */
-+ private final Map<String, Class> _externalExtensionFunctions;
-+
-+ /**
- * XSLTC compiler constructor
- */
- public XSLTC(boolean useServicesMechanism, FeatureManager featureManager) {
- _parser = new Parser(this, useServicesMechanism);
- _featureManager = featureManager;
-+ _extensionClassLoader = null;
-+ _externalExtensionFunctions = new HashMap<>();
- }
-
- /**
-@@ -207,6 +223,8 @@
- return _accessExternalDTD;
- } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
- return _xmlSecurityManager;
-+ } else if (name.equals(XalanConstants.JDK_EXTENSION_CLASSLOADER)) {
-+ return _extensionClassLoader;
- }
- return null;
- }
-@@ -222,6 +240,11 @@
- _accessExternalDTD = (String)value;
- } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
- _xmlSecurityManager = (XMLSecurityManager)value;
-+ } else if (name.equals(XalanConstants.JDK_EXTENSION_CLASSLOADER)) {
-+ _extensionClassLoader = (ClassLoader) value;
-+ /* Clear the external extension functions HashMap if extension class
-+ loader was changed */
-+ _externalExtensionFunctions.clear();
- }
- }
-
-@@ -256,6 +279,41 @@
- _bcelClasses = new Vector();
- }
-
-+ private void setExternalExtensionFunctions(String name, Class clazz) {
-+ if (_isSecureProcessing && clazz != null && !_externalExtensionFunctions.containsKey(name)) {
-+ _externalExtensionFunctions.put(name, clazz);
-+ }
-+ }
-+
-+ /*
-+ * Function loads an external extension functions.
-+ * The filtering of function types (external,internal) takes place in FunctionCall class
-+ *
-+ */
-+ Class loadExternalFunction(String name) throws ClassNotFoundException {
-+ Class loaded = null;
-+ //Check if the function is not loaded already
-+ if (_externalExtensionFunctions.containsKey(name)) {
-+ loaded = _externalExtensionFunctions.get(name);
-+ } else if (_extensionClassLoader != null) {
-+ loaded = Class.forName(name, true, _extensionClassLoader);
-+ setExternalExtensionFunctions(name, loaded);
-+ }
-+ if (loaded == null) {
-+ throw new ClassNotFoundException(name);
-+ }
-+ //Return loaded class
-+ return (Class) loaded;
-+ }
-+
-+ /*
-+ * Returns unmodifiable view of HashMap with loaded external extension
-+ * functions - will be needed for the TransformerImpl
-+ */
-+ public Map<String, Class> getExternalExtensionFunctions() {
-+ return Collections.unmodifiableMap(_externalExtensionFunctions);
-+ }
-+
- /**
- * Initializes the compiler to produce a new translet
- */
-@@ -283,6 +341,7 @@
- -1, // LEVEL_MULTIPLE
- -1 // LEVEL_ANY
- };
-+ _externalExtensionFunctions.clear();
- }
-
- /**
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java Fri Apr 10 09:20:34 2015 -0700
-@@ -602,6 +602,9 @@
- {ErrorMsg.JAXP_INVALID_ATTR_ERR,
- "TransformerFactory does not recognise attribute ''{0}''."},
-
-+ {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR,
-+ "Incorrect value specified for ''{0}'' attribute."},
-+
- /*
- * Note to translators: "setResult()" and "startDocument()" are Java
- * method names that should not be translated.
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_de.java,v 1.2.4.1 2005/09/15 10:02:28 pvedula Exp $
-+ * $Id: ErrorMessages_de.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "Stylesheet-Ziel \"{0}\" konnte nicht gelesen werden, weil der \"{1}\"-Zugriff wegen einer von der Eigenschaft accessExternalStylesheet festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "WARNING: \"{0}\"\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "FATAL ERROR: \"{0}\"\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "ERROR: \"{0}\"\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "Das Feature \"{0}\" kann nicht f\u00FCr diese TransformerFactory festgelegt werden."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: Feature kann nicht auf \"false\" gesetzt werden, wenn Security Manager vorhanden ist."}
-+ "FEATURE_SECURE_PROCESSING: Feature kann nicht auf \"false\" gesetzt werden, wenn Security Manager vorhanden ist."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "Interner XSLTC-Fehler: Der generierte Bytecode enth\u00E4lt einen Try-Catch-Finally-Block. Outline nicht m\u00F6glich."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "Interner XSLTC-Fehler: Die Marker OutlineableChunkStart und OutlineableChunkEnd m\u00FCssen ausgeglichen und ordnungsgem\u00E4\u00DF platziert sein."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "Interner XSLTC-Fehler: Eine Anweisung, die Teil eines Bytecodeblocks war, f\u00FCr den ein Outline erstellt wurde, wird nach wie vor in der Originalmethode referenziert."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "Interner XSLTC-Fehler: Eine Methode im Translet \u00FCberschreitet die Java Virtual Machine-L\u00E4ngeneinschr\u00E4nkung einer Methode von 64 KB. Ursache hierf\u00FCr sind in der Regel sehr gro\u00DFe Vorlagen in einem Stylesheet. Versuchen Sie, das Stylesheet mit kleineren Vorlagen umzustrukturieren."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Wenn die Java-Sicherheit aktiviert ist, ist die Unterst\u00FCtzung f\u00FCr das Deserialisieren von TemplatesImpl deaktiviert. Dies kann durch Setzen der Systemeigenschaft jdk.xml.enableTemplatesImplDeserialization auf \"True\" au\u00DFer Kraft gesetzt werden."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_es.java,v 1.2.4.1 2005/09/15 10:03:56 pvedula Exp $
-+ * $Id: ErrorMessages_es.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "No se ha podido leer el destino de hoja de estilos ''{0}'', porque no se permite el acceso ''{1}'' debido a una restricci\u00F3n definida por la propiedad accessExternalStylesheet."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "ADVERTENCIA: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "ERROR FATAL: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "ERROR: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "No se puede definir la funci\u00F3n ''{0}''en esta f\u00E1brica del transformador."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: no se puede definir la funci\u00F3n en false cuando est\u00E1 presente el gestor de seguridad."}
-+ "FEATURE_SECURE_PROCESSING: no se puede definir la funci\u00F3n en false cuando est\u00E1 presente el gestor de seguridad."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "Error interno de XSLTC: el c\u00F3digo de bytes generado contiene un bloque try-catch-finally y no se puede delimitar."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "Error interno de XSLTC: los marcadores OutlineableChunkStart y OutlineableChunkEnd deben estar equilibrados y correctamente anidados."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "Error interno de XSLTC: todav\u00EDa se hace referencia a una instrucci\u00F3n que formaba parte de un bloque de c\u00F3digo de bytes delimitado en el m\u00E9todo original."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "Error interno de XSLTC: un m\u00E9todo en el translet excede la limitaci\u00F3n de Java Virtual Machine de longitud de un m\u00E9todo de 64 kilobytes. Normalmente, esto lo causan plantillas en una hoja de estilos demasiado grandes. Pruebe a reestructurar la hoja de estilos para utilizar plantillas m\u00E1s peque\u00F1as."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Cuando la seguridad de Java est\u00E1 activada, el soporte para anular la serializaci\u00F3n de TemplatesImpl est\u00E1 desactivado. Esto se puede sustituir definiendo la propiedad del sistema jdk.xml.enableTemplatesImplDeserialization en true."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_fr.java,v 1.2.4.1 2005/09/15 10:04:47 pvedula Exp $
-+ * $Id: ErrorMessages_fr.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "Impossible de lire la cible de feuille de style ''{0}'' car l''acc\u00E8s \u00E0 ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalStylesheet."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "AVERTISSEMENT : ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "ERREUR FATALE : ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "ERREUR : ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "Impossible de d\u00E9finir la fonctionnalit\u00E9 ''{0}'' sur cette propri\u00E9t\u00E9 TransformerFactory."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING : impossible de d\u00E9finir la fonctionnalit\u00E9 sur False en pr\u00E9sence du gestionnaire de s\u00E9curit\u00E9."}
-+ "FEATURE_SECURE_PROCESSING : impossible de d\u00E9finir la fonctionnalit\u00E9 sur False en pr\u00E9sence du gestionnaire de s\u00E9curit\u00E9."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "Erreur XSLTC interne : le code ex\u00E9cutable g\u00E9n\u00E9r\u00E9 contient un bloc try-catch-finally et ne peut pas \u00EAtre d\u00E9limit\u00E9."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "Erreur XSLTC interne : les marqueurs OutlineableChunkStart et OutlineableChunkEnd doivent \u00EAtre \u00E9quilibr\u00E9s et correctement imbriqu\u00E9s."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "Erreur XSLTC interne : une instruction ayant fait partie d'un bloc de code ex\u00E9cutable d\u00E9limit\u00E9 est toujours r\u00E9f\u00E9renc\u00E9e dans la m\u00E9thode d'origine."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "Erreur XSLTC interne : une m\u00E9thode dans le translet d\u00E9passe la limite de la JVM concernant la longueur d'une m\u00E9thode de 64 kilo-octets. En g\u00E9n\u00E9ral, ceci est d\u00FB \u00E0 de tr\u00E8s grands mod\u00E8les dans une feuille de style. Essayez de restructurer la feuille de style pour utiliser des mod\u00E8les plus petits."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Lorsque la s\u00E9curit\u00E9 Java est activ\u00E9e, la prise en charge de la d\u00E9s\u00E9rialisation de TemplatesImpl est d\u00E9sactiv\u00E9e. La d\u00E9finition de la propri\u00E9t\u00E9 syst\u00E8me jdk.xml.enableTemplatesImplDeserialization sur True permet de remplacer ce param\u00E8tre."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_it.java,v 1.2.4.1 2005/09/15 10:07:02 pvedula Exp $
-+ * $Id: ErrorMessages_it.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "Impossibile leggere la destinazione del foglio di stile ''{0}''. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalStylesheet."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "Avvertenza: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "ERRORE IRREVERSIBILE: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "ERRORE: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "Impossibile impostare la funzione ''{0}'' in questo TransformerFactory."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: impossibile impostare la funzione su false se \u00E8 presente Security Manager."}
-+ "FEATURE_SECURE_PROCESSING: impossibile impostare la funzione su false se \u00E8 presente Security Manager."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "Errore XSLTC interno: il bytecode generato contiene un blocco try-catch-finally e non pu\u00F2 essere di tipo outlined."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "Errore XSLTC interno: gli indicatori OutlineableChunkStart e OutlineableChunkEnd devono essere bilanciati e nidificati correttamente."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "Errore XSLTC interno: a un'istruzione che faceva parte di un blocco di bytecode di tipo outlined viene ancora fatto riferimento nel metodo originale."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "Errore XSLTC interno: un metodo nel translet supera la limitazione Java Virtual Machine relativa alla lunghezza per un metodo di 64 kilobyte. Ci\u00F2 \u00E8 generalmente causato dalle grandi dimensioni dei modelli in un foglio di stile. Provare a ristrutturare il foglio di stile per utilizzare modelli di dimensioni inferiori."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Quando la sicurezza Java \u00E8 abilitata, il supporto per la deserializzazione TemplatesImpl \u00E8 disabilitato. \u00C8 possibile ignorare questa condizione impostando su true la propriet\u00E0 di sistema jdk.xml.enableTemplatesImplDeserialization."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_ja.java,v 1.2.4.1 2005/09/15 10:08:16 pvedula Exp $
-+ * $Id: ErrorMessages_ja.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "accessExternalStylesheet\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\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u30FB\u30BF\u30FC\u30B2\u30C3\u30C8''{0}''\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -682,7 +682,7 @@
- * documentation.
- */
- {ErrorMsg.COMPILE_USAGE_STR,
-- "SYNOPSIS\n java com.sun.org.apache.xalan.internal.xsltc.cmdline.Compile [-o <output>]\n [-d <directory>] [-j <jarfile>] [-p <package>]\n [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n -o <output> \u540D\u524D<output>\u3092\u751F\u6210\u6E08translet\u306B\n \u5272\u308A\u5F53\u3066\u308B\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001translet\u540D\u306F\n <stylesheet>\u540D\u306B\u7531\u6765\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n \u8907\u6570\u306E\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u30B3\u30F3\u30D1\u30A4\u30EB\u3059\u308B\u5834\u5408\u306F\u7121\u8996\u3055\u308C\u307E\u3059\u3002\n -d <directory> translet\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A\u3059\u308B\n -j <jarfile> <jarfile>\u3067\u6307\u5B9A\u3055\u308C\u308B\u540D\u524D\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306Btranslet\u30AF\u30E9\u30B9\u3092\n \u30D1\u30C3\u30B1\u30FC\u30B8\u3059\u308B\n -p <package> \u751F\u6210\u3055\u308C\u308B\u3059\u3079\u3066\u306Etranslet\u30AF\u30E9\u30B9\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\n \u63A5\u982D\u8F9E\u3092\u6307\u5B9A\u3059\u308B\u3002\n -n \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30A4\u30F3\u30E9\u30A4\u30F3\u5316\u3092\u6709\u52B9\u306B\u3059\u308B(\u5E73\u5747\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u52D5\u4F5C\u306E\u65B9\u304C\n \u512A\u308C\u3066\u3044\u307E\u3059)\u3002\n -x \u8FFD\u52A0\u306E\u30C7\u30D0\u30C3\u30B0\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u51FA\u529B\u3092\u30AA\u30F3\u306B\u3059\u308B\n -u <stylesheet>\u5F15\u6570\u3092URL\u3068\u3057\u3066\u89E3\u91C8\u3059\u308B\n -i \u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092stdin\u304B\u3089\u8AAD\u307F\u8FBC\u3080\u3053\u3068\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u5F37\u5236\u3059\u308B\n -v \u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n -h \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u6587\u3092\u51FA\u529B\u3059\u308B\n"},
-+ "\u5F62\u5F0F\n java com.sun.org.apache.xalan.internal.xsltc.cmdline.Compile [-o <output>]\n [-d <directory>] [-j <jarfile>] [-p <package>]\n [-n] [-x] [-u] [-v] [-h] { <stylesheet> | -i }\n\nOPTIONS\n -o <output> \u540D\u524D<output>\u3092\u751F\u6210\u6E08translet\u306B\n \u5272\u308A\u5F53\u3066\u308B\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001translet\u540D\u306F\n <stylesheet>\u540D\u306B\u7531\u6765\u3057\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n \u8907\u6570\u306E\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u30B3\u30F3\u30D1\u30A4\u30EB\u3059\u308B\u5834\u5408\u306F\u7121\u8996\u3055\u308C\u307E\u3059\u3002\n -d <directory> translet\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A\u3059\u308B\n -j <jarfile> <jarfile>\u3067\u6307\u5B9A\u3055\u308C\u308B\u540D\u524D\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306Btranslet\u30AF\u30E9\u30B9\u3092\n \u30D1\u30C3\u30B1\u30FC\u30B8\u3059\u308B\n -p <package> \u751F\u6210\u3055\u308C\u308B\u3059\u3079\u3066\u306Etranslet\u30AF\u30E9\u30B9\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\n \u63A5\u982D\u8F9E\u3092\u6307\u5B9A\u3059\u308B\u3002\n -n \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30A4\u30F3\u30E9\u30A4\u30F3\u5316\u3092\u6709\u52B9\u306B\u3059\u308B(\u5E73\u5747\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u52D5\u4F5C\u306E\u65B9\u304C\n \u512A\u308C\u3066\u3044\u307E\u3059)\u3002\n -x \u8FFD\u52A0\u306E\u30C7\u30D0\u30C3\u30B0\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u51FA\u529B\u3092\u30AA\u30F3\u306B\u3059\u308B\n -u <stylesheet>\u5F15\u6570\u3092URL\u3068\u3057\u3066\u89E3\u91C8\u3059\u308B\n -i \u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092stdin\u304B\u3089\u8AAD\u307F\u8FBC\u3080\u3053\u3068\u3092\u30B3\u30F3\u30D1\u30A4\u30E9\u306B\u5F37\u5236\u3059\u308B\n -v \u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n -h \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u6587\u3092\u51FA\u529B\u3059\u308B\n"},
-
- /*
- * Note to translators: This message contains usage information for a
-@@ -694,7 +694,7 @@
- * documentation.
- */
- {ErrorMsg.TRANSFORM_USAGE_STR,
-- "SYNOPSIS \n java com.sun.org.apache.xalan.internal.xsltc.cmdline.Transform [-j <jarfile>]\n [-x] [-n <iterations>] {-u <document_url> | <document>}\n <class> [<param1>=<value1> ...]\n\n translet <class>\u3092\u4F7F\u7528\u3057\u3066\u3001<document>\u3067\u6307\u5B9A\u3055\u308C\u308B\n XML\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u5909\u63DB\u3059\u308B\u3002translet <class>\u306F\n \u30E6\u30FC\u30B6\u30FC\u306ECLASSPATH\u5185\u304B\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3055\u308C\u305F<jarfile>\u5185\u306B\u3042\u308A\u307E\u3059\u3002\nOPTIONS\n -j <jarfile> translet\u3092\u30ED\u30FC\u30C9\u3059\u308Bjarfile\u3092\u6307\u5B9A\u3059\u308B\n -x \u8FFD\u52A0\u306E\u30C7\u30D0\u30C3\u30B0\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u51FA\u529B\u3092\u30AA\u30F3\u306B\u3059\u308B\n -n <iterations> \u5909\u63DB\u3092<iterations>\u56DE\u5B9F\u884C\u3057\u3001\n \u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u60C5\u5831\u3092\u8868\u793A\u3059\u308B\n -u <document_url> XML\u5165\u529B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092URL\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\n"},
-+ "\u5F62\u5F0F \n java com.sun.org.apache.xalan.internal.xsltc.cmdline.Transform [-j <jarfile>]\n [-x] [-n <iterations>] {-u <document_url> | <document>}\n <class> [<param1>=<value1> ...]\n\n translet <class>\u3092\u4F7F\u7528\u3057\u3066\u3001<document>\u3067\u6307\u5B9A\u3055\u308C\u308B\n XML\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u5909\u63DB\u3059\u308B\u3002translet <class>\u306F\n \u30E6\u30FC\u30B6\u30FC\u306ECLASSPATH\u5185\u304B\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3055\u308C\u305F<jarfile>\u5185\u306B\u3042\u308A\u307E\u3059\u3002\nOPTIONS\n -j <jarfile> translet\u3092\u30ED\u30FC\u30C9\u3059\u308Bjarfile\u3092\u6307\u5B9A\u3059\u308B\n -x \u8FFD\u52A0\u306E\u30C7\u30D0\u30C3\u30B0\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u51FA\u529B\u3092\u30AA\u30F3\u306B\u3059\u308B\n -n <iterations> \u5909\u63DB\u3092<iterations>\u56DE\u5B9F\u884C\u3057\u3001\n \u30D7\u30ED\u30D5\u30A1\u30A4\u30EA\u30F3\u30B0\u60C5\u5831\u3092\u8868\u793A\u3059\u308B\n -u <document_url> XML\u5165\u529B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092URL\u3068\u3057\u3066\u6307\u5B9A\u3059\u308B\n"},
-
-
-
-@@ -761,14 +761,14 @@
- * line option that was not recognized.
- */
- {ErrorMsg.ILLEGAL_CMDLINE_OPTION_ERR,
-- "\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002"},
-+ "\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002"},
-
- /*
- * Note to translators: The substitution text is the name of a command-
- * line option.
- */
- {ErrorMsg.CMDLINE_OPT_MISSING_ARG_ERR,
-- "\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u306B\u5FC5\u9808\u306E\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002"},
-+ "\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3''{0}''\u306B\u5FC5\u9808\u306E\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "\u8B66\u544A: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "\u81F4\u547D\u7684\u30A8\u30E9\u30FC: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "\u30A8\u30E9\u30FC: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "\u6A5F\u80FD''{0}''\u3092\u3053\u306ETransformerFactory\u306B\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002"},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "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"}
-+ "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"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "\u5185\u90E8XSLTC\u30A8\u30E9\u30FC: \u751F\u6210\u3055\u308C\u305F\u30D0\u30A4\u30C8\u30FB\u30B3\u30FC\u30C9\u306F\u3001try-catch-finally\u30D6\u30ED\u30C3\u30AF\u3092\u542B\u3093\u3067\u3044\u308B\u305F\u3081\u3001\u30A2\u30A6\u30C8\u30E9\u30A4\u30F3\u5316\u3067\u304D\u307E\u305B\u3093\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "\u5185\u90E8XSLTC\u30A8\u30E9\u30FC: OutlineableChunkStart\u30DE\u30FC\u30AB\u30FC\u3068OutlineableChunkEnd\u30DE\u30FC\u30AB\u30FC\u306F\u3001\u5BFE\u306B\u306A\u3063\u3066\u304A\u308A\u3001\u304B\u3064\u6B63\u3057\u304F\u30CD\u30B9\u30C8\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "\u5185\u90E8XSLTC\u30A8\u30E9\u30FC: \u30A2\u30A6\u30C8\u30E9\u30A4\u30F3\u5316\u3055\u308C\u305F\u30D0\u30A4\u30C8\u30FB\u30B3\u30FC\u30C9\u306E\u30D6\u30ED\u30C3\u30AF\u306E\u4E00\u90E8\u3067\u3042\u3063\u305F\u547D\u4EE4\u306F\u3001\u5143\u306E\u30E1\u30BD\u30C3\u30C9\u306E\u4E2D\u3067\u307E\u3060\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002"
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "\u5185\u90E8XSLTC\u30A8\u30E9\u30FC: \u30C8\u30E9\u30F3\u30B9\u30EC\u30C3\u30C8\u5185\u306E\u30E1\u30BD\u30C3\u30C9\u304C\u3001Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u5236\u9650(1\u30E1\u30BD\u30C3\u30C9\u306E\u9577\u3055\u306F\u6700\u592764\u30AD\u30ED\u30D0\u30A4\u30C8)\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002\u4E00\u822C\u7684\u306B\u3001\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u5185\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30B5\u30A4\u30BA\u304C\u5927\u304D\u904E\u304E\u308B\u3053\u3068\u304C\u539F\u56E0\u3068\u3057\u3066\u8003\u3048\u3089\u308C\u307E\u3059\u3002\u5C0F\u3055\u3044\u30B5\u30A4\u30BA\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u3001\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u518D\u69CB\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Java\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u304C\u6709\u52B9\u5316\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001TemplatesImpl\u306E\u30C7\u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u306E\u30B5\u30DD\u30FC\u30C8\u306F\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u3001jdk.xml.enableTemplatesImplDeserialization\u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092true\u306B\u8A2D\u5B9A\u3057\u3066\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3067\u304D\u307E\u3059\u3002"}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_ko.java,v 1.2.4.1 2005/09/15 10:10:07 pvedula Exp $
-+ * $Id: ErrorMessages_ko.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:58 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "accessExternalStylesheet \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 \uC2A4\uD0C0\uC77C\uC2DC\uD2B8 \uB300\uC0C1 ''{0}''\uC744(\uB97C) \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "\uACBD\uACE0: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "\uCE58\uBA85\uC801\uC778 \uC624\uB958: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "\uC624\uB958: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "\uC774 TransformerFactory\uC5D0\uC11C ''{0}'' \uAE30\uB2A5\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "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."}
-+ "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."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "\uB0B4\uBD80 XSLTC \uC624\uB958: \uC0DD\uC131\uB41C \uBC14\uC774\uD2B8 \uCF54\uB4DC\uAC00 try-catch-finally \uBE14\uB85D\uC744 \uD3EC\uD568\uD558\uBBC0\uB85C outlined \uCC98\uB9AC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "\uB0B4\uBD80 XSLTC \uC624\uB958: OutlineableChunkStart \uBC0F OutlineableChunkEnd \uD45C\uC2DC\uC790\uC758 \uC9DD\uC774 \uB9DE\uC544\uC57C \uD558\uACE0 \uC62C\uBC14\uB974\uAC8C \uC911\uCCA9\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "\uB0B4\uBD80 XSLTC \uC624\uB958: outlined \uCC98\uB9AC\uB41C \uBC14\uC774\uD2B8 \uCF54\uB4DC \uBE14\uB85D\uC5D0 \uC18D\uD55C \uBA85\uB839\uC774 \uC5EC\uC804\uD788 \uC6D0\uB798 \uBA54\uC18C\uB4DC\uC5D0\uC11C \uCC38\uC870\uB429\uB2C8\uB2E4."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "\uB0B4\uBD80 XSLTC \uC624\uB958: translet\uC758 \uBA54\uC18C\uB4DC\uAC00 Java Virtual Machine\uC758 \uBA54\uC18C\uB4DC \uAE38\uC774 \uC81C\uD55C\uC778 64KB\uB97C \uCD08\uACFC\uD569\uB2C8\uB2E4. \uB300\uAC1C \uC2A4\uD0C0\uC77C\uC2DC\uD2B8\uC758 \uD15C\uD50C\uB9AC\uD2B8\uAC00 \uB9E4\uC6B0 \uD06C\uAE30 \uB54C\uBB38\uC5D0 \uBC1C\uC0DD\uD569\uB2C8\uB2E4. \uB354 \uC791\uC740 \uD15C\uD50C\uB9AC\uD2B8\uB97C \uC0AC\uC6A9\uD558\uB3C4\uB85D \uC2A4\uD0C0\uC77C\uC2DC\uD2B8\uB97C \uC7AC\uAD6C\uC131\uD574 \uBCF4\uC2ED\uC2DC\uC624."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Java \uBCF4\uC548\uC774 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uB41C \uACBD\uC6B0 TemplatesImpl \uC9C1\uB82C\uD654 \uD574\uC81C\uC5D0 \uB300\uD55C \uC9C0\uC6D0\uC774 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uB429\uB2C8\uB2E4. jdk.xml.enableTemplatesImplDeserialization \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 true\uB85C \uC124\uC815\uD558\uBA74 \uC774\uB97C \uBB34\uD6A8\uD654\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -17,10 +17,10 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+/*
-+ * $Id: ErrorMessages_pt_BR.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-+ */
-
--/*
-- * $Id: ErrorMessages_pt_BR.java 3023 2011-03-01 00:53:34Z joehw $
-- */
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-
- import java.util.ListResourceBundle;
-@@ -214,7 +214,7 @@
- * the expression.
- */
- {ErrorMsg.XPATH_PARSER_ERR,
-- "Erro durante o parse da express\u00E3o XPath ''{0}''."},
-+ "Erro durante o parsing da express\u00E3o XPath ''{0}''."},
-
- /*
- * Note to translators: An element in the stylesheet requires a
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "N\u00E3o foi poss\u00EDvel ler o alvo ''{0}'' da folha de estilos, porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em virtude da restri\u00E7\u00E3o definida pela propriedade accessExternalStylesheet."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -475,7 +475,7 @@
- * encountered in the stylesheet but is not recognized.
- */
- {ErrorMsg.ELEMENT_PARSE_ERR,
-- "N\u00E3o foi poss\u00EDvel fazer parse do elemento ''{0}''"},
-+ "N\u00E3o foi poss\u00EDvel fazer parsing do elemento ''{0}''"},
-
- /*
- * Note to translators: "use", "<key>", "node", "node-set", "string"
-@@ -519,7 +519,7 @@
- * contains the expression that was in error.
- */
- {ErrorMsg.ATTR_VAL_TEMPLATE_ERR,
-- "N\u00E3o \u00E9 poss\u00EDvel fazer parse do modelo do valor do atributo ''{0}''."},
-+ "N\u00E3o \u00E9 poss\u00EDvel fazer parsing do modelo do valor do atributo ''{0}''."},
-
- /*
- * Note to translators: ???
-@@ -682,7 +682,7 @@
- * documentation.
- */
- {ErrorMsg.COMPILE_USAGE_STR,
-- "SINOPSE\n java com.sun.org.apache.xalan.internal.xsltc.cmdline.Compile [-o <sa\u00EDda>]\n [-d <diret\u00F3rio>] [-j <jarfile>] [-p <pacote>]\n [-n] [-x] [-u] [-v] [-h] { <folha de estilos> | -i }\n\nOP\u00C7\u00D5ES\n -o <sa\u00EDda> atribui o nome <sa\u00EDda> ao translet\n gerado. Por default, o nome translet\n origina-se do nome <folha de estilos>. Esta op\u00E7\u00E3o\n \u00E9 ignorada caso sejam compiladas v\u00E1rias folhas de estilos.\n -d <diret\u00F3rio> especifica um diret\u00F3rio de destino para translet\n -j <arquivo jar> empacota as classes translet em um arquivo jar do\n nome especificado como <arquivo jar>\n -p <pacote> especifica um prefixo de nome do pacote para todas as classes\n translet geradas.\n -n permite a inclus\u00E3o do modelo na linha (comportamento default melhor\n em m\u00E9dia).\n -x ativa a sa\u00EDda de mensagens de depura\u00E7\u00E3o adicionais\n -u interpreta os argumentos <folha de estilos> como URLs\n -i obriga o compilador a ler a folha de estilos de stdin\n -v imprime a vers\u00E3o do compilador\n -h imprime esta instru\u00E7\u00E3o de uso\n"},
-+ "SINOPSE\n java com.sun.org.apache.xalan.internal.xsltc.cmdline.Compile [-o <sa\u00EDda>]\n [-d <diret\u00F3rio>] [-j <jarfile>] [-p <pacote>]\n [-n] [-x] [-u] [-v] [-h] { <folha de estilos> | -i }\n\nOP\u00C7\u00D5ES\n -o <sa\u00EDda> atribui o nome <sa\u00EDda> ao translet\n gerado. Por padr\u00E3o, o nome translet\n origina-se do nome <folha de estilos>. Esta op\u00E7\u00E3o\n \u00E9 ignorada caso sejam compiladas v\u00E1rias folhas de estilos.\n -d <diret\u00F3rio> especifica um diret\u00F3rio de destino para translet\n -j <arquivo jar> empacota as classes translet em um arquivo jar do\n nome especificado como <arquivo jar>\n -p <pacote> especifica um prefixo de nome do pacote para todas as classes\n translet geradas.\n -n permite a inclus\u00E3o do modelo na linha (comportamento padr\u00E3o melhor\n em m\u00E9dia).\n -x ativa a sa\u00EDda de mensagens de depura\u00E7\u00E3o adicionais\n -u interpreta os argumentos <folha de estilos> como URLs\n -i obriga o compilador a ler a folha de estilos de stdin\n -v imprime a vers\u00E3o do compilador\n -h imprime esta instru\u00E7\u00E3o de uso\n"},
-
- /*
- * Note to translators: This message contains usage information for a
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "ADVERT\u00CANCIA: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "ERRO FATAL: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "ERRO: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "N\u00E3o \u00E9 poss\u00EDvel definir o recurso ''{0}'' nesta TransformerFactory."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: N\u00E3o \u00E9 poss\u00EDvel definir o recurso como falso quando o gerenciador de seguran\u00E7a est\u00E1 presente."}
-+ "FEATURE_SECURE_PROCESSING: N\u00E3o \u00E9 poss\u00EDvel definir o recurso como falso quando o gerenciador de seguran\u00E7a est\u00E1 presente."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "Erro interno de XSLTC: o byte code gerado cont\u00E9m um bloco try-catch-finally e n\u00E3o pode ser outlined."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "Erro interno de XSLTC: os marcadores OutlineableChunkStart e OutlineableChunkEnd devem ser balanceados e aninhados corretamente."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "Erro interno de XSLTC: ainda h\u00E1 refer\u00EAncia no m\u00E9todo original a uma instru\u00E7\u00E3o que fazia parte de um bloco de byte code que foi outlined."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "Erro interno de XSLTC: um m\u00E9todo no translet excede a limita\u00E7\u00E3o da M\u00E1quina Virtual Java quanto ao tamanho de um m\u00E9todo de de 64 kilobytes. Em geral, essa situa\u00E7\u00E3o \u00E9 causada por modelos de uma folha de estilos que s\u00E3o muito grandes. Tente reestruturar sua folha de estilos de forma a usar modelos menores."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "Quando a seguran\u00E7a do Java est\u00E1 ativada, o suporte para desserializar TemplatesImpl fica desativado. Essa situa\u00E7\u00E3o pode ser corrigida definindo a propriedade do sistema jdk.xml.enableTemplatesImplDeserialization como true."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -17,10 +17,10 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+/*
-+ * $Id: ErrorMessages_sv.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-+ */
-
--/*
-- * $Id: ErrorMessages_sv.java 3023 2011-03-01 00:53:34Z joehw $
-- */
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-
- import java.util.ListResourceBundle;
-@@ -413,7 +413,7 @@
- * encountered.
- */
- {ErrorMsg.INTERNAL_ERR,
-- "Irreparabelt XSLTC-internfel: ''{0}''"},
-+ "O\u00E5terkalleligt internt XSLTC-fel: ''{0}''"},
-
- /*
- * Note to translators: The stylesheet contained an element that was
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "Kunde inte l\u00E4sa formatmallen ''{0}'', eftersom ''{1}''-\u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av egenskapen accessExternalStylesheet."},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "VARNING: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "O\u00C5TERKALLELIGT FEL: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "FEL: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -882,7 +882,7 @@
- * substitution text contains the actual value of the attribute.
- */
- {ErrorMsg.INVALID_QNAME_ERR,
-- "Ett attribut vars v\u00E4rde m\u00E5ste vara ett QName eller en blankteckenseparerad lista med QNames hade v\u00E4rdet ''{0}''"},
-+ "Ett attribut vars v\u00E4rde m\u00E5ste vara ett QName eller en blankteckenavgr\u00E4nsad lista med QNames hade v\u00E4rdet ''{0}''"},
-
- /*
- * Note to translators: An attribute whose value is required to
-@@ -916,7 +916,58 @@
- "Kan inte st\u00E4lla in funktionen ''{0}'' i denna TransformerFactory."},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds."}
-+ "FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "Internt XSLTC-fel: den genererade bytekoden inneh\u00E5ller ett try-catch-finally-block och kan inte g\u00F6ras till en disposition."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "Internt XSLTC-fel: mark\u00F6rerna OutlineableChunkStart och OutlineableChunkEnd m\u00E5ste vara balanserade och korrekt kapslade."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "Internt XSLTC-fel: originalmetoden refererar fortfarande till en instruktion som var en del av ett bytekodsblock som gjordes till en disposition."
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "Internt XSLTC-fel: en metod i transleten \u00F6verstiger Java Virtual Machines l\u00E4ngdbegr\u00E4nsning f\u00F6r en metod p\u00E5 64 kilobytes. Det h\u00E4r orsakas vanligen av mycket stora mallar i en formatmall. F\u00F6rs\u00F6k att omstrukturera formatmallen att anv\u00E4nda mindre mallar."
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "N\u00E4r Java-s\u00E4kerheten \u00E4r aktiverad \u00E4r st\u00F6det f\u00F6r avserialisering av TemplatesImpl avaktiverat. Du kan \u00E5sidos\u00E4tta det h\u00E4r genom att st\u00E4lla in systemegenskapen jdk.xml.enableTemplatesImplDeserialization till sant."}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_zh_CN.java,v 1.2.4.1 2005/09/15 10:15:21 pvedula Exp $
-+ * $Id: ErrorMessages_zh_CN.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -214,7 +214,7 @@
- * the expression.
- */
- {ErrorMsg.XPATH_PARSER_ERR,
-- "\u5BF9 XPath \u8868\u8FBE\u5F0F ''{0}'' \u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u51FA\u9519\u3002"},
-+ "\u89E3\u6790 XPath \u8868\u8FBE\u5F0F ''{0}'' \u65F6\u51FA\u9519\u3002"},
-
- /*
- * Note to translators: An element in the stylesheet requires a
-@@ -406,7 +406,7 @@
- * XSLTC to process the XML input document had a configuration problem.
- */
- {ErrorMsg.SAX_PARSER_CONFIG_ERR,
-- "JAXP \u8BED\u6CD5\u5206\u6790\u5668\u672A\u6B63\u786E\u914D\u7F6E"},
-+ "JAXP \u89E3\u6790\u5668\u672A\u6B63\u786E\u914D\u7F6E"},
-
- /*
- * Note to translators: The substitution text names the internal error
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "\u7531\u4E8E accessExternalStylesheet \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u800C\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE, \u56E0\u6B64\u65E0\u6CD5\u8BFB\u53D6\u6837\u5F0F\u8868\u76EE\u6807 ''{0}''\u3002"},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -475,7 +475,7 @@
- * encountered in the stylesheet but is not recognized.
- */
- {ErrorMsg.ELEMENT_PARSE_ERR,
-- "\u65E0\u6CD5\u5BF9\u5143\u7D20 ''{0}'' \u8FDB\u884C\u8BED\u6CD5\u5206\u6790"},
-+ "\u65E0\u6CD5\u89E3\u6790\u5143\u7D20 ''{0}''"},
-
- /*
- * Note to translators: "use", "<key>", "node", "node-set", "string"
-@@ -519,7 +519,7 @@
- * contains the expression that was in error.
- */
- {ErrorMsg.ATTR_VAL_TEMPLATE_ERR,
-- "\u65E0\u6CD5\u5BF9\u5C5E\u6027\u503C\u6A21\u677F ''{0}'' \u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u3002"},
-+ "\u65E0\u6CD5\u89E3\u6790\u5C5E\u6027\u503C\u6A21\u677F ''{0}''\u3002"},
-
- /*
- * Note to translators: ???
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "\u8B66\u544A: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "\u81F4\u547D\u9519\u8BEF: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "\u9519\u8BEF: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "\u65E0\u6CD5\u5BF9\u6B64 TransformerFactory \u8BBE\u7F6E\u529F\u80FD ''{0}''\u3002"},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: \u5B58\u5728 Security Manager \u65F6, \u65E0\u6CD5\u5C06\u6B64\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u5047\u201D\u3002"}
-+ "FEATURE_SECURE_PROCESSING: \u5B58\u5728 Security Manager \u65F6, \u65E0\u6CD5\u5C06\u6B64\u529F\u80FD\u8BBE\u7F6E\u4E3A\u201C\u5047\u201D\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "\u5185\u90E8 XSLTC \u9519\u8BEF: \u751F\u6210\u7684\u5B57\u8282\u4EE3\u7801\u5305\u542B try-catch-finally \u5757, \u65E0\u6CD5\u8FDB\u884C Outlined\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "\u5185\u90E8 XSLTC \u9519\u8BEF: OutlineableChunkStart \u548C OutlineableChunkEnd \u6807\u8BB0\u5FC5\u987B\u914D\u5BF9\u5E76\u4E14\u6B63\u786E\u5D4C\u5957\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "\u5185\u90E8 XSLTC \u9519\u8BEF: \u5C5E\u4E8E\u5DF2\u8FDB\u884C Outlined \u7684\u5B57\u8282\u4EE3\u7801\u5757\u7684\u6307\u4EE4\u5728\u539F\u59CB\u65B9\u6CD5\u4E2D\u4ECD\u88AB\u5F15\u7528\u3002"
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "\u5185\u90E8 XSLTC \u9519\u8BEF: translet \u4E2D\u7684\u65B9\u6CD5\u8D85\u8FC7\u4E86 Java \u865A\u62DF\u673A\u7684\u65B9\u6CD5\u957F\u5EA6\u9650\u5236 64 KB\u3002\u8FD9\u901A\u5E38\u662F\u7531\u4E8E\u6837\u5F0F\u8868\u4E2D\u7684\u6A21\u677F\u975E\u5E38\u5927\u9020\u6210\u7684\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528\u8F83\u5C0F\u7684\u6A21\u677F\u91CD\u65B0\u6784\u5EFA\u6837\u5F0F\u8868\u3002"
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "\u542F\u7528\u4E86 Java \u5B89\u5168\u65F6, \u5C06\u7981\u7528\u5BF9\u53CD\u5E8F\u5217\u5316 TemplatesImpl \u7684\u652F\u6301\u3002\u53EF\u4EE5\u901A\u8FC7\u5C06 jdk.xml.enableTemplatesImplDeserialization \u7CFB\u7EDF\u5C5E\u6027\u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u6765\u8986\u76D6\u6B64\u8BBE\u7F6E\u3002"}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_zh_TW.java,v 1.2.4.1 2005/09/15 10:16:08 pvedula Exp $
-+ * $Id: ErrorMessages_zh_TW.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.compiler.util;
-@@ -453,7 +453,7 @@
- * Note to translators: access to the stylesheet target is denied
- */
- {ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
-- "Could not read stylesheet target ''{0}'', because ''{1}'' access is not allowed."},
-+ "\u7121\u6CD5\u8B80\u53D6\u6A23\u5F0F\u8868\u76EE\u6A19 ''{0}''\uFF0C\u56E0\u70BA accessExternalStylesheet \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002"},
-
- /*
- * Note to translators: This message represents an internal error in
-@@ -777,7 +777,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.WARNING_PLUS_WRAPPED_MSG,
-- "\u8B66\u544A: ''{0}''\n :{1}"},
-+ "WARNING: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -793,7 +793,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.FATAL_ERR_PLUS_WRAPPED_MSG,
-- "\u56B4\u91CD\u932F\u8AA4: ''{0}''\n :{1}"},
-+ "FATAL ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -809,7 +809,7 @@
- * it the same amount as the first in English.
- */
- {ErrorMsg.ERROR_PLUS_WRAPPED_MSG,
-- "\u932F\u8AA4: ''{0}''\n :{1}"},
-+ "ERROR: ''{0}''\n :{1}"},
-
- /*
- * Note to translators: This message is used to indicate the severity
-@@ -916,7 +916,58 @@
- "\u7121\u6CD5\u5728\u6B64 TransformerFactory \u4E0A\u8A2D\u5B9A\u529F\u80FD ''{0}''\u3002"},
-
- {ErrorMsg.JAXP_SECUREPROCESSING_FEATURE,
-- "FEATURE_SECURE_PROCESSING: \u5B89\u5168\u7BA1\u7406\u7A0B\u5F0F\u5B58\u5728\u6642\uFF0C\u7121\u6CD5\u5C07\u529F\u80FD\u8A2D\u70BA\u507D\u3002"}
-+ "FEATURE_SECURE_PROCESSING: \u5B89\u5168\u7BA1\u7406\u7A0B\u5F0F\u5B58\u5728\u6642\uFF0C\u7121\u6CD5\u5C07\u529F\u80FD\u8A2D\u70BA\u507D\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method, and "try-catch-finally block"
-+ * refers to the Java keywords with those names. "Outlined" is a
-+ * technical term internal to XSLTC and should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_TRY_CATCH,
-+ "\u5167\u90E8 XSLTC \u932F\u8AA4: \u7522\u751F\u7684\u4F4D\u5143\u7D44\u78BC\u5305\u542B try-catch-finally \u5340\u584A\uFF0C\u7121\u6CD5\u52A0\u4EE5 outlined."},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The terms "OutlineableChunkStart" and
-+ * "OutlineableChunkEnd" are the names of classes internal to XSLTC and
-+ * should not be translated. The message indicates that for every
-+ * "start" there must be a corresponding "end", and vice versa, and
-+ * that if one of a pair of "start" and "end" appears between another
-+ * pair of corresponding "start" and "end", then the other half of the
-+ * pair must also be between that same enclosing pair.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_UNBALANCED_MARKERS,
-+ "\u5167\u90E8 XSLTC \u932F\u8AA4: OutlineableChunkStart \u548C OutlineableChunkEnd \u6A19\u8A18\u5FC5\u9808\u6210\u5C0D\u51FA\u73FE\uFF0C\u4E26\u4F7F\u7528\u6B63\u78BA\u7684\u5DE2\u72C0\u7D50\u69CB\u3002"},
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The term "byte code" is a Java technical term for the
-+ * executable code in a Java method. The "method" that is being
-+ * referred to is a Java method in a translet that XSLTC is generating
-+ * in processing a stylesheet. The "instruction" that is being
-+ * referred to is one of the instrutions in the Java byte code in that
-+ * method. "Outlined" is a technical term internal to XSLTC and
-+ * should not be translated.
-+ */
-+ {ErrorMsg.OUTLINE_ERR_DELETED_TARGET,
-+ "\u5167\u90E8 XSLTC \u932F\u8AA4: \u539F\u59CB\u65B9\u6CD5\u4E2D\u4ECD\u7136\u53C3\u7167\u5C6C\u65BC outlined \u4F4D\u5143\u7D44\u78BC\u5340\u584A\u4E00\u90E8\u5206\u7684\u6307\u793A\u3002"
-+ },
-+
-+
-+ /*
-+ * Note to translators: This message describes an internal error in the
-+ * processor. The "method" that is being referred to is a Java method
-+ * in a translet that XSLTC is generating.
-+ *
-+ */
-+ {ErrorMsg.OUTLINE_ERR_METHOD_TOO_BIG,
-+ "\u5167\u90E8 XSLTC \u932F\u8AA4: translet \u4E2D\u7684\u65B9\u6CD5\u8D85\u904E Java \u865B\u64EC\u6A5F\u5668\u5C0D\u65BC\u65B9\u6CD5\u9577\u5EA6 64 KB \u7684\u9650\u5236\u3002\u9019\u901A\u5E38\u662F\u56E0\u70BA\u6A23\u5F0F\u8868\u4E2D\u6709\u975E\u5E38\u5927\u7684\u6A23\u677F\u3002\u8ACB\u5617\u8A66\u91CD\u65B0\u7D44\u7E54\u60A8\u7684\u6A23\u5F0F\u8868\u4EE5\u4F7F\u7528\u8F03\u5C0F\u7684\u6A23\u677F\u3002"
-+ },
-+
-+ {ErrorMsg.DESERIALIZE_TRANSLET_ERR, "\u555F\u7528 Java \u5B89\u5168\u6642\uFF0C\u6703\u505C\u7528\u9084\u539F\u5E8F\u5217\u5316 TemplatesImpl \u7684\u652F\u63F4\u3002\u5C07 jdk.xml.enableTemplatesImplDeserialization \u7CFB\u7D71\u5C6C\u6027\u8A2D\u70BA\u771F\u5373\u53EF\u8986\u5BEB\u6B64\u8A2D\u5B9A\u3002"}
-+
- };
-
- }
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java Fri Apr 10 09:20:34 2015 -0700
-@@ -117,6 +117,7 @@
- public static final String JAXP_NO_SOURCE_ERR = "JAXP_NO_SOURCE_ERR";
- public static final String JAXP_COMPILE_ERR = "JAXP_COMPILE_ERR";
- public static final String JAXP_INVALID_ATTR_ERR = "JAXP_INVALID_ATTR_ERR";
-+ public static final String JAXP_INVALID_ATTR_VALUE_ERR = "JAXP_INVALID_ATTR_VALUE_ERR";
- public static final String JAXP_SET_RESULT_ERR = "JAXP_SET_RESULT_ERR";
- public static final String JAXP_NO_TRANSLET_ERR = "JAXP_NO_TRANSLET_ERR";
- public static final String JAXP_NO_HANDLER_ERR = "JAXP_NO_HANDLER_ERR";
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Fri Apr 10 09:20:34 2015 -0700
-@@ -270,8 +270,8 @@
- if (Double.isNaN(start))
- return(EMPTYSTRING);
-
-- final int strlen = value.length();
-- int istart = (int)Math.round(start) - 1;
-+ final int strlen = value.length();
-+ int istart = (int)Math.round(start) - 1;
-
- if (istart > strlen)
- return(EMPTYSTRING);
-@@ -292,10 +292,11 @@
- public static String substringF(String value, double start, double length) {
- if (Double.isInfinite(start) ||
- Double.isNaN(start) ||
-- Double.isNaN(length))
-+ Double.isNaN(length) ||
-+ length < 0)
- return(EMPTYSTRING);
-
-- int istart = (int)Math.round(start) - 1;
-+ int istart = (int)Math.round(start) - 1;
- final int isum;
- if (Double.isInfinite(length))
- isum = Integer.MAX_VALUE;
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -17,10 +17,10 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+/*
-+ * $Id: ErrorMessages_pt_BR.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-+ */
-
--/*
-- * $Id: ErrorMessages_pt_BR.java 3023 2011-03-01 00:53:34Z joehw $
-- */
- package com.sun.org.apache.xalan.internal.xsltc.runtime;
-
- import java.util.ListResourceBundle;
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -17,10 +17,10 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+/*
-+ * $Id: ErrorMessages_sv.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-+ */
-
--/*
-- * $Id: ErrorMessages_sv.java 3023 2011-03-01 00:53:34Z joehw $
-- */
- package com.sun.org.apache.xalan.internal.xsltc.runtime;
-
- import java.util.ListResourceBundle;
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: ErrorMessages_zh_CN.java,v 1.2.4.1 2005/09/14 05:52:21 pvedula Exp $
-+ * $Id: ErrorMessages_zh_CN.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
- */
-
- package com.sun.org.apache.xalan.internal.xsltc.runtime;
-@@ -212,7 +212,7 @@
- * DTD.
- */
- {BasisLibrary.PARSER_DTD_SUPPORT_ERR,
-- "\u4F7F\u7528\u7684 SAX \u8BED\u6CD5\u5206\u6790\u5668\u4E0D\u4F1A\u5904\u7406 DTD \u58F0\u660E\u4E8B\u4EF6\u3002"},
-+ "\u4F7F\u7528\u7684 SAX \u89E3\u6790\u5668\u4E0D\u4F1A\u5904\u7406 DTD \u58F0\u660E\u4E8B\u4EF6\u3002"},
-
- /*
- * Note to translators: The following message indicates that the XML
-@@ -221,7 +221,7 @@
- * declarations.
- */
- {BasisLibrary.NAMESPACES_SUPPORT_ERR,
-- "\u4F7F\u7528\u7684 SAX \u8BED\u6CD5\u5206\u6790\u5668\u4E0D\u652F\u6301 XML \u540D\u79F0\u7A7A\u95F4\u3002"},
-+ "\u4F7F\u7528\u7684 SAX \u89E3\u6790\u5668\u4E0D\u652F\u6301 XML \u540D\u79F0\u7A7A\u95F4\u3002"},
-
- /*
- * Note to translators: The substitution text is the URI that was in
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Fri Apr 10 09:20:34 2015 -0700
-@@ -24,28 +24,27 @@
- 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.ObjectFactory;
-+import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
-+import com.sun.org.apache.xalan.internal.xsltc.DOM;
-+import com.sun.org.apache.xalan.internal.xsltc.Translet;
-+import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
-+import com.sun.org.apache.xalan.internal.xsltc.runtime.AbstractTranslet;
-+import com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable;
- import java.io.IOException;
- import java.io.ObjectInputStream;
- import java.io.ObjectOutputStream;
- import java.io.Serializable;
--import java.util.Properties;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
--
-+import java.util.Map;
-+import java.util.Properties;
- import javax.xml.XMLConstants;
- import javax.xml.transform.Templates;
- import javax.xml.transform.Transformer;
- import javax.xml.transform.TransformerConfigurationException;
- import javax.xml.transform.URIResolver;
-
--import com.sun.org.apache.xalan.internal.xsltc.DOM;
--import com.sun.org.apache.xalan.internal.xsltc.Translet;
--import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
--import com.sun.org.apache.xalan.internal.xsltc.runtime.AbstractTranslet;
--import com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable;
--import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
--import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
--
- /**
- * @author Morten Jorgensen
- * @author G. Todd Millerj
-@@ -131,8 +130,30 @@
- private String _accessExternalStylesheet = XalanConstants.EXTERNAL_ACCESS_DEFAULT;
-
- static final class TransletClassLoader extends ClassLoader {
-+
-+ private final Map<String,Class> _loadedExternalExtensionFunctions;
-+
- TransletClassLoader(ClassLoader parent) {
- super(parent);
-+ _loadedExternalExtensionFunctions = null;
-+ }
-+
-+ TransletClassLoader(ClassLoader parent,Map<String, Class> mapEF) {
-+ super(parent);
-+ _loadedExternalExtensionFunctions = mapEF;
-+ }
-+
-+ public Class<?> loadClass(String name) throws ClassNotFoundException {
-+ Class<?> ret = null;
-+ // The _loadedExternalExtensionFunctions will be empty when the
-+ // SecurityManager is not set and the FSP is turned off
-+ if (_loadedExternalExtensionFunctions != null) {
-+ ret = _loadedExternalExtensionFunctions.get(name);
-+ }
-+ if (ret == null) {
-+ ret = super.loadClass(name);
-+ }
-+ return ret;
- }
-
- /**
-@@ -330,7 +351,7 @@
- TransletClassLoader loader = (TransletClassLoader)
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
-- return new TransletClassLoader(ObjectFactory.findClassLoader());
-+ return new TransletClassLoader(ObjectFactory.findClassLoader(),_tfactory.getExternalExtensionsMap());
- }
- });
-
---- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Fri Apr 10 09:20:34 2015 -0700
-@@ -27,12 +27,12 @@
- 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.FeaturePropertyBase.State;
- 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;
-@@ -50,6 +50,7 @@
- import java.net.URL;
- import java.util.Enumeration;
- import java.util.Hashtable;
-+import java.util.Map;
- import java.util.Properties;
- import java.util.Vector;
- import java.util.zip.ZipEntry;
-@@ -57,7 +58,6 @@
- import javax.xml.XMLConstants;
- import javax.xml.parsers.SAXParser;
- import javax.xml.parsers.SAXParserFactory;
--
- import javax.xml.transform.ErrorListener;
- import javax.xml.transform.Source;
- import javax.xml.transform.Templates;
-@@ -239,6 +239,13 @@
-
- private final FeatureManager _featureManager;
-
-+ private ClassLoader _extensionClassLoader = null;
-+
-+ // Unmodifiable view of external extension function from xslt compiler
-+ // It will be populated by user-specified extension functions during the
-+ // type checking
-+ private Map<String, Class> _xsltcExtensionFunctions;
-+
- /**
- * javax.xml.transform.sax.TransformerFactory implementation.
- */
-@@ -270,6 +277,12 @@
-
- //Parser's security manager
- _xmlSecurityManager = new XMLSecurityManager(true);
-+ //Unmodifiable hash map with loaded external extension functions
-+ _xsltcExtensionFunctions = null;
-+ }
-+
-+ public Map<String,Class> getExternalExtensionsMap() {
-+ return _xsltcExtensionFunctions;
- }
-
- /**
-@@ -330,6 +343,8 @@
- return Boolean.FALSE;
- } else if (name.equals(XalanConstants.SECURITY_MANAGER)) {
- return _xmlSecurityManager;
-+ } else if (name.equals(XalanConstants.JDK_EXTENSION_CLASSLOADER)) {
-+ return _extensionClassLoader;
- }
-
- /** Check to see if the property is managed by the security manager **/
-@@ -444,6 +459,16 @@
- return;
- }
- }
-+ else if ( name.equals(XalanConstants.JDK_EXTENSION_CLASSLOADER)) {
-+ if (value instanceof ClassLoader) {
-+ _extensionClassLoader = (ClassLoader) value;
-+ return;
-+ } else {
-+ final ErrorMsg err
-+ = new ErrorMsg(ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, "Extension Functions ClassLoader");
-+ throw new IllegalArgumentException(err.toString());
-+ }
-+ }
-
- if (_xmlSecurityManager != null &&
- _xmlSecurityManager.setLimit(name, XMLSecurityManager.State.APIPROPERTY, value)) {
-@@ -878,7 +903,6 @@
- // Reset the per-session attributes to their default values
- // after each newTemplates() call.
- resetTransientAttributes();
--
- return new TemplatesImpl(bytecodes, transletClassName, null, _indentNumber, this);
- }
- }
-@@ -895,8 +919,10 @@
- xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, _accessExternalStylesheet);
- xsltc.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, _accessExternalDTD);
- xsltc.setProperty(XalanConstants.SECURITY_MANAGER, _xmlSecurityManager);
-+ xsltc.setProperty(XalanConstants.JDK_EXTENSION_CLASSLOADER, _extensionClassLoader);
- xsltc.init();
--
-+ if (!_isNotSecureProcessing)
-+ _xsltcExtensionFunctions = xsltc.getExternalExtensionFunctions();
- // Set a document loader (for xsl:include/import) if defined
- if (_uriResolver != null) {
- xsltc.setSourceLoader(this);
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
- FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
-@@ -55,7 +27,7 @@
- SYNTAX_ERR = Ung\u00FCltige Zeichenfolge angegeben.
- VALIDATION_ERR = Aufruf einer Methode wie insertBefore oder removeChild w\u00FCrde die Dokumentgrammatik des Knotens ung\u00FCltig machen.
- WRONG_DOCUMENT_ERR = Ein Knoten wird in einem anderen Dokument verwendet als dem, von dem er erstellt wurde.
--TYPE_MISMATCH_ERR = Der Wertetyp f\u00FCr diesen Parameternamen ist nicht mit dem erwarteten Wertetyp kompatibel.
-+TYPE_MISMATCH_ERR = Der Werttyp f\u00FCr diesen Parameternamen ist nicht mit dem erwarteten Werttyp kompatibel.
-
- #error messages or exceptions
- FEATURE_NOT_SUPPORTED = Parameter {0} wird erkannt, aber der angeforderte Wert kann nicht festgelegt werden.
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde bei der Normalisierung im DOM gefunden.
--UndeclaredEntRefInAttrValue = Attribut \"{0}\" Wert \"{1}\" referenzierte eine nicht deklarierte Entit\u00E4t.
-+UndeclaredEntRefInAttrValue = Attribut "{0}" Wert "{1}" referenzierte eine nicht deklarierte Entit\u00E4t.
- NullLocalElementName = Lokaler Nullname wurde bei der Namespace-Normalisierung von Element {0} gefunden.
- NullLocalAttrName = Lokaler Nullname wurde bei der Namespace-Normalisierung von Attribut {0} gefunden.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = Der Klassenname der Dokument-Factory \"{0}\", mit dem der DOM-Baum erstellt wurde, hat nicht den Typ org.w3c.dom.Document.
--MissingDocumentClassName = Der Klassenname der Dokument-Factory \"{0}\", mit dem der DOM-Baum erstellt wurde, konnte nicht gefunden werden.
--CannotCreateDocumentClass = Die Klasse mit dem Namen \"{0}\" konnte nicht als org.w3c.dom.Document erstellt werden.
-+InvalidDocumentClassName = Der Klassenname der Dokument-Factory "{0}", mit dem der DOM-Baum erstellt wurde, hat nicht den Typ org.w3c.dom.Document.
-+MissingDocumentClassName = Der Klassenname der Dokument-Factory "{0}", mit dem der DOM-Baum erstellt wurde, konnte nicht gefunden werden.
-+CannotCreateDocumentClass = Die Klasse mit dem Namen "{0}" konnte nicht als org.w3c.dom.Document erstellt werden.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = Eigenschaft "{0}" muss vor der Eigenschaft "{1}" festgelegt werden.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_es.properties 3019 2011-02-28 19:57:14Z joehw $
-+# @version $Id: DOMMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
- BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
- FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en DOM durante la normalizaci\u00F3n.
--UndeclaredEntRefInAttrValue = El atributo \"{0}\" con valor \"{1}\" ha hecho referencia a una entidad que no se declar\u00F3.
-+UndeclaredEntRefInAttrValue = El atributo "{0}" con valor "{1}" ha hecho referencia a una entidad que no se declar\u00F3.
- NullLocalElementName = Se ha encontrado un nombre local nulo durante la normalizaci\u00F3n del espacio de nombres del elemento {0}.
- NullLocalAttrName = Se ha encontrado un nombre local nulo durante la normalizaci\u00F3n del espacio de nombres del atributo {0}.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = El nombre de clase de la f\u00E1brica de documentos \"{0}\" utilizado para construir el \u00E1rbol DOM no es del tipo org.w3c.dom.Document.
--MissingDocumentClassName = No se ha encontrado el nombre de clase de la f\u00E1brica de documentos \"{0}\" utilizado para construir el \u00E1rbol DOM.
--CannotCreateDocumentClass = No se ha podido construir la clase con el nombre \"{0}\" como un org.w3c.dom.Document.
-+InvalidDocumentClassName = El nombre de clase de la f\u00E1brica de documentos "{0}" utilizado para construir el \u00E1rbol DOM no es del tipo org.w3c.dom.Document.
-+MissingDocumentClassName = No se ha encontrado el nombre de clase de la f\u00E1brica de documentos "{0}" utilizado para construir el \u00E1rbol DOM.
-+CannotCreateDocumentClass = No se ha podido construir la clase con el nombre "{0}" como un org.w3c.dom.Document.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = La propiedad ''{0}'' debe definirse antes de definir la propiedad ''{1}''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
- FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 trouv\u00E9 dans le DOM au cours de la normalisation.
--UndeclaredEntRefInAttrValue = La valeur de l''attribut \"{0}\", \"{1}\", r\u00E9f\u00E9ren\u00E7ait une entit\u00E9 non d\u00E9clar\u00E9e.
-+UndeclaredEntRefInAttrValue = La valeur de l''attribut "{0}", "{1}", r\u00E9f\u00E9ren\u00E7ait une entit\u00E9 non d\u00E9clar\u00E9e.
- NullLocalElementName = Un nom local NULL a \u00E9t\u00E9 d\u00E9tect\u00E9 au cours de la normalisation de l''espace de noms de l''\u00E9l\u00E9ment {0}.
- NullLocalAttrName = Un nom local NULL a \u00E9t\u00E9 d\u00E9tect\u00E9 au cours de la normalisation de l''espace de noms de l''attribut {0}.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = Le nom de classe de la fabrique de documents \"{0}\" utilis\u00E9e pour construire l''arborescence DOM n''est pas de type org.w3c.dom.Document.
--MissingDocumentClassName = Le nom de classe de la fabrique de documents \"{0}\" utilis\u00E9e pour construire l''arborescence DOM est introuvable.
--CannotCreateDocumentClass = La classe nomm\u00E9e \"{0}\" n''a pas pu \u00EAtre construite en tant que org.w3c.dom.Document.
-+InvalidDocumentClassName = Le nom de classe de la fabrique de documents "{0}" utilis\u00E9e pour construire l''arborescence DOM n''est pas de type org.w3c.dom.Document.
-+MissingDocumentClassName = Le nom de classe de la fabrique de documents "{0}" utilis\u00E9e pour construire l''arborescence DOM est introuvable.
-+CannotCreateDocumentClass = La classe nomm\u00E9e "{0}" n''a pas pu \u00EAtre construite en tant que org.w3c.dom.Document.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = La propri\u00E9t\u00E9 ''{0}'' doit \u00EAtre d\u00E9finie avant la propri\u00E9t\u00E9 ''{1}''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id$
-+# @version $Id: DOMMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
- FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) in DOM durante la normalizzazione.
--UndeclaredEntRefInAttrValue = L''attributo \"{0}\" con valore \"{1}\" fa riferimento a un''entit\u00E0 non dichiarata.
-+UndeclaredEntRefInAttrValue = L''attributo "{0}" con valore "{1}" fa riferimento a un''entit\u00E0 non dichiarata.
- NullLocalElementName = \u00C8 stato rilevato un nome locale nullo durante la normalizzazione dello spazio di nomi dell''elemento {0}.
- NullLocalAttrName = \u00C8 stato rilevato un nome locale nullo durante la normalizzazione dello spazio di nomi dell''attributo {0}.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = Il nome classe del document factory \"{0}\" utilizzato per creare la struttura DOM non \u00E8 di tipo org.w3c.dom.Document.
--MissingDocumentClassName = Impossibile trovare il nome classe del document factory \"{0}\" utilizzato per creare la struttura DOM.
--CannotCreateDocumentClass = Impossibile creare la classe denominata \"{0}\" come org.w3c.dom.Document.
-+InvalidDocumentClassName = Il nome classe del document factory "{0}" utilizzato per creare la struttura DOM non \u00E8 di tipo org.w3c.dom.Document.
-+MissingDocumentClassName = Impossibile trovare il nome classe del document factory "{0}" utilizzato per creare la struttura DOM.
-+CannotCreateDocumentClass = Impossibile creare la classe denominata "{0}" come org.w3c.dom.Document.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = Impostare la propriet\u00E0 ''{0}'' prima di impostare la propriet\u00E0 ''{1}''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
- FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = \u6B63\u898F\u5316\u4E2D\u306BDOM\u5185\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
--UndeclaredEntRefInAttrValue = \u5C5E\u6027\"{0}\"\u306E\u5024\"{1}\"\u3067\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+UndeclaredEntRefInAttrValue = \u5C5E\u6027"{0}"\u306E\u5024"{1}"\u3067\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- NullLocalElementName = \u8981\u7D20{0}\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u6B63\u898F\u5316\u4E2D\u306Bnull\u306E\u30ED\u30FC\u30AB\u30EB\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- NullLocalAttrName = \u5C5E\u6027{0}\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306E\u6B63\u898F\u5316\u4E2D\u306Bnull\u306E\u30ED\u30FC\u30AB\u30EB\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = DOM\u30C4\u30EA\u30FC\u306E\u69CB\u7BC9\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA\"{0}\"\u306E\u30AF\u30E9\u30B9\u540D\u304C\u30BF\u30A4\u30D7org.w3c.dom.Document\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
--MissingDocumentClassName = DOM\u30C4\u30EA\u30FC\u306E\u69CB\u7BC9\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA\"{0}\"\u306E\u30AF\u30E9\u30B9\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
--CannotCreateDocumentClass = \"{0}\"\u3068\u3044\u3046\u540D\u524D\u306E\u30AF\u30E9\u30B9\u3092org.w3c.dom.Document\u3068\u3057\u3066\u69CB\u7BC9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-+InvalidDocumentClassName = DOM\u30C4\u30EA\u30FC\u306E\u69CB\u7BC9\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA"{0}"\u306E\u30AF\u30E9\u30B9\u540D\u304C\u30BF\u30A4\u30D7org.w3c.dom.Document\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+MissingDocumentClassName = DOM\u30C4\u30EA\u30FC\u306E\u69CB\u7BC9\u306B\u4F7F\u7528\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA"{0}"\u306E\u30AF\u30E9\u30B9\u540D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-+CannotCreateDocumentClass = "{0}"\u3068\u3044\u3046\u540D\u524D\u306E\u30AF\u30E9\u30B9\u3092org.w3c.dom.Document\u3068\u3057\u3066\u69CB\u7BC9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = \u30D7\u30ED\u30D1\u30C6\u30A3''{1}''\u3092\u8A2D\u5B9A\u3059\u308B\u524D\u306B\u30D7\u30ED\u30D1\u30C6\u30A3''{0}''\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = \uC815\uADDC\uD654 \uC911 DOM\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
--UndeclaredEntRefInAttrValue = \uC18D\uC131 \"{0}\" \uAC12 \"{1}\"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uB97C \uCC38\uC870\uD588\uC2B5\uB2C8\uB2E4.
-+UndeclaredEntRefInAttrValue = \uC18D\uC131 "{0}" \uAC12 "{1}"\uC774(\uAC00) \uC120\uC5B8\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uB97C \uCC38\uC870\uD588\uC2B5\uB2C8\uB2E4.
- NullLocalElementName = {0} \uC694\uC18C\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC815\uADDC\uD654 \uC911 \uB110 \uB85C\uCEEC \uC774\uB984\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- NullLocalAttrName = {0} \uC18D\uC131\uC758 \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC815\uADDC\uD654 \uC911 \uB110 \uB85C\uCEEC \uC774\uB984\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = DOM \uD2B8\uB9AC \uC0DD\uC131\uC5D0 \uC0AC\uC6A9\uB41C \uBB38\uC11C \uD329\uD1A0\uB9AC \"{0}\"\uC758 \uD074\uB798\uC2A4 \uC774\uB984\uC740 org.w3c.dom.Document \uC720\uD615\uC774 \uC544\uB2D9\uB2C8\uB2E4.
--MissingDocumentClassName = DOM \uD2B8\uB9AC \uC0DD\uC131\uC5D0 \uC0AC\uC6A9\uB41C \uBB38\uC11C \uD329\uD1A0\uB9AC \"{0}\"\uC758 \uD074\uB798\uC2A4 \uC774\uB984\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
--CannotCreateDocumentClass = \uC774\uB984\uC774 \"{0}\"\uC778 \uD074\uB798\uC2A4\uB97C org.w3c.dom.Document\uB85C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+InvalidDocumentClassName = DOM \uD2B8\uB9AC \uC0DD\uC131\uC5D0 \uC0AC\uC6A9\uB41C \uBB38\uC11C \uD329\uD1A0\uB9AC "{0}"\uC758 \uD074\uB798\uC2A4 \uC774\uB984\uC740 org.w3c.dom.Document \uC720\uD615\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-+MissingDocumentClassName = DOM \uD2B8\uB9AC \uC0DD\uC131\uC5D0 \uC0AC\uC6A9\uB41C \uBB38\uC11C \uD329\uD1A0\uB9AC "{0}"\uC758 \uD074\uB798\uC2A4 \uC774\uB984\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+CannotCreateDocumentClass = \uC774\uB984\uC774 "{0}"\uC778 \uD074\uB798\uC2A4\uB97C org.w3c.dom.Document\uB85C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = ''{1}'' \uC18D\uC131\uC744 \uC124\uC815\uD558\uAE30 \uC804\uC5D0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
- FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no DOM durante a normaliza\u00E7\u00E3o.
--UndeclaredEntRefInAttrValue = O atributo \"{0}\" valor \"{1}\" mencionou uma entidade que n\u00E3o foi declarada.
-+UndeclaredEntRefInAttrValue = O atributo "{0}" valor "{1}" mencionou uma entidade que n\u00E3o foi declarada.
- NullLocalElementName = Um nome de local nulo foi encontrado durante a normaliza\u00E7\u00E3o do namespace do elemento {0}.
- NullLocalAttrName = Um nome de local nulo foi encontrado durante a normaliza\u00E7\u00E3o do namespace do atributo {0}.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = O nome da classe do factory do documento \"{0}\" usado para construir a \u00E1rvore DOM n\u00E3o \u00E9 do tipo org.w3c.dom.Document.
--MissingDocumentClassName = N\u00E3o foi poss\u00EDvel encontrar o nome da classe do factory do documento \"{0}\" usado para construir a \u00E1rvore DOM.
--CannotCreateDocumentClass = N\u00E3o foi poss\u00EDvel construir a classe com o nome \"{0}\" como um org.w3c.dom.Document.
-+InvalidDocumentClassName = O nome da classe do factory do documento "{0}" usado para construir a \u00E1rvore DOM n\u00E3o \u00E9 do tipo org.w3c.dom.Document.
-+MissingDocumentClassName = N\u00E3o foi poss\u00EDvel encontrar o nome da classe do factory do documento "{0}" usado para construir a \u00E1rvore DOM.
-+CannotCreateDocumentClass = N\u00E3o foi poss\u00EDvel construir a classe com o nome "{0}" como um org.w3c.dom.Document.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = A propriedade ''{0}'' deve ser estabelecida antes da defini\u00E7\u00E3o da propriedade ''{1}''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
- FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i DOM vid normalisering.
--UndeclaredEntRefInAttrValue = Attributet \"{0}\" med v\u00E4rdet \"{1}\" refererade en enhet som inte har deklarerats.
-+UndeclaredEntRefInAttrValue = Attributet "{0}" med v\u00E4rdet "{1}" refererade en enhet som inte har deklarerats.
- NullLocalElementName = Ett lokalt namn med null-v\u00E4rde p\u00E5tr\u00E4ffades vid namnrymdsnormalisering av elementet {0}.
- NullLocalAttrName = Ett lokalt namn med null-v\u00E4rde p\u00E5tr\u00E4ffades vid namnrymdsnormalisering av attributet {0}.
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = Klassnamnet p\u00E5 dokumentfabrik \"{0}\" som anv\u00E4nds vid konstruktion av DOM-tr\u00E4det \u00E4r inte typ org.w3c.dom.Document.
--MissingDocumentClassName = Hittade inte klassnamnet p\u00E5 dokumentfabrik \"{0}\" som anv\u00E4nds vid konstruktion av DOM-tr\u00E4det.
--CannotCreateDocumentClass = Klassen \"{0}\" kunde inte konstrueras som org.w3c.dom.Document.
-+InvalidDocumentClassName = Klassnamnet p\u00E5 dokumentfabrik "{0}" som anv\u00E4nds vid konstruktion av DOM-tr\u00E4det \u00E4r inte typ org.w3c.dom.Document.
-+MissingDocumentClassName = Hittade inte klassnamnet p\u00E5 dokumentfabrik "{0}" som anv\u00E4nds vid konstruktion av DOM-tr\u00E4det.
-+CannotCreateDocumentClass = Klassen "{0}" kunde inte konstrueras som org.w3c.dom.Document.
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = Egenskapen ''{0}'' m\u00E5ste anges f\u00F6re inst\u00E4llning av egenskapen ''{1}''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
- FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = \u8FDB\u884C\u89C4\u8303\u5316\u65F6, \u5728 DOM \u4E2D\u627E\u5230\u7684 XML \u5B57\u7B26 (Unicode: 0x{0}) \u65E0\u6548\u3002
--UndeclaredEntRefInAttrValue = \u5C5E\u6027 \"{0}\" \u503C \"{1}\" \u5F15\u7528\u4E86\u672A\u58F0\u660E\u7684\u5B9E\u4F53\u3002
-+UndeclaredEntRefInAttrValue = \u5C5E\u6027 "{0}" \u503C "{1}" \u5F15\u7528\u4E86\u672A\u58F0\u660E\u7684\u5B9E\u4F53\u3002
- NullLocalElementName = \u5BF9\u5143\u7D20{0}\u8FDB\u884C\u540D\u79F0\u7A7A\u95F4\u89C4\u8303\u5316\u65F6\u9047\u5230\u4E86\u7A7A\u672C\u5730\u540D\u79F0\u3002
- NullLocalAttrName = \u5BF9\u5C5E\u6027{0}\u8FDB\u884C\u540D\u79F0\u7A7A\u95F4\u89C4\u8303\u5316\u65F6\u9047\u5230\u4E86\u7A7A\u672C\u5730\u540D\u79F0\u3002
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = \u7528\u4E8E\u6784\u9020 DOM \u6811\u7684\u6587\u6863\u5DE5\u5382 \"{0}\" \u7684\u7C7B\u540D\u4E0D\u662F org.w3c.dom.Document \u7C7B\u578B\u3002
--MissingDocumentClassName = \u627E\u4E0D\u5230\u7528\u4E8E\u6784\u9020 DOM \u6811\u7684\u6587\u6863\u5DE5\u5382 \"{0}\" \u7684\u7C7B\u540D\u3002
--CannotCreateDocumentClass = \u540D\u4E3A \"{0}\" \u7684\u7C7B\u65E0\u6CD5\u6784\u9020\u4E3A org.w3c.dom.Document\u3002
-+InvalidDocumentClassName = \u7528\u4E8E\u6784\u9020 DOM \u6811\u7684\u6587\u6863\u5DE5\u5382 "{0}" \u7684\u7C7B\u540D\u4E0D\u662F org.w3c.dom.Document \u7C7B\u578B\u3002
-+MissingDocumentClassName = \u627E\u4E0D\u5230\u7528\u4E8E\u6784\u9020 DOM \u6811\u7684\u6587\u6863\u5DE5\u5382 "{0}" \u7684\u7C7B\u540D\u3002
-+CannotCreateDocumentClass = \u540D\u4E3A "{0}" \u7684\u7C7B\u65E0\u6CD5\u6784\u9020\u4E3A org.w3c.dom.Document\u3002
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = \u5FC5\u987B\u5728\u8BBE\u7F6E\u5C5E\u6027 ''{1}'' \u4E4B\u524D\u8BBE\u7F6E\u5C5E\u6027 ''{0}''\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # DOM implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DOMMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DOMMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
- FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
-@@ -71,14 +43,14 @@
-
- #Error codes used in DOM Normalizer
- InvalidXMLCharInDOM = \u6B63\u898F\u5316\u671F\u9593\u5728 DOM \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002
--UndeclaredEntRefInAttrValue = \u5C6C\u6027 \"{0}\" \u503C \"{1}\" \u53C3\u7167\u672A\u5BA3\u544A\u7684\u500B\u9AD4\u3002
-+UndeclaredEntRefInAttrValue = \u5C6C\u6027 "{0}" \u503C "{1}" \u53C3\u7167\u672A\u5BA3\u544A\u7684\u5BE6\u9AD4\u3002
- NullLocalElementName = \u5143\u7D20 {0} \u547D\u540D\u7A7A\u9593\u6B63\u898F\u5316\u671F\u9593\uFF0C\u51FA\u73FE\u7A7A\u503C\u5340\u57DF\u540D\u7A31\u3002
- NullLocalAttrName = \u5C6C\u6027 {0} \u547D\u540D\u7A7A\u9593\u6B63\u898F\u5316\u671F\u9593\uFF0C\u51FA\u73FE\u7A7A\u503C\u5340\u57DF\u540D\u7A31\u3002
-
- #Error codes used in DOMParser
--InvalidDocumentClassName = \u7528\u65BC\u5EFA\u69CB DOM \u6A39\u72C0\u7D50\u69CB\u7684\u6587\u4EF6\u8655\u7406\u7AD9 \"{0}\" \u985E\u5225\u540D\u7A31\u4E26\u975E\u985E\u578B org.w3c.dom.Document\u3002
--MissingDocumentClassName = \u627E\u4E0D\u5230\u7528\u65BC\u5EFA\u69CB DOM \u6A39\u72C0\u7D50\u69CB\u7684\u6587\u4EF6\u8655\u7406\u7AD9 \"{0}\" \u985E\u5225\u540D\u7A31\u3002
--CannotCreateDocumentClass = \u540D\u7A31\u70BA \"{0}\" \u7684\u985E\u5225\u7121\u6CD5\u5EFA\u69CB\u70BA org.w3c.dom.Document\u3002
-+InvalidDocumentClassName = \u7528\u65BC\u5EFA\u69CB DOM \u6A39\u72C0\u7D50\u69CB\u7684\u6587\u4EF6\u8655\u7406\u7AD9 "{0}" \u985E\u5225\u540D\u7A31\u4E26\u975E\u985E\u578B org.w3c.dom.Document\u3002
-+MissingDocumentClassName = \u627E\u4E0D\u5230\u7528\u65BC\u5EFA\u69CB DOM \u6A39\u72C0\u7D50\u69CB\u7684\u6587\u4EF6\u8655\u7406\u7AD9 "{0}" \u985E\u5225\u540D\u7A31\u3002
-+CannotCreateDocumentClass = \u540D\u7A31\u70BA "{0}" \u7684\u985E\u5225\u7121\u6CD5\u5EFA\u69CB\u70BA org.w3c.dom.Document\u3002
-
- # Error codes used by JAXP DocumentBuilder
- jaxp-order-not-supported = \u8A2D\u5B9A\u5C6C\u6027 ''{1}'' \u4E4B\u524D\uFF0C\u5FC5\u9808\u8A2D\u5B9A\u5C6C\u6027 ''{0}''\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
- FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
-
- FieldCannotBeNull={0} kann nicht mit "Null"-Parameter aufgerufen werden.
--UnknownField={0} mit unbekanntem Feld aufgerufen\:{1}
-+UnknownField={0} mit unbekanntem Feld aufgerufen:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=Jahr \= {0}, Monat \= {1}, Tag \= {2}, Stunde\= {3}, Minute \= {4}, Sekunde \= {5}, fractionalSecond \= {6}, Zeitzone \= {7} ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
-+InvalidXGCValue-milli=Jahr = {0}, Monat = {1}, Tag = {2}, Stunde= {3}, Minute = {4}, Sekunde = {5}, fractionalSecond = {6}, Zeitzone = {7} ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=Jahr \= {0}, Monat \= {1}, Tag \= {2}, Stunde\= {3}, Minute \= {4}, Sekunde \= {5}, fractionalSecond \= {6}, Zeitzone \= {7} ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
-+InvalidXGCValue-fractional=Jahr = {0}, Monat = {1}, Tag = {2}, Stunde= {3}, Minute = {4}, Sekunde = {5}, fractionalSecond = {6}, Zeitzone = {7} ist keine g\u00FCltige Darstellung eines XML-Wertes f\u00FCr einen gregorianischen Kalender.
-
- InvalidXGCFields=Ung\u00FCltige Gruppe von Feldern f\u00FCr XMLGregorianCalendar festgelegt
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_es.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
- BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
- FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
-
- FieldCannotBeNull=no se puede llamar a {0} con un par\u00E1metro ''nulo''.
--UnknownField=se ha llamado a {0} con un campo desconocido\:{1}
-+UnknownField=se ha llamado a {0} con un campo desconocido:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=A\u00F1o \= {0}, Mes \= {1}, D\u00EDa \= {2}, Hora \= {3}, Minuto \= {4}, Segundo \= {5}, Segundo Fraccionario \= {6}, Zona Horaria \= {7} , no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
-+InvalidXGCValue-milli=A\u00F1o = {0}, Mes = {1}, D\u00EDa = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, Segundo Fraccionario = {6}, Zona Horaria = {7} , no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=A\u00F1o \= {0}, Mes \= {1}, D\u00EDa \= {2}, Hora \= {3}, Minuto \= {4}, Segundo \= {5}, Segundo Fraccionario \= {6}, Zona Horaria \= {7} , no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
-+InvalidXGCValue-fractional=A\u00F1o = {0}, Mes = {1}, D\u00EDa = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, Segundo Fraccionario = {6}, Zona Horaria = {7} , no es una representaci\u00F3n v\u00E1lida de un valor del calendario gregoriano XML.
-
- InvalidXGCFields=Juego de campos no v\u00E1lido definido para el calendario gregoriano XML
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
- FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
-
- FieldCannotBeNull=Impossible d''appeler {0} avec le param\u00E8tre ''null''.
--UnknownField={0} a \u00E9t\u00E9 appel\u00E9 avec un champ inconnu \: {1}
-+UnknownField={0} a \u00E9t\u00E9 appel\u00E9 avec un champ inconnu : {1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=Ann\u00E9e \= {0}, Mois \= {1}, Jour \= {2}, Heure \= {3}, Minute \= {4}, Seconde \= {5}, Fraction de seconde \= {6}, Fuseau horaire \= {7} ne repr\u00E9sentent pas des valeurs de calendrier gr\u00E9gorien XML valides.
-+InvalidXGCValue-milli=Ann\u00E9e = {0}, Mois = {1}, Jour = {2}, Heure = {3}, Minute = {4}, Seconde = {5}, Fraction de seconde = {6}, Fuseau horaire = {7} ne repr\u00E9sentent pas des valeurs de calendrier gr\u00E9gorien XML valides.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=Ann\u00E9e \= {0}, Mois \= {1}, Jour \= {2}, Heure \= {3}, Minute \= {4}, Seconde \= {5}, Fraction de seconde \= {6}, Fuseau horaire \= {7} ne repr\u00E9sentent pas des valeurs de calendrier gr\u00E9gorien XML valides.
-+InvalidXGCValue-fractional=Ann\u00E9e = {0}, Mois = {1}, Jour = {2}, Heure = {3}, Minute = {4}, Seconde = {5}, Fraction de seconde = {6}, Fuseau horaire = {7} ne repr\u00E9sentent pas des valeurs de calendrier gr\u00E9gorien XML valides.
-
- InvalidXGCFields=Ensemble de champs non valide pour XMLGregorianCalendar
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_it.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
- FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
-
- FieldCannotBeNull=Impossibile richiamare {0} con un parametro ''null''.
--UnknownField={0} richiamato con un campo sconosciuto\:{1}
-+UnknownField={0} richiamato con un campo sconosciuto:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=Anno \= {0}, mese \= {1}, giorno \= {2}, ora \= {3}, minuto \= {4}, secondo \= {5}, frazione di secondo \= {6}, fuso orario \= {7} non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
-+InvalidXGCValue-milli=Anno = {0}, mese = {1}, giorno = {2}, ora = {3}, minuto = {4}, secondo = {5}, frazione di secondo = {6}, fuso orario = {7} non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=Anno \= {0}, mese \= {1}, giorno \= {2}, ora \= {3}, minuto \= {4}, secondo \= {5}, frazione di secondo \= {6}, fuso orario \= {7} non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
-+InvalidXGCValue-fractional=Anno = {0}, mese = {1}, giorno = {2}, ora = {3}, minuto = {4}, secondo = {5}, frazione di secondo = {6}, fuso orario = {7} non \u00E8 una rappresentazione valida di un valore di calendario gregoriano XML.
-
- InvalidXGCFields=Impostato set di campi non valido per XMLGregorianCalendar
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
- FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
-
- FieldCannotBeNull={0}\u306F''null''\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u547C\u3073\u51FA\u305B\u307E\u305B\u3093\u3002
--UnknownField={0}\u306F\u4E0D\u660E\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F\: {1}
-+UnknownField={0}\u306F\u4E0D\u660E\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F: {1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=\u5E74\={0}\u3001\u6708\={1}\u3001\u65E5\={2}\u3001\u6642\={3}\u3001\u5206\={4}\u3001\u79D2\={5}\u3001\u5C0F\u6570\u79D2\={6}\u3001\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\={7}\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+InvalidXGCValue-milli=\u5E74={0}\u3001\u6708={1}\u3001\u65E5={2}\u3001\u6642={3}\u3001\u5206={4}\u3001\u79D2={5}\u3001\u5C0F\u6570\u79D2={6}\u3001\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3={7}\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=\u5E74\={0}\u3001\u6708\={1}\u3001\u65E5\={2}\u3001\u6642\={3}\u3001\u5206\={4}\u3001\u79D2\={5}\u3001\u5C0F\u6570\u79D2\={6}\u3001\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\={7}\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+InvalidXGCValue-fractional=\u5E74={0}\u3001\u6708={1}\u3001\u65E5={2}\u3001\u6642={3}\u3001\u5206={4}\u3001\u79D2={5}\u3001\u5C0F\u6570\u79D2={6}\u3001\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3={7}\u306F\u3001XML\u30B0\u30EC\u30B4\u30EA\u30AA\u66A6\u306E\u5024\u306E\u6709\u52B9\u306A\u8868\u73FE\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-
- InvalidXGCFields=XMLGregorianCalendar\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BB\u30C3\u30C8\u304C\u7121\u52B9\u3067\u3059
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
-
- FieldCannotBeNull={0}\uC740(\uB294) ''null'' \uB9E4\uAC1C\uBCC0\uC218\uB85C \uD638\uCD9C\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
--UnknownField={0}\uC774(\uAC00) \uC54C \uC218 \uC5C6\uB294 \uD544\uB4DC\uB85C \uD638\uCD9C\uB428\:{1}
-+UnknownField={0}\uC774(\uAC00) \uC54C \uC218 \uC5C6\uB294 \uD544\uB4DC\uB85C \uD638\uCD9C\uB428:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=\uC5F0\uB3C4 \= {0}, \uC6D4 \= {1}, \uB0A0\uC9DC \= {2}, \uC2DC\uAC04 \= {3}, \uBD84 \= {4}, \uCD08 \= {5}, \uC18C\uC218\uC810 \uC774\uD558 \uCD08 \= {6}, \uC2DC\uAC04\uB300 \= {7}\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
-+InvalidXGCValue-milli=\uC5F0\uB3C4 = {0}, \uC6D4 = {1}, \uB0A0\uC9DC = {2}, \uC2DC\uAC04 = {3}, \uBD84 = {4}, \uCD08 = {5}, \uC18C\uC218\uC810 \uC774\uD558 \uCD08 = {6}, \uC2DC\uAC04\uB300 = {7}\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=\uC5F0\uB3C4 \= {0}, \uC6D4 \= {1}, \uB0A0\uC9DC \= {2}, \uC2DC\uAC04 \= {3}, \uBD84 \= {4}, \uCD08 \= {5}, \uC18C\uC218\uC810 \uC774\uD558 \uCD08 \= {6}, \uC2DC\uAC04\uB300 \= {7}\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
-+InvalidXGCValue-fractional=\uC5F0\uB3C4 = {0}, \uC6D4 = {1}, \uB0A0\uC9DC = {2}, \uC2DC\uAC04 = {3}, \uBD84 = {4}, \uCD08 = {5}, \uC18C\uC218\uC810 \uC774\uD558 \uCD08 = {6}, \uC2DC\uAC04\uB300 = {7}\uC740(\uB294) XML \uC591\uB825 \uAC12\uC5D0 \uBD80\uC801\uD569\uD55C \uD615\uC2DD\uC785\uB2C8\uB2E4.
-
- InvalidXGCFields=XMLGregorianCalendar\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uD544\uB4DC \uC9D1\uD569\uC774 \uC124\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
- FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
-
- FieldCannotBeNull={0} n\u00E3o pode ser chamado com o par\u00E2metro ''null''.
--UnknownField={0} chamado com um campo desconhecido\:{1}
-+UnknownField={0} chamado com um campo desconhecido:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=Ano \= {0}, M\u00EAs \= {1}, Dia \= {2}, Hora \= {3}, Minuto \= {4}, Segundo \= {5}, fractionalSecond \= {6}, Fuso hor\u00E1rio \= {7} , n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
-+InvalidXGCValue-milli=Ano = {0}, M\u00EAs = {1}, Dia = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, fractionalSecond = {6}, Fuso hor\u00E1rio = {7} , n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=Ano \= {0}, M\u00EAs \= {1}, Dia \= {2}, Hora \= {3}, Minuto \= {4}, Segundo \= {5}, fractionalSecond \= {6}, Fuso hor\u00E1rio \= {7} , n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
-+InvalidXGCValue-fractional=Ano = {0}, M\u00EAs = {1}, Dia = {2}, Hora = {3}, Minuto = {4}, Segundo = {5}, fractionalSecond = {6}, Fuso hor\u00E1rio = {7} , n\u00E3o \u00E9 uma representa\u00E7\u00E3o v\u00E1lida de um valor do Calend\u00E1rio Gregoriano XML.
-
- InvalidXGCFields=Conjunto inv\u00E1lido de conjunto de campos para XMLGregorianCalendar
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
- FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-
- FieldCannotBeNull={0} kan inte anropas med null-parameter.
--UnknownField={0} anropades med ok\u00E4nt f\u00E4lt\:{1}
-+UnknownField={0} anropades med ok\u00E4nt f\u00E4lt:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=\u00C5r \= {0}, m\u00E5nad \= {1}, dag \= {2}, timme \= {3}, minut \= {4}, sekund \= {5}, br\u00E5kdelssekund \= {6}, tidszon \= {7} \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
-+InvalidXGCValue-milli=\u00C5r = {0}, m\u00E5nad = {1}, dag = {2}, timme = {3}, minut = {4}, sekund = {5}, br\u00E5kdelssekund = {6}, tidszon = {7} \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=\u00C5r \= {0}, m\u00E5nad \= {1}, dag \= {2}, timme \= {3}, minut \= {4}, sekund \= {5}, br\u00E5kdelssekund \= {6}, tidszon \= {7} \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
-+InvalidXGCValue-fractional=\u00C5r = {0}, m\u00E5nad = {1}, dag = {2}, timme = {3}, minut = {4}, sekund = {5}, br\u00E5kdelssekund = {6}, tidszon = {7} \u00E4r ogiltigt v\u00E4rde f\u00F6r gregoriansk kalender i XML.
-
- InvalidXGCFields=Ogiltig upps\u00E4ttning med f\u00E4lt angivet i XMLGregorianCalendar
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
- FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
-
- FieldCannotBeNull=\u65E0\u6CD5\u4F7F\u7528 ''null'' \u53C2\u6570\u8C03\u7528{0}\u3002
--UnknownField=\u4F7F\u7528\u672A\u77E5\u5B57\u6BB5\u8C03\u7528\u4E86{0}\: {1}
-+UnknownField=\u4F7F\u7528\u672A\u77E5\u5B57\u6BB5\u8C03\u7528\u4E86{0}: {1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=\u5E74 \= {0}, \u6708 \= {1}, \u65E5 \= {2}, \u5C0F\u65F6 \= {3}, \u5206 \= {4}, \u79D2 \= {5}, \u5C0F\u6570\u79D2 \= {6}, \u65F6\u533A \= {7} \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
-+InvalidXGCValue-milli=\u5E74 = {0}, \u6708 = {1}, \u65E5 = {2}, \u5C0F\u65F6 = {3}, \u5206 = {4}, \u79D2 = {5}, \u5C0F\u6570\u79D2 = {6}, \u65F6\u533A = {7} \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=\u5E74 \= {0}, \u6708 \= {1}, \u65E5 \= {2}, \u5C0F\u65F6 \= {3}, \u5206 \= {4}, \u79D2 \= {5}, \u5C0F\u6570\u79D2 \= {6}, \u65F6\u533A \= {7} \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
-+InvalidXGCValue-fractional=\u5E74 = {0}, \u6708 = {1}, \u65E5 = {2}, \u5C0F\u65F6 = {3}, \u5206 = {4}, \u79D2 = {5}, \u5C0F\u6570\u79D2 = {6}, \u65F6\u533A = {7} \u4E0D\u662F XML \u683C\u91CC\u5386\u503C\u7684\u6709\u6548\u8868\u793A\u3002
-
- InvalidXGCFields=\u4E3A XMLGregorianCalendar \u8BBE\u7F6E\u7684\u5B57\u6BB5\u96C6\u65E0\u6548
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,46 +1,18 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Datatype API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: DatatypeMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: DatatypeMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
- FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
-
- FieldCannotBeNull=\u7121\u6CD5\u4F7F\u7528 ''null'' \u53C3\u6578\u547C\u53EB {0}
--UnknownField=\u4F7F\u7528\u4E0D\u660E\u7684\u6B04\u4F4D\u547C\u53EB {0}\:{1}
-+UnknownField=\u4F7F\u7528\u4E0D\u660E\u7684\u6B04\u4F4D\u547C\u53EB {0}:{1}
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-milli=\u5E74 \= {0}\u3001\u6708 \= {1}\uFF0C\u65E5 \= {2}\uFF0C\u5C0F\u6642 \= {3}\uFF0C\u5206\u9418\uFF0C \= {4}\uFF0C\u79D2 \= {5}\uFF0C\u5C0F\u6578\u79D2 \= {6}\uFF0C\u6642\u5340\uFF0C \= {7}\uFF0C\u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
-+InvalidXGCValue-milli=\u5E74 = {0}\u3001\u6708 = {1}\uFF0C\u65E5 = {2}\uFF0C\u5C0F\u6642 = {3}\uFF0C\u5206\u9418\uFF0C = {4}\uFF0C\u79D2 = {5}\uFF0C\u5C0F\u6578\u79D2 = {6}\uFF0C\u6642\u5340\uFF0C = {7}\uFF0C\u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
- #There are two similar keys 'InvalidXMLGreogorianCalendarValue' . Suffix (year, month) has been added and are used as per the context.
--InvalidXGCValue-fractional=\u5E74 \= {0}\u3001\u6708 \= {1}\uFF0C\u65E5 \= {2}\uFF0C\u5C0F\u6642 \= {3}\uFF0C\u5206\u9418\uFF0C \= {4}\uFF0C\u79D2 \= {5}\uFF0C\u5C0F\u6578\u79D2 \= {6}\uFF0C\u6642\u5340\uFF0C \= {7}\uFF0C\u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
-+InvalidXGCValue-fractional=\u5E74 = {0}\u3001\u6708 = {1}\uFF0C\u65E5 = {2}\uFF0C\u5C0F\u6642 = {3}\uFF0C\u5206\u9418\uFF0C = {4}\uFF0C\u79D2 = {5}\uFF0C\u5C0F\u6578\u79D2 = {6}\uFF0C\u6642\u5340\uFF0C = {7}\uFF0C\u4E0D\u662F XML \u516C\u66C6\u503C\u7684\u6709\u6548\u8868\u793A\u6CD5\u3002
-
- InvalidXGCFields=XMLGregorianCalendar \u8A2D\u5B9A\u4E86\u7121\u6548\u7684\u6B04\u4F4D\u96C6
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
-@@ -39,8 +11,8 @@
- # SchemaFactory error messages
- SchemaLanguageNull = Angegebene Schemasprache darf nicht null sein.
- SchemaLanguageLengthZero = Angegebene Schemasprache darf nicht null Zeichen lang sein.
--SchemaSourceArrayNull = Quell-Array-Parameter darf nicht null sein.
--SchemaSourceArrayMemberNull = Quell-Array-Parameter darf keine Nullelemente enthalten.
-+SchemaSourceArrayNull = Quellarrayparameter darf nicht null sein.
-+SchemaSourceArrayMemberNull = Quellarrayparameter darf keine Nullelemente enthalten.
- SchemaFactorySourceUnrecognized = Quellparameter des Typs "{0}" ist in dieser SchemaFactory unbekannt.
-
- # Validator error messages
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_es.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
-@@ -45,7 +17,7 @@
-
- # Validator error messages
- SourceParameterNull = Le param\u00E8tre source ne peut pas \u00EAtre NULL.
--SourceNotAccepted = Le param\u00E8tre source de type ''{0}'' n''est pas accept\u00E9 par ce contr\u00F4le de validation (validator).
-+SourceNotAccepted = Le param\u00E8tre source de type ''{0}'' n''est pas accept\u00E9 par ce valideur.
- SourceResultMismatch = Le param\u00E8tre source de type ''{0}'' n''est pas compatible avec le param\u00E8tre de r\u00E9sultat de type ''{1}''.
-
- # TypeInfoProvider error messages
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_it.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-@@ -45,7 +17,7 @@
-
- # Validator error messages
- SourceParameterNull = Il parametro di origine non pu\u00F2 essere nullo.
--SourceNotAccepted = Il parametro di origine di tipo ''{0}'' non \u00E8 accettato da questo convalidatore.
-+SourceNotAccepted = Il parametro di origine di tipo ''{0}'' non \u00E8 accettato da questo validator.
- SourceResultMismatch = Il parametro di origine di tipo ''{0}'' non \u00E8 compatibile con il parametro dei risultati di tipo ''{1}''.
-
- # TypeInfoProvider error messages
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces JAXP Validation API implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: JAXPValidationMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: JAXPValidationMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
-
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
-@@ -48,7 +20,7 @@
- true-not-supported = Status "True" f\u00FCr Feature "{0}" wird nicht unterst\u00FCtzt.
- false-not-supported = Status "False" f\u00FCr Feature "{0}" wird nicht unterst\u00FCtzt.
- feature-read-only = Feature "{0}" ist schreibgesch\u00FCtzt.
--jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Feature kann nicht auf \"false\" gesetzt werden, wenn Security Manager vorhanden ist.
-+jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Feature kann nicht auf "false" gesetzt werden, wenn Security Manager vorhanden ist.
-
- # property messages
- property-not-supported = Eigenschaft "{0}" wird nicht unterst\u00FCtzt.
-@@ -60,5 +32,5 @@
-
- start-document-not-called=Eigenschaft "{0}" sollte aufgerufen werden, nachdem das startDocument-Ereignis ausgel\u00F6st wurde
- nullparameter=Namensparameter f\u00FCr "{0}" ist null
--errorHandlerNotSet=Warnung\: Validierung wurde eingeschaltet, aber es wurde kein org.xml.sax.ErrorHandler festgelegt. Dies ist wahrscheinlich nicht beabsichtigt. Parser druckt die ersten {0} Fehler mit einem Standard-ErrorHandler. Rufen Sie die Methode "setErrorHandler" auf, um dies zu beheben.
--errorHandlerDebugMsg=Fehler\: URI \= "{0}", Zeile \= "{1}", \: {2}
-+errorHandlerNotSet=Warnung: Validierung wurde eingeschaltet, aber es wurde kein org.xml.sax.ErrorHandler festgelegt. Dies ist wahrscheinlich nicht beabsichtigt. Parser druckt die ersten {0} Fehler mit einem Standard-ErrorHandler. Rufen Sie die Methode "setErrorHandler" auf, um dies zu beheben.
-+errorHandlerDebugMsg=Fehler: URI = "{0}", Zeile = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_es.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
-
- BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
-@@ -60,5 +32,5 @@
-
- start-document-not-called=La propiedad "{0}" debe llamarse despu\u00E9s de que se haya devuelto el evento startDocument
- nullparameter=el par\u00E1metro de nombre para "{0}" es nulo
--errorHandlerNotSet=Advertencia\: se activ\u00F3 la validaci\u00F3n pero no se defini\u00F3 un org.xml.sax.ErrorHandler, lo cual probablemente sea un resultado no deseado. El analizador utilizar\u00E1 un ErrorHandler por defecto para imprimir los primeros {0} errores. Llame al m\u00E9todo ''setErrorHandler'' para solucionarlo.
--errorHandlerDebugMsg=Error\: URI \= "{0}", L\u00EDnea \= "{1}", \: {2}
-+errorHandlerNotSet=Advertencia: se activ\u00F3 la validaci\u00F3n pero no se defini\u00F3 un org.xml.sax.ErrorHandler, lo cual probablemente sea un resultado no deseado. El analizador utilizar\u00E1 un ErrorHandler por defecto para imprimir los primeros {0} errores. Llame al m\u00E9todo ''setErrorHandler'' para solucionarlo.
-+errorHandlerDebugMsg=Error: URI = "{0}", L\u00EDnea = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
-
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
-@@ -60,5 +32,5 @@
-
- start-document-not-called=La propri\u00E9t\u00E9 "{0}" doit \u00EAtre appel\u00E9e apr\u00E8s qu''un \u00E9v\u00E9nement startDocument est g\u00E9n\u00E9r\u00E9
- nullparameter=le param\u00E8tre de nom pour "{0}" est NULL
--errorHandlerNotSet=Avertissement \: la validation a \u00E9t\u00E9 activ\u00E9e mais aucun \u00E9l\u00E9ment org.xml.sax.ErrorHandler n''a \u00E9t\u00E9 d\u00E9fini, ce qui devrait probablement \u00EAtre le cas. L''analyseur utilisera un gestionnaire d''erreurs par d\u00E9faut pour imprimer les {0} premi\u00E8res erreurs. Appelez la m\u00E9thode ''setErrorHandler'' pour r\u00E9soudre ce probl\u00E8me.
--errorHandlerDebugMsg=Erreur \: URI \= "{0}", ligne \= "{1}", \: {2}
-+errorHandlerNotSet=Avertissement : la validation a \u00E9t\u00E9 activ\u00E9e mais aucun \u00E9l\u00E9ment org.xml.sax.ErrorHandler n''a \u00E9t\u00E9 d\u00E9fini, ce qui devrait probablement \u00EAtre le cas. L''analyseur utilisera un gestionnaire d''erreurs par d\u00E9faut pour imprimer les {0} premi\u00E8res erreurs. Appelez la m\u00E9thode ''setErrorHandler'' pour r\u00E9soudre ce probl\u00E8me.
-+errorHandlerDebugMsg=Erreur : URI = "{0}", ligne = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_it.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
-
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
-@@ -60,5 +32,5 @@
-
- start-document-not-called=Richiamare la propriet\u00E0 "{0}" dopo l''esecuzione dell''evento startDocument
- nullparameter=il parametro del nome per "{0}" \u00E8 nullo
--errorHandlerNotSet=Avvertenza\: la convalida \u00E8 stata attivata, ma org.xml.sax.ErrorHandler non \u00E8 stato impostato, il che potrebbe essere un errore. Il parser utilizzer\u00E0 un ErrorHandler predefinito per visualizzare i primi {0} errori. Richiamare il metodo ''setErrorHandler'' per correggere questo problema.
--errorHandlerDebugMsg=Errore\: URI \= "{0}", riga \= "{1}", \: {2}
-+errorHandlerNotSet=Avvertenza: la convalida \u00E8 stata attivata, ma org.xml.sax.ErrorHandler non \u00E8 stato impostato, il che potrebbe essere un errore. Il parser utilizzer\u00E0 un ErrorHandler predefinito per visualizzare i primi {0} errori. Richiamare il metodo ''setErrorHandler'' per correggere questo problema.
-+errorHandlerDebugMsg=Errore: URI = "{0}", riga = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
-
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-@@ -60,5 +32,5 @@
-
- start-document-not-called=startDocument\u30A4\u30D9\u30F3\u30C8\u304C\u30B9\u30ED\u30FC\u3055\u308C\u305F\u5F8C\u3001\u30D7\u30ED\u30D1\u30C6\u30A3"{0}"\u3092\u547C\u3073\u51FA\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
- nullparameter="{0}"\u306E\u540D\u524D\u30D1\u30E9\u30E1\u30FC\u30BF\u304Cnull\u3067\u3059
--errorHandlerNotSet=\u8B66\u544A\: \u691C\u8A3C\u306F\u30AA\u30F3\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u304C\u3001org.xml.sax.ErrorHandler\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3068\u3055\u308C\u3066\u3044\u308B\u30CF\u30F3\u30C9\u30E9\u306F\u3053\u306E\u30CF\u30F3\u30C9\u30E9\u3067\u306F\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u30D1\u30FC\u30B5\u30FC\u3067\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306EErrorHandler\u3092\u4F7F\u7528\u3057\u3066\u6700\u521D\u306E{0}\u30A8\u30E9\u30FC\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u554F\u984C\u3092\u4FEE\u6B63\u3059\u308B\u306B\u306F\u3001''setErrorHandler''\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--errorHandlerDebugMsg=\u30A8\u30E9\u30FC\: URI \= "{0}"\u3001\u884C \= "{1}"\u3001\: {2}
-+errorHandlerNotSet=\u8B66\u544A: \u691C\u8A3C\u306F\u30AA\u30F3\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u304C\u3001org.xml.sax.ErrorHandler\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3068\u3055\u308C\u3066\u3044\u308B\u30CF\u30F3\u30C9\u30E9\u306F\u3053\u306E\u30CF\u30F3\u30C9\u30E9\u3067\u306F\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u30D1\u30FC\u30B5\u30FC\u3067\u306F\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306EErrorHandler\u3092\u4F7F\u7528\u3057\u3066\u6700\u521D\u306E{0}\u30A8\u30E9\u30FC\u304C\u51FA\u529B\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u554F\u984C\u3092\u4FEE\u6B63\u3059\u308B\u306B\u306F\u3001''setErrorHandler''\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-+errorHandlerDebugMsg=\u30A8\u30E9\u30FC: URI = "{0}"\u3001\u884C = "{1}"\u3001: {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
-
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-@@ -39,7 +11,7 @@
-
- # JAXP messages
- schema-not-supported = \uC9C0\uC815\uB41C \uC2A4\uD0A4\uB9C8 \uC5B8\uC5B4\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
--jaxp-order-not-supported = ''{1}'' \uC18D\uC131\uC744 \uC124\uC815\uD558\uAE30 \uC804\uC5D0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.
-+jaxp-order-not-supported = ''{1}'' \uC18D\uC131\uC744 \uC124\uC815\uD558\uAE30 \uC804\uC5D0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.
- schema-already-specified = \uB110\uC774 \uC544\uB2CC \uC2A4\uD0A4\uB9C8 \uAC1D\uCCB4\uAC00 \uC774\uBBF8 \uC9C0\uC815\uB41C \uACBD\uC6B0 ''{0}'' \uC18D\uC131\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-
- # feature messages
-@@ -60,5 +32,5 @@
-
- start-document-not-called="{0}" \uC18D\uC131\uC740 startDocument \uC774\uBCA4\uD2B8\uAC00 \uBC1C\uC0DD\uB41C \uD6C4 \uD638\uCD9C\uD574\uC57C \uD569\uB2C8\uB2E4.
- nullparameter="{0}"\uC5D0 \uB300\uD55C \uC774\uB984 \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uB110\uC785\uB2C8\uB2E4.
--errorHandlerNotSet=\uACBD\uACE0\: \uAC80\uC99D\uC774 \uC124\uC815\uB418\uC5C8\uC9C0\uB9CC org.xml.sax.ErrorHandler\uAC00 \uC801\uC808\uD788 \uC124\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uAE30\uBCF8 ErrorHandler\uB97C \uC0AC\uC6A9\uD558\uC5EC \uCC98\uC74C {0}\uAC1C\uC758 \uC624\uB958\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4. \uC774 \uC624\uB958\uB97C \uC218\uC815\uD558\uB824\uBA74 ''setErrorHandler'' \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD558\uC2ED\uC2DC\uC624.
--errorHandlerDebugMsg=\uC624\uB958\: URI \= "{0}", \uD589 \= "{1}", \: {2}
-+errorHandlerNotSet=\uACBD\uACE0: \uAC80\uC99D\uC774 \uC124\uC815\uB418\uC5C8\uC9C0\uB9CC org.xml.sax.ErrorHandler\uAC00 \uC801\uC808\uD788 \uC124\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uAD6C\uBB38 \uBD84\uC11D\uAE30\uAC00 \uAE30\uBCF8 ErrorHandler\uB97C \uC0AC\uC6A9\uD558\uC5EC \uCC98\uC74C {0}\uAC1C\uC758 \uC624\uB958\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4. \uC774 \uC624\uB958\uB97C \uC218\uC815\uD558\uB824\uBA74 ''setErrorHandler'' \uBA54\uC18C\uB4DC\uB97C \uD638\uCD9C\uD558\uC2ED\uC2DC\uC624.
-+errorHandlerDebugMsg=\uC624\uB958: URI = "{0}", \uD589 = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
-
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
-@@ -54,11 +26,11 @@
- property-not-supported = A propriedade ''{0}'' n\u00E3o \u00E9 suportada.
- property-not-recognized = A propriedade ''{0}'' n\u00E3o \u00E9 reconhecida.
- property-read-only = A propriedade ''{0}'' \u00E9 somente para leitura.
--property-not-parsing-supported = A propriedade ''{0}'' n\u00E3o \u00E9 suportada durante o parse.
-+property-not-parsing-supported = A propriedade ''{0}'' n\u00E3o \u00E9 suportada durante o parsing.
- dom-node-read-not-supported = N\u00E3o \u00E9 poss\u00EDvel ler a propriedade do n\u00F3 de DOM. N\u00E3o existe uma \u00E1rvore de DOM.
- incompatible-class = O valor especificado para a propriedade ''{0}'' n\u00E3o pode ser transmitido para ''{1}''.
-
- start-document-not-called=A propriedade "{0}" deve ser chamada ap\u00F3s o evento startDocument ser lan\u00E7ado
- nullparameter=o par\u00E2metro de nome de "{0}" \u00E9 nulo
--errorHandlerNotSet=Advert\u00EAncia\: A valida\u00E7\u00E3o foi ativada, mas um org.xml.sax.ErrorHandler n\u00E3o foi definido, provavelmente porque n\u00E3o era necess\u00E1rio. O parser usar\u00E1 um ErrorHandler default para imprimir os primeiros {0} erros. Chame o m\u00E9todo ''setErrorHandler'' para corrigir o problema.
--errorHandlerDebugMsg=Erro\: URI \= "{0}", Linha \= "{1}", \: {2}
-+errorHandlerNotSet=Advert\u00EAncia: A valida\u00E7\u00E3o foi ativada, mas um org.xml.sax.ErrorHandler n\u00E3o foi definido, provavelmente porque n\u00E3o era necess\u00E1rio. O parser usar\u00E1 um ErrorHandler padr\u00E3o para imprimir os primeiros {0} erros. Chame o m\u00E9todo ''setErrorHandler'' para corrigir o problema.
-+errorHandlerDebugMsg=Erro: URI = "{0}", Linha = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
-
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
-@@ -60,5 +32,5 @@
-
- start-document-not-called=Egenskapen "{0}" b\u00F6r anropas efter startDocument-h\u00E4ndelsen utl\u00F6ses
- nullparameter=namnparametern f\u00F6r "{0}" \u00E4r null
--errorHandlerNotSet=Varning\: valideringen startades, men det fanns ingen angiven org.xml.sax.ErrorHandler. Parser anv\u00E4nder ErrorHandler av standardtyp vid utskrift av de f\u00F6rsta {0} felen. Korrigera felet genom anrop av setErrorHandler-metoden.
--errorHandlerDebugMsg=Fel\: URI \= "{0}", Rad \= "{1}", \: {2}
-+errorHandlerNotSet=Varning: valideringen startades, men det fanns ingen angiven org.xml.sax.ErrorHandler. Parser anv\u00E4nder ErrorHandler av standardtyp vid utskrift av de f\u00F6rsta {0} felen. Korrigera felet genom anrop av setErrorHandler-metoden.
-+errorHandlerDebugMsg=Fel: URI = "{0}", Rad = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
-
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
-@@ -54,11 +26,11 @@
- property-not-supported = \u4E0D\u652F\u6301\u5C5E\u6027 ''{0}''\u3002
- property-not-recognized = \u65E0\u6CD5\u8BC6\u522B\u5C5E\u6027 ''{0}''\u3002
- property-read-only = \u5C5E\u6027 ''{0}'' \u4E3A\u53EA\u8BFB\u3002
--property-not-parsing-supported = \u6267\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u4E0D\u652F\u6301\u5C5E\u6027 ''{0}''\u3002
-+property-not-parsing-supported = \u89E3\u6790\u65F6\u4E0D\u652F\u6301\u5C5E\u6027 ''{0}''\u3002
- dom-node-read-not-supported = \u65E0\u6CD5\u8BFB\u53D6 DOM \u8282\u70B9\u5C5E\u6027\u3002\u4E0D\u5B58\u5728 DOM \u6811\u3002
- incompatible-class = \u4E3A\u5C5E\u6027 ''{0}'' \u6307\u5B9A\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3A{1}\u3002
-
- start-document-not-called=\u5E94\u5728\u629B\u51FA startDocument \u4E8B\u4EF6\u540E\u8C03\u7528\u5C5E\u6027 "{0}"
- nullparameter="{0}" \u7684\u540D\u79F0\u53C2\u6570\u4E3A\u7A7A\u503C
--errorHandlerNotSet=\u8B66\u544A\: \u5DF2\u542F\u7528\u9A8C\u8BC1, \u4F46\u672A\u8BBE\u7F6E org.xml.sax.ErrorHandler, \u8FD9\u53EF\u80FD\u4E0D\u662F\u9884\u671F\u7ED3\u679C\u3002\u8BED\u6CD5\u5206\u6790\u5668\u5C06\u4F7F\u7528\u9ED8\u8BA4 ErrorHandler \u6765\u8F93\u51FA\u524D {0} \u4E2A\u9519\u8BEF\u3002\u8BF7\u8C03\u7528 ''setErrorHandler'' \u65B9\u6CD5\u4EE5\u89E3\u51B3\u6B64\u95EE\u9898\u3002
--errorHandlerDebugMsg=\u9519\u8BEF\: URI \= "{0}", \u884C \= "{1}", \: {2}
-+errorHandlerNotSet=\u8B66\u544A: \u5DF2\u542F\u7528\u9A8C\u8BC1, \u4F46\u672A\u8BBE\u7F6E org.xml.sax.ErrorHandler, \u8FD9\u53EF\u80FD\u4E0D\u662F\u9884\u671F\u7ED3\u679C\u3002\u89E3\u6790\u5668\u5C06\u4F7F\u7528\u9ED8\u8BA4 ErrorHandler \u6765\u8F93\u51FA\u524D {0} \u4E2A\u9519\u8BEF\u3002\u8BF7\u8C03\u7528 ''setErrorHandler'' \u65B9\u6CD5\u4EE5\u89E3\u51B3\u6B64\u95EE\u9898\u3002
-+errorHandlerDebugMsg=\u9519\u8BEF: URI = "{0}", \u884C = "{1}", : {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces
- # SAX implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: SAXMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: SAXMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
-
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
-@@ -60,5 +32,5 @@
-
- start-document-not-called=\u767C\u751F startDocument \u4E8B\u4EF6\u4E4B\u5F8C\uFF0C\u61C9\u547C\u53EB\u5C6C\u6027 "{0}"\u3002
- nullparameter="{0}" \u7684\u540D\u7A31\u53C3\u6578\u70BA\u7A7A\u503C
--errorHandlerNotSet=\u8B66\u544A\: \u5DF2\u958B\u555F\u9A57\u8B49\uFF0C\u4F46\u662F\u672A\u8A2D\u5B9A org.xml.sax.ErrorHandler\uFF0C\u9019\u53EF\u80FD\u4E0D\u662F\u6240\u8981\u7684\u72C0\u614B\u3002\u5256\u6790\u5668\u5C07\u4F7F\u7528\u9810\u8A2D\u7684 ErrorHandler \u4F86\u5217\u5370\u7B2C\u4E00\u500B {0} \u932F\u8AA4\u3002\u8ACB\u547C\u53EB ''setErrorHandler'' \u65B9\u6CD5\u4F86\u4FEE\u6B63\u6B64\u554F\u984C\u3002
--errorHandlerDebugMsg=\u932F\u8AA4\: URI \= "{0}"\uFF0C\u884C \= "{1}"\uFF0C\: {2}
-+errorHandlerNotSet=\u8B66\u544A: \u5DF2\u958B\u555F\u9A57\u8B49\uFF0C\u4F46\u662F\u672A\u8A2D\u5B9A org.xml.sax.ErrorHandler\uFF0C\u9019\u53EF\u80FD\u4E0D\u662F\u6240\u8981\u7684\u72C0\u614B\u3002\u5256\u6790\u5668\u5C07\u4F7F\u7528\u9810\u8A2D\u7684 ErrorHandler \u4F86\u5217\u5370\u7B2C\u4E00\u500B {0} \u932F\u8AA4\u3002\u8ACB\u547C\u53EB ''setErrorHandler'' \u65B9\u6CD5\u4F86\u4FEE\u6B63\u6B64\u554F\u984C\u3002
-+errorHandlerDebugMsg=\u932F\u8AA4: URI = "{0}"\uFF0C\u884C = "{1}"\uFF0C: {2}
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
- FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
-@@ -39,10 +11,10 @@
- HrefMissing = "href"-Attribut eines "include"-Elements fehlt.
- RecursiveInclude = Rekursives "include" ermittelt. Dokument "{0}" wurde bereits verarbeitet.
- InvalidParseValue = Ung\u00FCltiger Wert f\u00FCr "parse"-Attribut bei "include"-Element: "{0}".
--XMLParseError = Fehler beim Versuch, XML-Datei zu parsen (href="{0}"). Grund: {1}
-+XMLParseError = Fehler beim Versuch, XML-Datei zu parsen (href=''{0}''). Ursache: {1}
- XMLResourceError = Include-Vorgang nicht erfolgreich. Zur\u00FCck zu Fallback. Ressourcenfehler beim Lesen der Datei als XML (href="{0}"). Grund: {1}
- TextResourceError = Include-Vorgang nicht erfolgreich. Zur\u00FCck zu Fallback. Ressourcenfehler beim Lesen der Datei als Text (href="{0}"). Grund: {1}
--NO_XPointerSchema = Schema f\u00FCr \"{0}\" wird standardm\u00E4\u00DFig nicht unterst\u00FCtzt. Definieren Sie Ihr eigenes Schema f\u00FCr {0}. Siehe http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = Schema f\u00FCr "{0}" wird standardm\u00E4\u00DFig nicht unterst\u00FCtzt. Definieren Sie Ihr eigenes Schema f\u00FCr {0}. Siehe http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = Keine Subressource von XPointer-Prozessor f\u00FCr Zeiger {0} identifiziert.
- NonDuplicateNotation = Mehrere Notationen mit dem Namen "{0}" wurden verwendet, die aber nicht als Duplikate ermittelt wurden.
- NonDuplicateUnparsedEntity = Mehrere nicht geparste Entit\u00E4ten mit dem Namen "{0}" wurden verwendet, die aber nicht als Duplikate ermittelt wurden.
-@@ -55,7 +27,7 @@
- UnexpandedEntityReferenceIllegal = Der Ersatz eines "include"-Elements, das als Dokumentelement im Quell-Infoset der obersten Ebene angezeigt wird, darf keine nicht erweiterten Entit\u00E4tsreferenzen enthalten.
- HrefFragmentIdentifierIllegal = Fragment-IDs d\u00FCrfen nicht verwendet werden. Der "href"-Attributwert "{0}" ist nicht zul\u00E4ssig.
- HrefSyntacticallyInvalid = "href"-Attributwert "{0}" hat eine ung\u00FCltige Syntax. Nach Anwenden der Escape-Regeln ist der Wert kein syntaktisch korrekter URI oder IRI.
--XPointerStreamability = Es wurde ein xpointer angegeben, der auf eine Stelle im Quell-Infoset verweist. Auf diese Stelle kann aufgrund des Streaming-Charakters des Prozessors nicht zugegriffen werden.
-+XPointerStreamability = Es wurde ein xpointer angegeben, der auf eine Stelle im Quell-Infoset verweist. Auf diese Stelle kann aufgrund des Streamingcharakters des Prozessors nicht zugegriffen werden.
-
- XPointerResolutionUnsuccessful = XPointer-Aufl\u00F6sung nicht erfolgreich.
-
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
- FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
-@@ -39,10 +11,10 @@
- HrefMissing = Falta el atributo 'href' de un elemento 'include'.
- RecursiveInclude = Se ha detectado un elemento include recursivo. El documento ''{0}'' ya se ha procesado.
- InvalidParseValue = Valor no v\u00E1lido para el atributo ''parse'' en el elemento ''include'': ''{0}''.
--XMLParseError = Error al intentar analizar el archivo XML (href=''{0}''). Motivo: {1}
-+XMLParseError = Error al intentar analizar el archivo XML (href=''{0}''). Motivo: {1}
- XMLResourceError = Fallo de la operaci\u00F3n include, conversi\u00F3n a fallback. Error del recurso al leer el archivo como XML (href=''{0}''). Motivo: {1}
- TextResourceError = Fallo de la operaci\u00F3n include, conversi\u00F3n a fallback. Error del recurso al leer el archivo como texto (href=''{0}''). Motivo: {1}
--NO_XPointerSchema = El esquema para \"{0}\" no est\u00E1 soportado por defecto. Defina su propio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = El esquema para "{0}" no est\u00E1 soportado por defecto. Defina su propio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = El procesador XPointer no ha identificado el subrecurso para el puntero {0}.
- NonDuplicateNotation = Se han utilizado varias notaciones con el nombre''{0}'', pero no se ha determinado que sean duplicados.
- NonDuplicateUnparsedEntity = Se han utilizado varias entidades no analizadas con el nombre''{0}'', pero no se ha determinado que sean duplicados.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
- FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
-@@ -42,7 +14,7 @@
- XMLParseError = Erreur lors de la tentative d''analyse du fichier XML (href=''{0}''). Raison : {1}
- XMLResourceError = Echec de l''op\u00E9ration Include, r\u00E9tablissement de l''\u00E9l\u00E9ment fallback. Erreur de ressource lors de la lecture du fichier en tant que XML (href=''{0}''). Raison : {1}
- TextResourceError = Echec de l''op\u00E9ration Include, r\u00E9tablissement de l''\u00E9l\u00E9ment fallback. Erreur de ressource lors de la lecture du fichier en tant que texte (href=''{0}''). Raison : {1}
--NO_XPointerSchema = Par d\u00E9faut, le sch\u00E9ma pour \"{0}\" n''est pas pris en charge. D\u00E9finissez votre propre sch\u00E9ma pour {0}. Reportez-vous \u00E0 l''adresse http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = Par d\u00E9faut, le sch\u00E9ma pour "{0}" n''est pas pris en charge. D\u00E9finissez votre propre sch\u00E9ma pour {0}. Reportez-vous \u00E0 l''adresse http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = Aucune sous-ressource n''est identifi\u00E9e par le processeur XPointer pour le pointeur {0}.
- NonDuplicateNotation = Plusieurs notations portant le nom ''{0}'' ont \u00E9t\u00E9 utilis\u00E9es, mais elles n''ont pas \u00E9t\u00E9 consid\u00E9r\u00E9es comme des doublons.
- NonDuplicateUnparsedEntity = Plusieurs entit\u00E9s non analys\u00E9es portant le nom ''{0}'' ont \u00E9t\u00E9 utilis\u00E9es, mais elles n''ont pas \u00E9t\u00E9 consid\u00E9r\u00E9es comme des doublons.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
- FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
-@@ -39,10 +11,10 @@
- HrefMissing = Manca l'attributo 'href' di un elemento 'include'.
- RecursiveInclude = Inclusione ricorsiva rilevata. Il documento ''{0}'' \u00E8 gi\u00E0 stato elaborato.
- InvalidParseValue = Valore non valido per l''attributo ''parse'' nell''elemento ''include'': ''{0}''.
--XMLParseError = Errore nel tentativo di analizzare il file XML (href=''{0}''). Motivo: {1}
-+XMLParseError = Errore durante il tentativo di analizzare il file XML (href=''{0}''). Causa: {1}
- XMLResourceError = Operazione di inclusione non riuscita. Verr\u00E0 ripristinato il fallback. Errore di risorsa durante la lettura del file come XML (href=''{0}''). Motivo: {1}
- TextResourceError = Operazione di inclusione non riuscita. Verr\u00E0 ripristinato il fallback. Errore di risorsa durante la lettura del file come testo (href=''{0}''). Motivo: {1}
--NO_XPointerSchema = Lo schema per \"{0}\" non \u00E8 supportato per impostazione predefinita. Definire il proprio schema per {0}. Vedere http://apache.org/xml/properties/xpointer-schema.
-+NO_XPointerSchema = Lo schema per "{0}" non \u00E8 supportato per impostazione predefinita. Definire il proprio schema per {0}. Vedere http://apache.org/xml/properties/xpointer-schema.
- NO_SubResourceIdentified = Nessuna risorsa secondaria identificata dal processore XPointer per il puntatore {0}.
- NonDuplicateNotation = Sono state utilizzate pi\u00F9 notazioni con il nome ''{0}'', ma \u00E8 stato determinato che non sono duplicati.
- NonDuplicateUnparsedEntity = Sono state utilizzate pi\u00F9 entit\u00E0 non analizzate con il nome ''{0}'', ma \u00E8 stato determinato che non sono duplicati.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
- FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
-@@ -42,7 +14,7 @@
- XMLParseError = XML\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u8A66\u884C\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F(href=''{0}'')\u3002\u7406\u7531: {1}
- XMLResourceError = \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u64CD\u4F5C\u304C\u5931\u6557\u3057\u3001\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306B\u623B\u308A\u307E\u3059\u3002\u30D5\u30A1\u30A4\u30EB\u3092XML\u3068\u3057\u3066\u8AAD\u53D6\u308A\u4E2D\u306B\u30EA\u30BD\u30FC\u30B9\u30FB\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F(href=''{0}'')\u3002\u7406\u7531: {1}
- TextResourceError = \u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u64CD\u4F5C\u304C\u5931\u6557\u3057\u3001\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306B\u623B\u308A\u307E\u3059\u3002\u30D5\u30A1\u30A4\u30EB\u3092\u30C6\u30AD\u30B9\u30C8\u3068\u3057\u3066\u8AAD\u53D6\u308A\u4E2D\u306B\u30EA\u30BD\u30FC\u30B9\u30FB\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F(href=''{0}'')\u3002\u7406\u7531: {1}
--NO_XPointerSchema = \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\"{0}\"\u306E\u30B9\u30AD\u30FC\u30DE\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{0}\u306B\u5BFE\u3057\u3066\u72EC\u81EA\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002http://apache.org/xml/properties/xpointer-schema\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
-+NO_XPointerSchema = \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001"{0}"\u306E\u30B9\u30AD\u30FC\u30DE\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{0}\u306B\u5BFE\u3057\u3066\u72EC\u81EA\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002http://apache.org/xml/properties/xpointer-schema\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
- NO_SubResourceIdentified = \u30DD\u30A4\u30F3\u30BF{0}\u306EXPointer\u30D7\u30ED\u30BB\u30C3\u30B5\u3067\u306F\u30B5\u30D6\u30EA\u30BD\u30FC\u30B9\u306F\u8B58\u5225\u3055\u308C\u307E\u305B\u3093\u3002
- NonDuplicateNotation = \u540D\u524D\u304C''{0}''\u306E\u8907\u6570\u306E\u8868\u8A18\u6CD5\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u308C\u3089\u306E\u8868\u8A18\u6CD5\u306F\u91CD\u8907\u3068\u307F\u306A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- NonDuplicateUnparsedEntity = \u540D\u524D\u304C''{0}''\u306E\u8907\u6570\u306E\u672A\u89E3\u6790\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u308C\u3089\u306E\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306F\u91CD\u8907\u3068\u307F\u306A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
-@@ -39,10 +11,10 @@
- HrefMissing = 'include' \uC694\uC18C\uC758 'href' \uC18D\uC131\uC774 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- RecursiveInclude = \uC21C\uD658 include\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. ''{0}'' \uBB38\uC11C\uAC00 \uC774\uBBF8 \uCC98\uB9AC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- InvalidParseValue = ''include'' \uC694\uC18C\uC5D0 ''parse'' \uC18D\uC131\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD55C \uAC12\uC774 \uC788\uC74C: ''{0}''.
--XMLParseError = XML \uD30C\uC77C(href=''{0}'')\uC758 \uAD6C\uBB38\uC744 \uBD84\uC11D\uD558\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\uC6D0\uC778: {1}
-+XMLParseError = XML \uD30C\uC77C(href=''{0}'')\uC758 \uAD6C\uBB38\uC744 \uBD84\uC11D\uD558\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
- XMLResourceError = Include \uC791\uC5C5\uC744 \uC2E4\uD328\uD558\uC5EC fallback\uC73C\uB85C \uBCF5\uC6D0\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uD30C\uC77C\uC744 XML(href=''{0}'')\uB85C \uC77D\uB294 \uC911 \uB9AC\uC18C\uC2A4 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
- TextResourceError = Include \uC791\uC5C5\uC744 \uC2E4\uD328\uD558\uC5EC fallback\uC73C\uB85C \uBCF5\uC6D0\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. \uD30C\uC77C\uC744 \uD14D\uC2A4\uD2B8(href=''{0}'')\uB85C \uC77D\uB294 \uC911 \uB9AC\uC18C\uC2A4 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: {1}
--NO_XPointerSchema = \uAE30\uBCF8\uC801\uC73C\uB85C \"{0}\"\uC5D0 \uB300\uD55C \uC2A4\uD0A4\uB9C8\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. {0}\uC5D0 \uB300\uD574 \uACE0\uC720\uD55C \uC2A4\uD0A4\uB9C8\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624. http://apache.org/xml/properties/xpointer-schema\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
-+NO_XPointerSchema = \uAE30\uBCF8\uC801\uC73C\uB85C "{0}"\uC5D0 \uB300\uD55C \uC2A4\uD0A4\uB9C8\uB294 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. {0}\uC5D0 \uB300\uD574 \uACE0\uC720\uD55C \uC2A4\uD0A4\uB9C8\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624. http://apache.org/xml/properties/xpointer-schema\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
- NO_SubResourceIdentified = {0} \uD3EC\uC778\uD130\uC5D0 \uB300\uD55C XPointer \uD504\uB85C\uC138\uC11C\uAC00 \uC2DD\uBCC4\uD55C \uD558\uC704 \uB9AC\uC18C\uC2A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
- NonDuplicateNotation = \uC774\uB984\uC774 ''{0}''\uC774\uC9C0\uB9CC \uC911\uBCF5\uB41C \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC9C0 \uC54A\uC740 \uD45C\uAE30\uBC95\uC774 \uC5EC\uB7EC \uAC1C \uC0AC\uC6A9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- NonDuplicateUnparsedEntity = \uC774\uB984\uC774 ''{0}''\uC774\uC9C0\uB9CC \uC911\uBCF5\uB41C \uAC83\uC73C\uB85C \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB418\uC9C0 \uC54A\uC740 \uC5D4\uD2F0\uD2F0\uAC00 \uC5EC\uB7EC \uAC1C \uC0AC\uC6A9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
- FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
-@@ -39,10 +11,10 @@
- HrefMissing = O atributo 'href' de um elemento 'include' n\u00E3o foi encontrado.
- RecursiveInclude = Inclus\u00E3o recursiva detectada. O documento ''{0}'' j\u00E1 foi processado.
- InvalidParseValue = Valor inv\u00E1lido para o atributo ''parse'' no elemento ''include'': ''{0}''.
--XMLParseError = Erro ao tentar fazer parse do arquivo XML (href=''{0}''). Motivo: {1}
-+XMLParseError = Erro ao tentar fazer parse do arquivo XML (href=''{0}''). Motivo: {1}
- XMLResourceError = Falha na opera\u00E7\u00E3o de inclus\u00E3o; revertendo para fallback. Erro do recurso ao ler o arquivo como XML (href=''{0}''). Motivo: {1}
- TextResourceError = Falha na opera\u00E7\u00E3o de inclus\u00E3o; revertendo para fallback. Erro do recurso ao ler o arquivo como texto (href=''{0}''). Motivo: {1}
--NO_XPointerSchema = Por default, o esquema para \"{0}\" n\u00E3o \u00E9 suportado. Defina seu pr\u00F3prio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = Por padr\u00E3o, o esquema para "{0}" n\u00E3o \u00E9 suportado. Defina seu pr\u00F3prio esquema para {0}. Consulte http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = Nenhum Sub-recurso foi identificado pelo Processador XPointer do Ponteiro {0}.
- NonDuplicateNotation = Foram usadas v\u00E1rias nota\u00E7\u00F5es que tinham o nome ''{0}'', mas n\u00E3o foram determinadas como duplica\u00E7\u00F5es.
- NonDuplicateUnparsedEntity = Foram usadas v\u00E1rias entidades que tinham o nome ''{0}'', mas n\u00E3o foram determinadas como duplica\u00E7\u00F5es.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,37 +1,9 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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.
-- */
--
- # Messages for message reporting
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
- FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-
- # Messages for erroneous input
--NoFallback = Ett \''include\'' med href \''{0}\'' utf\u00F6rdes inte, hittade inget \u00E5terskapningselement (''fallback'').
-+NoFallback = Ett ''include'' med href ''{0}'' utf\u00F6rdes inte, hittade inget \u00E5terskapningselement (''fallback'').
- MultipleFallbacks = [underordnade] i ett 'include'-element f\u00E5r inte inneh\u00E5lla fler \u00E4n ett 'fallback'-element.
- FallbackParent = Ett 'fallback'-element hittades utan n\u00E5got 'include' som \u00F6verordnat element.
- IncludeChild = Element fr\u00E5n namnrymd ''http://www.w3.org/2001/XInclude'', ut\u00F6ver ''fallback'', \u00E4r inte till\u00E5tna som underordnade i ''include''-element. Hittade d\u00E4remot ''{0}''.
-@@ -42,7 +14,7 @@
- XMLParseError = Fel vid f\u00F6rs\u00F6k att tolka XML-fil (href=''{0}''). Orsak: {1}
- XMLResourceError = Inkluderings\u00E5tg\u00E4rden utf\u00F6rdes inte, \u00E5terst\u00E4ller genom att \u00E5terskapa. Resursfel vid l\u00E4sning av fil som XML (href=''{0}''). Orsak: {1}
- TextResourceError = Inkluderings\u00E5tg\u00E4rden utf\u00F6rdes inte, \u00E5terst\u00E4ller genom att \u00E5terskapa. Resursfel vid l\u00E4sning av fil som text (href=''{0}''). Orsak: {1}
--NO_XPointerSchema = Schema f\u00F6r \"{0}\" st\u00F6ds inte som standard. Definiera ett eget schema f\u00F6r {0}.Se http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = Schema f\u00F6r "{0}" st\u00F6ds inte som standard. Definiera ett eget schema f\u00F6r {0}.Se http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = Ingen Subresource har identifierats av XPointer-processorn f\u00F6r pekare {0}.
- NonDuplicateNotation = Flera noteringar anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter.
- NonDuplicateUnparsedEntity = Flera otolkade enheter anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
- FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
-@@ -39,13 +11,13 @@
- HrefMissing = \u7F3A\u5C11 'include' \u5143\u7D20\u7684 'href' \u5C5E\u6027\u3002
- RecursiveInclude = \u68C0\u6D4B\u5230\u9012\u5F52 include\u3002\u5DF2\u5904\u7406\u6587\u6863 ''{0}''\u3002
- InvalidParseValue = ''include'' \u5143\u7D20\u7684 ''parse'' \u5C5E\u6027\u7684\u503C\u65E0\u6548: ''{0}''\u3002
--XMLParseError = \u5C1D\u8BD5\u5BF9 XML \u6587\u4EF6 (href=''{0}'') \u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u51FA\u9519\u3002\u539F\u56E0: {1}
-+XMLParseError = \u5C1D\u8BD5\u89E3\u6790 XML \u6587\u4EF6 (href=''{0}'') \u65F6\u51FA\u9519\u3002\u539F\u56E0: {1}
- XMLResourceError = Include \u64CD\u4F5C\u5931\u8D25, \u5E76\u8FD8\u539F\u4E3A fallback\u3002\u4EE5 XML (href=''{0}'') \u683C\u5F0F\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u73B0\u8D44\u6E90\u9519\u8BEF\u3002\u539F\u56E0: {1}
- TextResourceError = Include \u64CD\u4F5C\u5931\u8D25, \u5E76\u8FD8\u539F\u4E3A fallback\u3002\u4EE5\u6587\u672C (href=''{0}'') \u683C\u5F0F\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u73B0\u8D44\u6E90\u9519\u8BEF\u3002\u539F\u56E0: {1}
--NO_XPointerSchema = \u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u4E0D\u652F\u6301 \"{0}\" \u7684\u65B9\u6848\u3002\u8BF7\u4E3A{0}\u5B9A\u4E49\u60A8\u81EA\u5DF1\u7684\u65B9\u6848\u3002\u8BF7\u8BBF\u95EE http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = \u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u4E0D\u652F\u6301 "{0}" \u7684\u65B9\u6848\u3002\u8BF7\u4E3A{0}\u5B9A\u4E49\u60A8\u81EA\u5DF1\u7684\u65B9\u6848\u3002\u8BF7\u8BBF\u95EE http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = \u65E0\u6CD5\u901A\u8FC7 XPointer Processor for Pointer {0} \u8BC6\u522B Subresource\u3002
- NonDuplicateNotation = \u4F7F\u7528\u4E86\u591A\u4E2A\u540D\u4E3A ''{0}'' \u7684\u8BB0\u53F7, \u4F46\u672A\u5C06\u8FD9\u4E9B\u8BB0\u53F7\u786E\u5B9A\u4E3A\u91CD\u590D\u9879\u3002
--NonDuplicateUnparsedEntity = \u4F7F\u7528\u4E86\u591A\u4E2A\u540D\u4E3A ''{0}'' \u7684\u672A\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u7684\u5B9E\u4F53, \u4F46\u672A\u5C06\u8FD9\u4E9B\u5B9E\u4F53\u786E\u5B9A\u4E3A\u91CD\u590D\u9879\u3002
-+NonDuplicateUnparsedEntity = \u4F7F\u7528\u4E86\u591A\u4E2A\u540D\u4E3A ''{0}'' \u7684\u672A\u89E3\u6790\u5B9E\u4F53, \u4F46\u672A\u5C06\u8FD9\u4E9B\u5B9E\u4F53\u786E\u5B9A\u4E3A\u91CD\u590D\u9879\u3002
- XpointerMissing = \u7F3A\u5C11 href \u5C5E\u6027\u65F6, \u5FC5\u987B\u5B58\u5728 xpointer \u5C5E\u6027\u3002
- AcceptMalformed = 'include' \u5143\u7D20\u7684 'accept' \u5C5E\u6027\u7684\u503C\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8303\u56F4 #x20 \u81F3 #x7E \u4EE5\u5916\u7684\u5B57\u7B26\u3002
- AcceptLanguageMalformed = 'include' \u5143\u7D20\u7684 'accept-language' \u5C5E\u6027\u7684\u503C\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8303\u56F4 #x20 \u81F3 #x7E \u4EE5\u5916\u7684\u5B57\u7B26\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -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.
-- */
--
- # Messages for message reporting
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
- FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
-@@ -39,20 +11,20 @@
- HrefMissing = \u907A\u6F0F 'include' \u5143\u7D20\u7684 'href' \u5C6C\u6027\u3002
- RecursiveInclude = \u5075\u6E2C\u5230\u905E\u8FF4\u5305\u542B\u3002\u5DF2\u7D93\u8655\u7406\u6587\u4EF6 ''{0}''\u3002
- InvalidParseValue = ''include'' \u5143\u7D20\u4E0A ''parse'' \u5C6C\u6027\u7684\u7121\u6548\u503C: ''{0}''\u3002
--XMLParseError = \u5617\u8A66\u5256\u6790 XML \u6A94\u6848\u6642\u767C\u751F\u932F\u8AA4 (href=''{0}'')\u3002\u539F\u56E0: {1}
-+XMLParseError = \u5617\u8A66\u5256\u6790 XML \u6A94\u6848 (href=''{0}'') \u6642\u767C\u751F\u932F\u8AA4\u3002\u539F\u56E0: {1}
- XMLResourceError = \u5305\u542B\u4F5C\u696D\u5931\u6557\uFF0C\u56DE\u5FA9\u81F3\u5F8C\u63F4\u3002\u4EE5 XML (href=''{0}'') \u65B9\u5F0F\u8B80\u53D6\u6A94\u6848\u6642\u767C\u751F\u8CC7\u6E90\u932F\u8AA4\u3002\u539F\u56E0: {1}
- TextResourceError = \u5305\u542B\u4F5C\u696D\u5931\u6557\uFF0C\u56DE\u5FA9\u81F3\u5F8C\u63F4\u3002\u4EE5\u6587\u5B57 (href=''{0}'') \u65B9\u5F0F\u8B80\u53D6\u6A94\u6848\u6642\u767C\u751F\u8CC7\u6E90\u932F\u8AA4\u3002\u539F\u56E0: {1}
--NO_XPointerSchema = \u9810\u8A2D\u4E0D\u652F\u63F4 \"{0}\" \u7684\u7DB1\u8981\u3002\u8ACB\u70BA {0} \u5B9A\u7FA9\u60A8\u81EA\u5DF1\u7684\u7DB1\u8981\u3002\u8ACB\u53C3\u95B1 http://apache.org/xml/properties/xpointer-schema
-+NO_XPointerSchema = \u9810\u8A2D\u4E0D\u652F\u63F4 "{0}" \u7684\u7DB1\u8981\u3002\u8ACB\u70BA {0} \u5B9A\u7FA9\u60A8\u81EA\u5DF1\u7684\u7DB1\u8981\u3002\u8ACB\u53C3\u95B1 http://apache.org/xml/properties/xpointer-schema
- NO_SubResourceIdentified = XPointer \u8655\u7406\u5668\u672A\u80FD\u70BA\u6307\u6A19 {0} \u8B58\u5225\u4EFB\u4F55\u5B50\u8CC7\u6E90\u3002
- NonDuplicateNotation = \u4F7F\u7528\u540D\u7A31\u70BA ''{0}'' \u7684\u591A\u500B\u8868\u793A\u6CD5\uFF0C\u4F46\u662F\u672A\u80FD\u5224\u65B7\u9019\u4E9B\u8868\u793A\u6CD5\u91CD\u8907\u3002
--NonDuplicateUnparsedEntity = \u4F7F\u7528\u540D\u7A31\u70BA ''{0}'' \u7684\u591A\u500B\u672A\u5256\u6790\u500B\u9AD4\uFF0C\u4F46\u662F\u672A\u80FD\u5224\u65B7\u9019\u4E9B\u500B\u9AD4\u91CD\u8907\u3002
-+NonDuplicateUnparsedEntity = \u4F7F\u7528\u540D\u7A31\u70BA ''{0}'' \u7684\u591A\u500B\u672A\u5256\u6790\u5BE6\u9AD4\uFF0C\u4F46\u662F\u672A\u80FD\u5224\u65B7\u9019\u4E9B\u5BE6\u9AD4\u91CD\u8907\u3002
- XpointerMissing = \u6C92\u6709 href \u5C6C\u6027\u6642\uFF0C\u5FC5\u9808\u6709 xpointer \u5C6C\u6027\u3002
- AcceptMalformed = 'include' \u5143\u7D20\u7684 'accept' \u5C6C\u6027\u503C\u4E2D\uFF0C\u4E0D\u5141\u8A31\u7BC4\u570D #x20 \u81F3 #x7E \u4E4B\u5916\u7684\u5B57\u5143\u3002
- AcceptLanguageMalformed = 'include' \u5143\u7D20\u7684 'accept-language' \u5C6C\u6027\u503C\u4E2D\uFF0C\u4E0D\u5141\u8A31\u7BC4\u570D #x20 \u81F3 #x7E \u4E4B\u5916\u7684\u5B57\u5143\u3002
- RootElementRequired = \u683C\u5F0F\u6B63\u78BA\u7684\u6587\u4EF6\u9700\u8981\u6839\u5143\u7D20\u3002
- MultipleRootElements = \u683C\u5F0F\u6B63\u78BA\u7684\u6587\u4EF6\u4E0D\u53EF\u5305\u542B\u591A\u500B\u6839\u5143\u7D20\u3002
- ContentIllegalAtTopLevel = \u53D6\u4EE3 'include' \u5143\u7D20\u4F5C\u70BA\u6700\u4E0A\u5C64\u4F86\u6E90 infoset \u7684\u6587\u4EF6\u5143\u7D20\u4E0D\u80FD\u5305\u542B\u5B57\u5143\u3002
--UnexpandedEntityReferenceIllegal = \u53D6\u4EE3 'include' \u5143\u7D20\u4F5C\u70BA\u6700\u4E0A\u5C64\u4F86\u6E90 infoset \u7684\u6587\u4EF6\u5143\u7D20\u4E0D\u80FD\u5305\u542B\u672A\u5C55\u958B\u7684\u500B\u9AD4\u53C3\u7167\u3002
-+UnexpandedEntityReferenceIllegal = \u53D6\u4EE3 'include' \u5143\u7D20\u4F5C\u70BA\u6700\u4E0A\u5C64\u4F86\u6E90 infoset \u7684\u6587\u4EF6\u5143\u7D20\u4E0D\u80FD\u5305\u542B\u672A\u5C55\u958B\u7684\u5BE6\u9AD4\u53C3\u7167\u3002
- HrefFragmentIdentifierIllegal = \u4E0D\u53EF\u4F7F\u7528\u7247\u6BB5 ID\u3002\u4E0D\u5141\u8A31 ''href'' \u5C6C\u6027\u503C ''{0}''\u3002
- HrefSyntacticallyInvalid = ''href'' \u5C6C\u6027\u503C ''{0}'' \u53E5\u6CD5\u7121\u6548\u3002\u5957\u7528\u9041\u96E2\u898F\u5247\u4E4B\u5F8C\uFF0C\u503C\u70BA\u53E5\u6CD5\u6B63\u78BA\u7684 URI \u6216 IRI\u3002
- XPointerStreamability = \u6307\u5B9A xpointer \u6307\u5411\u4F86\u6E90 infoset \u4E2D\u7684\u4F4D\u7F6E\u3002\u7531\u65BC\u8655\u7406\u5668\u4E32\u6D41\u7279\u6027\uFF0C\u56E0\u6B64\u7121\u6CD5\u5B58\u53D6\u6B64\u4F4D\u7F6E\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
- FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = Identity Constraint-Fehler (cvc-identity-constraint.4.2.1): Element \"{0}\" hat einen Schl\u00FCssel ohne Wert.
-- DuplicateField = Doppelte \u00DCbereinstimmung in Geltungsbereich f\u00FCr Feld \"{0}\".
-- DuplicateKey = Doppelter Schl\u00FCsselwert [{0}] f\u00FCr Identity Constraint des Elements \"{1}\" deklariert.
-- DuplicateUnique = Doppelter eindeutiger Wert [{0}] f\u00FCr Identity Constraint des Elements \"{1}\" deklariert.
-- FieldMultipleMatch = Identity Constraint-Fehler: Feld \"{0}\" entspricht mehreren Werten im Geltungsbereich seines Selectors. Felder m\u00FCssen eindeutigen Werten entsprechen.
-- FixedDiffersFromActual = Content dieses Elements entspricht nicht dem Wert des \"fixed\"-Attributs in der Elementdeklaration im Schema.
-- KeyMatchesNillable = Identity Constraint-Fehler (cvc-identity-constraint.4.2.3): Element \"{0}\" hat einen Schl\u00FCssel, der einem Element entspricht, bei dem "nillable" auf "true" gesetzt wurde.
-- KeyNotEnoughValues = Nicht gen\u00FCgend Werte angegeben f\u00FCr <key name=\"{1}\"> Identity Constraint f\u00FCr Element \"{0}\".
-+ AbsentKeyValue = Identity Constraint-Fehler (cvc-identity-constraint.4.2.1): Element "{0}" hat einen Schl\u00FCssel ohne Wert.
-+ DuplicateField = Doppelte \u00DCbereinstimmung in Geltungsbereich f\u00FCr Feld "{0}".
-+ DuplicateKey = Doppelter Schl\u00FCsselwert [{0}] f\u00FCr Identity Constraint des Elements "{1}" deklariert.
-+ DuplicateUnique = Doppelter eindeutiger Wert [{0}] f\u00FCr Identity Constraint des Elements "{1}" deklariert.
-+ FieldMultipleMatch = Identity Constraint-Fehler: Feld "{0}" entspricht mehreren Werten im Geltungsbereich seines Selectors. Felder m\u00FCssen eindeutigen Werten entsprechen.
-+ FixedDiffersFromActual = Content dieses Elements entspricht nicht dem Wert des "fixed"-Attributs in der Elementdeklaration im Schema.
-+ KeyMatchesNillable = Identity Constraint-Fehler (cvc-identity-constraint.4.2.3): Element "{0}" hat einen Schl\u00FCssel, der einem Element entspricht, bei dem "nillable" auf "true" gesetzt wurde.
-+ KeyNotEnoughValues = Nicht gen\u00FCgend Werte angegeben f\u00FCr <key name="{1}"> Identity Constraint f\u00FCr Element "{0}".
- KeyNotFound = Schl\u00FCssel "{0}" mit Wert "{1}" nicht gefunden f\u00FCr Identity Constraint des Elements "{2}".
-- KeyRefNotEnoughValues = Nicht gen\u00FCgend Werte angegeben f\u00FCr <keyref name=\"{1}\"> Identity Constraint f\u00FCr Element \"{0}\".
-- KeyRefOutOfScope = Identity Constraint-Fehler: Identity Constraint \"{0}\" hat eine keyref, die zu einem Key- oder Unique-Constraint au\u00DFerhalb des Geltungsbereichs verweist.
-- KeyRefReferNotFound = Schl\u00FCsselreferenzdeklaration \"{0}\" verweist auf einen unbekannten Schl\u00FCssel mit dem Namen \"{1}\".
-- UniqueNotEnoughValues = Nicht gen\u00FCgend Werte angegeben f\u00FCr <unique> Identity Constraint f\u00FCr Element \"{0}\".
-- UnknownField = Interner Identity Constraint-Fehler. Unbekanntes Feld \"{0}\".
-+ KeyRefNotEnoughValues = Nicht gen\u00FCgend Werte angegeben f\u00FCr <keyref name="{1}"> Identity Constraint f\u00FCr Element "{0}".
-+ KeyRefOutOfScope = Identity Constraint-Fehler: Identity Constraint "{0}" hat eine keyref, die zu einem Key- oder Unique-Constraint au\u00DFerhalb des Geltungsbereichs verweist.
-+ KeyRefReferNotFound = Schl\u00FCsselreferenzdeklaration "{0}" verweist auf einen unbekannten Schl\u00FCssel mit dem Namen "{1}".
-+ UniqueNotEnoughValues = Nicht gen\u00FCgend Werte angegeben f\u00FCr <unique> Identity Constraint f\u00FCr Element "{0}".
-+ UnknownField = Interner Identity Constraint-Fehler. Unbekanntes Feld "{0}".
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: Schemadokument "{0}" konnte nicht gelesen werden, weil der "{1}"-Zugriff wegen der von der Eigenschaft accessExternalSchema festgelegten Einschr\u00E4nkung nicht zul\u00E4ssig ist.
- schema_reference.4 = schema_reference.4: Schemadokument "{0}" konnte nicht gelesen werden, da 1) das Dokument nicht gefunden werden konnte; 2) das Dokument nicht gelesen werden konnte; 3) das Root-Element des Dokuments nicht <xsd:schema> ist.
- src-annotation = src-annotation: <annotation>-Elemente k\u00F6nnen nur <appinfo>- und <documentation>-Elemente enthalten, aber es wurde "{0}" gefunden.
- src-attribute.1 = src-attribute.1: Die Eigenschaften "default" und "fixed" k\u00F6nnen nicht beide in der Attributdeklaration "{0}" vorhanden sein. Verwenden Sie nur eine dieser Eigenschaften.
-@@ -181,7 +153,7 @@
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Der Contenttyp eines abgeleiteten Typs und der seiner Basis m\u00FCssen beide "mixed" oder "element-only" sein. Typ "{0}" ist "mixed", aber sein Basistyp nicht.
- cos-element-consistent = cos-element-consistent: Fehler bei Typ "{0}". Mehrere Elemente mit Namen "{1}" und unterschiedlichen Typen kommen in der Modellgruppe vor.
- cos-list-of-atomic = cos-list-of-atomic: In der Definition von Listentyp "{0}" ist Typ "{1}" ein ung\u00FCltiger Listenelementtyp, da er nicht atomar ist ("{1}" ist entweder ein Listentyp oder ein Vereinigungsmengentyp, der eine Liste enth\u00E4lt).
-- cos-nonambig = cos-nonambig: {0} und {1} (oder Elemente aus ihrer Substitutionsgruppe) verletzen \"Unique Particle Attribution\". Bei der Validierung f\u00FCr dieses Schema w\u00FCrde eine Mehrdeutigkeit f\u00FCr diese beiden Partikel erstellt.
-+ cos-nonambig = cos-nonambig: {0} und {1} (oder Elemente aus ihrer Substitutionsgruppe) verletzen "Unique Particle Attribution". Bei der Validierung f\u00FCr dieses Schema w\u00FCrde eine Mehrdeutigkeit f\u00FCr diese beiden Partikel erstellt.
- cos-particle-restrict.a = cos-particle-restrict.a: Abgeleitetes Partikel ist leer, und die Basis kann nicht geleert werden.
- cos-particle-restrict.b = cos-particle-restrict.b: Basispartikel ist leer, aber das abgeleitete Partikel ist nicht leer.
- cos-particle-restrict.2 = cos-particle-restrict.2: Unzul\u00E4ssige Partikeleinschr\u00E4nkung: "{0}".
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_es.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
- BadMessageKey = No se ha encontrado el mensaje de error correspondiente a la clave de mensaje.
- FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = Error de restricci\u00F3n de identidad (cvc-identity-constraint.4.2.1): el elemento \"{0}\" tiene una clave sin valor.
-- DuplicateField = Coincidencia duplicada en \u00E1mbito del campo \"{0}\".
-- DuplicateKey = Valor de clave duplicado [{0}] declarado para la restricci\u00F3n de identidad del elemento \"{1}\".
-- DuplicateUnique = Valor \u00FAnico duplicado [{0}] declarado para la restricci\u00F3n de identidad del elemento \"{1}\".
-- FieldMultipleMatch = Error de restricci\u00F3n de identidad: el campo \"{0}\" coincide con m\u00E1s de un valor en el \u00E1mbito de su selector; los campos deben coincidir con valores \u00FAnicos.
-- FixedDiffersFromActual = El contenido de este elemento no es equivalente al valor del atributo \"fixed\" en la declaraci\u00F3n del elemento del esquema.
-- KeyMatchesNillable = Error de restricci\u00F3n de identidad (cvc-identity-constraint.4.2.3): el elemento \"{0}\" tiene una clave que coincide con un elemento cuyo valor de Permite Nill est\u00E1 definido en true.
-- KeyNotEnoughValues = No se han especificado suficientes valores para la restricci\u00F3n de identidad <key name=\"{1}\"> especificada para el elemento \"{0}\".
-+ AbsentKeyValue = Error de restricci\u00F3n de identidad (cvc-identity-constraint.4.2.1): el elemento "{0}" tiene una clave sin valor.
-+ DuplicateField = Coincidencia duplicada en \u00E1mbito del campo "{0}".
-+ DuplicateKey = Valor de clave duplicado [{0}] declarado para la restricci\u00F3n de identidad del elemento "{1}".
-+ DuplicateUnique = Valor \u00FAnico duplicado [{0}] declarado para la restricci\u00F3n de identidad del elemento "{1}".
-+ FieldMultipleMatch = Error de restricci\u00F3n de identidad: el campo "{0}" coincide con m\u00E1s de un valor en el \u00E1mbito de su selector; los campos deben coincidir con valores \u00FAnicos.
-+ FixedDiffersFromActual = El contenido de este elemento no es equivalente al valor del atributo "fixed" en la declaraci\u00F3n del elemento del esquema.
-+ KeyMatchesNillable = Error de restricci\u00F3n de identidad (cvc-identity-constraint.4.2.3): el elemento "{0}" tiene una clave que coincide con un elemento cuyo valor de Permite Nill est\u00E1 definido en true.
-+ KeyNotEnoughValues = No se han especificado suficientes valores para la restricci\u00F3n de identidad <key name="{1}"> especificada para el elemento "{0}".
- KeyNotFound = No se ha encontrado la clave ''{0}'' con el valor ''{1}'' para la restricci\u00F3n de identidad del elemento ''{2}''.
-- KeyRefNotEnoughValues = No se han especificado suficientes valores para la restricci\u00F3n de identidad <keyref name=\"{1}\"> especificada para el elemento \"{0}\".
-- KeyRefOutOfScope = Error de restricci\u00F3n de identidad: la restricci\u00F3n de identidad \"{0}\" tiene una referencia de clave que hace referencia a una clave o elemento \u00FAnico que se encuentra fuera de \u00E1mbito.
-- KeyRefReferNotFound = La declaraci\u00F3n de referencia de clave \"{0}\" hace referencia a una clave desconocida con el nombre \"{1}\".
-- UniqueNotEnoughValues = No se han especificado suficientes valores para la restricci\u00F3n de identidad <unique> especificada para el elemento \"{0}\".
-- UnknownField = Error de restricci\u00F3n de identidad interno; campo desconocido \"{0}\".
-+ KeyRefNotEnoughValues = No se han especificado suficientes valores para la restricci\u00F3n de identidad <keyref name="{1}"> especificada para el elemento "{0}".
-+ KeyRefOutOfScope = Error de restricci\u00F3n de identidad: la restricci\u00F3n de identidad "{0}" tiene una referencia de clave que hace referencia a una clave o elemento \u00FAnico que se encuentra fuera de \u00E1mbito.
-+ KeyRefReferNotFound = La declaraci\u00F3n de referencia de clave "{0}" hace referencia a una clave desconocida con el nombre "{1}".
-+ UniqueNotEnoughValues = No se han especificado suficientes valores para la restricci\u00F3n de identidad <unique> especificada para el elemento "{0}".
-+ UnknownField = Error de restricci\u00F3n de identidad interno; campo desconocido "{0}".
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es v\u00E1lido con respecto a su tipo, ''{3}''.
-- cvc-attribute.4 = cvc-attribute.4: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es v\u00E1lido con respecto a su ''{''value constraint''}'' fija. El atributo debe tener un valor de ''{3}''.
-+ cvc-attribute.4 = cvc-attribute.4: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es v\u00E1lido con respecto a su '{'value constraint'}' fija. El atributo debe tener un valor de ''{3}''.
- cvc-complex-type.2.1 = cvc-complex-type.2.1: El elemento ''{0}'' no debe tener ning\u00FAn car\u00E1cter ni ning\u00FAn elemento de informaci\u00F3n de elemento [secundarios], porque el tipo de contenido de tipo est\u00E1 vac\u00EDo.
- cvc-complex-type.2.2 = cvc-complex-type.2.2: El elemento ''{0}'' no debe tener ning\u00FAn elemento [secundarios] y el valor debe ser v\u00E1lido.
- cvc-complex-type.2.3 = cvc-complex-type.2.3: El elemento ''{0}'' no debe tener ning\u00FAn car\u00E1cter [secundarios], porque el tipo de contenido del tipo es s\u00F3lo de elemento.
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: No est\u00E1 permitido que el atributo ''{1}'' aparezca en el elemento ''{0}''.
- cvc-complex-type.4 = cvc-complex-type.4: El atributo ''{1}'' debe aparecer en el elemento ''{0}''.
- cvc-complex-type.5.1 = cvc-complex-type.5.1: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comod\u00EDn, pero ya existe un identificador de comod\u00EDn ''{2}''. S\u00F3lo puede existir uno.
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comod\u00EDn, pero ya existe un atributo ''{2}'' derivado del identificador entre los ''{''attribute uses''}''.
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: En el elemento ''{0}'', el atributo ''{1}'' es un identificador de comod\u00EDn, pero ya existe un atributo ''{2}'' derivado del identificador entre los '{'attribute uses'}'.
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' no es un valor v\u00E1lido para ''{1}''.
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' no es un valor v\u00E1lido de tipo de lista ''{1}''.
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' no es un valor v\u00E1lido de tipo de uni\u00F3n ''{1}''.
- cvc-elt.1 = cvc-elt.1: No se ha encontrado la declaraci\u00F3n del elemento ''{0}''.
-- cvc-elt.2 = cvc-elt.2: El valor de ''{''abstract''}'' en la declaraci\u00F3n de elemento para ''{0}'' debe ser false.
-- cvc-elt.3.1 = cvc-elt.3.1: El atributo ''{1}'' no debe aparecer en el elemento ''{0}'', porque la propiedad ''{''nillable''}'' de ''{0}'' tiene el valor false.
-+ cvc-elt.2 = cvc-elt.2: El valor de '{'abstract'}' en la declaraci\u00F3n de elemento para ''{0}'' debe ser false.
-+ cvc-elt.3.1 = cvc-elt.3.1: El atributo ''{1}'' no debe aparecer en el elemento ''{0}'', porque la propiedad '{'nillable'}' de ''{0}'' tiene el valor false.
- cvc-elt.3.2.1 = cvc-elt.3.2.1: El elemento ''{0}'' no debe tener ning\u00FAn car\u00E1cter ni informaci\u00F3n de elemento [secundarios], porque se ha especificado ''{1}''.
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: No debe haber ning\u00FAn valor fijo de ''{''value constraint''}'' para el elemento ''{0}'', porque se ha especificado ''{1}''.
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: No debe haber ning\u00FAn valor fijo de '{'value constraint'}' para el elemento ''{0}'', porque se ha especificado ''{1}''.
- cvc-elt.4.1 = cvc-elt.4.1: El valor ''{2}'' del atributo ''{1}'' del elemento ''{0}'' no es un QName v\u00E1lido.
- cvc-elt.4.2 = cvc-elt.4.2: No se puede resolver ''{1}'' en una definici\u00F3n de tipo para el elemento ''{0}''.
- cvc-elt.4.3 = cvc-elt.4.3: El tipo ''{1}'' no se ha derivado de forma v\u00E1lida de la definici\u00F3n de tipo ''{2}'' del elemento ''{0}''.
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{''value constraint''}'' ''{2}'' del elemento ''{0}'' no es un valor por defecto v\u00E1lido para el tipo ''{1}''.
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}'' del elemento ''{0}'' no es un valor por defecto v\u00E1lido para el tipo ''{1}''.
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: El elemento ''{0}'' no debe tener ning\u00FAn elemento de informaci\u00F3n de elemento [secundarios].
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: El valor ''{1}'' del elemento ''{0}'' no coincide con el valor de ''{''value constraint''}'' fijo ''{2}''.
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: El valor ''{1}'' del elemento ''{0}'' no coincide con el valor de ''{''value constraint''}'' ''{2}''.
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: El valor ''{1}'' del elemento ''{0}'' no coincide con el valor de '{'value constraint'}' fijo ''{2}''.
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: El valor ''{1}'' del elemento ''{0}'' no coincide con el valor de '{'value constraint'}' ''{2}''.
- cvc-enumeration-valid = cvc-enumeration-valid: El valor ''{0}'' no es de faceta v\u00E1lida con respecto a la enumeraci\u00F3n ''{1}''. Debe ser un valor de la enumeraci\u00F3n.
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: El valor ''{0}'' tiene {1} d\u00EDgitos fraccionarios, pero el n\u00FAmero de d\u00EDgitos fraccionarios se ha limitado a {2}.
- cvc-id.1 = cvc-id.1: No hay ning\u00FAn enlace de identificador/IDREF para IDREF ''{0}''.
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: fallo al leer el documento de esquema ''{0}'' porque no se permite el acceso ''{1}'' debido a una restricci\u00F3n definida por la propiedad accessExternalSchema.
- schema_reference.4 = schema_reference.4: Fallo al leer el documento de esquema ''{0}'', porque 1) no se ha encontrado el documento; 2) no se ha podido leer el documento; 3) el elemento ra\u00EDz del documento no es <xsd:schema>.
- src-annotation = src-annotation: Los elementos de <annotation> s\u00F3lo pueden contener elementos de <appinfo> y <documentation>, pero se ha encontrado ''{0}''.
- src-attribute.1 = src-attribute.1: Las propiedades ''default'' y ''fixed'' no pueden estar presentes de forma simult\u00E1nea en la declaraci\u00F3n de atributo ''{0}''. Utilice s\u00F3lo una de ellas.
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2: Error en el grupo de atributos ''{0}''. Se han especificado usos de atributo duplicados con el mismo nombre y espacio de nombres de destino. El nombre del uso de atributo duplicado es ''{1}''.
- ag-props-correct.3 = ag-props-correct.3: Error en el grupo de atributos ''{0}''. Dos declaraciones de atributo, ''{1}'' y ''{2}'', tienen tipos que se derivan del identificador.
- a-props-correct.2 = a-props-correct.2: Valor de restricci\u00F3n de valor ''{1}'' no v\u00E1lido en el atributo ''{0}''.
-- a-props-correct.3 = a-props-correct.3: El atributo ''{0}'' no puede utilizar ''fixed'' ni ''default'', porque el valor de ''{''type definition''}'' del atributo es el identificador o se deriva del identificador.
-- au-props-correct.2 = au-props-correct.2: En la declaraci\u00F3n de atributo de ''{0}'', se ha especificado un valor fijo de ''{1}''. Por lo tanto, si el uso del atributo que hace referencia a ''{0}'' tambi\u00E9n tiene un valor de ''{''value constraint''}'', debe fijarse y el valor debe ser ''{1}''.
-+ a-props-correct.3 = a-props-correct.3: El atributo ''{0}'' no puede utilizar ''fixed'' ni ''default'', porque el valor de '{'type definition'}' del atributo es el identificador o se deriva del identificador.
-+ au-props-correct.2 = au-props-correct.2: En la declaraci\u00F3n de atributo de ''{0}'', se ha especificado un valor fijo de ''{1}''. Por lo tanto, si el uso del atributo que hace referencia a ''{0}'' tambi\u00E9n tiene un valor de '{'value constraint'}', debe fijarse y el valor debe ser ''{1}''.
- cos-all-limited.1.2 = cos-all-limited.1.2:Debe aparecer un grupo de modelos 'all' en una part\u00EDcula con '{'min occurs'}' = '{'max occurs'}' = 1 y dicha part\u00EDcula debe formar parte de un par que constituya el valor de '{'content type'}' de una definici\u00F3n de tipo complejo.
-- cos-all-limited.2 = cos-all-limited.2: El valor de ''{''max occurs''}'' de un elemento de un grupo de modelos ''all'' debe ser 0 o 1. El valor ''{0}'' del elemento ''{1}'' no es v\u00E1lido.
-+ cos-all-limited.2 = cos-all-limited.2: El valor de '{'max occurs'}' de un elemento de un grupo de modelos ''all'' debe ser 0 o 1. El valor ''{0}'' del elemento ''{1}'' no es v\u00E1lido.
- cos-applicable-facets = cos-applicable-facets: El tipo {1} no permite la faceta ''{0}''.
- cos-ct-extends.1.1 = cos-ct-extends.1.1: El tipo ''{0}'' se ha derivado por extensi\u00F3n del tipo ''{1}''. Sin embargo, el atributo ''final'' de ''{1}'' proh\u00EDbe la derivaci\u00F3n por extensi\u00F3n.
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: El tipo de contenido de un tipo derivado y el de su base deben ser mixtos o ser ambos s\u00F3lo de elemento. El tipo ''{0}'' es de s\u00F3lo elemento, pero su tipo base no lo es.
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: El tipo de contenido de un tipo derivado y el de su base deben ser mixtos o ser ambos s\u00F3lo de elemento. El tipo ''{0}'' es mixto, pero su tipo base no lo es.
- cos-element-consistent = cos-element-consistent: Error para el tipo ''{0}''. Aparecen en el grupo de modelos varios elementos con el nombre ''{1}'' y con tipos diferentes.
- cos-list-of-atomic = cos-list-of-atomic: En la definici\u00F3n de tipo de lista ''{0}'', el tipo ''{1}'' es un tipo de elemento de lista no v\u00E1lido porque no es at\u00F3mico (''{1}'' es un tipo de lista o un tipo de uni\u00F3n que contiene una lista).
-- cos-nonambig = cos-nonambig: {0} y {1} (o los elementos de su grupo de sustituci\u00F3n) violan la \"atribuci\u00F3n de part\u00EDcula \u00FAnica\". Durante la validaci\u00F3n a partir de este esquema, se crear\u00E1 ambig\u00FCedad para estas dos part\u00EDculas.
-+ cos-nonambig = cos-nonambig: {0} y {1} (o los elementos de su grupo de sustituci\u00F3n) violan la "atribuci\u00F3n de part\u00EDcula \u00FAnica". Durante la validaci\u00F3n a partir de este esquema, se crear\u00E1 ambig\u00FCedad para estas dos part\u00EDculas.
- cos-particle-restrict.a = cos-particle-restrict.a: La part\u00EDcula derivada est\u00E1 vac\u00EDa y la base no se puede vaciar.
- cos-particle-restrict.b = cos-particle-restrict.b: La part\u00EDcula base est\u00E1 vac\u00EDa, pero la part\u00EDcula derivada no.
- cos-particle-restrict.2 = cos-particle-restrict.2: Restricci\u00F3n de part\u00EDcula prohibida: ''{0}''.
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: El tipo ''{1}'' es at\u00F3mico, por lo que su ''{''base type definition''}'', ''{0}'', debe ser una definici\u00F3n de tipo simple at\u00F3mico o un tipo de dato primitivo incorporado.
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: El tipo ''{1}'' es at\u00F3mico, por lo que su '{'base type definition'}', ''{0}'', debe ser una definici\u00F3n de tipo simple at\u00F3mico o un tipo de dato primitivo incorporado.
- cos-st-restricts.2.1 = cos-st-restricts.2.1: En la definici\u00F3n de tipo de lista ''{0}'', el tipo ''{1}'' es un tipo de elemento no v\u00E1lido porque es un tipo de lista o un tipo de uni\u00F3n que contiene una lista.
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: El componente ''{''final''}'' de ''{''item type definition''}'', ''{0}'', contiene ''list''. Significa que ''{0}'' no se puede utilizar como un tipo de elemento para el tipo de lista ''{1}''.
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: El componente ''{''final''}'' de ''{''member type definitions''}'', ''{0}'', contiene ''union''. Significa que ''{0}'' no se puede utilizar como un tipo de miembro para el tipo de uni\u00F3n ''{1}''.
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: El componente '{'final'}' de '{'item type definition'}', ''{0}'', contiene ''list''. Significa que ''{0}'' no se puede utilizar como un tipo de elemento para el tipo de lista ''{1}''.
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: El componente '{'final'}' de '{'member type definitions'}', ''{0}'', contiene ''union''. Significa que ''{0}'' no se puede utilizar como un tipo de miembro para el tipo de uni\u00F3n ''{1}''.
- cos-valid-default.2.1 = cos-valid-default.2.1: El elemento ''{0}'' contiene una restricci\u00F3n de valor y debe tener un modelo de contenido mixto o simple.
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Como el elemento ''{0}'' tiene una ''{''value constraint''}'' y su definici\u00F3n de tipo tiene un ''{''content type''}'' mixto, la part\u00EDcula de ''{''content type''}'' debe poder vaciarse.
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Como el elemento ''{0}'' tiene una '{'value constraint'}' y su definici\u00F3n de tipo tiene un '{'content type'}' mixto, la part\u00EDcula de '{'content type'}' debe poder vaciarse.
- c-props-correct.2 = c-props-correct.2: La cardinalidad de los campos de la referencia de clave ''{0}'' y la clave ''{1}'' deben coincidir.
- ct-props-correct.3 = ct-props-correct.3: Se han detectado definiciones circulares para el tipo complejo ''{0}''. Significa que ''{0}'' est\u00E1 contenido en su propia jerarqu\u00EDa de tipos, lo que es un error.
- ct-props-correct.4 = ct-props-correct.4: Error para el tipo ''{0}''. Se han especificado usos de atributo duplicados con el mismo nombre y espacio de nombres de destino. El nombre del uso de atributo duplicado es ''{1}''.
- ct-props-correct.5 = ct-props-correct.5: Error para el tipo ''{0}''. Dos declaraciones de atributo, ''{1}'' y ''{2}'','' tienen tipos que se derivan del identificador.
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: El tipo ''{0}'' se ha derivado por restricci\u00F3n del tipo ''{1}''. Sin embargo, ''{1}'' tiene una propiedad ''{''final''}'' que proh\u00EDbe la derivaci\u00F3n por restricci\u00F3n.
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: El tipo ''{0}'' se ha derivado por restricci\u00F3n del tipo ''{1}''. Sin embargo, ''{1}'' tiene una propiedad '{'final'}' que proh\u00EDbe la derivaci\u00F3n por restricci\u00F3n.
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene un valor ''use'' de ''{2}'', que es incoherente con el valor de ''required'' en un uso de atributo coincidente del tipo base.
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene el tipo ''{2}'', que no se ha derivado de forma v\u00E1lida de ''{3}'', el tipo de uso de atributo coincidente del tipo base.
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Error para el tipo ''{0}''. El uso de atributo ''{1}'' en este tipo tiene una restricci\u00F3n de valor efectivo que no es fija y la restricci\u00F3n de valor efectivo del uso de atributo coincidente en el tipo base es fija.
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation: El tipo NOTATION ''{0}'', utilizado por {2} ''{1}'', debe tener un valor de faceta de enumeraci\u00F3n que especifique los elementos de notaci\u00F3n que utiliza este tipo.
- enumeration-valid-restriction = enumeration-valid-restriction: El valor de enumeraci\u00F3n ''{0}'' no se encuentra en el espacio reservado para el valor del tipo base, {1}.
- e-props-correct.2 = e-props-correct.2: Valor de restricci\u00F3n de valor ''{1}'' no v\u00E1lido en el elemento ''{0}''.
-- e-props-correct.4 = e-props-correct.4: El valor de ''{''type definition''}'' del elemento ''{0}'' no se ha derivado de forma v\u00E1lida del valor de ''{''type definition''}'' de substitutionHead ''{1}'' o la propiedad ''{''substitution group exclusions''}'' de ''{1}'' no permite esta derivaci\u00F3n.
-- e-props-correct.5 = e-props-correct.5: Un valor de ''{''value constraint''}'' no debe estar presente en el elemento ''{0}'', porque la ''{''type definition''}'' del elemento o el ''{''content type''}'' de ''{''type definition''}'' es un identificador o se deriva del identificador.
-+ e-props-correct.4 = e-props-correct.4: El valor de '{'type definition'}' del elemento ''{0}'' no se ha derivado de forma v\u00E1lida del valor de '{'type definition'}' de substitutionHead ''{1}'' o la propiedad '{'substitution group exclusions'}' de ''{1}'' no permite esta derivaci\u00F3n.
-+ e-props-correct.5 = e-props-correct.5: Un valor de '{'value constraint'}' no debe estar presente en el elemento ''{0}'', porque la '{'type definition'}' del elemento o el '{'content type'}' de '{'type definition'}' es un identificador o se deriva del identificador.
- e-props-correct.6 = e-props-correct.6: Se ha detectado un grupo de sustituci\u00F3n circular para el elemento ''{0}''.
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: En la definici\u00F3n de {2}, el valor ''{0}'' para la faceta ''fractionDigits'' no es v\u00E1lido porque debe ser menor o igual que el valor de ''fractionDigits'' que se ha definido en ''{1}'' en uno de los tipos de ascendientes.
- fractionDigits-totalDigits = fractionDigits-totalDigits: En la definici\u00F3n de {2}, el valor ''{0}'' para la faceta ''fractionDigits'' no es v\u00E1lido porque debe ser menor o igual que el valor de ''totalDigits'', que es ''{1}''.
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Error para el tipo ''{2}''. El valor de maxInclusive =''{0}'' debe ser mayor o igual que el valor de minInclusive del tipo base ''{1}''.
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Error para el tipo ''{2}''. El valor de maxInclusive =''{0}'' debe ser mayor que el valor de minExclusive del tipo base ''{1}''.
- maxLength-valid-restriction = maxLength-valid-restriction: En la definici\u00F3n de {2}, el valor de maxLength = ''{0}'' debe ser menor o igual que el del tipo base ''{1}''.
-- mg-props-correct.2 = mg-props-correct.2: Se han detectado definiciones circulares para el grupo ''{0}''. El seguimiento recurrente de los valores ''{''term''}'' de las part\u00EDculas provoca una part\u00EDcula cuyo valor de ''{''term''}'' es el mismo grupo.
-+ mg-props-correct.2 = mg-props-correct.2: Se han detectado definiciones circulares para el grupo ''{0}''. El seguimiento recurrente de los valores '{'term'}' de las part\u00EDculas provoca una part\u00EDcula cuyo valor de '{'term'}' es el mismo grupo.
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: En la definici\u00F3n de {2}, el valor de minExclusive = ''{0}'' debe ser menor o igual que el valor de maxExclusive = ''{1}''.
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: En la definici\u00F3n de {2}, el valor de minExclusive = ''{0}''debe ser menor que el valor de maxInclusive = ''{1}''.
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Error para el tipo ''{2}''. El valor de minExclusive =''{0}'' debe ser mayor o igual que el valor de minExclusive del tipo base ''{1}''.
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: En la definici\u00F3n de {2}, el valor de minLength = ''{0}'' debe ser menor que el valor de maxLength = ''{1}''.
- minLength-valid-restriction = minLength-valid-restriction: En la definici\u00F3n de {2}, el valor de minLength = ''{0}'' debe ser mayor o igual que el del tipo base, ''{1}''.
- no-xmlns = no-xmlns: El valor de {name} de una declaraci\u00F3n de atributo no debe coincidir con 'xmlns'.
-- no-xsi = no-xsi: El valor de ''{''target namespace''}'' de una declaraci\u00F3n de atributo no debe coincidir con ''{0}''.
-+ no-xsi = no-xsi: El valor de '{'target namespace'}' de una declaraci\u00F3n de atributo no debe coincidir con ''{0}''.
- p-props-correct.2.1 = p-props-correct.2.1: En la declaraci\u00F3n de ''{0}'', el valor de ''minOccurs'' es ''{1}'', pero no debe ser superior al valor de ''maxOccurs'', que es ''{2}''.
- rcase-MapAndSum.1 = rcase-MapAndSum.1: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
- rcase-MapAndSum.2 = rcase-MapAndSum.2: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de incidencia del grupo base, ({2},{3}).
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Los elementos tienen nombres y espacios de nombres de destino distintos: El elemento''{0}'' en el espacio de nombres ''{1}'' y el elemento ''{2}'' en el espacio de nombres ''{3}''.
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Error para la part\u00EDcula cuyo valor de ''{''term''}'' es la declaraci\u00F3n de elemento ''{0}''. El valor de ''{''nillable''}'' de la declaraci\u00F3n de elemento es true, pero la part\u00EDcula correspondiente en el tipo base tiene una declaraci\u00F3n de elemento cuyo valor de ''{''nillable''}'' es false.
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Error para la part\u00EDcula cuyo valor de ''{''term''}'' es la declaraci\u00F3n de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricci\u00F3n v\u00E1lida del rango, ({3},{4}, de la part\u00EDcula correspondiente en el tipo base.
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Error para la part\u00EDcula cuyo valor de '{'term'}' es la declaraci\u00F3n de elemento ''{0}''. El valor de '{'nillable'}' de la declaraci\u00F3n de elemento es true, pero la part\u00EDcula correspondiente en el tipo base tiene una declaraci\u00F3n de elemento cuyo valor de '{'nillable'}' es false.
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Error para la part\u00EDcula cuyo valor de '{'term'}' es la declaraci\u00F3n de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricci\u00F3n v\u00E1lida del rango, ({3},{4}, de la part\u00EDcula correspondiente en el tipo base.
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: El elemento ''{0}'' no es fijo, pero el elemento correspondiente en el tipo base es fijo con el valor ''{1}''.
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: El elemento ''{0}'' es fijo con el valor ''{1}'', pero el elemento correspondiente en el tipo base es fijo con el valor ''{2}''.
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Las restricciones de identidad del elemento ''{0}'' no son un subjuego de las de la base.
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: Las sustituciones no permitidas del elemento ''{0}'' no son un subjuego de las de la base.
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: El tipo de elemento ''{0}'', ''{1}'', no est\u00E1 derivado del tipo del elemento base, ''{2}''.
- rcase-NSCompat.1 = rcase-NSCompat.1: El elemento ''{0}'' tiene un espacio de nombres ''{1}'' que no est\u00E1 permitido por el comod\u00EDn de la base.
-- rcase-NSCompat.2 = rcase-NSCompat.2: Error para la part\u00EDcula cuyo valor de ''{''term''}'' es la declaraci\u00F3n de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricci\u00F3n v\u00E1lida del rango, ({3},{4}, de la part\u00EDcula correspondiente en el tipo base.
-+ rcase-NSCompat.2 = rcase-NSCompat.2: Error para la part\u00EDcula cuyo valor de '{'term'}' es la declaraci\u00F3n de elemento ''{0}''. Su rango de incidencia, ({1},{2}), no es una restricci\u00F3n v\u00E1lida del rango, ({3},{4}, de la part\u00EDcula correspondiente en el tipo base.
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: No existe ninguna asignaci\u00F3n funcional completa entre las part\u00EDculas.
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: El rango de incidencia del grupo, ({0},{1}), no es una restricci\u00F3n v\u00E1lida del rango de comod\u00EDn de la base, ({2},{3}).
- rcase-NSSubset.1 = rcase-NSSubset.1: El comod\u00EDn no es un subjuego del comod\u00EDn correspondiente de la base.
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: Un esquema no puede contener dos componentes globales con el mismo nombre; \u00E9ste contiene dos incidencias de ''{0}''.
- st-props-correct.2 = st-props-correct.2: Se han detectado definiciones circulares para el tipo simple ''{0}''. Significa que ''{0}'' est\u00E1 contenido en su propia jerarqu\u00EDa de tipos, lo que es un error.
-- st-props-correct.3 = st-props-correct.3: Error para el tipo ''{0}''. El valor de ''{''final''}'' de ''{''base type definition''}'', ''{1}'', proh\u00EDbe la derivaci\u00F3n por restricci\u00F3n.
-+ st-props-correct.3 = st-props-correct.3: Error para el tipo ''{0}''. El valor de '{'final'}' de '{'base type definition'}', ''{1}'', proh\u00EDbe la derivaci\u00F3n por restricci\u00F3n.
- totalDigits-valid-restriction = totalDigits-valid-restriction: En la definici\u00F3n de {2}, el valor ''{0}'' para la faceta ''totalDigits'' no es v\u00E1lido porque debe ser menor o igual que el valor de ''totalDigits'' que se ha definido en ''{1}'' en uno de los tipos de ascendientes.
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: En la definici\u00F3n de {0}, el valor ''{1}'' para la faceta ''whitespace'' no es v\u00E1lido porque el valor de ''whitespace'' se ha definido en ''collapse'' en uno de los tipos de ascendientes.
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: En la definici\u00F3n de {0}, el valor ''preserve'' para la faceta ''whitespace'' no es v\u00E1lido porque el valor de ''whitespace'' se ha definido en ''replace'' en uno de los tipos de ascendientes.
-@@ -309,8 +281,8 @@
- c-selector-xpath = c-selector-xpath: El valor de selector = ''{0}'' no es v\u00E1lido; los valores de Xpath en el selector no pueden contener atributos.
- EmptyTargetNamespace = EmptyTargetNamespace: En el documento de esquema ''{0}'', el valor del atributo ''targetNamespace'' no puede ser una cadena vac\u00EDa.
- FacetValueFromBase = FacetValueFromBase: En la declaraci\u00F3n de tipo ''{0}'', el valor ''{1}'' de la faceta ''{2}'' debe proceder del espacio reservado para el valor del tipo base, ''{3}''.
-- FixedFacetValue = FixedFacetValue: En la definici\u00F3n de {3}, el valor ''{1}'' para la faceta ''{0}'' no es v\u00E1lido porque el valor de ''{0}'' se ha definido en ''{2}'' en uno de los tipos de ascendientes y ''{''fixed''}'' = true.
-- InvalidRegex = InvalidRegex: El valor del patr\u00F3n ''{0}'' no es una expresi\u00F3n normal v\u00E1lida. El error registrado ha sido: ''{1}'' en la columna ''{2}''.
-+ FixedFacetValue = FixedFacetValue: En la definici\u00F3n de {3}, el valor ''{1}'' para la faceta ''{0}'' no es v\u00E1lido porque el valor de ''{0}'' se ha definido en ''{2}'' en uno de los tipos de ascendientes y '{'fixed'}' = true.
-+ InvalidRegex = InvalidRegex: El valor del patr\u00F3n ''{0}'' no es una expresi\u00F3n regular v\u00E1lida. El error registrado ha sido: ''{1}'' en la columna ''{2}''.
- maxOccurLimit = La configuraci\u00F3n actual del analizador no permite que la definici\u00F3n del valor del atributo maxOccurs sea mayor que {0}.
- PublicSystemOnNotation = PublicSystemOnNotation: Al menos un valor de ''public'' y ''system'' debe aparecer en el elemento ''notation''.
- SchemaLocation = SchemaLocation: El valor de schemaLocation = ''{0}'' debe tener un n\u00FAmero par de URI.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
- FormatFailed = Une erreur interne est survenue lors du formatage du message suivant :\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = Erreur de contrainte d''identit\u00E9 (cvc-identity-constraint.4.2.1) : l''\u00E9l\u00E9ment \"{0}\" a une cl\u00E9 sans valeur.
-- DuplicateField = Correspondance en double dans la port\u00E9e du champ \"{0}\".
-- DuplicateKey = Valeur de cl\u00E9 en double [{0}] d\u00E9clar\u00E9e pour la contrainte d''identit\u00E9 de l''\u00E9l\u00E9ment \"{1}\".
-- DuplicateUnique = Valeur unique en double [{0}] d\u00E9clar\u00E9e pour la contrainte d''identit\u00E9 de l''\u00E9l\u00E9ment \"{1}\".
-- FieldMultipleMatch = Erreur de contrainte d''identit\u00E9 : le champ \"{0}\" concorde avec plusieurs valeurs dans la port\u00E9e de son s\u00E9lecteur. Les champs doivent concorder avec des valeurs uniques.
-- FixedDiffersFromActual = Le contenu de l'\u00E9l\u00E9ment n'\u00E9quivaut pas \u00E0 la valeur de l'attribut \"fixed\" dans la d\u00E9claration de l'\u00E9l\u00E9ment du sch\u00E9ma.
-- KeyMatchesNillable = Erreur de contrainte d''identit\u00E9 (cvc-identity-constraint.4.2.3) : l''\u00E9l\u00E9ment \"{0}\" a une cl\u00E9 qui concorde avec un \u00E9l\u00E9ment dont l''attribut nillable a la valeur True.
-- KeyNotEnoughValues = Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <key name=\"{1}\"> de l''\u00E9l\u00E9ment \"{0}\" est insuffisant.
-+ AbsentKeyValue = Erreur de contrainte d''identit\u00E9 (cvc-identity-constraint.4.2.1) : l''\u00E9l\u00E9ment "{0}" a une cl\u00E9 sans valeur.
-+ DuplicateField = Correspondance en double dans la port\u00E9e du champ "{0}".
-+ DuplicateKey = Valeur de cl\u00E9 en double [{0}] d\u00E9clar\u00E9e pour la contrainte d''identit\u00E9 de l''\u00E9l\u00E9ment "{1}".
-+ DuplicateUnique = Valeur unique en double [{0}] d\u00E9clar\u00E9e pour la contrainte d''identit\u00E9 de l''\u00E9l\u00E9ment "{1}".
-+ FieldMultipleMatch = Erreur de contrainte d''identit\u00E9 : le champ "{0}" concorde avec plusieurs valeurs dans la port\u00E9e de son s\u00E9lecteur ; les champs doivent concorder avec des valeurs uniques.
-+ FixedDiffersFromActual = Le contenu de l'\u00E9l\u00E9ment n'\u00E9quivaut pas \u00E0 la valeur de l'attribut "fixed" dans la d\u00E9claration de l'\u00E9l\u00E9ment du sch\u00E9ma.
-+ KeyMatchesNillable = Erreur de contrainte d''identit\u00E9 (cvc-identity-constraint.4.2.3) : l''\u00E9l\u00E9ment "{0}" a une cl\u00E9 qui concorde avec un \u00E9l\u00E9ment dont l''attribut nillable a la valeur True.
-+ KeyNotEnoughValues = Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <key name="{1}"> de l''\u00E9l\u00E9ment "{0}" est insuffisant.
- KeyNotFound = La cl\u00E9 ''{0}'' ayant la valeur ''{1}'' est introuvable pour la contrainte d''identit\u00E9 de l''\u00E9l\u00E9ment ''{2}''.
-- KeyRefNotEnoughValues = Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <keyref name=\"{1}\"> de l''\u00E9l\u00E9ment \"{0}\" est insuffisant.
-- KeyRefOutOfScope = Erreur de contrainte d''identit\u00E9 : la contrainte d''identit\u00E9 \"{0}\" comporte une r\u00E9f\u00E9rence keyref se rapportant \u00E0 une cl\u00E9 ou \u00E0 une valeur unique hors port\u00E9e.
-- KeyRefReferNotFound = La d\u00E9claration de r\u00E9f\u00E9rence de cl\u00E9 \"{0}\" se rapporte \u00E0 une cl\u00E9 inconnue portant le nom \"{1}\".
-- UniqueNotEnoughValues = Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <unique> de l''\u00E9l\u00E9ment \"{0}\" est insuffisant.
-- UnknownField = Erreur de contrainte d''identit\u00E9 interne ; champ inconnu \"{0}\".
-+ KeyRefNotEnoughValues = Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <keyref name="{1}"> de l''\u00E9l\u00E9ment "{0}" est insuffisant.
-+ KeyRefOutOfScope = Erreur de contrainte d''identit\u00E9 : la contrainte d''identit\u00E9 "{0}" comporte une r\u00E9f\u00E9rence keyref se rapportant \u00E0 une cl\u00E9 ou \u00E0 une valeur unique hors port\u00E9e.
-+ KeyRefReferNotFound = La d\u00E9claration de r\u00E9f\u00E9rence de cl\u00E9 "{0}" se rapporte \u00E0 une cl\u00E9 inconnue portant le nom "{1}".
-+ UniqueNotEnoughValues = Le nombre de valeurs indiqu\u00E9es pour la contrainte d''identit\u00E9 <unique> de l''\u00E9l\u00E9ment "{0}" est insuffisant.
-+ UnknownField = Erreur de contrainte d''identit\u00E9 interne ; champ inconnu "{0}".
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,12 +35,12 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide par rapport \u00E0 son type, ''{3}''.
-- cvc-attribute.4 = cvc-attribute.4 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide par rapport \u00E0 son attribut ''{''value constraint''}'' fixe. L''attribut doit avoir une valeur de ''{3}''.
-+ cvc-attribute.4 = cvc-attribute.4 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas valide par rapport \u00E0 son attribut '{'value constraint'}' fixe. L''attribut doit avoir une valeur de ''{3}''.
- cvc-complex-type.2.1 = cvc-complex-type.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type caract\u00E8re ou \u00E9l\u00E9ment d''information, car le type de contenu du type est vide.
- cvc-complex-type.2.2 = cvc-complex-type.2.2 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type \u00E9l\u00E9ment et la valeur doit \u00EAtre valide.
- cvc-complex-type.2.3 = cvc-complex-type.2.3 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type caract\u00E8re, car le type porte le type de contenu "element-only".
- cvc-complex-type.2.4.a = cvc-complex-type.2.4.a : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. L''une des valeurs ''{1}'' est attendue.
-- cvc-complex-type.2.4.b = cvc-complex-type.2.4.b : Le contenu de l''\u00E9l\u00E9ment "{0}" n''est pas complet. L''une des valeurs "{1}" est attendue.
-+ cvc-complex-type.2.4.b = cvc-complex-type.2.4.b : Le contenu de l''\u00E9l\u00E9ment ''{0}'' n''est pas complet. L''un des \u00E9l\u00E9ments ''{1}'' est attendu.
- cvc-complex-type.2.4.c = cvc-complex-type.2.4.c : Le caract\u00E8re g\u00E9n\u00E9rique concordant est strict, mais aucune d\u00E9claration ne peut \u00EAtre trouv\u00E9e pour l''\u00E9l\u00E9ment ''{0}''.
- cvc-complex-type.2.4.d = cvc-complex-type.2.4.d : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. Aucun \u00E9l\u00E9ment enfant n''est attendu \u00E0 cet endroit.
- cvc-complex-type.2.4.e = cvc-complex-type.2.4.d : Contenu non valide trouv\u00E9 \u00E0 partir de l''\u00E9l\u00E9ment ''{0}''. Aucun \u00E9l\u00E9ment enfant ''{1}'' n''est attendu \u00E0 cet endroit.
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2 : L''attribut ''{1}'' n''est pas autoris\u00E9 dans l''\u00E9l\u00E9ment ''{0}''.
- cvc-complex-type.4 = cvc-complex-type.4 : L''attribut ''{1}'' doit figurer dans l''\u00E9l\u00E9ment ''{0}''.
- cvc-complex-type.5.1 = cvc-complex-type.5.1 : Dans l''\u00E9l\u00E9ment ''{0}'', l''attribut ''{1}'' est un ID g\u00E9n\u00E9rique. Or, il existe d\u00E9j\u00E0 un ID g\u00E9n\u00E9rique ''{2}''. Il ne peut en exister qu''un seul.
-- cvc-complex-type.5.2 = cvc-complex-type.5.2 : Dans l''\u00E9l\u00E9ment ''{0}'', l''attribut ''{1}'' est un ID g\u00E9n\u00E9rique. Or, il existe d\u00E9j\u00E0 un attribut ''{2}'' d\u00E9riv\u00E9 de l''ID dans ''{''attribute uses''}''.
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2 : Dans l''\u00E9l\u00E9ment ''{0}'', l''attribut ''{1}'' est un ID g\u00E9n\u00E9rique. Or, il existe d\u00E9j\u00E0 un attribut ''{2}'' d\u00E9riv\u00E9 de l''ID dans '{'attribute uses'}'.
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1 : ''{0}'' n''est pas une valeur valide pour ''{1}''.
-- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2 : ''{0}'' n''est pas une valeur valide pour le type de liste ''{1}''.
-- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3 : ''{0}'' n''est pas une valeur valide pour le type d''union ''{1}''.
-+ cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2 : ''{0}'' n''est pas une valeur valide du type de liste ''{1}''.
-+ cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3 : ''{0}'' n''est pas une valeur valide du type d''union ''{1}''.
- cvc-elt.1 = cvc-elt.1 : D\u00E9claration de l''\u00E9l\u00E9ment ''{0}'' introuvable.
-- cvc-elt.2 = cvc-elt.2 : La valeur de l''attribut ''{''abstract''}'' dans la d\u00E9claration de l''\u00E9l\u00E9ment pour ''{0}'' doit \u00EAtre False.
-- cvc-elt.3.1 = cvc-elt.3.1 : L''attribut ''{1}'' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}'', car la propri\u00E9t\u00E9 ''{''nillable''}'' de ''{0}'' est False.
-+ cvc-elt.2 = cvc-elt.2 : La valeur de l''attribut '{'abstract'}' dans la d\u00E9claration de l''\u00E9l\u00E9ment pour ''{0}'' doit \u00EAtre False.
-+ cvc-elt.3.1 = cvc-elt.3.1 : L''attribut ''{1}'' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}'', car la propri\u00E9t\u00E9 '{'nillable'}' de ''{0}'' est False.
- cvc-elt.3.2.1 = cvc-elt.3.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type caract\u00E8re ou \u00E9l\u00E9ment d''information, car ''{1}'' est indiqu\u00E9.
-- cvc-elt.3.2.2 = cvc-elt.3.2.2 : Il ne doit y avoir aucun attribut ''{''value constraint''}'' fixe pour l''\u00E9l\u00E9ment ''{0}'', car ''{1}'' est indiqu\u00E9.
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2 : Il ne doit y avoir aucun attribut '{'value constraint'}' fixe pour l''\u00E9l\u00E9ment ''{0}'', car ''{1}'' est indiqu\u00E9.
- cvc-elt.4.1 = cvc-elt.4.1 : La valeur ''{2}'' de l''attribut ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas un QName valide.
- cvc-elt.4.2 = cvc-elt.4.2 : Impossible de r\u00E9soudre ''{1}'' en une d\u00E9finition de type pour l''\u00E9l\u00E9ment ''{0}''.
- cvc-elt.4.3 = cvc-elt.4.3 : La d\u00E9rivation du type ''{1}'' \u00E0 partir de la d\u00E9finition de type ''{2}'' de l''\u00E9l\u00E9ment "{0}" n''est pas valide.
-- cvc-elt.5.1.1 = cvc-elt.5.1.1 : L''attribut ''{''value constraint''}'' ''{2}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas une valeur par d\u00E9faut valide pour le type ''{1}''.
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1 : L''attribut '{'value constraint'}' ''{2}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas une valeur par d\u00E9faut valide pour le type ''{1}''.
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1 : L''\u00E9l\u00E9ment ''{0}'' ne doit comporter aucun enfant ([children]) de type \u00E9l\u00E9ment d''information.
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' ne concorde pas avec la valeur ''{2}'' de l''attribut ''{''value constraint''}'' fixe.
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' ne concorde pas avec la valeur ''{2}'' de l''attribut ''{''value constraint''}''.
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' ne concorde pas avec la valeur de l''attribut '{'value constraint'}' fixe ''{2}''.
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2 : La valeur ''{1}'' de l''\u00E9l\u00E9ment ''{0}'' ne concorde pas avec la valeur de l''attribut '{'value constraint'}' ''{2}''.
- cvc-enumeration-valid = cvc-enumeration-valid : La valeur ''{0}'' n''est pas un facet valide par rapport \u00E0 l''\u00E9num\u00E9ration ''{1}''. Il doit s''agir d''une valeur provenant de l''\u00E9num\u00E9ration.
- cvc-fractionDigits-valid = cvc-fractionDigits-valid : La valeur ''{0}'' poss\u00E8de {1} chiffres apr\u00E8s la virgule, mais le nombre de chiffres apr\u00E8s la virgule ne doit pas d\u00E9passer {2}.
- cvc-id.1 = cvc-id.1 : Aucune liaison ID/IDREF pour l''IDREF ''{0}''.
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference : \u00E9chec de la lecture du document de sch\u00E9ma ''{0}'', car l''acc\u00E8s ''{1}'' n''est pas autoris\u00E9 en raison d''une restriction d\u00E9finie par la propri\u00E9t\u00E9 accessExternalSchema.
- schema_reference.4 = schema_reference.4 : Echec de la lecture du document de sch\u00E9ma ''{0}'' pour les raisons suivantes : 1) Le document est introuvable ; 2) Le document n''a pas pu \u00EAtre lu ; 3) L''\u00E9l\u00E9ment racine du document n''est pas <xsd:schema>.
- src-annotation = src-annotation : Les \u00E9l\u00E9ments <annotation> ne peuvent contenir que des \u00E9l\u00E9ments <appinfo> et <documentation>, mais ''{0}'' a \u00E9t\u00E9 trouv\u00E9.
- src-attribute.1 = src-attribute.1 : Les propri\u00E9t\u00E9s ''default'' et ''fixed'' ne peuvent pas figurer simultan\u00E9ment dans la d\u00E9claration d''attribut ''{0}''. Utilisez uniquement l''une d''entre elles.
-@@ -130,7 +102,7 @@
- src-ct.4 = src-ct.4 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. L''intersection de caract\u00E8res g\u00E9n\u00E9riques ne peut pas \u00EAtre exprim\u00E9e.
- src-ct.5 = src-ct.5 : Erreur de repr\u00E9sentation de la d\u00E9finition de type complexe pour le type ''{0}''. L''union de caract\u00E8res g\u00E9n\u00E9riques ne peut pas \u00EAtre exprim\u00E9e.
- src-element.1 = src-element.1 : Les propri\u00E9t\u00E9s ''default'' et ''fixed'' ne peuvent pas figurer simultan\u00E9ment dans la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Utilisez uniquement l''une d''entre elles.
-- src-element.2.1 = src-element.2.1 : 'ref' ou 'name' doit figurer dans les d\u00E9clarations d''\u00E9l\u00E9ment local.
-+ src-element.2.1 = src-element.2.1 : 'ref' ou 'name' doit figurer dans les d\u00E9clarations d'\u00E9l\u00E9ment local.
- src-element.2.2 = src-element.2.2 : Puisque ''{0}'' contient l''attribut ''ref'', son contenu doit concorder avec (annotation?). Cependant, ''{1}'' a \u00E9t\u00E9 trouv\u00E9.
- src-element.3 = src-element.3 : L''\u00E9l\u00E9ment ''{0}'' pr\u00E9sente un attribut ''type'' et un enfant ''anonymous type''. Seul un d''entre eux est autoris\u00E9 dans un \u00E9l\u00E9ment.
- src-import.1.1 = src-import.1.1 : L''attribut namespace "{0}" d''un \u00E9l\u00E9ment d''information d''\u00E9l\u00E9ment <import> ne doit pas \u00EAtre identique \u00E0 l''attribut targetNamespace du sch\u00E9ma dans lequel il figure.
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2 : Erreur dans le groupe d''attributs ''{0}''. Des occurrences d''attributs en double avec un nom et un espace de noms cible identiques sont indiqu\u00E9es. Le nom de l''occurrence d''attribut en double est ''{1}''.
- ag-props-correct.3 = ag-props-correct.3 : Erreur dans le groupe d''attributs ''{0}''. Deux d\u00E9clarations d''attribut, ''{1}'' et ''{2}'', ont des types d\u00E9riv\u00E9s de l''ID.
- a-props-correct.2 = a-props-correct.2 : Valeur de contrainte de valeur ''{1}'' non valide dans l''attribut ''{0}''.
-- a-props-correct.3 = a-props-correct.3 : L''attribut ''{0}'' ne peut pas utiliser ''fixed'' ou ''default'', car sa valeur ''{''type definition''}'' est identique \u00E0 l''ID ou en est d\u00E9riv\u00E9e.
-- au-props-correct.2 = au-props-correct.2 : Dans la d\u00E9claration d''attribut de ''{0}'', la valeur fixe ''{1}'' a \u00E9t\u00E9 indiqu\u00E9e. Par cons\u00E9quent, si l''occurrence de l''attribut faisant r\u00E9f\u00E9rence \u00E0 ''{0}'' comporte \u00E9galement ''{''value constraint''}'', celle-ci doit \u00EAtre fixe et sa valeur doit \u00EAtre ''{1}''.
-+ a-props-correct.3 = a-props-correct.3 : L''attribut ''{0}'' ne peut pas utiliser ''fixed'' ou ''default'', car sa valeur '{'type definition'}' est identique \u00E0 l''ID ou en est d\u00E9riv\u00E9e.
-+ au-props-correct.2 = au-props-correct.2 : Dans la d\u00E9claration d''attribut de ''{0}'', la valeur fixe ''{1}'' a \u00E9t\u00E9 indiqu\u00E9e. Par cons\u00E9quent, si l''occurrence de l''attribut faisant r\u00E9f\u00E9rence \u00E0 ''{0}'' comporte \u00E9galement '{'value constraint'}', celle-ci doit \u00EAtre fixe et sa valeur doit \u00EAtre ''{1}''.
- cos-all-limited.1.2 = cos-all-limited.1.2 : Un groupe de mod\u00E8les 'all' doit figurer dans une particule o\u00F9 '{'min occurs'}' = '{'max occurs'}' = 1. Cette particule doit en outre faire partie d'une paire constituant la valeur '{'content type'}' d'une d\u00E9finition de type complexe.
-- cos-all-limited.2 = cos-all-limited.2 : La valeur ''{''max occurs''}'' d''un \u00E9l\u00E9ment dans un groupe de mod\u00E8les ''all'' doit \u00EAtre 0 ou 1. La valeur ''{0}'' pour l''\u00E9l\u00E9ment ''{1}'' n''est pas valide.
-+ cos-all-limited.2 = cos-all-limited.2 : La valeur '{'max occurs'}' d''un \u00E9l\u00E9ment dans un groupe de mod\u00E8les ''all'' doit \u00EAtre 0 ou 1. La valeur ''{0}'' pour l''\u00E9l\u00E9ment ''{1}'' n''est pas valide.
- cos-applicable-facets = cos-applicable-facets : Le facet ''{0}'' n''est pas autoris\u00E9 pour le type {1}.
- cos-ct-extends.1.1 = cos-ct-extends.1.1 : Le type ''{0}'' est d\u00E9riv\u00E9 par l''extension du type ''{1}''. Toutefois, l''attribut ''final'' de ''{1}'' n''autorise pas la d\u00E9rivation par extension.
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a : Le type de contenu d''un type d\u00E9riv\u00E9 et celui de sa base doivent tous les deux \u00EAtre mixtes (mixed) ou \u00E9l\u00E9ment uniquement (element-only). Le type ''{0}'' est \u00E9l\u00E9ment uniquement, mais le type de sa base ne l''est pas.
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b : Le type de contenu d''un type d\u00E9riv\u00E9 et celui de sa base doivent tous les deux \u00EAtre mixtes (mixed) ou \u00E9l\u00E9ment uniquement (element-only). Le type ''{0}'' est mixte, mais le type de sa base ne l''est pas.
- cos-element-consistent = cos-element-consistent : Erreur dans le type ''{0}''. Plusieurs \u00E9l\u00E9ments portant le nom ''{1}'', de divers types, figurent dans le groupe de mod\u00E8les.
-- cos-list-of-atomic = cos-list-of-atomic : Dans la d\u00E9finition du type de liste ''{0}'', le type ''{1}'' est un type d''\u00E9l\u00E9ment de liste non valide car il n''est pas non d\u00E9composable (''{1}'' est un type de liste ou un type d''union contenant une liste).
-+ cos-list-of-atomic = cos-list-of-atomic : Dans la d\u00E9finition du type de liste ''{0}'', le type ''{1}'' est un type d''\u00E9l\u00E9ment de liste non valide car il n''est pas atomique (''{1}'' est un type de liste ou un type d''union contenant une liste).
- cos-nonambig = cos-nonambig : {0} et {1} (ou des \u00E9l\u00E9ments de leur groupe de substitution) violent la r\u00E8gle d''attribution de particule unique (Unique Particle Attribution). Au cours de la validation par rapport \u00E0 ce sch\u00E9ma, ces deux particules peuvent devenir ambigu\u00EBs.
- cos-particle-restrict.a = cos-particle-restrict.a : La particule d\u00E9riv\u00E9e est vide et la base ne peut pas \u00EAtre vide.
- cos-particle-restrict.b = cos-particle-restrict.b : La particule de base est vide, mais la particule d\u00E9riv\u00E9e ne l'est pas.
- cos-particle-restrict.2 = cos-particle-restrict.2 : Restriction de particule interdite : ''{0}''.
-- cos-st-restricts.1.1 = cos-st-restricts.1.1 : Le type ''{1}'' \u00E9tant non d\u00E9composable, sa valeur ''{''base type definition''}'', ''{0}'', doit \u00EAtre une d\u00E9finition de type simple non d\u00E9composable ou un type de donn\u00E9es primitif int\u00E9gr\u00E9.
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1 : Le type ''{1}'' \u00E9tant non d\u00E9composable, sa valeur '{'base type definition'}', ''{0}'', doit \u00EAtre une d\u00E9finition de type simple atomique ou un type de donn\u00E9es primitif int\u00E9gr\u00E9.
- cos-st-restricts.2.1 = cos-st-restricts.2.1 : Dans la d\u00E9finition du type de liste ''{0}'', le type ''{1}'' est un type d''\u00E9l\u00E9ment non valide car il s''agit d''un type de liste ou un type d''union contenant une liste.
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1 : Le composant ''{''final''}'' de la valeur ''{''item type definition''}'', ''{0}'', contient ''list''. Cela signifie que la valeur ''{0}'' ne peut pas \u00EAtre utilis\u00E9e en tant que type d''\u00E9l\u00E9ment pour le type de liste ''{1}''.
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1 : Le composant ''{''final''}'' de la valeur ''{''member type definitions''}'', ''{0}'', contient ''union''. Cela signifie que la valeur ''{0}'' ne peut pas \u00EAtre utilis\u00E9e en tant que type de membre pour le type d''union ''{1}''.
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1 : Le composant '{'final'}' de la valeur '{'item type definition'}', ''{0}'', contient ''list''. Cela signifie que la valeur ''{0}'' ne peut pas \u00EAtre utilis\u00E9e en tant que type d''\u00E9l\u00E9ment pour le type de liste ''{1}''.
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1 : Le composant '{'final'}' de la valeur '{'member type definitions'}', ''{0}'', contient ''union''. Cela signifie que la valeur ''{0}'' ne peut pas \u00EAtre utilis\u00E9e en tant que type de membre pour le type d''union ''{1}''.
- cos-valid-default.2.1 = cos-valid-default.2.1 : L''\u00E9l\u00E9ment ''{0}'' comporte une contrainte de valeur et doit disposer d''un mod\u00E8le de contenu mixte ou simple.
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2 : Puisque l''\u00E9l\u00E9ment ''{0}'' comporte une valeur ''{''value constraint''}'' et que sa d\u00E9finition de type a la valeur ''{''content type''}'' mixte, la particule de ''{''content type''}'' doit pouvoir \u00EAtre vide.
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2 : Puisque l''\u00E9l\u00E9ment ''{0}'' comporte une valeur '{'value constraint'}' et que sa d\u00E9finition de type a la valeur '{'content type'}' mixte, la particule de '{'content type'}' doit pouvoir \u00EAtre vide.
- c-props-correct.2 = c-props-correct.2 : La cardinalit\u00E9 des champs pour les valeurs keyref ''{0}'' et key ''{1}'' doit concorder.
- ct-props-correct.3 = ct-props-correct.3 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le type complexe ''{0}''. Cela signifie que ''{0}'' est contenu dans sa propre hi\u00E9rarchie des types, ce qui est une erreur.
- ct-props-correct.4 = ct-props-correct.4 : Erreur dans le type ''{0}''. Des occurrences d''attributs en double avec un nom et un espace de noms cible identiques sont indiqu\u00E9es. Le nom de l''occurrence d''attribut en double est ''{1}''.
- ct-props-correct.5 = ct-props-correct.5 : Erreur dans le type ''{0}''. Deux d\u00E9clarations d''attribut, ''{1}'' et ''{2}'', ont des types d\u00E9riv\u00E9s de l''ID.
-- derivation-ok-restriction.1 = derivation-ok-restriction.1 : Le type ''{0}'' a \u00E9t\u00E9 d\u00E9riv\u00E9 par restriction du type ''{1}''. Cependant, ''{1}'' comporte une propri\u00E9t\u00E9 ''{''final''}'' interdisant la d\u00E9rivation par restriction.
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1 : Le type ''{0}'' a \u00E9t\u00E9 d\u00E9riv\u00E9 par restriction du type ''{1}''. Cependant, ''{1}'' comporte une propri\u00E9t\u00E9 '{'final'}' interdisant la d\u00E9rivation par restriction.
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1 : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une valeur ''use'' de ''{2}'', ce qui est incoh\u00E9rent avec la valeur ''required'' dans une occurrence d''attribut correspondante dans le type de base.
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2 : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte le type ''{2}'', dont la d\u00E9rivation \u00E0 partir de ''{3}'', le type de l''occurrence d''attribut correspondante dans le type de base, n''est pas valide.
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a : Erreur dans le type ''{0}''. L''occurrence d''attribut ''{1}'' dans ce type comporte une contrainte de valeur effective qui n''est pas fixe, et la contrainte de valeur effective de l''occurrence d''attribut correspondante dans le type de base est fixe.
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation : Le type NOTATION, ''{0}'' utilis\u00E9 par {2} ''{1}'', doit comporter une valeur de facet d''\u00E9num\u00E9ration indiquant les \u00E9l\u00E9ments de notation utilis\u00E9s par ce type.
- enumeration-valid-restriction = enumeration-valid-restriction : La valeur d''\u00E9num\u00E9ration ''{0}'' n''est pas comprise l''espace de valeurs du type de base, {1}.
- e-props-correct.2 = e-props-correct.2 : Valeur de contrainte de valeur ''{1}'' non valide dans l''\u00E9l\u00E9ment ''{0}''.
-- e-props-correct.4 = e-props-correct.4 : La valeur ''{''type definition''}'' de l''\u00E9l\u00E9ment ''{0}'' n''est pas d\u00E9riv\u00E9e de fa\u00E7on valide \u00E0 partir de la valeur ''{''type definition''}'' de l''\u00E9l\u00E9ment substitutionHead ''{1}'', ou la propri\u00E9t\u00E9 ''{''substitution group exclusions''}'' de ''{1}'' n''accepte pas cette d\u00E9rivation.
-- e-props-correct.5 = e-props-correct.5 : Une valeur ''{''value constraint''}'' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}'', car sa valeur ''{''type definition''}'' ou le ''{''content type''}'' de sa valeur ''{''type definition''}'' est identique \u00E0 l''ID ou en est d\u00E9riv\u00E9.
-+ e-props-correct.4 = e-props-correct.4 : La valeur '{'type definition'}' de l''\u00E9l\u00E9ment ''{0}'' n''est pas d\u00E9riv\u00E9e de fa\u00E7on valide \u00E0 partir de la valeur '{'type definition'}' de l''\u00E9l\u00E9ment substitutionHead ''{1}'', ou la propri\u00E9t\u00E9 '{'substitution group exclusions'}' de ''{1}'' n''accepte pas cette d\u00E9rivation.
-+ e-props-correct.5 = e-props-correct.5 : Une valeur '{'value constraint'}' ne doit pas figurer dans l''\u00E9l\u00E9ment ''{0}'', car sa valeur '{'type definition'}' ou le '{'content type'}' de sa valeur '{'type definition'}' est identique \u00E0 l''ID ou en est d\u00E9riv\u00E9.
- e-props-correct.6 = e-props-correct.6 : Groupe de substitution circulaire d\u00E9tect\u00E9 pour \u00E9l\u00E9ment ''{0}''.
- fractionDigits-valid-restriction = fractionDigits-valid-restriction : Dans la d\u00E9finition de {2}, la valeur ''{0}'' pour le facet ''fractionDigits'' n''est pas valide car elle doit \u00EAtre <= \u00E0 la valeur de ''fractionDigits'', qui a \u00E9t\u00E9 d\u00E9finie sur ''{1}'' dans l''un des types d''anc\u00EAtre.
- fractionDigits-totalDigits = fractionDigits-totalDigits : Dans la d\u00E9finition de {2}, la valeur ''{0}'' pour le facet ''fractionDigits'' n''est pas valide car elle doit \u00EAtre <= \u00E0 la valeur de ''totalDigits'', d\u00E9finie sur ''{1}''.
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit \u00EAtre >= \u00E0 la valeur minInclusive du type de base ''{1}''.
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4 : Erreur dans le type ''{2}''. La valeur maxInclusive ''{0}'' doit \u00EAtre > \u00E0 la valeur minExclusive du type de base ''{1}''.
- maxLength-valid-restriction = maxLength-valid-restriction : Dans la d\u00E9finition de {2}, la valeur maxLength ''{0}'' doit \u00EAtre <= \u00E0 celle du type de base ''{1}''.
-- mg-props-correct.2 = mg-props-correct.2 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le groupe ''{0}''. Le suivi r\u00E9cursif des valeurs ''{''term''}'' des particules conduit \u00E0 une particule o\u00F9 ''{''term''}'' est le groupe proprement dit.
-+ mg-props-correct.2 = mg-props-correct.2 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le groupe ''{0}''. Le suivi r\u00E9cursif des valeurs '{'term'}' des particules conduit \u00E0 une particule o\u00F9 '{'term'}' est le groupe proprement dit.
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive : Dans la d\u00E9finition de {2}, la valeur minExclusive ''{0}'' doit \u00EAtre <= \u00E0 la valeur maxExclusive ''{1}''.
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive : Dans la d\u00E9finition de {2}, la valeur minExclusive ''{0}'' doit \u00EAtre < \u00E0 la valeur maxInclusive ''{1}''.
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1 : Erreur dans le type ''{2}''. La valeur minExclusive ''{0}'' doit \u00EAtre >= \u00E0 la valeur minExclusive du type de base ''{1}''.
-@@ -252,23 +224,23 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: Dans la d\u00E9finition de {2}, la valeur de minLength ''{0}'' doit \u00EAtre < \u00E0 la valeur de maxLength ''{1}''.
- minLength-valid-restriction = minLength-valid-restriction : Dans la d\u00E9finition de {2}, la valeur de minLength ''{0}'' doit \u00EAtre >= \u00E0 celle du type de base, ''{1}''.
- no-xmlns = no-xmlns : La valeur {name} d'une d\u00E9claration d'attribut ne doit pas \u00EAtre identique \u00E0 'xmlns'.
-- no-xsi = no-xsi : La valeur ''{''target namespace''}'' d''une d\u00E9claration d''attribut ne doit pas \u00EAtre identique \u00E0 ''{0}''.
-+ no-xsi = no-xsi : La valeur '{'target namespace'}' d''une d\u00E9claration d''attribut ne doit pas \u00EAtre identique \u00E0 ''{0}''.
- p-props-correct.2.1 = p-props-correct.2.1 : Dans la d\u00E9claration de ''{0}'', la valeur de ''minOccurs'' est ''{1}'', mais elle ne doit pas \u00EAtre sup\u00E9rieure \u00E0 la valeur de ''maxOccurs'', qui est ''{2}''.
- rcase-MapAndSum.1 = rcase-MapAndSum.1 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
- rcase-MapAndSum.2 = rcase-MapAndSum.2 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage d''occurrences du groupe de base, ({2},{3}).
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1 : Les \u00E9l\u00E9ments ont des noms (name) et des espaces de noms cible (target namespace) diff\u00E9rents : \u00E9l\u00E9ment "{0}" dans l''espace de noms "{1}" et \u00E9l\u00E9ment ''{2}'' dans l''espace de noms ''{3}''.
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2 : Erreur dans la particule o\u00F9 la valeur ''{''term''}'' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. La valeur ''{''nillable''}'' de la d\u00E9claration d''\u00E9l\u00E9ment est True, mais la particule correspondante dans le type de base comporte une d\u00E9claration d''\u00E9l\u00E9ment o\u00F9 la valeur ''{''nillable''}'' est False.
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3 : Erreur dans la particule o\u00F9 la valeur ''{''term''}'' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2 : Erreur dans la particule o\u00F9 la valeur '{'term'}' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. La valeur '{'nillable'}' de la d\u00E9claration d''\u00E9l\u00E9ment est True, mais la particule correspondante dans le type de base comporte une d\u00E9claration d''\u00E9l\u00E9ment o\u00F9 la valeur '{'nillable'}' est False.
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3 : Erreur dans la particule o\u00F9 la valeur '{'term'}' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a : L''\u00E9l\u00E9ment ''{0}'' n''est pas fixe, mais l''\u00E9l\u00E9ment correspondant dans le type de base est fixe avec la valeur ''{1}''.
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b : L''\u00E9l\u00E9ment ''{0}'' est fixe avec la valeur ''{1}'', mais l''\u00E9l\u00E9ment correspondant dans le type de base est fixe avec la valeur ''{2}''.
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5 : Les contraintes d''identit\u00E9 de l''\u00E9l\u00E9ment "{0}" ne sont pas un sous-ensemble de celles de la base.
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6 : Les substitutions non autoris\u00E9es pour l''\u00E9l\u00E9ment ''{0}'' ne sont pas un sur-ensemble de celles de la base.
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7 : Le type de l''\u00E9l\u00E9ment ''{0}'', ''{1}'', n''est pas d\u00E9riv\u00E9 du type de l''\u00E9l\u00E9ment de base, ''{2}''.
- rcase-NSCompat.1 = rcase-NSCompat.1 : L''\u00E9l\u00E9ment ''{0}'' comporte un espace de noms ''{1}'' non autoris\u00E9 par le caract\u00E8re g\u00E9n\u00E9rique de la base.
-- rcase-NSCompat.2 = rcase-NSCompat.2 : Erreur dans la particule o\u00F9 la valeur ''{''term''}'' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
-+ rcase-NSCompat.2 = rcase-NSCompat.2 : Erreur dans la particule o\u00F9 la valeur '{'term'}' est la d\u00E9claration d''\u00E9l\u00E9ment ''{0}''. Sa plage d''occurrences, ({1},{2}), n''est pas une restriction valide de la plage ({3},{4}) de la particule correspondante dans le type de base.
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1 : Aucune mise en correspondance fonctionnelle compl\u00E8te entre les particules.
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage \u00E0 caract\u00E8re g\u00E9n\u00E9rique de la base, ({2},{3}).
-- rcase-NSSubset.1 = rcase-NSSubset.1 : Le caract\u00E8re g\u00E9n\u00E9rique n'est pas un sous-ensemble de caract\u00E8res g\u00E9n\u00E9riques correspondant dans la base.
-+ rcase-NSSubset.1 = rcase-NSSubset.1 : Le caract\u00E8re g\u00E9n\u00E9rique n'est pas un sous-ensemble du caract\u00E8re g\u00E9n\u00E9rique correspondant dans la base.
- rcase-NSSubset.2 = rcase-NSSubset.2 : La plage d''occurrences du caract\u00E8re g\u00E9n\u00E9rique, ({0},{1}), n''est pas une restriction valide de celle de la base, ({2},{3}).
- rcase-NSSubset.3 = rcase-NSSubset.3 : Le contenu de processus de caract\u00E8re g\u00E9n\u00E9rique, ''{0}'', est plus faible que celui figurant dans la base, ''{1}''.
- rcase-Recurse.1 = rcase-Recurse.1 : La plage d''occurrences du groupe, ({0},{1}), n''est pas une restriction valide de la plage d''occurrences du groupe de base, ({2},{3}).
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2 : Un sch\u00E9ma ne peut pas contenir deux composants globaux de m\u00EAme nom ; celui-ci contient deux occurrences de ''{0}''.
- st-props-correct.2 = st-props-correct.2 : D\u00E9finitions circulaires d\u00E9tect\u00E9es pour le type simple ''{0}''. Cela signifie que ''{0}'' est contenu dans sa propre hi\u00E9rarchie des types, ce qui est une erreur.
-- st-props-correct.3 = st-props-correct.3 : Erreur dans le type ''{0}''. La valeur ''{''final''}'' de ''{''base type definition''}'', ''{1}'', n''accepte pas la d\u00E9rivation par restriction.
-+ st-props-correct.3 = st-props-correct.3 : Erreur dans le type ''{0}''. La valeur '{'final'}' de '{'base type definition'}', ''{1}'', n''accepte pas la d\u00E9rivation par restriction.
- totalDigits-valid-restriction = totalDigits-valid-restriction : Dans la d\u00E9finition de {2}, la valeur ''{0}'' pour le facet ''totalDigits'' n''est pas valide car elle doit \u00EAtre <= \u00E0 la valeur de ''totalDigits'', qui a \u00E9t\u00E9 d\u00E9finie sur ''{1}'' dans l''un des types d''anc\u00EAtre.
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1 : Dans la d\u00E9finition de {0}, la valeur ''{1}'' du facet ''whitespace'' n''est pas valide car elle a \u00E9t\u00E9 d\u00E9finie sur ''collapse'' dans l''un des types d''anc\u00EAtre.
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2 : Dans la d\u00E9finition de {0}, la valeur ''preserve'' du facet ''whitespace'' n''est pas valide car la valeur de ''whitespace'' a \u00E9t\u00E9 d\u00E9finie sur ''replace'' dans l''un des types d''anc\u00EAtre.
-@@ -309,7 +281,7 @@
- c-selector-xpath = c-selector-xpath : La valeur de s\u00E9lecteur ''{0}'' n''est pas valide ; les XPath de s\u00E9lecteur ne peuvent pas contenir d''attributs.
- EmptyTargetNamespace = EmptyTargetNamespace : Dans le document de sch\u00E9ma ''{0}'', la valeur de l''attribut ''targetNamespace'' ne peut pas \u00EAtre une cha\u00EEne vide.
- FacetValueFromBase = FacetValueFromBase : Dans la d\u00E9claration de type ''{0}'', la valeur ''{1}'' du facet ''{2}'' doit \u00EAtre issue de l''espace de valeurs du type de base, ''{3}''.
-- FixedFacetValue = FixedFacetValue : Dans la d\u00E9finition de {3}, la valeur ''{1}'' du facet ''{0}'' n''est pas valide, car la valeur de ''{0}'' a \u00E9t\u00E9 d\u00E9finie sur ''{2}'' dans l''un des types d''anc\u00EAtre, et ''{''fixed''}'' = true.
-+ FixedFacetValue = FixedFacetValue : Dans la d\u00E9finition de {3}, la valeur ''{1}'' du facet ''{0}'' n''est pas valide, car la valeur de ''{0}'' a \u00E9t\u00E9 d\u00E9finie sur ''{2}'' dans l''un des types d''anc\u00EAtre, et '{'fixed'}' = true.
- InvalidRegex = InvalidRegex : La valeur de mod\u00E8le ''{0}'' n''est pas une expression r\u00E9guli\u00E8re valide. L''erreur signal\u00E9e est ''{1}'', au niveau de la colonne ''{2}''.
- maxOccurLimit = La configuration en cours de l''analyseur ne permet pas de d\u00E9finir une valeur d''attribut maxOccurs sur une valeur sup\u00E9rieure \u00E0 {0}.
- PublicSystemOnNotation = PublicSystemOnNotation : Au moins une des valeurs ''public'' et ''system'' doit figurer dans l'\u00E9l\u00E9ment ''notation''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_it.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
- FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
-@@ -43,19 +15,19 @@
- # Identity constraints
-
- AbsentKeyValue = Errore del vincolo di identit\u00E0 (cvc-identity-constraint.4.2.1): l''elemento "{0}" ha una chiave senza alcun valore.
-- DuplicateField = Corrispondenza duplicata nell''ambito per il campo \"{0}\".
-+ DuplicateField = Corrispondenza duplicata nell''ambito per il campo "{0}".
- DuplicateKey = Valore chiave duplicato [{0}] dichiarato per il vincolo di identit\u00E0 dell''elemento "{1}".
- DuplicateUnique = Valore univoco duplicato [{0}] dichiarato per il vincolo di identit\u00E0 dell''elemento "{1}".
- FieldMultipleMatch = Errore del vincolo di identit\u00E0: il campo "{0}" corrisponde a pi\u00F9 valori nell''ambito del proprio selettore; i campi devono corrispondere a valori univoci.
-- FixedDiffersFromActual = Il contenuto di questo elemento non equivale al valore dell'attributo \"fixed\" nella dichiarazione dell'elemento nello schema.
-+ FixedDiffersFromActual = Il contenuto di questo elemento non equivale al valore dell'attributo "fixed" nella dichiarazione dell'elemento nello schema.
- KeyMatchesNillable = Errore del vincolo di identit\u00E0 (cvc-identity-constraint.4.2.3): l''elemento "{0}" ha una chiave corrispondente a un elemento con un valore annullabile impostato su true.
-- KeyNotEnoughValues = Valori insufficienti forniti per il vincolo di identit\u00E0 <key name=\"{1}\"> specificato per l''elemento \"{0}\".
-+ KeyNotEnoughValues = Valori insufficienti forniti per il vincolo di identit\u00E0 <key name="{1}"> specificato per l''elemento "{0}".
- KeyNotFound = Chiave "{0}"con valore "{1}" non trovata per il vincolo di identit\u00E0 dell''elemento "{2}".
-- KeyRefNotEnoughValues = Valori insufficienti forniti per il vincolo di identit\u00E0 <keyref name=\"{1}\"> specificato per l''elemento \"{0}\".
-- KeyRefOutOfScope = Errore del vincolo di identit\u00E0: il vincolo di identit\u00E0 \"{0}\" ha un keyref che fa riferimento a una chiave o a un valore univoco fuori ambito.
-- KeyRefReferNotFound = La dichiarazione \"{0}\" del riferimento chiave fa riferimento a una chiave sconosciuta denominata \"{1}\".
-- UniqueNotEnoughValues = Valori insufficienti forniti per il vincolo di identit\u00E0 <unique> specificato per l''elemento \"{0}\".
-- UnknownField = Errore interno del vincolo di identit\u00E0; campo \"{0}\" sconosciuto
-+ KeyRefNotEnoughValues = Valori insufficienti forniti per il vincolo di identit\u00E0 <keyref name="{1}"> specificato per l''elemento "{0}".
-+ KeyRefOutOfScope = Errore del vincolo di identit\u00E0: il vincolo di identit\u00E0 "{0}" ha un keyref che fa riferimento a una chiave o a un valore univoco fuori ambito.
-+ KeyRefReferNotFound = La dichiarazione "{0}" del riferimento chiave fa riferimento a una chiave sconosciuta denominata "{1}".
-+ UniqueNotEnoughValues = Valori insufficienti forniti per il vincolo di identit\u00E0 <unique> specificato per l''elemento "{0}".
-+ UnknownField = Errore interno del vincolo di identit\u00E0; campo "{0}" sconosciuto
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non \u00E8 valido rispetto al suo tipo ''{3}''.
-- cvc-attribute.4 = cvc-attribute.4: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non \u00E8 valido rispetto al suo ''{''value constraint''}'' fisso. L''attributo deve avere un valore pari a ''{3}''.
-+ cvc-attribute.4 = cvc-attribute.4: il valore ''{2}'' dell''attributo ''{1}'' sull''elemento ''{0}'' non \u00E8 valido rispetto al suo '{'value constraint'}' fisso. L''attributo deve avere un valore pari a ''{3}''.
- cvc-complex-type.2.1 = cvc-complex-type.2.1: l''elemento "{0}" non deve avere [children] di voci di informazioni di carattere o elemento perch\u00E9 il tipo di contenuto \u00E8 vuoto.
- cvc-complex-type.2.2 = cvc-complex-type.2.2: l''elemento "{0}" non deve avere [children] di tipo elemento e il valore deve essere valido.
- cvc-complex-type.2.3 = cvc-complex-type.2.3: l''elemento "{0}" non deve avere [children] di tipo carattere perch\u00E9 il tipo di contenuto \u00E8 di soli elementi.
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: l''attributo "{1}" non \u00E8 consentito nell''elemento "{0}".
- cvc-complex-type.4 = cvc-complex-type.4: l''attributo ''{1}'' deve apparire sull''elemento "{0}".
- cvc-complex-type.5.1 = cvc-complex-type.5.1: nell''elemento "{0}", l''attributo "{1}" \u00E8 un ID Wild ma esiste gi\u00E0 un ID Wild "{2}". Pu\u00F2 esisterne solo uno.
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: nell''elemento "{0}", l''attributo "{1}" \u00E8 un ID Wild ma esiste gi\u00E0 un attributo "{2}" derivato dall''ID tra ''{''attribute uses''}''.
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: nell''elemento "{0}", l''attributo "{1}" \u00E8 un ID Wild ma esiste gi\u00E0 un attributo "{2}" derivato dall''ID tra '{'attribute uses'}'.
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: "{0}" non \u00E8 un valore valido per "{1}".
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: "{0}" non \u00E8 un valore valido per il tipo di lista "{1}".
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: "{0}" non \u00E8 un valore valido per il tipo di unione "{1}".
- cvc-elt.1 = cvc-elt.1: impossibile trovare la dichiarazione dell''elemento "{0}".
-- cvc-elt.2 = cvc-elt.2: il valore di ''{''abstract''}'' nella dichiarazione di elemento per "{0}" deve essere false.
-- cvc-elt.3.1 = cvc-elt.3.1: l''attributo "{1}" non deve apparire sull''elemento "{0}" perch\u00E9 la propriet\u00E0 ''{''nillable''}'' di "{0}" \u00E8 false.
-+ cvc-elt.2 = cvc-elt.2: il valore di '{'abstract'}' nella dichiarazione di elemento per "{0}" deve essere false.
-+ cvc-elt.3.1 = cvc-elt.3.1: l''attributo "{1}" non deve apparire sull''elemento "{0}" perch\u00E9 la propriet\u00E0 '{'nillable'}' di "{0}" \u00E8 false.
- cvc-elt.3.2.1 = cvc-elt.3.2.1: l''elemento "{0}" non deve avere [children] di informazioni di tipo carattere o elemento perch\u00E9 \u00E8 specificato "{1}".
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: non deve esistere alcun ''{''value constraint''}'' fisso per l''elemento "{0}" perch\u00E9 \u00E8 specificato "{1}".
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: non deve esistere alcun '{'value constraint'}' fisso per l''elemento "{0}" perch\u00E9 \u00E8 specificato "{1}".
- cvc-elt.4.1 = cvc-elt.4.1: il valore "{2}" dell''attributo "{1}" per l''elemento "{0}" non \u00E8 un QName valido.
- cvc-elt.4.2 = cvc-elt.4.2: impossibile risolvere "{1}" in una definizione tipo per l''elemento "{0}".
- cvc-elt.4.3 = cvc-elt.4.3: tipo "{1}" non derivato in modo valido dalla definizione tipo ''{2}'' dell''elemento "{0}".
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{''value constraint''}'' "{2}" dell''elemento "{0}" non \u00E8 un valore predefinito valido per il tipo "{1}".
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' "{2}" dell''elemento "{0}" non \u00E8 un valore predefinito valido per il tipo "{1}".
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: l''elemento "{0}" non deve avere [children] di voci di informazioni di elemento.
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: il valore "{1}" dell''elemento "{0}" non corrisponde al valore fisso di ''{''value constraint''}'' "{2}".
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: il valore "{1}" dell''elemento "{0}" non corrisponde al valore di ''{''value constraint''}'' "{2}".
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: il valore "{1}" dell''elemento "{0}" non corrisponde al valore fisso di '{'value constraint'}' "{2}".
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: il valore "{1}" dell''elemento "{0}" non corrisponde al valore di '{'value constraint'}' "{2}".
- cvc-enumeration-valid = cvc-enumeration-valid: il valore "{0}" non \u00E8 valido come facet rispetto all''enumerazione "{1}". Deve essere un valore dell''enumerazione.
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: il valore ''{0}'' ha {1} cifre di frazione, ma il numero di cifre di frazione \u00E8 stato limitato a {2}.
- cvc-id.1 = cvc-id.1: non esiste alcuna associazione ID/IDREF per l''IDREF "{0}".
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: lettura del documento di schema ''{0}'' non riuscita. Accesso ''{1}'' non consentito a causa della limitazione definita dalla propriet\u00E0 accessExternalSchema.
- schema_reference.4 = schema_reference.4: lettura del documento di schema "{0}" non riuscita perch\u00E9 1) non \u00E8 stato possibile trovare il documento; 2) non \u00E8 stato possibile leggere il documento; 3) l''elemento radice del documento non \u00E8 <xsd:schema>.
- src-annotation = src-annotation: possono essere contenuti soltanto elementi <appinfo> e <documentation>, ma \u00E8 stato trovato ''{0}''.
- src-attribute.1 = src-attribute.1: le propriet\u00E0 ''default'' e ''fixed'' non possono essere entrambi presenti nella dichiarazione di attributo ''{0}''. Utilizzarne solo una.
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2: errore per il gruppo di attributi "{0}". Sono specificati usi di attributi duplicati con lo stesso nome e spazio di nomi di destinazione. Il nome dell''uso dell''attributo duplicato \u00E8 "{1}".
- ag-props-correct.3 = ag-props-correct.3: errore per il gruppo di attributi "{0}". Due dichiarazioni di attributo, "{1}" e "{2}" hanno tipi derivati dall''ID.
- a-props-correct.2 = a-props-correct.2: valore di vincolo di valore "{1}" non valido nell''attributo "{0}".
-- a-props-correct.3 = a-props-correct.3: l''attributo ''{0}'' non pu\u00F2 utilizzare il valore ''fixed'' o ''default'' poich\u00E9 la ''{''type definition''}'' dell''attributo \u00E8 un ID o \u00E8 derivata dall''ID.
-- au-props-correct.2 = au-props-correct.2: nella dichiarazione di attributo di ''{0}'' \u00E8 stato specificato un valore fisso ''{1}''. Se, pertanto, l''uso dell''attributo che fa riferimento a ''{0}'' ha anche un valore ''{''value constraint''}'', deve essere fisso e il suo valore deve essere ''{1}''.
-+ a-props-correct.3 = a-props-correct.3: l''attributo ''{0}'' non pu\u00F2 utilizzare il valore ''fixed'' o ''default'' poich\u00E9 la '{'type definition'}' dell''attributo \u00E8 un ID o \u00E8 derivata dall''ID.
-+ au-props-correct.2 = au-props-correct.2: nella dichiarazione di attributo di ''{0}'' \u00E8 stato specificato un valore fisso ''{1}''. Se, pertanto, l''uso dell''attributo che fa riferimento a ''{0}'' ha anche un valore '{'value constraint'}', deve essere fisso e il suo valore deve essere ''{1}''.
- cos-all-limited.1.2 = cos-all-limited.1.2: deve apparire un gruppo di modelli 'all' in una parte con '{'min occurs'}' = '{'max occurs'}' = 1 e la parte deve far parte di una coppia che costituisca il '{'content type'}' di una definizione di tipo complesso.
-- cos-all-limited.2 = cos-all-limited.2: il valore ''{''max occurs''}'' di un elemento in un gruppo di modelli ''all'' deve essere 0 o 1. Il valore ''{0}'' per l''elemento ''{1}'' non \u00E8 valido.
-+ cos-all-limited.2 = cos-all-limited.2: il valore '{'max occurs'}' di un elemento in un gruppo di modelli ''all'' deve essere 0 o 1. Il valore ''{0}'' per l''elemento ''{1}'' non \u00E8 valido.
- cos-applicable-facets = cos-applicable-facets: facet ''{0}'' non consentito dal tipo {1}.
- cos-ct-extends.1.1 = cos-ct-extends.1.1: il tipo ''{0}'' \u00E8 stato derivato mediante estensione dal tipo ''{1}'', ma l''attributo "final" di ''{1}'' impedisce la derivazione mediante estensione.
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Il tipo di contenuto di un tipo derivato e quello della rispettiva base devono essere entrambi misti o di soli elementi. Il tipo ''{0}'' \u00E8 di soli elementi, mentre la rispettiva base non lo \u00E8.
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Il tipo di contenuto di un tipo derivato e quello della rispettiva base devono essere entrambi misti o di soli elementi. Il tipo ''{0}'' \u00E8 misto, mentre la rispettiva base non lo \u00E8.
- cos-element-consistent = cos-element-consistent: errore per il tipo "{0}". Nel gruppo di modelli appaiono pi\u00F9 elementi con nome "{1}" e tipi diversi.
- cos-list-of-atomic = cos-list-of-atomic: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 non \u00E8 indivisibile (''{1}'' \u00E8 un tipo di lista o un tipo di unione che contiene una lista).
-- cos-nonambig = cos-nonambig: {0} e {1} (o gli elementi derivanti dal gruppo di sostituzione) violano \"Unique Particle Attribution\". Durante la convalida su questo schema, si creerebbe un''ambiguit\u00E0 per le due parti.
-+ cos-nonambig = cos-nonambig: {0} e {1} (o gli elementi derivanti dal gruppo di sostituzione) violano "Unique Particle Attribution". Durante la convalida su questo schema, si creerebbe un''ambiguit\u00E0 per le due parti.
- cos-particle-restrict.a = cos-particle-restrict.a: la parte derivata \u00E8 vuota, mente la base non \u00E8 svuotabile.
- cos-particle-restrict.b = cos-particle-restrict.b: la parte della base \u00E8 vuota, mente la parte derivata non lo \u00E8.
- cos-particle-restrict.2 = cos-particle-restrict.2: limitazione di parte vietata: ''{0}''.
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: il tipo ''{1}'' \u00E8 indivisibile, quindi la ''{''base type definition''}'' "{0}" deve essere una definizione di tipo semplice indivisibile o un tipo di dati predefinito incorporato.
-- cos-st-restricts.2.1 = cos-st-restricts.2.1: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 \u00E8 un tipo di lista o un tipo di unione che contiene una lista).
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: il componente ''{''final''}'' di ''{''item type definition''}'' ''{0}'' contiene ''list'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di elemento per il tipo di lista ''{1}''.
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: il componente ''{''final''}'' di ''{''member type definitions''}'' ''{0}'' contiene ''union'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di membro per il tipo di unione ''{1}''.
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: il tipo ''{1}'' \u00E8 indivisibile, quindi la '{'base type definition'}' "{0}" deve essere una definizione di tipo semplice indivisibile o un tipo di dati predefinito incorporato.
-+ cos-st-restricts.2.1 = cos-st-restricts.2.1: nella definizione del tipo di lista ''{0}'', il tipo ''{1}'' non \u00E8 valido poich\u00E9 \u00E8 un tipo di lista o un tipo di unione che contiene una lista.
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: il componente '{'final'}' di '{'item type definition'}' ''{0}'' contiene ''list'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di elemento per il tipo di lista ''{1}''.
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: il componente '{'final'}' di '{'member type definitions'}' ''{0}'' contiene ''union'', pertanto ''{0}'' non pu\u00F2 essere utilizzato come tipo di membro per il tipo di unione ''{1}''.
- cos-valid-default.2.1 = cos-valid-default.2.1: l''elemento "{0}" ha un vincolo di valore e deve avere un modello di contenuto misto o semplice.
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: l''elemento ''{0}'' ha un ''{''value constraint''}'' e la rispettiva definizione del tipo contiene ''{''content type''}'' misto, quindi la parte di ''{''content type''}'' deve essere svuotabile.
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: l''elemento ''{0}'' ha un '{'value constraint'}' e la rispettiva definizione del tipo contiene '{'content type'}' misto, quindi la parte di '{'content type'}' deve essere svuotabile.
- c-props-correct.2 = c-props-correct.2: la cardinalit\u00E0 dei campi per il keyref "{0}" e per la chiave "{1}" deve corrispondere.
- ct-props-correct.3 = ct-props-correct.3: sono state rilevate definizioni circolari per il tipo complesso ''{0}''. Ci\u00F2 significa che ''{0}'' si trova all''interno della sua stessa gerarchia di tipi, il che \u00E8 errato.
- ct-props-correct.4 = ct-props-correct.4: errore per il tipo "{0}". Sono specificati usi di attributi duplicati con lo stesso nome e spazio di nomi di destinazione. Il nome dell''uso dell''attributo duplicato \u00E8 "{1}".
- ct-props-correct.5 = ct-props-correct.5: errore per il tipo "{0}". Due dichiarazioni di attributo, "{1}" e "{2}" hanno tipi derivati dall''ID.
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: il tipo ''{0}'' \u00E8 stato derivato mediante limitazione dal tipo ''{1}'', ma ''{1}'' ha una propriet\u00E0 ''{''final''}'' che impedisce la derivazione mediante limitazione.
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: il tipo ''{0}'' \u00E8 stato derivato mediante limitazione dal tipo ''{1}'', ma ''{1}'' ha una propriet\u00E0 '{'final'}' che impedisce la derivazione mediante limitazione.
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: errore per il tipo "{0}". Un uso dell''attributo ''{1}'' in questo tipo ha un valore "use" ''{2}'' che \u00E8 incoerente con il valore di ''required'' in un uso corrispondente dell''attributo nel tipo di base.
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.12: errore per il tipo "{0}". Un uso dell''attributo ''{1}'' in questo tipo ha un valore tipo ''{2}'' che \u00E8 stato derivato in modo valido da ''{3}'', ovvero dal tipo di uso corrispondente dell''attributo nel tipo di base.
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: errore per il tipo "{0}". L''uso dell''attributo ''{1}'' in questo tipo ha un vincolo di valore effettivo che \u00E8 fisso, mentre il vincolo di valore effettivo dell''uso dell''attributo corrispondente nel tipo di base \u00E8 fisso.
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation: il tipo NOTATION ''{0}'' utilizzato da {2} ''{1}'' deve avere un valore di facet di enumerazione che specifica gli elementi di notazione utilizzati da questo tipo.
- enumeration-valid-restriction = enumeration-valid-restriction: il valore di enumerazione "{0}" non \u00E8 nello spazio dei valori del tipo di base {1}.
- e-props-correct.2 = e-props-correct.2: valore di vincolo di valore "{1}" non valido nell''elemento "{0}".
-- e-props-correct.4 = e-props-correct.4: ''{''type definition''}'' dell''elemento "{0}" non \u00E8 stata derivata in modo valido da ''{''type definition''}'' di substitutionHead "{1}" o la propriet\u00E0 ''{''substitution group exclusions''}'' di ''{1}'' non consente questa derivazione.
-- e-props-correct.5 = e-props-correct.5: non deve esistere ''{''value constraint''}'' sull''elemento "{0}" perch\u00E9 ''{''type definition''}'' dell''elemento o ''{''content type''}'' di ''{''type definition''}'' \u00E8 un ID o \u00E8 derivato da un ID.
-+ e-props-correct.4 = e-props-correct.4: '{'type definition'}' dell''elemento "{0}" non \u00E8 stata derivata in modo valido da '{'type definition'}' di substitutionHead "{1}" o la propriet\u00E0 '{'substitution group exclusions'}' di ''{1}'' non consente questa derivazione.
-+ e-props-correct.5 = e-props-correct.5: non deve esistere '{'value constraint'}' sull''elemento "{0}" perch\u00E9 '{'type definition'}' dell''elemento o '{'content type'}' di '{'type definition'}' \u00E8 un ID o \u00E8 derivato da un ID.
- e-props-correct.6 = e-props-correct.6: gruppo di sostituzione circolare rilevato per l''elemento "{0}".
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: nella definizione di {2}, il valore ''{0}'' per il facet ''fractionDigits'' non \u00E8 valido. Deve essere <= rispetto al valore per ''fractionDigits'', impostato su ''{1}'' in uno dei tipi di predecessore.
- fractionDigits-totalDigits = fractionDigits-totalDigits: nella definizione di {2}, il valore ''{0}'' per il facet ''fractionDigits'' non \u00E8 valido. Il valore deve essere <= rispetto al valore per ''totalDigits'', impostato su ''{1}''.
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere >= minInclusive del tipo di base "{1}".
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: errore per il tipo ''{2}''. Il valore maxInclusive ="{0}" deve essere > minExclusive del tipo di base "{1}".
- maxLength-valid-restriction = maxLength-valid-restriction: nella definizione di {2}, il valore maxLength = "{0}" deve essere <= rispetto a quello del tipo di base "{1}".
-- mg-props-correct.2 = mg-props-correct.2: definizioni circolari rilevate per il gruppo ''{0}''. Se si seguono in maniera ricorsiva i valori ''{''term''}'' delle parti, se ne avr\u00E0 una il cui ''{''term''}'' \u00E8 il gruppo stesso.
-+ mg-props-correct.2 = mg-props-correct.2: definizioni circolari rilevate per il gruppo ''{0}''. Se si seguono in maniera ricorsiva i valori '{'term'}' delle parti, se ne avr\u00E0 una il cui '{'term'}' \u00E8 il gruppo stesso.
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: nella definizione di {2}, il valore minExclusive = ''{0}'' deve essere <= rispetto al valore maxExclusive = ''{1}''.
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: nella definizione di {2}, il valore minExclusive = ''{0}'' deve essere <= rispetto al valore maxInclusive = ''{1}''.
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: errore per il tipo ''{2}''. Il valore minExclusive ="{0}" deve essere >= minExclusive del tipo di base "{1}".
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: nella definizione di {2}, il valore minLength = ''{0}'' deve essere < rispetto al valore maxLength = ''{1}''.
- minLength-valid-restriction = minLength-valid-restriction: nella definizione di {2}, minLength = ''{0}'' deve essere >= rispetto a quello del tipo di base ''{1}''.
- no-xmlns = no-xmlns: il {'name'} di una dichiarazione di attributo non deve corrispondere a 'xmlns'.
-- no-xsi = no-xsi: il ''{''target namespace''}'' di una dichiarazione di attributo non deve corrispondere a "{0}".
-+ no-xsi = no-xsi: il '{'target namespace'}' di una dichiarazione di attributo non deve corrispondere a "{0}".
- p-props-correct.2.1 = p-props-correct.2.1: nella dichiarazione di ''{0}'', il valore di ''minOccurs'' \u00E8 ''{1}'', ma non deve essere maggiore del valore di ''maxOccurs'', che \u00E8 ''{2}''.
- rcase-MapAndSum.1 = rcase-MapAndSum.1: non esiste un mapping funzionale completo tra le parti.
- rcase-MapAndSum.2 = rcase-MapAndSum.2: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo di ricorrenza ({2},{3}) del gruppo di base.
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: alcuni elementi hanno nomi e spazi di nomi di destinazione che non sono uguali: l''elemento "{0}" nello spazio di nomi "{1}" e l''elemento "{2}" nello spazio di nomi "{3}".
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: errore per la parte il cui ''{''term''}'' \u00E8 la dichiarazione di elemento ''{0}''. Il valore ''{''nillable''}'' della dichiarazione di elemento \u00E8 impostato su true, ma la parte corrispondente nel tipo di base contiene una dichiarazione di elemento per la quale ''{''nillable''}'' \u00E8 impostato su false.
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: errore per la parte il cui ''{''term''}'' \u00E8 la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non \u00E8 una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: errore per la parte il cui '{'term'}' \u00E8 la dichiarazione di elemento ''{0}''. Il valore '{'nillable'}' della dichiarazione di elemento \u00E8 impostato su true, ma la parte corrispondente nel tipo di base contiene una dichiarazione di elemento per la quale '{'nillable'}' \u00E8 impostato su false.
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: errore per la parte il cui '{'term'}' \u00E8 la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non \u00E8 una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: l''elemento "{0}" non \u00E8 fisso, ma l''elemento corrispondente nel tipo di base \u00E8 fisso con il valore ''{1}''.
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: l''elemento "{0}" \u00E8 fisso con il valore ''{1}'', ma l''elemento corrispondente nel tipo di base \u00E8 fisso con il valore ''{2}''.
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: i vincoli di identit\u00E0 per l''elemento "{0}" non sono un subset di quelli nella base.
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: le sostituzioni non consentite per l''elemento "{0}" non sono un superset di quelle nella base.
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: il tipo "{1}" dell''elemento "{0}" non deriva dal tipo dell''elemento di base "{2}".
- rcase-NSCompat.1 = rcase-NSCompat.1: l''elemento "{0}" ha uno spazio di nomi "{1}" che non \u00E8 consentito dal carattere jolly nella base.
-- rcase-NSCompat.2 = rcase-NSCompat.2: errore per la parte il cui ''{''term''}'' \u00E8 la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non \u00E8 una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
-+ rcase-NSCompat.2 = rcase-NSCompat.2: errore per la parte il cui '{'term'}' \u00E8 la dichiarazione di elemento ''{0}''. L''intervallo di ricorrenza ({1},{2}) non \u00E8 una limitazione valida dell''intervallo ({3},{4}) della parte corrispondente nel tipo di base.
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: non esiste un mapping funzionale completo tra le parti.
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: l''intervallo di ricorrenza ({0},{1}) del gruppo non \u00E8 una limitazione valida dell''intervallo ({2},{3}) del carattere jolly di base.
- rcase-NSSubset.1 = rcase-NSSubset.1: il carattere jolly non \u00E8 un subset del carattere jolly corrispondente nella base.
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: uno schema non pu\u00F2 contenere due componenti globali con lo stesso nome; questo contiene due ricorrenze di "{0}".
- st-props-correct.2 = st-props-correct.2: sono state rilevate definizioni circolari per il tipo semplice ''{0}''. Ci\u00F2 significa che ''{0}'' si trova all''interno della sua stessa gerarchia di tipi, il che \u00E8 errato.
-- st-props-correct.3 = st-props-correct.3: errore per il tipo ''{0}''. Il valore di ''{''final''}'' per ''{''base type definition''}'', ''{1}'', impedisce la derivazione mediante limitazione.
-+ st-props-correct.3 = st-props-correct.3: errore per il tipo ''{0}''. Il valore di '{'final'}' per '{'base type definition'}', ''{1}'', impedisce la derivazione mediante limitazione.
- totalDigits-valid-restriction = totalDigits-valid-restriction: nella definizione di {2}, il valore ''{0}'' per il facet ''totalDigits'' non \u00E8 valido. Deve essere <= rispetto al valore per ''totalDigits'', impostato su ''{1}'' in uno dei tipi di predecessore.
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: nella definizione di {0}, il valore ''{1}'' per il facet ''whitespace'' non \u00E8 valido. Il valore per ''whitespace'' \u00E8 stato impostato su ''collapse'' in uno dei tipi di predecessore.
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: nella definizione di {0}, il valore ''preserve'' per il facet ''whitespace'' non \u00E8 valido. Il valore per ''whitespace'' \u00E8 stato impostato su ''replace'' in uno dei tipi di predecessore.
-@@ -309,7 +281,7 @@
- c-selector-xpath = c-selector-xpath: il valore del selettore = "{0}" non \u00E8 valido; gli XPath del selettore non possono contenere attributi.
- EmptyTargetNamespace = EmptyTargetNamespace: nel documento di schema ''{0}'' il valore dell''attributo ''targetNamespace'' non pu\u00F2 essere una stringa vuota.
- FacetValueFromBase = FacetValueFromBase: nella dichiarazione del tipo ''{0}'' il valore ''{1}'' del facet ''{2}'' deve provenire dallo spazio di valori del tipo di base ''{3}''.
-- FixedFacetValue = FixedFacetValue: nella definizione di {3}, il valore ''{1}'' per il facet ''{0}'' non \u00E8 valido. Il valore per ''{0}'' \u00E8 stato impostato su ''{2}'' in uno dei tipi di predecessore e ''{''fixed''}'' = true.
-+ FixedFacetValue = FixedFacetValue: nella definizione di {3}, il valore ''{1}'' per il facet ''{0}'' non \u00E8 valido. Il valore per ''{0}'' \u00E8 stato impostato su ''{2}'' in uno dei tipi di predecessore e '{'fixed'}' = true.
- InvalidRegex = InvalidRegex: il valore di pattern "{0}" non \u00E8 un''espressione regolare valida. Errore segnalato ''{1}'' nella colonna ''{2}''.
- maxOccurLimit = La configurazione corrente del parser non consente che un valore di attributo maxOccurs sia impostato su un valore maggiore del valore {0}.
- PublicSystemOnNotation = PublicSystemOnNotation: almeno uno tra ''public'' e ''system'' deve essere presente nell'elemento ''notation''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
- FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC(cvc-identity-constraint.4.2.1): \u8981\u7D20\"{0}\"\u306B\u5024\u306E\u306A\u3044\u30AD\u30FC\u304C\u3042\u308A\u307E\u3059\u3002
-- DuplicateField = \u30D5\u30A3\u30FC\u30EB\u30C9\"{0}\"\u306E\u30B9\u30B3\u30FC\u30D7\u5185\u3067\u4E00\u81F4\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-- DuplicateKey = \u8981\u7D20\"{1}\"\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u3067\u5BA3\u8A00\u3055\u308C\u305Fkey\u306E\u5024[{0}]\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-- DuplicateUnique = \u8981\u7D20\"{1}\"\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u3067\u5BA3\u8A00\u3055\u308C\u305Funique\u306E\u5024[{0}]\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-- FieldMultipleMatch = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30D5\u30A3\u30FC\u30EB\u30C9\"{0}\"\u304C\u30BB\u30EC\u30AF\u30BF\u306E\u30B9\u30B3\u30FC\u30D7\u5185\u306E\u8907\u6570\u306E\u5024\u3068\u4E00\u81F4\u3057\u3066\u3044\u307E\u3059\u3002\u30D5\u30A3\u30FC\u30EB\u30C9\u306Funique\u306E\u5024\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- FixedDiffersFromActual = \u3053\u306E\u8981\u7D20\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u3001\u30B9\u30AD\u30FC\u30DE\u5185\u306E\u8981\u7D20\u5BA3\u8A00\u3067\u306E\"fixed\"\u5C5E\u6027\u306E\u5024\u3068\u7570\u306A\u308A\u307E\u3059\u3002
-- KeyMatchesNillable = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC(cvc-identity-constraint.4.2.3): \u8981\u7D20\"{0}\"\u306B\u306F\u3001nillable\u304Ctrue\u3067\u3042\u308B\u8981\u7D20\u3068\u4E00\u81F4\u3059\u308B\u30AD\u30FC\u304C\u3042\u308A\u307E\u3059\u3002
-- KeyNotEnoughValues = \u8981\u7D20\"{0}\"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<key name=\"{1}\">\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ AbsentKeyValue = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC(cvc-identity-constraint.4.2.1): \u8981\u7D20"{0}"\u306B\u5024\u306E\u306A\u3044\u30AD\u30FC\u304C\u3042\u308A\u307E\u3059\u3002
-+ DuplicateField = \u30D5\u30A3\u30FC\u30EB\u30C9"{0}"\u306E\u30B9\u30B3\u30FC\u30D7\u5185\u3067\u4E00\u81F4\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-+ DuplicateKey = \u8981\u7D20"{1}"\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u3067\u5BA3\u8A00\u3055\u308C\u305Fkey\u306E\u5024[{0}]\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-+ DuplicateUnique = \u8981\u7D20"{1}"\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u3067\u5BA3\u8A00\u3055\u308C\u305Funique\u306E\u5024[{0}]\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
-+ FieldMultipleMatch = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30D5\u30A3\u30FC\u30EB\u30C9"{0}"\u304C\u30BB\u30EC\u30AF\u30BF\u306E\u30B9\u30B3\u30FC\u30D7\u5185\u306E\u8907\u6570\u306E\u5024\u3068\u4E00\u81F4\u3057\u3066\u3044\u307E\u3059\u3002\u30D5\u30A3\u30FC\u30EB\u30C9\u306Funique\u306E\u5024\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ FixedDiffersFromActual = \u3053\u306E\u8981\u7D20\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u306F\u3001\u30B9\u30AD\u30FC\u30DE\u5185\u306E\u8981\u7D20\u5BA3\u8A00\u3067\u306E"fixed"\u5C5E\u6027\u306E\u5024\u3068\u7570\u306A\u308A\u307E\u3059\u3002
-+ KeyMatchesNillable = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC(cvc-identity-constraint.4.2.3): \u8981\u7D20"{0}"\u306B\u306F\u3001nillable\u304Ctrue\u3067\u3042\u308B\u8981\u7D20\u3068\u4E00\u81F4\u3059\u308B\u30AD\u30FC\u304C\u3042\u308A\u307E\u3059\u3002
-+ KeyNotEnoughValues = \u8981\u7D20"{0}"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<key name="{1}">\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
- KeyNotFound = \u8981\u7D20''{2}''\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u3067\u3001\u5024''{1}''\u306E\u30AD\u30FC''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-- KeyRefNotEnoughValues = \u8981\u7D20\"{0}\"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<keyref name=\"{1}\">\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- KeyRefOutOfScope = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\"{0}\"\u306B\u3001\u30B9\u30B3\u30FC\u30D7\u5916\u306Ekey\u3084unique\u3092\u53C2\u7167\u3057\u3066\u3044\u308Bkeyref\u304C\u3042\u308A\u307E\u3059\u3002
-- KeyRefReferNotFound = \u30AD\u30FC\u53C2\u7167\u306E\u5BA3\u8A00\"{0}\"\u304C\u3001\"{1}\"\u3068\u3044\u3046\u540D\u524D\u306E\u4E0D\u660E\u306A\u30AD\u30FC\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002
-- UniqueNotEnoughValues = \u8981\u7D20\"{0}\"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<unique>\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- UnknownField = \u5185\u90E8\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30D5\u30A3\u30FC\u30EB\u30C9\"{0}\"\u304C\u4E0D\u660E\u3067\u3059\u3002
-+ KeyRefNotEnoughValues = \u8981\u7D20"{0}"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<keyref name="{1}">\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ KeyRefOutOfScope = \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04"{0}"\u306B\u3001\u30B9\u30B3\u30FC\u30D7\u5916\u306Ekey\u3084unique\u3092\u53C2\u7167\u3057\u3066\u3044\u308Bkeyref\u304C\u3042\u308A\u307E\u3059\u3002
-+ KeyRefReferNotFound = \u30AD\u30FC\u53C2\u7167\u306E\u5BA3\u8A00"{0}"\u304C\u3001"{1}"\u3068\u3044\u3046\u540D\u524D\u306E\u4E0D\u660E\u306A\u30AD\u30FC\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002
-+ UniqueNotEnoughValues = \u8981\u7D20"{0}"\u306B\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B<unique>\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306B\u3001\u5341\u5206\u306A\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ UnknownField = \u5185\u90E8\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u30A8\u30E9\u30FC: \u30D5\u30A3\u30FC\u30EB\u30C9"{0}"\u304C\u4E0D\u660E\u3067\u3059\u3002
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u3001\u305D\u306E\u30BF\u30A4\u30D7''{3}''\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002
-- cvc-attribute.4 = cvc-attribute.4: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u3001\u56FA\u5B9A\u306E''{''value constraint''}''\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002\u5C5E\u6027\u306E\u5024\u306F''{3}''\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ cvc-attribute.4 = cvc-attribute.4: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u3001\u56FA\u5B9A\u306E'{'value constraint'}'\u306B\u5BFE\u3057\u3066\u7121\u52B9\u3067\u3059\u3002\u5C5E\u6027\u306E\u5024\u306F''{3}''\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- cvc-complex-type.2.1 = cvc-complex-type.2.1: \u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u304C\u7A7A\u767D\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B\u306F\u6587\u5B57\u3084\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
- cvc-complex-type.2.2 = cvc-complex-type.2.2: \u8981\u7D20''{0}''\u306F\u8981\u7D20[children]\u3092\u542B\u307E\u305A\u3001\u6709\u52B9\u306A\u5024\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- cvc-complex-type.2.3 = cvc-complex-type.2.3: \u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u304C\u8981\u7D20\u306E\u307F\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B\u306F\u6587\u5B57[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: \u8981\u7D20''{0}''\u306B\u5C5E\u6027''{1}''\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- cvc-complex-type.4 = cvc-complex-type.4: \u8981\u7D20''{0}''\u306B\u5C5E\u6027''{1}''\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- cvc-complex-type.5.1 = cvc-complex-type.5.1: \u8981\u7D20''{0}''\u3067\u306F\u5C5E\u6027''{1}''\u304CWild ID\u3067\u3059\u304C\u3001\u3059\u3067\u306BWild ID ''{2}''\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002\u8A31\u53EF\u3055\u308C\u308BWild ID\u306F1\u3064\u306E\u307F\u3067\u3059\u3002
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: \u8981\u7D20''{0}''\u3067\u306F\u5C5E\u6027''{1}''\u304CWild ID\u3067\u3059\u304C\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u5C5E\u6027''{2}''\u304C''{''attribute uses''}''\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: \u8981\u7D20''{0}''\u3067\u306F\u5C5E\u6027''{1}''\u304CWild ID\u3067\u3059\u304C\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u5C5E\u6027''{2}''\u304C'{'attribute uses'}'\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}''\u306F''{1}''\u306E\u6709\u52B9\u306A\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}''\u306F\u5171\u7528\u4F53\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cvc-elt.1 = cvc-elt.1: \u8981\u7D20''{0}''\u306E\u5BA3\u8A00\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-- cvc-elt.2 = cvc-elt.2: ''{0}''\u306B\u5BFE\u3059\u308B\u8981\u7D20\u5BA3\u8A00\u306E\u5024''{''abstract''}''\u306F\u3001false\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- cvc-elt.3.1 = cvc-elt.3.1: \u5C5E\u6027''{1}''\u306F\u8981\u7D20''{0}''\u306B\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u3001''{''nillable''}''\u30D7\u30ED\u30D1\u30C6\u30A3(''{0}'')\u304Cfalse\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-+ cvc-elt.2 = cvc-elt.2: ''{0}''\u306B\u5BFE\u3059\u308B\u8981\u7D20\u5BA3\u8A00\u306E\u5024'{'abstract'}'\u306F\u3001false\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ cvc-elt.3.1 = cvc-elt.3.1: \u5C5E\u6027''{1}''\u306F\u8981\u7D20''{0}''\u306B\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u3001'{'nillable'}'\u30D7\u30ED\u30D1\u30C6\u30A3(''{0}'')\u304Cfalse\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
- cvc-elt.3.2.1 = cvc-elt.3.2.1: ''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B\u306F\u6587\u5B57\u3084\u8981\u7D20\u60C5\u5831[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: \u56FA\u5B9A\u306E''{''value constraint''}''\u3092\u8981\u7D20''{0}''\u306B\u5BFE\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: \u56FA\u5B9A\u306E'{'value constraint'}'\u3092\u8981\u7D20''{0}''\u306B\u5BFE\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- cvc-elt.4.1 = cvc-elt.4.1: \u8981\u7D20''{0}''\u306E\u5C5E\u6027''{1}''\u306E\u5024''{2}''\u306F\u6709\u52B9\u306AQName\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cvc-elt.4.2 = cvc-elt.4.2: ''{1}''\u3092\u8981\u7D20''{0}''\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306B\u89E3\u6C7A\u3067\u304D\u307E\u305B\u3093\u3002
- cvc-elt.4.3 = cvc-elt.4.3: \u30BF\u30A4\u30D7''{1}''\u306F\u3001\u8981\u7D20''{0}''\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9''{2}''\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{''value constraint''}'' ''{2}''(\u8981\u7D20''{0}'')\u306F\u3001\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'value constraint'}' ''{2}''(\u8981\u7D20''{0}'')\u306F\u3001\u30BF\u30A4\u30D7''{1}''\u306E\u6709\u52B9\u306A\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: \u8981\u7D20''{0}''\u306B\u306F\u8981\u7D20\u60C5\u5831\u30A2\u30A4\u30C6\u30E0[children]\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u304C\u3001\u56FA\u5B9A\u306E''{''value constraint''}''\u5024''{2}''\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u304C\u3001''{''value constraint''}''\u5024''{2}''\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u304C\u3001\u56FA\u5B9A\u306E'{'value constraint'}'\u5024''{2}''\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u8981\u7D20''{0}''\u306E\u5024''{1}''\u304C\u3001'{'value constraint'}'\u5024''{2}''\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
- cvc-enumeration-valid = cvc-enumeration-valid: \u5024''{0}''\u306F\u3001\u5217\u6319''{1}''\u306B\u5BFE\u3057\u3066\u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5217\u6319\u304B\u3089\u306E\u5024\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: \u5024''{0}''\u306E\u5C0F\u6570\u306E\u6841\u6570\u306F{1}\u3067\u3059\u304C\u3001\u5C0F\u6570\u306E\u6841\u6570\u306F{2}\u306B\u5236\u9650\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- cvc-id.1 = cvc-id.1: IDREF ''{0}''\u306EID/IDREF\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: accessExternalSchema\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\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
- schema_reference.4 = schema_reference.4: 1)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u304C\u898B\u3064\u304B\u3089\u306A\u304B\u3063\u305F\u30012)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u53D6\u308C\u306A\u304B\u3063\u305F\u30013)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30EB\u30FC\u30C8\u8981\u7D20\u304C<xsd:schema>\u3067\u306F\u306A\u304B\u3063\u305F\u305F\u3081\u3001\u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u306E\u8AAD\u53D6\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
- src-annotation = src-annotation: <annotation>\u8981\u7D20\u306B\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u308B\u306E\u306F<appinfo>\u8981\u7D20\u304A\u3088\u3073<documentation>\u8981\u7D20\u306E\u307F\u3067\u3059\u304C\u3001''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
- src-attribute.1 = src-attribute.1: ''default''\u3068''fixed''\u306E\u4E21\u65B9\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u5C5E\u6027\u5BA3\u8A00''{0}''\u306B\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3044\u305A\u308C\u304B\u4E00\u65B9\u306E\u307F\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2: \u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u540C\u3058\u540D\u524D\u304A\u3088\u3073\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u6301\u3064\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u540D\u524D\u306F''{1}''\u3067\u3059\u3002
- ag-props-correct.3 = ag-props-correct.3: \u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u30022\u3064\u306E\u5C5E\u6027\u5BA3\u8A00''{1}''\u3068''{2}''\u306BID\u304B\u3089\u5C0E\u51FA\u3057\u305F\u30BF\u30A4\u30D7\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
- a-props-correct.2 = a-props-correct.2: \u5C5E\u6027''{0}''\u306E\u5024\u5236\u7D04\u306E\u5024''{1}''\u304C\u7121\u52B9\u3067\u3059\u3002
-- a-props-correct.3 = a-props-correct.3: \u5C5E\u6027''{0}''\u3067\u306F''fixed''\u3082''default''\u3082\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u3001\u5C5E\u6027\u306E''{''type definition''}''\u304CID\u3067\u3042\u308B\u304B\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-- au-props-correct.2 = au-props-correct.2: ''{0}''\u306E\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\u56FA\u5B9A\u5024''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305D\u306E\u305F\u3081\u3001''{0}''\u3092\u53C2\u7167\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306B''{''value constraint''}''\u3082\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u305D\u308C\u3092\u56FA\u5B9A\u3057\u3001\u305D\u306E\u5024\u3092''{1}''\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ a-props-correct.3 = a-props-correct.3: \u5C5E\u6027''{0}''\u3067\u306F''fixed''\u3082''default''\u3082\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u3001\u5C5E\u6027\u306E'{'type definition'}'\u304CID\u3067\u3042\u308B\u304B\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-+ au-props-correct.2 = au-props-correct.2: ''{0}''\u306E\u5C5E\u6027\u5BA3\u8A00\u3067\u306F\u3001\u56FA\u5B9A\u5024''{1}''\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305D\u306E\u305F\u3081\u3001''{0}''\u3092\u53C2\u7167\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306B'{'value constraint'}'\u3082\u542B\u307E\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u305D\u308C\u3092\u56FA\u5B9A\u3057\u3001\u305D\u306E\u5024\u3092''{1}''\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- cos-all-limited.1.2 = cos-all-limited.1.2: 'all'\u306E\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306F'{'min occurs'}' = '{'max occurs'}' = 1\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u542B\u307E\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u3001\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u8907\u5408\u578B\u5B9A\u7FA9\u306E'{'content type'}'\u3092\u69CB\u6210\u3059\u308B1\u7D44\u306E\u4E00\u90E8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- cos-all-limited.2 = cos-all-limited.2: ''all''\u306E\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u8981\u7D20\u306E''{''max occurs''}''\u306F0\u304B1\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u8981\u7D20''{1}''\u306E\u5024''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002
-+ cos-all-limited.2 = cos-all-limited.2: ''all''\u306E\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u8981\u7D20\u306E'{'max occurs'}'\u306F0\u304B1\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u8981\u7D20''{1}''\u306E\u5024''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002
- cos-applicable-facets = cos-applicable-facets: \u30BF\u30A4\u30D7{1}\u306B\u30D5\u30A1\u30BB\u30C3\u30C8''{0}''\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
- cos-ct-extends.1.1 = cos-ct-extends.1.1: \u30BF\u30A4\u30D7''{0}''\u306F\u30BF\u30A4\u30D7''{1}''\u306E\u62E1\u5F35\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3059\u3002\u305F\u3060\u3057\u3001''{1}''\u306E''final''\u5C5E\u6027\u306B\u3088\u3063\u3066\u3001\u62E1\u5F35\u306B\u3088\u308B\u5C0E\u51FA\u304C\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \u5C0E\u51FA\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u3068\u305D\u306E\u30D9\u30FC\u30B9\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u306F\u4E21\u65B9\u3068\u3082\u6DF7\u5408\u578B\u306B\u3059\u308B\u304B\u3001\u8981\u7D20\u306E\u307F\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7''{0}''\u306F\u8981\u7D20\u306E\u307F\u3067\u3059\u304C\u3001\u305D\u306E\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306F\u8981\u7D20\u306E\u307F\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \u5C0E\u51FA\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u3068\u305D\u306E\u30D9\u30FC\u30B9\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30BF\u30A4\u30D7\u306F\u4E21\u65B9\u3068\u3082\u6DF7\u5408\u578B\u306B\u3059\u308B\u304B\u3001\u8981\u7D20\u306E\u307F\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30BF\u30A4\u30D7''{0}''\u306F\u6DF7\u5408\u578B\u3067\u3059\u304C\u3001\u305D\u306E\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306F\u6DF7\u5408\u578B\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cos-element-consistent = cos-element-consistent: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002''{1}''\u3068\u3044\u3046\u540D\u524D\u306E\u7570\u306A\u308B\u30BF\u30A4\u30D7\u306E\u8907\u6570\u306E\u8981\u7D20\u304C\u30E2\u30C7\u30EB\u30FB\u30B0\u30EB\u30FC\u30D7\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
- cos-list-of-atomic = cos-list-of-atomic: \u30BF\u30A4\u30D7''{1}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u3067\u306F\u306A\u3044\u305F\u3081(''{1}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7\u304B\u3001\u30EA\u30B9\u30C8\u3092\u542B\u3080\u5171\u7528\u4F53\u30BF\u30A4\u30D7\u3067\u3042\u308B\u305F\u3081)\u3001\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{0}''\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u306A\u30EA\u30B9\u30C8\u8981\u7D20\u30BF\u30A4\u30D7\u3067\u3059\u3002
-- cos-nonambig = cos-nonambig: {0}\u3068{1} (\u307E\u305F\u306F\u7F6E\u63DB\u30B0\u30EB\u30FC\u30D7\u306E\u8981\u7D20)\u304C\"Unique Particle Attribution\"\u306B\u9055\u53CD\u3057\u3066\u3044\u307E\u3059\u3002\u3053\u306E\u30B9\u30AD\u30FC\u30DE\u306B\u5BFE\u3059\u308B\u691C\u8A3C\u6642\u306B\u3001\u3053\u308C\u30892\u3064\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u3042\u3044\u307E\u3044\u3055\u304C\u751F\u3058\u308B\u3068\u8003\u3048\u3089\u308C\u307E\u3059\u3002
-+ cos-nonambig = cos-nonambig: {0}\u3068{1} (\u307E\u305F\u306F\u7F6E\u63DB\u30B0\u30EB\u30FC\u30D7\u306E\u8981\u7D20)\u304C"Unique Particle Attribution"\u306B\u9055\u53CD\u3057\u3066\u3044\u307E\u3059\u3002\u3053\u306E\u30B9\u30AD\u30FC\u30DE\u306B\u5BFE\u3059\u308B\u691C\u8A3C\u6642\u306B\u3001\u3053\u308C\u30892\u3064\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u3042\u3044\u307E\u3044\u3055\u304C\u751F\u3058\u308B\u3068\u8003\u3048\u3089\u308C\u307E\u3059\u3002
- cos-particle-restrict.a = cos-particle-restrict.a: \u5C0E\u51FA\u3055\u308C\u305F\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u304C\u7A7A\u3067\u3042\u308A\u3001\u30D9\u30FC\u30B9\u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002
- cos-particle-restrict.b = cos-particle-restrict.b: \u30D9\u30FC\u30B9\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u3067\u3059\u304C\u3001\u5C0E\u51FA\u3055\u308C\u305F\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- cos-particle-restrict.2 = cos-particle-restrict.2: \u7981\u6B62\u3055\u308C\u305F\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u5236\u9650: ''{0}''\u3002
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: \u30BF\u30A4\u30D7''{1}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u3067\u3042\u308B\u305F\u3081\u3001\u305D\u306E''{''base type definition''}'' ''{0}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u306E\u5358\u7D14\u578B\u5B9A\u7FA9\u304B\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u306E\u7D44\u8FBC\u307F\u30C7\u30FC\u30BF\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: \u30BF\u30A4\u30D7''{1}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u3067\u3042\u308B\u305F\u3081\u3001\u305D\u306E'{'base type definition'}' ''{0}''\u306F\u30A2\u30C8\u30DF\u30C3\u30AF\u306E\u5358\u7D14\u578B\u5B9A\u7FA9\u304B\u30D7\u30EA\u30DF\u30C6\u30A3\u30D6\u306E\u7D44\u8FBC\u307F\u30C7\u30FC\u30BF\u578B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- cos-st-restricts.2.1 = cos-st-restricts.2.1: \u30BF\u30A4\u30D7''{1}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7\u304B\u3001\u30EA\u30B9\u30C8\u3092\u542B\u3080\u5171\u7528\u4F53\u30BF\u30A4\u30D7\u3067\u3042\u308B\u305F\u3081\u3001\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{0}''\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0\u30FB\u30BF\u30A4\u30D7\u3067\u3059\u3002
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: ''{''item type definition''}'' ''{0}''\u306E''{''final''}''\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u3001''list''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u3064\u307E\u308A\u3001''{0}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u30A2\u30A4\u30C6\u30E0\u30FB\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: ''{''member type definitions''}'' ''{0}''\u306E''{''final''}''\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u3001''union''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u3064\u307E\u308A\u3001''{0}''\u306F\u5171\u7528\u4F53\u30BF\u30A4\u30D7''{1}''\u306E\u30E1\u30F3\u30D0\u30FC\u30FB\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' ''{0}''\u306E'{'final'}'\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u3001''list''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u3064\u307E\u308A\u3001''{0}''\u306F\u30EA\u30B9\u30C8\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u30A2\u30A4\u30C6\u30E0\u30FB\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}''\u306E'{'final'}'\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u3001''union''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u3064\u307E\u308A\u3001''{0}''\u306F\u5171\u7528\u4F53\u30BF\u30A4\u30D7''{1}''\u306E\u30E1\u30F3\u30D0\u30FC\u30FB\u30BF\u30A4\u30D7\u3068\u3057\u3066\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
- cos-valid-default.2.1 = cos-valid-default.2.1: \u8981\u7D20''{0}''\u306B\u306F\u5024\u5236\u7D04\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u6DF7\u5408\u307E\u305F\u306F\u5358\u7D14\u30B3\u30F3\u30C6\u30F3\u30C4\u30FB\u30E2\u30C7\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u8981\u7D20''{0}''\u306B\u306F''{''value constraint''}''\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u305D\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306B\u306F\u6DF7\u5408''{''content type''}''\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u3001''{''content type''}''\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u306B\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u8981\u7D20''{0}''\u306B\u306F'{'value constraint'}'\u304C\u542B\u307E\u308C\u3066\u304A\u308A\u3001\u305D\u306E\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306B\u306F\u6DF7\u5408'{'content type'}'\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u3001'{'content type'}'\u306E\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306F\u7A7A\u306B\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- c-props-correct.2 = c-props-correct.2: keyref ''{0}''\u3068key ''{1}''\u306B\u5BFE\u3059\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30AB\u30FC\u30C7\u30A3\u30CA\u30EA\u30C6\u30A3\u304C\u76F8\u4E92\u306B\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- ct-props-correct.3 = ct-props-correct.3: \u8907\u5408\u578B''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3064\u307E\u308A\u3001''{0}''\u304C\u305D\u308C\u81EA\u4F53\u306E\u30BF\u30A4\u30D7\u968E\u5C64\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u30A8\u30E9\u30FC\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
- ct-props-correct.4 = ct-props-correct.4: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u540C\u3058\u540D\u524D\u304A\u3088\u3073\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u6301\u3064\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u91CD\u8907\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u540D\u524D\u306F''{1}''\u3067\u3059\u3002
- ct-props-correct.5 = ct-props-correct.5: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u30022\u3064\u306E\u5C5E\u6027\u5BA3\u8A00''{1}''\u3068''{2}''\u306BID\u304B\u3089\u5C0E\u51FA\u3057\u305F\u30BF\u30A4\u30D7\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: \u30BF\u30A4\u30D7''{0}''\u306F\u30BF\u30A4\u30D7''{1}''\u306E\u5236\u9650\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3059\u3002\u305F\u3060\u3057\u3001''{1}''\u306E''{''final''}''\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u3088\u3063\u3066\u3001\u5236\u9650\u306B\u3088\u308B\u5C0E\u51FA\u304C\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: \u30BF\u30A4\u30D7''{0}''\u306F\u30BF\u30A4\u30D7''{1}''\u306E\u5236\u9650\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3059\u3002\u305F\u3060\u3057\u3001''{1}''\u306E'{'final'}'\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u3088\u3063\u3066\u3001\u5236\u9650\u306B\u3088\u308B\u5C0E\u51FA\u304C\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u5024''required''\u3068\u4E00\u8CAB\u6027\u304C\u306A\u3044''{2}''\u306E''use''\u5024\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u30BF\u30A4\u30D7''{3}''\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306F\u306A\u3044\u30BF\u30A4\u30D7''{2}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5C5E\u6027\u4F7F\u7528''{1}''\u306B\u306F\u3001\u56FA\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u6709\u52B9\u306A\u5024\u5236\u7D04\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u5C5E\u6027\u4F7F\u7528\u306E\u6709\u52B9\u306A\u5024\u5236\u7D04\u306F\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation: {2} ''{1}''\u3067\u4F7F\u7528\u3055\u308C\u308BNOTATION\u30BF\u30A4\u30D7''{0}''\u306B\u306F\u3001\u3053\u306E\u30BF\u30A4\u30D7\u3067\u4F7F\u7528\u3055\u308C\u308B\u8868\u8A18\u6CD5\u8981\u7D20\u3092\u6307\u5B9A\u3059\u308B\u5217\u6319\u30D5\u30A1\u30BB\u30C3\u30C8\u5024\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- enumeration-valid-restriction = enumeration-valid-restriction: \u5217\u6319\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5024\u7A7A\u9593{1}\u306B\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
- e-props-correct.2 = e-props-correct.2: \u8981\u7D20''{0}''\u306E\u5024\u5236\u7D04\u306E\u5024''{1}''\u304C\u7121\u52B9\u3067\u3059\u3002
-- e-props-correct.4 = e-props-correct.4: \u8981\u7D20''{0}''\u306E''{''type definition''}''\u304CsubstitutionHead ''{1}''\u306E''{''type definition''}''\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306A\u3044\u304B\u3001''{1}''\u306E''{''substitution group exclusions''}''\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u3053\u306E\u5C0E\u51FA\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-- e-props-correct.5 = e-props-correct.5: \u8981\u7D20\u306E''{''type definition''}''\u307E\u305F\u306F''{''type definition''}''\u306E''{''content type''}''\u306FID\u3067\u3042\u308B\u304B\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B''{''value constraint''}''\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-+ e-props-correct.4 = e-props-correct.4: \u8981\u7D20''{0}''\u306E'{'type definition'}'\u304CsubstitutionHead ''{1}''\u306E'{'type definition'}'\u304B\u3089\u6B63\u5E38\u306B\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306A\u3044\u304B\u3001''{1}''\u306E'{'substitution group exclusions'}'\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u3053\u306E\u5C0E\u51FA\u304C\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+ e-props-correct.5 = e-props-correct.5: \u8981\u7D20\u306E'{'type definition'}'\u307E\u305F\u306F'{'type definition'}'\u306E'{'content type'}'\u306FID\u3067\u3042\u308B\u304B\u3001ID\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B\u305F\u3081\u3001\u8981\u7D20''{0}''\u306B'{'value constraint'}'\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- e-props-correct.6 = e-props-correct.6: \u8981\u7D20''{0}''\u3067\u5FAA\u74B0\u7F6E\u63DB\u30B0\u30EB\u30FC\u30D7\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: \u30D5\u30A1\u30BB\u30C3\u30C8''fractionDigits''\u306E\u5024''{0}''\u306F\u3001\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B''fractionDigits''\u306E\u5024\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B\u305F\u3081\u3001{2}\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
- fractionDigits-totalDigits = fractionDigits-totalDigits: \u30D5\u30A1\u30BB\u30C3\u30C8''fractionDigits''\u306E\u5024''{0}''\u306F\u3001''totalDigits''\u306E\u5024''{1}''\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B\u305F\u3081\u3001{2}\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminInclusive\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002maxInclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminExclusive\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- maxLength-valid-restriction = maxLength-valid-restriction: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001maxLength\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u5024\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- mg-props-correct.2 = mg-props-correct.2: \u30B0\u30EB\u30FC\u30D7''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E''{''term''}''\u5024\u3092\u518D\u5E30\u7684\u306B\u305F\u3069\u308B\u3068\u3001''{''term''}''\u304C\u30B0\u30EB\u30FC\u30D7\u81EA\u4F53\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u9054\u3057\u307E\u3059\u3002
-+ mg-props-correct.2 = mg-props-correct.2: \u30B0\u30EB\u30FC\u30D7''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E'{'term'}'\u5024\u3092\u518D\u5E30\u7684\u306B\u305F\u3069\u308B\u3068\u3001'{'term'}'\u304C\u30B0\u30EB\u30FC\u30D7\u81EA\u4F53\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u9054\u3057\u307E\u3059\u3002
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minExclusive\u306E\u5024''{0}''\u306FmaxExclusive\u306E\u5024''{1}''\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minExclusive\u306E\u5024''{0}''\u306FmaxInclusive\u306E\u5024''{1}''\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: \u30BF\u30A4\u30D7''{2}''\u306E\u30A8\u30E9\u30FC\u3002minExclusive\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306EminExclusive\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minLength\u306E\u5024''{0}''\u306FmaxLength\u306E\u5024''{1}''\u3088\u308A\u5C0F\u3055\u304F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- minLength-valid-restriction = minLength-valid-restriction: {2}\u306E\u5B9A\u7FA9\u3067\u306F\u3001minLength\u306E\u5024''{0}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{1}''\u306E\u5024\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
- no-xmlns = no-xmlns: \u5C5E\u6027\u5BA3\u8A00\u306E{name}\u3092'xmlns'\u3068\u540C\u4E00\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-- no-xsi = no-xsi: \u5C5E\u6027\u5BA3\u8A00\u306E''{''target namespace''}''\u3092''{0}''\u3068\u540C\u4E00\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-+ no-xsi = no-xsi: \u5C5E\u6027\u5BA3\u8A00\u306E'{'target namespace'}'\u3092''{0}''\u3068\u540C\u4E00\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- p-props-correct.2.1 = p-props-correct.2.1: ''{0}''\u306E\u5BA3\u8A00\u3067\u306F\u3001''minOccurs''\u306E\u5024\u306F''{1}''\u3067\u3059\u304C\u3001''maxOccurs''\u306E\u5024''{2}''\u3088\u308A\u5927\u304D\u304F\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- rcase-MapAndSum.1 = rcase-MapAndSum.1: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-MapAndSum.2 = rcase-MapAndSum.2: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u30FB\u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \u8981\u7D20\u306B\u7570\u306A\u308B\u540D\u524D\u3084\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u542B\u307E\u308C\u307E\u3059: \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{1}''\u306E\u8981\u7D20''{0}''\u304A\u3088\u3073\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{3}''\u306E\u8981\u7D20''{2}''\u3067\u3059\u3002
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: ''{''term''}''\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u8981\u7D20\u5BA3\u8A00\u306E''{''nillable''}''\u306Ftrue\u3067\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u306F''{''nillable''}''\u304Cfalse\u306E\u8981\u7D20\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: ''{''term''}''\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u51FA\u73FE\u7BC4\u56F2({1},{2})\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u7BC4\u56F2({3},{4}\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: '{'term'}'\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u8981\u7D20\u5BA3\u8A00\u306E'{'nillable'}'\u306Ftrue\u3067\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306B\u306F'{'nillable'}'\u304Cfalse\u306E\u8981\u7D20\u5BA3\u8A00\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: '{'term'}'\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u51FA\u73FE\u7BC4\u56F2({1},{2})\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u7BC4\u56F2({3},{4}\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: \u8981\u7D20''{0}''\u306F\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u8981\u7D20\u306F\u5024''{1}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: \u8981\u7D20''{0}''\u306F\u5024''{1}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u8981\u7D20\u306F\u5024''{2}''\u3067\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: \u8981\u7D20''{0}''\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u304C\u30D9\u30FC\u30B9\u306E\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u5236\u7D04\u306E\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: \u8981\u7D20''{0}''\u306Edisallowed substitutions\u306F\u30D9\u30FC\u30B9\u306Edisallowed substitutions\u306E\u30B9\u30FC\u30D1\u30FC\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: \u8981\u7D20''{0}''\u306E\u30BF\u30A4\u30D7''{1}''\u306F\u3001\u30D9\u30FC\u30B9\u8981\u7D20\u306E\u30BF\u30A4\u30D7''{2}''\u304B\u3089\u5C0E\u51FA\u3055\u308C\u305F\u3082\u306E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NSCompat.1 = rcase-NSCompat.1: \u8981\u7D20''{0}''\u306B\u3001\u30D9\u30FC\u30B9\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u3067\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9''{1}''\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-- rcase-NSCompat.2 = rcase-NSCompat.2: ''{''term''}''\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u51FA\u73FE\u7BC4\u56F2({1},{2})\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u7BC4\u56F2({3},{4}\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-+ rcase-NSCompat.2 = rcase-NSCompat.2: '{'term'}'\u304C\u8981\u7D20\u5BA3\u8A00''{0}''\u3067\u3042\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u30A8\u30E9\u30FC\u3002\u51FA\u73FE\u7BC4\u56F2({1},{2})\u306F\u3001\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u5BFE\u5FDC\u3059\u308B\u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u306E\u7BC4\u56F2({3},{4}\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \u30D1\u30FC\u30C6\u30A3\u30AF\u30EB\u9593\u306B\u5B8C\u5168\u306A\u6A5F\u80FD\u30DE\u30C3\u30D4\u30F3\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \u30B0\u30EB\u30FC\u30D7\u306E\u51FA\u73FE\u7BC4\u56F2({0},{1})\u304C\u30D9\u30FC\u30B9\u306E\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u7BC4\u56F2({2},{3})\u306E\u6709\u52B9\u306A\u5236\u9650\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- rcase-NSSubset.1 = rcase-NSSubset.1: \u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u304C\u3001\u30D9\u30FC\u30B9\u306E\u5BFE\u5FDC\u3059\u308B\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306E\u30B5\u30D6\u30BB\u30C3\u30C8\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: \u30B9\u30AD\u30FC\u30DE\u306B\u306F\u540C\u3058\u540D\u524D\u3092\u6301\u30642\u3064\u306E\u30B0\u30ED\u30FC\u30D0\u30EB\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u30B9\u30AD\u30FC\u30DE\u306B\u306F''{0}''\u304C2\u3064\u3042\u308A\u307E\u3059\u3002
- st-props-correct.2 = st-props-correct.2: \u5358\u7D14\u578B''{0}''\u3067\u5FAA\u74B0\u5B9A\u7FA9\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u3064\u307E\u308A\u3001''{0}''\u304C\u305D\u308C\u81EA\u4F53\u306E\u30BF\u30A4\u30D7\u968E\u5C64\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u305F\u3081\u30A8\u30E9\u30FC\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-- st-props-correct.3 = st-props-correct.3: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002''{''base type definition''}''\u306E''{''final''}''\u306E\u5024''{1}''\u306F\u3001\u5236\u9650\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3092\u7981\u6B62\u3057\u3066\u3044\u307E\u3059\u3002
-+ st-props-correct.3 = st-props-correct.3: \u30BF\u30A4\u30D7''{0}''\u306E\u30A8\u30E9\u30FC\u3002'{'base type definition'}'\u306E'{'final'}'\u306E\u5024''{1}''\u306F\u3001\u5236\u9650\u306B\u3088\u3063\u3066\u5C0E\u51FA\u3092\u7981\u6B62\u3057\u3066\u3044\u307E\u3059\u3002
- totalDigits-valid-restriction = totalDigits-valid-restriction: \u30D5\u30A1\u30BB\u30C3\u30C8''totalDigits''\u306E\u5024''{0}''\u306F\u3001\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B''totalDigits''\u306E\u5024\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B\u305F\u3081\u3001{2}\u306E\u5B9A\u7FA9\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: \u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''whitespace''\u306E\u5024\u304C''collapse''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001{0}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''whitespace''\u306E\u5024''{1}''\u306F\u7121\u52B9\u3067\u3059\u3002
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: \u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''whitespace''\u306E\u5024\u304C''replace''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001{0}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''whitespace''\u306E\u5024''preserve''\u306F\u7121\u52B9\u3067\u3059\u3002
-@@ -309,7 +281,7 @@
- c-selector-xpath = c-selector-xpath: selector\u306E\u5024''{0}''\u306F\u7121\u52B9\u3067\u3059\u3002selector\u306EXPath\u306B\u306F\u5C5E\u6027\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- EmptyTargetNamespace = EmptyTargetNamespace: \u30B9\u30AD\u30FC\u30DE\u30FB\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8''{0}''\u3067\u306F\u3001''targetNamespace''\u5C5E\u6027\u306E\u5024\u3092\u7A7A\u306E\u6587\u5B57\u5217\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
- FacetValueFromBase = FacetValueFromBase: \u30BF\u30A4\u30D7''{0}''\u306E\u5BA3\u8A00\u3067\u306F\u3001\u30D5\u30A1\u30BB\u30C3\u30C8''{2}''\u306E\u5024''{1}''\u306F\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7''{3}''\u306E\u5024\u7A7A\u9593\u304B\u3089\u306E\u3082\u306E\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-- FixedFacetValue = FixedFacetValue: {3}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''{0}''\u306E\u5024''{1}''\u306F\u7121\u52B9\u3067\u3059\u3002\u3053\u308C\u306F\u3001''{0}''\u306E\u5024\u304C\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{2}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u304A\u308A\u3001''{''fixed''}'' = true\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
-+ FixedFacetValue = FixedFacetValue: {3}\u306E\u5B9A\u7FA9\u3067\u306F\u30D5\u30A1\u30BB\u30C3\u30C8''{0}''\u306E\u5024''{1}''\u306F\u7121\u52B9\u3067\u3059\u3002\u3053\u308C\u306F\u3001''{0}''\u306E\u5024\u304C\u7956\u5148\u30BF\u30A4\u30D7\u306E\u3044\u305A\u308C\u304B\u3067''{2}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u304A\u308A\u3001'{'fixed'}' = true\u3067\u3042\u308B\u305F\u3081\u3067\u3059\u3002
- InvalidRegex = InvalidRegex: pattern\u306E\u5024''{0}''\u306F\u7121\u52B9\u306A\u6B63\u898F\u8868\u73FE\u3067\u3059\u3002\u5217''{2}''\u3067''{1}''\u30A8\u30E9\u30FC\u304C\u5831\u544A\u3055\u308C\u307E\u3057\u305F\u3002
- maxOccurLimit = \u73FE\u5728\u306E\u30D1\u30FC\u30B5\u30FC\u306E\u69CB\u6210\u3067\u306F\u3001maxOccurs\u5C5E\u6027\u306B\u5024{0}\u3088\u308A\u5927\u304D\u3044\u5024\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
- PublicSystemOnNotation = PublicSystemOnNotation: \u8981\u7D20''notation''\u306B\u306F''public''\u304A\u3088\u3073''system''\u306E\u5C11\u306A\u304F\u3068\u30821\u3064\u304C\u5FC5\u8981\u3067\u3059\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958(cvc-identity-constraint.4.2.1): \"{0}\" \uC694\uC18C\uC5D0 \uAC12\uC774 \uC5C6\uB294 \uD0A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-- DuplicateField = \"{0}\" \uD544\uB4DC \uBC94\uC704\uC5D0 \uC911\uBCF5 \uC0AC\uD56D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-- DuplicateKey = \uC911\uBCF5 \uD0A4 \uAC12 [{0}]\uC774(\uAC00) \"{1}\" \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-- DuplicateUnique = \uC911\uBCF5 \uACE0\uC720 \uAC12 [{0}]\uC774(\uAC00) \"{1}\" \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-- FieldMultipleMatch = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: \"{0}\" \uD544\uB4DC\uAC00 \uD574\uB2F9 \uC120\uD0DD\uAE30 \uBC94\uC704 \uB0B4\uC5D0 \uD3EC\uD568\uB41C \uC5EC\uB7EC \uAC12\uACFC \uC77C\uCE58\uD569\uB2C8\uB2E4. \uD544\uB4DC\uB294 \uACE0\uC720 \uAC12\uACFC \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-- FixedDiffersFromActual = \uC774 \uC694\uC18C\uC758 \uCF58\uD150\uCE20\uAC00 \uC2A4\uD0A4\uB9C8\uC758 \uC694\uC18C \uC120\uC5B8\uC5D0 \uC788\uB294 \"fixed\" \uC18D\uC131\uAC12\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- KeyMatchesNillable = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958(cvc-identity-constraint.4.2.3): \"{0}\" \uC694\uC18C\uC5D0 nillable\uC774 true\uB85C \uC124\uC815\uB41C \uC694\uC18C\uC640 \uC77C\uCE58\uD558\uB294 \uD0A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-- KeyNotEnoughValues = \"{0}\" \uC694\uC18C\uC758 <key name=\"{1}\"> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
-+ AbsentKeyValue = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958(cvc-identity-constraint.4.2.1): "{0}" \uC694\uC18C\uC5D0 \uAC12\uC774 \uC5C6\uB294 \uD0A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-+ DuplicateField = "{0}" \uD544\uB4DC \uBC94\uC704\uC5D0 \uC911\uBCF5 \uC0AC\uD56D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+ DuplicateKey = \uC911\uBCF5 \uD0A4 \uAC12 [{0}]\uC774(\uAC00) "{1}" \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ DuplicateUnique = \uC911\uBCF5 \uACE0\uC720 \uAC12 [{0}]\uC774(\uAC00) "{1}" \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC120\uC5B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+ FieldMultipleMatch = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: "{0}" \uD544\uB4DC\uAC00 \uD574\uB2F9 \uC120\uD0DD\uAE30 \uBC94\uC704 \uB0B4\uC5D0 \uD3EC\uD568\uB41C \uC5EC\uB7EC \uAC12\uACFC \uC77C\uCE58\uD569\uB2C8\uB2E4. \uD544\uB4DC\uB294 \uACE0\uC720 \uAC12\uACFC \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
-+ FixedDiffersFromActual = \uC774 \uC694\uC18C\uC758 \uCF58\uD150\uCE20\uAC00 \uC2A4\uD0A4\uB9C8\uC758 \uC694\uC18C \uC120\uC5B8\uC5D0 \uC788\uB294 "fixed" \uC18D\uC131\uAC12\uACFC \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ KeyMatchesNillable = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958(cvc-identity-constraint.4.2.3): "{0}" \uC694\uC18C\uC5D0 nillable\uC774 true\uB85C \uC124\uC815\uB41C \uC694\uC18C\uC640 \uC77C\uCE58\uD558\uB294 \uD0A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-+ KeyNotEnoughValues = "{0}" \uC694\uC18C\uC758 <key name="{1}"> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
- KeyNotFound = ''{2}'' \uC694\uC18C\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uAC12\uC774 ''{1}''\uC778 ''{0}'' \uD0A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- KeyRefNotEnoughValues = \"{0}\" \uC694\uC18C\uC758 <keyref name=\"{1}\"> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
-- KeyRefOutOfScope = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: ID \uC81C\uC57D \uC870\uAC74 \"{0}\"\uC758 keyref\uAC00 \uBC94\uC704\uC5D0\uC11C \uBC97\uC5B4\uB09C \uD0A4 \uB610\uB294 \uACE0\uC720 \uD56D\uBAA9\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4.
-- KeyRefReferNotFound = \uD0A4 \uCC38\uC870 \uC120\uC5B8 \"{0}\"\uC740(\uB294) \uC774\uB984\uC774 \"{1}\"\uC778 \uC54C \uC218 \uC5C6\uB294 \uD0A4\uB97C \uCC38\uC870\uD569\uB2C8\uB2E4.
-- UniqueNotEnoughValues = \"{0}\" \uC694\uC18C\uC758 <unique> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
-- UnknownField = \uB0B4\uBD80 ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: \"{0}\"\uC740(\uB294) \uC54C \uC218 \uC5C6\uB294 \uD544\uB4DC\uC785\uB2C8\uB2E4.
-+ KeyRefNotEnoughValues = "{0}" \uC694\uC18C\uC758 <keyref name="{1}"> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
-+ KeyRefOutOfScope = ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: ID \uC81C\uC57D \uC870\uAC74 "{0}"\uC758 keyref\uAC00 \uBC94\uC704\uC5D0\uC11C \uBC97\uC5B4\uB09C \uD0A4 \uB610\uB294 \uACE0\uC720 \uD56D\uBAA9\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4.
-+ KeyRefReferNotFound = \uD0A4 \uCC38\uC870 \uC120\uC5B8 "{0}"\uC740(\uB294) \uC774\uB984\uC774 "{1}"\uC778 \uC54C \uC218 \uC5C6\uB294 \uD0A4\uB97C \uCC38\uC870\uD569\uB2C8\uB2E4.
-+ UniqueNotEnoughValues = "{0}" \uC694\uC18C\uC758 <unique> ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD574 \uC9C0\uC815\uB41C \uAC12\uC774 \uBD80\uC871\uD569\uB2C8\uB2E4.
-+ UnknownField = \uB0B4\uBD80 ID \uC81C\uC57D \uC870\uAC74 \uC624\uB958: "{0}"\uC740(\uB294) \uC54C \uC218 \uC5C6\uB294 \uD544\uB4DC\uC785\uB2C8\uB2E4.
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC774 ''{3}'' \uC720\uD615\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-- cvc-attribute.4 = cvc-attribute.4: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC774 \uACE0\uC815\uB41C ''{''value constraint''}''\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC18D\uC131\uC758 \uAC12\uC740 ''{3}''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ cvc-attribute.4 = cvc-attribute.4: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC774 \uACE0\uC815\uB41C '{'value constraint'}'\uC5D0 \uB300\uD574 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC18D\uC131\uC758 \uAC12\uC740 ''{3}''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- cvc-complex-type.2.1 = cvc-complex-type.2.1: \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uBE44\uC5B4 \uC788\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0\uB294 \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9 [children]\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- cvc-complex-type.2.2 = cvc-complex-type.2.2: ''{0}'' \uC694\uC18C\uC5D0\uB294 \uC694\uC18C [children]\uC774 \uC5C6\uC5B4\uC57C \uD558\uBA70 \uAC12\uC774 \uC801\uD569\uD574\uC57C \uD569\uB2C8\uB2E4.
- cvc-complex-type.2.3 = cvc-complex-type.2.3: \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC774 \uC694\uC18C \uC804\uC6A9\uC774\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0\uB294 \uBB38\uC790 [children]\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB0A0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- cvc-complex-type.4 = cvc-complex-type.4: ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
- cvc-complex-type.5.1 = cvc-complex-type.5.1: ''{0}'' \uC694\uC18C\uC5D0\uC11C ''{1}'' \uC18D\uC131\uC774 \uB300\uCCB4 ID\uC774\uC9C0\uB9CC \uB300\uCCB4 ID ''{2}''\uC774(\uAC00) \uC774\uBBF8 \uC788\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: ''{0}'' \uC694\uC18C\uC5D0\uC11C ''{1}'' \uC18D\uC131\uC774 \uB300\uCCB4 ID\uC774\uC9C0\uB9CC ''{''attribute uses''}'' \uC911 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C ''{2}'' \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC2B5\uB2C8\uB2E4.
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: ''{0}'' \uC694\uC18C\uC5D0\uC11C ''{1}'' \uC18D\uC131\uC774 \uB300\uCCB4 ID\uC774\uC9C0\uB9CC '{'attribute uses'}' \uC911 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C ''{2}'' \uC18D\uC131\uC774 \uC774\uBBF8 \uC788\uC2B5\uB2C8\uB2E4.
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}''\uC740(\uB294) ''{1}''\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}''\uC740(\uB294) \uBAA9\uB85D \uC720\uD615 ''{1}''\uC758 \uC801\uD569\uD55C \uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}''\uC740(\uB294) \uD569\uC9D1\uD569 \uC720\uD615 ''{1}''\uC758 \uC801\uD569\uD55C \uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- cvc-elt.1 = cvc-elt.1: ''{0}'' \uC694\uC18C\uC758 \uC120\uC5B8\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- cvc-elt.2 = cvc-elt.2: ''{0}''\uC5D0 \uB300\uD55C \uC694\uC18C \uC120\uC5B8\uC5D0\uC11C ''{''abstract''}''\uC758 \uAC12\uC740 false\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-- cvc-elt.3.1 = cvc-elt.3.1: ''{0}''\uC758 ''{''nillable''}'' \uC18D\uC131\uC774 false\uC774\uBBC0\uB85C ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ cvc-elt.2 = cvc-elt.2: ''{0}''\uC5D0 \uB300\uD55C \uC694\uC18C \uC120\uC5B8\uC5D0\uC11C '{'abstract'}'\uC758 \uAC12\uC740 false\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-+ cvc-elt.3.1 = cvc-elt.3.1: ''{0}''\uC758 '{'nillable'}' \uC18D\uC131\uC774 false\uC774\uBBC0\uB85C ''{1}'' \uC18D\uC131\uC740 ''{0}'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
- cvc-elt.3.2.1 = cvc-elt.3.2.1: ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0\uB294 \uBB38\uC790 \uB610\uB294 \uC694\uC18C \uC815\uBCF4 [children]\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD574 \uACE0\uC815\uB41C ''{''value constraint''}''\uAC00 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD574 \uACE0\uC815\uB41C '{'value constraint'}'\uAC00 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- cvc-elt.4.1 = cvc-elt.4.1: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uC18D\uC131\uC5D0 \uB300\uD55C ''{2}'' \uAC12\uC740 \uC801\uD569\uD55C QName\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- cvc-elt.4.2 = cvc-elt.4.2: ''{1}''\uC744(\uB97C) ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC720\uD615 \uC815\uC758\uB85C \uBD84\uC11D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- cvc-elt.4.3 = cvc-elt.4.3: ''{1}'' \uC720\uD615\uC740 ''{0}'' \uC694\uC18C\uC758 \uC720\uD615 \uC815\uC758 ''{2}''\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{0}'' \uC694\uC18C\uC758 ''{''value constraint''}'' ''{2}''\uC740(\uB294) ''{1}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uAE30\uBCF8\uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: ''{0}'' \uC694\uC18C\uC758 '{'value constraint'}' ''{2}''\uC740(\uB294) ''{1}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uAE30\uBCF8\uAC12\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: ''{0}'' \uC694\uC18C\uC5D0\uB294 \uC694\uC18C \uC815\uBCF4 \uD56D\uBAA9 [children]\uC774 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 \uACE0\uC815\uB41C ''{''value constraint''}'' \uAC12 ''{2}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 ''{''value constraint''}'' \uAC12 ''{2}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 \uACE0\uC815\uB41C '{'value constraint'}' \uAC12 ''{2}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: ''{0}'' \uC694\uC18C\uC758 ''{1}'' \uAC12\uC774 '{'value constraint'}' \uAC12 ''{2}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- cvc-enumeration-valid = cvc-enumeration-valid: ''{0}'' \uAC12\uC740 ''{1}'' \uBAA9\uB85D\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uBA74\uC774 \uC544\uB2D9\uB2C8\uB2E4. \uBAA9\uB85D\uC758 \uAC12\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: ''{0}'' \uAC12\uC758 \uC18C\uC218\uC810 \uC774\uD558 \uC790\uB9BF\uC218\uAC00 {1}\uC774\uC9C0\uB9CC \uC18C\uC218\uC810 \uC774\uD558 \uC790\uB9BF\uC218\uB294 {2}(\uC73C)\uB85C \uC81C\uD55C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- cvc-id.1 = cvc-id.1: IDREF ''{0}''\uC5D0 \uB300\uD55C ID/IDREF \uBC14\uC778\uB529\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: accessExternalSchema \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 \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
- schema_reference.4 = schema_reference.4: \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}'' \uC77D\uAE30\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uC6D0\uC778: 1) \uBB38\uC11C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. 2) \uBB38\uC11C\uB97C \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. 3) \uBB38\uC11C\uC758 \uB8E8\uD2B8 \uC694\uC18C\uAC00 <xsd:schema>\uAC00 \uC544\uB2D9\uB2C8\uB2E4.
- src-annotation = src-annotation: <annotation> \uC694\uC18C\uC5D0\uB294 <appinfo> \uBC0F <documentation> \uC694\uC18C\uB9CC \uD3EC\uD568\uB420 \uC218 \uC788\uC9C0\uB9CC ''{0}''\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- src-attribute.1 = src-attribute.1: ''default'' \uBC0F ''fixed'' \uC18D\uC131\uC740 \uC18D\uC131 \uC120\uC5B8 ''{0}''\uC5D0 \uD568\uAED8 \uC874\uC7AC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD558\uB098\uB9CC \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2: \uC18D\uC131 \uADF8\uB8F9 ''{0}''\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB984 \uBC0F \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uB3D9\uC77C\uD55C \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC758 \uC774\uB984\uC740 ''{1}''\uC785\uB2C8\uB2E4.
- ag-props-correct.3 = ag-props-correct.3: \uC18D\uC131 \uADF8\uB8F9 ''{0}''\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uB450 \uAC1C\uC758 \uC18D\uC131 \uC120\uC5B8 ''{1}'' \uBC0F ''{2}''\uC5D0 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uC720\uD615\uC774 \uC788\uC2B5\uB2C8\uB2E4.
- a-props-correct.2 = a-props-correct.2: ''{0}'' \uC18D\uC131\uC758 \uAC12 \uC81C\uC57D \uC870\uAC74 \uAC12 ''{1}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-- a-props-correct.3 = a-props-correct.3: \uC18D\uC131\uC758 ''{''type definition''}''\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C ''{0}'' \uC18D\uC131\uC740 ''fixed'' \uB610\uB294 ''default''\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- au-props-correct.2 = au-props-correct.2: ''{0}''\uC758 \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uACE0\uC815\uB41C \uAC12 ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uCC38\uC870\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0\uB3C4 ''{''value constraint''}''\uAC00 \uC788\uC744 \uACBD\uC6B0 \uACE0\uC815\uB418\uC5B4\uC57C \uD558\uBA70 \uAC12\uC740 ''{1}''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ a-props-correct.3 = a-props-correct.3: \uC18D\uC131\uC758 '{'type definition'}'\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C ''{0}'' \uC18D\uC131\uC740 ''fixed'' \uB610\uB294 ''default''\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ au-props-correct.2 = au-props-correct.2: ''{0}''\uC758 \uC18D\uC131 \uC120\uC5B8\uC5D0\uC11C \uACE0\uC815\uB41C \uAC12 ''{1}''\uC774(\uAC00) \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uCC38\uC870\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0\uB3C4 '{'value constraint'}'\uAC00 \uC788\uC744 \uACBD\uC6B0 \uACE0\uC815\uB418\uC5B4\uC57C \uD558\uBA70 \uAC12\uC740 ''{1}''\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- cos-all-limited.1.2 = cos-all-limited.1.2: 'all' \uBAA8\uB378 \uADF8\uB8F9\uC774 '{'min occurs'}' = '{'max occurs'}' = 1\uC778 \uC870\uAC01\uC5D0 \uB098\uD0C0\uB098\uC57C \uD558\uBA70 \uD574\uB2F9 \uC870\uAC01\uC740 \uBCF5\uD569 \uC720\uD615 \uC815\uC758\uC758 '{'content type'}'\uC744 \uAD6C\uC131\uD558\uB294 \uC30D\uC758 \uC77C\uBD80\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-- cos-all-limited.2 = cos-all-limited.2: ''all'' \uBAA8\uB378 \uADF8\uB8F9\uC5D0 \uD3EC\uD568\uB41C \uC694\uC18C\uC758 ''{''max occurs''}''\uB294 0 \uB610\uB294 1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{1}'' \uC694\uC18C\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-+ cos-all-limited.2 = cos-all-limited.2: ''all'' \uBAA8\uB378 \uADF8\uB8F9\uC5D0 \uD3EC\uD568\uB41C \uC694\uC18C\uC758 '{'max occurs'}'\uB294 0 \uB610\uB294 1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{1}'' \uC694\uC18C\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
- cos-applicable-facets = cos-applicable-facets: {1} \uC720\uD615\uC5D0\uC11C\uB294 ''{0}'' \uBA74\uC774 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- cos-ct-extends.1.1 = cos-ct-extends.1.1: ''{0}'' \uC720\uD615\uC740 ''{1}'' \uC720\uD615\uC5D0\uC11C \uD655\uC7A5\uC5D0 \uC758\uD574 \uD30C\uC0DD\uB418\uC5C8\uC9C0\uB9CC ''{1}''\uC758 ''final'' \uC18D\uC131\uC740 \uD655\uC7A5\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD569\uB2C8\uB2E4.
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \uD30C\uC0DD\uB41C \uC720\uD615\uACFC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uBAA8\uB450 \uD63C\uD569\uB418\uAC70\uB098 \uBAA8\uB450 \uC694\uC18C \uC804\uC6A9\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{0}'' \uC720\uD615\uC740 \uC694\uC18C \uC804\uC6A9\uC774\uC9C0\uB9CC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC740 \uC694\uC18C \uC804\uC6A9\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \uD30C\uC0DD\uB41C \uC720\uD615\uACFC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC758 \uCF58\uD150\uCE20 \uC720\uD615\uC740 \uBAA8\uB450 \uD63C\uD569\uB418\uAC70\uB098 \uBAA8\uB450 \uC694\uC18C \uC804\uC6A9\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. ''{0}'' \uC720\uD615\uC740 \uD63C\uD569\uB418\uC5B4 \uC788\uC9C0\uB9CC \uD574\uB2F9 \uAE30\uBCF8 \uC720\uD615\uC740 \uD63C\uD569\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- cos-element-consistent = cos-element-consistent: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB984\uC774 ''{1}''\uC774\uBA70 \uC720\uD615\uC774 \uB2E4\uB978 \uC5EC\uB7EC \uC694\uC18C\uAC00 \uBAA8\uB378 \uADF8\uB8F9\uC5D0 \uB098\uD0C0\uB0A9\uB2C8\uB2E4.
- cos-list-of-atomic = cos-list-of-atomic: \uBAA9\uB85D \uC720\uD615 ''{0}''\uC758 \uC815\uC758\uC5D0\uC11C ''{1}'' \uC720\uD615\uC740 \uAE30\uBCF8 \uB2E8\uC704\uAC00 \uC544\uB2C8\uBBC0\uB85C \uBD80\uC801\uD569\uD55C \uBAA9\uB85D \uC694\uC18C \uC720\uD615\uC785\uB2C8\uB2E4. ''{1}''\uC774(\uAC00) \uBAA9\uB85D \uC720\uD615\uC774\uAC70\uB098 \uBAA9\uB85D\uC744 \uD3EC\uD568\uD558\uB294 \uD569\uC9D1\uD569 \uC720\uD615\uC785\uB2C8\uB2E4.
-- cos-nonambig = cos-nonambig: {0} \uBC0F {1}(\uB610\uB294 \uD574\uB2F9 \uB300\uCCB4 \uADF8\uB8F9\uC758 \uC694\uC18C)\uC774(\uAC00) \"Unique Particle Attribution\"\uC744 \uC704\uBC18\uD569\uB2C8\uB2E4. \uC774 \uC2A4\uD0A4\uB9C8\uC5D0 \uB300\uD55C \uAC80\uC99D \uC911 \uC774\uB7EC\uD55C \uB450 \uC870\uAC01\uC774 \uBAA8\uD638\uD574\uC9C8 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-+ cos-nonambig = cos-nonambig: {0} \uBC0F {1}(\uB610\uB294 \uD574\uB2F9 \uB300\uCCB4 \uADF8\uB8F9\uC758 \uC694\uC18C)\uC774(\uAC00) "Unique Particle Attribution"\uC744 \uC704\uBC18\uD569\uB2C8\uB2E4. \uC774 \uC2A4\uD0A4\uB9C8\uC5D0 \uB300\uD55C \uAC80\uC99D \uC911 \uC774\uB7EC\uD55C \uB450 \uC870\uAC01\uC774 \uBAA8\uD638\uD574\uC9C8 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
- cos-particle-restrict.a = cos-particle-restrict.a: \uD30C\uC0DD\uB41C \uC870\uAC01\uC774 \uBE44\uC5B4 \uC788\uC73C\uBBC0\uB85C \uAE30\uBCF8 \uC870\uAC01\uC744 \uBE44\uC6B8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- cos-particle-restrict.b = cos-particle-restrict.b: \uAE30\uBCF8 \uC870\uAC01\uC740 \uBE44\uC5B4 \uC788\uC9C0\uB9CC \uD30C\uC0DD\uB41C \uC870\uAC01\uC740 \uBE44\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
- cos-particle-restrict.2 = cos-particle-restrict.2: \uAE08\uC9C0\uB41C \uC870\uAC01 \uC81C\uD55C \uC0AC\uD56D: ''{0}''.
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: ''{1}'' \uC720\uD615\uC774 \uAE30\uBCF8 \uB2E8\uC704\uC774\uBBC0\uB85C \uD574\uB2F9 ''{''base type definition''}'' ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uB2E8\uC21C \uC720\uD615 \uC815\uC758 \uB610\uB294 \uB0B4\uC7A5\uB41C \uAE30\uBCF8 \uB370\uC774\uD130 \uC720\uD615\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: ''{1}'' \uC720\uD615\uC774 \uAE30\uBCF8 \uB2E8\uC704\uC774\uBBC0\uB85C \uD574\uB2F9 '{'base type definition'}' ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uB2E8\uC21C \uC720\uD615 \uC815\uC758 \uB610\uB294 \uB0B4\uC7A5\uB41C \uAE30\uBCF8 \uB370\uC774\uD130 \uC720\uD615\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- cos-st-restricts.2.1 = cos-st-restricts.2.1: \uBAA9\uB85D \uC720\uD615 ''{0}''\uC758 \uC815\uC758\uC5D0\uC11C ''{1}'' \uC720\uD615\uC740 \uBAA9\uB85D \uC720\uD615\uC774\uAC70\uB098 \uBAA9\uB85D\uC744 \uD3EC\uD568\uD558\uB294 \uD569\uC9D1\uD569 \uC720\uD615\uC774\uBBC0\uB85C \uBD80\uC801\uD569\uD55C \uD56D\uBAA9 \uC720\uD615\uC785\uB2C8\uB2E4.
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: ''{''item type definition''}'' ''{0}''\uC758 ''{''final''}'' \uAD6C\uC131 \uC694\uC18C\uC5D0 ''list''\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uBAA9\uB85D \uC720\uD615 ''{1}''\uC5D0 \uB300\uD55C \uD56D\uBAA9 \uC720\uD615\uC73C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: ''{''member type definitions''}'' ''{0}''\uC758 ''{''final''}'' \uAD6C\uC131 \uC694\uC18C\uC5D0 ''union''\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uD569\uC9D1\uD569 \uC720\uD615 ''{1}''\uC5D0 \uB300\uD55C \uBA64\uBC84 \uC720\uD615\uC73C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' ''{0}''\uC758 '{'final'}' \uAD6C\uC131 \uC694\uC18C\uC5D0 ''list''\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uBAA9\uB85D \uC720\uD615 ''{1}''\uC5D0 \uB300\uD55C \uD56D\uBAA9 \uC720\uD615\uC73C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}''\uC758 '{'final'}' \uAD6C\uC131 \uC694\uC18C\uC5D0 ''union''\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC744(\uB97C) \uD569\uC9D1\uD569 \uC720\uD615 ''{1}''\uC5D0 \uB300\uD55C \uBA64\uBC84 \uC720\uD615\uC73C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- cos-valid-default.2.1 = cos-valid-default.2.1: ''{0}'' \uC694\uC18C\uC5D0 \uAC12 \uC81C\uC57D \uC870\uAC74\uC774 \uC788\uC73C\uBBC0\uB85C \uD63C\uD569 \uB610\uB294 \uB2E8\uC21C \uCF58\uD150\uCE20 \uBAA8\uB378\uC774 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: ''{0}'' \uC694\uC18C\uC5D0 ''{''value constraint''}''\uAC00 \uC788\uC73C\uBA70 \uD574\uB2F9 \uC720\uD615 \uC815\uC758\uC5D0 \uD63C\uD569 ''{''content type''}''\uC774 \uC788\uC73C\uBBC0\uB85C ''{''content type''}''\uC758 \uC870\uAC01\uC744 \uBE44\uC6B8 \uC218 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: ''{0}'' \uC694\uC18C\uC5D0 '{'value constraint'}'\uAC00 \uC788\uC73C\uBA70 \uD574\uB2F9 \uC720\uD615 \uC815\uC758\uC5D0 \uD63C\uD569 '{'content type'}'\uC774 \uC788\uC73C\uBBC0\uB85C '{'content type'}'\uC758 \uC870\uAC01\uC744 \uBE44\uC6B8 \uC218 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- c-props-correct.2 = c-props-correct.2: keyref ''{0}''\uACFC(\uC640) \uD0A4 ''{1}''\uC5D0 \uB300\uD55C \uD544\uB4DC \uAE30\uC218\uB294 \uC11C\uB85C \uC77C\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4.
- ct-props-correct.3 = ct-props-correct.3: \uBCF5\uD569 \uC720\uD615 ''{0}''\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC740(\uB294) \uACE0\uC720\uD55C \uC720\uD615 \uACC4\uCE35\uC5D0 \uD3EC\uD568\uB41C \uAC83\uC774\uBA70 \uC774\uB294 \uC624\uB958\uC785\uB2C8\uB2E4.
- ct-props-correct.4 = ct-props-correct.4: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB984 \uBC0F \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uB3D9\uC77C\uD55C \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC911\uBCF5 \uC18D\uC131 \uC0AC\uC6A9\uC758 \uC774\uB984\uC740 ''{1}''\uC785\uB2C8\uB2E4.
- ct-props-correct.5 = ct-props-correct.5: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uB450 \uAC1C\uC758 \uC18D\uC131 \uC120\uC5B8 ''{1}'' \uBC0F ''{2}''\uC5D0 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uC720\uD615\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: ''{0}'' \uC720\uD615\uC740 ''{1}'' \uC720\uD615\uC5D0\uC11C \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD574 \uD30C\uC0DD\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uC9C0\uB9CC ''{1}''\uC5D0\uB294 \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD558\uB294 ''{''final''}'' \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: ''{0}'' \uC720\uD615\uC740 ''{1}'' \uC720\uD615\uC5D0\uC11C \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD574 \uD30C\uC0DD\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uC9C0\uB9CC ''{1}''\uC5D0\uB294 \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD558\uB294 '{'final'}' \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4.
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0 \uB300\uD55C ''use'' \uAC12\uC774 ''{2}''\uC785\uB2C8\uB2E4. \uC774\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uAC12\uC778 ''required''\uC640 \uB2E4\uB985\uB2C8\uB2E4.
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0 \uB300\uD55C \uC720\uD615\uC774 ''{2}''\uC785\uB2C8\uB2E4. \uC774\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uC720\uD615\uC778 ''{3}''\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uC720\uD615\uC758 \uC18D\uC131 \uC0AC\uC6A9 ''{1}''\uC5D0\uB294 \uACE0\uC815\uB418\uC9C0 \uC54A\uC740 \uC720\uD6A8\uD55C \uAC12 \uC81C\uC57D \uC870\uAC74\uC774 \uC788\uC73C\uBA70, \uAE30\uBCF8 \uC720\uD615\uC758 \uC77C\uCE58\uD558\uB294 \uC18D\uC131 \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uC720\uD6A8\uD55C \uAC12 \uC81C\uC57D \uC870\uAC74\uC740 \uACE0\uC815\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation: {2} ''{1}''\uC5D0 \uC0AC\uC6A9\uB418\uB294 NOTATION \uC720\uD615 ''{0}''\uC5D0\uB294 \uC774 \uC720\uD615\uC5D0 \uC0AC\uC6A9\uB418\uB294 \uD45C\uAE30\uBC95 \uC694\uC18C\uB97C \uC9C0\uC815\uD558\uB294 \uBAA9\uB85D \uBA74 \uAC12\uC774 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- enumeration-valid-restriction = enumeration-valid-restriction: \uBAA9\uB85D \uAC12 ''{0}''\uC774(\uAC00) \uAE30\uBCF8 \uC720\uD615 {1}\uC758 \uAC12 \uACF5\uAC04\uC5D0 \uC5C6\uC2B5\uB2C8\uB2E4.
- e-props-correct.2 = e-props-correct.2: ''{0}'' \uC694\uC18C\uC758 \uAC12 \uC81C\uC57D \uC870\uAC74 \uAC12 ''{1}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-- e-props-correct.4 = e-props-correct.4: ''{0}'' \uC694\uC18C\uC758 ''{''type definition''}''\uC774 substitutionHead ''{1}''\uC758 ''{''type definition''}''\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2C8\uAC70\uB098 ''{1}''\uC758 ''{''substitution group exclusions''}'' \uC18D\uC131\uC774 \uC774 \uD30C\uC0DD\uC744 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-- e-props-correct.5 = e-props-correct.5: \uC694\uC18C\uC758 ''{''type definition''}'' \uB610\uB294 ''{''type definition''}''\uC758 ''{''content type''}''\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C ''{''value constraint''}''\uB294 ''{0}'' \uC694\uC18C\uC5D0 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-+ e-props-correct.4 = e-props-correct.4: ''{0}'' \uC694\uC18C\uC758 '{'type definition'}'\uC774 substitutionHead ''{1}''\uC758 '{'type definition'}'\uC5D0\uC11C \uC801\uD569\uD558\uAC8C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2C8\uAC70\uB098 ''{1}''\uC758 '{'substitution group exclusions'}' \uC18D\uC131\uC774 \uC774 \uD30C\uC0DD\uC744 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+ e-props-correct.5 = e-props-correct.5: \uC694\uC18C\uC758 '{'type definition'}' \uB610\uB294 '{'type definition'}'\uC758 '{'content type'}'\uC774 ID\uC774\uAC70\uB098 ID\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774\uBBC0\uB85C '{'value constraint'}'\uB294 ''{0}'' \uC694\uC18C\uC5D0 \uC5C6\uC5B4\uC57C \uD569\uB2C8\uB2E4.
- e-props-correct.6 = e-props-correct.6: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C \uC21C\uD658 \uB300\uCCB4 \uADF8\uB8F9\uC774 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4..
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''fractionDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{1}''(\uC73C)\uB85C \uC124\uC815\uB41C ''fractionDigits''\uC5D0 \uB300\uD55C \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
- fractionDigits-totalDigits = fractionDigits-totalDigits: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''fractionDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 ''totalDigits''\uC5D0 \uB300\uD55C \uAC12\uC778 ''{1}''\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minInclusive\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. maxInclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minExclusive\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4.
- maxLength-valid-restriction = maxLength-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C maxLength \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-- mg-props-correct.2 = mg-props-correct.2: ''{0}'' \uADF8\uB8F9\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC21C\uD658\uC801\uC73C\uB85C \uB4A4\uC5D0 \uC624\uB294 ''{''term''}'' \uC870\uAC01 \uAC12\uC774 ''{''term''}''\uC774 \uADF8\uB8F9 \uC790\uC2E0\uC778 \uC870\uAC01\uC5D0 \uB3C4\uB2EC\uD569\uB2C8\uB2E4.
-+ mg-props-correct.2 = mg-props-correct.2: ''{0}'' \uADF8\uB8F9\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC21C\uD658\uC801\uC73C\uB85C \uB4A4\uC5D0 \uC624\uB294 '{'term'}' \uC870\uAC01 \uAC12\uC774 '{'term'}'\uC774 \uADF8\uB8F9 \uC790\uC2E0\uC778 \uC870\uAC01\uC5D0 \uB3C4\uB2EC\uD569\uB2C8\uB2E4.
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: {2}\uC758 \uC815\uC758\uC5D0\uC11C minExclusive \uAC12 = ''{0}''\uC740(\uB294) maxExclusive \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: {2}\uC758 \uC815\uC758\uC5D0\uC11C minExclusive \uAC12 = ''{0}''\uC740(\uB294) maxInclusive \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: ''{2}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. minExclusive \uAC12 = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 minExclusive\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: {2}\uC758 \uC815\uC758\uC5D0\uC11C minLength \uAC12 = ''{0}''\uC740(\uB294) maxLength \uAC12 = ''{1}''\uBCF4\uB2E4 \uC791\uC544\uC57C \uD569\uB2C8\uB2E4.
- minLength-valid-restriction = minLength-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C minLength = ''{0}''\uC740(\uB294) \uAE30\uBCF8 \uC720\uD615 ''{1}''\uC758 \uAC12\uBCF4\uB2E4 \uD06C\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
- no-xmlns = no-xmlns: \uC18D\uC131 \uC120\uC5B8\uC758 {name}\uC740 'xmlns'\uC640 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-- no-xsi = no-xsi: \uC18D\uC131 \uC120\uC5B8\uC758 ''{''target namespace''}''\uB294 ''{0}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
-+ no-xsi = no-xsi: \uC18D\uC131 \uC120\uC5B8\uC758 '{'target namespace'}'\uB294 ''{0}''\uACFC(\uC640) \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
- p-props-correct.2.1 = p-props-correct.2.1: ''{0}''\uC758 \uC120\uC5B8\uC5D0\uC11C ''minOccurs'' \uAC12\uC774 ''{1}''\uC774\uC9C0\uB9CC \uC774 \uAC12\uC740 ''maxOccurs'' \uAC12 ''{2}''\uBCF4\uB2E4 \uD06C\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4.
- rcase-MapAndSum.1 = rcase-MapAndSum.1: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
- rcase-MapAndSum.2 = rcase-MapAndSum.2: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \uC694\uC18C\uC5D0 \uB3D9\uC77C\uD558\uC9C0 \uC54A\uC740 \uC774\uB984 \uBC0F \uB300\uC0C1 \uB124\uC784\uC2A4\uD398\uC774\uC2A4(''{1}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 ''{0}'' \uC694\uC18C \uBC0F ''{3}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC758 ''{2}'' \uC694\uC18C)\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: ''{''term''}''\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC694\uC18C \uC120\uC5B8\uC758 ''{''nillable''}''\uC774 true\uC774\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC870\uAC01\uC5D0 ''{''nillable''}''\uC774 false\uC778 \uC694\uC18C \uC120\uC5B8\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: ''{''term''}''\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uBC18\uBCF5 \uBC94\uC704({1},{2})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC788\uB294 \uD574\uB2F9 \uC870\uAC01\uC758 \uBC94\uC704({3},{4})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: '{'term'}'\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC694\uC18C \uC120\uC5B8\uC758 '{'nillable'}'\uC774 true\uC774\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC870\uAC01\uC5D0 '{'nillable'}'\uC774 false\uC778 \uC694\uC18C \uC120\uC5B8\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: '{'term'}'\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uBC18\uBCF5 \uBC94\uC704({1},{2})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC788\uB294 \uD574\uB2F9 \uC870\uAC01\uC758 \uBC94\uC704({3},{4})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: ''{0}'' \uC694\uC18C\uB294 \uACE0\uC815\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC694\uC18C\uB294 ''{1}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: ''{0}'' \uC694\uC18C\uB294 ''{1}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB418\uC5B4 \uC788\uC9C0\uB9CC \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC694\uC18C\uB294 ''{2}'' \uAC12\uC73C\uB85C \uACE0\uC815\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD55C ID \uC81C\uC57D \uC870\uAC74\uC740 \uAE30\uBCF8 \uC720\uD615\uC758 ID \uC81C\uC57D \uC870\uAC74\uC5D0 \uB300\uD55C \uBD80\uBD84 \uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: ''{0}'' \uC694\uC18C\uC5D0 \uB300\uD574 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uB294 \uB300\uCCB4\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uB300\uCCB4\uC5D0 \uB300\uD55C \uB300\uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: ''{0}'' \uC694\uC18C\uC758 \uC720\uD615 ''{1}''\uC740(\uB294) \uAE30\uBCF8 \uC694\uC18C\uC758 \uC720\uD615 ''{2}''\uC5D0\uC11C \uD30C\uC0DD\uB41C \uAC83\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NSCompat.1 = rcase-NSCompat.1: ''{0}'' \uC694\uC18C\uC5D0\uB294 \uAE30\uBCF8 \uC720\uD615\uC758 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC5D0\uC11C \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uB294 ''{1}'' \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-- rcase-NSCompat.2 = rcase-NSCompat.2: ''{''term''}''\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uBC18\uBCF5 \uBC94\uC704({1},{2})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC788\uB294 \uD574\uB2F9 \uC870\uAC01\uC758 \uBC94\uC704({3},{4})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-+ rcase-NSCompat.2 = rcase-NSCompat.2: '{'term'}'\uC774 \uC694\uC18C \uC120\uC5B8 ''{0}''\uC778 \uC870\uAC01\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uBC18\uBCF5 \uBC94\uC704({1},{2})\uAC00 \uAE30\uBCF8 \uC720\uD615\uC5D0 \uC788\uB294 \uD574\uB2F9 \uC870\uAC01\uC758 \uBC94\uC704({3},{4})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \uC870\uAC01 \uAC04 \uC804\uCCB4 \uAE30\uB2A5 \uB9E4\uD551\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \uADF8\uB8F9\uC758 \uBC1C\uC0DD \uBC94\uC704({0},{1})\uAC00 \uAE30\uBCF8 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC758 \uBC94\uC704({2},{3})\uC5D0 \uB300\uD574 \uC801\uD569\uD55C \uC81C\uD55C \uC0AC\uD56D\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- rcase-NSSubset.1 = rcase-NSSubset.1: \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uAC00 \uAE30\uBCF8 \uC720\uD615\uC758 \uD574\uB2F9 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790\uC5D0 \uB300\uD55C \uBD80\uBD84 \uC9D1\uD569\uC774 \uC544\uB2D9\uB2C8\uB2E4.
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: \uC2A4\uD0A4\uB9C8\uC5D0\uB294 \uB3D9\uC77C\uD55C \uC774\uB984\uC744 \uAC00\uC9C4 \uB450 \uAC1C\uC758 \uC804\uC5ED \uAD6C\uC131 \uC694\uC18C\uAC00 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC774 \uC2A4\uD0A4\uB9C8\uC5D0\uB294 \uB450 \uAC1C\uC758 ''{0}''\uC774(\uAC00) \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.
- st-props-correct.2 = st-props-correct.2: \uB2E8\uC21C \uC720\uD615 ''{0}''\uC5D0 \uB300\uD55C \uC21C\uD658 \uC815\uC758\uAC00 \uAC10\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB530\uB77C\uC11C ''{0}''\uC740(\uB294) \uACE0\uC720\uD55C \uC720\uD615 \uACC4\uCE35\uC5D0 \uD3EC\uD568\uB41C \uAC83\uC774\uBA70 \uC774\uB294 \uC624\uB958\uC785\uB2C8\uB2E4.
-- st-props-correct.3 = st-props-correct.3: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. ''{''base type definition''}'' ''{1}''\uC758 ''{''final''}'' \uAC12\uC740 \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD569\uB2C8\uB2E4.
-+ st-props-correct.3 = st-props-correct.3: ''{0}'' \uC720\uD615\uC5D0 \uB300\uD574 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. '{'base type definition'}' ''{1}''\uC758 '{'final'}' \uAC12\uC740 \uC81C\uD55C \uC0AC\uD56D\uC5D0 \uC758\uD55C \uD30C\uC0DD\uC744 \uAE08\uC9C0\uD569\uB2C8\uB2E4.
- totalDigits-valid-restriction = totalDigits-valid-restriction: {2}\uC758 \uC815\uC758\uC5D0\uC11C ''totalDigits'' \uBA74\uC5D0 \uB300\uD55C ''{0}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC774 \uAC12\uC740 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{1}''(\uC73C)\uB85C \uC124\uC815\uB41C ''totalDigits''\uC5D0 \uB300\uD55C \uAC12\uBCF4\uB2E4 \uC791\uAC70\uB098 \uAC19\uC544\uC57C \uD569\uB2C8\uB2E4.
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: {0}\uC758 \uC815\uC758\uC5D0\uC11C ''whitespace'' \uBA74\uC5D0 \uB300\uD55C ''{1}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''whitespace''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''collapse''\uB85C \uC124\uC815\uB418\uC5C8\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: {0}\uC758 \uC815\uC758\uC5D0\uC11C ''whitespace'' \uBA74\uC5D0 \uB300\uD55C ''preserve'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''whitespace''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''replace''\uB85C \uC124\uC815\uB418\uC5C8\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
-@@ -309,7 +281,7 @@
- c-selector-xpath = c-selector-xpath: \uC120\uD0DD\uAE30 \uAC12 = ''{0}''\uC774(\uAC00) \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC120\uD0DD\uAE30 XPath\uC5D0\uB294 \uC18D\uC131\uC774 \uD3EC\uD568\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- EmptyTargetNamespace = EmptyTargetNamespace: \uC2A4\uD0A4\uB9C8 \uBB38\uC11C ''{0}''\uC758 ''targetNamespace'' \uC18D\uC131\uAC12\uC740 \uBE48 \uBB38\uC790\uC5F4\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- FacetValueFromBase = FacetValueFromBase: ''{0}'' \uC720\uD615\uC758 \uC120\uC5B8\uC5D0\uC11C ''{2}'' \uBA74\uC758 ''{1}'' \uAC12\uC740 \uAE30\uBCF8 \uC720\uD615 ''{3}''\uC758 \uAC12 \uACF5\uBC31\uC5D0\uC11C \uC640\uC57C \uD569\uB2C8\uB2E4.
-- FixedFacetValue = FixedFacetValue: {3}\uC758 \uC815\uC758\uC5D0\uC11C ''{0}'' \uBA74\uC5D0 \uB300\uD55C ''{1}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''{0}''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{2}''(\uC73C)\uB85C \uC124\uC815\uB418\uC5C8\uC73C\uBA70 ''{''fixed''}'' = true\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
-+ FixedFacetValue = FixedFacetValue: {3}\uC758 \uC815\uC758\uC5D0\uC11C ''{0}'' \uBA74\uC5D0 \uB300\uD55C ''{1}'' \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. ''{0}''\uC5D0 \uB300\uD55C \uAC12\uC774 \uC870\uC0C1 \uC720\uD615 \uC911 \uD558\uB098\uC5D0\uC11C ''{2}''(\uC73C)\uB85C \uC124\uC815\uB418\uC5C8\uC73C\uBA70 '{'fixed'}' = true\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.
- InvalidRegex = InvalidRegex: \uD328\uD134 \uAC12 ''{0}''\uC740(\uB294) \uC801\uD569\uD55C \uC815\uADDC \uD45C\uD604\uC2DD\uC774 \uC544\uB2D9\uB2C8\uB2E4. ''{2}'' \uC5F4\uC5D0\uC11C ''{1}'' \uC624\uB958\uAC00 \uBCF4\uACE0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
- maxOccurLimit = \uAD6C\uBB38 \uBD84\uC11D\uAE30\uC758 \uD604\uC7AC \uAD6C\uC131\uC5D0\uC11C maxOccurs \uC18D\uC131\uAC12\uC744 {0} \uAC12\uBCF4\uB2E4 \uD06C\uAC8C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- PublicSystemOnNotation = PublicSystemOnNotation: \uD558\uB098 \uC774\uC0C1\uC758 ''public''\uACFC ''system''\uC774 ''notation'' \uC694\uC18C\uC5D0 \uB098\uD0C0\uB098\uC57C \uD569\uB2C8\uB2E4.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
- FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = Erro de Restri\u00E7\u00E3o de identidade (cvc-identity-constraint.4.2.1): o elemento \"{0}\" tem uma chave sem valor.
-- DuplicateField = Correspond\u00EAncia duplicada no escopo do campo \"{0}\".
-- DuplicateKey = Valor da chave duplicado [{0}] declarado para a restri\u00E7\u00E3o de identidade do elemento \"{1}\".
-- DuplicateUnique = Valor exclusivo duplicado [{0}] declarado para a restri\u00E7\u00E3o de identidade do elemento \"{1}\".
-- FieldMultipleMatch = Erro de restri\u00E7\u00E3o de identidade: o campo \"{0}\" corresponde a mais de um valor no escopo deste seletor; os campos devem corresponder a valores exclusivos.
-- FixedDiffersFromActual = O conte\u00FAdo deste elemento n\u00E3o \u00E9 equivalente ao valor do atributo \"fixed\" na declara\u00E7\u00E3o do elemento do esquema.
-- KeyMatchesNillable = Erro de restri\u00E7\u00E3o de identidade (cvc-identity-constraint.4.2.3): o elemento \"{0}\" tem uma chave que corresponde a um elemento o qual tem anul\u00E1vel definido como verdadeiro.
-- KeyNotEnoughValues = N\u00E3o h\u00E1 valores suficientes especificados para a restri\u00E7\u00E3o de identidade de <key name=\"{1}\"> especificada para o elemento \"{0}\".
-+ AbsentKeyValue = Erro de Restri\u00E7\u00E3o de identidade (cvc-identity-constraint.4.2.1): o elemento "{0}" tem uma chave sem valor.
-+ DuplicateField = Correspond\u00EAncia duplicada no escopo do campo "{0}".
-+ DuplicateKey = Valor da chave duplicado [{0}] declarado para a restri\u00E7\u00E3o de identidade do elemento "{1}".
-+ DuplicateUnique = Valor exclusivo duplicado [{0}] declarado para a restri\u00E7\u00E3o de identidade do elemento "{1}".
-+ FieldMultipleMatch = Erro de restri\u00E7\u00E3o de identidade: o campo "{0}" corresponde a mais de um valor no escopo deste seletor; os campos devem corresponder a valores exclusivos.
-+ FixedDiffersFromActual = O conte\u00FAdo deste elemento n\u00E3o \u00E9 equivalente ao valor do atributo "fixed" na declara\u00E7\u00E3o do elemento do esquema.
-+ KeyMatchesNillable = Erro de restri\u00E7\u00E3o de identidade (cvc-identity-constraint.4.2.3): o elemento "{0}" tem uma chave que corresponde a um elemento o qual tem anul\u00E1vel definido como verdadeiro.
-+ KeyNotEnoughValues = N\u00E3o h\u00E1 valores suficientes especificados para a restri\u00E7\u00E3o de identidade de <key name="{1}"> especificada para o elemento "{0}".
- KeyNotFound = Chave ''{0}'' com valor ''{1}'' n\u00E3o encontrada para a restri\u00E7\u00E3o de identidade do elemento ''{2}''.
-- KeyRefNotEnoughValues = N\u00E3o h\u00E1 valores suficientes especificados para a restri\u00E7\u00E3o de identidade de <keyref name=\"{1}\"> especificada para o elemento \"{0}\".
-- KeyRefOutOfScope = Erro de restri\u00E7\u00E3o de identidade: a restri\u00E7\u00E3o de identidade \"{0}\" tem uma keyref que se refere a uma chave exclusiva a qual est\u00E1 fora do escopo.
-- KeyRefReferNotFound = A declara\u00E7\u00E3o de refer\u00EAncia da chave \"{0}\" refere-se a uma chave com o nome \"{1}\".
-- UniqueNotEnoughValues = N\u00E3o h\u00E1 valores suficientes especificados para a restri\u00E7\u00E3o de identidade <unique> especificada para o elemento \"{0}\".
-- UnknownField = Erro interno de restri\u00E7\u00E3o de identidade; campo desconhecido \"{0}\".
-+ KeyRefNotEnoughValues = N\u00E3o h\u00E1 valores suficientes especificados para a restri\u00E7\u00E3o de identidade de <keyref name="{1}"> especificada para o elemento "{0}".
-+ KeyRefOutOfScope = Erro de restri\u00E7\u00E3o de identidade: a restri\u00E7\u00E3o de identidade "{0}" tem uma keyref que se refere a uma chave exclusiva a qual est\u00E1 fora do escopo.
-+ KeyRefReferNotFound = A declara\u00E7\u00E3o de refer\u00EAncia da chave "{0}" refere-se a uma chave com o nome "{1}".
-+ UniqueNotEnoughValues = N\u00E3o h\u00E1 valores suficientes especificados para a restri\u00E7\u00E3o de identidade <unique> especificada para o elemento "{0}".
-+ UnknownField = Erro interno de restri\u00E7\u00E3o de identidade; campo desconhecido "{0}".
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido em rela\u00E7\u00E3o ao seu tipo, ''{3}''.
-- cvc-attribute.4 = cvc-attribute.4: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido em rela\u00E7\u00E3o \u00E0 sua ''{''value constraint''}'' fixa. O atributo deve ter um valor ''{3}''.
-+ cvc-attribute.4 = cvc-attribute.4: O valor ''{2}'' do atributo ''{1}'' no elemento ''{0}'' n\u00E3o \u00E9 v\u00E1lido em rela\u00E7\u00E3o \u00E0 sua '{'value constraint'}' fixa. O atributo deve ter um valor ''{3}''.
- cvc-complex-type.2.1 = cvc-complex-type.2.1: O elemento ''{0}'' n\u00E3o deve ter um caractere ou um item com informa\u00E7\u00F5es do elemento [children] porque o tipo de conte\u00FAdo do tipo \u00E9 vazio.
- cvc-complex-type.2.2 = cvc-complex-type.2.2: O elemento ''{0}'' n\u00E3o deve ter um elemento [children] e o valor deve ser v\u00E1lido.
- cvc-complex-type.2.3 = cvc-complex-type.2.3: O elemento ''{0}'' n\u00E3o pode ter um caractere [children] porque o tipo de conte\u00FAdo do tipo \u00E9 somente elemento.
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: O atributo ''{1}'' n\u00E3o pode aparecer no elemento ''{0}''.
- cvc-complex-type.4 = cvc-complex-type.4: O atributo ''{1}'' deve aparecer no elemento ''{0}''.
- cvc-complex-type.5.1 = cvc-complex-type.5.1: No elemento ''{0}'', o atributo ''{1}'' \u00E9 um ID Curinga, mas j\u00E1 existe um ID Curinga ''{2}''. Pode haver somente um.
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: No elemento, ''{0}'', o atributo ''{1}'' \u00E9 um ID Curinga, mas j\u00E1 existe um atributo ''{2}'' obtido do ID entre os ''{''attribute uses''}''.
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: No elemento, ''{0}'', o atributo ''{1}'' \u00E9 um ID Curinga, mas j\u00E1 existe um atributo ''{2}'' obtido do ID entre os '{'attribute uses'}'.
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' n\u00E3o \u00E9 um valor v\u00E1lido para ''{1}''.
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' n\u00E3o \u00E9 um valor v\u00E1lido do tipo de lista ''{1}''.
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' n\u00E3o \u00E9 um valor v\u00E1lido do tipo de uni\u00E3o ''{1}''.
- cvc-elt.1 = cvc-elt.1: N\u00E3o pode localizar a declara\u00E7\u00E3o do elemento ''{0}''.
- cvc-elt.2 = cvc-elt.2: O valor de "{"abstract"}" na declara\u00E7\u00E3o do elemento para ''{0}'' deve ser falso.
-- cvc-elt.3.1 = cvc-elt.3.1: O atributo ''{1}'' n\u00E3o deve aparecer no elemento ''{0}'' porque a propriedade ''{''nillable''}'' de ''{0}'' \u00E9 falsa.
-+ cvc-elt.3.1 = cvc-elt.3.1: O atributo ''{1}'' n\u00E3o deve aparecer no elemento ''{0}'' porque a propriedade '{'nillable'}' de ''{0}'' \u00E9 falsa.
- cvc-elt.3.2.1 = cvc-elt.3.2.1: O elemento ''{0}'' n\u00E3o pode ter informa\u00E7\u00F5es de caractere ou de elemento [children] porque ''{1}'' foi especificado.
- cvc-elt.3.2.2 = cvc-elt.3.2.2: N\u00E3o deve haver "{"value constraint"}" fixo para o elemento ''{0}'' porque ''{1}'' foi especificado.
- cvc-elt.4.1 = cvc-elt.4.1: O valor ''{2}'' do atributo ''{1}'' do elemento ''{0}'' n\u00E3o \u00E9 um QName v\u00E1lido.
- cvc-elt.4.2 = cvc-elt.4.2: N\u00E3o \u00E9 poss\u00EDvel resolver ''{1}'' para uma defini\u00E7\u00E3o de tipo de elemento ''{0}''.
- cvc-elt.4.3 = cvc-elt.4.3: O tipo ''{1}'' n\u00E3o \u00E9 obtido de forma v\u00E1lida da defini\u00E7\u00E3o do tipo, ''{2}'', do elemento ''{0}''.
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: "{"value constraint"}" ''{2}'' do elemento ''{0}'' n\u00E3o \u00E9 um valor default v\u00E1lido para o tipo ''{1}''.
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: "{"value constraint"}" ''{2}'' do elemento ''{0}'' n\u00E3o \u00E9 um valor padr\u00E3o v\u00E1lido para o tipo ''{1}''.
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: O elemento ''{0}'' n\u00E3o deve ter item de informa\u00E7\u00F5es do elemento [children].
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: O valor ''{1}'' do elemento ''{0}'' n\u00E3o corresponde ao valor fixo de ''{''value constraint''}'' ''{2}''.
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: O valor ''{1}'' do elemento ''{0}'' n\u00E3o corresponde ao valor de ''{''value constraint''}'' ''{2}'' .
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: O valor ''{1}'' do elemento ''{0}'' n\u00E3o corresponde ao valor fixo de '{'value constraint'}' ''{2}''.
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: O valor ''{1}'' do elemento ''{0}'' n\u00E3o corresponde ao valor de '{'value constraint'}' ''{2}'' .
- cvc-enumeration-valid = cvc-enumeration-valid: O valor ''{0}'' n\u00E3o tem um aspecto v\u00E1lido em rela\u00E7\u00E3o \u00E0 enumera\u00E7\u00E3o ''{1}''. Deve ser um valor da enumera\u00E7\u00E3o.
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: O valor ''{0}'' tem {1} d\u00EDgitos fracion\u00E1rios, mas o n\u00FAmero de d\u00EDgitos fracion\u00E1rios foi limitado a {2}.
- cvc-id.1 = cvc-id.1: N\u00E3o h\u00E1 associa\u00E7\u00E3o de ID/IDREF para IDREF ''{0}''.
-@@ -114,11 +86,11 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: falha ao ler o documento de esquema ''{0}'' porque o acesso a ''{1}'' n\u00E3o \u00E9 permitido em decorr\u00EAncia de uma restri\u00E7\u00E3o definida pela propriedade accessExternalSchema.
- schema_reference.4 = schema_reference.4: Falha ao ler o documento do esquema ''{0}'' porque 1) n\u00E3o foi poss\u00EDvel encontrar o documento; 2) n\u00E3o foi poss\u00EDvel ler o documento; 3) o elemento-raiz do documento n\u00E3o \u00E9 <xsd:schema>.
- src-annotation = src-annotation: os elementos de <annotation> podem conter somente os elementos <appinfo> e <documentation>, mas foi encontrado ''{0}''.
-- src-attribute.1 = src-attribute.1: As propriedades ''default'' e ''fixed'' n\u00E3o podem estar presentes na declara\u00E7\u00E3o do atributo ''{0}''. Use somente uma delas.
-- src-attribute.2 = src-attribute.2: : A propriedade ''default'' est\u00E1 presente no atributo ''{0}''. Dessa forma, o valor de ''use'' deve ser ''optional''.
-+ src-attribute.1 = src-attribute.1: As propriedades ''padr\u00E3o'' e ''fixed'' n\u00E3o podem estar presentes na declara\u00E7\u00E3o do atributo ''{0}''. Use somente uma delas.
-+ src-attribute.2 = src-attribute.2: : A propriedade ''padr\u00E3o'' est\u00E1 presente no atributo ''{0}''. Dessa forma, o valor de ''use'' deve ser ''optional''.
- src-attribute.3.1 = src-attribute.3.1: 'ref' ou 'name' deve estar presente na declara\u00E7\u00E3o do atributo de local.
- src-attribute.3.2 = src-attribute.3.2: O conte\u00FAdo deve corresponder a (annotation?) da refer\u00EAncia do atributo ''{0}''.
- src-attribute.4 = src-attribute.4: O atributo ''{0}'' tem um atributo ''type'' e um ''simpleType'' filho an\u00F4nimo. Somente um deles \u00E9 permitido para um atributo.
-@@ -129,7 +101,7 @@
- src-ct.2.2 = src-ct.2.2: Erro de Representa\u00E7\u00E3o de Defini\u00E7\u00E3o do Tipo Complexo do tipo ''{0}''. Quando um complexType com simpleContent \u00E9 restrito a um complexType com conte\u00FAdo misto e part\u00EDcula esvazi\u00E1vel, ent\u00E3o deve haver um <simpleType> entre os filhos de <restriction>.
- src-ct.4 = src-ct.4: Erro de Representa\u00E7\u00E3o de Defini\u00E7\u00E3o de Tipo Complexo do tipo ''{0}''. A intersec\u00E7\u00E3o de curingas n\u00E3o \u00E9 express\u00EDvel.
- src-ct.5 = src-ct.5: Erro de Representa\u00E7\u00E3o da Defini\u00E7\u00E3o do Tipo Complexo do tipo ''{0}''. A uni\u00E3o de curingas n\u00E3o \u00E9 express\u00EDvel.
-- src-element.1 = src-element.1: As propriedades ''default'' e ''fixed'' n\u00E3o podem estar presentes na declara\u00E7\u00E3o do elemento ''{0}''. Use somente uma delas.
-+ src-element.1 = src-element.1: As propriedades ''padr\u00E3o'' e ''fixed'' n\u00E3o podem estar presentes na declara\u00E7\u00E3o do elemento ''{0}''. Use somente uma delas.
- src-element.2.1 = src-attribute.2.1: 'ref' ou 'name' deve estar presente na declara\u00E7\u00E3o de elemento do local.
- src-element.2.2 = src-element.2.2: Como ''{0}'' cont\u00E9m o atributo ''ref'', seu conte\u00FAdo deve ser correspondente (annotation?). No entanto, ''{1}'' foi encontrado.
- src-element.3 = src-element.3: O elemento ''{0}'' tem um atributo ''type'' e um filho ''anonymous type''. Somente um deles \u00E9 permitido para um elemento.
-@@ -171,8 +143,8 @@
- ag-props-correct.2 = ag-props-correct.2: Erro do grupo de atributos ''{0}''. Os usos do atributo duplicado com o mesmo nome e namespace de destino foram especificados. O nome de uso do atributo duplicado \u00E9 ''{1}''.
- ag-props-correct.3 = ag-props-correct.3: Erro do grupo de atributos ''{0}''. Duas declara\u00E7\u00F5es de atributo ''{1}'' e ''{2}'' t\u00EAm tipos que s\u00E3o obtidos do ID.
- a-props-correct.2 = a-props-correct.2: Valor de restri\u00E7\u00E3o inv\u00E1lido ''{1}'' no atributo ''{0}''.
-- a-props-correct.3 = a-props-correct.3: O atributo ''{0}'' n\u00E3o pode usar ''fixed'' ou ''default'' porque o ''{''type definition''}'' do atributo \u00E9 ID ou \u00E9 obtida do ID.
-- au-props-correct.2 = au-props-correct.2: Na declara\u00E7\u00E3o do atributo de ''{0}'', foi especificado um valor fixo de ''{1}''. Dessa forma, se o uso do atributo que faz refer\u00EAncia a ''{0}'' tamb\u00E9m tiver uma ''{''value constraint''}'', ele deve ser corrigido e seu valor deve ser ''{1}''.
-+ a-props-correct.3 = a-props-correct.3: O atributo ''{0}'' n\u00E3o pode usar ''fixed'' ou ''padr\u00E3o'' porque o '{'type definition'}' do atributo \u00E9 ID ou \u00E9 obtida do ID.
-+ au-props-correct.2 = au-props-correct.2: Na declara\u00E7\u00E3o do atributo de ''{0}'', foi especificado um valor fixo de ''{1}''. Dessa forma, se o uso do atributo que faz refer\u00EAncia a ''{0}'' tamb\u00E9m tiver uma '{'value constraint'}', ele deve ser corrigido e seu valor deve ser ''{1}''.
- cos-all-limited.1.2 = cos-all-limited.1.2: Um grupo de modelos 'all' deve ser exibido em uma part\u00EDcula com '{'min occurs'}' = '{'max occurs'}' = 1 e essa part\u00EDcula deve fazer parte de um par que constitui o '{'content type'}' de uma defini\u00E7\u00E3o de tipo complexa.
- cos-all-limited.2 = cos-all-limited.2: O "{"max occurs"}" de um elemento em um grupo de modelos ''all'' deve ser 0 ou 1. O valor ''{0}'' do elemento ''{1}'' \u00E9 inv\u00E1lido.
- cos-applicable-facets = cos-applicable-facets: O aspecto ''{0}'' n\u00E3o \u00E9 permitido pelo tipo {1}.
-@@ -181,21 +153,21 @@
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: O tipo de conte\u00FAdo de um tipo derivado e sua base devem ser mistos ou ambos devem ser somente de elemento. O tipo ''{0}'' \u00E9 misto, mas seu tipo de base n\u00E3o \u00E9.
- cos-element-consistent = cos-element-consistent: Erro do tipo ''{0}''. V\u00E1rios elementos com o nome ''{1}'' com diferentes tipos aparecem no grupo de modelos.
- cos-list-of-atomic = cos-list-of-atomic: Na defini\u00E7\u00E3o do tipo de lista ''{0}'', o tipo ''{1}'' \u00E9 um tipo de elemento da lista inv\u00E1lido porque n\u00E3o \u00E9 at\u00F4mico (''{1}'' \u00E9 um tipo de lista ou um tipo de uni\u00E3o que cont\u00E9m uma lista).
-- cos-nonambig = cos-nonambig: {0} e {1} (ou elementos de seu grupo de substitui\u00E7\u00E3o) violam a \"Unique Particle Attribution\". Durante a valida\u00E7\u00E3o deste esquema, a ambiguidade ser\u00E1 criada para essas duas part\u00EDculas.
-+ cos-nonambig = cos-nonambig: {0} e {1} (ou elementos de seu grupo de substitui\u00E7\u00E3o) violam a "Unique Particle Attribution". Durante a valida\u00E7\u00E3o deste esquema, a ambiguidade ser\u00E1 criada para essas duas part\u00EDculas.
- cos-particle-restrict.a = cos-particle-restrict.a: A part\u00EDcula obtida est\u00E1 vazia e a base n\u00E3o pode ser esvaziada.
- cos-particle-restrict.b = cos-particle-restrict.b: A part\u00EDcula base est\u00E1 vazia, mas a part\u00EDcula obtida n\u00E3o est\u00E1.
- cos-particle-restrict.2 = cos-particle-restrict.2: Restri\u00E7\u00E3o de part\u00EDcula proibida: ''{0}''.
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: O tipo ''{1}'' \u00E9 at\u00F4mico. Dessa forma, sua ''{''base type definition''}'', ''{0}'', deve ser uma defini\u00E7\u00E3o de tipo simples at\u00F4mico ou um tipo de dados primitivo criado.
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: O tipo ''{1}'' \u00E9 at\u00F4mico. Dessa forma, sua '{'base type definition'}', ''{0}'', deve ser uma defini\u00E7\u00E3o de tipo simples at\u00F4mico ou um tipo de dados primitivo criado.
- cos-st-restricts.2.1 = cos-st-restricts.2.1: Na defini\u00E7\u00E3o do tipo de lista ''{0}'', o tipo ''{1}'' \u00E9 um tipo de item inv\u00E1lido porque \u00E9 um tipo de lista ou um tipo de uni\u00E3o que cont\u00E9m uma lista.
- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: O componente "{"final"}" da "{"item type definition"}" ''{0}'' cont\u00E9m ''list''. Isso significa que ''{0}'' n\u00E3o pode ser usado como um tipo de item do tipo de lista ''{1}''.
- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: O componente "{"final"}" de "{"member type definitions"}", ''{0}'', cont\u00E9m ''union''. Isso significa que ''{0}'' n\u00E3o pode ser usado como um tipo de membro do tipo de uni\u00E3o ''{1}''.
-- cos-valid-default.2.1 = cos-valid-default.2.1: O elemento ''{0}'' tem uma restri\u00E7\u00E3o de valor e deve ter um modelo de conte\u00FAdo simples ou misto.
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Como o elemento ''{0}'' tem uma ''{''value constraint''}'' e sua defini\u00E7\u00E3o de tipo tem {''content type''}'' misto, ent\u00E3o a part\u00EDcula do ''{''content type''}'' deve ser esvazi\u00E1vel.
-+ cos-valid-default.2.1 = cos-valid-padr\u00E3o.2.1: O elemento ''{0}'' tem uma restri\u00E7\u00E3o de valor e deve ter um modelo de conte\u00FAdo simples ou misto.
-+ cos-valid-default.2.2.2 = cos-valid-padr\u00E3o.2.2.2: Como o elemento ''{0}'' tem uma '{'value constraint'}' e sua defini\u00E7\u00E3o de tipo tem {''content type'}' misto, ent\u00E3o a part\u00EDcula do '{'content type'}' deve ser esvazi\u00E1vel.
- c-props-correct.2 = c-props-correct.2: A cardinalidade dos Campos de keyref ''{0}'' e chave ''{1}'' deve ser correspondente.
- ct-props-correct.3 = ct-props-correct.3: Defini\u00E7\u00F5es circulares detectadas para o tipo complexo ''{0}''. Isso significa que ''{0}'' est\u00E1 contido em sua pr\u00F3pria hierarquia de tipo, o que \u00E9 um erro.
- ct-props-correct.4 = ct-props-correct.4: Erro do tipo ''{0}''. Os usos do atributo duplicado com o mesmo nome e namespace de destino foram especificados. O nome do uso do atributo duplicado \u00E9 ''{1}''.
- ct-props-correct.5 = ct-props-correct.5: Erro do tipo ''{0}''. Duas declara\u00E7\u00F5es do atributo ''{1}'' e ''{2}'' t\u00EAm tipos que s\u00E3o obtidos do ID.
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: O tipo ''{0}'' foi obtido por meio da restri\u00E7\u00E3o do tipo ''{1}''. No entanto, ''{1}'' tem uma propriedade ''{''final''}'' que pro\u00EDbe a deriva\u00E7\u00E3o por restri\u00E7\u00E3o.
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: O tipo ''{0}'' foi obtido por meio da restri\u00E7\u00E3o do tipo ''{1}''. No entanto, ''{1}'' tem uma propriedade '{'final'}' que pro\u00EDbe a deriva\u00E7\u00E3o por restri\u00E7\u00E3o.
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem um valor de ''uso'' de ''{2}'', que \u00E9 inconsistente com o valor ''obrigat\u00F3rio'' em um uso de atributo correspondente no tipo de base.
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem o tipo ''{2}'', que \u00E9 obtido de forma v\u00E1lida de "{3}", o tipo de uso do atributo correspondente no tipo de base.
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Erro do tipo ''{0}''. O uso do atributo ''{1}'' neste tipo tem uma restri\u00E7\u00E3o de valor efetivo que n\u00E3o \u00E9 fixa e a restri\u00E7\u00E3o de valor efetivo do atributo correspondente no tipo de base \u00E9 fixa.
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Erro do tipo ''{2}''. O valor maxInclusive =''{0}'' deve ser > = minInclusive do tipo de base ''{1}''.
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Erro do tipo ''{2}''. O valor maxInclusive =''{0}'' deve ser > minInclusive do tipo de base ''{1}''.
- maxLength-valid-restriction = maxLength-valid-restriction: Na defini\u00E7\u00E3o de {2}, o valor maxLength = ''{0}'' deve ser <= que o do tipo de base ''{1}''.
-- mg-props-correct.2 = mg-props-correct.2: Defini\u00E7\u00F5es circulares detectadas para o grupo ''{0}''. Seguir de forma recursiva dos valores de ''{''term''}'' das part\u00EDculas conduz a uma part\u00EDcula cujo ''{''term''}'' \u00E9 o pr\u00F3prio grupo.
-+ mg-props-correct.2 = mg-props-correct.2: Defini\u00E7\u00F5es circulares detectadas para o grupo ''{0}''. Seguir de forma recursiva dos valores de '{'term'}' das part\u00EDculas conduz a uma part\u00EDcula cujo '{'term'}' \u00E9 o pr\u00F3prio grupo.
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: Na defini\u00E7\u00E3o de {2}, o valor minExclusive = ''{0}'' deve ser <= que o valor maxExclusive = ''{1}''.
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: Na defini\u00E7\u00E3o de {2}, o valor minExclusive = ''{0}'' deve ser <= que o valor maxInclusive = ''{1}''.
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Erro do tipo ''{2}''. O valor minExclusive =''{0}'' deve ser >= minExclusive do tipo de base ''{1}''.
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: Um esquema n\u00E3o pode conter dois componentes globais com o mesmo nome; este esquema cont\u00E9m duas ocorr\u00EAncias de ''{0}''.
- st-props-correct.2 = st-props-correct.2: Defini\u00E7\u00F5es circulares detectadas para o tipo simples {0}''. Isso significa que ''{0}'' est\u00E1 contido em sua pr\u00F3pria hierarquia de tipo, o que \u00E9 um erro.
-- st-props-correct.3 = st-props-correct.3: Erro do tipo ''{0}''. O valor de ''{''final''}'' da ''{''base type definition''}'', ''{1}'', pro\u00EDbe a obten\u00E7\u00E3o por restri\u00E7\u00E3o.
-+ st-props-correct.3 = st-props-correct.3: Erro do tipo ''{0}''. O valor de '{'final'}' da '{'base type definition'}', ''{1}'', pro\u00EDbe a obten\u00E7\u00E3o por restri\u00E7\u00E3o.
- totalDigits-valid-restriction = totalDigits-valid-restriction: Na defini\u00E7\u00E3o de {2}, o valor ''{0}'' do "totalDigits"'' do aspecto \u00E9 inv\u00E1lido porque ele deve ser <= ao valor de ''totalDigits", que foi definido como ''{1}'' em um dos tipos de ancestrais.
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: Na defini\u00E7\u00E3o de {0}, o valor ''{1}'' do aspecto ''whitespace'' \u00E9 inv\u00E1lido porque o valor para ''whitespace'' foi definido como ''colapse'' em um dos tipos de ancestrais.
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: Na defini\u00E7\u00E3o de {0}, o valor do aspecto ''preserve'' \u00E9 inv\u00E1lido para o aspecto "whitespace" porque o valor para ''whitespace'' foi definido como ''replace'' em um dos tipos de ancestrais.
-@@ -309,7 +281,7 @@
- c-selector-xpath = c-selector-xpath: O valor do seletor = ''{0}'' n\u00E3o \u00E9 v\u00E1lido; os xpaths do seletor n\u00E3o podem conter atributos.
- EmptyTargetNamespace = EmptyTargetNamespace: No documento do esquema ''{0}'', o valor do atributo ''targetNamespace'' n\u00E3o pode ser uma string vazia.
- FacetValueFromBase = FacetValueFromBase: Na declara\u00E7\u00E3o do tipo ''{0}'', o valor ''{1}'' do aspecto ''{2}'' deve ser proveniente do espa\u00E7o de valor do tipo de base, ''{3}''.
-- FixedFacetValue = FixedFacetValue: Na defini\u00E7\u00E3o de {3}, o valor ''{1}'' do aspecto ''{0}'' \u00E9 inv\u00E1lido porque o valor de ''{0}'' foi enviado para ''{2}'' em um dos tipos de ancestrais e ''{''fixed''}'' = true.
-+ FixedFacetValue = FixedFacetValue: Na defini\u00E7\u00E3o de {3}, o valor ''{1}'' do aspecto ''{0}'' \u00E9 inv\u00E1lido porque o valor de ''{0}'' foi enviado para ''{2}'' em um dos tipos de ancestrais e '{'fixed'}' = true.
- InvalidRegex = InvalidRegex: O valor do padr\u00E3o ''{0}'' n\u00E3o \u00E9 uma express\u00E3o regular v\u00E1lida. O erro reportado foi: ''{1}'' na coluna ''{2}''.
- maxOccurLimit = A configura\u00E7\u00E3o atual do parser n\u00E3o permite que o valor de um atributo maxOccurs seja definido como maior que o valor {0}.
- PublicSystemOnNotation = PublicSystemOnNotation: Pelo menos ''public'' e ''system'' devem aparecer no elemento ''notation''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
- FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = Fel vid id-begr\u00E4nsning (cvc-identity-constraint.4.2.1): elementet \"{0}\" har en nyckel som saknar v\u00E4rde.
-- DuplicateField = Dubblettmatchning inom omfattningen av f\u00E4ltet \"{0}\".
-- DuplicateKey = Duplicerat nyckelv\u00E4rde [{0}] har deklarerats f\u00F6r id-begr\u00E4nsning av elementet \"{1}\".
-- DuplicateUnique = Duplicerat unikt v\u00E4rde [{0}] har deklarerats f\u00F6r id-begr\u00E4nsning av elementet \"{1}\".
-- FieldMultipleMatch = Fel vid id-begr\u00E4nsning: f\u00E4ltet \"{0}\" matchar fler \u00E4n ett v\u00E4rde inom omfattningen av v\u00E4ljaren; f\u00E4lt m\u00E5ste matcha unika v\u00E4rden.
-- FixedDiffersFromActual = Elementets inneh\u00E5ll motsvarar inte v\u00E4rdet av attributet som anges som \"fixed\" i elementdeklarationen i schemat.
-- KeyMatchesNillable = Fel vid id-begr\u00E4nsning (cvc-identity-constraint.4.2.3): elementet \"{0}\" har en nyckel som matchar ett element med nullbart v\u00E4rde angivet som true.
-- KeyNotEnoughValues = Det finns inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden angivna f\u00F6r <key name=\"{1}\"> som id-begr\u00E4nsning f\u00F6r elementet \"{0}\".
-+ AbsentKeyValue = Fel vid id-begr\u00E4nsning (cvc-identity-constraint.4.2.1): elementet "{0}" har en nyckel som saknar v\u00E4rde.
-+ DuplicateField = Dubblettmatchning inom omfattningen av f\u00E4ltet "{0}".
-+ DuplicateKey = Duplicerat nyckelv\u00E4rde [{0}] har deklarerats f\u00F6r id-begr\u00E4nsning av elementet "{1}".
-+ DuplicateUnique = Duplicerat unikt v\u00E4rde [{0}] har deklarerats f\u00F6r id-begr\u00E4nsning av elementet "{1}".
-+ FieldMultipleMatch = Fel vid id-begr\u00E4nsning: f\u00E4ltet "{0}" matchar fler \u00E4n ett v\u00E4rde inom omfattningen av v\u00E4ljaren; f\u00E4lt m\u00E5ste matcha unika v\u00E4rden.
-+ FixedDiffersFromActual = Elementets inneh\u00E5ll motsvarar inte v\u00E4rdet av attributet som anges som "fixed" i elementdeklarationen i schemat.
-+ KeyMatchesNillable = Fel vid id-begr\u00E4nsning (cvc-identity-constraint.4.2.3): elementet "{0}" har en nyckel som matchar ett element med nullbart v\u00E4rde angivet som true.
-+ KeyNotEnoughValues = Det finns inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden angivna f\u00F6r <key name="{1}"> som id-begr\u00E4nsning f\u00F6r elementet "{0}".
- KeyNotFound = Nyckeln ''{0}'' med v\u00E4rdet ''{1}'' hittades inte f\u00F6r id-begr\u00E4nsning f\u00F6r element ''{2}''.
-- KeyRefNotEnoughValues = Det finns inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden angivna f\u00F6r <keyref name=\"{1}\"> som id-begr\u00E4nsning f\u00F6r elementet \"{0}\".
-- KeyRefOutOfScope = Fel vid id-begr\u00E4nsning: id-begr\u00E4nsning \"{0}\" har en nyckelreferens som refererar till nyckel eller unikt v\u00E4rde utanf\u00F6r definitionsomr\u00E5det.
-- KeyRefReferNotFound = Nyckelreferensdeklarationen \"{0}\" refererar till ok\u00E4nd nyckel med namnet \"{1}\".
-- UniqueNotEnoughValues = Det finns inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden angivna f\u00F6r <unique> som id-begr\u00E4nsning f\u00F6r elementet \"{0}\".
-- UnknownField = Fel vid intern id-begr\u00E4nsning; ok\u00E4nt f\u00E4lt \"{0}\".
-+ KeyRefNotEnoughValues = Det finns inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden angivna f\u00F6r <keyref name="{1}"> som id-begr\u00E4nsning f\u00F6r elementet "{0}".
-+ KeyRefOutOfScope = Fel vid id-begr\u00E4nsning: id-begr\u00E4nsning "{0}" har en nyckelreferens som refererar till nyckel eller unikt v\u00E4rde utanf\u00F6r definitionsomr\u00E5det.
-+ KeyRefReferNotFound = Nyckelreferensdeklarationen "{0}" refererar till ok\u00E4nd nyckel med namnet "{1}".
-+ UniqueNotEnoughValues = Det finns inte tillr\u00E4ckligt m\u00E5nga v\u00E4rden angivna f\u00F6r <unique> som id-begr\u00E4nsning f\u00F6r elementet "{0}".
-+ UnknownField = Fel vid intern id-begr\u00E4nsning; ok\u00E4nt f\u00E4lt "{0}".
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' har ogiltig typ, ''{3}''.
-- cvc-attribute.4 = cvc-attribute.4: V\u00E4rdet \''{2}\'' f\u00F6r attributet \''{1}\'' i elementet \''{0}\'' har ogiltig fast \''{\''v\u00E4rdebegr\u00E4nsning\''}\''. Attributet m\u00E5ste ha v\u00E4rdet \''{3}\''.
-+ cvc-attribute.4 = cvc-attribute.4: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' har ogiltig fast '{'v\u00E4rdebegr\u00E4nsning'}'. Attributet m\u00E5ste ha v\u00E4rdet ''{3}''.
- cvc-complex-type.2.1 = cvc-complex-type.2.1: Elementet ''{0}'' f\u00E5r inte ha [underordnade] objekt med tecken- eller elementinformation, eftersom inneh\u00E5llstyp \u00E4r tomt.
- cvc-complex-type.2.2 = cvc-complex-type.2.2: Elementet ''{0}'' f\u00E5r inte ha [underordnade] element och v\u00E4rdet m\u00E5ste vara giltigt.
- cvc-complex-type.2.3 = cvc-complex-type.2.3: Elementet ''{0}'' f\u00E5r inte ha [underordnade] tecken, eftersom inneh\u00E5llstyp \u00E4r endast element.
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: Attributet ''{1}'' \u00E4r inte till\u00E5tet i elementet ''{0}''.
- cvc-complex-type.4 = cvc-complex-type.4: Attributet ''{1}'' m\u00E5ste anger i elementet ''{0}''.
- cvc-complex-type.5.1 = cvc-complex-type.5.1: I elementet ''{0}'' \u00E4r attributet ''{1}'' ett joker-id. Joker-id ''{2}'' finns redan och endast ett id kan anv\u00E4ndas.
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: I elementet ''{0}'' \u00E4r attributet ''{1}'' ett joker-id. Det finns redan ett attribut ''{2}'' som tas fr\u00E5n id bland \''{\''attributanv\u00E4ndningar\''}\''.
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: I elementet ''{0}'' \u00E4r attributet ''{1}'' ett joker-id. Det finns redan ett attribut ''{2}'' som tas fr\u00E5n id bland '{'attributanv\u00E4ndningar'}'.
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' \u00E4r inte n\u00E5got giltigt v\u00E4rde f\u00F6r ''{1}''.
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' \u00E4r inte n\u00E5got giltigt v\u00E4rde f\u00F6r listtyp ''{1}''.
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' \u00E4r inte n\u00E5got giltigt v\u00E4rde f\u00F6r uniontyp ''{1}''.
- cvc-elt.1 = cvc-elt.1: Kan inte hitta deklarationen f\u00F6r elementet ''{0}''.
-- cvc-elt.2 = cvc-elt.2: V\u00E4rdet f\u00F6r \''{\''abstrakt\''}\'' i elementdeklarationen f\u00F6r ''{0}'' m\u00E5ste anges som false.
-- cvc-elt.3.1 = cvc-elt.3.1: Attributet ''{1}'' f\u00E5r inte anges i elementet ''{0}'', eftersom \''{\''nullbar\''}\'' egenskap f\u00F6r ''{0}'' har angetts som false.
-+ cvc-elt.2 = cvc-elt.2: V\u00E4rdet f\u00F6r '{'abstrakt'}' i elementdeklarationen f\u00F6r ''{0}'' m\u00E5ste anges som false.
-+ cvc-elt.3.1 = cvc-elt.3.1: Attributet ''{1}'' f\u00E5r inte anges i elementet ''{0}'', eftersom '{'nullbar'}' egenskap f\u00F6r ''{0}'' har angetts som false.
- cvc-elt.3.2.1 = cvc-elt.3.2.1: Elementet ''{0}'' f\u00E5r inte inneh\u00E5lla [underordnade] med tecken- eller elementinformation eftersom ''{1}'' har angetts.
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: Det f\u00E5r inte finnas n\u00E5gon fast \''{\''v\u00E4rdebegr\u00E4nsning\''}\'' f\u00F6r elementet ''{0}'' eftersom ''{1}'' har angetts.
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: Det f\u00E5r inte finnas n\u00E5gon fast '{'v\u00E4rdebegr\u00E4nsning'}' f\u00F6r elementet ''{0}'' eftersom ''{1}'' har angetts.
- cvc-elt.4.1 = cvc-elt.4.1: V\u00E4rdet ''{2}'' f\u00F6r attributet ''{1}'' i elementet ''{0}'' \u00E4r inte n\u00E5got giltigt QName.
- cvc-elt.4.2 = cvc-elt.4.2: Kan inte matcha ''{1}'' med typdefinition f\u00F6r elementet ''{0}''.
- cvc-elt.4.3 = cvc-elt.4.3: Typ ''{1}'' \u00E4r inte giltigt att tas fr\u00E5n typdefinitionen ''{2}'' i elementet ''{0}''.
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: \''{\''v\u00E4rdebegr\u00E4nsning\''}\'' ''{2}'' i elementet ''{0}'' \u00E4r inte n\u00E5got giltigt standardv\u00E4rde f\u00F6r typ ''{1}''.
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: '{'v\u00E4rdebegr\u00E4nsning'}' ''{2}'' i elementet ''{0}'' \u00E4r inte n\u00E5got giltigt standardv\u00E4rde f\u00F6r typ ''{1}''.
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: Elementet ''{0}'' f\u00E5r inte ha [underordnade] objekt med elementinformation.
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: V\u00E4rdet ''{1}'' i elementet ''{0}'' matchar inte v\u00E4rdet med fast ''{''v\u00E4rdebegr\u00E4nsning''}'', ''{2}''.
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: V\u00E4rdet ''{1}'' i elementet ''{0}'' matchar inte v\u00E4rdet med ''{''v\u00E4rdebegr\u00E4nsning''}'', ''{2}''.
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: V\u00E4rdet ''{1}'' i elementet ''{0}'' matchar inte v\u00E4rdet med fast '{'v\u00E4rdebegr\u00E4nsning'}', ''{2}''.
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: V\u00E4rdet ''{1}'' i elementet ''{0}'' matchar inte v\u00E4rdet med '{'v\u00E4rdebegr\u00E4nsning'}', ''{2}''.
- cvc-enumeration-valid = cvc-enumeration-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuell uppr\u00E4kning ''{1}''. V\u00E4rdet m\u00E5ste ing\u00E5 i uppr\u00E4kningen.
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: V\u00E4rdet ''{0}'' har {1} br\u00E5ktalssiffror, men antalet br\u00E5ktalssiffror \u00E4r begr\u00E4nsat till {2}.
- cvc-id.1 = cvc-id.1: Det finns ingen ID/IDREF-bindning f\u00F6r IDREF ''{0}''.
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: Kunde inte l\u00E4sa schemadokumentet ''{0}'' eftersom ''{1}''-\u00E5tkomst inte till\u00E5ts p\u00E5 grund av begr\u00E4nsning som anges av egenskapen accessExternalSchema.
- schema_reference.4 = schema_reference.4: L\u00E4sning av schemadokument ''{0}'' utf\u00F6rdes inte p\u00E5 grund av 1) det g\u00E5r inte att hitta dokumentet; 2) det g\u00E5r inte att l\u00E4sa dokumentet; 3) dokumentets rotelement \u00E4r inte <xsd:schema>.
- src-annotation = src-annotation: element f\u00F6r <anteckningar> f\u00E5r endast inneh\u00E5lla element f\u00F6r <appinfo> och <dokumentation>, men ''{0}'' hittades.
- src-attribute.1 = src-attribute.1: B\u00E5da egenskaperna ''default'' och ''fixed'' kan inte samtidigt ing\u00E5 i attributdeklarationen ''{0}''. Anv\u00E4nd en av dem.
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2: Ett fel intr\u00E4ffade f\u00F6r attributgruppen ''{0}''. Duplicerad attributanv\u00E4ndning med samma namn och namnrymd. Namnet p\u00E5 dubbletten \u00E4r ''{1}''.
- ag-props-correct.3 = ag-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r attributgruppen ''{0}''. Tv\u00E5 attributdeklarationer, ''{1}'' och ''{2}'' har angetts med typer som h\u00E4rleds fr\u00E5n ID.
- a-props-correct.2 = a-props-correct.2: Ogiltigt v\u00E4rde f\u00F6r begr\u00E4nsning, ''{1}'', i attributet ''{0}''.
-- a-props-correct.3 = a-props-correct.3: Attributet ''{0}'' f\u00E5r inte anv\u00E4nda ''fixed'' eller ''default'', eftersom attributets \''{\''typdefinition\''}\'' \u00E4r ID eller h\u00E4rleds fr\u00E5n ID.
-- au-props-correct.2 = au-props-correct.2: Det fasta v\u00E4rdet ''{1}'' har angetts i attributdeklarationen ''{0}''. Om attributet som refererar till ''{0}'' \u00E4ven inneh\u00E5ller en \''{\''v\u00E4rdebegr\u00E4nsning\''}\'' m\u00E5ste du l\u00F6sa detta och ange v\u00E4rdet ''{1}''.
-+ a-props-correct.3 = a-props-correct.3: Attributet ''{0}'' f\u00E5r inte anv\u00E4nda ''fixed'' eller ''default'', eftersom attributets '{'typdefinition'}' \u00E4r ID eller h\u00E4rleds fr\u00E5n ID.
-+ au-props-correct.2 = au-props-correct.2: Det fasta v\u00E4rdet ''{1}'' har angetts i attributdeklarationen ''{0}''. Om attributet som refererar till ''{0}'' \u00E4ven inneh\u00E5ller en '{'v\u00E4rdebegr\u00E4nsning'}' m\u00E5ste du l\u00F6sa detta och ange v\u00E4rdet ''{1}''.
- cos-all-limited.1.2 = cos-all-limited.1.2: En 'all'-modellgrupp m\u00E5ste anges i en partikel med '{'min f\u00F6rekomster'}' = '{'max f\u00F6rekomster'}' = 1 och partikeln m\u00E5ste vara en del i ett par som utg\u00F6r '{'inneh\u00E5llstyp'}' i en komplex typdefinition.
-- cos-all-limited.2 = cos-all-limited.2: V\u00E4rdet f\u00F6r \''{\''max f\u00F6rekomster\''}\'' i ett element i en ''all''-modellgrupp m\u00E5ste vara 0 eller 1. V\u00E4rdet ''{0}'' f\u00F6r elementet ''{1}'' \u00E4r ogiltigt.
-+ cos-all-limited.2 = cos-all-limited.2: V\u00E4rdet f\u00F6r '{'max f\u00F6rekomster'}' i ett element i en ''all''-modellgrupp m\u00E5ste vara 0 eller 1. V\u00E4rdet ''{0}'' f\u00F6r elementet ''{1}'' \u00E4r ogiltigt.
- cos-applicable-facets = cos-applicable-facets: Aspekten (facet) ''{0}'' \u00E4r inte till\u00E5ten med typ {1}.
- cos-ct-extends.1.1 = cos-ct-extends.1.1: Typ ''{0}'' h\u00E4rleds fr\u00E5n ett till\u00E4gg fr\u00E5n typ ''{1}''. Attributet ''final'' i ''{1}'' till\u00E5ter dock inte h\u00E4rledning av till\u00E4gg.
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: Inneh\u00E5llstyp f\u00F6r h\u00E4rledd typ och f\u00F6r basen m\u00E5ste b\u00E5da vara blandade eller endast element. Typ ''{0}'' \u00E4r endast element, men d\u00E4remot inte basen.
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: Inneh\u00E5llstyp f\u00F6r h\u00E4rledd typ och f\u00F6r basen m\u00E5ste b\u00E5da vara blandade eller endast element. Typ ''{0}'' \u00E4r blandat, men d\u00E4remot inte basen.
- cos-element-consistent = cos-element-consistent: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Flera element med namnet ''{1}'', med olika typer, har angetts i modellgruppen.
- cos-list-of-atomic = cos-list-of-atomic: I definitionen av listtyp ''{0}'' \u00E4r typ ''{1}'' en ogiltig typ av listelement eftersom den inte \u00E4r atomisk (''{1}'' \u00E4r antingen en listtyp eller en uniontyp som inneh\u00E5ller en lista).
-- cos-nonambig = cos-nonambig: {0} och {1} (eller element fr\u00E5n ers\u00E4ttningsgruppen) bryter mot \"Unique Particle Attribution\". Detta skapar tvetydighet f\u00F6r partiklarna vid validering gentemot detta schema.
-+ cos-nonambig = cos-nonambig: {0} och {1} (eller element fr\u00E5n ers\u00E4ttningsgruppen) bryter mot "Unique Particle Attribution". Detta skapar tvetydighet f\u00F6r partiklarna vid validering gentemot detta schema.
- cos-particle-restrict.a = cos-particle-restrict.a: H\u00E4rledd partikel \u00E4r tom och basen \u00E4r inte t\u00F6mningsbar.
- cos-particle-restrict.b = cos-particle-restrict.b: Baspartikeln \u00E4r tom, men den h\u00E4rledda partikeln \u00E4r inte det.
- cos-particle-restrict.2 = cos-particle-restrict.2: F\u00F6rbjuden partikelbegr\u00E4nsning: ''{0}''.
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: Typ ''{1}'' \u00E4r atomisk och d\u00E4rf\u00F6r m\u00E5ste \''{\''bastypdefinitionen\''}\'', ''{0}'', anges som atomisk enkel typ eller inbyggd primitiv datatyp.
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: Typ ''{1}'' \u00E4r atomisk och d\u00E4rf\u00F6r m\u00E5ste '{'bastypdefinitionen'}', ''{0}'', anges som atomisk enkel typ eller inbyggd primitiv datatyp.
- cos-st-restricts.2.1 = cos-st-restricts.2.1: I definitionen av listtyp ''{0}'' \u00E4r typ ''{1}'' en ogiltig objekttyp eftersom det \u00E4r antingen en listtyp eller en uniontyp som inneh\u00E5ller en lista.
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: Den \''{\''sista\''}\'' komponenten i \''{\''objekttypdefinitionen\''}\'', ''{0}'', inneh\u00E5ller ''list''. Detta betyder att ''{0}'' inte kan anv\u00E4ndas som objekttyp f\u00F6r listtyp ''{1}''.
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: Den ''{''sista''}'' komponenten i \''{\''medlemtypdefinitionerna\''}\'', ''{0}'', inneh\u00E5ller ''union''. Detta betyder att ''{0}'' inte kan anv\u00E4ndas som medlemstyp f\u00F6r uniontyp ''{1}''.
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: Den '{'sista'}' komponenten i '{'objekttypdefinitionen'}', ''{0}'', inneh\u00E5ller ''list''. Detta betyder att ''{0}'' inte kan anv\u00E4ndas som objekttyp f\u00F6r listtyp ''{1}''.
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: Den '{'sista'}' komponenten i '{'medlemtypdefinitionerna'}', ''{0}'', inneh\u00E5ller ''union''. Detta betyder att ''{0}'' inte kan anv\u00E4ndas som medlemstyp f\u00F6r uniontyp ''{1}''.
- cos-valid-default.2.1 = cos-valid-default.2.1: Elementet ''{0}'' har en v\u00E4rdebegr\u00E4nsning och m\u00E5ste ha en blandad eller enkel inneh\u00E5llsmodell.
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Eftersom elementet ''{0}'' har en \''{\''v\u00E4rdebegr\u00E4nsning\''}\'' och typdefinitionen har blandad \''{\''inneh\u00E5llstyp\''}\'' s\u00E5 m\u00E5ste partikeln av \''{\''inneh\u00E5llstyp\''}\'' vara t\u00F6mningsbar.
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: Eftersom elementet ''{0}'' har en '{'v\u00E4rdebegr\u00E4nsning'}' och typdefinitionen har blandad '{'inneh\u00E5llstyp'}' s\u00E5 m\u00E5ste partikeln av '{'inneh\u00E5llstyp'}' vara t\u00F6mningsbar.
- c-props-correct.2 = c-props-correct.2: Kardinalitet av f\u00E4lt med nyckelreferens ''{0}'' och nyckel ''{1}'' m\u00E5ste matcha varandra.
- ct-props-correct.3 = ct-props-correct.3: Cirkul\u00E4ra definitioner har identifierats f\u00F6r komplex typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel.
- ct-props-correct.4 = ct-props-correct.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Duplicerad attributanv\u00E4ndning med samma namn och namnrymd. Namnet p\u00E5 dubbletten \u00E4r ''{1}''.
- ct-props-correct.5 = ct-props-correct.5: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Tv\u00E5 attributdeklarationer, ''{1}'' och ''{2}'', anv\u00E4nds med typer som h\u00E4rleds fr\u00E5n ID.
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: Typ ''{0}'' h\u00E4rleddes genom begr\u00E4nsning fr\u00E5n typ ''{1}''. ''{1}'' har d\u00E4remot en \''{\''slutlig\''}\'' egenskap som f\u00F6rbjuder h\u00E4rledning via begr\u00E4nsning.
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: Typ ''{0}'' h\u00E4rleddes genom begr\u00E4nsning fr\u00E5n typ ''{1}''. ''{1}'' har d\u00E4remot en '{'slutlig'}' egenskap som f\u00F6rbjuder h\u00E4rledning via begr\u00E4nsning.
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har ''use''-v\u00E4rdet ''{2}'' vilket inte \u00E4r konsekvent med v\u00E4rdet f\u00F6r ''required'' i matchande attributanv\u00E4ndning i bastypen.
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har typ ''{2}'', som inte f\u00E5r h\u00E4rledas fr\u00E5n ''{3}'', typ i matchande attributanv\u00E4ndning i bastypen.
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Attributanv\u00E4ndning ''{1}'' i denna typ har en effektiv v\u00E4rdebegr\u00E4nsning som inte \u00E4r fast, medan den effektiva v\u00E4rdebegr\u00E4nsningen i matchande attributanv\u00E4ndning i bastypen \u00E4r fast.
-@@ -210,11 +182,11 @@
- derivation-ok-restriction.5.3.2 = derivation-ok-restriction.5.3.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Inneh\u00E5llstypen f\u00F6r denna typ \u00E4r tom, men inneh\u00E5llstypen f\u00F6r basen, ''{1}'', \u00E4r inte tom eller t\u00F6mningsbar.
- derivation-ok-restriction.5.4.1.2 = derivation-ok-restriction.5.4.1.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Inneh\u00E5llstypen f\u00F6r denna typ \u00E4r blandad, medan inneh\u00E5llstypen f\u00F6r basen, ''{1}'', inte \u00E4r det.
- derivation-ok-restriction.5.4.2 = derivation-ok-restriction.5.4.2: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. Typpartikeln \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r partikeln i basen.
-- enumeration-required-notation = enumeration-required-notation: NOTATION-typ, ''{0}'' anv\u00E4nds av {2} ''{1}'', m\u00E5ste anges med uppr\u00E4kningsv\u00E4rde som specificerar de notationselement som anv\u00E4nds av denna typ.
-+ enumeration-required-notation = enumeration-required-notation: NOTATION-typ, ''{0}'' anv\u00E4nds av {2} ''{1}'', m\u00E5ste anges med uppr\u00E4kningsaspektv\u00E4rde som specificerar de notationselement som anv\u00E4nds av denna typ.
- enumeration-valid-restriction = enumeration-valid-restriction: Uppr\u00E4kningsv\u00E4rdet ''{0}'' finns inte i bastypens, {1}, v\u00E4rdeutrymme.
- e-props-correct.2 = e-props-correct.2: Ogiltigt v\u00E4rde f\u00F6r begr\u00E4nsningsv\u00E4rde ''{1}'' i elementet ''{0}''.
-- e-props-correct.4 = e-props-correct.4: \''{\''Typdefinition\''}\'' f\u00F6r elementet ''{0}'' har en ogiltig h\u00E4rledning fr\u00E5n \''{\''typdefinitionen\''}\'' f\u00F6r substitutionHead ''{1}'' eller s\u00E5 till\u00E5ts inte denna h\u00E4rledning av egenskapen ''{1}'' f\u00F6r \''{\''ers\u00E4ttningsgruppexkluderingar\''}\''.
-- e-props-correct.5 = e-props-correct.5: En \''{\''v\u00E4rdebegr\u00E4nsning\''}\'' f\u00E5r inte finnas med i elementet ''{0}'' eftersom elementets \''{\''typdefinition\''}\'' eller \''{\''typdefinitionens\''}\'' \''{\''inneh\u00E5llstyp\''}\'' \u00E4r ID, eller h\u00E4rleds fr\u00E5n ID.
-+ e-props-correct.4 = e-props-correct.4: '{'Typdefinition'}' f\u00F6r elementet ''{0}'' har en ogiltig h\u00E4rledning fr\u00E5n '{'typdefinitionen'}' f\u00F6r substitutionHead ''{1}'' eller s\u00E5 till\u00E5ts inte denna h\u00E4rledning av egenskapen ''{1}'' f\u00F6r '{'ers\u00E4ttningsgruppexkluderingar'}'.
-+ e-props-correct.5 = e-props-correct.5: En '{'v\u00E4rdebegr\u00E4nsning'}' f\u00E5r inte finnas med i elementet ''{0}'' eftersom elementets '{'typdefinition'}' eller '{'typdefinitionens'}' '{'inneh\u00E5llstyp'}' \u00E4r ID, eller h\u00E4rleds fr\u00E5n ID.
- e-props-correct.6 = e-props-correct.6: Cirkul\u00E4r ers\u00E4ttningsgrupp identifierades f\u00F6r elementet ''{0}''.
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''fractionDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''fractionDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
- fractionDigits-totalDigits = fractionDigits-totalDigits: I definitionen av {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''fractionDigits'' ogiltigt eftersom v\u00E4rdet m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som \u00E4r ''{1}''.
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n eller lika med minInclusive i bastyp ''{1}''.
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. maxInclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n minExclusive i bastyp ''{1}''.
- maxLength-valid-restriction = maxLength-valid-restriction: I definitionen f\u00F6r {2} m\u00E5ste maxLength-v\u00E4rdet ''{0}'' vara mindre \u00E4n eller lika med v\u00E4rdet i bastyp ''{1}''.
-- mg-props-correct.2 = mg-props-correct.2: Cirkul\u00E4ra definitioner identifierades f\u00F6r gruppen ''{0}''. Rekursivt efterf\u00F6ljande v\u00E4rdena f\u00F6r \''{\''term\''}\'' i partiklarna leder till en partikel vars \''{\''term\''}\'' \u00E4r den ursprungliga gruppen.
-+ mg-props-correct.2 = mg-props-correct.2: Cirkul\u00E4ra definitioner identifierades f\u00F6r gruppen ''{0}''. Rekursivt efterf\u00F6ljande v\u00E4rdena f\u00F6r '{'term'}' i partiklarna leder till en partikel vars '{'term'}' \u00E4r den ursprungliga gruppen.
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: I definitionen f\u00F6r {2} m\u00E5ste minExclusive-v\u00E4rdet ''{0}'' vara mindre \u00E4n eller lika med maxExclusive-v\u00E4rdet ''{1}''.
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: I definitionen f\u00F6r {2} m\u00E5ste minExclusive-v\u00E4rdet ''{0}'' vara mindre \u00E4n maxInclusive-v\u00E4rdet ''{1}''.
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: Ett fel intr\u00E4ffade f\u00F6r typ ''{2}''. minExclusive-v\u00E4rdet ''{0}'' m\u00E5ste vara st\u00F6rre \u00E4n eller lika med minExclusive i bastyp ''{1}''.
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: I definitionen f\u00F6r {2} m\u00E5ste minLength-v\u00E4rdet ''{0}'' vara mindre \u00E4n maxLength-v\u00E4rdet ''{1}''.
- minLength-valid-restriction = minLength-valid-restriction: I definitionen f\u00F6r {2} m\u00E5ste minLength-v\u00E4rdet ''{0}'' vara st\u00F6rre \u00E4n eller lika med v\u00E4rdet i bastyp ''{1}''.
- no-xmlns = no-xmlns: Ett {namn} p\u00E5 en attributdeklaration f\u00E5r inte matcha 'xmlns'.
-- no-xsi = no-xsi: En \''{\''m\u00E5lnamnrymd\''}\'' i en attributdeklaration f\u00E5r inte matcha ''{0}''.
-+ no-xsi = no-xsi: En '{'m\u00E5lnamnrymd'}' i en attributdeklaration f\u00E5r inte matcha ''{0}''.
- p-props-correct.2.1 = p-props-correct.2.1: I deklarationen ''{0}'' \u00E4r v\u00E4rdet f\u00F6r ''minOccurs'' ''{1}'', men det f\u00E5r inte vara st\u00F6rre \u00E4n v\u00E4rdet f\u00F6r ''maxOccurs'' (som \u00E4r ''{2}'').
- rcase-MapAndSum.1 = rcase-MapAndSum.1: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
- rcase-MapAndSum.2 = rcase-MapAndSum.2: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basgruppens f\u00F6rekomstintervall, ({2},{3}).
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: Element har namn och m\u00E5lnamnrymder som inte \u00E4r desamma: Elementet ''{0}'' i namnrymd ''{1}'' och elementet ''{2}'' i namnrymd ''{3}''.
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Ett fel intr\u00E4ffade f\u00F6r partikeln vars \''{\''term\''}\'' \u00E4r elementdeklarationen ''{0}''. Elementdeklarationens v\u00E4rde som \u00E4r \''{\''nullbart\''}\'' har angetts som true, men motsvarande partikel i bastypen har en elementdeklaration vars v\u00E4rde som \u00E4r \''{\''nullbart\''}\'' har angetts som false.
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Ett fel intr\u00E4ffade f\u00F6r partikeln vars \''{\''term\''}\'' \u00E4r elementdeklarationen ''{0}''. F\u00F6rekomstintervallet, ({1},{2}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r intervallet, ({3},{4}, i motsvarande partikel i bastypen.
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: Ett fel intr\u00E4ffade f\u00F6r partikeln vars '{'term'}' \u00E4r elementdeklarationen ''{0}''. Elementdeklarationens v\u00E4rde som \u00E4r '{'nullbart'}' har angetts som true, men motsvarande partikel i bastypen har en elementdeklaration vars v\u00E4rde som \u00E4r '{'nullbart'}' har angetts som false.
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: Ett fel intr\u00E4ffade f\u00F6r partikeln vars '{'term'}' \u00E4r elementdeklarationen ''{0}''. F\u00F6rekomstintervallet, ({1},{2}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r intervallet, ({3},{4}, i motsvarande partikel i bastypen.
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: Elementet ''{0}'' har inte n\u00E5got fast v\u00E4rde, men motsvarande element i bastypen har angetts med det fasta v\u00E4rdet ''{1}''.
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: Elementet ''{0}'' har det fasta v\u00E4rdet ''{1}'', men motsvarande element i bastypen har angetts med det fasta v\u00E4rdet ''{2}''.
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: Identitetsbegr\u00E4nsningarna f\u00F6r elementet ''{0}'' \u00E4r inte n\u00E5gon del av de som finns i basen.
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: De avaktiverade ers\u00E4ttningarna f\u00F6r elementet ''{0}'' \u00E4r inte inneslutna i basen.
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: Elementtyp ''{0}'', ''{1}'' h\u00E4rleds inte fr\u00E5n typ av baselement, ''{2}''.
- rcase-NSCompat.1 = rcase-NSCompat.1: Elementet ''{0}'' har namnrymden ''{1}'' som inte \u00E4r till\u00E5tet av jokertecknet i basen.
-- rcase-NSCompat.2 = rcase-NSCompat.2: Ett fel intr\u00E4ffade f\u00F6r partikeln vars \''{\''term\''}\'' \u00E4r elementdeklarationen ''{0}''. F\u00F6rekomstintervallet, ({1},{2}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r intervallet, ({3},{4}, i motsvarande partikel i bastypen.
-+ rcase-NSCompat.2 = rcase-NSCompat.2: Ett fel intr\u00E4ffade f\u00F6r partikeln vars '{'term'}' \u00E4r elementdeklarationen ''{0}''. F\u00F6rekomstintervallet, ({1},{2}), \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r intervallet, ({3},{4}, i motsvarande partikel i bastypen.
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: Gruppens f\u00F6rekomstintervall ({0},{1}) \u00E4r inte n\u00E5gon giltig begr\u00E4nsning f\u00F6r basjokertecknets intervall, ({2},{3}).
- rcase-NSSubset.1 = rcase-NSSubset.1: Jokertecknet \u00E4r inte n\u00E5gon del av motsvarande jokertecken i basen.
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: Ett schema kan inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''.
- st-props-correct.2 = st-props-correct.2: Cirkul\u00E4ra definitioner har identifierats f\u00F6r enkel typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel.
-- st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r \''{\''slutgiltigt\''}\'' i \''{\''bastypdefinitionen\''}\'', ''{1}'', f\u00F6rbjuder h\u00E4rledning med begr\u00E4nsning.
-+ st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r '{'slutgiltigt'}' i '{'bastypdefinitionen'}', ''{1}'', f\u00F6rbjuder h\u00E4rledning med begr\u00E4nsning.
- totalDigits-valid-restriction = totalDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''totalDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: I definitionen f\u00F6r {0} \u00E4r v\u00E4rdet ''{1}'' f\u00F6r ''whitespace'' ogiltigt, eftersom v\u00E4rdet f\u00F6r ''whitespace'' har angetts som ''collapse'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: I definitionen f\u00F6r {0} \u00E4r v\u00E4rdet ''preserve'' f\u00F6r ''whitespace'' ogiltigt, eftersom v\u00E4rdet f\u00F6r ''whitespace'' har angetts som ''replace'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
-@@ -309,7 +281,7 @@
- c-selector-xpath = c-selector-xpath: V\u00E4ljarv\u00E4rdet ''{0}'' \u00E4r ogiltigt; xpath f\u00F6r v\u00E4ljare f\u00E5r inte inneh\u00E5lla attribut.
- EmptyTargetNamespace = EmptyTargetNamespace: I schemadokumentet ''{0}'' f\u00E5r v\u00E4rdet f\u00F6r attributet ''targetNamespace'' inte vara en tom str\u00E4ng.
- FacetValueFromBase = FacetValueFromBase: I deklarationen av typ ''{0}'' m\u00E5ste v\u00E4rdet ''{1}'' f\u00F6r aspekt ''{2}'' komma fr\u00E5n v\u00E4rdeutrymmet i bastypen ''{3}''.
-- FixedFacetValue = FixedFacetValue: I definitionen f\u00F6r {3} \u00E4r v\u00E4rdet ''{1}'' f\u00F6r aspekten ''{0}'' ogiltigt eftersom v\u00E4rdet f\u00F6r ''{0}'' har angetts som ''{2}'' i n\u00E5gon av typerna f\u00F6r \u00F6verordnade samtidigt som \''{\''fast\''}\'' = true.
-+ FixedFacetValue = FixedFacetValue: I definitionen f\u00F6r {3} \u00E4r v\u00E4rdet ''{1}'' f\u00F6r aspekten ''{0}'' ogiltigt eftersom v\u00E4rdet f\u00F6r ''{0}'' har angetts som ''{2}'' i n\u00E5gon av typerna f\u00F6r \u00F6verordnade samtidigt som '{'fast'}' = true.
- InvalidRegex = InvalidRegex: M\u00F6nsterv\u00E4rdet ''{0}'' \u00E4r inte n\u00E5got giltigt regulj\u00E4rt uttryck. Det rapporterade felet \u00E4r: ''{1}'' i kolumn ''{2}''.
- maxOccurLimit = Den aktuella konfigurationen f\u00F6r parsern till\u00E5ter inte att attributv\u00E4rdet f\u00F6r Occurs anges som st\u00F6rre \u00E4n v\u00E4rdet {0}.
- PublicSystemOnNotation = PublicSystemOnNotation: \u00C5tminstone ett av ''public'' och ''system'' m\u00E5ste anges i elementets ''notation''.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
- FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF (cvc-identity-constraint.4.2.1): \u5143\u7D20 \"{0}\" \u7684\u4E00\u4E2A\u5173\u952E\u5B57\u6CA1\u6709\u503C\u3002
-- DuplicateField = \u5B57\u6BB5 \"{0}\" \u5728\u4F5C\u7528\u57DF\u5185\u6709\u91CD\u590D\u5339\u914D\u3002
-- DuplicateKey = \u4E3A\u5143\u7D20 \"{1}\" \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u58F0\u660E\u7684\u5173\u952E\u5B57\u503C [{0}] \u91CD\u590D\u3002
-- DuplicateUnique = \u4E3A\u5143\u7D20 \"{1}\" \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u58F0\u660E\u7684\u552F\u4E00\u503C [{0}] \u91CD\u590D\u3002
-- FieldMultipleMatch = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF: \u5B57\u6BB5 \"{0}\" \u4E0E\u5176\u9009\u62E9\u5668\u4F5C\u7528\u57DF\u5185\u7684\u591A\u4E2A\u503C\u5339\u914D; \u5B57\u6BB5\u5FC5\u987B\u4E0E\u552F\u4E00\u503C\u5339\u914D\u3002
-- FixedDiffersFromActual = \u6B64\u5143\u7D20\u7684\u5185\u5BB9\u4E0E\u65B9\u6848\u4E2D\u5143\u7D20\u58F0\u660E\u7684 \"fixed\" \u5C5E\u6027\u7684\u503C\u4E0D\u76F8\u540C\u3002
-- KeyMatchesNillable = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF (cvc-identity-constraint.4.2.3): \u5143\u7D20 \"{0}\" \u5177\u6709\u4E00\u4E2A\u4E0E nillable \u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u7684\u5143\u7D20\u5339\u914D\u7684\u5173\u952E\u5B57\u3002
-- KeyNotEnoughValues = \u5BF9\u4E8E\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7684 <key name=\"{1}\"> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
-+ AbsentKeyValue = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF (cvc-identity-constraint.4.2.1): \u5143\u7D20 "{0}" \u7684\u4E00\u4E2A\u5173\u952E\u5B57\u6CA1\u6709\u503C\u3002
-+ DuplicateField = \u5B57\u6BB5 "{0}" \u5728\u4F5C\u7528\u57DF\u5185\u6709\u91CD\u590D\u5339\u914D\u3002
-+ DuplicateKey = \u4E3A\u5143\u7D20 "{1}" \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u58F0\u660E\u7684\u5173\u952E\u5B57\u503C [{0}] \u91CD\u590D\u3002
-+ DuplicateUnique = \u4E3A\u5143\u7D20 "{1}" \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u58F0\u660E\u7684\u552F\u4E00\u503C [{0}] \u91CD\u590D\u3002
-+ FieldMultipleMatch = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF: \u5B57\u6BB5 "{0}" \u4E0E\u5176\u9009\u62E9\u5668\u4F5C\u7528\u57DF\u5185\u7684\u591A\u4E2A\u503C\u5339\u914D; \u5B57\u6BB5\u5FC5\u987B\u4E0E\u552F\u4E00\u503C\u5339\u914D\u3002
-+ FixedDiffersFromActual = \u6B64\u5143\u7D20\u7684\u5185\u5BB9\u4E0E\u65B9\u6848\u4E2D\u5143\u7D20\u58F0\u660E\u7684 "fixed" \u5C5E\u6027\u7684\u503C\u4E0D\u76F8\u540C\u3002
-+ KeyMatchesNillable = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF (cvc-identity-constraint.4.2.3): \u5143\u7D20 "{0}" \u5177\u6709\u4E00\u4E2A\u4E0E nillable \u8BBE\u7F6E\u4E3A\u201C\u771F\u201D\u7684\u5143\u7D20\u5339\u914D\u7684\u5173\u952E\u5B57\u3002
-+ KeyNotEnoughValues = \u5BF9\u4E8E\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <key name="{1}"> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
- KeyNotFound = \u6CA1\u6709\u4E3A\u5143\u7D20 ''{2}'' \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u627E\u5230\u503C\u4E3A ''{1}'' \u7684\u5173\u952E\u5B57 ''{0}''\u3002
-- KeyRefNotEnoughValues = \u5BF9\u4E8E\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7684 <keyref name=\"{1}\"> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
-- KeyRefOutOfScope = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF: \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 \"{0}\" \u5177\u6709\u4E00\u4E2A\u5F15\u7528\u4E86\u4F5C\u7528\u57DF\u4E4B\u5916\u7684\u5173\u952E\u5B57\u6216\u552F\u4E00\u503C\u7684 keyref\u3002
-- KeyRefReferNotFound = \u5173\u952E\u5B57\u5F15\u7528\u58F0\u660E \"{0}\" \u5F15\u7528\u4E86\u540D\u4E3A \"{1}\" \u7684\u672A\u77E5\u5173\u952E\u5B57\u3002
-- UniqueNotEnoughValues = \u5BF9\u4E8E\u4E3A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7684 <unique> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
-- UnknownField = \u5185\u90E8\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF; \u5B57\u6BB5 \"{0}\" \u672A\u77E5\u3002
-+ KeyRefNotEnoughValues = \u5BF9\u4E8E\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <keyref name="{1}"> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
-+ KeyRefOutOfScope = \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF: \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6 "{0}" \u5177\u6709\u4E00\u4E2A\u5F15\u7528\u4E86\u4F5C\u7528\u57DF\u4E4B\u5916\u7684\u5173\u952E\u5B57\u6216\u552F\u4E00\u503C\u7684 keyref\u3002
-+ KeyRefReferNotFound = \u5173\u952E\u5B57\u5F15\u7528\u58F0\u660E "{0}" \u5F15\u7528\u4E86\u540D\u4E3A "{1}" \u7684\u672A\u77E5\u5173\u952E\u5B57\u3002
-+ UniqueNotEnoughValues = \u5BF9\u4E8E\u4E3A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <unique> \u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6, \u6CA1\u6709\u4E3A\u5B83\u6307\u5B9A\u8DB3\u591F\u7684\u503C\u3002
-+ UnknownField = \u5185\u90E8\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u9519\u8BEF; \u5B57\u6BB5 "{0}" \u672A\u77E5\u3002
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0E\u5176\u7C7B\u578B ''{3}'' \u4E0D\u5339\u914D\u3002
-- cvc-attribute.4 = cvc-attribute.4: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0E\u5176\u56FA\u5B9A\u7684 ''{''value constraint''}'' \u4E0D\u5339\u914D\u3002\u8BE5\u5C5E\u6027\u7684\u503C\u5FC5\u987B\u4E3A ''{3}''\u3002
-+ cvc-attribute.4 = cvc-attribute.4: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0E\u5176\u56FA\u5B9A\u7684 '{'value constraint'}' \u4E0D\u5339\u914D\u3002\u8BE5\u5C5E\u6027\u7684\u503C\u5FC5\u987B\u4E3A ''{3}''\u3002
- cvc-complex-type.2.1 = cvc-complex-type.2.1: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5B57\u7B26\u6216\u5143\u7D20\u4FE1\u606F\u9879 [\u5B50\u7EA7], \u56E0\u4E3A\u8BE5\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u4E3A\u7A7A\u3002
- cvc-complex-type.2.2 = cvc-complex-type.2.2: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5143\u7D20 [\u5B50\u7EA7], \u5E76\u4E14\u5176\u503C\u5FC5\u987B\u6709\u6548\u3002
- cvc-complex-type.2.3 = cvc-complex-type.2.3: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5B57\u7B26 [\u5B50\u7EA7], \u56E0\u4E3A\u8BE5\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u4E3A\u201C\u4EC5\u5143\u7D20\u201D\u3002
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u5141\u8BB8\u51FA\u73B0\u5C5E\u6027 ''{1}''\u3002
- cvc-complex-type.4 = cvc-complex-type.4: \u5143\u7D20 ''{0}'' \u4E2D\u5FC5\u987B\u5305\u542B\u5C5E\u6027 ''{1}''\u3002
- cvc-complex-type.5.1 = cvc-complex-type.5.1: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u662F\u4E00\u4E2A\u901A\u7528 ID\u3002\u4F46\u5DF2\u5B58\u5728\u901A\u7528 ID ''{2}''\u3002\u53EA\u80FD\u6709\u4E00\u4E2A\u901A\u7528 ID\u3002
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u662F\u4E00\u4E2A\u901A\u7528 ID\u3002\u4F46\u5DF2\u6709\u4E00\u4E2A\u5C5E\u6027 ''{2}'' \u662F\u4ECE ''{''attribute uses''}'' \u4E2D\u7684 ID \u6D3E\u751F\u7684\u3002
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: \u5728\u5143\u7D20 ''{0}'' \u4E2D, \u5C5E\u6027 ''{1}'' \u662F\u4E00\u4E2A\u901A\u7528 ID\u3002\u4F46\u5DF2\u6709\u4E00\u4E2A\u5C5E\u6027 ''{2}'' \u662F\u4ECE '{'attribute uses'}' \u4E2D\u7684 ID \u6D3E\u751F\u7684\u3002
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' \u4E0D\u662F ''{1}'' \u7684\u6709\u6548\u503C\u3002
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' \u4E0D\u662F\u5217\u8868\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' \u4E0D\u662F\u8054\u5408\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
- cvc-elt.1 = cvc-elt.1: \u627E\u4E0D\u5230\u5143\u7D20 ''{0}'' \u7684\u58F0\u660E\u3002
-- cvc-elt.2 = cvc-elt.2: ''{0}'' \u7684\u5143\u7D20\u58F0\u660E\u4E2D ''{''abstract''}'' \u7684\u503C\u5FC5\u987B\u4E3A\u201C\u5047\u201D\u3002
-- cvc-elt.3.1 = cvc-elt.3.1: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B\u5C5E\u6027 ''{1}'', \u56E0\u4E3A ''{0}'' \u7684 ''{''nillable''}'' \u5C5E\u6027\u4E3A\u201C\u5047\u201D\u3002
-+ cvc-elt.2 = cvc-elt.2: ''{0}'' \u7684\u5143\u7D20\u58F0\u660E\u4E2D '{'abstract'}' \u7684\u503C\u5FC5\u987B\u4E3A\u201C\u5047\u201D\u3002
-+ cvc-elt.3.1 = cvc-elt.3.1: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B\u5C5E\u6027 ''{1}'', \u56E0\u4E3A ''{0}'' \u7684 '{'nillable'}' \u5C5E\u6027\u4E3A\u201C\u5047\u201D\u3002
- cvc-elt.3.2.1 = cvc-elt.3.2.1: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5B57\u7B26\u6216\u5143\u7D20\u4FE1\u606F [\u5B50\u7EA7], \u56E0\u4E3A\u5DF2\u6307\u5B9A ''{1}''\u3002
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u5305\u542B\u56FA\u5B9A\u7684 ''{''value constraint''}'', \u56E0\u4E3A\u5DF2\u6307\u5B9A ''{1}''\u3002
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u5305\u542B\u56FA\u5B9A\u7684 '{'value constraint'}', \u56E0\u4E3A\u5DF2\u6307\u5B9A ''{1}''\u3002
- cvc-elt.4.1 = cvc-elt.4.1: \u5143\u7D20 ''{0}'' \u7684\u5C5E\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0D\u662F\u6709\u6548\u7684\u9650\u5B9A\u540D\u3002
- cvc-elt.4.2 = cvc-elt.4.2: \u65E0\u6CD5\u5C06 ''{1}'' \u89E3\u6790\u4E3A\u5143\u7D20 ''{0}'' \u7684\u7C7B\u578B\u5B9A\u4E49\u3002
- cvc-elt.4.3 = cvc-elt.4.3: \u7C7B\u578B ''{1}'' \u4E0D\u662F\u4ECE\u5143\u7D20 ''{0}'' \u7684\u7C7B\u578B\u5B9A\u4E49 ''{2}'' \u6709\u6548\u6D3E\u751F\u7684\u3002
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: \u5143\u7D20 ''{0}'' \u7684 ''{''value constraint''}'' ''{2}'' \u4E0D\u662F\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u9ED8\u8BA4\u503C\u3002
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: \u5143\u7D20 ''{0}'' \u7684 '{'value constraint'}' ''{2}'' \u4E0D\u662F\u7C7B\u578B ''{1}'' \u7684\u6709\u6548\u9ED8\u8BA4\u503C\u3002
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: \u5143\u7D20 ''{0}'' \u5FC5\u987B\u4E0D\u542B\u5143\u7D20\u4FE1\u606F\u9879 [\u5B50\u7EA7]\u3002
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0E\u56FA\u5B9A\u7684 ''{''value constraint''}'' \u503C ''{2}'' \u4E0D\u5339\u914D\u3002
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0E ''{''value constraint''}'' \u503C ''{2}'' \u4E0D\u5339\u914D\u3002
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0E\u56FA\u5B9A\u7684 '{'value constraint'}' \u503C ''{2}'' \u4E0D\u5339\u914D\u3002
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0E '{'value constraint'}' \u503C ''{2}'' \u4E0D\u5339\u914D\u3002
- cvc-enumeration-valid = cvc-enumeration-valid: \u5BF9\u4E8E\u679A\u4E3E ''{1}'', \u503C ''{0}'' \u4E0D\u5177\u6709\u9762\u6709\u6548\u6027\u3002\u5B83\u5FC5\u987B\u662F\u6765\u81EA\u679A\u4E3E\u7684\u503C\u3002
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: \u503C ''{0}'' \u5177\u6709 {1} \u4F4D\u5C0F\u6570, \u4F46\u5C0F\u6570\u4F4D\u6570\u5DF2\u9650\u5236\u4E3A {2}\u3002
- cvc-id.1 = cvc-id.1: IDREF ''{0}'' \u6CA1\u6709 ID/IDREF \u7ED1\u5B9A\u3002
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: \u7531\u4E8E accessExternalSchema \u5C5E\u6027\u8BBE\u7F6E\u7684\u9650\u5236\u800C\u4E0D\u5141\u8BB8 ''{1}'' \u8BBF\u95EE, \u56E0\u6B64\u65E0\u6CD5\u8BFB\u53D6\u65B9\u6848\u6587\u6863 ''{0}''\u3002
- schema_reference.4 = schema_reference.4: \u65E0\u6CD5\u8BFB\u53D6\u65B9\u6848\u6587\u6863 ''{0}'', \u539F\u56E0\u4E3A 1) \u65E0\u6CD5\u627E\u5230\u6587\u6863; 2) \u65E0\u6CD5\u8BFB\u53D6\u6587\u6863; 3) \u6587\u6863\u7684\u6839\u5143\u7D20\u4E0D\u662F <xsd:schema>\u3002
- src-annotation = src-annotation: <annotation> \u5143\u7D20\u53EA\u80FD\u5305\u542B <appinfo> \u548C <documentation> \u5143\u7D20, \u4F46\u53D1\u73B0\u4E86 ''{0}''\u3002
- src-attribute.1 = src-attribute.1: \u5C5E\u6027\u58F0\u660E ''{0}'' \u4E2D\u4E0D\u80FD\u540C\u65F6\u5B58\u5728\u7279\u6027 ''default'' \u548C ''fixed''\u3002\u5E94\u53EA\u4F7F\u7528\u5176\u4E2D\u4E00\u4E2A\u3002
-@@ -171,31 +143,31 @@
- ag-props-correct.2 = ag-props-correct.2: \u5C5E\u6027\u7EC4 ''{0}'' \u9519\u8BEF\u3002\u6307\u5B9A\u4E86\u5177\u6709\u76F8\u540C\u540D\u79F0\u548C\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u7684\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u3002\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u7684\u540D\u79F0\u4E3A ''{1}''\u3002
- ag-props-correct.3 = ag-props-correct.3: \u5C5E\u6027\u7EC4 ''{0}'' \u9519\u8BEF\u3002\u4E24\u4E2A\u5C5E\u6027\u58F0\u660E ''{1}'' \u548C ''{2}'' \u5177\u6709\u7684\u7C7B\u578B\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
- a-props-correct.2 = a-props-correct.2: \u5C5E\u6027 ''{0}'' \u4E2D\u7684\u503C\u7EA6\u675F\u6761\u4EF6\u7684\u503C ''{1}'' \u65E0\u6548\u3002
-- a-props-correct.3 = a-props-correct.3: \u5C5E\u6027 ''{0}'' \u4E0D\u80FD\u4F7F\u7528 ''fixed'' \u6216 ''default'', \u56E0\u4E3A\u5176 ''{''type definition''}'' \u4E3A ID, \u6216\u8005\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
-- au-props-correct.2 = au-props-correct.2: \u5728 ''{0}'' \u7684\u5C5E\u6027\u58F0\u660E\u4E2D, \u6307\u5B9A\u4E86\u56FA\u5B9A\u503C ''{1}''\u3002\u56E0\u6B64\u5982\u679C\u5F15\u7528 ''{0}'' \u7684\u5C5E\u6027\u7528\u6CD5\u540C\u65F6\u5177\u6709 ''{''value constraint''}'', \u5219\u5B83\u5FC5\u987B\u662F\u56FA\u5B9A\u7684, \u5E76\u4E14\u5176\u503C\u5FC5\u987B\u4E3A ''{1}''\u3002
-+ a-props-correct.3 = a-props-correct.3: \u5C5E\u6027 ''{0}'' \u4E0D\u80FD\u4F7F\u7528 ''fixed'' \u6216 ''default'', \u56E0\u4E3A\u5176 '{'type definition'}' \u4E3A ID, \u6216\u8005\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
-+ au-props-correct.2 = au-props-correct.2: \u5728 ''{0}'' \u7684\u5C5E\u6027\u58F0\u660E\u4E2D, \u6307\u5B9A\u4E86\u56FA\u5B9A\u503C ''{1}''\u3002\u56E0\u6B64\u5982\u679C\u5F15\u7528 ''{0}'' \u7684\u5C5E\u6027\u7528\u6CD5\u540C\u65F6\u5177\u6709 '{'value constraint'}', \u5219\u5B83\u5FC5\u987B\u662F\u56FA\u5B9A\u7684, \u5E76\u4E14\u5176\u503C\u5FC5\u987B\u4E3A ''{1}''\u3002
- cos-all-limited.1.2 = cos-all-limited.1.2: '{'min occurs'}' = '{'max occurs'}' = 1 \u7684\u7C92\u5B50\u4E2D\u5FC5\u987B\u5305\u542B 'all' \u6A21\u578B\u7EC4, \u8BE5\u7C92\u5B50\u5FC5\u987B\u662F\u7EC4\u6210\u590D\u6742\u7C7B\u578B\u5B9A\u4E49\u7684 '{'content type'}' \u5BF9\u7684\u4E00\u90E8\u5206\u3002
-- cos-all-limited.2 = cos-all-limited.2: \u5728 ''all'' \u6A21\u578B\u7EC4\u4E2D\u5143\u7D20\u7684 ''{''max occurs''}'' \u5FC5\u987B\u4E3A 0 \u6216 1\u3002\u5143\u7D20 ''{1}'' \u7684\u503C ''{0}'' \u65E0\u6548\u3002
-+ cos-all-limited.2 = cos-all-limited.2: \u5728 ''all'' \u6A21\u578B\u7EC4\u4E2D\u5143\u7D20\u7684 '{'max occurs'}' \u5FC5\u987B\u4E3A 0 \u6216 1\u3002\u5143\u7D20 ''{1}'' \u7684\u503C ''{0}'' \u65E0\u6548\u3002
- cos-applicable-facets = cos-applicable-facets: \u7C7B\u578B {1} \u4E0D\u5141\u8BB8\u9762 ''{0}''\u3002
- cos-ct-extends.1.1 = cos-ct-extends.1.1: \u7C7B\u578B ''{0}'' \u662F\u4ECE\u7C7B\u578B ''{1}'' \u7684\u6269\u5C55\u6D3E\u751F\u7684\u3002\u4F46\u662F, ''{1}'' \u7684 ''final'' \u5C5E\u6027\u7981\u6B62\u7531\u6269\u5C55\u6D3E\u751F\u3002
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \u6D3E\u751F\u7C7B\u578B\u53CA\u5176\u57FA\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u90FD\u5FC5\u987B\u4E3A\u201C\u6DF7\u5408\u201D\u6216\u201C\u4EC5\u5143\u7D20\u201D\u3002\u7C7B\u578B ''{0}'' \u4E3A\u201C\u4EC5\u5143\u7D20\u201D, \u4F46\u5176\u57FA\u7C7B\u578B\u4E0D\u662F\u3002
- cos-ct-extends.1.4.3.2.2.1.b = cos-ct-extends.1.4.3.2.2.1.b: \u6D3E\u751F\u7C7B\u578B\u53CA\u5176\u57FA\u7C7B\u578B\u7684\u5185\u5BB9\u7C7B\u578B\u90FD\u5FC5\u987B\u4E3A\u201C\u6DF7\u5408\u201D\u6216\u201C\u4EC5\u5143\u7D20\u201D\u3002\u7C7B\u578B ''{0}'' \u4E3A\u201C\u6DF7\u5408\u201D, \u4F46\u5176\u57FA\u7C7B\u578B\u4E0D\u662F\u3002
- cos-element-consistent = cos-element-consistent: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6A21\u578B\u7EC4\u4E2D\u5B58\u5728\u540D\u79F0\u4E3A ''{1}'' \u4E14\u5177\u6709\u4E0D\u540C\u7C7B\u578B\u7684\u591A\u4E2A\u5143\u7D20\u3002
- cos-list-of-atomic = cos-list-of-atomic: \u5728\u5217\u8868\u7C7B\u578B ''{0}'' \u7684\u5B9A\u4E49\u4E2D, \u7C7B\u578B ''{1}'' \u662F\u65E0\u6548\u7684\u5217\u8868\u5143\u7D20\u7C7B\u578B, \u56E0\u4E3A\u5B83\u4E0D\u662F\u539F\u5B50 (''{1}'' \u65E2\u4E0D\u662F\u5217\u8868\u7C7B\u578B, \u4E5F\u4E0D\u662F\u5305\u542B\u5217\u8868\u7684\u8054\u5408\u7C7B\u578B)\u3002
-- cos-nonambig = cos-nonambig: {0} \u548C {1} (\u6216\u6765\u81EA\u5176\u66FF\u4EE3\u7EC4\u7684\u5143\u7D20) \u8FDD\u53CD\u4E86 \"\u552F\u4E00\u7C92\u5B50\u5C5E\u6027\"\u3002\u6839\u636E\u6B64\u65B9\u6848\u8FDB\u884C\u9A8C\u8BC1\u671F\u95F4, \u8FD9\u4E24\u4E2A\u7C92\u5B50\u4F1A\u9020\u6210\u6B67\u4E49\u3002
-+ cos-nonambig = cos-nonambig: {0} \u548C {1} (\u6216\u6765\u81EA\u5176\u66FF\u4EE3\u7EC4\u7684\u5143\u7D20) \u8FDD\u53CD\u4E86 "\u552F\u4E00\u7C92\u5B50\u5C5E\u6027"\u3002\u6839\u636E\u6B64\u65B9\u6848\u8FDB\u884C\u9A8C\u8BC1\u671F\u95F4, \u8FD9\u4E24\u4E2A\u7C92\u5B50\u4F1A\u9020\u6210\u6B67\u4E49\u3002
- cos-particle-restrict.a = cos-particle-restrict.a: \u6D3E\u751F\u7684\u7C92\u5B50\u4E3A\u7A7A, \u800C\u57FA\u7C92\u5B50\u4E0D\u53EF\u4E3A\u7A7A\u3002
- cos-particle-restrict.b = cos-particle-restrict.b: \u57FA\u7C92\u5B50\u4E3A\u7A7A, \u4F46\u6D3E\u751F\u7C92\u5B50\u4E0D\u4E3A\u7A7A\u3002
- cos-particle-restrict.2 = cos-particle-restrict.2: \u7981\u6B62\u7C92\u5B50\u9650\u5236: ''{0}''\u3002
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: \u7C7B\u578B ''{1}'' \u4E3A\u539F\u5B50, \u56E0\u6B64\u5176 ''{''base type definition''}'' ''{0}'' \u5FC5\u987B\u4E3A\u539F\u5B50\u7B80\u5355\u7C7B\u578B\u5B9A\u4E49\u6216\u5185\u7F6E\u57FA\u5143\u6570\u636E\u7C7B\u578B\u3002
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: \u7C7B\u578B ''{1}'' \u4E3A\u539F\u5B50, \u56E0\u6B64\u5176 '{'base type definition'}' ''{0}'' \u5FC5\u987B\u4E3A\u539F\u5B50\u7B80\u5355\u7C7B\u578B\u5B9A\u4E49\u6216\u5185\u7F6E\u57FA\u5143\u6570\u636E\u7C7B\u578B\u3002
- cos-st-restricts.2.1 = cos-st-restricts.2.1: \u5728\u5217\u8868\u7C7B\u578B ''{0}'' \u7684\u5B9A\u4E49\u4E2D, \u7C7B\u578B ''{1}'' \u662F\u65E0\u6548\u7684\u9879\u7C7B\u578B, \u56E0\u4E3A\u5B83\u65E2\u4E0D\u662F\u5217\u8868\u7C7B\u578B, \u4E5F\u4E0D\u662F\u5305\u542B\u5217\u8868\u7684\u8054\u5408\u7C7B\u578B\u3002
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: ''{''item type definition''}'' \u7684 ''{''final''}'' \u7EC4\u4EF6 ''{0}'' \u5305\u542B ''list''\u3002\u8FD9\u8868\u793A ''{0}'' \u4E0D\u80FD\u7528\u4F5C\u5217\u8868\u7C7B\u578B ''{1}'' \u7684\u9879\u7C7B\u578B\u3002
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: ''{''member type definitions''}'' ''{0}'' \u7684 ''{''final''}'' \u7EC4\u4EF6\u5305\u542B ''union''\u3002\u8FD9\u8868\u793A ''{0}'' \u4E0D\u80FD\u7528\u4F5C\u8054\u5408\u7C7B\u578B ''{1}'' \u7684\u6210\u5458\u7C7B\u578B\u3002
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' \u7684 '{'final'}' \u7EC4\u4EF6 ''{0}'' \u5305\u542B ''list''\u3002\u8FD9\u8868\u793A ''{0}'' \u4E0D\u80FD\u7528\u4F5C\u5217\u8868\u7C7B\u578B ''{1}'' \u7684\u9879\u7C7B\u578B\u3002
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' ''{0}'' \u7684 '{'final'}' \u7EC4\u4EF6\u5305\u542B ''union''\u3002\u8FD9\u8868\u793A ''{0}'' \u4E0D\u80FD\u7528\u4F5C\u8054\u5408\u7C7B\u578B ''{1}'' \u7684\u6210\u5458\u7C7B\u578B\u3002
- cos-valid-default.2.1 = cos-valid-default.2.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u503C\u7EA6\u675F\u6761\u4EF6, \u5E76\u4E14\u5FC5\u987B\u5177\u6709\u201C\u6DF7\u5408\u201D\u6216\u201C\u7B80\u5355\u201D\u5185\u5BB9\u6A21\u578B\u3002
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u7531\u4E8E\u5143\u7D20 ''{0}'' \u5177\u6709 ''{''value constraint''}'', \u5E76\u4E14\u5176\u7C7B\u578B\u5B9A\u4E49\u5177\u6709\u6DF7\u5408\u7684 ''{''content type''}'', \u5219 ''{''content type''}'' \u7684\u7C92\u5B50\u5FC5\u987B\u53EF\u4E3A\u7A7A\u3002
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u7531\u4E8E\u5143\u7D20 ''{0}'' \u5177\u6709 '{'value constraint'}', \u5E76\u4E14\u5176\u7C7B\u578B\u5B9A\u4E49\u5177\u6709\u6DF7\u5408\u7684 '{'content type'}', \u5219 '{'content type'}' \u7684\u7C92\u5B50\u5FC5\u987B\u53EF\u4E3A\u7A7A\u3002
- c-props-correct.2 = c-props-correct.2: \u952E\u5F15\u7528 ''{0}'' \u548C\u952E ''{1}'' \u4E2D\u5B57\u6BB5\u7684\u57FA\u6570\u5FC5\u987B\u76F8\u540C\u3002
- ct-props-correct.3 = ct-props-correct.3: \u5728\u590D\u6742\u7C7B\u578B ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u8FD9\u8868\u793A ''{0}'' \u5305\u542B\u5728\u5176\u81EA\u8EAB\u7684\u7C7B\u578B\u5206\u5C42\u7ED3\u6784\u4E2D, \u8FD9\u662F\u9519\u8BEF\u7684\u3002
- ct-props-correct.4 = ct-props-correct.4: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6307\u5B9A\u4E86\u5177\u6709\u76F8\u540C\u540D\u79F0\u548C\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u7684\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u3002\u91CD\u590D\u5C5E\u6027\u7528\u6CD5\u7684\u540D\u79F0\u4E3A ''{1}''\u3002
- ct-props-correct.5 = ct-props-correct.5: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u4E24\u4E2A\u5C5E\u6027\u58F0\u660E ''{1}'' \u548C ''{2}'' \u5177\u6709\u4ECE ID \u6D3E\u751F\u7684\u7C7B\u578B\u3002
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: \u7C7B\u578B ''{0}'' \u7531\u9650\u5236\u4ECE\u7C7B\u578B ''{1}'' \u6D3E\u751F\u3002\u4F46\u662F, ''{1}'' \u5177\u6709\u7981\u6B62\u7531\u9650\u5236\u6D3E\u751F\u7684 ''{''final''}'' \u5C5E\u6027\u3002
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: \u7C7B\u578B ''{0}'' \u7531\u9650\u5236\u4ECE\u7C7B\u578B ''{1}'' \u6D3E\u751F\u3002\u4F46\u662F, ''{1}'' \u5177\u6709\u7981\u6B62\u7531\u9650\u5236\u6D3E\u751F\u7684 '{'final'}' \u5C5E\u6027\u3002
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709 ''{2}'' \u7684 ''use'' \u503C, \u8FD9\u4E0E\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684 ''required'' \u503C\u4E0D\u4E00\u81F4\u3002
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709\u7C7B\u578B ''{2}'', \u5B83\u4E0D\u662F\u4ECE\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684\u7C7B\u578B ''{3}'' \u6709\u6548\u6D3E\u751F\u7684\u3002
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002\u6B64\u7C7B\u578B\u4E2D\u7684\u5C5E\u6027\u7528\u6CD5 ''{1}'' \u5177\u6709\u4E0D\u56FA\u5B9A\u7684\u6709\u6548\u503C\u7EA6\u675F\u6761\u4EF6, \u800C\u57FA\u7C7B\u578B\u4E2D\u7684\u5339\u914D\u5C5E\u6027\u7528\u6CD5\u7684\u6709\u6548\u503C\u7EA6\u675F\u6761\u4EF6\u662F\u56FA\u5B9A\u7684\u3002
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation: {2} ''{1}'' \u4F7F\u7528\u7684 NOTATION \u7C7B\u578B ''{0}'' \u5FC5\u987B\u5177\u6709\u679A\u4E3E\u9762\u503C, \u7528\u4E8E\u6307\u5B9A\u6B64\u7C7B\u578B\u4F7F\u7528\u7684\u6CE8\u91CA\u5143\u7D20\u3002
- enumeration-valid-restriction = enumeration-valid-restriction: \u679A\u4E3E\u503C ''{0}'' \u4E0D\u5728\u57FA\u7C7B\u578B {1} \u7684\u503C\u7A7A\u95F4\u4E2D\u3002
- e-props-correct.2 = e-props-correct.2: \u5143\u7D20 ''{0}'' \u4E2D\u7684\u503C\u7EA6\u675F\u6761\u4EF6\u7684\u503C ''{1}'' \u65E0\u6548\u3002
-- e-props-correct.4 = e-props-correct.4: \u5143\u7D20 ''{0}'' \u7684 ''{''type definition''}'' \u4E0D\u662F\u4ECE substitutionHead ''{1}'' \u7684 ''{''type definition''}'' \u6709\u6548\u6D3E\u751F\u7684, \u6216\u8005 ''{1}'' \u7684 ''{''substitution group exclusions''}'' \u5C5E\u6027\u4E0D\u5141\u8BB8\u8FDB\u884C\u6B64\u6D3E\u751F\u3002
-- e-props-correct.5 = e-props-correct.5: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B ''{''value constraint''}'', \u56E0\u4E3A\u5143\u7D20\u7684 ''{''type definition''}'' \u6216 ''{''type definition''}'' \u7684 ''{''content type''}'' \u4E3A ID, \u6216\u8005\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
-+ e-props-correct.4 = e-props-correct.4: \u5143\u7D20 ''{0}'' \u7684 '{'type definition'}' \u4E0D\u662F\u4ECE substitutionHead ''{1}'' \u7684 '{'type definition'}' \u6709\u6548\u6D3E\u751F\u7684, \u6216\u8005 ''{1}'' \u7684 '{'substitution group exclusions'}' \u5C5E\u6027\u4E0D\u5141\u8BB8\u8FDB\u884C\u6B64\u6D3E\u751F\u3002
-+ e-props-correct.5 = e-props-correct.5: \u5143\u7D20 ''{0}'' \u4E2D\u4E0D\u80FD\u5305\u542B '{'value constraint'}', \u56E0\u4E3A\u5143\u7D20\u7684 '{'type definition'}' \u6216 '{'type definition'}' \u7684 '{'content type'}' \u4E3A ID, \u6216\u8005\u662F\u4ECE ID \u6D3E\u751F\u7684\u3002
- e-props-correct.6 = e-props-correct.6: \u5728\u5143\u7D20 ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u66FF\u4EE3\u7EC4\u3002
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''fractionDigits'' \u7684\u503C ''{0}'' \u65E0\u6548, \u56E0\u4E3A\u8BE5\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E ''fractionDigits'' \u7684\u503C, \u4F46\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u5DF2\u5C06\u5176\u8BBE\u7F6E\u4E3A ''{1}''\u3002
- fractionDigits-totalDigits = fractionDigits-totalDigits: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''fractionDigits'' \u7684\u503C ''{0}'' \u65E0\u6548, \u56E0\u4E3A\u8BE5\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E ''totalDigits'' \u7684\u503C ''{1}''\u3002
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxInclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minInclusive\u3002
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002maxInclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minExclusive\u3002
- maxLength-valid-restriction = maxLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, maxLength \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 maxLength\u3002
-- mg-props-correct.2 = mg-props-correct.2: \u5728\u7EC4 ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u9012\u5F52\u8DDF\u968F\u7C92\u5B50\u7684 ''{''term''}'' \u4EE5\u4E0B\u503C\u4F1A\u5F15\u5BFC\u5230\u5176 ''{''term''}'' \u662F\u7EC4\u81EA\u8EAB\u7684\u7C92\u5B50\u3002
-+ mg-props-correct.2 = mg-props-correct.2: \u5728\u7EC4 ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u9012\u5F52\u8DDF\u968F\u7C92\u5B50\u7684 '{'term'}' \u4EE5\u4E0B\u503C\u4F1A\u5F15\u5BFC\u5230\u5176 '{'term'}' \u662F\u7EC4\u81EA\u8EAB\u7684\u7C92\u5B50\u3002
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E maxExclusive \u503C ''{1}''\u3002
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minExclusive \u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E maxInclusive \u503C ''{1}''\u3002
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: \u7C7B\u578B ''{2}'' \u9519\u8BEF\u3002minExclusive \u503C ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B ''{1}'' \u7684 minExclusive\u3002
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minLength \u7684\u503C ''{0}'' \u5FC5\u987B\u5C0F\u4E8E maxLength \u7684\u503C ''{1}''\u3002
- minLength-valid-restriction = minLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, minLength ''{0}'' \u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E\u57FA\u7C7B\u578B\u7684 minLength ''{1}''\u3002
- no-xmlns = no-xmlns: \u5C5E\u6027\u58F0\u660E\u7684 {name} \u4E0D\u80FD\u4E0E 'xmlns' \u5339\u914D\u3002
-- no-xsi = no-xsi: \u5C5E\u6027\u58F0\u660E\u7684 ''{''target namespace''}'' \u4E0D\u80FD\u4E0E ''{0}'' \u5339\u914D\u3002
-+ no-xsi = no-xsi: \u5C5E\u6027\u58F0\u660E\u7684 '{'target namespace'}' \u4E0D\u80FD\u4E0E ''{0}'' \u5339\u914D\u3002
- p-props-correct.2.1 = p-props-correct.2.1: \u5728 ''{0}'' \u7684\u58F0\u660E\u4E2D, ''minOccurs'' \u7684\u503C\u4E3A ''{1}'', \u4F46\u8BE5\u503C\u4E0D\u80FD\u5927\u4E8E ''maxOccurs'' \u7684\u503C ''{2}''\u3002
- rcase-MapAndSum.1 = rcase-MapAndSum.1: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
- rcase-MapAndSum.2 = rcase-MapAndSum.2: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \u5143\u7D20\u7684\u540D\u79F0\u548C\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u4E0D\u76F8\u540C: \u540D\u79F0\u7A7A\u95F4 ''{1}'' \u4E2D\u7684\u5143\u7D20\u4E3A ''{0}'', \u540D\u79F0\u7A7A\u95F4 ''{3}'' \u4E2D\u7684\u5143\u7D20\u4E3A ''{2}''\u3002
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: \u5176 ''{''term''}'' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u5143\u7D20\u58F0\u660E\u7684 ''{''nillable''}'' \u4E3A\u201C\u771F\u201D, \u4F46\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7684\u7C92\u5B50\u5177\u6709 ''{''nillable''}'' \u4E3A\u201C\u5047\u201D\u7684\u5143\u7D20\u58F0\u660E\u3002
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: \u5176 ''{''term''}'' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u8BE5\u7C92\u5B50\u7684\u53D1\u751F\u8303\u56F4 ({1},{2}) \u4E0D\u5728\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7C92\u5B50\u7684\u8303\u56F4 ({3},{4}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: \u5176 '{'term'}' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u5143\u7D20\u58F0\u660E\u7684 '{'nillable'}' \u4E3A\u201C\u771F\u201D, \u4F46\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7684\u7C92\u5B50\u5177\u6709 '{'nillable'}' \u4E3A\u201C\u5047\u201D\u7684\u5143\u7D20\u58F0\u660E\u3002
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: \u5176 '{'term'}' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u8BE5\u7C92\u5B50\u7684\u53D1\u751F\u8303\u56F4 ({1},{2}) \u4E0D\u5728\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7C92\u5B50\u7684\u8303\u56F4 ({3},{4}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: \u5143\u7D20 ''{0}'' \u4E0D\u662F\u56FA\u5B9A\u7684, \u4F46\u57FA\u7C7B\u578B\u4E2D\u7684\u5BF9\u5E94\u5143\u7D20\u662F\u56FA\u5B9A\u7684, \u4E14\u503C\u4E3A ''{1}''\u3002
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: \u5143\u7D20 ''{0}'' \u662F\u56FA\u5B9A\u7684, \u4E14\u503C\u4E3A ''{1}'', \u4F46\u57FA\u7C7B\u578B\u4E2D\u7684\u5BF9\u5E94\u5143\u7D20\u662F\u56FA\u5B9A\u7684, \u4E14\u503C\u4E3A ''{2}''\u3002
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: \u5143\u7D20 ''{0}'' \u7684\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u4E0D\u662F\u57FA\u7C7B\u578B\u4E2D\u90A3\u4E9B\u8EAB\u4EFD\u7EA6\u675F\u6761\u4EF6\u7684\u5B50\u96C6\u3002
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: \u5143\u7D20 ''{0}'' \u7684\u4E0D\u63A5\u53D7\u66FF\u4EE3\u4E0D\u662F\u57FA\u5143\u7D20\u4E2D\u4E0D\u63A5\u53D7\u66FF\u4EE3\u7684\u8D85\u96C6\u3002
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: \u5143\u7D20 ''{0}'' \u7684\u7C7B\u578B ''{1}'' \u4E0D\u662F\u4ECE\u57FA\u5143\u7D20\u7684\u7C7B\u578B ''{2}'' \u6D3E\u751F\u7684\u3002
- rcase-NSCompat.1 = rcase-NSCompat.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u540D\u79F0\u7A7A\u95F4 ''{1}'', \u5728\u57FA\u5143\u7D20\u4E2D, \u901A\u914D\u7B26\u4E0D\u5141\u8BB8\u5177\u6709\u6B64\u540D\u79F0\u7A7A\u95F4\u3002
-- rcase-NSCompat.2 = rcase-NSCompat.2: \u5176 ''{''term''}'' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u8BE5\u7C92\u5B50\u7684\u53D1\u751F\u8303\u56F4 ({1},{2}) \u4E0D\u5728\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7C92\u5B50\u7684\u8303\u56F4 ({3},{4}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
-+ rcase-NSCompat.2 = rcase-NSCompat.2: \u5176 '{'term'}' \u4E3A\u5143\u7D20\u58F0\u660E ''{0}'' \u7684\u7C92\u5B50\u9519\u8BEF\u3002\u8BE5\u7C92\u5B50\u7684\u53D1\u751F\u8303\u56F4 ({1},{2}) \u4E0D\u5728\u57FA\u7C7B\u578B\u4E2D\u5BF9\u5E94\u7C92\u5B50\u7684\u8303\u56F4 ({3},{4}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \u7C92\u5B50\u4E4B\u95F4\u6CA1\u6709\u5B8C\u6574\u7684\u529F\u80FD\u6620\u5C04\u3002
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \u7EC4\u7684\u53D1\u751F\u8303\u56F4 ({0},{1}) \u4E0D\u5728\u57FA\u672C\u901A\u914D\u7B26\u8303\u56F4 ({2},{3}) \u7684\u6709\u6548\u9650\u5236\u4E4B\u5185\u3002
- rcase-NSSubset.1 = rcase-NSSubset.1: \u901A\u914D\u7B26\u4E0D\u662F\u57FA\u672C\u901A\u914D\u7B26\u4E2D\u5BF9\u5E94\u901A\u914D\u7B26\u7684\u5B50\u96C6\u3002
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: \u65B9\u6848\u4E0D\u80FD\u5305\u542B\u5177\u6709\u76F8\u540C\u540D\u79F0\u7684\u4E24\u4E2A\u5168\u5C40\u7EC4\u4EF6; \u800C\u6B64\u65B9\u6848\u4E2D\u5305\u542B\u4E24\u4E2A ''{0}''\u3002
- st-props-correct.2 = st-props-correct.2: \u5728\u7B80\u5355\u7C7B\u578B ''{0}'' \u4E2D\u68C0\u6D4B\u5230\u5FAA\u73AF\u5B9A\u4E49\u3002\u8FD9\u8868\u793A ''{0}'' \u5305\u542B\u5728\u5176\u81EA\u8EAB\u7684\u7C7B\u578B\u5206\u5C42\u7ED3\u6784\u4E2D, \u8FD9\u662F\u9519\u8BEF\u7684\u3002
-- st-props-correct.3 = st-props-correct.3: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002''{''base type definition''}'' \u7684 ''{''final''}'' \u7684\u503C ''{1}'' \u7981\u6B62\u7531\u9650\u5236\u6D3E\u751F\u3002
-+ st-props-correct.3 = st-props-correct.3: \u7C7B\u578B ''{0}'' \u9519\u8BEF\u3002'{'base type definition'}' \u7684 '{'final'}' \u7684\u503C ''{1}'' \u7981\u6B62\u7531\u9650\u5236\u6D3E\u751F\u3002
- totalDigits-valid-restriction = totalDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''totalDigits'' \u7684\u503C ''{0}'' \u65E0\u6548, \u56E0\u4E3A\u8BE5\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E ''totalDigits'' \u7684\u503C, \u800C\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u5DF2\u5C06\u5176\u8BBE\u7F6E\u4E3A ''{1}''\u3002
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: \u5728 {0} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''whitespace'' \u7684\u503C ''{1}'' \u65E0\u6548, \u56E0\u4E3A ''whitespace'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''collapse''\u3002
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: \u5728 {0} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''whitespace'' \u7684\u503C ''preserve'' \u65E0\u6548, \u56E0\u4E3A ''whitespace'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''replace''\u3002
-@@ -309,9 +281,9 @@
- c-selector-xpath = c-selector-xpath: \u9009\u62E9\u5668\u503C ''{0}'' \u65E0\u6548; \u9009\u62E9\u5668 xpath \u4E0D\u80FD\u5305\u542B\u5C5E\u6027\u3002
- EmptyTargetNamespace = EmptyTargetNamespace: \u5728\u65B9\u6848\u6587\u6863 ''{0}'' \u4E2D, ''targetNamespace'' \u5C5E\u6027\u7684\u503C\u4E0D\u80FD\u4E3A\u7A7A\u5B57\u7B26\u4E32\u3002
- FacetValueFromBase = FacetValueFromBase: \u5728\u7C7B\u578B ''{0}'' \u7684\u58F0\u660E\u4E2D, \u9762 ''{2}'' \u7684\u503C ''{1}'' \u5FC5\u987B\u6765\u81EA\u57FA\u7C7B\u578B\u7684\u503C\u7A7A\u95F4 ''{3}''\u3002
-- FixedFacetValue = FixedFacetValue: \u5728 {3} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''{0}'' \u7684\u503C ''{1}'' \u65E0\u6548, \u56E0\u4E3A ''{0}'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''{2}'', \u5E76\u4E14 ''{''fixed''}'' = true\u3002
-+ FixedFacetValue = FixedFacetValue: \u5728 {3} \u7684\u5B9A\u4E49\u4E2D, \u9762 ''{0}'' \u7684\u503C ''{1}'' \u65E0\u6548, \u56E0\u4E3A ''{0}'' \u7684\u503C\u5DF2\u5728\u539F\u7EA7\u7C7B\u578B\u4E4B\u4E00\u4E2D\u8BBE\u7F6E\u4E3A ''{2}'', \u5E76\u4E14 '{'fixed'}' = true\u3002
- InvalidRegex = InvalidRegex: \u6A21\u5F0F\u503C ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u6B63\u5219\u8868\u8FBE\u5F0F\u3002\u5217 ''{2}'' \u4E0A\u62A5\u544A\u7684\u9519\u8BEF\u4E3A: ''{1}''\u3002
-- maxOccurLimit = \u8BED\u6CD5\u5206\u6790\u5668\u7684\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u5C06 maxOccurs \u5C5E\u6027\u503C\u8BBE\u7F6E\u4E3A\u5927\u4E8E\u503C {0}\u3002
-+ maxOccurLimit = \u89E3\u6790\u5668\u7684\u5F53\u524D\u914D\u7F6E\u4E0D\u5141\u8BB8\u5C06 maxOccurs \u5C5E\u6027\u503C\u8BBE\u7F6E\u4E3A\u5927\u4E8E\u503C {0}\u3002
- PublicSystemOnNotation = PublicSystemOnNotation: \u5143\u7D20 ''notation'' \u4E2D\u5FC5\u987B\u81F3\u5C11\u51FA\u73B0 ''public'' \u548C ''system'' \u4E2D\u7684\u4E00\u4E2A\u3002
- SchemaLocation = SchemaLocation: schemaLocation \u503C ''{0}'' \u5FC5\u987B\u5177\u6709\u5076\u6570\u4E2A URI\u3002
- TargetNamespace.1 = TargetNamespace.1: \u5E94\u4E3A\u540D\u79F0\u7A7A\u95F4 ''{0}'', \u4F46\u65B9\u6848\u6587\u6863\u7684\u76EE\u6807\u540D\u79F0\u7A7A\u95F4\u4E3A ''{1}''\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,35 +1,7 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 Schema
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XMLSchemaMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSchemaMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
- FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
-@@ -42,20 +14,20 @@
-
- # Identity constraints
-
-- AbsentKeyValue = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4 (cvc-identity-constraint.4.2.1): \u5143\u7D20 \"{0}\" \u5177\u6709\u7684\u91D1\u9470\u6C92\u6709\u503C\u3002
-- DuplicateField = \u7BC4\u570D\u4E2D\u7684\u6B04\u4F4D \"{0}\" \u91CD\u8907\u914D\u5C0D\u3002
-- DuplicateKey = \u70BA\u5143\u7D20 \"{1}\" \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u5BA3\u544A\u4E86\u91CD\u8907\u7684\u91D1\u9470\u503C [{0}]\u3002
-- DuplicateUnique = \u70BA\u5143\u7D20 \"{1}\" \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u5BA3\u544A\u4E86\u91CD\u8907\u7684\u552F\u4E00\u503C [{0}]\u3002
-- FieldMultipleMatch = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4: \u6B04\u4F4D \"{0}\" \u7B26\u5408\u5176\u9078\u53D6\u5668\u7BC4\u570D\u5167\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u503C; \u6B04\u4F4D\u5FC5\u9808\u7B26\u5408\u552F\u4E00\u503C\u3002
-- FixedDiffersFromActual = \u6B64\u5143\u7D20\u7684\u5167\u5BB9\u4E0D\u7B49\u65BC\u7DB1\u8981\u5143\u7D20\u5BA3\u544A\u4E2D \"fixed\" \u5C6C\u6027\u7684\u503C\u3002
-- KeyMatchesNillable = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4 (cvc-identity-constraint.4.2.3): \u5143\u7D20 \"{0}\" \u5177\u6709\u7684\u91D1\u9470\uFF0C\u7B26\u5408 nillable \u8A2D\u70BA\u771F\u7684\u5143\u7D20\u3002
-- KeyNotEnoughValues = \u6C92\u6709\u8DB3\u5920\u7684\u503C\u6307\u5B9A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7684 <key name=\"{1}\"> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u3002
-+ AbsentKeyValue = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4 (cvc-identity-constraint.4.2.1): \u5143\u7D20 "{0}" \u5177\u6709\u7684\u91D1\u9470\u6C92\u6709\u503C\u3002
-+ DuplicateField = \u7BC4\u570D\u4E2D\u7684\u6B04\u4F4D "{0}" \u91CD\u8907\u914D\u5C0D\u3002
-+ DuplicateKey = \u70BA\u5143\u7D20 "{1}" \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u5BA3\u544A\u4E86\u91CD\u8907\u7684\u91D1\u9470\u503C [{0}]\u3002
-+ DuplicateUnique = \u70BA\u5143\u7D20 "{1}" \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u5BA3\u544A\u4E86\u91CD\u8907\u7684\u552F\u4E00\u503C [{0}]\u3002
-+ FieldMultipleMatch = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4: \u6B04\u4F4D "{0}" \u7B26\u5408\u5176\u9078\u53D6\u5668\u7BC4\u570D\u5167\u8D85\u904E\u4E00\u500B\u4EE5\u4E0A\u7684\u503C; \u6B04\u4F4D\u5FC5\u9808\u7B26\u5408\u552F\u4E00\u503C\u3002
-+ FixedDiffersFromActual = \u6B64\u5143\u7D20\u7684\u5167\u5BB9\u4E0D\u7B49\u65BC\u7DB1\u8981\u5143\u7D20\u5BA3\u544A\u4E2D "fixed" \u5C6C\u6027\u7684\u503C\u3002
-+ KeyMatchesNillable = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4 (cvc-identity-constraint.4.2.3): \u5143\u7D20 "{0}" \u5177\u6709\u7684\u91D1\u9470\uFF0C\u7B26\u5408 nillable \u8A2D\u70BA\u771F\u7684\u5143\u7D20\u3002
-+ KeyNotEnoughValues = \u6C92\u6709\u8DB3\u5920\u7684\u503C\u6307\u5B9A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <key name="{1}"> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u3002
- KeyNotFound = \u5143\u7D20 ''{2}'' \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u627E\u4E0D\u5230\u503C ''{1}'' \u7684\u91D1\u9470 ''{0}''\u3002
-- KeyRefNotEnoughValues = \u6C92\u6709\u8DB3\u5920\u7684\u503C\u6307\u5B9A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7684 <keyref name=\"{1}\"> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u3002
-- KeyRefOutOfScope = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4: \u8B58\u5225\u9650\u5236\u689D\u4EF6 \"{0}\" \u5177\u6709\u4E00\u500B keyref\uFF0C\u5B83\u53C3\u7167\u4E86\u7BC4\u570D\u4E4B\u5916\u7684\u91D1\u9470\u6216\u552F\u4E00\u503C\u3002
-- KeyRefReferNotFound = \u91D1\u9470\u53C3\u7167\u5BA3\u544A \"{0}\" \u53C3\u7167\u4E86\u540D\u7A31\u70BA \"{1}\" \u7684\u4E0D\u660E\u91D1\u9470\u3002
-- UniqueNotEnoughValues = \u6C92\u6709\u8DB3\u5920\u7684\u503C\u6307\u5B9A\u5143\u7D20 \"{0}\" \u6307\u5B9A\u7684 <unique> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u3002
-- UnknownField = \u5167\u90E8\u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4; \u4E0D\u660E\u7684\u6B04\u4F4D \"{0}\"\u3002
-+ KeyRefNotEnoughValues = \u6C92\u6709\u8DB3\u5920\u7684\u503C\u6307\u5B9A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <keyref name="{1}"> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u3002
-+ KeyRefOutOfScope = \u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4: \u8B58\u5225\u9650\u5236\u689D\u4EF6 "{0}" \u5177\u6709\u4E00\u500B keyref\uFF0C\u5B83\u53C3\u7167\u4E86\u7BC4\u570D\u4E4B\u5916\u7684\u91D1\u9470\u6216\u552F\u4E00\u503C\u3002
-+ KeyRefReferNotFound = \u91D1\u9470\u53C3\u7167\u5BA3\u544A "{0}" \u53C3\u7167\u4E86\u540D\u7A31\u70BA "{1}" \u7684\u4E0D\u660E\u91D1\u9470\u3002
-+ UniqueNotEnoughValues = \u6C92\u6709\u8DB3\u5920\u7684\u503C\u6307\u5B9A\u5143\u7D20 "{0}" \u6307\u5B9A\u7684 <unique> \u8B58\u5225\u9650\u5236\u689D\u4EF6\u3002
-+ UnknownField = \u5167\u90E8\u8B58\u5225\u9650\u5236\u689D\u4EF6\u932F\u8AA4; \u4E0D\u660E\u7684\u6B04\u4F4D "{0}"\u3002
-
- # Ideally, we should only use the following error keys, not the ones under
- # "Identity constraints". And we should cover all of the following errors.
-@@ -63,7 +35,7 @@
- #validation (3.X.4)
-
- cvc-attribute.3 = cvc-attribute.3: \u5143\u7D20 ''{0}'' \u4E0A\u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u5C0D\u65BC\u5176\u985E\u578B ''{3}'' \u7121\u6548\u3002
-- cvc-attribute.4 = cvc-attribute.4: \u5143\u7D20 ''{0}'' \u4E0A\u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u5C0D\u65BC\u5176\u56FA\u5B9A ''{''value constraint''}'' \u7121\u6548\u3002\u5C6C\u6027\u5FC5\u9808\u5177\u6709 ''{3}'' \u7684\u503C\u3002
-+ cvc-attribute.4 = cvc-attribute.4: \u5143\u7D20 ''{0}'' \u4E0A\u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u5C0D\u65BC\u5176\u56FA\u5B9A '{'value constraint'}' \u7121\u6548\u3002\u5C6C\u6027\u5FC5\u9808\u5177\u6709 ''{3}'' \u7684\u503C\u3002
- cvc-complex-type.2.1 = cvc-complex-type.2.1: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u6709\u5B57\u5143\u6216\u5143\u7D20\u8CC7\u8A0A\u9805\u76EE [children]\uFF0C\u56E0\u70BA\u985E\u578B\u7684\u5167\u5BB9\u985E\u578B\u70BA\u7A7A\u767D\u3002
- cvc-complex-type.2.2 = cvc-complex-type.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u6709\u5143\u7D20 [children]\uFF0C\u4E14\u503C\u5FC5\u9808\u6709\u6548\u3002
- cvc-complex-type.2.3 = cvc-complex-type.2.3: \u5143\u7D20 ''{0}'' \u4E0D\u80FD\u6709\u5B57\u5143 [children]\uFF0C\u56E0\u70BA\u985E\u578B\u7684\u5167\u5BB9\u985E\u578B\u70BA element-only\u3002
-@@ -77,22 +49,22 @@
- cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: \u4E0D\u5141\u8A31\u5C6C\u6027 ''{1}'' \u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\u3002
- cvc-complex-type.4 = cvc-complex-type.4: \u5C6C\u6027 ''{1}'' \u5FC5\u9808\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\u3002
- cvc-complex-type.5.1 = cvc-complex-type.5.1: \u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u5C6C\u6027 ''{1}'' \u70BA Wild ID\u3002\u4F46\u662F\u5DF2\u7D93\u6709\u4E00\u500B Wild ID ''{2}''\u3002\u53EA\u80FD\u6709\u4E00\u500B Wild ID\u3002
-- cvc-complex-type.5.2 = cvc-complex-type.5.2: \u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u5C6C\u6027 ''{1}'' \u70BA Wild ID\u3002\u4F46\u662F\u5DF2\u7D93\u6709\u4E00\u500B\u5F9E ''{''attribute uses''}'' \u4E2D\u7684 ID \u884D\u751F\u800C\u4F86\u7684\u5C6C\u6027 ''{2}''\u3002
-+ cvc-complex-type.5.2 = cvc-complex-type.5.2: \u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u5C6C\u6027 ''{1}'' \u70BA Wild ID\u3002\u4F46\u662F\u5DF2\u7D93\u6709\u4E00\u500B\u5F9E '{'attribute uses'}' \u4E2D\u7684 ID \u884D\u751F\u800C\u4F86\u7684\u5C6C\u6027 ''{2}''\u3002
- cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' \u4E0D\u662F ''{1}'' \u7684\u6709\u6548\u503C\u3002
- cvc-datatype-valid.1.2.2 = cvc-datatype-valid.1.2.2: ''{0}'' \u4E0D\u662F\u6E05\u55AE\u985E\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
- cvc-datatype-valid.1.2.3 = cvc-datatype-valid.1.2.3: ''{0}'' \u4E0D\u662F\u806F\u96C6\u985E\u578B ''{1}'' \u7684\u6709\u6548\u503C\u3002
- cvc-elt.1 = cvc-elt.1: \u627E\u4E0D\u5230\u5143\u7D20 ''{0}'' \u7684\u5BA3\u544A\u3002
-- cvc-elt.2 = cvc-elt.2: ''{0}'' \u5143\u7D20\u5BA3\u544A\u4E2D ''{''abstract''}'' \u7684\u503C\u5FC5\u9808\u70BA\u507D\u3002
-- cvc-elt.3.1 = cvc-elt.3.1: \u5C6C\u6027 ''{1}'' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u56E0\u70BA ''{0}'' \u7684 ''{''nillable''}'' \u5C6C\u6027\u70BA\u507D\u3002
-+ cvc-elt.2 = cvc-elt.2: ''{0}'' \u5143\u7D20\u5BA3\u544A\u4E2D '{'abstract'}' \u7684\u503C\u5FC5\u9808\u70BA\u507D\u3002
-+ cvc-elt.3.1 = cvc-elt.3.1: \u5C6C\u6027 ''{1}'' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E2D\uFF0C\u56E0\u70BA ''{0}'' \u7684 '{'nillable'}' \u5C6C\u6027\u70BA\u507D\u3002
- cvc-elt.3.2.1 = cvc-elt.3.2.1: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u5B57\u5143\u6216\u5143\u7D20\u8CC7\u8A0A [children]\uFF0C\u56E0\u70BA\u6307\u5B9A\u4E86 ''{1}''\u3002
-- cvc-elt.3.2.2 = cvc-elt.3.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u56FA\u5B9A\u7684 ''{''value constraint''}''\uFF0C\u56E0\u70BA\u6307\u5B9A\u4E86 ''{1}''\u3002
-+ cvc-elt.3.2.2 = cvc-elt.3.2.2: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u56FA\u5B9A\u7684 '{'value constraint'}'\uFF0C\u56E0\u70BA\u6307\u5B9A\u4E86 ''{1}''\u3002
- cvc-elt.4.1 = cvc-elt.4.1: \u5143\u7D20 ''{0}'' \u5C6C\u6027 ''{1}'' \u7684\u503C ''{2}'' \u4E0D\u662F\u6709\u6548\u7684 QName\u3002
- cvc-elt.4.2 = cvc-elt.4.2: \u7121\u6CD5\u5C07 ''{1}'' \u89E3\u6790\u70BA\u5143\u7D20 ''{0}'' \u7684\u985E\u578B\u5B9A\u7FA9\u3002
- cvc-elt.4.3 = cvc-elt.4.3: \u985E\u578B ''{1}'' \u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA\u5143\u7D20 ''{0}'' \u7684\u985E\u578B\u5B9A\u7FA9 ''{2}''\u3002
-- cvc-elt.5.1.1 = cvc-elt.5.1.1: \u5143\u7D20 ''{0}'' \u7684 ''{''value constraint''}'' ''{2}'' \u4E0D\u662F\u985E\u578B ''{1}'' \u7684\u6709\u6548\u9810\u8A2D\u503C\u3002
-+ cvc-elt.5.1.1 = cvc-elt.5.1.1: \u5143\u7D20 ''{0}'' \u7684 '{'value constraint'}' ''{2}'' \u4E0D\u662F\u985E\u578B ''{1}'' \u7684\u6709\u6548\u9810\u8A2D\u503C\u3002
- cvc-elt.5.2.2.1 = cvc-elt.5.2.2.1: \u5143\u7D20 ''{0}'' \u4E0D\u53EF\u6709\u5143\u7D20\u8CC7\u8A0A\u9805\u76EE [children]\u3002
-- cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0D\u7B26\u5408\u56FA\u5B9A ''{''value constraint''}'' \u503C ''{2}''\u3002
-- cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0D\u7B26\u5408 ''{''value constraint''}'' \u503C ''{2}''\u3002
-+ cvc-elt.5.2.2.2.1 = cvc-elt.5.2.2.2.1: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0D\u7B26\u5408\u56FA\u5B9A '{'value constraint'}' \u503C ''{2}''\u3002
-+ cvc-elt.5.2.2.2.2 = cvc-elt.5.2.2.2.2: \u5143\u7D20 ''{0}'' \u7684\u503C ''{1}'' \u4E0D\u7B26\u5408 '{'value constraint'}' \u503C ''{2}''\u3002
- cvc-enumeration-valid = cvc-enumeration-valid: \u503C ''{0}'' \u5C0D\u65BC\u5217\u8209 ''{1}'' \u800C\u8A00\u4E26\u975E facet-valid\u3002\u5B83\u5FC5\u9808\u662F\u4F86\u81EA\u5217\u8209\u7684\u503C\u3002
- cvc-fractionDigits-valid = cvc-fractionDigits-valid: \u503C ''{0}'' \u5177\u6709 {1} \u5206\u6578\u4F4D\u6578\uFF0C\u4F46\u662F\u5206\u6578\u4F4D\u6578\u7684\u6578\u76EE\u9650\u5236\u70BA {2}\u3002
- cvc-id.1 = cvc-id.1: IDREF ''{0}'' \u6C92\u6709 ID/IDREF \u9023\u7D50\u3002
-@@ -114,7 +86,7 @@
-
- #schema valid (3.X.3)
-
-- schema_reference.access = schema_reference: Failed to read schema document ''{0}'', because ''{1}'' access is not allowed.
-+ schema_reference.access = schema_reference: \u7121\u6CD5\u8B80\u53D6\u7DB1\u8981\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA accessExternalSchema \u5C6C\u6027\u8A2D\u5B9A\u7684\u9650\u5236\uFF0C\u6240\u4EE5\u4E0D\u5141\u8A31 ''{1}'' \u5B58\u53D6\u3002
- schema_reference.4 = schema_reference.4: \u7121\u6CD5\u8B80\u53D6\u7DB1\u8981\u6587\u4EF6 ''{0}''\uFF0C\u56E0\u70BA 1) \u627E\u4E0D\u5230\u6587\u4EF6; 2) \u7121\u6CD5\u8B80\u53D6\u6587\u4EF6; 3) \u6587\u4EF6\u7684\u6839\u5143\u7D20\u4E0D\u662F <xsd:schema>\u3002
- src-annotation = src-annotation: <annotation> \u5143\u7D20\u50C5\u80FD\u5305\u542B <appinfo> \u8207 <documentation> \u5143\u7D20\uFF0C\u4F46\u627E\u5230 ''{0}''\u3002
- src-attribute.1 = src-attribute.1: \u5C6C\u6027 ''default'' \u8207 ''fixed'' \u4E0D\u53EF\u540C\u6642\u51FA\u73FE\u5728\u5C6C\u6027\u5BA3\u544A ''{0}'' \u4E2D\u3002\u8ACB\u53EA\u4F7F\u7528\u5176\u4E2D\u4E00\u500B\u3002
-@@ -171,10 +143,10 @@
- ag-props-correct.2 = ag-props-correct.2: \u5C6C\u6027\u7FA4\u7D44 ''{0}'' \u7684\u932F\u8AA4\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u76F8\u540C\u540D\u7A31\u4E14\u6307\u5B9A\u4E86\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u7684\u540D\u7A31\u70BA ''{1}''\u3002
- ag-props-correct.3 = ag-props-correct.3: \u5C6C\u6027\u7FA4\u7D44 ''{0}'' \u7684\u932F\u8AA4\u3002\u5169\u500B\u5C6C\u6027\u5BA3\u544A ''{1}'' \u8207 ''{2}'' \u5177\u6709\u884D\u751F\u81EA ID \u7684\u985E\u578B\u3002
- a-props-correct.2 = a-props-correct.2: \u5C6C\u6027 ''{0}'' \u4E2D\u7684\u503C\u9650\u5236\u689D\u4EF6\u503C ''{1}'' \u7121\u6548\u3002
-- a-props-correct.3 = a-props-correct.3: \u5C6C\u6027 ''{0}'' \u7121\u6CD5\u4F7F\u7528 ''fixed'' \u6216 ''default''\uFF0C\u56E0\u70BA\u5C6C\u6027\u7684 ''{''type definition''}'' \u70BA ID\uFF0C\u6216\u884D\u751F\u81EA ID\u3002
-- au-props-correct.2 = au-props-correct.2: \u5728 ''{0}'' \u7684\u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u4E86 ''{1}'' \u7684\u56FA\u5B9A\u503C\u3002\u56E0\u6B64\uFF0C\u82E5\u53C3\u7167 ''{0}'' \u7684\u5C6C\u6027\u4F7F\u7528\u4E5F\u5177\u6709 ''{''value constraint''}''\uFF0C\u5B83\u5FC5\u9808\u662F\u56FA\u5B9A\u503C\u4E14\u503C\u5FC5\u9808\u70BA ''{1}''\u3002
-+ a-props-correct.3 = a-props-correct.3: \u5C6C\u6027 ''{0}'' \u7121\u6CD5\u4F7F\u7528 ''fixed'' \u6216 ''default''\uFF0C\u56E0\u70BA\u5C6C\u6027\u7684 '{'type definition'}' \u70BA ID\uFF0C\u6216\u884D\u751F\u81EA ID\u3002
-+ au-props-correct.2 = au-props-correct.2: \u5728 ''{0}'' \u7684\u5C6C\u6027\u5BA3\u544A\u4E2D\uFF0C\u6307\u5B9A\u4E86 ''{1}'' \u7684\u56FA\u5B9A\u503C\u3002\u56E0\u6B64\uFF0C\u82E5\u53C3\u7167 ''{0}'' \u7684\u5C6C\u6027\u4F7F\u7528\u4E5F\u5177\u6709 '{'value constraint'}'\uFF0C\u5B83\u5FC5\u9808\u662F\u56FA\u5B9A\u503C\u4E14\u503C\u5FC5\u9808\u70BA ''{1}''\u3002
- cos-all-limited.1.2 = cos-all-limited.1.2: 'all' \u6A21\u578B\u7FA4\u7D44\u5FC5\u9808\u51FA\u73FE\u5728 '{'min occurs'}' = '{'max occurs'}' = 1 \u7684\u7269\u4EF6\u4E2D\uFF0C\u4E14\u8A72\u7269\u4EF6\u5FC5\u9808\u662F\u4E00\u5C0D\u7D44\u6210\u8907\u96DC\u985E\u578B\u5B9A\u7FA9\u4E4B '{'content type'}' \u7269\u4EF6\u4E2D\u7684\u4E00\u90E8\u5206\u3002
-- cos-all-limited.2 = cos-all-limited.2: ''all'' \u6A21\u578B\u7FA4\u7D44\u4E2D\u5143\u7D20\u7684 ''{''max occurs''}'' \u5FC5\u9808\u662F 0 \u6216 1\u3002\u5143\u7D20 ''{1}'' \u7684\u503C ''{0}'' \u7121\u6548\u3002
-+ cos-all-limited.2 = cos-all-limited.2: ''all'' \u6A21\u578B\u7FA4\u7D44\u4E2D\u5143\u7D20\u7684 '{'max occurs'}' \u5FC5\u9808\u662F 0 \u6216 1\u3002\u5143\u7D20 ''{1}'' \u7684\u503C ''{0}'' \u7121\u6548\u3002
- cos-applicable-facets = cos-applicable-facets: \u985E\u578B {1} \u4E0D\u5141\u8A31 Facet ''{0}''\u3002
- cos-ct-extends.1.1 = cos-ct-extends.1.1: \u985E\u578B ''{0}'' \u662F\u7531\u64F4\u5145\u5957\u4EF6\u5F9E\u985E\u578B ''{1}'' \u884D\u751F\u3002\u4E0D\u904E\uFF0C''{1}'' \u7684 ''final'' \u5C6C\u6027\u7981\u6B62\u7531\u64F4\u5145\u5957\u4EF6\u884D\u751F\u3002
- cos-ct-extends.1.4.3.2.2.1.a = cos-ct-extends.1.4.3.2.2.1.a: \u884D\u751F\u985E\u578B\u8207\u5176\u57FA\u790E\u7684\u5167\u5BB9\u985E\u578B\u7686\u5FC5\u9808\u662F\u6DF7\u5408\u985E\u578B\u6216\u5169\u8005\u7686\u662F element-only\u3002\u985E\u578B ''{0}'' \u662F element-only\uFF0C\u4F46\u5176\u57FA\u790E\u985E\u578B\u5247\u5426\u3002
-@@ -185,17 +157,17 @@
- cos-particle-restrict.a = cos-particle-restrict.a: \u884D\u751F\u7269\u4EF6\u70BA\u7A7A\u767D\uFF0C\u5247\u57FA\u790E\u7269\u4EF6\u4E0D\u53EF\u70BA\u7A7A\u767D\u3002
- cos-particle-restrict.b = cos-particle-restrict.b: \u57FA\u790E\u7269\u4EF6\u70BA\u7A7A\u767D\uFF0C\u4F46\u662F\u884D\u751F\u7269\u4EF6\u5247\u5426\u3002
- cos-particle-restrict.2 = cos-particle-restrict.2: \u7981\u6B62\u7684\u7269\u4EF6\u9650\u5236: ''{0}''\u3002
-- cos-st-restricts.1.1 = cos-st-restricts.1.1: \u985E\u578B ''{1}'' \u70BA\u55AE\u5143\u985E\u578B\uFF0C\u56E0\u6B64\u5176 ''{''base type definition''}'' (''{0}'') \u5FC5\u9808\u662F\u55AE\u5143\u7C21\u55AE\u985E\u578B\u5B9A\u7FA9\u6216\u5167\u5EFA\u7684\u539F\u59CB\u8CC7\u6599\u985E\u578B\u3002
-+ cos-st-restricts.1.1 = cos-st-restricts.1.1: \u985E\u578B ''{1}'' \u70BA\u55AE\u5143\u985E\u578B\uFF0C\u56E0\u6B64\u5176 '{'base type definition'}' (''{0}'') \u5FC5\u9808\u662F\u55AE\u5143\u7C21\u55AE\u985E\u578B\u5B9A\u7FA9\u6216\u5167\u5EFA\u7684\u539F\u59CB\u8CC7\u6599\u985E\u578B\u3002
- cos-st-restricts.2.1 = cos-st-restricts.2.1: \u6E05\u55AE\u985E\u578B ''{0}'' \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u985E\u578B ''{1}'' \u662F\u7121\u6548\u7684\u9805\u76EE\u985E\u578B\uFF0C\u56E0\u70BA\u5B83\u662F\u6E05\u55AE\u985E\u578B\uFF0C\u6216\u5305\u542B\u6E05\u55AE\u7684\u806F\u96C6\u985E\u578B\u3002
-- cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: ''{''item type definition''}'' \u7684 ''{''final''}'' \u5143\u4EF6 ''{0}'' \u5305\u542B ''list''\u3002\u9019\u4EE3\u8868 ''{0}'' \u7121\u6CD5\u4F5C\u70BA\u6E05\u55AE\u985E\u578B ''{1}'' \u7684\u9805\u76EE\u985E\u578B\u3002
-- cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: ''{''member type definitions''}'' \u7684 ''{''final''}'' \u5143\u4EF6 ''{0}'' \u5305\u542B ''union''\u3002\u9019\u4EE3\u8868 ''{0}'' \u7121\u6CD5\u4F5C\u70BA\u806F\u96C6\u985E\u578B ''{1}'' \u7684\u6210\u54E1\u985E\u578B\u3002
-+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: '{'item type definition'}' \u7684 '{'final'}' \u5143\u4EF6 ''{0}'' \u5305\u542B ''list''\u3002\u9019\u4EE3\u8868 ''{0}'' \u7121\u6CD5\u4F5C\u70BA\u6E05\u55AE\u985E\u578B ''{1}'' \u7684\u9805\u76EE\u985E\u578B\u3002
-+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: '{'member type definitions'}' \u7684 '{'final'}' \u5143\u4EF6 ''{0}'' \u5305\u542B ''union''\u3002\u9019\u4EE3\u8868 ''{0}'' \u7121\u6CD5\u4F5C\u70BA\u806F\u96C6\u985E\u578B ''{1}'' \u7684\u6210\u54E1\u985E\u578B\u3002
- cos-valid-default.2.1 = cos-valid-default.2.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u503C\u9650\u5236\u689D\u4EF6\uFF0C\u4E14\u5FC5\u9808\u5177\u6709\u6DF7\u5408\u6216\u7C21\u55AE\u5167\u5BB9\u6A21\u578B\u3002
-- cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u7531\u65BC\u5143\u7D20 ''{0}'' \u5177\u6709 ''{''value constraint''}'' \u4E14\u5176\u985E\u578B\u5B9A\u7FA9\u5177\u6709\u6DF7\u5408\u7684 ''{''content type''}''\uFF0C\u56E0\u6B64 ''{''content type''}'' \u7684\u7269\u4EF6\u5FC5\u9808\u662F\u53EF\u7A7A\u767D\u3002
-+ cos-valid-default.2.2.2 = cos-valid-default.2.2.2: \u7531\u65BC\u5143\u7D20 ''{0}'' \u5177\u6709 '{'value constraint'}' \u4E14\u5176\u985E\u578B\u5B9A\u7FA9\u5177\u6709\u6DF7\u5408\u7684 '{'content type'}'\uFF0C\u56E0\u6B64 '{'content type'}' \u7684\u7269\u4EF6\u5FC5\u9808\u662F\u53EF\u7A7A\u767D\u3002
- c-props-correct.2 = c-props-correct.2: keyref ''{0}'' \u8207 key ''{1}'' \u7684 Fields \u57FA\u6578\u5F7C\u6B64\u5FC5\u9808\u76F8\u7B26\u3002
- ct-props-correct.3 = ct-props-correct.3: \u5075\u6E2C\u5230\u8907\u96DC\u985E\u578B ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u9019\u4EE3\u8868 ''{0}'' \u5305\u542B\u5728\u81EA\u8EAB\u985E\u578B\u968E\u5C64\u4E2D\uFF0C\u9019\u662F\u4E00\u9805\u932F\u8AA4\u3002
- ct-props-correct.4 = ct-props-correct.4: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u76F8\u540C\u540D\u7A31\u4E14\u6307\u5B9A\u4E86\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u3002\u91CD\u8907\u5C6C\u6027\u4F7F\u7528\u7684\u540D\u7A31\u70BA ''{1}''\u3002
- ct-props-correct.5 = ct-props-correct.5: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u5169\u500B\u5C6C\u6027\u5BA3\u544A ''{1}'' \u8207 ''{2}'' \u5177\u6709\u884D\u751F\u81EA ID \u7684\u985E\u578B\u3002
-- derivation-ok-restriction.1 = derivation-ok-restriction.1: \u985E\u578B ''{0}'' \u7531\u9650\u5236\u5F9E\u985E\u578B ''{1}'' \u884D\u751F\u3002\u4E0D\u904E\uFF0C''{1}'' \u5177\u6709 ''{''final''}'' \u5C6C\u6027\uFF0C\u7981\u6B62\u7531\u9650\u5236\u884D\u751F\u3002
-+ derivation-ok-restriction.1 = derivation-ok-restriction.1: \u985E\u578B ''{0}'' \u7531\u9650\u5236\u5F9E\u985E\u578B ''{1}'' \u884D\u751F\u3002\u4E0D\u904E\uFF0C''{1}'' \u5177\u6709 '{'final'}' \u5C6C\u6027\uFF0C\u7981\u6B62\u7531\u9650\u5236\u884D\u751F\u3002
- derivation-ok-restriction.2.1.1 = derivation-ok-restriction.2.1.1: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709 ''use'' \u503C\u7684 ''{2}''\uFF0C\u9019\u8207\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7B26\u5408\u5C6C\u6027\u7684 ''required'' \u503C\u4E0D\u4E00\u81F4\u3002
- derivation-ok-restriction.2.1.2 = derivation-ok-restriction.2.1.2: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709\u985E\u578B ''{2}''\uFF0C\u9019\u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA ''{3}''\uFF0C\u4EA6\u5373\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7B26\u5408\u5C6C\u6027\u7684\u985E\u578B\u3002
- derivation-ok-restriction.2.1.3.a = derivation-ok-restriction.2.1.3.a: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002\u6B64\u985E\u578B\u4E2D\u4F7F\u7528 ''{1}'' \u7684\u5C6C\u6027\u5177\u6709\u672A\u56FA\u5B9A\u7684\u6709\u6548\u503C\u9650\u5236\u689D\u4EF6\uFF0C\u800C\u57FA\u790E\u985E\u578B\u4E2D\u4F7F\u7528\u7684\u7B26\u5408\u5C6C\u6027\u6709\u6548\u503C\u9650\u5236\u689D\u4EF6\u70BA\u56FA\u5B9A\u5F0F\u3002
-@@ -213,8 +185,8 @@
- enumeration-required-notation = enumeration-required-notation: \u7531 {2} ''{1}'' \u4F7F\u7528\u7684 NOTATION \u985E\u578B ''{0}''\uFF0C\u5FC5\u9808\u5177\u6709\u5217\u8209 facet \u503C\uFF0C\u4EE5\u6307\u5B9A\u6B64\u985E\u578B\u4F7F\u7528\u7684\u8868\u793A\u6CD5\u5143\u7D20\u3002
- enumeration-valid-restriction = enumeration-valid-restriction: \u5217\u8209\u503C ''{0}'' \u4E0D\u5728\u57FA\u790E\u985E\u578B {1} \u7684\u503C\u7A7A\u9593\u4E2D\u3002
- e-props-correct.2 = e-props-correct.2: \u5143\u7D20 ''{0}'' \u4E2D\u7684\u503C\u9650\u5236\u689D\u4EF6\u503C ''{1}'' \u7121\u6548\u3002
-- e-props-correct.4 = e-props-correct.4: \u5143\u7D20 ''{0}'' \u7684 ''{''type definition''}'' \u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA substitutionHead ''{1}'' \u7684 ''{''type definition''}''\uFF0C\u6216\u662F ''{1}'' \u7684 ''{''substitution group exclusions''}'' \u5C6C\u6027\u4E0D\u5141\u8A31\u6B64\u884D\u751F\u3002
-- e-props-correct.5 = e-props-correct.5: ''{''value constraint''}'' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E0A\uFF0C\u56E0\u70BA\u5143\u7D20\u7684 ''{''type definition''}'' \u6216 ''{''type definition''}'' \u7684 ''{''content type''}'' \u70BA ID\uFF0C\u6216\u884D\u751F\u81EA ID\u3002
-+ e-props-correct.4 = e-props-correct.4: \u5143\u7D20 ''{0}'' \u7684 '{'type definition'}' \u4E0D\u662F\u6709\u6548\u884D\u751F\u81EA substitutionHead ''{1}'' \u7684 '{'type definition'}'\uFF0C\u6216\u662F ''{1}'' \u7684 '{'substitution group exclusions'}' \u5C6C\u6027\u4E0D\u5141\u8A31\u6B64\u884D\u751F\u3002
-+ e-props-correct.5 = e-props-correct.5: '{'value constraint'}' \u4E0D\u53EF\u51FA\u73FE\u5728\u5143\u7D20 ''{0}'' \u4E0A\uFF0C\u56E0\u70BA\u5143\u7D20\u7684 '{'type definition'}' \u6216 '{'type definition'}' \u7684 '{'content type'}' \u70BA ID\uFF0C\u6216\u884D\u751F\u81EA ID\u3002
- e-props-correct.6 = e-props-correct.6: \u5075\u6E2C\u5230 ''{0}'' \u7684\u5FAA\u74B0\u66FF\u4EE3\u7FA4\u7D44\u3002
- fractionDigits-valid-restriction = fractionDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''fractionDigits'' \u7684\u503C ''{0}'' \u7121\u6548\uFF0C\u56E0\u70BA\u5B83\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC ''fractionDigits'' \u7684\u503C\uFF0C\u6B64\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{1}''\u3002
- fractionDigits-totalDigits = fractionDigits-totalDigits: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C facet ''fractionDigits'' \u7684\u503C ''{0}'' \u7121\u6548\uFF0C\u56E0\u70BA\u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC ''totalDigits'' \u7684\u503C\uFF0C\u4EA6\u5373 ''{1}''\u3002
-@@ -235,7 +207,7 @@
- maxInclusive-valid-restriction.3 = maxInclusive-valid-restriction.3: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxInclusive \u503C\u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minInclusive\u3002
- maxInclusive-valid-restriction.4 = maxInclusive-valid-restriction.4: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 maxInclusive \u503C\u5FC5\u9808\u5927\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minExclusive\u3002
- maxLength-valid-restriction = maxLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 maxLength \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 maxLength \u503C\u3002
-- mg-props-correct.2 = mg-props-correct.2: \u5075\u6E2C\u5230\u7FA4\u7D44 ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u905E\u8FF4\u4F7F\u7528\u7269\u4EF6\u7684 ''{''term''}'' \u503C\u5C07\u5C0E\u81F3\u5176 ''{''term''}'' \u70BA\u7FA4\u7D44\u672C\u8EAB\u7684\u7269\u4EF6\u3002
-+ mg-props-correct.2 = mg-props-correct.2: \u5075\u6E2C\u5230\u7FA4\u7D44 ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u905E\u8FF4\u4F7F\u7528\u7269\u4EF6\u7684 '{'term'}' \u503C\u5C07\u5C0E\u81F3\u5176 '{'term'}' \u70BA\u7FA4\u7D44\u672C\u8EAB\u7684\u7269\u4EF6\u3002
- minExclusive-less-than-equal-to-maxExclusive = minExclusive-less-than-equal-to-maxExclusive: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC maxExclusive \u503C (\u7B49\u65BC ''{1}'')\u3002
- minExclusive-less-than-maxInclusive = minExclusive-less-than-maxInclusive: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5C0F\u65BC maxInclusive \u503C (\u7B49\u65BC ''{1}'')\u3002
- minExclusive-valid-restriction.1 = minExclusive-valid-restriction.1: \u985E\u578B ''{2}'' \u7684\u932F\u8AA4\u3002\u7B49\u65BC ''{0}'' \u7684 minExclusive \u503C\u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minExclusive\u3002
-@@ -252,20 +224,20 @@
- minLength-less-than-equal-to-maxLength = minLength-less-than-equal-to-maxLength: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minLength \u503C\u5FC5\u9808\u5C0F\u65BC maxLength \u503C (\u7B49\u65BC ''{1}'')\u3002
- minLength-valid-restriction = minLength-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0C\u7B49\u65BC ''{0}'' \u7684 minLength \u5FC5\u9808\u5927\u65BC\u6216\u7B49\u65BC\u57FA\u790E\u985E\u578B ''{1}'' \u7684 minLength\u3002
- no-xmlns = no-xmlns: \u5C6C\u6027\u5BA3\u544A\u7684 {name} \u4E0D\u80FD\u8207 'xmlns' \u76F8\u540C\u3002
-- no-xsi = no-xsi: \u5C6C\u6027\u5BA3\u544A\u7684 ''{''target namespace''}'' \u4E0D\u80FD\u8207 ''{0}'' \u76F8\u540C\u3002
-+ no-xsi = no-xsi: \u5C6C\u6027\u5BA3\u544A\u7684 '{'target namespace'}' \u4E0D\u80FD\u8207 ''{0}'' \u76F8\u540C\u3002
- p-props-correct.2.1 = p-props-correct.2.1: \u5728 ''{0}'' \u7684\u5BA3\u544A\u4E2D\uFF0C''minOccurs'' \u7684\u503C\u70BA ''{1}''\uFF0C\u4F46\u662F\u5B83\u4E0D\u53EF\u5927\u65BC ''maxOccurs'' \u7684\u503C ''{2}''\u3002
- rcase-MapAndSum.1 = rcase-MapAndSum.1: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
- rcase-MapAndSum.2 = rcase-MapAndSum.2: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u7FA4\u7D44\u767C\u751F\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
- rcase-NameAndTypeOK.1 = rcase-NameAndTypeOK.1: \u5143\u7D20\u5177\u6709\u4E0D\u76F8\u540C\u7684\u540D\u7A31\u8207\u76EE\u6A19\u547D\u540D\u7A7A\u9593: \u547D\u540D\u7A7A\u9593 ''{1}'' \u4E2D\u7684\u5143\u7D20 ''{0}'' \u8207\u547D\u540D\u7A7A\u9593 ''{3}'' \u4E2D\u7684\u5143\u7D20 ''{2}''\u3002
-- rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: \u7269\u4EF6\u7684 ''{''term''}'' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5143\u7D20\u5BA3\u544A\u7684 ''{''nillable''}'' \u70BA\u771F\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u7684\u5C0D\u61C9\u7269\u4EF6\u5177\u6709 ''{''nillable''}'' \u70BA\u507D\u7684\u5143\u7D20\u5BA3\u544A\u3002
-- rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: \u7269\u4EF6\u7684 ''{''term''}'' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5B83\u7684\u767C\u751F\u7BC4\u570D ({1}\uFF0C{2}) \u4E0D\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7269\u4EF6\u7BC4\u570D ({3}\uFF0C{4}) \u7684\u6709\u6548\u9650\u5236\u3002
-+ rcase-NameAndTypeOK.2 = rcase-NameAndTypeOK.2: \u7269\u4EF6\u7684 '{'term'}' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5143\u7D20\u5BA3\u544A\u7684 '{'nillable'}' \u70BA\u771F\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u7684\u5C0D\u61C9\u7269\u4EF6\u5177\u6709 '{'nillable'}' \u70BA\u507D\u7684\u5143\u7D20\u5BA3\u544A\u3002
-+ rcase-NameAndTypeOK.3 = rcase-NameAndTypeOK.3: \u7269\u4EF6\u7684 '{'term'}' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5B83\u7684\u767C\u751F\u7BC4\u570D ({1}\uFF0C{2}) \u4E0D\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7269\u4EF6\u7BC4\u570D ({3}\uFF0C{4}) \u7684\u6709\u6548\u9650\u5236\u3002
- rcase-NameAndTypeOK.4.a = rcase-NameAndTypeOK.4.a: \u5143\u7D20 ''{0}'' \u975E\u56FA\u5B9A\u5F0F\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7684\u5143\u7D20\u5177\u6709\u56FA\u5B9A\u503C ''{1}''\u3002
- rcase-NameAndTypeOK.4.b = rcase-NameAndTypeOK.4.b: \u5143\u7D20 ''{0}'' \u5177\u6709\u56FA\u5B9A\u503C ''{1}''\uFF0C\u4F46\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7684\u5143\u7D20\u5177\u6709\u56FA\u5B9A\u503C ''{2}''\u3002
- rcase-NameAndTypeOK.5 = rcase-NameAndTypeOK.5: \u5143\u7D20 ''{0}'' \u7684\u8B58\u5225\u9650\u5236\u689D\u4EF6\u4E0D\u662F\u57FA\u790E\u4E2D\u7684\u5B50\u96C6\u3002
- rcase-NameAndTypeOK.6 = rcase-NameAndTypeOK.6: \u5143\u7D20 ''{0}'' \u4E0D\u5141\u8A31\u7684\u66FF\u4EE3\u4E0D\u662F\u57FA\u790E\u4E2D\u7684\u8D85\u96C6\u3002
- rcase-NameAndTypeOK.7 = rcase-NameAndTypeOK.7: \u5143\u7D20 ''{0}'' \u7684\u985E\u578B ''{1}'' \u4E0D\u662F\u884D\u751F\u81EA\u57FA\u790E\u5143\u7D20 ''{2}'' \u7684\u985E\u578B\u3002
- rcase-NSCompat.1 = rcase-NSCompat.1: \u5143\u7D20 ''{0}'' \u5177\u6709\u57FA\u790E\u4E2D\u842C\u7528\u5B57\u5143\u4E0D\u5141\u8A31\u7684\u547D\u540D\u7A7A\u9593 ''{1}''\u3002
-- rcase-NSCompat.2 = rcase-NSCompat.2: \u7269\u4EF6\u7684 ''{''term''}'' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5B83\u7684\u767C\u751F\u7BC4\u570D ({1}\uFF0C{2}) \u4E0D\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7269\u4EF6\u7BC4\u570D ({3}\uFF0C{4}) \u7684\u6709\u6548\u9650\u5236\u3002
-+ rcase-NSCompat.2 = rcase-NSCompat.2: \u7269\u4EF6\u7684 '{'term'}' \u70BA\u5143\u7D20\u5BA3\u544A ''{0}'' \u7684\u932F\u8AA4\u3002\u5B83\u7684\u767C\u751F\u7BC4\u570D ({1}\uFF0C{2}) \u4E0D\u662F\u57FA\u790E\u985E\u578B\u4E2D\u5C0D\u61C9\u7269\u4EF6\u7BC4\u570D ({3}\uFF0C{4}) \u7684\u6709\u6548\u9650\u5236\u3002
- rcase-NSRecurseCheckCardinality.1 = rcase-NSRecurseCheckCardinality.1: \u7269\u4EF6\u4E4B\u9593\u6C92\u6709\u5B8C\u6574\u7684\u529F\u80FD\u5C0D\u61C9\u3002
- rcase-NSRecurseCheckCardinality.2 = rcase-NSRecurseCheckCardinality.2: \u7FA4\u7D44\u7684\u767C\u751F\u7BC4\u570D ({0}\uFF0C{1}) \u4E0D\u662F\u57FA\u790E\u842C\u7528\u5B57\u5143\u7BC4\u570D ({2}\uFF0C{3}) \u7684\u6709\u6548\u9650\u5236\u3002
- rcase-NSSubset.1 = rcase-NSSubset.1: \u842C\u7528\u5B57\u5143\u4E0D\u662F\u57FA\u790E\u4E2D\u5C0D\u61C9\u842C\u7528\u5B57\u5143\u7684\u5B50\u96C6\u3002
-@@ -281,7 +253,7 @@
- # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: \u7DB1\u8981\u7121\u6CD5\u5305\u542B\u76F8\u540C\u540D\u7A31\u7684\u5169\u500B\u5168\u57DF\u5143\u4EF6; \u6B64\u7DB1\u8981\u5305\u542B\u5169\u500B ''{0}''\u3002
- st-props-correct.2 = st-props-correct.2: \u5075\u6E2C\u5230\u7C21\u55AE\u985E\u578B ''{0}'' \u7684\u5FAA\u74B0\u5B9A\u7FA9\u3002\u9019\u4EE3\u8868 ''{0}'' \u5305\u542B\u5728\u81EA\u8EAB\u985E\u578B\u968E\u5C64\u4E2D\uFF0C\u9019\u662F\u4E00\u9805\u932F\u8AA4\u3002
-- st-props-correct.3 = st-props-correct.3: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002''{''base type definition''}'' \u7684 ''{''final''}'' \u503C ''{1}'' \u9650\u5236\u7981\u6B62\u884D\u751F\u3002
-+ st-props-correct.3 = st-props-correct.3: \u985E\u578B ''{0}'' \u7684\u932F\u8AA4\u3002'{'base type definition'}' \u7684 '{'final'}' \u503C ''{1}'' \u9650\u5236\u7981\u6B62\u884D\u751F\u3002
- totalDigits-valid-restriction = totalDigits-valid-restriction: \u5728 {2} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''totalDigits'' \u7684\u503C ''{0}'' \u7121\u6548\uFF0C\u56E0\u70BA\u5B83\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC ''totalDigits'' \u7684\u503C\uFF0C\u6B64\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{1}''\u3002
- whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: \u5728 {0} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''whitespace'' \u7684\u503C ''{1}'' \u7121\u6548\uFF0C\u56E0\u70BA ''whitespace'' \u7684\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''collapse''\u3002
- whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: \u5728 {0} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''whitespace'' \u7684\u503C ''preserve'' \u7121\u6548\uFF0C\u56E0\u70BA ''whitespace'' \u7684\u503C\u5728\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u4E2D\u8A2D\u70BA ''replace''\u3002
-@@ -297,7 +269,7 @@
- # the "invalid-content" messages provide less information than the "must-match" counterparts above. They're used for complex types when providing a "match" would be an information dump
- s4s-elt-invalid-content.1 = s4s-elt-invalid-content.1: ''{0}'' \u7684\u5167\u5BB9\u7121\u6548\u3002\u5143\u7D20 ''{1}'' \u7121\u6548\u3001\u4F4D\u7F6E\u932F\u8AA4\u6216\u592A\u5E38\u51FA\u73FE\u3002
- s4s-elt-invalid-content.2 = s4s-elt-invalid-content.2: ''{0}'' \u7684\u5167\u5BB9\u7121\u6548\u3002\u5143\u7D20 ''{1}'' \u4E0D\u53EF\u7A7A\u767D\u3002
-- s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: \u985E\u578B ''{0}'' \u7684\u5143\u7D20\u4E0D\u53EF\u51FA\u73FE\u5728\u5BA3\u544A\u4E4B\u5F8C\uFF0C\u505A\u70BA <schema> \u5143\u7D20\u7684\u5B50\u9805\u3002
-+ s4s-elt-invalid-content.3 = s4s-elt-invalid-content.3: \u985E\u578B ''{0}'' \u7684\u5143\u7D20\u4E0D\u53EF\u51FA\u73FE\u5728\u5BA3\u544A\u4E4B\u5F8C\uFF0C\u4F5C\u70BA <schema> \u5143\u7D20\u7684\u5B50\u9805\u3002
- s4s-elt-schema-ns = s4s-elt-schema-ns: \u5143\u7D20 ''{0}'' \u7684\u547D\u540D\u7A7A\u9593\u5FC5\u9808\u4F86\u81EA\u7DB1\u8981\u547D\u540D\u7A7A\u9593 ''http://www.w3.org/2001/XMLSchema''\u3002
- s4s-elt-character = s4s-elt-character: \u7DB1\u8981\u5143\u7D20\u4E2D\u4E0D\u5141\u8A31\u975E\u7A7A\u767D\u5B57\u5143\uFF0C\u4F46\u662F ''xs:appinfo'' \u8207 ''xs:documentation'' \u9664\u5916\u3002\u767C\u73FE ''{0}''\u3002
-
-@@ -309,12 +281,12 @@
- c-selector-xpath = c-selector-xpath: \u7B49\u65BC ''{0}'' \u7684\u9078\u53D6\u5668\u503C\u7121\u6548; \u9078\u53D6\u5668 xpaths \u4E0D\u80FD\u5305\u542B\u5C6C\u6027\u3002
- EmptyTargetNamespace = EmptyTargetNamespace: \u5728\u7DB1\u8981\u6587\u4EF6 ''{0}'' \u4E2D\uFF0C''targetNamespace'' \u5C6C\u6027\u7684\u503C\u4E0D\u53EF\u70BA\u7A7A\u767D\u5B57\u4E32\u3002
- FacetValueFromBase = FacetValueFromBase: \u5728\u985E\u578B ''{0}'' \u7684\u5BA3\u544A\u4E2D\uFF0Cfacet ''{2}'' \u7684\u503C ''{1}'' \u5FC5\u9808\u4F86\u81EA\u57FA\u790E\u985E\u578B\u7684\u503C\u7A7A\u9593 ''{3}''\u3002
-- FixedFacetValue = FixedFacetValue: \u5728 {3} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''{0}'' \u7684\u503C ''{1}'' \u7121\u6548\uFF0C\u56E0\u70BA ''{0}'' \u7684\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{2}''\uFF0C\u4E14 ''{''fixed''}'' = true\u3002
-- InvalidRegex = InvalidRegex: \u6A23\u5F0F\u503C ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u4E00\u822C\u8868\u793A\u5F0F\u3002\u5831\u544A\u7684\u932F\u8AA4: \u4F4D\u65BC\u8CC7\u6599\u6B04 ''{2}'' \u7684 ''{1}''\u3002
-+ FixedFacetValue = FixedFacetValue: \u5728 {3} \u7684\u5B9A\u7FA9\u4E2D\uFF0Cfacet ''{0}'' \u7684\u503C ''{1}'' \u7121\u6548\uFF0C\u56E0\u70BA ''{0}'' \u7684\u503C\u4EE5\u5176\u4E2D\u4E00\u500B\u7956\u7CFB\u985E\u578B\u8A2D\u70BA ''{2}''\uFF0C\u4E14 '{'fixed'}' = true\u3002
-+ InvalidRegex = InvalidRegex: \u6A23\u5F0F\u503C ''{0}'' \u4E0D\u662F\u6709\u6548\u7684\u6B63\u898F\u8868\u793A\u5F0F\u3002\u5831\u544A\u7684\u932F\u8AA4: \u4F4D\u65BC\u8CC7\u6599\u6B04 ''{2}'' \u7684 ''{1}''\u3002
- maxOccurLimit = \u5256\u6790\u5668\u76EE\u524D\u7684\u7D44\u614B\u4E0D\u5141\u8A31 maxOccurs \u5C6C\u6027\u503C\u8A2D\u70BA\u5927\u65BC\u503C {0}\u3002
- PublicSystemOnNotation = PublicSystemOnNotation: ''public'' \u8207 ''system'' \u81F3\u5C11\u5176\u4E2D\u4E4B\u4E00\u5FC5\u9808\u51FA\u73FE\u5728\u5143\u7D20 ''notation'' \u4E2D\u3002
- SchemaLocation = \u7B49\u65BC ''{0}'' \u7684 SchemaLocation: schemaLocation \u503C\u5FC5\u9808\u5177\u6709\u5076\u6578\u500B URI\u3002
- TargetNamespace.1 = TargetNamespace.1: \u9810\u671F\u547D\u540D\u7A7A\u9593 ''{0}''\uFF0C\u4F46\u662F\u7DB1\u8981\u6587\u4EF6\u7684\u76EE\u6A19\u547D\u540D\u7A7A\u9593\u70BA ''{1}''\u3002
- TargetNamespace.2 = TargetNamespace.2: \u672A\u9810\u671F\u547D\u540D\u7A7A\u9593\uFF0C\u4F46\u662F\u7DB1\u8981\u6587\u4EF6\u5177\u6709\u76EE\u6A19\u547D\u540D\u7A7A\u9593 ''{1}''\u3002
-- UndeclaredEntity = UndeclaredEntity: \u672A\u5BA3\u544A\u500B\u9AD4 ''{0}''\u3002
-+ UndeclaredEntity = UndeclaredEntity: \u672A\u5BA3\u544A\u5BE6\u9AD4 ''{0}''\u3002
- UndeclaredPrefix = UndeclaredPrefix: \u7121\u6CD5\u89E3\u6790 ''{0}'' \u70BA QName: \u672A\u5BA3\u544A\u524D\u7F6E\u78BC ''{1}''\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties Fri Apr 10 09:20:34 2015 -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 stores error messages for the Xerces XML
- # serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
-@@ -33,7 +5,7 @@
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
- #
--# @version $Id: XMLSerializerMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XMLSerializerMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
- FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
-@@ -49,8 +21,8 @@
- AttributeQName = Attributname "{0}" ist kein QName.
- AttributePrefix = Attribut "{0}" geh\u00F6rt zu keinem Namespace: Pr\u00E4fix ist m\u00F6glicherweise nicht deklariert oder an einen Namespace gebunden.
- InvalidNSDecl = Namespace-Deklarationssyntax ist falsch: {0}.
-- EndingCDATA = Zeichenfolge"\"]]>\" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
-- SplittingCDATA = Teilen eines CDATA-Abschnitts mit dem CDATA-Abschnittsabschlusszeichen \"]]>\".
-+ EndingCDATA = Zeichenfolge""]]>" darf nur im Content enthalten sein, wenn sie das Ende eines CDATA-Abschnitts markiert.
-+ SplittingCDATA = Teilen eines CDATA-Abschnitts mit dem CDATA-Abschnittsabschlusszeichen "]]>".
- ResourceNotFound = Ressource "{0}" konnte nicht gefunden werden.
- ResourceNotLoaded = Ressource "{0}" konnte nicht geladen werden. {1}
- SerializationStopped = Serialisierung auf Benutzeranforderung gestoppt.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_es.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
- BadMessageKey = No se ha encontrado el mensaje de error que corresponde a la clave de mensaje.
- FormatFailed = Se ha producido un error interno al formatear el siguiente mensaje:\n
-@@ -49,8 +21,8 @@
- AttributeQName = El nombre del atributo ''{0}'' no es un QName.
- AttributePrefix = El atributo ''{0}'' no pertenece a ning\u00FAn espacio de nombres: el prefijo puede ser no declarado o estar enlazado a alg\u00FAn espacio de nombres.
- InvalidNSDecl = La sintaxis de la declaraci\u00F3n de espacio de nombres no es correcta: {0}.
-- EndingCDATA = La secuencia de caracteres \"]]>\" no debe aparecer en el contenido a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
-- SplittingCDATA = Divisi\u00F3n de una secci\u00F3n CDATA que contiene el marcador de terminaci\u00F3n de secci\u00F3n CDATA \"]]>\".
-+ EndingCDATA = La secuencia de caracteres "]]>" no debe aparecer en el contenido a menos que se utilice para marcar el final de una secci\u00F3n CDATA.
-+ SplittingCDATA = Divisi\u00F3n de una secci\u00F3n CDATA que contiene el marcador de terminaci\u00F3n de secci\u00F3n CDATA "]]>".
- ResourceNotFound = No se ha encontrado el recurso ''{0}''.
- ResourceNotLoaded = No se ha podido cargar el recurso ''{0}''. {1}
- SerializationStopped = La serializaci\u00F3n se ha parado a petici\u00F3n del usuario.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
- FormatFailed = Une erreur interne est survenue lors de la mise en forme du message suivant :\n
-@@ -49,8 +21,8 @@
- AttributeQName = Le nom d''attribut ''{0}'' n''est pas un QName.
- AttributePrefix = L''attribut ''{0}'' n''appartient \u00E0 aucun espace de noms : le pr\u00E9fixe est peut-\u00EAtre non d\u00E9clar\u00E9 ou li\u00E9 \u00E0 un espace de noms.
- InvalidNSDecl = La syntaxe de la d\u00E9claration d''espace de noms est incorrecte : {0}.
-- EndingCDATA = La s\u00E9quence de caract\u00E8res \"]]>\" ne peut figurer dans le contenu que pour marquer la fin de la section CDATA.
-- SplittingCDATA = Fractionnement d'une section CDATA contenant le marqueur de fin de section CDATA \"]]>\".
-+ EndingCDATA = La s\u00E9quence de caract\u00E8res "]]>" ne peut figurer dans le contenu que pour marquer la fin de la section CDATA.
-+ SplittingCDATA = Fractionnement d'une section CDATA contenant le marqueur de fin de section CDATA "]]>".
- ResourceNotFound = La ressource ''{0}'' est introuvable.
- ResourceNotLoaded = La ressource ''{0}'' n''a pas pu \u00EAtre charg\u00E9e. {1}
- SerializationStopped = La s\u00E9rialisation a \u00E9t\u00E9 arr\u00EAt\u00E9e \u00E0 la demande de l'utilisateur.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_it.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
- FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n
-@@ -49,8 +21,8 @@
- AttributeQName = Il nome attributo ''{0}'' non \u00E8 un QName.
- AttributePrefix = L''attributo ''{0}'' non appartiene ad alcuno spazio di nomi: il prefisso deve essere non dichiarato o associato a uno spazio di nomi.
- InvalidNSDecl = La sintassi della dichiarazione dello spazio di nomi \u00E8 errata: {0}.
-- EndingCDATA = La sequenza di caratteri \"]]>\" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
-- SplittingCDATA = Verr\u00E0 suddivisa una sezione CDATA che contiene l'indicatore di fine della sezione CDATA \"]]>\".
-+ EndingCDATA = La sequenza di caratteri "]]>" non deve essere presente nel contenuto a meno che non sia utilizzata per contrassegnare la fine di una sezione CDATA.
-+ SplittingCDATA = Verr\u00E0 suddivisa una sezione CDATA che contiene l'indicatore di fine della sezione CDATA "]]>".
- ResourceNotFound = Impossibile trovare la risorsa ''{0}''.
- ResourceNotLoaded = Impossibile caricare la risorsa ''{0}''. {1}
- SerializationStopped = Serializzazione arrestata su richiesta dell'utente.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
- FormatFailed = \u6B21\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u66F8\u5F0F\u8A2D\u5B9A\u4E2D\u306B\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:\n
-@@ -49,8 +21,8 @@
- AttributeQName = \u5C5E\u6027\u540D''{0}''\u306FQName\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
- AttributePrefix = \u5C5E\u6027''{0}''\u304C\u3069\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u3082\u5C5E\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u63A5\u982D\u8F9E\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u306A\u3093\u3089\u304B\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u306B\u30D0\u30A4\u30F3\u30C9\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
- InvalidNSDecl = \u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5BA3\u8A00\u306E\u69CB\u6587\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093: {0}\u3002
-- EndingCDATA = \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
-- SplittingCDATA = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u7D42\u4E86\u30DE\u30FC\u30AB\u30FC\"]]>\"\u304C\u542B\u307E\u308C\u3066\u3044\u308BCDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u5206\u5272\u3057\u3066\u3044\u307E\u3059\u3002
-+ EndingCDATA = \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
-+ SplittingCDATA = CDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u7D42\u4E86\u30DE\u30FC\u30AB\u30FC"]]>"\u304C\u542B\u307E\u308C\u3066\u3044\u308BCDATA\u30BB\u30AF\u30B7\u30E7\u30F3\u3092\u5206\u5272\u3057\u3066\u3044\u307E\u3059\u3002
- ResourceNotFound = \u30EA\u30BD\u30FC\u30B9''{0}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
- ResourceNotLoaded = \u30EA\u30BD\u30FC\u30B9''{0}''\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002 {1}
- SerializationStopped = \u30B7\u30EA\u30A2\u30E9\u30A4\u30BA\u304C\u30E6\u30FC\u30B6\u30FC\u30FB\u30EA\u30AF\u30A8\u30B9\u30C8\u3067\u505C\u6B62\u3055\u308C\u307E\u3057\u305F\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- FormatFailed = \uB2E4\uC74C \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC744 \uC9C0\uC815\uD558\uB294 \uC911 \uB0B4\uBD80 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n
-@@ -49,8 +21,8 @@
- AttributeQName = \uC18D\uC131 \uC774\uB984 ''{0}''\uC740(\uB294) QName\uC774 \uC544\uB2D9\uB2C8\uB2E4.
- AttributePrefix = ''{0}'' \uC18D\uC131\uC774 \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uC18D\uD558\uC9C0 \uC54A\uC74C: \uC811\uB450\uC5B4\uC758 \uC120\uC5B8\uC744 \uD574\uC81C\uD558\uAC70\uB098 \uC811\uB450\uC5B4\uB97C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBC14\uC778\uB4DC\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
- InvalidNSDecl = \uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC120\uC5B8 \uAD6C\uBB38\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC74C: {0}.
-- EndingCDATA = \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.
-- SplittingCDATA = CDATA \uC139\uC158 \uC885\uB8CC \uD45C\uC2DC\uC790 \"]]>\"\uB97C \uD3EC\uD568\uD558\uB294 CDATA \uC139\uC158\uC744 \uBD84\uD560\uD558\uB294 \uC911\uC785\uB2C8\uB2E4.
-+ EndingCDATA = \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.
-+ SplittingCDATA = CDATA \uC139\uC158 \uC885\uB8CC \uD45C\uC2DC\uC790 "]]>"\uB97C \uD3EC\uD568\uD558\uB294 CDATA \uC139\uC158\uC744 \uBD84\uD560\uD558\uB294 \uC911\uC785\uB2C8\uB2E4.
- ResourceNotFound = ''{0}'' \uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
- ResourceNotLoaded = ''{0}'' \uB9AC\uC18C\uC2A4\uB97C \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. {1}
- SerializationStopped = \uC0AC\uC6A9\uC790 \uC694\uCCAD\uC5D0 \uB530\uB77C \uC9C1\uB82C\uD654\uAC00 \uC815\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
- FormatFailed = Ocorreu um erro interno ao formatar a mensagem a seguir:\n
-@@ -49,8 +21,8 @@
- AttributeQName = O nome do atributo ''{0}'' n\u00E3o \u00E9 QName.
- AttributePrefix = O atributo ''{0}'' n\u00E3o pertence a nenhum namespace: o prefixo n\u00E3o pode ser n\u00E3o declarado ou vinculado a algum namespace.
- InvalidNSDecl = Sintaxe de declara\u00E7\u00E3o de namespace incorreta: {0}.
-- EndingCDATA = 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.
-- SplittingCDATA = Dividir uma se\u00E7\u00E3o CDATA que cont\u00E9m o marcador \"]]>\" de termina\u00E7\u00E3o de se\u00E7\u00E3o CDATA.
-+ EndingCDATA = 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.
-+ SplittingCDATA = Dividir uma se\u00E7\u00E3o CDATA que cont\u00E9m o marcador "]]>" de termina\u00E7\u00E3o de se\u00E7\u00E3o CDATA.
- ResourceNotFound = N\u00E3o foi poss\u00EDvel encontrar o recurso ''{0}''.
- ResourceNotLoaded = N\u00E3o foi poss\u00EDvel carregar o recurso ''{0}''. {1}
- SerializationStopped = Serializa\u00E7\u00E3o interrompida na solicita\u00E7\u00E3o do usu\u00E1rio.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
- FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n
-@@ -49,8 +21,8 @@
- AttributeQName = Attributnamnet ''{0}'' \u00E4r inte n\u00E5got QName.
- AttributePrefix = Attributet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
- InvalidNSDecl = Felaktig syntax i deklaration av namnrymd: {0}.
-- EndingCDATA = Teckensekvensen \"]]>\" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
-- SplittingCDATA = Delar en CDATA-sektion som inneh\u00E5ller CDATA-sektionens avslutningsmark\u00F6r \"]]>\".
-+ EndingCDATA = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
-+ SplittingCDATA = Delar en CDATA-sektion som inneh\u00E5ller CDATA-sektionens avslutningsmark\u00F6r "]]>".
- ResourceNotFound = Resursen ''{0}'' hittades inte.
- ResourceNotLoaded = Resursen ''{0}'' kunde inte laddas. {1}
- SerializationStopped = Serialiseringen stoppades vid anv\u00E4ndarbeg\u00E4ran.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
- FormatFailed = \u8BBE\u7F6E\u4EE5\u4E0B\u6D88\u606F\u7684\u683C\u5F0F\u65F6\u51FA\u73B0\u5185\u90E8\u9519\u8BEF:\n
-@@ -49,8 +21,8 @@
- AttributeQName = \u5C5E\u6027\u540D ''{0}'' \u4E0D\u662F\u9650\u5B9A\u540D\u3002
- AttributePrefix = \u5C5E\u6027 ''{0}'' \u4E0D\u5C5E\u4E8E\u4EFB\u4F55\u540D\u79F0\u7A7A\u95F4: \u53EF\u80FD\u672A\u58F0\u660E\u524D\u7F00, \u6216\u8005\u5DF2\u7ECF\u5C06\u524D\u7F00\u7ED1\u5B9A\u5230\u67D0\u4E2A\u540D\u79F0\u7A7A\u95F4\u3002
- InvalidNSDecl = \u540D\u79F0\u7A7A\u95F4\u58F0\u660E\u8BED\u6CD5\u4E0D\u6B63\u786E: {0}\u3002
-- EndingCDATA = \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
-- SplittingCDATA = \u62C6\u5206\u5305\u542B CDATA \u6BB5\u7EC8\u6B62\u6807\u8BB0 \"]]>\" \u7684 CDATA \u6BB5\u3002
-+ EndingCDATA = \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
-+ SplittingCDATA = \u62C6\u5206\u5305\u542B CDATA \u6BB5\u7EC8\u6B62\u6807\u8BB0 "]]>" \u7684 CDATA \u6BB5\u3002
- ResourceNotFound = \u627E\u4E0D\u5230\u8D44\u6E90 ''{0}''\u3002
- ResourceNotLoaded = \u65E0\u6CD5\u52A0\u8F7D\u8D44\u6E90 ''{0}''\u3002{1}
- SerializationStopped = \u6839\u636E\u7528\u6237\u8BF7\u6C42\u505C\u6B62\u4E86\u5E8F\u5217\u5316\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,39 +1,11 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores error messages for the Xerces XML
--# serializer. Many DOM Load/Save error messages also
-+# serializer. Many DOM Load/Save error messages also
- # live here, since the serializer largely implements that package.
- #
- # As usual with properties files, the messages are arranged in
- # key/value tuples.
--#
--# @version $Id: XMLSerializerMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+#
-+# @version $Id: XMLSerializerMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
- FormatFailed = \u683C\u5F0F\u5316\u4E0B\u5217\u8A0A\u606F\u6642\u767C\u751F\u5167\u90E8\u932F\u8AA4:\n
-@@ -49,8 +21,8 @@
- AttributeQName = \u5C6C\u6027\u540D\u7A31 ''{0}'' \u4E0D\u662F QName\u3002
- AttributePrefix = \u5C6C\u6027 ''{0}'' \u4E0D\u5C6C\u65BC\u4EFB\u4F55\u547D\u540D\u7A7A\u9593: \u53EF\u80FD\u672A\u5BA3\u544A\u524D\u7F6E\u78BC\u6216\u524D\u7F6E\u78BC\u9023\u7D50\u5176\u4ED6\u547D\u540D\u7A7A\u9593\u3002
- InvalidNSDecl = \u547D\u540D\u7A7A\u9593\u5BA3\u544A\u8A9E\u6CD5\u4E0D\u6B63\u78BA: {0}\u3002
-- EndingCDATA = \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
-- SplittingCDATA = \u5206\u5272\u5305\u542B CDATA \u6BB5\u843D\u7D42\u6B62\u6A19\u8A18 \"]]>\" \u7684 CDATA \u6BB5\u843D\u3002
-+ EndingCDATA = \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
-+ SplittingCDATA = \u5206\u5272\u5305\u542B CDATA \u6BB5\u843D\u7D42\u6B62\u6A19\u8A18 "]]>" \u7684 CDATA \u6BB5\u843D\u3002
- ResourceNotFound = \u627E\u4E0D\u5230\u8CC7\u6E90 ''{0}''\u3002
- ResourceNotLoaded = \u7121\u6CD5\u8F09\u5165\u8CC7\u6E90 ''{0}''\u3002{1}
- SerializationStopped = \u4F9D\u7167\u4F7F\u7528\u8005\u8981\u6C42\u505C\u6B62\u5E8F\u5217\u5316\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_de.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_de.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_es.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_es.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = No se ha encontrado el mensaje de error que corresponde a la clave de mensaje.
-@@ -38,7 +10,7 @@
-
- # XPointer Framework Error Messages
- XPointerProcessingError = XPointerProcessingError: Se ha producido un error al procesar la expresi\u00F3n XPointer.
--InvalidXPointerToken = InvalidXPointerToken: La expresi\u00F3n XPointer contiene el elemento no v\u00E1lido ''{0}''
-+InvalidXPointerToken = InvalidXPointerToken: La expresi\u00F3n XPointer contiene el token no v\u00E1lido ''{0}''
- InvalidXPointerExpression = InvalidXPointerExpression: La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida.
- MultipleShortHandPointers = MultipleShortHandPointers: La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida. Tiene m\u00E1s de un puntero abreviado.
- SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: La expresi\u00F3n XPointer ''{0}'' no es v\u00E1lida. SchemeData no viene seguido de un car\u00E1cter '')''.
-@@ -48,7 +20,7 @@
- InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: La expresi\u00F3n XPointer ''{0}'' contiene un valor de SchemeData no v\u00E1lido.
-
- # XPointer Element Scheme Error Messages
--InvalidElementSchemeToken = InvalidElementSchemeToken: La expresi\u00F3n XPointer del esquema de element() contiene el elemento no v\u00E1lido ''{0}''
-+InvalidElementSchemeToken = InvalidElementSchemeToken: La expresi\u00F3n XPointer del esquema de element() contiene el token no v\u00E1lido ''{0}''
- InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: La expresi\u00F3n XPointer del esquema de elemento ''{0}'' no es v\u00E1lida.
- XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Se ha producido un error al procesar la expresi\u00F3n de esquema XPointer element().
- InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: El esquema element() contiene un puntero abreviado ''{0}'' con un valor de NCName no v\u00E1lido.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_fr.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_fr.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Le message d'erreur correspondant \u00E0 la cl\u00E9 de message est introuvable.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_it.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_it.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Impossibile trovare il messaggio di errore corrispondente alla chiave di messaggio.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_ja.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_ja.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC\u306B\u5BFE\u5FDC\u3059\u308B\u30A8\u30E9\u30FC\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_ko.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_ko.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \uBA54\uC2DC\uC9C0 \uD0A4\uC5D0 \uD574\uB2F9\uD558\uB294 \uC624\uB958 \uBA54\uC2DC\uC9C0\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_pt_BR.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_pt_BR.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = N\u00E3o foi poss\u00EDvel encontrar a mensagem de erro correspondente \u00E0 chave da mensagem.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_sv.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_sv.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = Hittar inte felmeddelandet som motsvarar meddelandenyckeln.
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_zh_CN.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_zh_CN.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \u627E\u4E0D\u5230\u4E0E\u6D88\u606F\u5173\u952E\u5B57\u5BF9\u5E94\u7684\u9519\u8BEF\u6D88\u606F\u3002
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,36 +1,8 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please 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 stores localized messages for the Xerces XPointer implementation.
- #
- # The messages are arranged in key and value tuples in a ListResourceBundle.
- #
--# @version $Id: XPointerMessages_zh_TW.properties 3021 2011-03-01 00:12:28Z joehw $
-+# @version $Id: XPointerMessages_zh_TW.properties /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
-
- # Messages for message reporting
- BadMessageKey = \u627E\u4E0D\u5230\u5C0D\u61C9\u8A0A\u606F\u7D22\u5F15\u9375\u7684\u932F\u8AA4\u8A0A\u606F\u3002
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=Falsches Zeichen.
-+parser.parse.2=Ung\u00FCltige Referenznummer.
-+parser.next.1=Nach \\ ist ein Zeichen erforderlich.
-+parser.next.2='?' wird nicht erwartet. '(?:' oder '(?=' oder '(?!' oder '(?<' oder '(?#' oder '(?>'?
-+parser.next.3='(?<=' oder '(?<!' wird erwartet.
-+parser.next.4=Ein Kommentar ist nicht abgeschlossen.
-+parser.factor.1=')' wird erwartet.
-+parser.factor.2=Unerwartetes Ende des Musters in einer Modifier-Gruppe.
-+parser.factor.3=':' wird erwartet.
-+parser.factor.4=Unerwartetes Ende des Musters in einer Bedingungsgruppe.
-+parser.factor.5=Eine Back-Referenz, ein Anker, ein Lookahead oder ein Lookbehind wird in einem Bedingungsmuster erwartet
-+parser.factor.6=Es gibt mehr als drei Auswahlm\u00F6glichkeiten in einer Bedingungsgruppe.
-+parser.atom.1=Ein Zeichen in U+0040-U+005f muss auf \\c folgen.
-+parser.atom.2=Ein '{' ist vor einer Zeichenkategorie erforderlich.
-+parser.atom.3=Ein Eigenschaftsname nicht wird durch '}' abgeschlossen.
-+parser.atom.4=Unerwartetes Metazeichen.
-+parser.atom.5=Unbekannte Eigenschaft.
-+parser.cc.1=Eine POSIX-Zeichenklasse muss durch ':]' abgeschlossen werden.
-+parser.cc.2=Unerwartetes Ende des Musters in einer Zeichenklasse.
-+parser.cc.3=Unbekannter Name f\u00FCr eine POSIX-Zeichenklasse.
-+parser.cc.4='-' ist hier ung\u00FCltig.
-+parser.cc.5=']' wird erwartet.
-+parser.cc.6='[' ist in einer Zeichenklasse ung\u00FCltig. Schreiben Sie '\\['.
-+parser.cc.7=']' ist in einer Zeichenklasse ung\u00FCltig. Schreiben Sie '\\]'.
-+parser.cc.8='-' ist ein ung\u00FCltiger Zeichenbereich. Schreiben Sie '\\-'.
-+parser.ope.1='[' wird erwartet.
-+parser.ope.2=')' oder '-[' oder '+[' oder '&[' wird erwartet.
-+parser.ope.3=Der Endcodepunkt des Bereichs ist kleiner als der Startcodepunkt.
-+parser.descape.1=Ung\u00FCltige Unicode-Hex-Notation.
-+parser.descape.2=\u00DCberlauf in einer Hex-Notation.
-+parser.descape.3='\\x{' muss durch '}' abgeschlossen werden.
-+parser.descape.4=Ung\u00FCltiger Unicode-Codepunkt.
-+parser.descape.5=Ein Anker darf nicht hier sein.
-+parser.process.1=Dieser Ausdruck wird in der aktuellen Optionseinstellung nicht unterst\u00FCtzt.
-+parser.quantifier.1=Ung\u00FCltiger Quantifizierer. Eine Ziffer wird erwartet.
-+parser.quantifier.2=Ung\u00FCltiger Quantifizierer. Ung\u00FCltige Menge, oder ein '}' fehlt.
-+parser.quantifier.3=Ung\u00FCltiger Quantifizierer. Eine Stelle oder '}' wird erwartet.
-+parser.quantifier.4=Ung\u00FCltiger Quantifizierer. Mindestmenge muss <= Maximalmenge sein.
-+parser.quantifier.5=Ung\u00FCltiger Quantifizierer. Ein Mengenwert\u00FCberlauf.
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=Car\u00E1cter incorrecto.
-+parser.parse.2=N\u00FAmero de referencia no v\u00E1lido.
-+parser.next.1=Es necesario un car\u00E1cter despu\u00E9s de \\.
-+parser.next.2=No se esperaba '?'. '(?:', '(?=', '(?!', '(?<', '(?#' o '(?>'?
-+parser.next.3=Se esperaba '(?<=' o '(?<!'.
-+parser.next.4=Un comentario no est\u00E1 terminado.
-+parser.factor.1=Se esperaba ')'.
-+parser.factor.2=Fin inesperado del patr\u00F3n en un grupo de modificadores.
-+parser.factor.3=Se esperaba ':'.
-+parser.factor.4=Fin inesperado del patr\u00F3n en un grupo condicional.
-+parser.factor.5=Se esperaba una referencia hacia atr\u00E1s, anclaje, lookahead o lookbehind en un patr\u00F3n condicional.
-+parser.factor.6=Hay m\u00E1s de tres opciones en un grupo condicional.
-+parser.atom.1=Un car\u00E1cter en U+0040-U+005f debe seguir a \\c.
-+parser.atom.2=Se necesita '{' antes de una categor\u00EDa de car\u00E1cter.
-+parser.atom.3=Un nombre de propiedad no est\u00E1 cerrado por '}'.
-+parser.atom.4=Metacar\u00E1cter inesperado.
-+parser.atom.5=Propiedad desconocida.
-+parser.cc.1=Una clase de car\u00E1cter POSIX debe estar cerrada por ':]'.
-+parser.cc.2=Fin inesperado del patr\u00F3n en una clase de car\u00E1cter.
-+parser.cc.3=Nombre desconocido para una clase de car\u00E1cter POSIX.
-+parser.cc.4='-' no es v\u00E1lido aqu\u00ED.
-+parser.cc.5=Se esperaba ']'.
-+parser.cc.6='[' no es v\u00E1lido en una clase de car\u00E1cter. Escriba '\\['.
-+parser.cc.7=']' no es v\u00E1lido en una clase de car\u00E1cter. Escriba '\\]'.
-+parser.cc.8='-' no es un rango de caracteres v\u00E1lido. Escriba '\\-'.
-+parser.ope.1=Se esperaba '['.
-+parser.ope.2=Se esperaba ')', '-[', '+[' o '&['.
-+parser.ope.3=El punto de c\u00F3digo de fin de rango es menor que el punto de c\u00F3digo de inicio.
-+parser.descape.1=Notaci\u00F3n hexadecimal Unicode no v\u00E1lida.
-+parser.descape.2=Desbordamiento en una notaci\u00F3n hexadecimal.
-+parser.descape.3='\\x{' debe estar cerrado por '}'.
-+parser.descape.4=Punto de c\u00F3digo Unicode no v\u00E1lido.
-+parser.descape.5=No debe haber un anclaje aqu\u00ED.
-+parser.process.1=Esta expresi\u00F3n no est\u00E1 soportada en la configuraci\u00F3n de la opci\u00F3n actual.
-+parser.quantifier.1=Cuantificador no v\u00E1lido. Se esperaba un d\u00EDgito.
-+parser.quantifier.2=Cuantificador no v\u00E1lido. La cantidad no es v\u00E1lida o falta '}'.
-+parser.quantifier.3=Cuantificador no v\u00E1lido. Se esperaba un d\u00EDgito o '}'.
-+parser.quantifier.4=Cuantificador no v\u00E1lido. Una cantidad m\u00EDnima debe ser <= una cantidad m\u00E1xima.
-+parser.quantifier.5=Cuantificador no v\u00E1lido. Desbordamiento de un valor de cantidad.
-+null
-+null
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,32 +1,41 @@
-- parser.parse.1=Caract\u00e8re invalide.
--parser.parse.2=Num\u00e9ro de r\u00e9f\u00e9rence invalide.
--parser.next.1=Un \\ doit \u00eatre suivi d'un caract\u00e8re.
--parser.next.2='?' n'est pas possible ici. '(?:' ou '(?=' ou '(?!' ou '(?<' ou '(?#' ou '(?>'?
--parser.next.3='(?<=' ou '(?<!' sont attendus.
--parser.next.4=Un commentaire n'est pas ferm\u00e9.
--parser.factor.1=')' manquant.
--parser.factor.2=Fin pr\u00e9matur\u00e9e de motif dans un groupe modifiant.
--parser.factor.3=':' manquant.
--parser.factor.4=Fin pr\u00e9matur\u00e9e de motif dans un groupe conditionel.
--parser.factor.5=Une r\u00e9f\u00e9rence arri\u00e8re ou une ancre ou un lookahead ou un lookbehind est attendu dans un groupe conditionel.
--parser.factor.6=Il y a plus de trois choix dans un groupe conditionel.
--parser.atom.1=\\c doit \u00eatre suivi d'un caract\u00e8re dans l'intervalle U+0040-U+005f .
--parser.atom.2=Un caract\u00e8re de cat\u00e9gorie ou '{' est requis.
--parser.atom.3=Un nom de propri\u00e9t\u00e9 ne se termine pas par '}'.
--parser.atom.4=M\u00e9tacaract\u00e8re interdit.
--parser.atom.5=Propri\u00e9t\u00e9 inconnue.
--parser.cc.1=Une classe de caract\u00e8re POSIX doit \u00eatre termin\u00e9e par ':]'.
--parser.cc.2=Fin pr\u00e9matur\u00e9e de motif dans une classe de caract\u00e8re.
--parser.cc.3=Nom inconnu pour une classe de caract\u00e8re POSIX.
--parser.cc.4='-' est invalide, dans ce cas.
--parser.cc.5=']' manquant.
--parser.cc.6='[' est invalide dans une classe de caract\u00e8re. Ecrivez '\\['.
--parser.cc.7=']' est invalide dans une classe de caract\u00e8re. Ecrivez '\\]'.
-+parser.parse.1=Caract\u00E8re incorrect.
-+parser.parse.2=Num\u00E9ro de r\u00E9f\u00E9rence non valide.
-+parser.next.1=Un caract\u00E8re est obligatoire apr\u00E8s \\.
-+parser.next.2='?' n'est pas attendu. '(?:' ou '(?=' ou '(?!' ou '(?<' ou '(?#' ou '(?>'?
-+parser.next.3='(?<=' ou '(?<!' est attendu.
-+parser.next.4=Un commentaire n'est pas termin\u00E9.
-+parser.factor.1=')' est attendu.
-+parser.factor.2=Fin de mod\u00E8le inattendue dans un groupe de modificateur.
-+parser.factor.3=':' est attendu.
-+parser.factor.4=Fin de mod\u00E8le inattendue dans un groupe conditionnel
-+parser.factor.5=Une r\u00E9f\u00E9rence auxiliaire (back reference), un ancrage, une recherche vers l'avant ou une recherche vers l'arri\u00E8re est attendu dans un mod\u00E8le conditionnel.
-+parser.factor.6=Il existe plus de trois choix dans un groupe conditionnel.
-+parser.atom.1=Un caract\u00E8re compris entre U+0040-U+005f doit suivre \\c.
-+parser.atom.2=Une accolade ('{') est obligatoire avant une cat\u00E9gorie de caract\u00E8res.
-+parser.atom.3=Un nom de propri\u00E9t\u00E9 n'est pas ferm\u00E9 par une accolade ('}').
-+parser.atom.4=M\u00E9tacaract\u00E8re inattendu
-+parser.atom.5=Propri\u00E9t\u00E9 inconnue.
-+parser.cc.1=Une classe de caract\u00E8res POSIX doit \u00EAtre ferm\u00E9e par ':]'.
-+parser.cc.2=Fin de mod\u00E8le inattendue dans une classe de caract\u00E8res.
-+parser.cc.3=Nom inconnu pour une classe de caract\u00E8res POSIX.
-+parser.cc.4='-' n'est pas valide ici.
-+parser.cc.5=']' est attendu.
-+parser.cc.6='[' n'est pas valide dans une classe de caract\u00E8res. Ecrivez '\\['.
-+parser.cc.7=']' n'est pas valide dans une classe de caract\u00E8res. Ecrivez '\\]'.
-+parser.cc.8='-' est une plage de caract\u00E8res non valide. Ecrivez '\\-'.
- parser.ope.1='[' est attendu.
--parser.ope.2=')' ou '-[' ou '+[' ou '&[' sont attendus.
--parser.descape.1=Notation hexad\u00e9cimale Unicode invalide.
--parser.descape.2=D\u00e9passement de capacit\u00e9 dans une expression hexad\u00e9cimale.
--parser.descape.3='\\x{' doit se terminer par un '}'.
--parser.descape.4=Point de code Unicode invalide.
--parser.descape.5=Ancre interdite ici.
--parser.process.1=Cette expression n'est pas autoris\u00e9e compte tenu des options en cours.
-+parser.ope.2=')' ou '-[' ou '+[' ou '&[' est attendu.
-+parser.ope.3=Le point code de fin de la plage est inf\u00E9rieur au point code de d\u00E9but.
-+parser.descape.1=Notation hexad\u00E9cimale Unicode non valide.
-+parser.descape.2=D\u00E9bordement de capacit\u00E9 d'une notation hexad\u00E9cimale.
-+parser.descape.3='\\x{' doit \u00EAtre ferm\u00E9 par '}'.
-+parser.descape.4=Point code Unicode non valide.
-+parser.descape.5=Aucun point d'ancrage ne doit se trouver ici.
-+parser.process.1=Cette expression n'est pas prise en charge dans le param\u00E8tre d'option en cours.
-+parser.quantifier.1=Quantificateur non valide. Un chiffre est attendu.
-+parser.quantifier.2=Quantificateur non valide. Quantit\u00E9 non valide ou accolade ('}') manquante.
-+parser.quantifier.3=Quantificateur non valide. Un chiffre ou une accolade ('}') est attendu.
-+parser.quantifier.4=Quantificateur non valide. Une quantit\u00E9 minimale doit \u00EAtre <= une quantit\u00E9 maximale.
-+parser.quantifier.5=Quantificateur non valide. D\u00E9bordement de la valeur de quantit\u00E9.
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=Carattere errato.
-+parser.parse.2=Numero di riferimento non valido.
-+parser.next.1=\u00C8 necessario un carattere dopo \\.
-+parser.next.2='?' non previsto. '(?:' o '(?=' o '(?!' o '(?<' o '(?#' o '(?>'?
-+parser.next.3='(?<=' o '(?<!' previsto.
-+parser.next.4=Un commento non \u00E8 terminato.
-+parser.factor.1=\u00E8 previsto ')'.
-+parser.factor.2=Fine del pattern imprevista in un gruppo modificatore.
-+parser.factor.3=\u00E8 previsto ':'.
-+parser.factor.4=Fine del pattern imprevista in un gruppo condizionale.
-+parser.factor.5=In un pattern condizionale \u00E8 previsto un riferimento all'indietro, un ancoraggio, un lookahead o un lookbehind.
-+parser.factor.6=In un gruppo condizionale sono disponibili pi\u00F9 di tre scelte.
-+parser.atom.1=Un carattere in U+0040-U+005f deve seguire \\c.
-+parser.atom.2=Un '{' \u00E8 necessario prima di una categoria di carattere.
-+parser.atom.3=Un nome di propriet\u00E0 non \u00E8 chiuso da '}'.
-+parser.atom.4=Metacarattere imprevisto.
-+parser.atom.5=Propriet\u00E0 sconosciuta.
-+parser.cc.1=Una classe caratteri POSIX deve essere chiusa da ':]'.
-+parser.cc.2=Fine imprevista del pattern in una classe caratteri.
-+parser.cc.3=Nome sconosciuto per una classe caratteri POSIX.
-+parser.cc.4='-' non \u00E8 valido qui.
-+parser.cc.5=\u00E8 previsto ']'.
-+parser.cc.6='[' non \u00E8 valido in una classe caratteri. Scrivere '\\['.
-+parser.cc.7=']' non \u00E8 valido in una classe caratteri. Scrivere '\\]'.
-+parser.cc.8='-' \u00E8 un intervallo di caratteri non valido. Scrivere '\\-'.
-+parser.ope.1=\u00E8 previsto '['.
-+parser.ope.2=\u00E8 previsto ')' o '-[' o '+[' o '&['.
-+parser.ope.3=Il punto di codice finale dell'intervallo \u00E8 minore del punto di codice iniziale.
-+parser.descape.1=Notazione esadecimale Unicode non valida.
-+parser.descape.2=Overflow in una notazione esadecimale.
-+parser.descape.3='\\x{' deve essere chiuso da '}'.
-+parser.descape.4=Punto di codice Unicode non valido.
-+parser.descape.5=Un ancoraggio non deve essere posizionato qui.
-+parser.process.1=Questa espressione non \u00E8 supportata nell'impostazione dell'opzione corrente.
-+parser.quantifier.1=Quantificatore non valido. \u00C8 prevista una cifra.
-+parser.quantifier.2=Quantificatore non valido. Quantit\u00E0 non valida o '}' mancante.
-+parser.quantifier.3=Quantificatore non valido. \u00C8 prevista una cifra o '}'.
-+parser.quantifier.4=Quantificatore non valido.Una quantit\u00E0 minima deve essere <= di una quantit\u00E0 massima.
-+parser.quantifier.5=Quantificatore non valido. Overflow del valore di quantit\u00E0.
-+null
-+null
---- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -1,32 +1,41 @@
--parser.parse.1=\u3078\u3093\u306a\u6587\u5b57.
--parser.parse.2=\u5b58\u5728\u3057\u306a\u3044\u30b0\u30eb\u30fc\u30d7\u756a\u53f7\u3067\u3059.
--parser.next.1=\\ \u306e\u5f8c\u306b1\u6587\u5b57\u5fc5\u8981\u3067\u3059.
--parser.next.2='?' \u3092\u3053\u3053\u306b\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093. \u3082\u3057\u304b\u3057\u3066 '(?:' \u304b '(?=' \u304b '(?!' \u304b '(?<' \u304b '(?#' \u304b '(?>' \u3067\u3059\u304b?
--parser.next.3='(?<=' \u304b '(?<!' \u304c\u5fc5\u8981\u3067\u3059.
--parser.next.4=\u8a3b\u91c8\u304c\u9589\u3058\u3066\u3044\u307e\u305b\u3093.
--parser.factor.1=')' \u304c\u5fc5\u8981\u3067\u3059.
--parser.factor.2=\u30aa\u30d7\u30b7\u30e7\u30f3\u4ed8\u304d\u30b0\u30eb\u30fc\u30d7\u306e\u4e2d\u3067\u30d1\u30bf\u30fc\u30f3\u304c\u7d42\u4e86\u3057\u3066\u3044\u307e\u3059.
--parser.factor.3=':' \u304c\u5fc5\u8981\u3067\u3059.
--parser.factor.4=\u6761\u4ef6\u4ed8\u304d\u30b0\u30eb\u30fc\u30d7\u306e\u4e2d\u3067\u30d1\u30bf\u30fc\u30f3\u304c\u7d42\u4e86\u3057\u3066\u3044\u307e\u3059.
--parser.factor.5=\u6761\u4ef6\u30d1\u30bf\u30fc\u30f3\u306b\u306f\u3001\u5f8c\u65b9\u53c2\u7167\u30fb\u30a2\u30f3\u30ab\u30fc\u30fb\u5148\u8aad\u307f\u30fb\u5f8c\u8aad\u307f\u306e\u307f\u4f7f\u7528\u3067\u304d\u307e\u3059.
--parser.factor.6=\u6761\u4ef6\u4ed8\u304d\u30b0\u30eb\u30fc\u30d7\u306e\u4e2d\u306b3\u500b\u4ee5\u4e0a\u306e\u9078\u629e\u3092\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093.
--parser.atom.1=\\c \u306e\u5f8c\u306b\u306f\u30b3\u30fc\u30c9\u30dd\u30a4\u30f3\u30c8\u304c U+0040\uff5eU+005f \u306e\u7bc4\u56f2\u306e\u6587\u5b57\u304c\u5fc5\u8981\u3067\u3059.
--parser.atom.2=1\u6587\u5b57\u306e\u30ab\u30c6\u30b4\u30ea\u6587\u5b57\u304b '{' \u304c\u5fc5\u8981\u3067\u3059.
--parser.atom.3=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u304c '}' \u3067\u9589\u3058\u3066\u3044\u307e\u305b\u3093.
--parser.atom.4=\u30e1\u30bf\u6587\u5b57\u304c\u5909\u306a\u3068\u3053\u308d\u306b\u3042\u308a\u307e\u3059.
--parser.atom.5=\u672a\u77e5\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u3067\u3059.
--parser.cc.1=POSIX \u6587\u5b57\u30af\u30e9\u30b9\u306f ':]' \u3067\u9589\u3058\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059.
--parser.cc.2=\u6587\u5b57\u30af\u30e9\u30b9\u5185\u3067\u30d1\u30bf\u30fc\u30f3\u304c\u7d42\u4e86\u3057\u3066\u3044\u307e\u3059.
--parser.cc.3=\u672a\u77e5\u306e POSIX \u6587\u5b57\u30af\u30e9\u30b9\u540d\u3067\u3059.
--parser.cc.4=\u3053\u3053\u306b '-' \u3092\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093.
--parser.cc.5=']' \u304c\u5fc5\u8981\u3067\u3059.
--parser.cc.6=\u6587\u5b57\u30af\u30e9\u30b9\u5185\u3067\u306f '[' \u3092\u76f4\u63a5\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093. '\\[' \u3068\u66f8\u3044\u3066\u304f\u3060\u3055\u3044.
--parser.cc.7=\u6587\u5b57\u30af\u30e9\u30b9\u5185\u3067\u306f ']' \u3092\u76f4\u63a5\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093. '\\]' \u3068\u66f8\u3044\u3066\u304f\u3060\u3055\u3044.
--parser.ope.1='[' \u304c\u5fc5\u8981\u3067\u3059.
--parser.ope.2=')' \u304b '-[' \u304b '+[' \u304b '&[' \u304c\u5fc5\u8981\u3067\u3059.
--parser.descape.1=\u30b3\u30fc\u30c9\u30dd\u30a4\u30f3\u30c8\u306e16\u9032\u6570\u8868\u8a18\u4e2d\u306b\u9593\u9055\u3063\u305f\u6587\u5b57\u304c\u3042\u308a\u307e\u3059.
--parser.descape.2=\u30b3\u30fc\u30c9\u30dd\u30a4\u30f3\u30c8\u306e\u6570\u5024\u304c\u5927\u304d\u3059\u304e\u307e\u3059.
--parser.descape.3='\\x{' \u306f '}' \u3067\u9589\u3058\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093.
--parser.descape.4=Unicode \u306e\u30b3\u30fc\u30c9\u30dd\u30a4\u30f3\u30c8\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059.
--parser.descape.5=\u30a2\u30f3\u30ab\u30fc\u3092\u3053\u3053\u306b\u66f8\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093.
--parser.process.1=\u3053\u306e\u8868\u73fe\u306f\u73fe\u5728\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u8a2d\u5b9a\u3067\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093.
-+parser.parse.1=\u6587\u5B57\u304C\u9055\u3063\u3066\u3044\u307E\u3059\u3002
-+parser.parse.2=\u7121\u52B9\u306A\u53C2\u7167\u756A\u53F7\u3067\u3059\u3002
-+parser.next.1=\\\u306E\u5F8C\u306B\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.next.2='?'\u306F\u60F3\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002'(?:'\u3001'(?='\u3001'(?!'\u3001'(?<'\u3001'(?#'\u307E\u305F\u306F'(?>'\u3067\u3059\u304B\u3002
-+parser.next.3='(?<='\u307E\u305F\u306F'(?<!'\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.next.4=\u30B3\u30E1\u30F3\u30C8\u304C\u7D42\u4E86\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-+parser.factor.1=')'\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.factor.2=\u4FEE\u98FE\u5B50\u30B0\u30EB\u30FC\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u4E88\u671F\u305B\u305A\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-+parser.factor.3=':'\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.factor.4=\u6761\u4EF6\u30B0\u30EB\u30FC\u30D7\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u4E88\u671F\u305B\u305A\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-+parser.factor.5=\u6761\u4EF6\u30D1\u30BF\u30FC\u30F3\u306B\u5F8C\u65B9\u53C2\u7167\u3001\u30A2\u30F3\u30AB\u30FC\u3001\u5148\u8AAD\u307F\u307E\u305F\u306F\u5F8C\u8AAD\u307F\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.factor.6=\u6761\u4EF6\u30B0\u30EB\u30FC\u30D7\u306B3\u500B\u8D85\u306E\u9078\u629E\u80A2\u304C\u3042\u308A\u307E\u3059\u3002
-+parser.atom.1=\\c\u306E\u5F8C\u306BU+0040\u304B\u3089U+005f\u307E\u3067\u306E\u6587\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.atom.2=\u6587\u5B57\u30AB\u30C6\u30B4\u30EA\u306E\u524D\u306B'{'\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.atom.3=\u30D7\u30ED\u30D1\u30C6\u30A3\u540D\u304C'}'\u3067\u9589\u3058\u3089\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+parser.atom.4=\u4E88\u671F\u3057\u306A\u3044\u30E1\u30BF\u6587\u5B57\u3067\u3059\u3002
-+parser.atom.5=\u4E0D\u660E\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u3059\u3002
-+parser.cc.1=POSIX\u6587\u5B57\u30AF\u30E9\u30B9\u306F':]'\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+parser.cc.2=\u6587\u5B57\u30AF\u30E9\u30B9\u306E\u30D1\u30BF\u30FC\u30F3\u304C\u4E88\u671F\u305B\u305A\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002
-+parser.cc.3=POSIX\u6587\u5B57\u30AF\u30E9\u30B9\u306B\u5BFE\u3059\u308B\u540D\u524D\u304C\u4E0D\u660E\u3067\u3059\u3002
-+parser.cc.4='-'\u306F\u3053\u3053\u3067\u306F\u7121\u52B9\u3067\u3059\u3002
-+parser.cc.5=']'\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.cc.6='['\u306F\u6587\u5B57\u30AF\u30E9\u30B9\u3067\u7121\u52B9\u3067\u3059\u3002'\\['\u3092\u8A18\u8FF0\u3057\u307E\u3059\u3002
-+parser.cc.7=']'\u306F\u6587\u5B57\u30AF\u30E9\u30B9\u3067\u7121\u52B9\u3067\u3059\u3002'\\]'\u3092\u8A18\u8FF0\u3057\u307E\u3059\u3002
-+parser.cc.8='-'\u306F\u7121\u52B9\u306A\u6587\u5B57\u7BC4\u56F2\u3067\u3059\u3002'\\-'\u3092\u8A18\u8FF0\u3057\u307E\u3059\u3002
-+parser.ope.1='['\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.ope.2=')'\u3001'-['\u3001'+['\u307E\u305F\u306F'&['\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.ope.3=\u7BC4\u56F2\u306E\u7D42\u4E86\u30B3\u30FC\u30C9\u30FB\u30DD\u30A4\u30F3\u30C8\u304C\u958B\u59CB\u30B3\u30FC\u30C9\u30FB\u30DD\u30A4\u30F3\u30C8\u3088\u308A\u5C0F\u3055\u3044\u3067\u3059\u3002
-+parser.descape.1=\u7121\u52B9\u306AUnicode16\u9032\u6CD5\u3067\u3059\u3002
-+parser.descape.2=16\u9032\u6CD5\u3067\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u3057\u3066\u3044\u307E\u3059\u3002
-+parser.descape.3='\\x{'\u306F'}'\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+parser.descape.4=\u7121\u52B9\u306AUnicode\u30B3\u30FC\u30C9\u30FB\u30DD\u30A4\u30F3\u30C8\u3067\u3059\u3002
-+parser.descape.5=\u30A2\u30F3\u30AB\u30FC\u306F\u3053\u3053\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-+parser.process.1=\u3053\u306E\u5F0F\u306F\u3001\u73FE\u5728\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u8A2D\u5B9A\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-+parser.quantifier.1=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6570\u5B57\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.quantifier.2=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002'}'\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-+parser.quantifier.3=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6570\u5B57\u307E\u305F\u306F'}'\u304C\u5FC5\u8981\u3067\u3059\u3002
-+parser.quantifier.4=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6700\u5C0F\u6570\u91CF\u306F\u6700\u5927\u6570\u91CF\u4EE5\u4E0B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-+parser.quantifier.5=\u7121\u52B9\u306A\u6570\u91CF\u8A5E\u3067\u3059\u3002\u6570\u91CF\u5024\u304C\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u3057\u3066\u3044\u307E\u3059\u3002
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=\uC798\uBABB\uB41C \uBB38\uC790\uC785\uB2C8\uB2E4.
-+parser.parse.2=\uBD80\uC801\uD569\uD55C \uCC38\uC870 \uBC88\uD638\uC785\uB2C8\uB2E4.
-+parser.next.1=\\ \uB4A4\uC5D0 \uBB38\uC790\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.next.2='?'\uB294 \uD544\uC694\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. '(?:' \uB610\uB294 '(?=' \uB610\uB294 '(?!' \uB610\uB294 '(?<' \uB610\uB294 '(?#' \uB610\uB294 '(?>'?
-+parser.next.3='(?<=' \uB610\uB294 '(?<!'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.next.4=\uC124\uBA85\uC774 \uC885\uB8CC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+parser.factor.1=')'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.factor.2=\uC218\uC815\uC790 \uADF8\uB8F9\uC5D0 \uC608\uC0C1\uCE58 \uC54A\uC740 \uD328\uD134 \uB05D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+parser.factor.3=':'\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.factor.4=\uC870\uAC74 \uADF8\uB8F9\uC5D0 \uC608\uC0C1\uCE58 \uC54A\uC740 \uD328\uD134 \uB05D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+parser.factor.5=\uC870\uAC74 \uD328\uD134\uC5D0 \uC5ED\uCC38\uC870 \uB610\uB294 \uC575\uCEE4 \uB610\uB294 lookahead \uB610\uB294 lookbehind\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.factor.6=\uC870\uAC74 \uADF8\uB8F9\uC5D0 4\uAC1C \uC774\uC0C1\uC758 \uC120\uD0DD \uD56D\uBAA9\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+parser.atom.1=U+0040-U+005f\uC758 \uBB38\uC790\uAC00 \\c \uB4A4\uC5D0 \uC640\uC57C \uD569\uB2C8\uB2E4.
-+parser.atom.2=\uBB38\uC790 \uBC94\uC8FC \uC55E\uC5D0 '{'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.atom.3=\uC18D\uC131 \uC774\uB984\uC774 '}'\uB85C \uB2EB\uD788\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-+parser.atom.4=\uC608\uC0C1\uCE58 \uC54A\uC740 \uBA54\uD0C0 \uBB38\uC790\uC785\uB2C8\uB2E4.
-+parser.atom.5=\uC54C \uC218 \uC5C6\uB294 \uC18D\uC131\uC785\uB2C8\uB2E4.
-+parser.cc.1=POSIX \uBB38\uC790 \uD074\uB798\uC2A4\uB97C ':]'\uB85C \uB2EB\uC544\uC57C \uD569\uB2C8\uB2E4.
-+parser.cc.2=\uBB38\uC790 \uD074\uB798\uC2A4\uC5D0 \uC608\uC0C1\uCE58 \uC54A\uC740 \uD328\uD134 \uB05D\uC774 \uC788\uC2B5\uB2C8\uB2E4.
-+parser.cc.3=POSIX \uBB38\uC790 \uD074\uB798\uC2A4\uC5D0 \uB300\uD574 \uC54C \uC218 \uC5C6\uB294 \uC774\uB984\uC785\uB2C8\uB2E4.
-+parser.cc.4='-'\uB294 \uC5EC\uAE30\uC11C \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-+parser.cc.5=']'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.cc.6=\uBB38\uC790 \uD074\uB798\uC2A4\uC5D0\uC11C '['\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. '\\['\uB97C \uC4F0\uC2ED\uC2DC\uC624.
-+parser.cc.7=\uBB38\uC790 \uD074\uB798\uC2A4\uC5D0\uC11C ']'\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. '\\]'\uB97C \uC4F0\uC2ED\uC2DC\uC624.
-+parser.cc.8='-'\uC740 \uBD80\uC801\uD569\uD55C \uBB38\uC790 \uBC94\uC704\uC785\uB2C8\uB2E4. '\\-'\uC744 \uC4F0\uC2ED\uC2DC\uC624.
-+parser.ope.1='['\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.ope.2=')' \uB610\uB294 '-[' \uB610\uB294 '+[' \uB610\uB294 '&['\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.ope.3=\uBC94\uC704 \uB05D \uCF54\uB4DC \uD3EC\uC778\uD2B8\uAC00 \uC2DC\uC791 \uCF54\uB4DC \uD3EC\uC778\uD2B8\uBCF4\uB2E4 \uC791\uC2B5\uB2C8\uB2E4.
-+parser.descape.1=\uBD80\uC801\uD569\uD55C \uC720\uB2C8\uCF54\uB4DC 16\uC9C4\uC218 \uD45C\uAE30\uBC95\uC785\uB2C8\uB2E4.
-+parser.descape.2=16\uC9C4\uC218 \uD45C\uAE30\uBC95\uC758 \uC624\uBC84\uD50C\uB85C\uC6B0\uC785\uB2C8\uB2E4.
-+parser.descape.3='\\x{'\uB294 '}'\uB85C \uB2EB\uC544\uC57C \uD569\uB2C8\uB2E4.
-+parser.descape.4=\uBD80\uC801\uD569\uD55C \uC720\uB2C8\uCF54\uB4DC \uCF54\uB4DC \uD3EC\uC778\uD2B8\uC785\uB2C8\uB2E4.
-+parser.descape.5=\uC575\uCEE4\uAC00 \uC5EC\uAE30\uC5D0 \uC788\uC73C\uBA74 \uC548\uB429\uB2C8\uB2E4.
-+parser.process.1=\uC774 \uD45C\uD604\uC2DD\uC740 \uD604\uC7AC \uC635\uC158 \uC124\uC815\uC5D0\uC11C \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
-+parser.quantifier.1=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC22B\uC790\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.quantifier.2=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC218\uB7C9\uC774 \uBD80\uC801\uD569\uD558\uAC70\uB098 '}'\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-+parser.quantifier.3=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC22B\uC790\uB098 '}'\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.
-+parser.quantifier.4=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uCD5C\uC18C \uC218\uB7C9\uC740 \uCD5C\uB300 \uC218\uB7C9 \uC774\uD558\uC5EC\uC57C \uD569\uB2C8\uB2E4.
-+parser.quantifier.5=\uC218\uB7C9\uC0AC\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. \uC218\uB7C9 \uAC12 \uC624\uBC84\uD50C\uB85C\uC6B0\uC785\uB2C8\uB2E4.
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=Caractere incorreto.
-+parser.parse.2=N\u00FAmero de refer\u00EAncia inv\u00E1lido.
-+parser.next.1=\u00C9 obrigat\u00F3rio um caractere ap\u00F3s \\.
-+parser.next.2='?' n\u00E3o \u00E9 esperado. '(?:' ou '(?=' ou '(?!' ou '(?<' ou '(?#' ou '(?>'?
-+parser.next.3='(?<=' ou '(?<!' \u00E9 esperado.
-+parser.next.4=Um coment\u00E1rio n\u00E3o foi finalizado.
-+parser.factor.1=')' \u00E9 esperado.
-+parser.factor.2=Fim inesperado do padr\u00E3o em um grupo de modificadores.
-+parser.factor.3=':' \u00E9 esperado.
-+parser.factor.4=Fim inesperado do padr\u00E3o em um grupo condicional.
-+parser.factor.5=Em um padr\u00E3o condicional, esperava-se uma refer\u00EAncia retroativa, \u00E2ncora, lookahead ou lookbehind.
-+parser.factor.6=H\u00E1 mais de tr\u00EAs op\u00E7\u00F5es em um grupo condicional.
-+parser.atom.1=Um caractere em U+0040-U+005f vir ap\u00F3s \\c.
-+parser.atom.2=Um '{' \u00E9 obrigat\u00F3rio antes de uma categoria de caractere.
-+parser.atom.3=Um nome de propriedade n\u00E3o foi fechado por '}'.
-+parser.atom.4=Metacaractere inesperado.
-+parser.atom.5=Propriedade desconhecida.
-+parser.cc.1=Uma classe de caractere POSIX deve ser fechada por ':]'.
-+parser.cc.2=Fim inesperado do padr\u00E3o em uma classe de caractere.
-+parser.cc.3=Nome desconhecido para uma classe de caractere POSIX.
-+parser.cc.4='-' \u00E9 inv\u00E1lido aqui.
-+parser.cc.5=']' \u00E9 esperado.
-+parser.cc.6='[' \u00E9 inv\u00E1lido em uma classe de caractere. Use '\\['.
-+parser.cc.7=']' \u00E9 inv\u00E1lido em uma classe de caractere. Use '\\]'.
-+parser.cc.8='-' \u00E9 uma faixa de caracteres inv\u00E1lida. Use '\\-'.
-+parser.ope.1='[' \u00E9 esperado.
-+parser.ope.2=')' ou '-[' ou '+[' ou '&[' \u00E9 esperado.
-+parser.ope.3=O c\u00F3digo de fim da faixa \u00E9 inferior ao de in\u00EDcio.
-+parser.descape.1=Nota\u00E7\u00E3o hexadecimal Unicode inv\u00E1lida.
-+parser.descape.2=Overflow em uma nota\u00E7\u00E3o hexadecimal.
-+parser.descape.3='\\x{' deve ser fechado por '}'.
-+parser.descape.4=C\u00F3digo Unicode inv\u00E1lido.
-+parser.descape.5=Uma \u00E2ncora n\u00E3o deve estar aqui.
-+parser.process.1=Esta express\u00E3o n\u00E3o \u00E9 suportada na defini\u00E7\u00E3o da op\u00E7\u00E3o atual.
-+parser.quantifier.1=Quantificador inv\u00E1lido. \u00C9 esperado um d\u00EDgito.
-+parser.quantifier.2=Quantificador inv\u00E1lido. A quantidade \u00E9 inv\u00E1lida ou est\u00E1 faltando um '}'.
-+parser.quantifier.3=Quantificador inv\u00E1lido. \u00C9 esperado um d\u00EDgito ou '}'.
-+parser.quantifier.4=Quantificador inv\u00E1lido. Uma quantidade m\u00EDnima deve ser <= uma quantidade m\u00E1xima.
-+parser.quantifier.5=Quantificador inv\u00E1lido. Um overflow do valor de quantidade.
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=Fel tecken.
-+parser.parse.2=Ogiltigt referensnummer.
-+parser.next.1=Ett tecken kr\u00E4vs efter \\.
-+parser.next.2='?' f\u00F6rv\u00E4ntas inte. '(?:' eller '(?=' eller '(?!' eller '(?<' eller '(?#' eller '(?>'?
-+parser.next.3='(?<=' eller '(?<!' f\u00F6rv\u00E4ntas.
-+parser.next.4=En kommentar har inte avslutats.
-+parser.factor.1=')' f\u00F6rv\u00E4ntas.
-+parser.factor.2=Ov\u00E4ntat avslut p\u00E5 m\u00F6nstret i en modifierargrupp.
-+parser.factor.3=':' f\u00F6rv\u00E4ntas.
-+parser.factor.4=Ov\u00E4ntat avslut p\u00E5 m\u00F6nstret i en villkorsgrupp.
-+parser.factor.5=Bak\u00E5treferens eller ankare eller lookahead eller lookbehind f\u00F6rv\u00E4ntas i ett villkorsm\u00F6nster.
-+parser.factor.6=Det finns mer \u00E4n tre val i en villkorsgrupp.
-+parser.atom.1=Ett tecken i U+0040-U+005f m\u00E5ste komma efter \\c.
-+parser.atom.2=Ett '{' kr\u00E4vs f\u00F6re en teckenkategori.
-+parser.atom.3=Ett egenskapsnamn har inte st\u00E4ngts med '}'.
-+parser.atom.4=Ov\u00E4ntat metatecken.
-+parser.atom.5=Ok\u00E4nd egenskap.
-+parser.cc.1=En POSIX-teckenklass m\u00E5ste st\u00E4ngas av ':]'.
-+parser.cc.2=Ov\u00E4ntat avslut p\u00E5 m\u00F6nstret i en teckenklass.
-+parser.cc.3=Ok\u00E4nt namn p\u00E5 en POSIX-teckenklass.
-+parser.cc.4='-' \u00E4r ogiltigt h\u00E4r.
-+parser.cc.5=']' f\u00F6rv\u00E4ntas.
-+parser.cc.6='[' \u00E4r ogiltigt i en teckenklass. Skriv '\\['.
-+parser.cc.7=']' \u00E4r ogiltigt i en teckenklass. Skriv '\\]'.
-+parser.cc.8='-' \u00E4r ett ogiltigt teckenintervall. Skriv '\\-'.
-+parser.ope.1='[' f\u00F6rv\u00E4ntas.
-+parser.ope.2=')' eller '-[' eller '+[' eller '&[' f\u00F6rv\u00E4ntas.
-+parser.ope.3=Slutkodspunkten f\u00F6r intervallet \u00E4r mindre \u00E4n startkodspunkten.
-+parser.descape.1=Ogiltig Unicode hex-notation.
-+parser.descape.2=Spill i en hex-notation.
-+parser.descape.3='\\x{' m\u00E5ste st\u00E4ngas av '}'.
-+parser.descape.4=Ogiltig Unicode-kodpunkt.
-+parser.descape.5=Ett ankare f\u00E5r inte vara h\u00E4r.
-+parser.process.1=Det h\u00E4r uttrycket st\u00F6ds inte i aktuell alternativinst\u00E4llning.
-+parser.quantifier.1=Ogiltig kvantifierare. En siffra f\u00F6rv\u00E4ntas.
-+parser.quantifier.2=Ogiltig kvantifierare. Ogiltig kvantitet eller '}' saknas.
-+parser.quantifier.3=Ogiltig kvantifierare. En siffra eller '}' f\u00F6rv\u00E4ntas.
-+parser.quantifier.4=Ogiltig kvantifierare. En minkvantitet m\u00E5ste vara <= en maxkvantitet.
-+parser.quantifier.5=Ogiltig kvantifierare. Ett kvantitetsv\u00E4rdesspill.
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=\u5B57\u7B26\u9519\u8BEF\u3002
-+parser.parse.2=\u5F15\u7528\u53F7\u65E0\u6548\u3002
-+parser.next.1=\\ \u540E\u9762\u5FC5\u987B\u6709\u5B57\u7B26\u3002
-+parser.next.2=\u4E0D\u5E94\u51FA\u73B0 '?'\u3002'(?:' \u6216 '(?=' \u6216 '(?!' \u6216 '(?<' \u6216 '(?#' \u6216 '(?>'?
-+parser.next.3=\u5E94\u4E3A '(?<=' \u6216 '(?<!'\u3002
-+parser.next.4=\u6CE8\u91CA\u672A\u7EC8\u6B62\u3002
-+parser.factor.1=\u5E94\u4E3A ')'\u3002
-+parser.factor.2=\u4FEE\u9970\u7B26\u7EC4\u4E2D\u610F\u5916\u7684\u6A21\u5F0F\u7ED3\u5C3E\u3002
-+parser.factor.3=\u5E94\u4E3A ':'\u3002
-+parser.factor.4=\u6761\u4EF6\u7EC4\u4E2D\u610F\u5916\u7684\u6A21\u5F0F\u7ED3\u5C3E\u3002
-+parser.factor.5=\u5728\u6761\u4EF6\u6A21\u5F0F\u4E2D\u5E94\u4E3A\u5411\u540E\u5F15\u7528\u6216\u951A\u5B9A\u70B9\u6216\u5411\u524D\u67E5\u627E\u6216\u5411\u540E\u67E5\u627E\u3002
-+parser.factor.6=\u6761\u4EF6\u7EC4\u4E2D\u7684\u9009\u9879\u591A\u4E8E\u4E09\u4E2A\u3002
-+parser.atom.1=\\c \u540E\u9762\u5FC5\u987B\u8DDF\u6709 U+0040-U+005f \u4E2D\u7684\u5B57\u7B26\u3002
-+parser.atom.2=\u5B57\u7B26\u7C7B\u522B\u524D\u5FC5\u987B\u6709 '{'\u3002
-+parser.atom.3=\u5C5E\u6027\u540D\u672A\u4EE5 '}' \u7ED3\u675F\u3002
-+parser.atom.4=\u610F\u5916\u7684\u5143\u5B57\u7B26\u3002
-+parser.atom.5=\u672A\u77E5\u5C5E\u6027\u3002
-+parser.cc.1=POSIX \u5B57\u7B26\u7C7B\u5FC5\u987B\u4EE5 ':]' \u7ED3\u675F\u3002
-+parser.cc.2=\u5B57\u7B26\u7C7B\u4E2D\u610F\u5916\u7684\u6A21\u5F0F\u7ED3\u5C3E\u3002
-+parser.cc.3=POSIX \u5B57\u7B26\u7C7B\u7684\u540D\u79F0\u672A\u77E5\u3002
-+parser.cc.4=\u6B64\u5904 '-' \u662F\u65E0\u6548\u7684\u3002
-+parser.cc.5=\u5E94\u4E3A ']'\u3002
-+parser.cc.6='[' \u5728\u5B57\u7B26\u7C7B\u4E2D\u662F\u65E0\u6548\u7684\u3002\u5199\u5165 '\\['\u3002
-+parser.cc.7=']' \u5728\u5B57\u7B26\u7C7B\u4E2D\u662F\u65E0\u6548\u7684\u3002\u5199\u5165 '\\]'\u3002
-+parser.cc.8='-' \u662F\u65E0\u6548\u7684\u5B57\u7B26\u8303\u56F4\u3002\u5199\u5165 '\\-'\u3002
-+parser.ope.1=\u5E94\u4E3A '['\u3002
-+parser.ope.2=\u5E94\u4E3A ')' \u6216 '-[' \u6216 '+[' \u6216 '&['\u3002
-+parser.ope.3=\u8303\u56F4\u7ED3\u675F\u4EE3\u7801\u70B9\u5C0F\u4E8E\u5F00\u59CB\u4EE3\u7801\u70B9\u3002
-+parser.descape.1=Unicode \u5341\u516D\u8FDB\u5236\u8BB0\u53F7\u65E0\u6548\u3002
-+parser.descape.2=\u5341\u516D\u8FDB\u5236\u8BB0\u53F7\u6EA2\u51FA\u3002
-+parser.descape.3='\\x{' \u5FC5\u987B\u4EE5 '}' \u7ED3\u675F\u3002
-+parser.descape.4=Unicode \u4EE3\u7801\u70B9\u65E0\u6548\u3002
-+parser.descape.5=\u6B64\u5904\u4E0D\u80FD\u6709\u951A\u5B9A\u70B9\u3002
-+parser.process.1=\u5F53\u524D\u7684\u9009\u9879\u8BBE\u7F6E\u4E0D\u652F\u6301\u6B64\u8868\u8FBE\u5F0F\u3002
-+parser.quantifier.1=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u5E94\u4E3A\u6570\u5B57\u3002
-+parser.quantifier.2=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u7F3A\u5C11\u6709\u6548\u7684\u6570\u91CF\u6216 '}'\u3002
-+parser.quantifier.3=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u5E94\u4E3A\u6570\u5B57\u6216 '}'\u3002
-+parser.quantifier.4=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u6700\u5C0F\u6570\u91CF\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E\u6700\u5927\u6570\u91CF\u3002
-+parser.quantifier.5=\u9650\u5B9A\u7B26\u65E0\u6548\u3002\u6570\u91CF\u503C\u6EA2\u51FA\u3002
-+null
-+null
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,41 @@
-+parser.parse.1=\u4E0D\u6B63\u78BA\u7684\u5B57\u5143.
-+parser.parse.2=\u7121\u6548\u7684\u53C3\u7167\u865F\u78BC.
-+parser.next.1=\\ \u4E4B\u5F8C\u5FC5\u9808\u8981\u6709\u4E00\u500B\u5B57\u5143.
-+parser.next.2=\u4E0D\u61C9\u70BA '?'. '(?:' \u6216 '(?=' \u6216 '(?!' \u6216 '(?<' \u6216 '(?#' \u6216 '(?>'?
-+parser.next.3=\u9810\u671F\u61C9\u70BA '(?<=' \u6216 '(?<!'.
-+parser.next.4=\u8A3B\u89E3\u672A\u7D42\u6B62.
-+parser.factor.1=\u9810\u671F\u61C9\u6709 ')'.
-+parser.factor.2=\u4FEE\u98FE\u689D\u4EF6\u7FA4\u7D44\u4E2D\u6709\u672A\u9810\u671F\u7684\u6A23\u5F0F\u7D50\u5C3E.
-+parser.factor.3=\u9810\u671F\u61C9\u6709 ':'.
-+parser.factor.4=\u689D\u4EF6\u6027\u7FA4\u7D44\u4E2D\u6709\u672A\u9810\u671F\u7684\u6A23\u5F0F\u7D50\u5C3E.
-+parser.factor.5=\u689D\u4EF6\u6027\u6A23\u5F0F\u4E2D\u61C9\u8A72\u6709\u5F80\u56DE\u53C3\u7167\u3001\u5B9A\u9328\u9EDE\u3001\u5411\u524D\u67E5\u627E\u6216\u5411\u5F8C\u67E5\u627E.
-+parser.factor.6=\u689D\u4EF6\u6027\u7FA4\u7D44\u4E2D\u6709\u4E09\u500B\u4EE5\u4E0A\u7684\u9078\u9805.
-+parser.atom.1=U+0040-U+005f \u5B57\u5143\u5FC5\u9808\u63A5\u8457 \\c.
-+parser.atom.2=\u5B57\u5143\u985E\u5225\u524D\u9762\u5FC5\u9808\u8981\u6709\u4E00\u500B '{'.
-+parser.atom.3=\u7279\u6027\u540D\u7A31\u672A\u4EE5 '}' \u7D50\u675F.
-+parser.atom.4=\u672A\u9810\u671F\u7684\u63CF\u8FF0\u5B57\u5143.
-+parser.atom.5=\u4E0D\u660E\u7684\u7279\u6027.
-+parser.cc.1=POSIX \u5B57\u5143\u985E\u5225\u5FC5\u9808\u4EE5 ':]' \u4F5C\u70BA\u7D50\u675F.
-+parser.cc.2=\u5B57\u5143\u985E\u5225\u4E2D\u6709\u672A\u9810\u671F\u7684\u6A23\u5F0F\u7D50\u5C3E.
-+parser.cc.3=\u4E0D\u660E\u7684 POSIX \u5B57\u5143\u985E\u5225\u540D\u7A31.
-+parser.cc.4='-' \u5728\u6B64\u8655\u7121\u6548.
-+parser.cc.5=\u9810\u671F\u61C9\u6709 ']'.
-+parser.cc.6='[' \u5728\u5B57\u5143\u985E\u5225\u4E2D\u7121\u6548. \u5BEB\u5165 '\\['.
-+parser.cc.7=']' \u5728\u5B57\u5143\u985E\u5225\u4E2D\u7121\u6548. \u5BEB\u5165 '\\]'.
-+parser.cc.8='-' \u70BA\u7121\u6548\u7684\u5B57\u5143\u7BC4\u570D. \u5BEB\u5165 '\\-'.
-+parser.ope.1=\u9810\u671F\u61C9\u6709 '['.
-+parser.ope.2=\u9810\u671F\u61C9\u6709 ')'\u3001'-['\u3001'+[' \u6216 '&['.
-+parser.ope.3=\u7BC4\u570D\u7D50\u675F\u5B57\u78BC\u6307\u6A19\u5C0F\u65BC\u958B\u59CB\u5B57\u78BC\u6307\u6A19.
-+parser.descape.1=\u7121\u6548\u7684 Unicode \u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5.
-+parser.descape.2=\u5341\u516D\u9032\u4F4D\u8868\u793A\u6CD5\u6EA2\u4F4D.
-+parser.descape.3='\\x{' \u5FC5\u9808\u4EE5 '}' \u4F5C\u70BA\u7D50\u675F.
-+parser.descape.4=\u7121\u6548\u7684 Unicode \u5B57\u78BC\u6307\u6A19.
-+parser.descape.5=\u6B64\u8655\u4E0D\u53EF\u6709\u5B9A\u9328\u9EDE.
-+parser.process.1=\u76EE\u524D\u7684\u9078\u9805\u8A2D\u5B9A\u4E0D\u652F\u63F4\u6B64\u8868\u793A\u5F0F
-+parser.quantifier.1=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u9810\u671F\u61C9\u70BA\u6578\u5B57.
-+parser.quantifier.2=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u7121\u6548\u7684\u6578\u91CF\u6216\u907A\u6F0F '}'.
-+parser.quantifier.3=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u9810\u671F\u61C9\u70BA\u6578\u5B57\u6216 '}'.
-+parser.quantifier.4=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u6700\u5C0F\u6578\u91CF\u5FC5\u9808\u5C0F\u65BC\u6216\u7B49\u65BC\u6700\u5927\u6578\u91CF.
-+parser.quantifier.5=\u7121\u6548\u7684\u6578\u91CF\u8A5E. \u6578\u91CF\u503C\u6EA2\u4F4D.
-+null
-+null
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_de.java,v 1.2.4.1 2005/09/15 07:45:39 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_de.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_es.java,v 1.2.4.1 2005/09/15 07:45:41 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_es.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_fr.java,v 1.2.4.1 2005/09/15 07:45:41 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_fr.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_it.java,v 1.2.4.1 2005/09/15 07:45:42 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_it.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_ja.java,v 1.2.4.1 2005/09/15 07:45:42 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_ja.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -230,7 +230,7 @@
- "\u4E0D\u660E\u306A\u8EF8\u30C8\u30E9\u30D0\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u3067\u3059: {0}"},
-
- { ER_AXIS_NOT_SUPPORTED,
-- "\u8EF8traverser\u6A5F\u80FD\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}"},
-+ "\u8EF8\u30C8\u30E9\u30D0\u30FC\u30B5\u6A5F\u80FD\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}"},
-
- { ER_NO_DTMIDS_AVAIL,
- "DTM ID\u306F\u3053\u308C\u4EE5\u4E0A\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093"},
-@@ -269,13 +269,13 @@
- "\u30B9\u30AD\u30FC\u30E0\u304CURI\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-
- { ER_PATH_INVALID_CHAR,
-- "\u30D1\u30B9\u306B\u7121\u52B9\u6587\u5B57{0}\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059"},
-+ "\u30D1\u30B9\u306B\u7121\u52B9\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059: {0}"},
-
- { ER_SCHEME_FROM_NULL_STRING,
- "null\u6587\u5B57\u5217\u304B\u3089\u306F\u30B9\u30AD\u30FC\u30E0\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-
- { ER_SCHEME_NOT_CONFORMANT,
-- "\u30B9\u30AD\u30FC\u30E0\u306F\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093\u3002"},
-+ "\u30B9\u30AD\u30FC\u30E0\u304C\u6574\u5408\u3057\u3066\u3044\u307E\u305B\u3093\u3002"},
-
- { ER_HOST_ADDRESS_NOT_WELLFORMED,
- "\u30DB\u30B9\u30C8\u306F\u6574\u5F62\u5F0F\u306E\u30A2\u30C9\u30EC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-@@ -329,7 +329,7 @@
- "XMLReader\u306FstartParse\u30EA\u30AF\u30A8\u30B9\u30C8\u3088\u308A\u524D\u306B\u3067\u304D\u307E\u305B\u3093"},
-
- { ER_AXIS_TRAVERSER_NOT_SUPPORTED,
-- "\u8EF8traverser\u6A5F\u80FD\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}"},
-+ "\u8EF8\u30C8\u30E9\u30D0\u30FC\u30B5\u6A5F\u80FD\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093: {0}"},
-
- { ER_ERRORHANDLER_CREATED_WITH_NULL_PRINTWRITER,
- "null PrintWriter\u306B\u3088\u3063\u3066ListingErrorHandler\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\u3002"},
-@@ -397,7 +397,7 @@
- "\u7121\u52B9\u306AUTF-16\u30B5\u30ED\u30B2\u30FC\u30C8\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F: {0}\u3002" },
-
- {ER_OIERROR,
-- "\u5165\u51FA\u529B\u30A8\u30E9\u30FC" },
-+ "IO\u30A8\u30E9\u30FC" },
-
- {ER_ILLEGAL_ATTRIBUTE_POSITION,
- "\u5B50\u30CE\u30FC\u30C9\u306E\u5F8C\u307E\u305F\u306F\u8981\u7D20\u304C\u751F\u6210\u3055\u308C\u308B\u524D\u306B\u5C5E\u6027{0}\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002\u5C5E\u6027\u306F\u7121\u8996\u3055\u308C\u307E\u3059\u3002"},
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_ko.java,v 1.2.4.1 2005/09/15 07:45:42 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_ko.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java Fri Apr 10 09:20:34 2015 -0700
-@@ -9,7 +9,7 @@
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-+ * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
-@@ -17,9 +17,8 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--
- /*
-- * $Id: XMLErrorResources_pt_BR.java 3023 2011-03-01 00:53:34Z joehw $
-+ * $Id: XMLErrorResources_pt_BR.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -180,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- public static final Object[][] contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -192,7 +191,7 @@
- "N\u00E3o \u00E9 poss\u00EDvel substituir a causa"},
-
- { ER_NO_DEFAULT_IMPL,
-- "Nenhuma implementa\u00E7\u00E3o default encontrada "},
-+ "Nenhuma implementa\u00E7\u00E3o padr\u00E3o encontrada "},
-
- { ER_CHUNKEDINTARRAY_NOT_SUPPORTED,
- "ChunkedIntArray({0}) n\u00E3o suportado atualmente"},
-@@ -216,7 +215,7 @@
- "\nINESPERADO: Parser doTerminate responde {0}"},
-
- { ER_NO_PARSE_CALL_WHILE_PARSING,
-- "o parse n\u00E3o pode ser chamado durante o parse"},
-+ "o parsing n\u00E3o pode ser chamado durante o parsing"},
-
- { ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED,
- "Erro: iterador digitado para o eixo {0} n\u00E3o implementado"},
-@@ -246,7 +245,7 @@
- "N\u00E3o foi poss\u00EDvel resolver o n\u00F3 para um handle"},
-
- { ER_STARTPARSE_WHILE_PARSING,
-- "startParse n\u00E3o pode ser chamado durante o parse"},
-+ "startParse n\u00E3o pode ser chamado durante o parsing"},
-
- { ER_STARTPARSE_NEEDS_SAXPARSER,
- "startParse requer um SAXParser n\u00E3o nulo"},
-@@ -261,7 +260,7 @@
- "O caminho cont\u00E9m uma sequ\u00EAncia inv\u00E1lida de caracteres de escape"},
-
- { ER_SCHEME_REQUIRED,
-- "\u00C9 necess\u00E1rio um esquema!"},
-+ "O esquema \u00E9 obrigat\u00F3rio!"},
-
- { ER_NO_SCHEME_IN_URI,
- "Nenhum esquema encontrado no URI: {0}"},
-@@ -300,7 +299,7 @@
- "O parser j\u00E1 est\u00E1 sendo usado"},
-
- { ER_CANNOT_CHANGE_WHILE_PARSING,
-- "N\u00E3o \u00E9 poss\u00EDvel alterar {0} {1} durante o parse"},
-+ "N\u00E3o \u00E9 poss\u00EDvel alterar {0} {1} durante o parsing"},
-
- { ER_SELF_CAUSATION_NOT_PERMITTED,
- "Autoaverigua\u00E7\u00E3o n\u00E3o permitida"},
-@@ -430,7 +429,7 @@
- "Declara\u00E7\u00E3o de namespace ''{0}''=''{1}'' fora do elemento." },
-
- {ER_COULD_NOT_LOAD_RESOURCE,
-- "N\u00E3o foi poss\u00EDvel carregar ''{0}'' (verificar CLASSPATH); usando agora apenas os defaults"},
-+ "N\u00E3o foi poss\u00EDvel carregar ''{0}'' (verificar CLASSPATH); usando agora apenas os padr\u00F5es"},
-
- { ER_ILLEGAL_CHARACTER,
- "Tentativa de exibir um caractere de valor integral {0} que n\u00E3o est\u00E1 representado na codifica\u00E7\u00E3o de sa\u00EDda especificada de {1}."},
-@@ -440,16 +439,7 @@
-
-
- };
-- private static final Object[][] msgCopy = new Object[contents.length][2];
-- // return a copy of contents; in theory we want a deep clone
-- // of contents, but since it only contains (immutable) Strings,
-- // this shallow copy is sufficient
-- static {
-- for (int i = 0; i < contents.length; i++) {
-- msgCopy[i][0] = contents[i][0];
-- msgCopy[i][1] = contents[i][1];
-- }
-- }
-+
- /**
- * Get the association list.
- *
-@@ -457,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return msgCopy;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_sv.java,v 1.2.4.1 2005/09/15 07:45:46 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_sv.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,6 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-+
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_zh_CN.java,v 1.2.4.1 2005/09/15 07:45:47 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_zh_CN.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -212,10 +212,10 @@
- "Coroutine \u53C2\u6570\u9519\u8BEF ({0})"},
-
- { ER_PARSER_DOTERMINATE_ANSWERS,
-- "\n\u610F\u5916: \u8BED\u6CD5\u5206\u6790\u5668\u5BF9\u7B54\u590D{0}\u6267\u884C doTerminate"},
-+ "\n\u610F\u5916: \u89E3\u6790\u5668\u5BF9\u7B54\u590D{0}\u6267\u884C doTerminate"},
-
- { ER_NO_PARSE_CALL_WHILE_PARSING,
-- "\u65E0\u6CD5\u5728\u6267\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u8C03\u7528 parse"},
-+ "\u65E0\u6CD5\u5728\u89E3\u6790\u65F6\u8C03\u7528 parse"},
-
- { ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED,
- "\u9519\u8BEF: \u672A\u5B9E\u73B0\u8F74{0}\u7684\u7C7B\u578B\u5316\u8FED\u4EE3\u5668"},
-@@ -245,13 +245,13 @@
- "\u65E0\u6CD5\u5C06\u8282\u70B9\u89E3\u6790\u4E3A\u53E5\u67C4"},
-
- { ER_STARTPARSE_WHILE_PARSING,
-- "\u65E0\u6CD5\u5728\u6267\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u8C03\u7528 startParse"},
-+ "\u65E0\u6CD5\u5728\u89E3\u6790\u65F6\u8C03\u7528 startParse"},
-
- { ER_STARTPARSE_NEEDS_SAXPARSER,
- "startParse \u9700\u8981\u975E\u7A7A SAXParser"},
-
- { ER_COULD_NOT_INIT_PARSER,
-- "\u65E0\u6CD5\u4F7F\u7528\u4EE5\u4E0B\u5BF9\u8C61\u521D\u59CB\u5316\u8BED\u6CD5\u5206\u6790\u5668"},
-+ "\u65E0\u6CD5\u4F7F\u7528\u4EE5\u4E0B\u5BF9\u8C61\u521D\u59CB\u5316\u89E3\u6790\u5668"},
-
- { ER_EXCEPTION_CREATING_POOL,
- "\u4E3A\u6C60\u521B\u5EFA\u65B0\u5B9E\u4F8B\u65F6\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF"},
-@@ -269,7 +269,7 @@
- "\u5728 URI \u4E2D\u627E\u4E0D\u5230\u65B9\u6848"},
-
- { ER_PATH_INVALID_CHAR,
-- "\u8DEF\u5F84\u5305\u542B\u65E0\u6548\u5B57\u7B26: {0}"},
-+ "\u8DEF\u5F84\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26: {0}"},
-
- { ER_SCHEME_FROM_NULL_STRING,
- "\u65E0\u6CD5\u4ECE\u7A7A\u5B57\u7B26\u4E32\u8BBE\u7F6E\u65B9\u6848"},
-@@ -296,10 +296,10 @@
- "\u7247\u6BB5\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26"},
-
- { ER_PARSER_IN_USE,
-- "\u8BED\u6CD5\u5206\u6790\u5668\u5DF2\u5728\u4F7F\u7528"},
-+ "\u89E3\u6790\u5668\u5DF2\u5728\u4F7F\u7528"},
-
- { ER_CANNOT_CHANGE_WHILE_PARSING,
-- "\u65E0\u6CD5\u5728\u8FDB\u884C\u8BED\u6CD5\u5206\u6790\u65F6\u66F4\u6539{0} {1}"},
-+ "\u65E0\u6CD5\u5728\u89E3\u6790\u65F6\u66F4\u6539{0} {1}"},
-
- { ER_SELF_CAUSATION_NOT_PERMITTED,
- "\u4E0D\u5141\u8BB8\u4F7F\u7528\u81EA\u56E0"},
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java Fri Apr 10 09:20:34 2015 -0700
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XMLErrorResources_zh_TW.java,v 1.2.4.1 2005/09/15 07:45:48 suresh_emailid Exp $
-+ * $Id: XMLErrorResources_zh_TW.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
- */
- package com.sun.org.apache.xml.internal.res;
-
-@@ -179,7 +179,7 @@
- // Error messages...
-
- /** The lookup table for error messages. */
-- private static final Object[][] _contents = {
-+ private static final Object[][] contents = {
-
- /** Error message ID that has a null message, but takes in a single object. */
- {"ER0000" , "{0}" },
-@@ -447,7 +447,7 @@
- */
-
- protected Object[][] getContents() {
-- return _contents;
-+ return contents;
- }
-
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_de.java,v 1.1.4.1 2005/09/08 11:03:12 suresh_emailid Exp $
-+ * $Id: SerializerMessages_de.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_de extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "Die Parallel-Seriell-Umsetzerklasse ''{0}'' implementiert org.xml.sax.ContentHandler nicht."},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "Die Ressource [ {0} ] konnte nicht gefunden werden.\n {1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "Die Ressource [ {0} ] konnte nicht geladen werden: {1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "Puffergr\u00f6\u00dfe <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "Ung\u00fcltige UTF-16-Ersetzung festgestellt: {0} ?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "Der Nachrichtenschl\u00FCssel \"{0}\" ist nicht in der Nachrichtenklasse \"{1}\" enthalten" },
-
-- { MsgKey.ER_OIERROR,
-- "E/A-Fehler"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "Das Format der Nachricht \"{0}\" in der Nachrichtenklasse \"{1}\" war nicht erfolgreich." },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "Attribut {0} kann nicht nach Kindknoten oder vor dem Erstellen eines Elements hinzugef\u00fcgt werden. Das Attribut wird ignoriert."},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "Serializer-Klasse \"{0}\" implementiert org.xml.sax.ContentHandler nicht." },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "Der Namensbereich f\u00fcr Pr\u00e4fix ''{0}'' wurde nicht deklariert."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "Ressource [ {0} ] konnte nicht gefunden werden.\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "Namensbereichsdeklaration ''{0}''=''{1}'' befindet sich nicht in einem Element."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "Ressource [ {0} ] konnte nicht geladen werden: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "''{0}'' konnte nicht geladen werden (CLASSPATH pr\u00fcfen); es werden die Standardwerte verwendet"},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "Puffergr\u00F6\u00DFe <=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "Merkmaldatei ''{0}'' konnte f\u00fcr Ausgabemethode ''{1}'' nicht geladen werden (CLASSPATH pr\u00fcfen)"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "Ung\u00FCltige UTF-16-Ersetzung festgestellt: {0}?" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "Ung\u00fcltige Portnummer"},
-+ { MsgKey.ER_OIERROR,
-+ "I/O-Fehler" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "Der Port kann nicht festgelegt werden, wenn der Host gleich Null ist."},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "Attribut {0} kann nicht nach untergeordneten Knoten oder vor dem Erstellen eines Elements hinzugef\u00FCgt werden. Attribut wird ignoriert." },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "Der Host ist keine syntaktisch korrekte Adresse."},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "Namespace f\u00FCr Pr\u00E4fix \"{0}\" wurde nicht deklariert." },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "Das Schema ist nicht angepasst."},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "Attribut \"{0}\" au\u00DFerhalb des Elements." },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "Schema kann nicht von Nullzeichenfolge festgelegt werden."},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "Namespace-Deklaration {0}={1} au\u00DFerhalb des Elements." },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "Der Pfad enth\u00e4lt eine ung\u00fcltige Escapezeichenfolge."},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "\"{0}\" konnte nicht geladen werden (CLASSPATH pr\u00FCfen). Die Standardwerte werden verwendet" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "Pfad enth\u00e4lt ung\u00fcltiges Zeichen: {0}."},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "Versuch, Zeichen mit Integralwert {0} auszugeben, das nicht in der speziellen Ausgabecodierung von {1} dargestellt wird." },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "Fragment enth\u00e4lt ein ung\u00fcltiges Zeichen."},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "Property-Datei \"{0}\" konnte f\u00FCr Ausgabemethode \"{1}\" nicht geladen werden (CLASSPATH pr\u00FCfen)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "Fragment kann nicht festgelegt werden, wenn der Pfad gleich Null ist."},
-+ { MsgKey.ER_INVALID_PORT,
-+ "Ung\u00FCltige Portnummer" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "Fragment kann nur f\u00fcr eine generische URI (Uniform Resource Identifier) festgelegt werden."},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "Port kann nicht festgelegt werden, wenn der Host null ist" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "Kein Schema gefunden in URI: {0}."},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "Host ist keine wohlgeformte Adresse" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "URI (Uniform Resource Identifier) kann nicht mit leeren Parametern initialisiert werden."},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "Schema ist nicht konform." },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "Fragment kann nicht im Pfad und im Fragment angegeben werden."},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "Schema kann nicht von Nullzeichenfolge festgelegt werden" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "Abfragezeichenfolge kann nicht im Pfad und in der Abfragezeichenfolge angegeben werden."},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "Pfad enth\u00E4lt eine ung\u00FCltige Escapesequenz" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "Der Port kann nicht angegeben werden, wenn der Host nicht angegeben wurde."},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "Pfad enth\u00E4lt ung\u00FCltiges Zeichen: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "Benutzerinformationen k\u00f6nnen nicht angegeben werden, wenn der Host nicht angegeben wurde."},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "Fragment enth\u00E4lt ein ung\u00FCltiges Zeichen" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "Schema ist erforderlich!"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "Fragment kann nicht festgelegt werden, wenn der Pfad null ist" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "Fragment kann nur f\u00FCr einen generischen URI festgelegt werden" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "Kein Schema gefunden in URI" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "URI kann nicht mit leeren Parametern initialisiert werden" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "Fragment kann nicht im Pfad und im Fragment angegeben werden" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "Abfragezeichenfolge kann nicht im Pfad und in der Abfragezeichenfolge angegeben werden" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "Port kann nicht angegeben werden, wenn der Host nicht angegeben wurde" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "Benutzerinformationen k\u00F6nnen nicht angegeben werden, wenn der Host nicht angegeben wurde" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "Warnung: Die Version des Ausgabedokuments soll \"{0}\" sein. Diese Version von XML wird nicht unterst\u00FCtzt. Die Version des Ausgabedokuments wird \"1.0\" sein." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "Schema ist erforderlich." },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "Das an die SerializerFactory \u00FCbergebene Properties-Objekt verf\u00FCgt \u00FCber keine Eigenschaft \"{0}\"." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "Warnung: Die Codierung \"{0}\" wird nicht von der Java-Laufzeit unterst\u00FCtzt." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_es.java,v 1.1.4.1 2005/09/08 11:03:13 suresh_emailid Exp $
-+ * $Id: SerializerMessages_es.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_es extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "La clase serializer ''{0}'' no implementa org.xml.sax.ContentHandler."},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "No se ha podido cargar el recurso [ {0} ].\n{1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "No se ha podido cargar el recurso [ {0} ]: {1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "Tama\u00f1o de almacenamiento intermedio <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "\u00bfSe ha detectado un sustituto UTF-16 no v\u00e1lido: {0}?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "La clave de mensaje ''{0}'' no est\u00E1 en la clase de mensaje ''{1}''" },
-
-- { MsgKey.ER_OIERROR,
-- "Error de ES"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "Fallo de formato del mensaje ''{0}'' en la clase de mensaje ''{1}''." },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "No se puede a\u00f1adir el atributo {0} despu\u00e9s de nodos hijo o antes de que se produzca un elemento. Se ignorar\u00e1 el atributo."},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "La clase de serializador ''{0}'' no implanta org.xml.sax.ContentHandler." },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "No se ha declarado el espacio de nombres para el prefijo ''{0}''."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "No se ha encontrado el recurso [ {0} ].\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "Declaraci\u00f3n del espacio de nombres ''{0}''=''{1}'' fuera del elemento."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "No se ha podido cargar el recurso [ {0} ]: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "No se ha podido cargar ''{0}'' (compruebe la CLASSPATH), ahora s\u00f3lo se est\u00e1n utilizando los valores por omisi\u00f3n"},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "Tama\u00F1o de buffer menor o igual que 0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "No se ha podido cargar el archivo de propiedades ''{0}'' para el m\u00e9todo de salida ''{1}'' (compruebe la CLASSPATH)"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "\u00BFSe ha detectado un sustituto UTF-16 no v\u00E1lido: {0}?" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "N\u00famero de puerto no v\u00e1lido"},
-+ { MsgKey.ER_OIERROR,
-+ "Error de E/S" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "No se puede establecer el puerto si el sistema principal es nulo"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "No se puede agregar el atributo {0} despu\u00E9s de nodos secundarios o antes de que se produzca un elemento. Se ignorar\u00E1 el atributo." },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "El sistema principal no es una direcci\u00f3n bien formada"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "No se ha declarado el espacio de nombres para el prefijo ''{0}''." },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "El esquema no es compatible."},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "El atributo ''{0}'' est\u00E1 fuera del elemento." },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "No se puede establecer un esquema de una serie nula"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "Declaraci\u00F3n del espacio de nombres ''{0}''=''{1}'' fuera del elemento." },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "La v\u00eda de acceso contiene una secuencia de escape no v\u00e1lida"},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "No se ha podido cargar ''{0}'' (compruebe la CLASSPATH), ahora s\u00F3lo se est\u00E1n utilizando los valores por defecto" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "La v\u00eda de acceso contiene un car\u00e1cter no v\u00e1lido: {0}"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "Intento de realizar la salida del car\u00E1cter del valor integral {0}, que no est\u00E1 representado en la codificaci\u00F3n de salida de {1}." },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "El fragmento contiene un car\u00e1cter no v\u00e1lido"},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "No se ha podido cargar el archivo de propiedades ''{0}'' para el m\u00E9todo de salida ''{1}'' (compruebe la CLASSPATH)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "No se puede establecer el fragmento si la v\u00eda de acceso es nula"},
-+ { MsgKey.ER_INVALID_PORT,
-+ "N\u00FAmero de puerto no v\u00E1lido" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "S\u00f3lo se puede establecer el fragmento para un URI gen\u00e9rico"},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "No se puede definir el puerto si el host es nulo" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "No se ha encontrado un esquema en el URI: {0}"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "El formato de la direcci\u00F3n de host no es correcto" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "No se puede inicializar el URI con par\u00e1metros vac\u00edos"},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "El esquema no es v\u00E1lido." },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "No se puede especificar el fragmento en la v\u00eda de acceso y en el fragmento"},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "No se puede definir un esquema a partir de una cadena nula" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "No se puede especificar la serie de consulta en la v\u00eda de acceso y en la serie de consulta"},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "La ruta de acceso contiene una secuencia de escape no v\u00E1lida" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "No se puede especificar el puerto si no se ha especificado el sistema principal"},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "La ruta de acceso contiene un car\u00E1cter no v\u00E1lido: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "No se puede especificar la informaci\u00f3n de usuario si no se ha especificado el sistema principal"},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "El fragmento contiene un car\u00E1cter no v\u00E1lido" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "\u00a1Se necesita un esquema!"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "No se puede definir el fragmento si la ruta de acceso es nula" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "S\u00F3lo se puede definir el fragmento para un URI gen\u00E9rico" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "No se ha encontrado un esquema en el URI" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "No se puede inicializar el URI con par\u00E1metros vac\u00EDos" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "No se puede especificar el fragmento en la ruta de acceso y en el fragmento" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "No se puede especificar la cadena de consulta en la ruta de acceso y en la cadena de consulta" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "No se puede especificar el puerto si no se ha especificado el host" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "No se puede especificar la informaci\u00F3n de usuario si no se ha especificado el host" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "Advertencia: es necesario que la versi\u00F3n del documento de salida sea ''{0}''. Esta versi\u00F3n de XML no est\u00E1 soportada. La versi\u00F3n del documento de salida ser\u00E1 ''1.0''." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "Se necesita un esquema." },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "El objeto de propiedades transferido a SerializerFactory no tiene una propiedad ''{0}''." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "Advertencia: el tiempo de ejecuci\u00F3n de Java no soporta la codificaci\u00F3n ''{0}''." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_fr.java,v 1.1.4.1 2005/09/08 11:03:13 suresh_emailid Exp $
-+ * $Id: SerializerMessages_fr.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_fr extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "La classe de la m\u00e9thode de s\u00e9rialisation ''{0}'' n''impl\u00e9mente pas org.xml.sax.ContentHandler."},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "La ressource [ {0} ] est introuvable.\n {1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "La ressource [ {0} ] n''a pas pu charger : {1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "Taille du tampon <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "Substitut UTF-16 non valide d\u00e9tect\u00e9 : {0} ?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "La cl\u00E9 de message ''{0}'' ne figure pas dans la classe de messages ''{1}''" },
-
-- { MsgKey.ER_OIERROR,
-- "Erreur d''E-S"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "Echec du format de message ''{0}'' dans la classe de messages ''{1}''." },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "Ajout impossible de l''attribut {0} apr\u00e8s des noeuds enfants ou avant la production d''un \u00e9l\u00e9ment. L''attribut est ignor\u00e9."},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "La classe de serializer ''{0}'' n''impl\u00E9mente pas org.xml.sax.ContentHandler." },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "L''espace de noms du pr\u00e9fixe ''{0}'' n''a pas \u00e9t\u00e9 d\u00e9clar\u00e9."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "La ressource [ {0} ] est introuvable.\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "La d\u00e9claration d''espace de noms ''{0}''=''{1}'' est \u00e0 l''ext\u00e9rieur de l''\u00e9l\u00e9ment."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "La ressource [ {0} ] n''a pas pu charger : {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "Impossible de charger ''{0}'' (v\u00e9rifier CLASSPATH), les valeurs par d\u00e9faut sont donc employ\u00e9es "},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "Taille du tampon <=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "Impossible de charger le fichier de propri\u00e9t\u00e9s ''{0}'' pour la m\u00e9thode de sortie ''{1}'' (v\u00e9rifier CLASSPATH)"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "Substitut UTF-16 non valide d\u00E9tect\u00E9 : {0} ?" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "Num\u00e9ro de port non valide"},
-+ { MsgKey.ER_OIERROR,
-+ "Erreur d'E/S" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "Le port ne peut \u00eatre d\u00e9fini quand l'h\u00f4te est vide"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "Impossible d''ajouter l''attribut {0} apr\u00E8s des noeuds enfant ou avant la production d''un \u00E9l\u00E9ment. L''attribut est ignor\u00E9." },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "L'h\u00f4te n'est pas une adresse bien form\u00e9e"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "L''espace de noms du pr\u00E9fixe ''{0}'' n''a pas \u00E9t\u00E9 d\u00E9clar\u00E9." },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "Le processus n'est pas conforme."},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "Attribut ''{0}'' en dehors de l''\u00E9l\u00E9ment." },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "Impossible de d\u00e9finir le processus \u00e0 partir de la cha\u00eene vide"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "La d\u00E9claration d''espace de noms ''{0}''=''{1}'' est \u00E0 l''ext\u00E9rieur de l''\u00E9l\u00E9ment." },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "Le chemin d'acc\u00e8s contient une s\u00e9quence d'\u00e9chappement non valide"},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "Impossible de charger ''{0}'' (v\u00E9rifier CLASSPATH), les valeurs par d\u00E9faut sont donc employ\u00E9es" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "Le chemin contient un caract\u00e8re non valide : {0}"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "Tentative de sortie d''un caract\u00E8re avec une valeur enti\u00E8re {0}, non repr\u00E9sent\u00E9 dans l''encodage de sortie sp\u00E9cifi\u00E9 pour {1}." },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "Le fragment contient un caract\u00e8re non valide"},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "Impossible de charger le fichier de propri\u00E9t\u00E9s ''{0}'' pour la m\u00E9thode de sortie ''{1}'' (v\u00E9rifier CLASSPATH)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "Le fragment ne peut \u00eatre d\u00e9fini quand le chemin d'acc\u00e8s est vide"},
-+ { MsgKey.ER_INVALID_PORT,
-+ "Num\u00E9ro de port non valide" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "Le fragment ne peut \u00eatre d\u00e9fini que pour un URI g\u00e9n\u00e9rique"},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "Impossible de d\u00E9finir le port quand l'h\u00F4te est NULL" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "Processus introuvable dans l''URI : {0}"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "Le format de l'adresse de l'h\u00F4te n'est pas correct" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "Impossible d'initialiser l'URI avec des param\u00e8tres vides"},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "Le mod\u00E8le n'est pas conforme." },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "Le fragment ne doit pas \u00eatre indiqu\u00e9 \u00e0 la fois dans le chemin et dans le fragment"},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "Impossible de d\u00E9finir le mod\u00E8le \u00E0 partir de la cha\u00EEne NULL" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "La cha\u00eene de requ\u00eate ne doit pas figurer dans un chemin et une cha\u00eene de requ\u00eate"},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "Le chemin d'acc\u00E8s contient une s\u00E9quence d'\u00E9chappement non valide" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "Le port peut ne pas \u00eatre sp\u00e9cifi\u00e9 si l'h\u00f4te n'est pas sp\u00e9cifi\u00e9"},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "Le chemin contient un caract\u00E8re non valide : {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "Userinfo ne peut \u00eatre sp\u00e9cifi\u00e9 si l'h\u00f4te ne l'est pas"},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "Le fragment contient un caract\u00E8re non valide" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "Processus requis !"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "Impossible de d\u00E9finir le fragment quand le chemin d'acc\u00E8s est NULL" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "Le fragment ne peut \u00EAtre d\u00E9fini que pour un URI g\u00E9n\u00E9rique" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "Mod\u00E8le introuvable dans l'URI" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "Impossible d'initialiser l'URI avec des param\u00E8tres vides" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "Le fragment ne doit pas \u00EAtre indiqu\u00E9 \u00E0 la fois dans le chemin et dans le fragment" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "La cha\u00EEne de requ\u00EAte ne doit pas figurer dans un chemin et une cha\u00EEne de requ\u00EAte" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "Le port peut ne pas \u00EAtre sp\u00E9cifi\u00E9 si l'h\u00F4te ne l'est pas" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "Userinfo peut ne pas \u00EAtre sp\u00E9cifi\u00E9 si l'h\u00F4te ne l'est pas" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "Avertissement : la version du document de sortie doit \u00EAtre ''{0}''. Cette version XML n''est pas prise en charge. La version du document de sortie sera ''1.0''." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "Mod\u00E8le obligatoire." },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "L''objet de propri\u00E9t\u00E9s transmis \u00E0 SerializerFactory ne comporte aucune propri\u00E9t\u00E9 ''{0}''." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "Avertissement : l''encodage ''{0}'' n''est pas pris en charge par l''ex\u00E9cution Java." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_it.java,v 1.1.4.1 2005/09/08 11:03:15 suresh_emailid Exp $
-+ * $Id: SerializerMessages_it.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:41:53 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_it extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "La classe serializer ''{0}'' non implementa org.xml.sax.ContentHandler."},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "Risorsa [ {0} ] non trovata.\n {1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "Impossibile caricare la risorsa [ {0} ]: {1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "Dimensione buffer <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "Rilevato surrogato UTF-16 non valido: {0} ?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "La chiave di messaggio ''{0}'' non si trova nella classe messaggio ''{1}''" },
-
-- { MsgKey.ER_OIERROR,
-- "Errore IO"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "Formato di messaggio ''{0}'' in classe messaggio ''{1}'' non riuscito." },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "Impossibile aggiungere l''attributo {0} dopo i nodi secondari o prima che sia prodotto un elemento. L''attributo verr\u00e0 ignorato. "},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "La classe serializzatore ''{0}'' non implementa org.xml.sax.ContentHandler." },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "Lo spazio nomi per il prefisso ''{0}'' non \u00e8 stato dichiarato. "},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "Risorsa [ {0} ] non trovata.\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "Dichiarazione dello spazio nome ''{0}''=''{1}'' al di fuori dell''elemento. "},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "Impossibile caricare la risorsa [ {0} ]: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "Impossibile caricare ''{0}'' (verificare CLASSPATH); verranno utilizzati i valori predefiniti "},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "Dimensione buffer <=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "Impossibile caricare il file delle propriet\u00e0 ''{0}'' per il metodo di emissione ''{1}'' (verificare CLASSPATH)"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "Rilevato surrogato UTF-16 non valido: {0}?" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "Numero di porta non valido"},
-+ { MsgKey.ER_OIERROR,
-+ "Errore di I/O" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "La porta non pu\u00f2 essere impostata se l'host \u00e8 nullo"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "Impossibile aggiungere l''attributo {0} dopo i nodi figlio o prima che sia prodotto un elemento. L''attributo verr\u00E0 ignorato." },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "Host non \u00e8 un'indirizzo corretto"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "Lo spazio di nomi per il prefisso ''{0}'' non \u00E8 stato dichiarato." },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "Lo schema non \u00e8 conforme."},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "Attributo ''{0}'' al di fuori dell''elemento." },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "Impossibile impostare lo schema da una stringa nulla"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "Dichiarazione dello spazio di nomi ''{0}''=''{1}'' al di fuori dell''elemento." },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "Il percorso contiene sequenza di escape non valida"},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "Impossibile caricare ''{0}'' (verificare CLASSPATH); verranno utilizzati i valori predefiniti" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "Il percorso contiene un carattere non valido: {0}"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "Tentativo di eseguire l''output di un carattere di valore integrale {0} non rappresentato nella codifica di output {1} specificata." },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "Il frammento contiene un carattere non valido"},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "Impossibile caricare il file delle propriet\u00E0 ''{0}'' per il metodo di emissione ''{1}'' (verificare CLASSPATH)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "Il frammento non pu\u00f2 essere impostato se il percorso \u00e8 nullo"},
-+ { MsgKey.ER_INVALID_PORT,
-+ "Numero di porta non valido" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "Il frammento pu\u00f2 essere impostato solo per un URI generico"},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "La porta non pu\u00F2 essere impostata se l'host \u00E8 nullo" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "Nessuno schema trovato nell''URI: {0}"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "Host non \u00E8 un indirizzo corretto" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "Impossibile inizializzare l'URI con i parametri vuoti"},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "Lo schema non \u00E8 conforme." },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "Il frammento non pu\u00f2 essere specificato sia nel percorso che nel frammento"},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "Impossibile impostare lo schema da una stringa nulla" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "La stringa di interrogazione non pu\u00f2 essere specificata nella stringa di interrogazione e percorso."},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "Il percorso contiene sequenza di escape non valida" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "La porta non pu\u00f2 essere specificata se l'host non \u00e8 specificato"},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "Il percorso contiene un carattere non valido: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "Userinfo non pu\u00f2 essere specificato se l'host non \u00e8 specificato"},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "Il frammento contiene un carattere non valido" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "Lo schema \u00e8 obbligatorio."}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "Il frammento non pu\u00F2 essere impostato se il percorso \u00E8 nullo" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "Il frammento pu\u00F2 essere impostato solo per un URI generico" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "Nessuno schema trovato nell'URI" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "Impossibile inizializzare l'URI con i parametri vuoti" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "Il frammento non pu\u00F2 essere specificato sia nel percorso che nel frammento" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "La stringa di query non pu\u00F2 essere specificata nella stringa di percorso e query." },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "La porta non pu\u00F2 essere specificata se l'host non \u00E8 specificato" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "Userinfo non pu\u00F2 essere specificato se l'host non \u00E8 specificato" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "Avvertenza: la versione del documento di output deve essere ''{0}''. Questa versione di XML non \u00E8 supportata. La versione del documento di output sar\u00E0 ''1.0''." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "Lo schema \u00E8 obbligatorio." },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "L''oggetto Properties passato a SerializerFactory non dispone di una propriet\u00E0 ''{0}''." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "Avvertenza: la codifica ''{0}'' non \u00E8 supportata da Java Runtime." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_ja.java,v 1.1.4.1 2005/09/08 11:03:16 suresh_emailid Exp $
-+ * $Id: SerializerMessages_ja.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_ja extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "\u30b7\u30ea\u30a2\u30e9\u30a4\u30b6\u30fc\u30fb\u30af\u30e9\u30b9 ''{0}'' \u306f org.xml.sax.ContentHandler \u3092\u30a4\u30f3\u30d7\u30ea\u30e1\u30f3\u30c8\u3057\u307e\u305b\u3093\u3002"},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "\u30ea\u30bd\u30fc\u30b9 [ {0} ] \u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\n {1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "\u30ea\u30bd\u30fc\u30b9 [ {0} ] \u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: {1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "\u30d0\u30c3\u30d5\u30a1\u30fc\u30fb\u30b5\u30a4\u30ba <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "\u7121\u52b9\u306a UTF-16 \u30b5\u30ed\u30b2\u30fc\u30c8\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f: {0} ?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "\u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AD\u30FC''{0}''\u306F\u3001\u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AF\u30E9\u30B9''{1}''\u3067\u306F\u3042\u308A\u307E\u305B\u3093" },
-
-- { MsgKey.ER_OIERROR,
-- "\u5165\u51fa\u529b\u30a8\u30e9\u30fc"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "\u30E1\u30C3\u30BB\u30FC\u30B8\u30FB\u30AF\u30E9\u30B9''{1}''\u306E\u30E1\u30C3\u30BB\u30FC\u30B8''{0}''\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002" },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "\u4e0b\u4f4d\u30ce\u30fc\u30c9\u306e\u5f8c\u307e\u305f\u306f\u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u751f\u6210\u3055\u308c\u308b\u524d\u306b\u5c5e\u6027 {0} \u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u5c5e\u6027\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002"},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "\u30B7\u30EA\u30A2\u30E9\u30A4\u30B6\u30FB\u30AF\u30E9\u30B9''{0}''\u306Forg.xml.sax.ContentHandler\u3092\u5B9F\u88C5\u3057\u307E\u305B\u3093\u3002" },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "\u63a5\u982d\u90e8 ''{0}'' \u306e\u30cd\u30fc\u30e0\u30fb\u30b9\u30da\u30fc\u30b9\u304c\u5ba3\u8a00\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "\u30EA\u30BD\u30FC\u30B9[ {0} ]\u306F\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "\u30cd\u30fc\u30e0\u30fb\u30b9\u30da\u30fc\u30b9\u5ba3\u8a00 ''{0}''=''{1}'' \u304c\u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5916\u5074\u3067\u3059\u3002"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "\u30EA\u30BD\u30FC\u30B9[ {0} ]\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "''{0}'' \u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f (CLASSPATH \u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044)\u3002\u73fe\u5728\u306f\u5358\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002"},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "\u30D0\u30C3\u30D5\u30A1\u30FB\u30B5\u30A4\u30BA<=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "\u51fa\u529b\u30e1\u30bd\u30c3\u30c9 ''{1}'' \u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb ''{0}'' \u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f (CLASSPATH \u3092\u78ba\u8a8d)"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "\u7121\u52B9\u306AUTF-16\u30B5\u30ED\u30B2\u30FC\u30C8\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F: {0}\u3002" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "\u7121\u52b9\u306a\u30dd\u30fc\u30c8\u756a\u53f7"},
-+ { MsgKey.ER_OIERROR,
-+ "IO\u30A8\u30E9\u30FC" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "\u30db\u30b9\u30c8\u304c\u30cc\u30eb\u3067\u3042\u308b\u3068\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "\u5B50\u30CE\u30FC\u30C9\u306E\u5F8C\u307E\u305F\u306F\u8981\u7D20\u304C\u751F\u6210\u3055\u308C\u308B\u524D\u306B\u5C5E\u6027{0}\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002\u5C5E\u6027\u306F\u7121\u8996\u3055\u308C\u307E\u3059\u3002" },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "\u30db\u30b9\u30c8\u306f\u3046\u307e\u304f\u69cb\u6210\u3055\u308c\u305f\u30a2\u30c9\u30ec\u30b9\u3067\u3042\u308a\u307e\u305b\u3093"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "\u63A5\u982D\u8F9E''{0}''\u306E\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002" },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "\u30b9\u30ad\u30fc\u30e0\u306f\u4e00\u81f4\u3057\u3066\u3044\u307e\u305b\u3093\u3002"},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "\u5C5E\u6027''{0}''\u304C\u8981\u7D20\u306E\u5916\u5074\u306B\u3042\u308A\u307E\u3059\u3002" },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "\u30cc\u30eb\u30fb\u30b9\u30c8\u30ea\u30f3\u30b0\u304b\u3089\u306f\u30b9\u30ad\u30fc\u30e0\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u5BA3\u8A00''{0}''=''{1}''\u304C\u8981\u7D20\u306E\u5916\u5074\u306B\u3042\u308A\u307E\u3059\u3002" },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "\u30d1\u30b9\u306b\u7121\u52b9\u306a\u30a8\u30b9\u30b1\u30fc\u30d7\u30fb\u30b7\u30fc\u30b1\u30f3\u30b9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059"},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "''{0}''\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(CLASSPATH\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044)\u3002\u73FE\u5728\u306F\u5358\u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "\u30d1\u30b9\u306b\u7121\u52b9\u6587\u5b57: {0} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "{1}\u306E\u6307\u5B9A\u3055\u308C\u305F\u51FA\u529B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u793A\u3055\u308C\u306A\u3044\u6574\u6570\u5024{0}\u306E\u6587\u5B57\u3092\u51FA\u529B\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002" },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u306b\u7121\u52b9\u6587\u5b57\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059"},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "\u51FA\u529B\u30E1\u30BD\u30C3\u30C9''{1}''\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB''{0}''\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(CLASSPATH\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "\u30d1\u30b9\u304c\u30cc\u30eb\u3067\u3042\u308b\u3068\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093"},
-+ { MsgKey.ER_INVALID_PORT,
-+ "\u7121\u52B9\u306A\u30DD\u30FC\u30C8\u756A\u53F7" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "\u7dcf\u79f0 URI \u306e\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u3057\u304b\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093"},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "\u30DB\u30B9\u30C8\u304Cnull\u306E\u5834\u5408\u306F\u30DD\u30FC\u30C8\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "\u30b9\u30ad\u30fc\u30e0\u306f URI {0} \u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "\u30DB\u30B9\u30C8\u306F\u6574\u5F62\u5F0F\u306E\u30A2\u30C9\u30EC\u30B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "URI \u306f\u7a7a\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u4f7f\u7528\u3057\u3066\u521d\u671f\u5316\u3067\u304d\u307e\u305b\u3093"},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "\u30B9\u30AD\u30FC\u30E0\u304C\u6574\u5408\u3057\u3066\u3044\u307E\u305B\u3093\u3002" },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u306f\u30d1\u30b9\u3068\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u306e\u4e21\u65b9\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093"},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "null\u6587\u5B57\u5217\u304B\u3089\u306F\u30B9\u30AD\u30FC\u30E0\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "\u7167\u4f1a\u30b9\u30c8\u30ea\u30f3\u30b0\u306f\u30d1\u30b9\u304a\u3088\u3073\u7167\u4f1a\u30b9\u30c8\u30ea\u30f3\u30b0\u5185\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093"},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "\u30D1\u30B9\u306B\u7121\u52B9\u306A\u30A8\u30B9\u30B1\u30FC\u30D7\u30FB\u30B7\u30FC\u30B1\u30F3\u30B9\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "\u30db\u30b9\u30c8\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306f\u30dd\u30fc\u30c8\u3092\u6307\u5b9a\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093"},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "\u30D1\u30B9\u306B\u7121\u52B9\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "\u30db\u30b9\u30c8\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306f Userinfo \u3092\u6307\u5b9a\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093"},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "\u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u306B\u7121\u52B9\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "\u30b9\u30ad\u30fc\u30e0\u304c\u5fc5\u8981\u3067\u3059!"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "\u30D1\u30B9\u304Cnull\u306E\u5834\u5408\u306F\u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "\u6C4E\u7528URI\u306E\u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u306E\u307F\u8A2D\u5B9A\u3067\u304D\u307E\u3059" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "\u30B9\u30AD\u30FC\u30E0\u304CURI\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "URI\u306F\u7A7A\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3066\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "\u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u306F\u30D1\u30B9\u3068\u30D5\u30E9\u30B0\u30E1\u30F3\u30C8\u306E\u4E21\u65B9\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "\u554F\u5408\u305B\u6587\u5B57\u5217\u306F\u30D1\u30B9\u304A\u3088\u3073\u554F\u5408\u305B\u6587\u5B57\u5217\u5185\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "\u30DB\u30B9\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F\u30DD\u30FC\u30C8\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "\u30DB\u30B9\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306FUserinfo\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "\u8B66\u544A: \u51FA\u529B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001''{0}''\u3067\u3042\u308B\u3053\u3068\u304C\u30EA\u30AF\u30A8\u30B9\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002XML\u306E\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u51FA\u529B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001''1.0''\u306B\u306A\u308A\u307E\u3059\u3002" },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "\u30B9\u30AD\u30FC\u30E0\u304C\u5FC5\u8981\u3067\u3059\u3002" },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "SerializerFactory\u306B\u6E21\u3055\u308C\u308B\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306B\u3001''{0}''\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u3042\u308A\u307E\u305B\u3093\u3002" },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "\u8B66\u544A: \u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0''{0}''\u306F\u3001Java\u30E9\u30F3\u30BF\u30A4\u30E0\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002" },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_ko.java,v 1.1.4.1 2005/09/08 11:03:16 suresh_emailid Exp $
-+ * $Id: SerializerMessages_ko.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:34:59 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_ko extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "''{0}'' \uc9c1\ub82c\ud654 \ud504\ub85c\uadf8\ub7a8 \ud074\ub798\uc2a4\uac00 org.xml.sax.ContentHandler\ub97c \uad6c\ud604\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4."},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "[ {0} ] \uc790\uc6d0\uc744 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.\n {1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "[ {0} ] \uc790\uc6d0\uc774 {1} \n {2} \n {3}\uc744(\ub97c) \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. "},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "\ubc84\ud37c \ud06c\uae30 <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "\uc798\ubabb\ub41c UTF-16 \ub300\ub9ac\uc790(surrogate)\uac00 \ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4: {0} ?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "\uBA54\uC2DC\uC9C0 \uD0A4 ''{0}''\uC774(\uAC00) \uBA54\uC2DC\uC9C0 \uD074\uB798\uC2A4 ''{1}''\uC5D0 \uC5C6\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_OIERROR,
-- "IO \uc624\ub958"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "\uBA54\uC2DC\uC9C0 \uD074\uB798\uC2A4 ''{1}''\uC5D0\uC11C ''{0}'' \uBA54\uC2DC\uC9C0\uC758 \uD615\uC2DD\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "\ud558\uc704 \ub178\ub4dc\uac00 \uc0dd\uc131\ub41c \uc774\ud6c4 \ub610\ub294 \uc694\uc18c\uac00 \uc791\uc131\ub418\uae30 \uc774\uc804\uc5d0 {0} \uc18d\uc131\uc744 \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc18d\uc131\uc774 \ubb34\uc2dc\ub429\ub2c8\ub2e4."},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "Serializer \uD074\uB798\uC2A4 ''{0}''\uC774(\uAC00) org.xml.sax.ContentHandler\uB97C \uAD6C\uD604\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "''{0}'' \uc811\ub450\ubd80\uc5d0 \ub300\ud55c \uc774\ub984 \uacf5\uac04\uc774 \uc120\uc5b8\ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "[{0}] \uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "''{0}''=''{1}'' \uc774\ub984 \uacf5\uac04 \uc120\uc5b8\uc774 \uc694\uc18c\uc758 \uc678\ubd80\uc5d0 \uc788\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "[{0}] \uB9AC\uC18C\uC2A4\uAC00 \uB2E4\uC74C\uC744 \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC74C: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "''{0}''(CLASSPATH \ud655\uc778)\uc744(\ub97c) \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c, \ud604\uc7ac \uae30\ubcf8\uac12\ub9cc\uc744 \uc0ac\uc6a9 \uc911\uc785\ub2c8\ub2e4."},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "\uBC84\uD37C \uD06C\uAE30 <=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "''{1}''\ucd9c\ub825 \uba54\uc18c\ub4dc(CLASSPATH \ud655\uc778)\uc5d0 \ub300\ud55c ''{0}'' \ud2b9\uc131 \ud30c\uc77c\uc744 \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "\uBD80\uC801\uD569\uD55C UTF-16 \uB300\uB9AC \uC694\uC18C\uAC00 \uAC10\uC9C0\uB428: {0}" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "\uc798\ubabb\ub41c \ud3ec\ud2b8 \ubc88\ud638"},
-+ { MsgKey.ER_OIERROR,
-+ "IO \uC624\uB958" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "\ud638\uc2a4\ud2b8\uac00 \ub110(null)\uc774\uba74 \ud3ec\ud2b8\ub97c \uc124\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "\uD558\uC704 \uB178\uB4DC\uAC00 \uC0DD\uC131\uB41C \uD6C4 \uB610\uB294 \uC694\uC18C\uAC00 \uC0DD\uC131\uB418\uAE30 \uC804\uC5D0 {0} \uC18D\uC131\uC744 \uCD94\uAC00\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC18D\uC131\uC774 \uBB34\uC2DC\uB429\uB2C8\uB2E4." },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "\ud638\uc2a4\ud2b8\uac00 \uc644\uc804\ud55c \uc8fc\uc18c\uac00 \uc544\ub2d9\ub2c8\ub2e4."},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "''{0}'' \uC811\uB450\uC5B4\uC5D0 \uB300\uD55C \uB124\uC784\uC2A4\uD398\uC774\uC2A4\uAC00 \uC120\uC5B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "\uc124\uacc4\uac00 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4."},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "''{0}'' \uC18D\uC131\uC774 \uC694\uC18C\uC5D0 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "\ub110(null) \ubb38\uc790\uc5f4\uc5d0\uc11c \uc124\uacc4\ub97c \uc124\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "\uB124\uC784\uC2A4\uD398\uC774\uC2A4 \uC120\uC5B8 ''{0}''=''{1}''\uC774(\uAC00) \uC694\uC18C\uC5D0 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "\uacbd\ub85c\uc5d0 \uc798\ubabb\ub41c \uc774\uc2a4\ucf00\uc774\ud504 \uc21c\uc11c\uac00 \uc788\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "{0}\uC744(\uB97C) \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. CLASSPATH\uB97C \uD655\uC778\uD558\uC2ED\uC2DC\uC624. \uD604\uC7AC \uAE30\uBCF8\uAC12\uB9CC \uC0AC\uC6A9\uD558\uB294 \uC911\uC785\uB2C8\uB2E4." },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "\uacbd\ub85c\uc5d0 \uc798\ubabb\ub41c \ubb38\uc790\uac00 \uc788\uc2b5\ub2c8\ub2e4: {0}"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "{1}\uC758 \uC9C0\uC815\uB41C \uCD9C\uB825 \uC778\uCF54\uB529\uC5D0\uC11C \uD45C\uC2DC\uB418\uC9C0 \uC54A\uB294 \uC815\uC218 \uAC12 {0}\uC758 \uBB38\uC790\uB97C \uCD9C\uB825\uD558\uB824\uACE0 \uC2DC\uB3C4\uD588\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "\ub2e8\ud3b8\uc5d0 \uc798\ubabb\ub41c \ubb38\uc790\uac00 \uc788\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "\uCD9C\uB825 \uBA54\uC18C\uB4DC ''{1}''\uC5D0 \uB300\uD55C \uC18D\uC131 \uD30C\uC77C ''{0}''\uC744(\uB97C) \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. CLASSPATH\uB97C \uD655\uC778\uD558\uC2ED\uC2DC\uC624." },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "\uacbd\ub85c\uac00 \ub110(null)\uc774\uba74 \ub2e8\ud3b8\uc744 \uc124\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_INVALID_PORT,
-+ "\uD3EC\uD2B8 \uBC88\uD638\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4." },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "\uc77c\ubc18 URI\uc5d0 \ub300\ud574\uc11c\ub9cc \ub2e8\ud3b8\uc744 \uc124\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "\uD638\uC2A4\uD2B8\uAC00 \uB110\uC77C \uACBD\uC6B0 \uD3EC\uD2B8\uB97C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "URI\uc5d0 \uc124\uacc4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4: {0}"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "\uD638\uC2A4\uD2B8\uAC00 \uC644\uC804\uD55C \uC8FC\uC18C\uAC00 \uC544\uB2D9\uB2C8\uB2E4." },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "\ube48 \ub9e4\uac1c\ubcc0\uc218\ub85c URI\ub97c \ucd08\uae30\ud654\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "\uCCB4\uACC4\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "\uacbd\ub85c \ubc0f \ub2e8\ud3b8 \ub458 \ub2e4\uc5d0 \ub2e8\ud3b8\uc744 \uc9c0\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "\uB110 \uBB38\uC790\uC5F4\uC5D0\uC11C \uCCB4\uACC4\uB97C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "\uacbd\ub85c \ubc0f \uc870\ud68c \ubb38\uc790\uc5f4\uc5d0 \uc870\ud68c \ubb38\uc790\uc5f4\uc744 \uc9c0\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "\uACBD\uB85C\uC5D0 \uBD80\uC801\uD569\uD55C \uC774\uC2A4\uCF00\uC774\uD504 \uC2DC\uD000\uC2A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "\ud638\uc2a4\ud2b8\ub97c \uc9c0\uc815\ud558\uc9c0 \uc54a\uc740 \uacbd\uc6b0\uc5d0\ub294 \ud3ec\ud2b8\ub97c \uc9c0\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "\uACBD\uB85C\uC5D0 \uBD80\uC801\uD569\uD55C \uBB38\uC790\uAC00 \uD3EC\uD568\uB428: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "\ud638\uc2a4\ud2b8\ub97c \uc9c0\uc815\ud558\uc9c0 \uc54a\uc740 \uacbd\uc6b0\uc5d0\ub294 Userinfo\ub97c \uc9c0\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "\uBD80\uBD84\uC5D0 \uBD80\uC801\uD569\uD55C \uBB38\uC790\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4." },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "\uc124\uacc4\uac00 \ud544\uc694\ud569\ub2c8\ub2e4!"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "\uACBD\uB85C\uAC00 \uB110\uC77C \uACBD\uC6B0 \uBD80\uBD84\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "\uC77C\uBC18 URI\uC5D0 \uB300\uD574\uC11C\uB9CC \uBD80\uBD84\uC744 \uC124\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "URI\uC5D0\uC11C \uCCB4\uACC4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "\uBE48 \uB9E4\uAC1C\uBCC0\uC218\uB85C URI\uB97C \uCD08\uAE30\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "\uACBD\uB85C\uC640 \uBD80\uBD84\uC5D0 \uBAA8\uB450 \uBD80\uBD84\uC744 \uC9C0\uC815\uD560 \uC218\uB294 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "\uACBD\uB85C \uBC0F \uC9C8\uC758 \uBB38\uC790\uC5F4\uC5D0 \uC9C8\uC758 \uBB38\uC790\uC5F4\uC744 \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "\uD638\uC2A4\uD2B8\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC740 \uACBD\uC6B0\uC5D0\uB294 \uD3EC\uD2B8\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "\uD638\uC2A4\uD2B8\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC740 \uACBD\uC6B0\uC5D0\uB294 Userinfo\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "\uACBD\uACE0: \uCD9C\uB825 \uBB38\uC11C\uC758 \uBC84\uC804\uC774 ''{0}''\uC774(\uAC00) \uB418\uB3C4\uB85D \uC694\uCCAD\uD588\uC2B5\uB2C8\uB2E4. \uC774 \uBC84\uC804\uC758 XML\uC740 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uCD9C\uB825 \uBB38\uC11C\uC758 \uBC84\uC804\uC740 ''1.0''\uC774 \uB429\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "\uCCB4\uACC4\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4!" },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "SerializerFactory\uC5D0 \uC804\uB2EC\uB41C Properties \uAC1D\uCCB4\uC5D0 ''{0}'' \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "\uACBD\uACE0: \uC778\uCF54\uB529 ''{0}''\uC740(\uB294) Java \uB7F0\uD0C0\uC784\uC5D0 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java Fri Apr 10 09:20:34 2015 -0700
-@@ -0,0 +1,208 @@
-+/*
-+ * reserved comment block
-+ * DO NOT REMOVE OR ALTER!
-+ */
-+/*
-+ * Copyright 2004 The Apache Software Foundation.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+/*
-+ * $Id: SerializerMessages_pt_BR.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
-+ */
-+package com.sun.org.apache.xml.internal.serializer.utils;
-+
-+import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-+
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
-+public class SerializerMessages_pt_BR extends ListResourceBundle {
-+
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-+
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-+
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-+
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "A chave de mensagem ''{0}'' n\u00E3o est\u00E1 na classe de mensagem ''{1}''" },
-+
-+ { MsgKey.BAD_MSGFORMAT,
-+ "Houve falha no formato da mensagem ''{0}'' na classe de mensagem ''{1}''." },
-+
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "A classe ''{0}'' do serializador n\u00E3o implementa org.xml.sax.ContentHandler." },
-+
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "N\u00E3o foi poss\u00EDvel encontrar o recurso [ {0} ].\n {1}" },
-+
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "O recurso [ {0} ] n\u00E3o foi carregado: {1} \n {2} \t {3}" },
-+
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "Tamanho do buffer <=0" },
-+
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "Foi detectado um substituto de UTF-16 inv\u00E1lido: {0} ?" },
-+
-+ { MsgKey.ER_OIERROR,
-+ "Erro de E/S" },
-+
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "N\u00E3o \u00E9 poss\u00EDvel adicionar o atributo {0} depois dos n\u00F3s filhos ou antes que um elemento seja produzido. O atributo ser\u00E1 ignorado." },
-+
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "O namespace do prefixo ''{0}'' n\u00E3o foi declarado." },
-+
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "Atributo ''{0}'' fora do elemento." },
-+
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "Declara\u00E7\u00E3o de namespace ''{0}''=''{1}'' fora do elemento." },
-+
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "N\u00E3o foi poss\u00EDvel carregar ''{0}'' (verificar CLASSPATH); usando agora apenas os padr\u00F5es" },
-+
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "Tentativa de exibir um caractere de valor integral {0} que n\u00E3o est\u00E1 representado na codifica\u00E7\u00E3o de sa\u00EDda especificada de {1}." },
-+
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "N\u00E3o foi poss\u00EDvel carregar o arquivo de propriedade ''{0}'' para o m\u00E9todo de sa\u00EDda ''{1}'' (verificar CLASSPATH)" },
-+
-+ { MsgKey.ER_INVALID_PORT,
-+ "N\u00FAmero de porta inv\u00E1lido" },
-+
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "A porta n\u00E3o pode ser definida quando o host \u00E9 nulo" },
-+
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "O host n\u00E3o \u00E9 um endere\u00E7o correto" },
-+
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "O esquema n\u00E3o \u00E9 compat\u00EDvel." },
-+
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "N\u00E3o \u00E9 poss\u00EDvel definir o esquema de uma string nula" },
-+
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "O caminho cont\u00E9m uma sequ\u00EAncia inv\u00E1lida de caracteres de escape" },
-+
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "O caminho cont\u00E9m um caractere inv\u00E1lido: {0}" },
-+
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "O fragmento cont\u00E9m um caractere inv\u00E1lido" },
-+
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "O fragmento n\u00E3o pode ser definido quando o caminho \u00E9 nulo" },
-+
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "O fragmento s\u00F3 pode ser definido para um URI gen\u00E9rico" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "Nenhum esquema encontrado no URI" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "N\u00E3o \u00E9 poss\u00EDvel inicializar o URI com par\u00E2metros vazios" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "O fragmento n\u00E3o pode ser especificado no caminho nem no fragmento" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "A string de consulta n\u00E3o pode ser especificada no caminho nem na string de consulta" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "A porta n\u00E3o pode ser especificada se o host n\u00E3o tiver sido especificado" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "As informa\u00E7\u00F5es do usu\u00E1rio n\u00E3o podem ser especificadas se o host n\u00E3o tiver sido especificado" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "Advert\u00EAncia: a vers\u00E3o do documento de sa\u00EDda deve ser obrigatoriamente ''{0}''. Esta vers\u00E3o do XML n\u00E3o \u00E9 suportada. A vers\u00E3o do documento de sa\u00EDda ser\u00E1 ''1.0''." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "O esquema \u00E9 obrigat\u00F3rio!" },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "O objeto Properties especificado para a SerializerFactory n\u00E3o tem uma propriedade ''{0}''." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "Advert\u00EAncia: a codifica\u00E7\u00E3o ''{0}'' n\u00E3o \u00E9 suportada pelo Java runtime." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
-+}
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,83 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_sv.java,v 1.1.4.1 2005/09/08 11:03:17 suresh_emailid Exp $
-+ * $Id: SerializerMessages_sv.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_sv extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- // ER_SERIALIZER_NOT_CONTENTHANDLER needs translation
-- // ER_RESOURCE_COULD_NOT_FIND needs translation
-- // ER_RESOURCE_COULD_NOT_LOAD needs translation
-- // ER_BUFFER_SIZE_LESSTHAN_ZERO needs translation
-- // ER_INVALID_UTF16_SURROGATE needs translation
-- // ER_OIERROR needs translation
-- // ER_ILLEGAL_ATTRIBUTE_POSITION needs translation
-- // ER_NAMESPACE_PREFIX needs translation
-- // ER_STRAY_ATTRIBUTE needs translation
-- // ER_STRAY_NAMESPACE needs translation
-- // ER_COULD_NOT_LOAD_RESOURCE needs translation
-- // ER_ILLEGAL_CHARACTER needs translation
-- // ER_COULD_NOT_LOAD_METHOD_PROPERTY needs translation
-- { MsgKey.ER_INVALID_PORT,
-- "Ogiltigt portnummer"},
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "Port kan inte s\u00e4ttas n\u00e4r v\u00e4rd \u00e4r null"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "V\u00e4rd \u00e4r inte en v\u00e4lformulerad adress"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "Schemat \u00e4r inte likformigt."},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "Kan inte s\u00e4tta schema fr\u00e5n null-str\u00e4ng"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "Meddelandenyckeln ''{0}'' \u00E4r inte i meddelandeklassen ''{1}''" },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "V\u00e4g inneh\u00e5ller ogiltig flyktsekvens"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "Formatet p\u00E5 meddelandet ''{0}'' i meddelandeklassen ''{1}'' underk\u00E4ndes." },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "V\u00e4g inneh\u00e5ller ogiltigt tecken: {0}"},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "Serializerklassen ''{0}'' implementerar inte org.xml.sax.ContentHandler." },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "Fragment inneh\u00e5ller ogiltigt tecken"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "Resursen [ {0} ] kunde inte h\u00E4mtas.\n {1}" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "Fragment kan inte s\u00e4ttas n\u00e4r v\u00e4g \u00e4r null"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "Resursen [ {0} ] kunde inte laddas: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "Fragment kan bara s\u00e4ttas f\u00f6r en allm\u00e4n URI"},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "Buffertstorlek <=0" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "Schema saknas i URI: {0}"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "Ogiltigt UTF-16-surrogat uppt\u00E4ckt: {0} ?" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "Kan inte initialisera URI med tomma parametrar"},
-+ { MsgKey.ER_OIERROR,
-+ "IO-fel" },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "Fragment kan inte anges i b\u00e5de v\u00e4gen och fragmentet"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "Kan inte l\u00E4gga till attributet {0} efter underordnade noder eller innan ett element har skapats. Attributet ignoreras." },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "F\u00f6rfr\u00e5gan-str\u00e4ng kan inte anges i v\u00e4g och f\u00f6rfr\u00e5gan-str\u00e4ng"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "Namnrymd f\u00F6r prefix ''{0}'' har inte deklarerats." },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "Port f\u00e5r inte anges om v\u00e4rden inte \u00e4r angiven"},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "Attributet ''{0}'' finns utanf\u00F6r elementet." },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "Userinfo f\u00e5r inte anges om v\u00e4rden inte \u00e4r angiven"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "Namnrymdsdeklarationen ''{0}''=''{1}'' finns utanf\u00F6r element." },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "Schema kr\u00e4vs!"}
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "Kunde inte ladda ''{0}'' (kontrollera CLASSPATH), anv\u00E4nder nu enbart standardv\u00E4rden" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "F\u00F6rs\u00F6k att skriva utdatatecken med integralv\u00E4rdet {0} som inte \u00E4r representerat i angiven utdatakodning av {1}." },
-+
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "Kunde inte ladda egenskapsfilen ''{0}'' f\u00F6r utdatametoden ''{1}'' (kontrollera CLASSPATH)" },
-+
-+ { MsgKey.ER_INVALID_PORT,
-+ "Ogiltigt portnummer" },
-+
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "Port kan inte st\u00E4llas in n\u00E4r v\u00E4rd \u00E4r null" },
-+
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "V\u00E4rd \u00E4r inte en v\u00E4lformulerad adress" },
-+
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "Schemat \u00E4r inte likformigt." },
-+
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "Kan inte st\u00E4lla in schema fr\u00E5n null-str\u00E4ng" },
-+
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "S\u00F6kv\u00E4gen inneh\u00E5ller en ogiltig escape-sekvens" },
-+
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "S\u00F6kv\u00E4gen inneh\u00E5ller ett ogiltigt tecken: {0}" },
-+
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "Fragment inneh\u00E5ller ett ogiltigt tecken" },
-+
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "Fragment kan inte st\u00E4llas in n\u00E4r s\u00F6kv\u00E4g \u00E4r null" },
-+
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "Fragment kan bara st\u00E4llas in f\u00F6r en allm\u00E4n URI" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "Schema saknas i URI" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "Kan inte initiera URI med tomma parametrar" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "Fragment kan inte anges i b\u00E5de s\u00F6kv\u00E4gen och fragmentet" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "Fr\u00E5gestr\u00E4ng kan inte anges i b\u00E5de s\u00F6kv\u00E4gen och fr\u00E5gestr\u00E4ngen" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "Port f\u00E5r inte anges om v\u00E4rden inte \u00E4r angiven" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "Anv\u00E4ndarinfo f\u00E5r inte anges om v\u00E4rden inte \u00E4r angiven" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "Varning: Versionen av utdatadokumentet som beg\u00E4rts \u00E4r ''{0}''. Den h\u00E4r versionen av XML st\u00F6ds inte. Versionen av utdatadokumentet kommer att vara ''1.0''." },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "Schema kr\u00E4vs!" },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "Egenskapsobjektet som \u00F6verf\u00F6rts till SerializerFactory har ingen ''{0}''-egenskap." },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "Varning: Kodningen ''{0}'' st\u00F6ds inte av Java runtime." },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_zh_CN.java,v 1.1.4.1 2005/09/08 11:03:18 suresh_emailid Exp $
-+ * $Id: SerializerMessages_zh_CN.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_zh_CN extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "\u4e32\u884c\u5668\u7c7b\u201c{0}\u201d\u4e0d\u5b9e\u73b0 org.xml.sax.ContentHandler."},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "\u627e\u4e0d\u5230\u8d44\u6e90 [ {0} ]\u3002\n {1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "\u8d44\u6e90 [ {0} ] \u65e0\u6cd5\u88c5\u5165\uff1a{1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "\u7f13\u51b2\u533a\u5927\u5c0f <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "\u68c0\u6d4b\u5230\u65e0\u6548\u7684 UTF-16 \u66ff\u4ee3\u8005\uff1a{0}\uff1f"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "\u6D88\u606F\u5173\u952E\u5B57 ''{0}'' \u4E0D\u5728\u6D88\u606F\u7C7B ''{1}'' \u4E2D" },
-
-- { MsgKey.ER_OIERROR,
-- "IO \u9519\u8bef"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "\u6D88\u606F\u7C7B ''{1}'' \u4E2D\u6D88\u606F ''{0}'' \u7684\u683C\u5F0F\u5316\u5931\u8D25\u3002" },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "\u5728\u751f\u6210\u5b50\u8282\u70b9\u4e4b\u540e\u6216\u5728\u751f\u6210\u5143\u7d20\u4e4b\u524d\u65e0\u6cd5\u6dfb\u52a0\u5c5e\u6027 {0}\u3002\u5c06\u5ffd\u7565\u5c5e\u6027\u3002"},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "\u4E32\u884C\u5668\u7C7B ''{0}'' \u4E0D\u5B9E\u73B0 org.xml.sax.ContentHandler\u3002" },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "\u6ca1\u6709\u8bf4\u660e\u540d\u79f0\u7a7a\u95f4\u524d\u7f00\u201c{0}\u201d\u3002"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "\u627E\u4E0D\u5230\u8D44\u6E90 [ {0} ]\u3002\n {1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "\u540d\u79f0\u7a7a\u95f4\u8bf4\u660e\u201c{0}\u201d=\u201c{1}\u201d\u5728\u5143\u7d20\u5916\u3002"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "\u8D44\u6E90 [ {0} ] \u65E0\u6CD5\u52A0\u8F7D: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "\u65e0\u6cd5\u88c5\u5165\u201c{0}\u201d\uff08\u68c0\u67e5 CLASSPATH\uff09\uff0c\u73b0\u5728\u53ea\u4f7f\u7528\u7f3a\u7701\u503c"},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "\u7F13\u51B2\u533A\u5927\u5C0F <=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "\u65e0\u6cd5\u4e3a\u8f93\u51fa\u65b9\u6cd5\u201c{1}\u201d\u88c5\u8f7d\u5c5e\u6027\u6587\u4ef6\u201c{0}\u201d\uff08\u68c0\u67e5 CLASSPATH\uff09"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "\u68C0\u6D4B\u5230\u65E0\u6548\u7684 UTF-16 \u4EE3\u7406: {0}?" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "\u65e0\u6548\u7684\u7aef\u53e3\u53f7"},
-+ { MsgKey.ER_OIERROR,
-+ "IO \u9519\u8BEF" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "\u4e3b\u673a\u4e3a\u7a7a\u65f6\uff0c\u65e0\u6cd5\u8bbe\u7f6e\u7aef\u53e3"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "\u5728\u751F\u6210\u5B50\u8282\u70B9\u4E4B\u540E\u6216\u5728\u751F\u6210\u5143\u7D20\u4E4B\u524D\u65E0\u6CD5\u6DFB\u52A0\u5C5E\u6027 {0}\u3002\u5C06\u5FFD\u7565\u5C5E\u6027\u3002" },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "\u4e3b\u673a\u4e0d\u662f\u683c\u5f0f\u826f\u597d\u7684\u5730\u5740"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "\u6CA1\u6709\u8BF4\u660E\u540D\u79F0\u7A7A\u95F4\u524D\u7F00 ''{0}''\u3002" },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "\u6a21\u5f0f\u4e0d\u4e00\u81f4\u3002"},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "\u5C5E\u6027 ''{0}'' \u5728\u5143\u7D20\u5916\u90E8\u3002" },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "\u65e0\u6cd5\u4ece\u7a7a\u5b57\u7b26\u4e32\u8bbe\u7f6e\u6a21\u5f0f"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "\u540D\u79F0\u7A7A\u95F4\u58F0\u660E ''{0}''=''{1}'' \u5728\u5143\u7D20\u5916\u90E8\u3002" },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "\u8def\u5f84\u5305\u542b\u65e0\u6548\u7684\u8f6c\u4e49\u5e8f\u5217"},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "\u65E0\u6CD5\u52A0\u8F7D ''{0}'' (\u68C0\u67E5 CLASSPATH), \u73B0\u5728\u53EA\u4F7F\u7528\u9ED8\u8BA4\u503C" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "\u8def\u5f84\u5305\u542b\u975e\u6cd5\u5b57\u7b26\uff1a{0}"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "\u5C1D\u8BD5\u8F93\u51FA\u672A\u4EE5{1}\u7684\u6307\u5B9A\u8F93\u51FA\u7F16\u7801\u8868\u793A\u7684\u6574\u6570\u503C {0} \u7684\u5B57\u7B26\u3002" },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "\u7247\u6bb5\u5305\u542b\u65e0\u6548\u7684\u5b57\u7b26"},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "\u65E0\u6CD5\u4E3A\u8F93\u51FA\u65B9\u6CD5 ''{1}'' \u52A0\u8F7D\u5C5E\u6027\u6587\u4EF6 ''{0}'' (\u68C0\u67E5 CLASSPATH)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "\u8def\u5f84\u4e3a\u7a7a\u65f6\uff0c\u65e0\u6cd5\u8bbe\u7f6e\u7247\u6bb5"},
-+ { MsgKey.ER_INVALID_PORT,
-+ "\u65E0\u6548\u7684\u7AEF\u53E3\u53F7" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "\u53ea\u80fd\u4e3a\u4e00\u822c URI \u8bbe\u7f6e\u7247\u6bb5"},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "\u4E3B\u673A\u4E3A\u7A7A\u65F6, \u65E0\u6CD5\u8BBE\u7F6E\u7AEF\u53E3" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "\u5728 URI \u4e2d\u627e\u4e0d\u5230\u6a21\u5f0f\uff1a{0}"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "\u4E3B\u673A\u4E0D\u662F\u683C\u5F0F\u826F\u597D\u7684\u5730\u5740" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "\u65e0\u6cd5\u4ee5\u7a7a\u53c2\u6570\u521d\u59cb\u5316 URI"},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "\u65B9\u6848\u4E0D\u4E00\u81F4\u3002" },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "\u8def\u5f84\u548c\u7247\u6bb5\u4e2d\u90fd\u65e0\u6cd5\u6307\u5b9a\u7247\u6bb5"},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "\u65E0\u6CD5\u4ECE\u7A7A\u5B57\u7B26\u4E32\u8BBE\u7F6E\u65B9\u6848" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "\u8def\u5f84\u548c\u67e5\u8be2\u5b57\u7b26\u4e32\u4e2d\u4e0d\u80fd\u6307\u5b9a\u67e5\u8be2\u5b57\u7b26\u4e32"},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "\u8DEF\u5F84\u5305\u542B\u65E0\u6548\u7684\u8F6C\u4E49\u5E8F\u5217" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "\u5982\u679c\u6ca1\u6709\u6307\u5b9a\u4e3b\u673a\uff0c\u5219\u4e0d\u53ef\u4ee5\u6307\u5b9a\u7aef\u53e3"},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "\u8DEF\u5F84\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "\u5982\u679c\u6ca1\u6709\u6307\u5b9a\u4e3b\u673a\uff0c\u5219\u4e0d\u53ef\u4ee5\u6307\u5b9a Userinfo"},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "\u7247\u6BB5\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "\u6a21\u5f0f\u662f\u5fc5\u9700\u7684\uff01"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "\u8DEF\u5F84\u4E3A\u7A7A\u65F6, \u65E0\u6CD5\u8BBE\u7F6E\u7247\u6BB5" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "\u53EA\u80FD\u4E3A\u4E00\u822C URI \u8BBE\u7F6E\u7247\u6BB5" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "\u5728 URI \u4E2D\u627E\u4E0D\u5230\u65B9\u6848" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "\u65E0\u6CD5\u4EE5\u7A7A\u53C2\u6570\u521D\u59CB\u5316 URI" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "\u8DEF\u5F84\u548C\u7247\u6BB5\u4E2D\u90FD\u65E0\u6CD5\u6307\u5B9A\u7247\u6BB5" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "\u8DEF\u5F84\u548C\u67E5\u8BE2\u5B57\u7B26\u4E32\u4E2D\u4E0D\u80FD\u6307\u5B9A\u67E5\u8BE2\u5B57\u7B26\u4E32" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "\u5982\u679C\u6CA1\u6709\u6307\u5B9A\u4E3B\u673A, \u5219\u4E0D\u53EF\u4EE5\u6307\u5B9A\u7AEF\u53E3" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "\u5982\u679C\u6CA1\u6709\u6307\u5B9A\u4E3B\u673A, \u5219\u4E0D\u53EF\u4EE5\u6307\u5B9A Userinfo" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "\u8B66\u544A: \u8F93\u51FA\u6587\u6863\u7684\u7248\u672C\u5E94\u4E3A ''{0}''\u3002\u4E0D\u652F\u6301\u6B64\u7248\u672C\u7684 XML\u3002\u8F93\u51FA\u6587\u6863\u7684\u7248\u672C\u5C06\u4E3A ''1.0''\u3002" },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "\u65B9\u6848\u662F\u5FC5\u9700\u7684!" },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "\u4F20\u9012\u5230 SerializerFactory \u7684 Properties \u5BF9\u8C61\u6CA1\u6709 ''{0}'' \u5C5E\u6027\u3002" },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "\u8B66\u544A: Java \u8FD0\u884C\u65F6\u4E0D\u652F\u6301\u7F16\u7801 ''{0}''\u3002" },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,105 +18,191 @@
- * limitations under the License.
- */
- /*
-- * $Id: SerializerMessages_zh_TW.java,v 1.1.4.1 2005/09/08 11:03:18 suresh_emailid Exp $
-+ * $Id: SerializerMessages_zh_TW.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:45:37 gmolloy Exp $
- */
--
- package com.sun.org.apache.xml.internal.serializer.utils;
-
- import java.util.ListResourceBundle;
-+import java.util.Locale;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-
-+/**
-+ * An instance of this class is a ListResourceBundle that
-+ * has the required getContents() method that returns
-+ * an array of message-key/message associations.
-+ * <p>
-+ * The message keys are defined in {@link MsgKey}. The
-+ * messages that those keys map to are defined here.
-+ * <p>
-+ * The messages in the English version are intended to be
-+ * translated.
-+ *
-+ * This class is not a public API, it is only public because it is
-+ * used in com.sun.org.apache.xml.internal.serializer.
-+ *
-+ * @xsl.usage internal
-+ */
- public class SerializerMessages_zh_TW extends ListResourceBundle {
-- public Object[][] getContents() {
-- Object[][] contents = new Object[][] {
-- // BAD_MSGKEY needs translation
-- // BAD_MSGFORMAT needs translation
-- { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-- "serializer \u985e\u5225 ''{0}'' \u4e0d\u5be6\u4f5c org.xml.sax.ContentHandler\u3002"},
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-- "\u627e\u4e0d\u5230\u8cc7\u6e90 [ {0} ]\u3002\n{1}"},
-+ /*
-+ * This file contains error and warning messages related to
-+ * Serializer Error Handling.
-+ *
-+ * General notes to translators:
-
-- { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-- "\u7121\u6cd5\u8f09\u5165\u8cc7\u6e90 [ {0} ]\uff1a{1} \n {2} \n {3}"},
-+ * 1) A stylesheet is a description of how to transform an input XML document
-+ * into a resultant XML document (or HTML document or text). The
-+ * stylesheet itself is described in the form of an XML document.
-
-- { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-- "\u7de9\u885d\u5340\u5927\u5c0f <=0"},
-+ *
-+ * 2) An element is a mark-up tag in an XML document; an attribute is a
-+ * modifier on the tag. For example, in <elem attr='val' attr2='val2'>
-+ * "elem" is an element name, "attr" and "attr2" are attribute names with
-+ * the values "val" and "val2", respectively.
-+ *
-+ * 3) A namespace declaration is a special attribute that is used to associate
-+ * a prefix with a URI (the namespace). The meanings of element names and
-+ * attribute names that use that prefix are defined with respect to that
-+ * namespace.
-+ *
-+ *
-+ */
-
-- { MsgKey.ER_INVALID_UTF16_SURROGATE,
-- "\u5075\u6e2c\u5230\u7121\u6548\u7684 UTF-16 \u4ee3\u7406\uff1a{0}?"},
-+ /** The lookup table for error messages. */
-+ public Object[][] getContents() {
-+ Object[][] contents = new Object[][] {
-+ { MsgKey.BAD_MSGKEY,
-+ "\u8A0A\u606F\u7D22\u5F15\u9375 ''{0}'' \u7684\u8A0A\u606F\u985E\u5225\u4E0D\u662F ''{1}''" },
-
-- { MsgKey.ER_OIERROR,
-- "IO \u932f\u8aa4"},
-+ { MsgKey.BAD_MSGFORMAT,
-+ "\u8A0A\u606F\u985E\u5225 ''{1}'' \u4E2D\u7684\u8A0A\u606F ''{0}'' \u683C\u5F0F\u4E0D\u6B63\u78BA\u3002" },
-
-- { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-- "\u5728\u7522\u751f\u5b50\u9805\u7bc0\u9ede\u4e4b\u5f8c\uff0c\u6216\u5728\u7522\u751f\u5143\u7d20\u4e4b\u524d\uff0c\u4e0d\u53ef\u65b0\u589e\u5c6c\u6027 {0}\u3002\u5c6c\u6027\u6703\u88ab\u5ffd\u7565\u3002"},
-+ { MsgKey.ER_SERIALIZER_NOT_CONTENTHANDLER,
-+ "serializer \u985E\u5225 ''{0}'' \u4E0D\u5BE6\u884C org.xml.sax.ContentHandler\u3002" },
-
-- { MsgKey.ER_NAMESPACE_PREFIX,
-- "\u5b57\u9996 ''{0}'' \u7684\u540d\u7a31\u7a7a\u9593\u5c1a\u672a\u5ba3\u544a\u3002"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_FIND,
-+ "\u627E\u4E0D\u5230\u8CC7\u6E90 [ {0} ]\u3002\n{1}" },
-
-- // ER_STRAY_ATTRIBUTE needs translation
-- { MsgKey.ER_STRAY_NAMESPACE,
-- "\u540d\u7a31\u7a7a\u9593\u5ba3\u544a ''{0}''=''{1}'' \u8d85\u51fa\u5143\u7d20\u5916\u3002"},
-+ { MsgKey.ER_RESOURCE_COULD_NOT_LOAD,
-+ "\u7121\u6CD5\u8F09\u5165\u8CC7\u6E90 [ {0} ]: {1} \n {2} \t {3}" },
-
-- { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-- "\u7121\u6cd5\u8f09\u5165 ''{0}''\uff08\u6aa2\u67e5 CLASSPATH\uff09\uff0c\u76ee\u524d\u53ea\u4f7f\u7528\u9810\u8a2d\u503c"},
-+ { MsgKey.ER_BUFFER_SIZE_LESSTHAN_ZERO,
-+ "\u7DE9\u885D\u5340\u5927\u5C0F <=0" },
-
-- // ER_ILLEGAL_CHARACTER needs translation
-- { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-- "\u7121\u6cd5\u8f09\u5165\u8f38\u51fa\u65b9\u6cd5 ''{1}'' \u7684\u5167\u5bb9\u6a94 ''{0}''\uff08\u6aa2\u67e5 CLASSPATH\uff09"},
-+ { MsgKey.ER_INVALID_UTF16_SURROGATE,
-+ "\u5075\u6E2C\u5230\u7121\u6548\u7684 UTF-16 \u4EE3\u7406: {0}\uFF1F" },
-
-- { MsgKey.ER_INVALID_PORT,
-- "\u7121\u6548\u7684\u57e0\u7de8\u865f"},
-+ { MsgKey.ER_OIERROR,
-+ "IO \u932F\u8AA4" },
-
-- { MsgKey.ER_PORT_WHEN_HOST_NULL,
-- "\u4e3b\u6a5f\u70ba\u7a7a\u503c\u6642\uff0c\u7121\u6cd5\u8a2d\u5b9a\u57e0"},
-+ { MsgKey.ER_ILLEGAL_ATTRIBUTE_POSITION,
-+ "\u5728\u7522\u751F\u5B50\u9805\u7BC0\u9EDE\u4E4B\u5F8C\uFF0C\u6216\u5728\u7522\u751F\u5143\u7D20\u4E4B\u524D\uFF0C\u4E0D\u53EF\u65B0\u589E\u5C6C\u6027 {0}\u3002\u5C6C\u6027\u6703\u88AB\u5FFD\u7565\u3002" },
-
-- { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-- "\u4e3b\u6a5f\u6c92\u6709\u5b8c\u6574\u7684\u4f4d\u5740"},
-+ /*
-+ * Note to translators: The stylesheet contained a reference to a
-+ * namespace prefix that was undefined. The value of the substitution
-+ * text is the name of the prefix.
-+ */
-+ { MsgKey.ER_NAMESPACE_PREFIX,
-+ "\u5B57\u9996 ''{0}'' \u7684\u547D\u540D\u7A7A\u9593\u5C1A\u672A\u5BA3\u544A\u3002" },
-
-- { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-- "\u7db1\u8981\u4e0d\u662f conformant\u3002"},
-+ /*
-+ * Note to translators: This message is reported if the stylesheet
-+ * being processed attempted to construct an XML document with an
-+ * attribute in a place other than on an element. The substitution text
-+ * specifies the name of the attribute.
-+ */
-+ { MsgKey.ER_STRAY_ATTRIBUTE,
-+ "\u5C6C\u6027 ''{0}'' \u5728\u5143\u7D20\u4E4B\u5916\u3002" },
-
-- { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-- "\u7121\u6cd5\u5f9e\u7a7a\u5b57\u4e32\u8a2d\u5b9a\u7db1\u8981"},
-+ /*
-+ * Note to translators: As with the preceding message, a namespace
-+ * declaration has the form of an attribute and is only permitted to
-+ * appear on an element. The substitution text {0} is the namespace
-+ * prefix and {1} is the URI that was being used in the erroneous
-+ * namespace declaration.
-+ */
-+ { MsgKey.ER_STRAY_NAMESPACE,
-+ "\u547D\u540D\u7A7A\u9593\u5BA3\u544A ''{0}''=''{1}'' \u8D85\u51FA\u5143\u7D20\u5916\u3002" },
-
-- { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-- "\u8def\u5f91\u5305\u542b\u7121\u6548\u7684\u8df3\u812b\u5b57\u5143"},
-+ { MsgKey.ER_COULD_NOT_LOAD_RESOURCE,
-+ "\u7121\u6CD5\u8F09\u5165 ''{0}'' (\u6AA2\u67E5 CLASSPATH)\uFF0C\u76EE\u524D\u53EA\u4F7F\u7528\u9810\u8A2D\u503C" },
-
-- { MsgKey.ER_PATH_INVALID_CHAR,
-- "\u8def\u5f91\u5305\u542b\u7121\u6548\u7684\u5b57\u5143\uff1a{0}"},
-+ { MsgKey.ER_ILLEGAL_CHARACTER,
-+ "\u5617\u8A66\u8F38\u51FA\u6574\u6578\u503C {0} \u7684\u5B57\u5143\uFF0C\u4F46\u662F\u5B83\u4E0D\u662F\u4EE5\u6307\u5B9A\u7684 {1} \u8F38\u51FA\u7DE8\u78BC\u5448\u73FE\u3002" },
-
-- { MsgKey.ER_FRAG_INVALID_CHAR,
-- "\u7247\u6bb5\u5305\u542b\u7121\u6548\u7684\u5b57\u5143"},
-+ { MsgKey.ER_COULD_NOT_LOAD_METHOD_PROPERTY,
-+ "\u7121\u6CD5\u8F09\u5165\u8F38\u51FA\u65B9\u6CD5 ''{1}'' \u7684\u5C6C\u6027\u6A94 ''{0}'' (\u6AA2\u67E5 CLASSPATH)" },
-
-- { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-- "\u8def\u5f91\u70ba\u7a7a\u503c\u6642\uff0c\u7121\u6cd5\u8a2d\u5b9a\u7247\u6bb5"},
-+ { MsgKey.ER_INVALID_PORT,
-+ "\u7121\u6548\u7684\u9023\u63A5\u57E0\u865F\u78BC" },
-
-- { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-- "\u53ea\u80fd\u5c0d\u901a\u7528\u7684 URI \u8a2d\u5b9a\u7247\u6bb5"},
-+ { MsgKey.ER_PORT_WHEN_HOST_NULL,
-+ "\u4E3B\u6A5F\u70BA\u7A7A\u503C\u6642\uFF0C\u7121\u6CD5\u8A2D\u5B9A\u9023\u63A5\u57E0" },
-
-- { MsgKey.ER_NO_SCHEME_IN_URI,
-- "\u5728 URI\uff1a{0} \u627e\u4e0d\u5230\u7db1\u8981"},
-+ { MsgKey.ER_HOST_ADDRESS_NOT_WELLFORMED,
-+ "\u4E3B\u6A5F\u6C92\u6709\u5B8C\u6574\u7684\u4F4D\u5740" },
-
-- { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-- "\u7121\u6cd5\u4ee5\u7a7a\u767d\u53c3\u6578\u8d77\u59cb\u8a2d\u5b9a URI"},
-+ { MsgKey.ER_SCHEME_NOT_CONFORMANT,
-+ "\u914D\u7F6E\u4E0D\u4E00\u81F4\u3002" },
-
-- { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-- "\u7247\u6bb5\u7121\u6cd5\u540c\u6642\u5728\u8def\u5f91\u548c\u7247\u6bb5\u4e2d\u6307\u5b9a"},
-+ { MsgKey.ER_SCHEME_FROM_NULL_STRING,
-+ "\u7121\u6CD5\u5F9E\u7A7A\u503C\u5B57\u4E32\u8A2D\u5B9A\u914D\u7F6E" },
-
-- { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-- "\u5728\u8def\u5f91\u53ca\u67e5\u8a62\u5b57\u4e32\u4e2d\u4e0d\u53ef\u6307\u5b9a\u67e5\u8a62\u5b57\u4e32"},
-+ { MsgKey.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
-+ "\u8DEF\u5F91\u5305\u542B\u7121\u6548\u7684\u9041\u96E2\u5E8F\u5217" },
-
-- { MsgKey.ER_NO_PORT_IF_NO_HOST,
-- "\u5982\u679c\u6c92\u6709\u6307\u5b9a\u4e3b\u6a5f\uff0c\u4e0d\u53ef\u6307\u5b9a\u57e0"},
-+ { MsgKey.ER_PATH_INVALID_CHAR,
-+ "\u8DEF\u5F91\u5305\u542B\u7121\u6548\u7684\u5B57\u5143: {0}" },
-
-- { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-- "\u5982\u679c\u6c92\u6709\u6307\u5b9a\u4e3b\u6a5f\uff0c\u4e0d\u53ef\u6307\u5b9a Userinfo"},
-+ { MsgKey.ER_FRAG_INVALID_CHAR,
-+ "\u7247\u6BB5\u5305\u542B\u7121\u6548\u7684\u5B57\u5143" },
-
-- { MsgKey.ER_SCHEME_REQUIRED,
-- "\u7db1\u8981\u662f\u5fc5\u9700\u7684\uff01"}
-+ { MsgKey.ER_FRAG_WHEN_PATH_NULL,
-+ "\u8DEF\u5F91\u70BA\u7A7A\u503C\u6642\uFF0C\u7121\u6CD5\u8A2D\u5B9A\u7247\u6BB5" },
-
-- };
-- return contents;
-- }
-+ { MsgKey.ER_FRAG_FOR_GENERIC_URI,
-+ "\u53EA\u80FD\u5C0D\u4E00\u822C URI \u8A2D\u5B9A\u7247\u6BB5" },
-+
-+ { MsgKey.ER_NO_SCHEME_IN_URI,
-+ "\u5728 URI \u627E\u4E0D\u5230\u914D\u7F6E" },
-+
-+ { MsgKey.ER_CANNOT_INIT_URI_EMPTY_PARMS,
-+ "\u7121\u6CD5\u4EE5\u7A7A\u767D\u53C3\u6578\u8D77\u59CB\u8A2D\u5B9A URI" },
-+
-+ { MsgKey.ER_NO_FRAGMENT_STRING_IN_PATH,
-+ "\u8DEF\u5F91\u548C\u7247\u6BB5\u4E0D\u80FD\u540C\u6642\u6307\u5B9A\u7247\u6BB5" },
-+
-+ { MsgKey.ER_NO_QUERY_STRING_IN_PATH,
-+ "\u5728\u8DEF\u5F91\u53CA\u67E5\u8A62\u5B57\u4E32\u4E2D\u4E0D\u53EF\u6307\u5B9A\u67E5\u8A62\u5B57\u4E32" },
-+
-+ { MsgKey.ER_NO_PORT_IF_NO_HOST,
-+ "\u5982\u679C\u6C92\u6709\u6307\u5B9A\u4E3B\u6A5F\uFF0C\u4E0D\u53EF\u6307\u5B9A\u9023\u63A5\u57E0" },
-+
-+ { MsgKey.ER_NO_USERINFO_IF_NO_HOST,
-+ "\u5982\u679C\u6C92\u6709\u6307\u5B9A\u4E3B\u6A5F\uFF0C\u4E0D\u53EF\u6307\u5B9A Userinfo" },
-+
-+ { MsgKey.ER_XML_VERSION_NOT_SUPPORTED,
-+ "\u8B66\u544A: \u8981\u6C42\u7684\u8F38\u51FA\u6587\u4EF6\u7248\u672C\u70BA ''{0}''\u3002\u4E0D\u652F\u63F4\u6B64\u7248\u672C\u7684 XML\u3002\u8F38\u51FA\u6587\u4EF6\u7684\u7248\u672C\u5C07\u6703\u662F ''1.0''\u3002" },
-+
-+ { MsgKey.ER_SCHEME_REQUIRED,
-+ "\u5FC5\u9808\u6709\u914D\u7F6E\uFF01" },
-+
-+ /*
-+ * Note to translators: The words 'Properties' and
-+ * 'SerializerFactory' in this message are Java class names
-+ * and should not be translated.
-+ */
-+ { MsgKey.ER_FACTORY_PROPERTY_MISSING,
-+ "\u50B3\u905E\u7D66 SerializerFactory \u7684 Properties \u7269\u4EF6\u6C92\u6709 ''{0}'' \u5C6C\u6027\u3002" },
-+
-+ { MsgKey.ER_ENCODING_NOT_SUPPORTED,
-+ "\u8B66\u544A: Java Runtime \u4E0D\u652F\u63F4\u7DE8\u78BC ''{0}''\u3002" },
-+
-+
-+ };
-+
-+ return contents;
-+ }
- }
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XPATHErrorResources_de.java,v 1.2.4.1 2005/09/15 00:39:22 jeffsuttor Exp $
-+ * $Id: XPATHErrorResources_de.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:23:27 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -881,7 +881,7 @@
- { "optionIN", " [-in inputXMLURL]"},
- { "optionSelect", " [-select xpath expression]"},
- { "optionMatch", " [-match match pattern (f\u00FCr Vergleichsdiagnose)]"},
-- { "optionAnyExpr", "Oder nur ein XPath-Ausdruck f\u00FChrt einen Diagnose-Dump aus"},
-+ { "optionAnyExpr", "Oder nur ein XPath-Ausdruck f\u00FChrt einen Diagnosedump aus"},
- { "noParsermsg1", "XSL-Prozess war nicht erfolgreich."},
- { "noParsermsg2", "** Parser konnte nicht gefunden werden **"},
- { "noParsermsg3", "Pr\u00FCfen Sie den Classpath."},
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XPATHErrorResources_es.java,v 1.2.4.1 2005/09/15 00:39:22 jeffsuttor Exp $
-+ * $Id: XPATHErrorResources_es.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:38:53 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -432,7 +432,7 @@
- "ERROR. C\u00F3digo de operaci\u00F3n desconocido: {0}"},
-
- { ER_EXTRA_ILLEGAL_TOKENS,
-- "Elementos no permitidos adicionales: {0}"},
-+ "Tokens no permitidos adicionales: {0}"},
-
- { ER_EXPECTED_DOUBLE_QUOTE,
- "literal con comillas incorrectas... se esperaban comillas dobles"},
-@@ -549,7 +549,7 @@
- "En XPath.readObject: {0}"},
-
- { ER_FUNCTION_TOKEN_NOT_FOUND,
-- "No se ha encontrado el elemento de funci\u00F3n."},
-+ "No se ha encontrado el token de funci\u00F3n."},
-
- { ER_CANNOT_DEAL_XPATH_TYPE,
- "No se puede negociar con el tipo de XPath: {0}"},
-@@ -643,13 +643,13 @@
- // The message indicates that such an expression was expected following the
- // characters '/' or '//', but was not found.
- { ER_EXPECTED_REL_LOC_PATH,
-- "Se esperaba una ruta de acceso de ubicaci\u00F3n relativa despu\u00E9s del elemento '/' o '//'."},
-+ "Se esperaba una ruta de acceso de ubicaci\u00F3n relativa despu\u00E9s del token '/' o '//'."},
-
- // Note to translators: A location path is a form of XPath expression.
- // The message indicates that syntactically such an expression was expected,but
- // the characters specified by the substitution text were encountered instead.
- { ER_EXPECTED_LOC_PATH,
-- "Se esperaba una ruta de acceso de ubicaci\u00F3n, pero se ha encontrado el siguiente elemento: {0}"},
-+ "Se esperaba una ruta de acceso de ubicaci\u00F3n, pero se ha encontrado el siguiente token: {0}"},
-
- // Note to translators: A location path is a form of XPath expression.
- // The message indicates that syntactically such a subexpression was expected,
-@@ -661,7 +661,7 @@
- // The message indicates that syntactically such an expression was expected
- // following the specified characters.
- { ER_EXPECTED_LOC_STEP,
-- "Se esperaba un paso de ubicaci\u00F3n despu\u00E9s del elemento '/' o '//'."},
-+ "Se esperaba un paso de ubicaci\u00F3n despu\u00E9s del token '/' o '//'."},
-
- // Note to translators: A node test is part of an XPath expression that is
- // used to test for particular kinds of nodes. In this case, a node test that
-@@ -846,7 +846,7 @@
- "XPath necesita un objeto derivado para implantar una prueba de nodo."},
-
- { WG_FUNCTION_TOKEN_NOT_FOUND,
-- "No se ha encontrado el elemento de funci\u00F3n."},
-+ "No se ha encontrado el token de funci\u00F3n."},
-
- { WG_COULDNOT_FIND_FUNCTION,
- "No se ha encontrado la funci\u00F3n: {0}"},
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XPATHErrorResources_fr.java,v 1.2.4.1 2005/09/15 00:39:21 jeffsuttor Exp $
-+ * $Id: XPATHErrorResources_fr.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 08:37:49 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -459,7 +459,7 @@
- "Caract\u00E8re ',' trouv\u00E9 sans argument le suivant."},
-
- { ER_PREDICATE_ILLEGAL_SYNTAX,
-- "Syntaxe '..[predicate]' ou '.[predicate]' non admise. Utilisez ''self::node()[predicate]'' \u00E0 la place."},
-+ "Syntaxe '..[predicate]' ou '.[predicate]' non admise. Utilisez 'self::node()[predicate]' \u00E0 la place."},
-
- { ER_ILLEGAL_AXIS_NAME,
- "nom d''axe non admis : {0}"},
-@@ -643,7 +643,7 @@
- // The message indicates that such an expression was expected following the
- // characters '/' or '//', but was not found.
- { ER_EXPECTED_REL_LOC_PATH,
-- "Un chemin d'acc\u00E8s relatif \u00E9tait attendu apr\u00E8s le jeton ''/'' ou ''//''."},
-+ "Un chemin d'acc\u00E8s relatif \u00E9tait attendu apr\u00E8s le jeton '/' ou '//'."},
-
- // Note to translators: A location path is a form of XPath expression.
- // The message indicates that syntactically such an expression was expected,but
-@@ -661,7 +661,7 @@
- // The message indicates that syntactically such an expression was expected
- // following the specified characters.
- { ER_EXPECTED_LOC_STEP,
-- "Une \u00E9tape d'emplacement \u00E9tait attendue apr\u00E8s le jeton ''/'' ou ''//''."},
-+ "Une \u00E9tape d'emplacement \u00E9tait attendue apr\u00E8s le jeton '/' ou '//'."},
-
- // Note to translators: A node test is part of an XPath expression that is
- // used to test for particular kinds of nodes. In this case, a node test that
-@@ -674,7 +674,7 @@
- // The message indicates that syntactically such an expression was expected,
- // but the specified character was found in the expression instead.
- { ER_EXPECTED_STEP_PATTERN,
-- "Un mod\u00E8le d'\u00E9tape \u00E9tait attendu, mais ''/'' a \u00E9t\u00E9 d\u00E9tect\u00E9."},
-+ "Un mod\u00E8le d'\u00E9tape \u00E9tait attendu, mais '/' a \u00E9t\u00E9 d\u00E9tect\u00E9."},
-
- // Note to translators: A relative path pattern is part of an XPath expression.
- // The message indicates that syntactically such an expression was expected,
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XPATHErrorResources_ja.java,v 1.2.4.1 2005/09/15 00:39:20 jeffsuttor Exp $
-+ * $Id: XPATHErrorResources_ja.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:16:51 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -540,7 +540,7 @@
- "\u7121\u52B9\u306AUTF-16\u30B5\u30ED\u30B2\u30FC\u30C8\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F: {0}\u3002"},
-
- { ER_OIERROR,
-- "\u5165\u51FA\u529B\u30A8\u30E9\u30FC"},
-+ "IO\u30A8\u30E9\u30FC"},
-
- { ER_CANNOT_CREATE_URL,
- "{0}\u306EURL\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093"},
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,13 +3,13 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-+ * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
-@@ -17,9 +17,8 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--
- /*
-- * $Id: XPATHErrorResources_pt_BR.java 3023 2011-03-01 00:53:34Z joehw $
-+ * $Id: XPATHErrorResources_pt_BR.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:50:29 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -517,7 +516,7 @@
- "O prefixo deve ser resolvido para um namespace: {0}"},
-
- { ER_PARSE_NOT_SUPPORTED,
-- "parse (InputSource source) n\u00E3o suportado em XPathContext! N\u00E3o \u00E9 poss\u00EDvel abrir {0}"},
-+ "parsing (InputSource source) n\u00E3o suportado em XPathContext! N\u00E3o \u00E9 poss\u00EDvel abrir {0}"},
-
- { ER_SAX_API_NOT_HANDLED,
- "Caracteres SAX API(char ch[]... n\u00E3o tratados por DTM!"},
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XPATHErrorResources_sv.java,v 1.2.4.1 2005/09/15 00:39:20 jeffsuttor Exp $
-+ * $Id: XPATHErrorResources_sv.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 10:05:13 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -447,7 +447,7 @@
- "F\u00F6rv\u00E4ntade {0}, men hittade: {1}"},
-
- { ER_INCORRECT_PROGRAMMER_ASSERTION,
-- "Programmerarens verifiering \u00E4r inte korrekt! - {0}"},
-+ "Programmerarens utsaga \u00E4r inte korrekt! - {0}"},
-
- { ER_BOOLEAN_ARG_NO_LONGER_OPTIONAL,
- "Argumentet boolean(...) \u00E4r inte l\u00E4ngre valfritt med 19990709 XPath-utkast."},
-@@ -480,7 +480,7 @@
- "Fel! Hittade inte xpath select-uttryck (-select)."},
-
- { ER_COULDNOT_FIND_ENDOP_AFTER_OPLOCATIONPATH,
-- "FEL! Kunde inte hitta ENDOP efter OP_LOCATIONPATH"},
-+ "FEL! Hittade inte ENDOP efter OP_LOCATIONPATH"},
-
- { ER_ERROR_OCCURED,
- "Fel intr\u00E4ffade!"},
-@@ -498,7 +498,7 @@
- "Funktionen count borde ta emot ett argument!"},
-
- { ER_COULDNOT_FIND_FUNCTION,
-- "Kunde inte hitta funktionen: {0}"},
-+ "Hittade inte funktionen: {0}"},
-
- { ER_UNSUPPORTED_ENCODING,
- "Kodning utan st\u00F6d: {0}"},
-@@ -567,7 +567,7 @@
- "Felhanterare med v\u00E4rde null"},
-
- { ER_PROG_ASSERT_UNKNOWN_OPCODE,
-- "Programmerarens verifiering: ok\u00E4nd op-kod: {0}"},
-+ "Programmerarens utsaga: ok\u00E4nd op-kod: {0}"},
-
- { ER_ZERO_OR_ONE,
- "0 eller 1"},
-@@ -637,7 +637,7 @@
- "{0} till\u00E5ter endast {1} argument"},
-
- { ER_UNKNOWN_STEP,
-- "Programmerarens verifiering i getNextStepPos: ok\u00E4nt stepType: {0}"},
-+ "Programmerarens utsaga i getNextStepPos: ok\u00E4nt stepType: {0}"},
-
- //Note to translators: A relative location path is a form of XPath expression.
- // The message indicates that such an expression was expected following the
-@@ -849,7 +849,7 @@
- "funktionstecken hittades inte."},
-
- { WG_COULDNOT_FIND_FUNCTION,
-- "Kunde inte hitta funktionen: {0}"},
-+ "Hittade inte funktionen: {0}"},
-
- { WG_CANNOT_MAKE_URL_FROM,
- "Kan inte skapa URL fr\u00E5n: {0}"},
---- ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java Mon Jan 05 11:56:34 2015 -0800
-+++ ./jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java Fri Apr 10 09:20:34 2015 -0700
-@@ -3,7 +3,7 @@
- * DO NOT REMOVE OR ALTER!
- */
- /*
-- * Copyright 1999-2004 The Apache Software Foundation.
-+ * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
-@@ -18,7 +18,7 @@
- * limitations under the License.
- */
- /*
-- * $Id: XPATHErrorResources_zh_CN.java,v 1.2.4.1 2005/09/15 00:39:21 jeffsuttor Exp $
-+ * $Id: XPATHErrorResources_zh_CN.java /st_wptg_1.7.0.79.0jdk/1 2015/01/23 11:18:41 gmolloy Exp $
- */
- package com.sun.org.apache.xpath.internal.res;
-
-@@ -855,7 +855,7 @@
- "\u65E0\u6CD5\u6839\u636E{0}\u751F\u6210 URL"},
-
- { WG_EXPAND_ENTITIES_NOT_SUPPORTED,
-- "DTM \u8BED\u6CD5\u5206\u6790\u5668\u4E0D\u652F\u6301 -E \u9009\u9879"},
-+ "DTM \u89E3\u6790\u5668\u4E0D\u652F\u6301 -E \u9009\u9879"},
-
- { WG_ILLEGAL_VARIABLE_REFERENCE,
- "\u4E3A\u53D8\u91CF\u7ED9\u5B9A\u7684 VariableReference \u8131\u79BB\u4E0A\u4E0B\u6587\u6216\u6CA1\u6709\u5B9A\u4E49! \u540D\u79F0 = {0}"},
-@@ -883,7 +883,7 @@
- { "optionMatch", " [-match match pattern (for match diagnostics)]"},
- { "optionAnyExpr", "\u6216\u8005\u4EC5 xpath \u8868\u8FBE\u5F0F\u6267\u884C\u8BCA\u65AD\u8F6C\u50A8"},
- { "noParsermsg1", "XSL \u8FDB\u7A0B\u672A\u6210\u529F\u3002"},
-- { "noParsermsg2", "** \u627E\u4E0D\u5230\u8BED\u6CD5\u5206\u6790\u5668 **"},
-+ { "noParsermsg2", "** \u627E\u4E0D\u5230\u89E3\u6790\u5668 **"},
- { "noParsermsg3", "\u8BF7\u68C0\u67E5\u60A8\u7684\u7C7B\u8DEF\u5F84\u3002"},
- { "noParsermsg4", "\u5982\u679C\u6CA1\u6709 IBM \u63D0\u4F9B\u7684 XML Parser for Java, \u5219\u53EF\u4EE5\u4ECE"},
- { "noParsermsg5", "IBM AlphaWorks \u8FDB\u884C\u4E0B\u8F7D, \u7F51\u5740\u4E3A: http://www.alphaworks.ibm.com/formula/xml"},
---- ./jaxws/.hgtags Mon Jan 05 11:56:55 2015 -0800
-+++ ./jaxws/.hgtags Fri Apr 10 09:20:47 2015 -0700
-@@ -527,6 +527,10 @@
- e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14
- 587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30
- 4257d52e30b4054c9ce43cfe830dff2b8f740037 jdk7u72-b31
-+21fa73d6d8229f9b47e0e005d749f1a8f2e6773b jdk7u72-b32
-+76bad2bdb262a711286dd3e564ff74a35a5e4057 jdk7u72-b33
-+d696a336ab88e75a4754e33cc55d2077233274cf jdk7u72-b34
-+f53c2202f0f3e71e5fce28a255c84f82c72e66af jdk7u72-b35
- 664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00
- ce5b9e0d988cb52d9e6c36edeafe60bd16280534 jdk7u75-b01
- 1b6ba791cbf7d995a81dfd1478906ebae3769ea2 jdk7u75-b02
-@@ -558,3 +562,37 @@
- dc818936e1050f0058d35a7a27946e4e2bfb27ee jdk7u76-b12
- a986e4b755f388532378d595831bebece7bf72c4 jdk7u76-b13
- 260565d7fba1a2d176bd43d81b0714bd19cf4459 jdk7u76-b30
-+c3d2e34987eae0eabef0f4297c6f45698251f27d jdk7u76-b31
-+1861eefc3db3696d0b1871dd3bd9ab66bf9b70e7 jdk7u76-b32
-+f1266833b5a07aa84d5da263f4a18503838286f4 jdk7u79-b00
-+4f7ab6ef2080323109da52df2931eb661453cc74 jdk7u79-b01
-+8a6d9421cc85ef5dd9549e748d2447a86ea91b46 jdk7u79-b02
-+b73eefa2d0e12841f097547d1b3b15b03e8ca0df jdk7u79-b03
-+931954df4985d83a044545f2606eeeacedc6d286 jdk7u79-b06
-+c9c194a74632eb094b618a7d8622d6728ef48d01 jdk7u79-b07
-+77da17c07509a090dfe19f742622b1bc3eaa3ed0 jdk7u79-b08
-+1ddc3c2923f0c31c762a3261053969abbff0d116 jdk7u79-b09
-+eed22a7e2498022e68fb19b5ac29ce72ad8032c1 jdk7u79-b10
-+ed0b993ecbf0a353beae3fbfbe958da333ddc570 jdk7u79-b11
-+c9c2272d9823e1ae10a2955811555a3bdb0bccb9 jdk7u79-b12
-+b20bcfe401e916df6c850d7a944f18906b43f79b jdk7u79-b13
-+d0bce57e5f05eead65366e2e4dbe635f1407b76d jdk7u79-b14
-+5c8cec1a09708a2627930ff923e64f468c7d9000 jdk7u79-b30
-+4ed47474a15acb48cd7f7fd3a4d9d3f8f457d914 jdk7u79-b15
-+bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00
-+0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01
-+579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02
-+e24556d88882d7a683812d416e3409386dda4ceb jdk7u80-b03
-+aaa0e97579b680842c80b0cf14c5dfd14deddbb7 jdk7u80-b04
-+c104ccd5dec598e99b61ca9cb92fe4af26d450cc jdk7u80-b05
-+4f6bcbad3545ab33c0aa587c80abf22b23e08162 jdk7u80-b06
-+8cadb55300888be69636353d355bbcc85315f405 jdk7u80-b07
-+2fb372549f5be49aba26992ea1d44121b7671fd5 jdk7u80-b08
-+0fefcb506b46944f8ee42d36b2d9c22727c41ec9 jdk7u80-b09
-+88edfb09289488ee4924977402f6d8949ecb8571 jdk7u80-b10
-+dbb1d1057fe5005777e8796b616423ea99c0936c jdk7u80-b11
-+4b6ad47f7eed058b894931e6e82117e9b1c00251 jdk7u80-b12
-+f816779f033526a72e2d17ccbb1d8642639c4e50 jdk7u80-b13
-+54dbf50da693ef8091e824b5d5bb1f271f753793 jdk7u80-b14
-+c1bf2f665c46d0e0b514bdeb227003f98a54a561 jdk7u80-b30
-+f6417ecaede6ee277f999f68e45959326dcd8f07 jdk7u80-b15
---- ./jaxws/THIRD_PARTY_README Mon Jan 05 11:56:55 2015 -0800
-+++ ./jaxws/THIRD_PARTY_README Fri Apr 10 09:20:47 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
-@@ -1912,35 +1912,6 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to Sparkle v.1.5,
--which is included with JRE 7 on Mac OS X.
--
----- begin of LICENSE ---
--
--Copyright (c) 2012 Sparkle.org and Andy Matuschak
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
----- end of LICENSE ---
--
---------------------------------------------------------------------------------
--
- %% Portions licensed from Taligent, Inc.
-
- -------------------------------------------------------------------------------
-@@ -3198,12 +3169,12 @@
- %% This notice is provided with respect to the following which is
- included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
-
-- Apache Derby 10.8.3.0 [included with JDK 7 only]
-+ Apache Derby 10.8.1.2 [included with JDK 7 only]
- Apache Jakarta BCEL 5.2
- Apache Jakarta Regexp 1.4
- Apache Santuario XMLSec-Java 1.4.2
- Apache Xalan-Java 2.7.1
-- Apache Xerces2 Java 2.11.0
-+ Apache Xerces2 Java 2.10.0
- Apache XML Resolver 1.1
-
-
---- ./jdk/.hgtags Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/.hgtags Fri Apr 10 09:21:28 2015 -0700
-@@ -511,6 +511,10 @@
- f4cf053f2ed3df23b756dd182061876ac9774bc5 jdk7u72-b14
- 6ef59d24666e8af5428706fc32295a5d088a48c9 jdk7u72-b30
- 550c9196d41b566e01f2d164a1b5e0aba9871f5e jdk7u72-b31
-+e2f6d0b84938d9ea91938f7105679b44f862ee3e jdk7u72-b32
-+fb11e637716c656029b9cbcb57689d58386b4b9d jdk7u72-b33
-+33ea00001116163c8a8a42f6048e285190e54a25 jdk7u72-b34
-+b56e38e4693b659e5b80a396e39d66f1d17139c0 jdk7u72-b35
- 87f9570ca734714f981d4a47477dcc6c80a7d324 jdk7u75-b00
- 0fefa48e670a31015be985ba74e35841d0cc66c1 jdk7u75-b01
- e885a036cc5dc0f8fa07dc0a5f55647f819f3fc5 jdk7u75-b02
-@@ -546,3 +550,35 @@
- 9af83882ca9e628f9e35634b930081271a91d561 jdk7u76-b12
- 1af0023da23e23482947b715fbf3bdfdee0d2813 jdk7u76-b13
- c5567031a820910ded5f20f2d7fa21c433d744ca jdk7u76-b30
-+09f3004e9b123b457da8f314aec027a5f4c3977f jdk7u76-b31
-+efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u80-b00
-+bc7f9d966c1df3748ef9c148eab25976cd065963 jdk7u80-b01
-+2590a9c18fdba19086712bb91a28352e9239a2be jdk7u80-b02
-+3796111298d5b013e46d5ce49f17c16fc3197be8 jdk7u80-b03
-+54acd5cd04856e80a3c7d5d38ef9c7a44d1e215a jdk7u80-b04
-+45f30f5524d4eef7aa512e35d5399cc4d84af174 jdk7u79-b00
-+2879572fbbb7be4d44e2bcd815711590cc6538e9 jdk7u79-b01
-+643cb9ac8b38239c65404daff8cc8d501bafa610 jdk7u79-b02
-+c2a53d62b3ad7eaae0087139f7764ff2054fe132 jdk7u79-b03
-+10431974d072ad8a24b003373e891bc4514d0ae6 jdk7u79-b06
-+e83b7d88c57654b0ebf78b5139bd74463a130525 jdk7u79-b07
-+f94dd20a1efaa3b0b4345992330dfe7cddae343b jdk7u79-b08
-+4fca88d471f4020266574064fa65787083ab1274 jdk7u79-b09
-+a476addbc2a4c88b34e5aacfe00bfc635f895c14 jdk7u79-b10
-+fd0139b86bc186ebfc2715266b70da08b0af6132 jdk7u79-b11
-+ed6e798f44e1698dfe766ee9e0763e035968c3a6 jdk7u79-b12
-+efc8369247fc9ace2ce2008192349e1e49949e7d jdk7u79-b13
-+2471c1dfff367fd75654eaeff608f0c32caa8171 jdk7u79-b14
-+da34e5f77e9e922844e7eb8d1e165d25245a8b40 jdk7u79-b30
-+ea77b684d424c40f983d1aff2c9f4ef6a9c572b0 jdk7u79-b15
-+f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06
-+feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07
-+f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08
-+0f1f2eeee541517e36b0f58d5d11a7786c6c616b jdk7u80-b09
-+a4e5054913cece41b8f42b7b0109779daf25b1ad jdk7u80-b10
-+a2e056f646434ad434b967cd7b973d5d5404d463 jdk7u80-b11
-+408f07c2baac78a1259c8168832493d5d828a4a8 jdk7u80-b12
-+84c9465241bf7152f8277ad4f39c8fb0bf045977 jdk7u80-b13
-+d5fb2dd3be5f3f65b8bbbf0965f3686a83c045b1 jdk7u80-b14
-+75fb0553cc146fb238df4e93dbe90791435e84f9 jdk7u80-b30
-+daa5092b07a75c17356bb438adba03f83f94ef17 jdk7u80-b15
---- ./jdk/THIRD_PARTY_README Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/THIRD_PARTY_README Fri Apr 10 09:21:28 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
---- ./jdk/make/Makefile Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/Makefile Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1995, 2011, 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
-@@ -232,7 +232,7 @@
-
- all build:: sanity-all post-sanity-all
-
--SUBDIRS = tools java javax sun com
-+SUBDIRS = tools java javax jdk sun com
- ifeq ($(PLATFORM), macosx)
- SUBDIRS += apple
- endif
---- ./jdk/make/common/Defs.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/common/Defs.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1995, 2012, 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
-@@ -213,7 +213,7 @@
- #
- # zlib version
- #
--ZLIB_VERSION = 1.2.3
-+ZLIB_VERSION = 1.2.8
-
-
- #
---- ./jdk/make/common/Program.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/common/Program.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1995, 2012, 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
-@@ -357,10 +357,10 @@
- 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
-+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.2.8
- endif # SYSTEM_ZLIB
- else # PLATFORM !MACOSX
-- OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.2.8
- endif
-
- OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
---- ./jdk/make/common/shared/Defs-javadoc.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/common/shared/Defs-javadoc.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -43,6 +43,7 @@
- TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
- JNLP_FIRST_COPYRIGHT_YEAR = 1998
- PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
-+JDKNET_FIRST_COPYRIGHT_YEAR = 2014
-
- # Oracle name
- FULL_COMPANY_NAME = Oracle and/or its affiliates
---- ./jdk/make/docs/Makefile Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/docs/Makefile Fri Apr 10 09:21:28 2015 -0700
-@@ -1,4 +1,4 @@
--# 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
-@@ -836,6 +836,56 @@
-
- #############################################################
- #
-+# jdk.net docs
-+#
-+
-+ALL_OTHER_TARGETS += jdknetdocs
-+
-+JDKNET_DOCDIR := $(JRE_API_DOCSDIR)/net/socketoptions/spec
-+JDKNET2COREAPI := ../../../$(JDKJRE2COREAPI)
-+JDKNET_DOCTITLE := jdk.net API
-+JDKNET_WINDOWTITLE := jdk.net API
-+JDKNET_HEADER := <strong>jdk.net API</strong>
-+JDKNET_BOTTOM := $(call CommonBottom,$(JDKNET_FIRST_COPYRIGHT_YEAR))
-+# JDKNET_PKGS is located in NON_CORE_PKGS.gmk
-+
-+JDKNET_INDEX_HTML = $(JDKNET_DOCDIR)/index.html
-+JDKNET_OPTIONS_FILE = $(DOCSTMPDIR)/jdknet.options
-+JDKNET_PACKAGES_FILE = $(DOCSTMPDIR)/jdknet.packages
-+
-+jdknetdocs: $(JDKNET_INDEX_HTML)
-+
-+# Set relative location to core api document root
-+$(JDKNET_INDEX_HTML): GET2DOCSDIR=$(JDKNET2COREAPI)/..
-+
-+# Run javadoc if the index file is out of date or missing
-+$(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE)
-+ $(prep-javadoc)
-+ $(call JavadocSummary,$(JDKNET_OPTIONS_FILE),$(JDKNET_PACKAGES_FILE))
-+ $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
-+ @$(JDKNET_OPTIONS_FILE) @$(JDKNET_PACKAGES_FILE)
-+
-+# Create file with javadoc options in it
-+$(JDKNET_OPTIONS_FILE):
-+ $(prep-target)
-+ @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-+ $(call OptionPair,-encoding,ascii) ; \
-+ $(call OptionOnly,-nodeprecatedlist) ; \
-+ $(call OptionPair,-doctitle,$(JDKNET_DOCTITLE)) ; \
-+ $(call OptionPair,-windowtitle,$(JDKNET_WINDOWTITLE) $(DRAFT_WINTITLE));\
-+ $(call OptionPair,-header,$(JDKNET_HEADER)$(DRAFT_HEADER)); \
-+ $(call OptionPair,-bottom,$(JDKNET_BOTTOM)$(DRAFT_BOTTOM)); \
-+ $(call OptionTrip,-linkoffline,$(JDKNET2COREAPI),$(COREAPI_DOCSDIR)/); \
-+ ) >> $@
-+
-+# Create a file with the package names in it
-+$(JDKNET_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDKNET_PKGS))
-+ $(prep-target)
-+ $(call PackageFilter,$(JDKNET_PKGS))
-+
-+#############################################################
-+#
- # httpserverdocs
- #
-
---- ./jdk/make/docs/NON_CORE_PKGS.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/docs/NON_CORE_PKGS.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -62,6 +62,8 @@
-
- OLD_JSSE_PKGS = com.sun.net.ssl
-
-+JDKNET_PKGS = jdk.net
-+
- HTTPSERVER_PKGS = com.sun.net.httpserver \
- com.sun.net.httpserver.spi
-
-@@ -99,6 +101,7 @@
- NON_CORE_PKGS = $(DOMAPI_PKGS) \
- $(MGMT_PKGS) \
- $(JAAS_PKGS) \
-+ $(JDKNET_PKGS) \
- $(JGSS_PKGS) \
- $(NIO_PKGS) \
- $(OLD_JSSE_PKGS) \
---- ./jdk/make/java/net/FILES_c.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/java/net/FILES_c.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -26,6 +26,7 @@
- FILES_c = \
- AbstractPlainDatagramSocketImpl.c \
- DatagramPacket.c \
-+ ExtendedOptionsImpl.c \
- InetAddress.c \
- Inet4Address.c \
- Inet6Address.c \
---- ./jdk/make/java/net/mapfile-vers Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/java/net/mapfile-vers Fri Apr 10 09:21:28 2015 -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
-@@ -96,6 +96,10 @@
- Java_sun_net_sdp_SdpSupport_create0;
- Java_sun_net_spi_DefaultProxySelector_init;
- Java_sun_net_spi_DefaultProxySelector_getSystemProxy;
-+ Java_sun_net_ExtendedOptionsImpl_init;
-+ Java_sun_net_ExtendedOptionsImpl_setFlowOption;
-+ Java_sun_net_ExtendedOptionsImpl_getFlowOption;
-+ Java_sun_net_ExtendedOptionsImpl_flowSupported;
- NET_AllocSockaddr;
- NET_SockaddrToInetAddress;
- NET_SockaddrEqualsInetAddress;
-@@ -106,6 +110,8 @@
- NET_Bind;
- NET_MapSocketOption;
- NET_Wait;
-+ NET_EnableFastTcpLoopback;
-+ NET_ThrowNew;
- ipv6_available;
-
- local:
---- ./jdk/make/java/nio/Makefile Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/java/nio/Makefile Fri Apr 10 09:21:28 2015 -0700
-@@ -380,6 +380,8 @@
- -libpath:$(LIBDIR) java.lib \
- $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
- $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \
-+ $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util_md.obj \
-+ $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/canonicalize_md.obj \
- $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
- endif
- ifeq ($(PLATFORM), linux)
---- ./jdk/make/java/zip/FILES_c.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/java/zip/FILES_c.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1996, 2002, 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
-@@ -35,7 +35,6 @@
- FILES_c += \
- compress.c \
- deflate.c \
-- gzio.c \
- infback.c \
- inffast.c \
- inflate.c \
---- ./jdk/make/java/zip/Makefile Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/java/zip/Makefile Fri Apr 10 09:21:28 2015 -0700
-@@ -68,6 +68,16 @@
- FILES_reorder += reorder-$(ARCH)
- endif
- endif
-+
-+#
-+# Use mapfile unconditionally (even with fastdebug).
-+# JDK's internal zlib is incompatible with stock zlib, because the
-+# size of struct z_stream has been changed, so internal zlib
-+# implementation must not be allowed to leak outside of libzip.so,
-+# else you get hard to debug failures with fastdebug jdk when user
-+# native code includes stock zlib.
-+#
-+FILES_m = mapfile-vers
- include $(BUILDDIR)/common/Mapfile-vers.gmk
- include $(BUILDDIR)/common/Library.gmk
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/jdk/Makefile Fri Apr 10 09:21:28 2015 -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.
-+#
-+
-+#
-+# Makefile for building jdk sub dir
-+#
-+
-+BUILDDIR = ..
-+PRODUCT = jdk
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+SUBDIRS = net
-+
-+include $(BUILDDIR)/common/Subdirs.gmk
-+
-+all build clean clobber::
-+ $(SUBDIRS-loop)
-+
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/jdk/net/FILES_java.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,30 @@
-+#
-+# 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.
-+#
-+
-+FILES_java = \
-+ jdk/net/ExtendedSocketOptions.java \
-+ jdk/net/NetworkPermission.java \
-+ jdk/net/SocketFlow.java \
-+ jdk/net/Sockets.java
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/jdk/net/Makefile Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,43 @@
-+#
-+# 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.
-+#
-+
-+#
-+# Makefile for building jdk.net classes
-+#
-+
-+BUILDDIR = ../..
-+PACKAGE = jdk.net
-+PRODUCT = sun
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+#
-+# Files to compile.
-+#
-+AUTO_FILES_JAVA_DIRS = jdk/net
-+
-+#
-+# Rules.
-+#
-+include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/jprt.properties Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/jprt.properties Fri Apr 10 09:21:28 2015 -0700
-@@ -81,6 +81,7 @@
- ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
-+ ${jprt.my.test.target.set:TESTNAME=jdk_security4}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
---- ./jdk/make/sun/javazic/tzdata/VERSION Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/VERSION Fri Apr 10 09:21:28 2015 -0700
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2014j
-+tzdata2015a
---- ./jdk/make/sun/javazic/tzdata/antarctica Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/antarctica Fri Apr 10 09:21:28 2015 -0700
-@@ -70,8 +70,8 @@
- Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 -
- Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 -
- Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S
--Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 -
--Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
-+Rule ChileAQ 2012 2015 - Apr Sun>=23 3:00u 0 -
-+Rule ChileAQ 2012 2014 - Sep Sun>=2 4:00u 1:00 S
-
- # Argentina - year-round bases
- # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-@@ -377,9 +377,10 @@
- #
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Antarctica/Palmer 0 - zzz 1965
-- -4:00 ArgAQ AR%sT 1969 Oct 5
-+ -4:00 ArgAQ AR%sT 1969 Oct 5
- -3:00 ArgAQ AR%sT 1982 May
-- -4:00 ChileAQ CL%sT
-+ -4:00 ChileAQ CL%sT 2015 Apr 26 3:00u
-+ -3:00 - CLT
- #
- #
- # McMurdo Station, Ross Island, since 1955-12
---- ./jdk/make/sun/javazic/tzdata/asia Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/asia Fri Apr 10 09:21:28 2015 -0700
-@@ -168,10 +168,7 @@
- 4:00 Azer AZ%sT
-
- # Bahrain
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah
-- 4:00 - GST 1972 Jun
-- 3:00 - AST
-+# See Asia/Qatar.
-
- # Bangladesh
- # From Alexander Krivenyshev (2009-05-13):
-@@ -1754,9 +1751,7 @@
- ###############################################################################
-
- # Kuwait
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Asia/Kuwait 3:11:56 - LMT 1950
-- 3:00 - AST
-+# See Asia/Riyadh.
-
- # Laos
- # See Asia/Bangkok.
-@@ -1977,12 +1972,7 @@
- 5:45 - NPT # Nepal Time
-
- # Oman
--
--# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
--
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Asia/Muscat 3:54:24 - LMT 1920
-- 4:00 - GST
-+# See Asia/Dubai.
-
- # Pakistan
-
-@@ -2476,6 +2466,7 @@
- Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
- 4:00 - GST 1972 Jun
- 3:00 - AST
-+Link Asia/Qatar Asia/Bahrain
-
- # Saudi Arabia
- #
-@@ -2502,6 +2493,8 @@
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
- 3:00 - AST
-+Link Asia/Riyadh Asia/Aden # Yemen
-+Link Asia/Riyadh Asia/Kuwait
-
- # Singapore
- # taken from Mok Ly Yng (2003-10-30)
-@@ -2790,6 +2783,7 @@
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Dubai 3:41:12 - LMT 1920
- 4:00 - GST
-+Link Asia/Dubai Asia/Muscat # Oman
-
- # Uzbekistan
- # Byalokoz 1919 says Uzbekistan was 4:27:53.
-@@ -2874,10 +2868,4 @@
- 7:00 - ICT
-
- # Yemen
--
--# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
--# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
--
--# Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Asia/Aden 2:59:54 - LMT 1950
-- 3:00 - AST
-+# See Asia/Riyadh.
---- ./jdk/make/sun/javazic/tzdata/backward Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/backward Fri Apr 10 09:21:28 2015 -0700
-@@ -28,7 +28,7 @@
- # and their old names. Many names changed in late 1993.
-
- # Link TARGET LINK-NAME
--Link Africa/Asmara Africa/Asmera
-+Link Africa/Nairobi Africa/Asmera
- Link Africa/Abidjan Africa/Timbuktu
- Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
- Link America/Adak America/Atka
---- ./jdk/make/sun/javazic/tzdata/europe Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/europe Fri Apr 10 09:21:28 2015 -0700
-@@ -1430,35 +1430,32 @@
- # might be a reference to the Julian calendar as opposed to Gregorian, or it
- # might mean something else (???).
- #
--# From Paul Eggert (2006-03-22):
--# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points.
--# We go with the Almanak, except for one claim from Shanks & Pottenger, namely
--# that Reykavik was 21W57 from 1837 to 1908, local mean time before that.
-+# From Paul Eggert (2014-11-22):
-+# The information below is taken from the 1988 Almanak; see
-+# http://www.almanak.hi.is/klukkan.html
- #
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Iceland 1917 1918 - Feb 19 23:00 1:00 S
-+Rule Iceland 1917 1919 - Feb 19 23:00 1:00 S
- Rule Iceland 1917 only - Oct 21 1:00 0 -
--Rule Iceland 1918 only - Nov 16 1:00 0 -
-+Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-+Rule Iceland 1921 only - Mar 19 23:00 1:00 S
-+Rule Iceland 1921 only - Jun 23 1:00 0 -
- Rule Iceland 1939 only - Apr 29 23:00 1:00 S
--Rule Iceland 1939 only - Nov 29 2:00 0 -
-+Rule Iceland 1939 only - Oct 29 2:00 0 -
- Rule Iceland 1940 only - Feb 25 2:00 1:00 S
--Rule Iceland 1940 only - Nov 3 2:00 0 -
--Rule Iceland 1941 only - Mar 2 1:00s 1:00 S
--Rule Iceland 1941 only - Nov 2 1:00s 0 -
--Rule Iceland 1942 only - Mar 8 1:00s 1:00 S
--Rule Iceland 1942 only - Oct 25 1:00s 0 -
-+Rule Iceland 1940 1941 - Nov Sun>=2 1:00s 0 -
-+Rule Iceland 1941 1942 - Mar Sun>=2 1:00s 1:00 S
- # 1943-1946 - first Sunday in March until first Sunday in winter
- Rule Iceland 1943 1946 - Mar Sun>=1 1:00s 1:00 S
--Rule Iceland 1943 1948 - Oct Sun>=22 1:00s 0 -
-+Rule Iceland 1942 1948 - Oct Sun>=22 1:00s 0 -
- # 1947-1967 - first Sunday in April until first Sunday in winter
- Rule Iceland 1947 1967 - Apr Sun>=1 1:00s 1:00 S
--# 1949 Oct transition delayed by 1 week
-+# 1949 and 1967 Oct transitions delayed by 1 week
- Rule Iceland 1949 only - Oct 30 1:00s 0 -
- Rule Iceland 1950 1966 - Oct Sun>=22 1:00s 0 -
- Rule Iceland 1967 only - Oct 29 1:00s 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
--Zone Atlantic/Reykjavik -1:27:24 - LMT 1837
-- -1:27:48 - RMT 1908 # Reykjavik Mean Time?
-+Zone Atlantic/Reykjavik -1:28 - LMT 1908
- -1:00 Iceland IS%sT 1968 Apr 7 1:00s
- 0:00 - GMT
-
---- ./jdk/make/sun/javazic/tzdata/leapseconds Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/leapseconds Fri Apr 10 09:21:28 2015 -0700
-@@ -77,3 +77,7 @@
- Leap 2005 Dec 31 23:59:60 + S
- Leap 2008 Dec 31 23:59:60 + S
- Leap 2012 Jun 30 23:59:60 + S
-+Leap 2015 Jun 30 23:59:60 + S
-+
-+# Updated through IERS Bulletin C49
-+# File expires on: 28 December 2015
---- ./jdk/make/sun/javazic/tzdata/northamerica Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/northamerica Fri Apr 10 09:21:28 2015 -0700
-@@ -147,7 +147,7 @@
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
- Rule US 1945 only - Aug 14 23:00u 1:00 P # Peace
--Rule US 1945 only - Sep 30 2:00 0 S
-+Rule US 1945 only - Sep lastSun 2:00 0 S
- Rule US 1967 2006 - Oct lastSun 2:00 0 S
- Rule US 1967 1973 - Apr lastSun 2:00 1:00 D
- Rule US 1974 only - Jan 6 2:00 1:00 D
-@@ -2147,11 +2147,11 @@
-
- # Mexico
-
--# From Paul Eggert (2001-03-05):
-+# From Paul Eggert (2014-12-07):
- # The Investigation and Analysis Service of the
- # Mexican Library of Congress (MLoC) has published a
- # history of Mexican local time (in Spanish)
--# http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/
-+# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm
- #
- # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
- # (In all cases we go with the MLoC.)
-@@ -2320,6 +2320,24 @@
- # efecto desde las dos horas del segundo domingo de marzo y concluirá a
- # las dos horas del primer domingo de noviembre.
-
-+# From Steffen Thorsen (2014-12-08), translated by Gwillim Law:
-+# The Mexican state of Quintana Roo will likely change to EST in 2015.
-+#
-+# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo
-+# "With this change, the time conflict that has existed between the municipios
-+# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an
-+# end. The latter declared itself in rebellion 15 years ago when a time change
-+# was initiated in Mexico, and since then it has refused to change its time
-+# zone along with the rest of the country."
-+#
-+# From Steffen Thorsen (2015-01-14), translated by Gwillim Law:
-+# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html
-+# "...the new time zone will come into effect at two o'clock on the first Sunday
-+# of February, when we will have to advance the clock one hour from its current
-+# time..."
-+#
-+# Also, the new zone will not use DST.
-+
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
-@@ -2340,7 +2358,8 @@
- 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
-+ -6:00 Mexico C%sT 2015 Feb 1 2:00
-+ -5:00 - EST
- # 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
---- ./jdk/make/sun/javazic/tzdata/southamerica Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/southamerica Fri Apr 10 09:21:28 2015 -0700
-@@ -1229,6 +1229,11 @@
- # 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
-
-+# From Juan Correa (2015-01-28):
-+# ... today the Ministry of Energy announced that Chile will drop DST, will keep
-+# "summer time" (UTC -3 / UTC -5) all year round....
-+# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html
-+
- # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
- # 'antarctica' file.
-
-@@ -1270,8 +1275,8 @@
- Rule Chile 2010 only - Apr Sun>=1 3:00u 0 -
- Rule Chile 2011 only - May Sun>=2 3:00u 0 -
- Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S
--Rule Chile 2012 max - Apr Sun>=23 3:00u 0 -
--Rule Chile 2012 max - Sep Sun>=2 4:00u 1:00 S
-+Rule Chile 2012 2015 - Apr Sun>=23 3:00u 0 -
-+Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 S
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
- # (1996-09) says 1998-03-08. Ignore these.
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
-@@ -1282,11 +1287,13 @@
- -4:00 - CLT 1919 Jul 1 # Chile Time
- -4:42:46 - SMT 1927 Sep 1 # Santiago Mean Time
- -5:00 Chile CL%sT 1947 May 22 # Chile Time
-- -4:00 Chile CL%sT
-+ -4:00 Chile CL%sT 2015 Apr 26 3:00u
-+ -3:00 - CLT
- 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 Time
-- -6:00 Chile EAS%sT
-+ -7:00 Chile EAS%sT 1982 Mar 13 3:00u # Easter Time
-+ -6:00 Chile EAS%sT 2015 Apr 26 3:00u
-+ -5:00 - EAST
- #
- # Salas y Gómez Island is uninhabited.
- # Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
---- ./jdk/make/sun/javazic/tzdata/zone.tab Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/javazic/tzdata/zone.tab Fri Apr 10 09:21:28 2015 -0700
-@@ -297,7 +297,7 @@
- MV +0410+07330 Indian/Maldives
- MW -1547+03500 Africa/Blantyre
- MX +1924-09909 America/Mexico_City Central Time - most locations
--MX +2105-08646 America/Cancun Central Time - Quintana Roo
-+MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo
- MX +2058-08937 America/Merida Central Time - Campeche, Yucatan
- MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
- MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
---- ./jdk/make/sun/net/FILES_java.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/net/FILES_java.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -24,6 +24,7 @@
- #
-
- FILES_java = \
-+ sun/net/ExtendedOptionsImpl.java \
- sun/net/InetAddressCachePolicy.java \
- sun/net/URLCanonicalizer.java \
- sun/net/NetworkClient.java \
---- ./jdk/make/sun/splashscreen/FILES_c.gmk Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/sun/splashscreen/FILES_c.gmk Fri Apr 10 09:21:28 2015 -0700
-@@ -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
-@@ -98,7 +98,10 @@
- FILES_c += \
- compress.c \
- deflate.c \
-- gzio.c \
-+ gzclose.c \
-+ gzlib.c \
-+ gzread.c \
-+ gzwrite.c \
- infback.c \
- inffast.c \
- inflate.c \
---- ./jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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) 20) * 365 * 24 * 60 * 60 * 1000) {
-- throw new RuntimeException("time is more than 10 years from present: " + time + " " + timeString + " " + currencyInfo);
-+ 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);
- }
- specialCaseCutOverTimes[specialCaseCount] = time;
- specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
---- ./jdk/make/tools/src/build/tools/javazic/Zoneinfo.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/tools/src/build/tools/javazic/Zoneinfo.java Fri Apr 10 09:21:28 2015 -0700
-@@ -376,6 +376,7 @@
- ZoneRec zrec = zone.get(zone.size()-1);
- tz.getOffsetIndex(zrec.getGmtOffset());
-
-+ int lastGmtOffsetValue = -1;
- int currentSave = 0;
- boolean usedZone;
- for (int zindex = 0; zindex < zone.size(); zindex++) {
-@@ -384,9 +385,12 @@
- gmtOffset = zrec.getGmtOffset();
- int stdOffset = zrec.getDirectSave();
-
-+ if (gmtOffset != lastGmtOffsetValue) {
-+ tz.setRawOffset(gmtOffset, fromTime);
-+ lastGmtOffsetValue = gmtOffset;
-+ }
- // If this is the last zone record, take the last rule info.
- if (!zrec.hasUntil()) {
-- tz.setRawOffset(gmtOffset, fromTime);
- if (zrec.hasRuleReference()) {
- tz.setLastRules(zrec.getRuleRef().getLastRules());
- } else if (stdOffset != 0) {
---- ./jdk/make/tools/swing-beans/SwingBeanInfo.template Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/make/tools/swing-beans/SwingBeanInfo.template Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -28,6 +28,7 @@
- import java.beans.BeanDescriptor;
- import java.beans.PropertyDescriptor;
- import java.awt.Image;
-+import java.security.PrivilegedAction;
-
- import sun.swing.BeanInfoUtils;
-
-@@ -92,25 +93,42 @@
- /**
- * @return an icon of the specified kind for @(BeanClassName)
- */
-- public Image getIcon(int kind) {
-+ public Image getIcon(final int kind) {
- Image i;
- switch (kind){
- case ICON_COLOR_32x32:
-- i = loadImage("beaninfo/images/@(BeanClassName)Color32.gif");
-- return ((i == null) ? loadImage("beaninfo/images/JComponentColor32.gif") : i);
-+ i = loadStandardImage("beaninfo/images/@(BeanClassName)Color32.gif");
-+ return ((i == null) ? loadStandardImage("beaninfo/images/JComponentColor32.gif") : i);
- case ICON_COLOR_16x16:
-- i = loadImage("beaninfo/images/@(BeanClassName)Color16.gif");
-- return ((i == null) ? loadImage("beaninfo/images/JComponentColor16.gif") : i);
-+ i = loadStandardImage("beaninfo/images/@(BeanClassName)Color16.gif");
-+ return ((i == null) ? loadStandardImage("beaninfo/images/JComponentColor16.gif") : i);
- case ICON_MONO_32x32:
-- i = loadImage("beaninfo/images/@(BeanClassName)Mono32.gif");
-- return ((i == null) ? loadImage("beaninfo/images/JComponentMono32.gif") : i);
-+ i = loadStandardImage("beaninfo/images/@(BeanClassName)Mono32.gif");
-+ return ((i == null) ? loadStandardImage("beaninfo/images/JComponentMono32.gif") : i);
- case ICON_MONO_16x16:
-- i = loadImage("beaninfo/images/@(BeanClassName)Mono16.gif");
-- return ((i == null) ? loadImage("beaninfo/images/JComponentMono16.gif") : i);
-+ i = loadStandardImage("beaninfo/images/@(BeanClassName)Mono16.gif");
-+ return ((i == null) ? loadStandardImage("beaninfo/images/JComponentMono16.gif") : i);
- default:
- return super.getIcon(kind);
- }
- }
-+
-+ /**
-+ * This is a utility method to help in loading standard icon images.
-+ *
-+ * @param resourceName A pathname relative to the directory holding the
-+ * class file of the current class
-+ * @return an image object. May be null if the load failed.
-+ * @see java.beans.SimpleBeanInfo#loadImage(String)
-+ */
-+ private Image loadStandardImage(final String resourceName) {
-+ return (Image) java.security.AccessController.doPrivileged(
-+ new PrivilegedAction() {
-+ public Object run() {
-+ return loadImage(resourceName);
-+ }
-+ });
-+ }
- }
-
-
---- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Fri Apr 10 09:21:28 2015 -0700
-@@ -674,6 +674,13 @@
- @Override // PlatformWindow
- public void toFront() {
- final long nsWindowPtr = getNSWindowPtr();
-+ LWCToolkit lwcToolkit = (LWCToolkit) Toolkit.getDefaultToolkit();
-+ Window w = DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
-+ if( w != null && w.getPeer() != null
-+ && ((LWWindowPeer)w.getPeer()).getPeerType() == LWWindowPeer.PeerType.EMBEDDED_FRAME
-+ && !lwcToolkit.isApplicationActive()) {
-+ lwcToolkit.activateApplicationIgnoringOtherApps();
-+ }
- updateFocusabilityForAutoRequestFocus(false);
- nativePushNSWindowToFront(nsWindowPtr);
- updateFocusabilityForAutoRequestFocus(true);
---- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java Fri Apr 10 09:21:28 2015 -0700
-@@ -203,6 +203,10 @@
-
-
- setAttributes(attributes);
-+ // throw exception for invalid destination
-+ if (destinationAttr != null) {
-+ validateDestination(destinationAttr);
-+ }
-
- /* Get the range of pages we are to print. If the
- * last page to print is unknown, then we print to
---- ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Fri Apr 10 09:21:28 2015 -0700
-@@ -700,6 +700,11 @@
- */
- public native boolean isApplicationActive();
-
-+ /*
-+ * Activates application ignoring other apps.
-+ */
-+ public native void activateApplicationIgnoringOtherApps();
-+
- /************************
- * Native methods section
- ************************/
---- ./jdk/src/macosx/native/sun/awt/LWCToolkit.m Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/macosx/native/sun/awt/LWCToolkit.m Fri Apr 10 09:21:28 2015 -0700
-@@ -392,6 +392,23 @@
- return active;
- }
-
-+/*
-+ * Class: sun_lwawt_macosx_LWCToolkit
-+ * Method: activateApplicationIgnoringOtherApps
-+ * Signature: ()V
-+ */
-+JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_activateApplicationIgnoringOtherApps
-+(JNIEnv *env, jclass clazz)
-+{
-+ JNF_COCOA_ENTER(env);
-+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
-+ if(![NSApp isActive]){
-+ [NSApp activateIgnoringOtherApps:YES];
-+ }
-+ }];
-+ JNF_COCOA_EXIT(env);
-+}
-+
-
- /*
- * Class: sun_awt_SunToolkit
---- ./jdk/src/macosx/native/sun/font/AWTStrike.m Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/macosx/native/sun/font/AWTStrike.m Fri Apr 10 09:21:28 2015 -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
-@@ -25,14 +25,11 @@
-
- #import <JavaNativeFoundation/JavaNativeFoundation.h>
- #import "java_awt_geom_PathIterator.h"
--#import "sun_awt_SunHints.h"
- #import "sun_font_CStrike.h"
- #import "sun_font_CStrikeDisposer.h"
- #import "CGGlyphImages.h"
- #import "CGGlyphOutlines.h"
--#import "AWTStrike.h"
- #import "CoreTextSupport.h"
--//#import "jni_util.h"
- #include "fontscalerdefs.h"
-
- @implementation AWTStrike
-@@ -60,10 +57,10 @@
- invDevTx.b *= -1;
- invDevTx.c *= -1;
- fFontTx = CGAffineTransformConcat(CGAffineTransformConcat(tx, invDevTx), sInverseTX);
-- fDevTx = CGAffineTransformInvert(invDevTx);
-+ fDevTx = CGAffineTransformInvert(CGAffineTransformConcat(invDevTx, sInverseTX));
-
- // the "font size" is the square root of the determinant of the matrix
-- fSize = sqrt(abs(fFontTx.a * fFontTx.d - fFontTx.b * fFontTx.c));
-+ fSize = sqrt(fabs(fFontTx.a * fFontTx.d - fFontTx.b * fFontTx.c));
- }
- return self;
- }
---- ./jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -351,7 +351,7 @@
- switch (mode) {
- case MODE_SIGN:
- data = padding.pad(buffer, 0, bufOfs);
-- return RSACore.rsa(data, privateKey);
-+ return RSACore.rsa(data, privateKey, true);
- case MODE_VERIFY:
- byte[] verifyBuffer = RSACore.convert(buffer, 0, bufOfs);
- data = RSACore.rsa(verifyBuffer, publicKey);
-@@ -361,7 +361,7 @@
- return RSACore.rsa(data, publicKey);
- case MODE_DECRYPT:
- byte[] decryptBuffer = RSACore.convert(buffer, 0, bufOfs);
-- data = RSACore.rsa(decryptBuffer, privateKey);
-+ data = RSACore.rsa(decryptBuffer, privateKey, false);
- return padding.unpad(data);
- default:
- throw new AssertionError("Internal error");
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Fri Apr 10 09:21:28 2015 -0700
-@@ -31,6 +31,8 @@
- import java.awt.KeyEventPostProcessor;
- import java.awt.Window;
- import java.awt.Toolkit;
-+
-+import sun.awt.AWTAccessor;
- import sun.awt.SunToolkit;
-
- import java.awt.event.ActionEvent;
-@@ -133,10 +135,15 @@
- // window. If this time appears to be greater than the altRelease
- // event time the event is skipped to avoid unexpected menu
- // activation. See 7121442.
-+ // Also we must ensure that original source of key event belongs
-+ // to the same window object as winAncestor. See 8001633.
- boolean skip = false;
- Toolkit tk = Toolkit.getDefaultToolkit();
- if (tk instanceof SunToolkit) {
-- skip = ev.getWhen() <= ((SunToolkit)tk).getWindowDeactivationTime(winAncestor);
-+ Component originalSource = AWTAccessor.getKeyEventAccessor()
-+ .getOriginalSource(ev);
-+ skip = SunToolkit.getContainingWindow(originalSource) != winAncestor ||
-+ ev.getWhen() <= ((SunToolkit) tk).getWindowDeactivationTime(winAncestor);
- }
-
- if (menu != null && !skip) {
---- ./jdk/src/share/classes/com/sun/jndi/ldap/Connection.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/com/sun/jndi/ldap/Connection.java Fri Apr 10 09:21:28 2015 -0700
-@@ -460,14 +460,16 @@
- rber = ldr.getReplyBer();
- if (rber == null) {
- if (readTimeout > 0) { // Socket read timeout is specified
--
- // will be woken up before readTimeout only if reply is
- // available
- ldr.wait(readTimeout);
-+ waited = true;
- } else {
-- ldr.wait(15 * 1000); // 15 second timeout
-+ // no timeout is set so we wait infinitely until
-+ // a response is received
-+ // http://docs.oracle.com/javase/8/docs/technotes/guides/jndi/jndi-ldap.html#PROP
-+ ldr.wait();
- }
-- waited = true;
- } else {
- break;
- }
---- ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1062,10 +1062,6 @@
- if (ktab != null) {
- if (!privCredSet.contains(ktab)) {
- privCredSet.add(ktab);
-- // Compatibility; also add keys to privCredSet
-- for (KerberosKey key: ktab.getKeys(kerbClientPrinc)) {
-- privCredSet.add(new Krb5Util.KeysFromKeyTab(key));
-- }
- }
- } else {
- succeeded = false;
---- ./jdk/src/share/classes/java/awt/EventQueue.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/awt/EventQueue.java Fri Apr 10 09:21:28 2015 -0700
-@@ -181,7 +181,14 @@
-
- private final String name = "AWT-EventQueue-" + threadInitNumber.getAndIncrement();
-
-- private static final PlatformLogger eventLog = PlatformLogger.getLogger("java.awt.event.EventQueue");
-+ private static volatile PlatformLogger eventLog;
-+
-+ private static final PlatformLogger getEventLog() {
-+ if(eventLog == null) {
-+ eventLog = PlatformLogger.getLogger("java.awt.event.EventQueue");
-+ }
-+ return eventLog;
-+ }
-
- static {
- AWTAccessor.setEventQueueAccessor(
-@@ -748,8 +755,8 @@
- dispatchThread.stopDispatching();
- }
- } else {
-- if (eventLog.isLoggable(PlatformLogger.FINE)) {
-- eventLog.fine("Unable to dispatch event: " + event);
-+ if (getEventLog().isLoggable(PlatformLogger.FINE)) {
-+ getEventLog().fine("Unable to dispatch event: " + event);
- }
- }
- }
-@@ -846,8 +853,8 @@
- * @since 1.2
- */
- public void push(EventQueue newEventQueue) {
-- if (eventLog.isLoggable(PlatformLogger.FINE)) {
-- eventLog.fine("EventQueue.push(" + newEventQueue + ")");
-+ if (getEventLog().isLoggable(PlatformLogger.FINE)) {
-+ getEventLog().fine("EventQueue.push(" + newEventQueue + ")");
- }
-
- pushPopLock.lock();
-@@ -870,8 +877,8 @@
- // Use getNextEventPrivate() as it doesn't call flushPendingEvents()
- newEventQueue.postEventPrivate(topQueue.getNextEventPrivate());
- } catch (InterruptedException ie) {
-- if (eventLog.isLoggable(PlatformLogger.FINE)) {
-- eventLog.fine("Interrupted push", ie);
-+ if (getEventLog().isLoggable(PlatformLogger.FINE)) {
-+ getEventLog().fine("Interrupted push", ie);
- }
- }
- }
-@@ -909,8 +916,8 @@
- * @since 1.2
- */
- protected void pop() throws EmptyStackException {
-- if (eventLog.isLoggable(PlatformLogger.FINE)) {
-- eventLog.fine("EventQueue.pop(" + this + ")");
-+ if (getEventLog().isLoggable(PlatformLogger.FINE)) {
-+ getEventLog().fine("EventQueue.pop(" + this + ")");
- }
-
- pushPopLock.lock();
-@@ -932,8 +939,8 @@
- try {
- prevQueue.postEventPrivate(topQueue.getNextEventPrivate());
- } catch (InterruptedException ie) {
-- if (eventLog.isLoggable(PlatformLogger.FINE)) {
-- eventLog.fine("Interrupted pop", ie);
-+ if (getEventLog().isLoggable(PlatformLogger.FINE)) {
-+ getEventLog().fine("Interrupted pop", ie);
- }
- }
- }
---- ./jdk/src/share/classes/java/awt/event/KeyEvent.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/awt/event/KeyEvent.java Fri Apr 10 09:21:28 2015 -0700
-@@ -930,6 +930,10 @@
- long extendedKeyCode) {
- ev.extendedKeyCode = extendedKeyCode;
- }
-+
-+ public Component getOriginalSource( KeyEvent ev ) {
-+ return ev.originalSource;
-+ }
- });
- }
-
-@@ -939,6 +943,14 @@
- */
- private static native void initIDs();
-
-+ /**
-+ * The original event source.
-+ *
-+ * Event source can be changed during processing, but in some cases
-+ * we need to be able to obtain original source.
-+ */
-+ private Component originalSource;
-+
- private KeyEvent(Component source, int id, long when, int modifiers,
- int keyCode, char keyChar, int keyLocation, boolean isProxyActive) {
- this(source, id, when, modifiers, keyCode, keyChar, keyLocation);
-@@ -1023,6 +1035,7 @@
- } else if ((getModifiers() == 0) && (getModifiersEx() != 0)) {
- setOldModifiers();
- }
-+ originalSource = source;
- }
-
- /**
---- ./jdk/src/share/classes/java/beans/Beans.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/beans/Beans.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
- * 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,9 +46,6 @@
-
- import java.net.URL;
-
--import java.security.AccessController;
--import java.security.PrivilegedAction;
--
- import java.util.Enumeration;
- import java.util.Hashtable;
- import java.util.Iterator;
-@@ -177,16 +174,10 @@
-
- // Try to find a serialized object with this name
- final String serName = beanName.replace('.','/').concat(".ser");
-- final ClassLoader loader = cls;
-- ins = (InputStream)AccessController.doPrivileged
-- (new PrivilegedAction() {
-- public Object run() {
-- if (loader == null)
-- return ClassLoader.getSystemResourceAsStream(serName);
-- else
-- return loader.getResourceAsStream(serName);
-- }
-- });
-+ if (cls == null)
-+ ins = ClassLoader.getSystemResourceAsStream(serName);
-+ else
-+ ins = cls.getResourceAsStream(serName);
- if (ins != null) {
- try {
- if (cls == null) {
-@@ -277,19 +268,10 @@
- URL docBase = null;
-
- // Now get the URL correponding to the resource name.
--
-- final ClassLoader cloader = cls;
-- objectUrl = (URL)
-- AccessController.doPrivileged
-- (new PrivilegedAction() {
-- public Object run() {
-- if (cloader == null)
-- return ClassLoader.getSystemResource
-- (resourceName);
-- else
-- return cloader.getResource(resourceName);
-- }
-- });
-+ if (cls == null) {
-+ objectUrl = ClassLoader.getSystemResource(resourceName);
-+ } else
-+ objectUrl = cls.getResource(resourceName);
-
- // If we found a URL, we try to locate the docbase by taking
- // of the final path name component, and the code base by taking
---- ./jdk/src/share/classes/java/beans/SimpleBeanInfo.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/beans/SimpleBeanInfo.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
- * 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,11 @@
-
- package java.beans;
-
-+import java.awt.Image;
-+import java.awt.Toolkit;
-+import java.awt.image.ImageProducer;
-+import java.net.URL;
-+
- /**
- * This is a support class to make it easier for people to provide
- * BeanInfo classes.
-@@ -99,7 +104,7 @@
- * Claim there are no icons available. You can override
- * this if you want to provide icons for your bean.
- */
-- public java.awt.Image getIcon(int iconKind) {
-+ public Image getIcon(int iconKind) {
- return null;
- }
-
-@@ -114,33 +119,17 @@
- * "wombat.gif".
- * @return an image object. May be null if the load failed.
- */
-- public java.awt.Image loadImage(final String resourceName) {
-+ public Image loadImage(final String resourceName) {
- try {
-- final Class c = getClass();
-- java.awt.image.ImageProducer ip = (java.awt.image.ImageProducer)
-- java.security.AccessController.doPrivileged(
-- new java.security.PrivilegedAction() {
-- public Object run() {
-- java.net.URL url;
-- if ((url = c.getResource(resourceName)) == null) {
-- return null;
-- } else {
-- try {
-- return url.getContent();
-- } catch (java.io.IOException ioe) {
-- return null;
-- }
-- }
-- }
-- });
--
-- if (ip == null)
-- return null;
-- java.awt.Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
-- return tk.createImage(ip);
-- } catch (Exception ex) {
-- return null;
-+ final URL url = getClass().getResource(resourceName);
-+ if (url != null) {
-+ final ImageProducer ip = (ImageProducer) url.getContent();
-+ if (ip != null) {
-+ return Toolkit.getDefaultToolkit().createImage(ip);
-+ }
-+ }
-+ } catch (final Exception ignored) {
- }
-+ return null;
- }
--
- }
---- ./jdk/src/share/classes/java/lang/Class.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/lang/Class.java Fri Apr 10 09:21:28 2015 -0700
-@@ -130,11 +130,15 @@
- }
-
- /*
-- * Constructor. Only the Java Virtual Machine creates Class
-- * objects.
-+ * Private constructor. Only the Java Virtual Machine creates Class objects.
-+ * This constructor is not used and prevents the default constructor being
-+ * generated.
- */
-- private Class() {}
--
-+ private Class(ClassLoader loader) {
-+ // Initialize final field for classLoader. The initialization value of non-null
-+ // prevents future JIT optimizations from assuming this final field is null.
-+ classLoader = loader;
-+ }
-
- /**
- * Converts the object to a string. The string representation is the
-@@ -622,8 +626,12 @@
- }
-
- // Package-private to allow ClassLoader access
-- native ClassLoader getClassLoader0();
-+ ClassLoader getClassLoader0() { return classLoader; }
-
-+ // Initialized in JVM not by private constructor
-+ // This field is filtered from reflection access, i.e. getDeclaredField
-+ // will throw NoSuchFieldException
-+ private final ClassLoader classLoader;
-
- /**
- * Returns an array of {@code TypeVariable} objects that represent the
-@@ -2454,7 +2462,7 @@
- private native String getGenericSignature();
-
- // Generic info repository; lazily initialized
-- private transient ClassRepository genericInfo;
-+ private volatile transient ClassRepository genericInfo;
-
- // accessor for factory
- private GenericsFactory getFactory() {
-@@ -2464,11 +2472,13 @@
-
- // accessor for generic info repository
- private ClassRepository getGenericInfo() {
-+ ClassRepository genericInfo = this.genericInfo;
- // lazily initialize repository if necessary
- if (genericInfo == null) {
- // create and cache generic info repository
- genericInfo = ClassRepository.make(getGenericSignature(),
- getFactory());
-+ this.genericInfo = genericInfo;
- }
- return genericInfo; //return cached repository
- }
---- ./jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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
-@@ -129,14 +129,15 @@
- setAccessible0(this, flag);
- }
-
-- /* Check that you aren't exposing java.lang.Class.<init>. */
-+ /* Check that you aren't exposing java.lang.Class.<init> or sensitive
-+ fields in java.lang.Class. */
- private static void setAccessible0(AccessibleObject obj, boolean flag)
- throws SecurityException
- {
- if (obj instanceof Constructor && flag == true) {
- Constructor<?> c = (Constructor<?>)obj;
- if (c.getDeclaringClass() == Class.class) {
-- throw new SecurityException("Can not make a java.lang.Class" +
-+ throw new SecurityException("Cannot make a java.lang.Class" +
- " constructor accessible");
- }
- }
---- ./jdk/src/share/classes/java/net/DatagramSocket.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/net/DatagramSocket.java Fri Apr 10 09:21:28 2015 -0700
-@@ -340,6 +340,7 @@
- }
- // creates a udp socket
- impl.create();
-+ impl.setDatagramSocket(this);
- created = true;
- }
-
---- ./jdk/src/share/classes/java/net/DatagramSocketImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/net/DatagramSocketImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -54,6 +54,20 @@
- }
-
- /**
-+ * The DatagramSocket or MulticastSocket
-+ * that owns this impl
-+ */
-+ DatagramSocket socket;
-+
-+ void setDatagramSocket(DatagramSocket socket) {
-+ this.socket = socket;
-+ }
-+
-+ DatagramSocket getDatagramSocket() {
-+ return socket;
-+ }
-+
-+ /**
- * Creates a datagram socket.
- * @exception SocketException if there is an error in the
- * underlying protocol, such as a TCP error.
-@@ -239,6 +253,56 @@
- return localPort;
- }
-
-+ <T> void setOption(SocketOption<T> name, T value) throws IOException {
-+ if (name == StandardSocketOptions.SO_SNDBUF) {
-+ setOption(SocketOptions.SO_SNDBUF, value);
-+ } else if (name == StandardSocketOptions.SO_RCVBUF) {
-+ setOption(SocketOptions.SO_RCVBUF, value);
-+ } else if (name == StandardSocketOptions.SO_REUSEADDR) {
-+ setOption(SocketOptions.SO_REUSEADDR, value);
-+ } else if (name == StandardSocketOptions.IP_TOS) {
-+ setOption(SocketOptions.IP_TOS, value);
-+ } else if (name == StandardSocketOptions.IP_MULTICAST_IF &&
-+ (getDatagramSocket() instanceof MulticastSocket)) {
-+ setOption(SocketOptions.IP_MULTICAST_IF2, value);
-+ } else if (name == StandardSocketOptions.IP_MULTICAST_TTL &&
-+ (getDatagramSocket() instanceof MulticastSocket)) {
-+ if (! (value instanceof Integer)) {
-+ throw new IllegalArgumentException("not an integer");
-+ }
-+ setTimeToLive((Integer)value);
-+ } else if (name == StandardSocketOptions.IP_MULTICAST_LOOP &&
-+ (getDatagramSocket() instanceof MulticastSocket)) {
-+ setOption(SocketOptions.IP_MULTICAST_LOOP, value);
-+ } else {
-+ throw new UnsupportedOperationException("unsupported option");
-+ }
-+ }
-+
-+ <T> T getOption(SocketOption<T> name) throws IOException {
-+ if (name == StandardSocketOptions.SO_SNDBUF) {
-+ return (T) getOption(SocketOptions.SO_SNDBUF);
-+ } else if (name == StandardSocketOptions.SO_RCVBUF) {
-+ return (T) getOption(SocketOptions.SO_RCVBUF);
-+ } else if (name == StandardSocketOptions.SO_REUSEADDR) {
-+ return (T) getOption(SocketOptions.SO_REUSEADDR);
-+ } else if (name == StandardSocketOptions.IP_TOS) {
-+ return (T) getOption(SocketOptions.IP_TOS);
-+ } else if (name == StandardSocketOptions.IP_MULTICAST_IF &&
-+ (getDatagramSocket() instanceof MulticastSocket)) {
-+ return (T) getOption(SocketOptions.IP_MULTICAST_IF2);
-+ } else if (name == StandardSocketOptions.IP_MULTICAST_TTL &&
-+ (getDatagramSocket() instanceof MulticastSocket)) {
-+ Integer ttl = getTimeToLive();
-+ return (T)ttl;
-+ } else if (name == StandardSocketOptions.IP_MULTICAST_LOOP &&
-+ (getDatagramSocket() instanceof MulticastSocket)) {
-+ return (T) getOption(SocketOptions.IP_MULTICAST_LOOP);
-+ } else {
-+ throw new UnsupportedOperationException("unsupported option");
-+ }
-+ }
-+
- /**
- * Gets the datagram socket file descriptor.
- * @return a <tt>FileDescriptor</tt> object representing the datagram socket
---- ./jdk/src/share/classes/java/net/SocketImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/net/SocketImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -354,4 +354,44 @@
- {
- /* Not implemented yet */
- }
-+
-+ <T> void setOption(SocketOption<T> name, T value) throws IOException {
-+ if (name == StandardSocketOptions.SO_KEEPALIVE) {
-+ setOption(SocketOptions.SO_KEEPALIVE, value);
-+ } else if (name == StandardSocketOptions.SO_SNDBUF) {
-+ setOption(SocketOptions.SO_SNDBUF, value);
-+ } else if (name == StandardSocketOptions.SO_RCVBUF) {
-+ setOption(SocketOptions.SO_RCVBUF, value);
-+ } else if (name == StandardSocketOptions.SO_REUSEADDR) {
-+ setOption(SocketOptions.SO_REUSEADDR, value);
-+ } else if (name == StandardSocketOptions.SO_LINGER) {
-+ setOption(SocketOptions.SO_LINGER, value);
-+ } else if (name == StandardSocketOptions.IP_TOS) {
-+ setOption(SocketOptions.IP_TOS, value);
-+ } else if (name == StandardSocketOptions.TCP_NODELAY) {
-+ setOption(SocketOptions.TCP_NODELAY, value);
-+ } else {
-+ throw new UnsupportedOperationException("unsupported option");
-+ }
-+ }
-+
-+ <T> T getOption(SocketOption<T> name) throws IOException {
-+ if (name == StandardSocketOptions.SO_KEEPALIVE) {
-+ return (T)getOption(SocketOptions.SO_KEEPALIVE);
-+ } else if (name == StandardSocketOptions.SO_SNDBUF) {
-+ return (T)getOption(SocketOptions.SO_SNDBUF);
-+ } else if (name == StandardSocketOptions.SO_RCVBUF) {
-+ return (T)getOption(SocketOptions.SO_RCVBUF);
-+ } else if (name == StandardSocketOptions.SO_REUSEADDR) {
-+ return (T)getOption(SocketOptions.SO_REUSEADDR);
-+ } else if (name == StandardSocketOptions.SO_LINGER) {
-+ return (T)getOption(SocketOptions.SO_LINGER);
-+ } else if (name == StandardSocketOptions.IP_TOS) {
-+ return (T)getOption(SocketOptions.IP_TOS);
-+ } else if (name == StandardSocketOptions.TCP_NODELAY) {
-+ return (T)getOption(SocketOptions.TCP_NODELAY);
-+ } else {
-+ throw new UnsupportedOperationException("unsupported option");
-+ }
-+ }
- }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/java/net/SocketSecrets.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,70 @@
-+/*
-+ * 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 java.net;
-+
-+import java.io.IOException;
-+
-+class SocketSecrets {
-+
-+ /* accessed by reflection from jdk.net.Sockets */
-+
-+ /* obj must be a Socket or ServerSocket */
-+
-+ private static <T> void setOption(Object obj, SocketOption<T> name, T value) throws IOException {
-+ SocketImpl impl;
-+
-+ if (obj instanceof Socket) {
-+ impl = ((Socket)obj).getImpl();
-+ } else if (obj instanceof ServerSocket) {
-+ impl = ((ServerSocket)obj).getImpl();
-+ } else {
-+ throw new IllegalArgumentException();
-+ }
-+ impl.setOption(name, value);
-+ }
-+
-+ private static <T> T getOption(Object obj, SocketOption<T> name) throws IOException {
-+ SocketImpl impl;
-+
-+ if (obj instanceof Socket) {
-+ impl = ((Socket)obj).getImpl();
-+ } else if (obj instanceof ServerSocket) {
-+ impl = ((ServerSocket)obj).getImpl();
-+ } else {
-+ throw new IllegalArgumentException();
-+ }
-+ return impl.getOption(name);
-+ }
-+
-+ private static <T> void setOption(DatagramSocket s, SocketOption<T> name, T value) throws IOException {
-+ s.getImpl().setOption(name, value);
-+ }
-+
-+ private static <T> T getOption(DatagramSocket s, SocketOption<T> name) throws IOException {
-+ return s.getImpl().getOption(name);
-+ }
-+
-+}
---- ./jdk/src/share/classes/java/net/SocksSocketImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/net/SocksSocketImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -388,14 +388,13 @@
- }
- while (iProxy.hasNext()) {
- p = iProxy.next();
-- if (p == null || p == Proxy.NO_PROXY) {
-+ if (p == null || p.type() != Proxy.Type.SOCKS) {
- super.connect(epoint, remainingMillis(deadlineMillis));
- return;
- }
-- if (p.type() != Proxy.Type.SOCKS)
-- throw new SocketException("Unknown proxy type : " + p.type());
-+
- if (!(p.address() instanceof InetSocketAddress))
-- throw new SocketException("Unknow address type for proxy: " + p);
-+ throw new SocketException("Unknown address type for proxy: " + p);
- // Use getHostString() to avoid reverse lookups
- server = ((InetSocketAddress) p.address()).getHostString();
- serverPort = ((InetSocketAddress) p.address()).getPort();
-@@ -703,13 +702,12 @@
- }
- while (iProxy.hasNext()) {
- p = iProxy.next();
-- if (p == null || p == Proxy.NO_PROXY) {
-+ if (p == null || p.type() != Proxy.Type.SOCKS) {
- return;
- }
-- if (p.type() != Proxy.Type.SOCKS)
-- throw new SocketException("Unknown proxy type : " + p.type());
-+
- if (!(p.address() instanceof InetSocketAddress))
-- throw new SocketException("Unknow address type for proxy: " + p);
-+ throw new SocketException("Unknown address type for proxy: " + p);
- // Use getHostString() to avoid reverse lookups
- server = ((InetSocketAddress) p.address()).getHostString();
- serverPort = ((InetSocketAddress) p.address()).getPort();
---- ./jdk/src/share/classes/java/net/URL.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/net/URL.java Fri Apr 10 09:21:28 2015 -0700
-@@ -41,17 +41,21 @@
- * directory, or it can be a reference to a more complicated object,
- * such as a query to a database or to a search engine. More
- * information on the types of URLs and their formats can be found at:
-- * <blockquote>
-- * <a href="http://www.socs.uts.edu.au/MosaicDocs-old/url-primer.html">
-- * <i>http://www.socs.uts.edu.au/MosaicDocs-old/url-primer.html</i></a>
-- * </blockquote>
-+ * <a href=
-+ * "http://web.archive.org/web/20051219043731/http://archive.ncsa.uiuc.edu/SDG/Software/Mosaic/Demo/url-primer.html">
-+ * <i>Types of URL</i></a>
- * <p>
-- * In general, a URL can be broken into several parts. The previous
-- * example of a URL indicates that the protocol to use is
-+ * In general, a URL can be broken into several parts. Consider the
-+ * following example:
-+ * <blockquote><pre>
-+ * http://www.example.com/docs/resource1.html
-+ * </pre></blockquote>
-+ * <p>
-+ * The URL above indicates that the protocol to use is
- * <code>http</code> (HyperText Transfer Protocol) and that the
- * information resides on a host machine named
-- * <code>www.socs.uts.edu.au</code>. The information on that host
-- * machine is named <code>/MosaicDocs-old/url-primer.html</code>. The exact
-+ * <code>www.example.com</code>. The information on that host
-+ * machine is named <code>/docs/resource1.html</code>. The exact
- * meaning of this name on the host machine is both protocol
- * dependent and host dependent. The information normally resides in
- * a file, but it could be generated on the fly. This component of
-@@ -64,7 +68,7 @@
- * <code>http</code> is <code>80</code>. An alternative port could be
- * specified as:
- * <blockquote><pre>
-- * http://www.socs.uts.edu.au:80/MosaicDocs-old/url-primer.html
-+ * http://www.example.com:1080/docs/resource1.html
- * </pre></blockquote>
- * <p>
- * The syntax of <code>URL</code> is defined by <a
---- ./jdk/src/share/classes/java/security/KeyPairGenerator.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/security/KeyPairGenerator.java Fri Apr 10 09:21:28 2015 -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,6 +33,7 @@
-
- import sun.security.jca.*;
- import sun.security.jca.GetInstance.Instance;
-+import sun.security.util.Debug;
-
- /**
- * The KeyPairGenerator class is used to generate pairs of
-@@ -127,6 +128,11 @@
-
- public abstract class KeyPairGenerator extends KeyPairGeneratorSpi {
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("keypairgenerator");
-+
- private final String algorithm;
-
- // The provider
-@@ -168,6 +174,12 @@
- kpg = new Delegate(spi, algorithm);
- }
- kpg.provider = instance.provider;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyPairGenerator." + algorithm +
-+ " algorithm from: " + kpg.provider.getName());
-+ }
-+
- return kpg;
- }
-
-@@ -558,6 +570,11 @@
- provider = instance.provider;
- this.serviceIterator = serviceIterator;
- initType = I_NONE;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyPairGenerator." + algorithm +
-+ " algorithm from: " + provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/java/security/KeyStore.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/security/KeyStore.java Fri Apr 10 09:21:28 2015 -0700
-@@ -34,6 +34,8 @@
-
- import javax.security.auth.callback.*;
-
-+import sun.security.util.Debug;
-+
- /**
- * This class represents a storage facility for cryptographic
- * keys and certificates.
-@@ -187,6 +189,11 @@
-
- public class KeyStore {
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("keystore");
-+
- /*
- * Constant to lookup in the Security properties file to determine
- * the default keystore type.
-@@ -578,6 +585,11 @@
- this.keyStoreSpi = keyStoreSpi;
- this.provider = provider;
- this.type = type;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyStore." + type.toUpperCase() + " type from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/java/security/MessageDigest.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/security/MessageDigest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -35,6 +35,8 @@
-
- import java.nio.ByteBuffer;
-
-+import sun.security.util.Debug;
-+
- /**
- * This MessageDigest class provides applications the functionality of a
- * message digest algorithm, such as SHA-1 or SHA-256.
-@@ -103,6 +105,11 @@
-
- public abstract class MessageDigest extends MessageDigestSpi {
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("messagedigest");
-+
- private String algorithm;
-
- // The state of this digest
-@@ -156,18 +163,23 @@
- public static MessageDigest getInstance(String algorithm)
- throws NoSuchAlgorithmException {
- try {
-+ MessageDigest md;
- Object[] objs = Security.getImpl(algorithm, "MessageDigest",
- (String)null);
- if (objs[0] instanceof MessageDigest) {
-- MessageDigest md = (MessageDigest)objs[0];
-- md.provider = (Provider)objs[1];
-- return md;
-+ md = (MessageDigest)objs[0];
- } else {
-- MessageDigest delegate =
-- new Delegate((MessageDigestSpi)objs[0], algorithm);
-- delegate.provider = (Provider)objs[1];
-- return delegate;
-+ md = new Delegate((MessageDigestSpi)objs[0], algorithm);
- }
-+ md.provider = (Provider)objs[1];
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("MessageDigest." + algorithm +
-+ " algorithm from: " + md.provider.getName());
-+ }
-+
-+ return md;
-+
- } catch(NoSuchProviderException e) {
- throw new NoSuchAlgorithmException(algorithm + " not found");
- }
---- ./jdk/src/share/classes/java/security/SecureRandom.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/security/SecureRandom.java Fri Apr 10 09:21:28 2015 -0700
-@@ -31,6 +31,7 @@
-
- import sun.security.jca.*;
- import sun.security.jca.GetInstance.Instance;
-+import sun.security.util.Debug;
-
- /**
- * This class provides a cryptographically strong random number
-@@ -91,6 +92,11 @@
-
- public class SecureRandom extends java.util.Random {
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("securerandom");
-+
- /**
- * The provider.
- *
-@@ -233,6 +239,11 @@
- this.secureRandomSpi = secureRandomSpi;
- this.provider = provider;
- this.algorithm = algorithm;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("SecureRandom." + algorithm +
-+ " algorithm from: " + this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/java/security/Signature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/security/Signature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -121,6 +121,11 @@
- private static final Debug debug =
- Debug.getInstance("jca", "Signature");
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("signature");
-+
- /*
- * The algorithm for this signature object.
- * This value is used to map an OID to the particular algorithm.
-@@ -450,6 +455,11 @@
- throws InvalidKeyException {
- engineInitVerify(publicKey);
- state = VERIFY;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Signature." + algorithm +
-+ " verification algorithm from: " + this.provider.getName());
-+ }
- }
-
- /**
-@@ -494,6 +504,11 @@
- PublicKey publicKey = certificate.getPublicKey();
- engineInitVerify(publicKey);
- state = VERIFY;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Signature." + algorithm +
-+ " verification algorithm from: " + this.provider.getName());
-+ }
- }
-
- /**
-@@ -510,6 +525,11 @@
- throws InvalidKeyException {
- engineInitSign(privateKey);
- state = SIGN;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Signature." + algorithm +
-+ " signing algorithm from: " + this.provider.getName());
-+ }
- }
-
- /**
-@@ -528,6 +548,11 @@
- throws InvalidKeyException {
- engineInitSign(privateKey, random);
- state = SIGN;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Signature." + algorithm +
-+ " signing algorithm from: " + this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/java/util/Currency.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/util/Currency.java Fri Apr 10 09:21:28 2015 -0700
-@@ -34,6 +34,8 @@
- import java.io.Serializable;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentMap;
- import java.util.logging.Level;
- import java.util.regex.Pattern;
- import java.util.regex.Matcher;
-@@ -99,7 +101,7 @@
-
- // class data: instance map
-
-- private static HashMap<String, Currency> instances = new HashMap<String, Currency>(7);
-+ private static ConcurrentMap<String, Currency> instances = new ConcurrentHashMap<>(7);
- private static HashSet<Currency> available;
-
-
-@@ -286,48 +288,47 @@
-
- private static Currency getInstance(String currencyCode, int defaultFractionDigits,
- int numericCode) {
-- synchronized (instances) {
-- // Try to look up the currency code in the instances table.
-- // This does the null pointer check as a side effect.
-- // Also, if there already is an entry, the currencyCode must be valid.
-- Currency instance = instances.get(currencyCode);
-- if (instance != null) {
-- return instance;
-+ // Try to look up the currency code in the instances table.
-+ // This does the null pointer check as a side effect.
-+ // Also, if there already is an entry, the currencyCode must be valid.
-+ Currency instance = instances.get(currencyCode);
-+ if (instance != null) {
-+ return instance;
-+ }
-+
-+ if (defaultFractionDigits == Integer.MIN_VALUE) {
-+ // Currency code not internally generated, need to verify first
-+ // A currency code must have 3 characters and exist in the main table
-+ // or in the list of other currencies.
-+ if (currencyCode.length() != 3) {
-+ throw new IllegalArgumentException();
- }
--
-- if (defaultFractionDigits == Integer.MIN_VALUE) {
-- // Currency code not internally generated, need to verify first
-- // A currency code must have 3 characters and exist in the main table
-- // or in the list of other currencies.
-- if (currencyCode.length() != 3) {
-+ char char1 = currencyCode.charAt(0);
-+ char char2 = currencyCode.charAt(1);
-+ int tableEntry = getMainTableEntry(char1, char2);
-+ if ((tableEntry & COUNTRY_TYPE_MASK) == SIMPLE_CASE_COUNTRY_MASK
-+ && tableEntry != INVALID_COUNTRY_ENTRY
-+ && currencyCode.charAt(2) - 'A' == (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK)) {
-+ defaultFractionDigits = (tableEntry & SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK) >> SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT;
-+ numericCode = (tableEntry & NUMERIC_CODE_MASK) >> NUMERIC_CODE_SHIFT;
-+ } else {
-+ // Check for '-' separately so we don't get false hits in the table.
-+ if (currencyCode.charAt(2) == '-') {
- throw new IllegalArgumentException();
- }
-- char char1 = currencyCode.charAt(0);
-- char char2 = currencyCode.charAt(1);
-- int tableEntry = getMainTableEntry(char1, char2);
-- if ((tableEntry & COUNTRY_TYPE_MASK) == SIMPLE_CASE_COUNTRY_MASK
-- && tableEntry != INVALID_COUNTRY_ENTRY
-- && currencyCode.charAt(2) - 'A' == (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK)) {
-- defaultFractionDigits = (tableEntry & SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK) >> SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT;
-- numericCode = (tableEntry & NUMERIC_CODE_MASK) >> NUMERIC_CODE_SHIFT;
-- } else {
-- // Check for '-' separately so we don't get false hits in the table.
-- if (currencyCode.charAt(2) == '-') {
-- throw new IllegalArgumentException();
-- }
-- int index = otherCurrencies.indexOf(currencyCode);
-- if (index == -1) {
-- throw new IllegalArgumentException();
-- }
-- defaultFractionDigits = otherCurrenciesDFD[index / 4];
-- numericCode = otherCurrenciesNumericCode[index / 4];
-+ int index = otherCurrencies.indexOf(currencyCode);
-+ if (index == -1) {
-+ throw new IllegalArgumentException();
- }
-+ defaultFractionDigits = otherCurrenciesDFD[index / 4];
-+ numericCode = otherCurrenciesNumericCode[index / 4];
- }
-+ }
-
-- instance = new Currency(currencyCode, defaultFractionDigits, numericCode);
-- instances.put(currencyCode, instance);
-- return instance;
-- }
-+ Currency currencyVal =
-+ new Currency(currencyCode, defaultFractionDigits, numericCode);
-+ instance = instances.putIfAbsent(currencyCode, currencyVal);
-+ return (instance != null ? instance : currencyVal);
- }
-
- /**
---- ./jdk/src/share/classes/java/util/logging/LogManager.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/java/util/logging/LogManager.java Fri Apr 10 09:21:28 2015 -0700
-@@ -383,11 +383,11 @@
- JavaAWTAccess javaAwtAccess = SharedSecrets.getJavaAWTAccess();
- if (sm != null && javaAwtAccess != null) {
- // for each applet, it has its own LoggerContext isolated from others
-- synchronized (javaAwtAccess) {
-- // 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) {
-+ final Object ecx = javaAwtAccess.getAppletContext();
-+ if (ecx != null) {
-+ synchronized (javaAwtAccess) {
-+ // find the AppContext of the applet code
-+ // will be null if we are in the main app context.
- if (contextsMap == null) {
- contextsMap = new WeakHashMap<>();
- }
---- ./jdk/src/share/classes/javax/crypto/Cipher.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/crypto/Cipher.java Fri Apr 10 09:21:28 2015 -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
-@@ -156,6 +156,11 @@
- private static final Debug debug =
- Debug.getInstance("jca", "Cipher");
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("cipher");
-+
- /**
- * Constant used to initialize cipher to encryption mode.
- */
-@@ -1100,6 +1105,21 @@
- }
- }
-
-+ private static String getOpmodeString(int opmode) {
-+ switch (opmode) {
-+ case ENCRYPT_MODE:
-+ return "encryption";
-+ case DECRYPT_MODE:
-+ return "decryption";
-+ case WRAP_MODE:
-+ return "key wrapping";
-+ case UNWRAP_MODE:
-+ return "key unwrapping";
-+ default:
-+ return "";
-+ }
-+ }
-+
- /**
- * Initializes this cipher with a key.
- *
-@@ -1219,6 +1239,12 @@
-
- initialized = true;
- this.opmode = opmode;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Cipher." + transformation + " " +
-+ getOpmodeString(opmode) + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
-@@ -1350,6 +1376,12 @@
-
- initialized = true;
- this.opmode = opmode;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Cipher." + transformation + " " +
-+ getOpmodeString(opmode) + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
-@@ -1481,6 +1513,12 @@
-
- initialized = true;
- this.opmode = opmode;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Cipher." + transformation + " " +
-+ getOpmodeString(opmode) + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
-@@ -1659,6 +1697,12 @@
-
- initialized = true;
- this.opmode = opmode;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Cipher." + transformation + " " +
-+ getOpmodeString(opmode) + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/javax/crypto/KeyAgreement.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/crypto/KeyAgreement.java Fri Apr 10 09:21:28 2015 -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
-@@ -78,6 +78,11 @@
- private static final Debug debug =
- Debug.getInstance("jca", "KeyAgreement");
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("keyagreement");
-+
- // The provider
- private Provider provider;
-
-@@ -467,6 +472,11 @@
- throw new InvalidKeyException(e);
- }
- }
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyAgreement." + algorithm + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
-@@ -523,6 +533,11 @@
- } else {
- chooseProvider(I_PARAMS, key, params, random);
- }
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyAgreement." + algorithm + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/javax/crypto/KeyGenerator.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/crypto/KeyGenerator.java Fri Apr 10 09:21:28 2015 -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,6 +33,7 @@
-
- import sun.security.jca.*;
- import sun.security.jca.GetInstance.Instance;
-+import sun.security.util.Debug;
-
- /**
- * This class provides the functionality of a secret (symmetric) key generator.
-@@ -109,6 +110,11 @@
-
- public class KeyGenerator {
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("keygenerator");
-+
- // see java.security.KeyPairGenerator for failover notes
-
- private final static int I_NONE = 1;
-@@ -146,6 +152,11 @@
- this.spi = keyGenSpi;
- this.provider = provider;
- this.algorithm = algorithm;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyGenerator." + algorithm + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- private KeyGenerator(String algorithm) throws NoSuchAlgorithmException {
-@@ -158,6 +169,11 @@
- throw new NoSuchAlgorithmException
- (algorithm + " KeyGenerator not available");
- }
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("KeyGenerator." + algorithm + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/javax/crypto/Mac.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/crypto/Mac.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2011, 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
-@@ -77,6 +77,11 @@
- private static final Debug debug =
- Debug.getInstance("jca", "Mac");
-
-+ private static final Debug pdebug =
-+ Debug.getInstance("provider", "Provider");
-+ private static final boolean skipDebug =
-+ Debug.isOn("engine=") && !Debug.isOn("mac");
-+
- // The provider
- private Provider provider;
-
-@@ -413,6 +418,11 @@
- throw new InvalidKeyException("init() failed", e);
- }
- initialized = true;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Mac." + algorithm + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
-@@ -435,6 +445,11 @@
- chooseProvider(key, params);
- }
- initialized = true;
-+
-+ if (!skipDebug && pdebug != null) {
-+ pdebug.println("Mac." + algorithm + " algorithm from: " +
-+ this.provider.getName());
-+ }
- }
-
- /**
---- ./jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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
-@@ -33,7 +33,8 @@
- import javax.swing.text.View;
- import sun.swing.SwingUtilities2;
- import sun.awt.AppContext;
--
-+import java.util.Enumeration;
-+import java.util.HashSet;
-
- /**
- * RadioButtonUI implementation for BasicRadioButtonUI
-@@ -44,15 +45,27 @@
- {
- private static final Object BASIC_RADIO_BUTTON_UI_KEY = new Object();
-
-+ /**
-+ * The icon.
-+ */
- protected Icon icon;
-
- private boolean defaults_initialized = false;
-
- private final static String propertyPrefix = "RadioButton" + ".";
-
-+ private KeyListener keyListener = null;
-+
- // ********************************
- // Create PLAF
- // ********************************
-+
-+ /**
-+ * Returns an instance of {@code BasicRadioButtonUI}.
-+ *
-+ * @param b a component
-+ * @return an instance of {@code BasicRadioButtonUI}
-+ */
- public static ComponentUI createUI(JComponent b) {
- AppContext appContext = AppContext.getAppContext();
- BasicRadioButtonUI radioButtonUI =
-@@ -64,6 +77,7 @@
- return radioButtonUI;
- }
-
-+ @Override
- protected String getPropertyPrefix() {
- return propertyPrefix;
- }
-@@ -71,7 +85,8 @@
- // ********************************
- // Install PLAF
- // ********************************
-- protected void installDefaults(AbstractButton b){
-+ @Override
-+ protected void installDefaults(AbstractButton b) {
- super.installDefaults(b);
- if(!defaults_initialized) {
- icon = UIManager.getIcon(getPropertyPrefix() + "icon");
-@@ -82,15 +97,80 @@
- // ********************************
- // Uninstall PLAF
- // ********************************
-- protected void uninstallDefaults(AbstractButton b){
-+ @Override
-+ protected void uninstallDefaults(AbstractButton b) {
- super.uninstallDefaults(b);
- defaults_initialized = false;
- }
-
-+ /**
-+ * Returns the default icon.
-+ *
-+ * @return the default icon
-+ */
- public Icon getDefaultIcon() {
- return icon;
- }
-
-+ // ********************************
-+ // Install Listeners
-+ // ********************************
-+ @Override
-+ protected void installListeners(AbstractButton button) {
-+ super.installListeners(button);
-+
-+ // Only for JRadioButton
-+ if (!(button instanceof JRadioButton))
-+ return;
-+
-+ keyListener = createKeyListener();
-+ button.addKeyListener(keyListener);
-+
-+ // Need to get traversal key event
-+ button.setFocusTraversalKeysEnabled(false);
-+
-+ // Map actions to the arrow keys
-+ button.getActionMap().put("Previous", new SelectPreviousBtn());
-+ button.getActionMap().put("Next", new SelectNextBtn());
-+
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-+ put(KeyStroke.getKeyStroke("UP"), "Previous");
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-+ put(KeyStroke.getKeyStroke("DOWN"), "Next");
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-+ put(KeyStroke.getKeyStroke("LEFT"), "Previous");
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-+ put(KeyStroke.getKeyStroke("RIGHT"), "Next");
-+ }
-+
-+ // ********************************
-+ // UnInstall Listeners
-+ // ********************************
-+ @Override
-+ protected void uninstallListeners(AbstractButton button) {
-+ super.uninstallListeners(button);
-+
-+ // Only for JRadioButton
-+ if (!(button instanceof JRadioButton))
-+ return;
-+
-+ // Unmap actions from the arrow keys
-+ button.getActionMap().remove("Previous");
-+ button.getActionMap().remove("Next");
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-+ .remove(KeyStroke.getKeyStroke("UP"));
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-+ .remove(KeyStroke.getKeyStroke("DOWN"));
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-+ .remove(KeyStroke.getKeyStroke("LEFT"));
-+ button.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-+ .remove(KeyStroke.getKeyStroke("RIGHT"));
-+
-+ if (keyListener != null) {
-+ button.removeKeyListener(keyListener);
-+ keyListener = null;
-+ }
-+ }
-
- /* These Dimensions/Rectangles are allocated once for all
- * RadioButtonUI.paint() calls. Re-using rectangles
-@@ -106,6 +186,7 @@
- /**
- * paint the radio button
- */
-+ @Override
- public synchronized void paint(Graphics g, JComponent c) {
- AbstractButton b = (AbstractButton) c;
- ButtonModel model = b.getModel();
-@@ -195,7 +276,14 @@
- }
- }
-
-- protected void paintFocus(Graphics g, Rectangle textRect, Dimension size){
-+ /**
-+ * Paints focused radio button.
-+ *
-+ * @param g an instance of {@code Graphics}
-+ * @param textRect bounds
-+ * @param size the size of radio button
-+ */
-+ protected void paintFocus(Graphics g, Rectangle textRect, Dimension size) {
- }
-
-
-@@ -213,6 +301,7 @@
- /**
- * The preferred size of the radio button
- */
-+ @Override
- public Dimension getPreferredSize(JComponent c) {
- if(c.getComponentCount() > 0) {
- return null;
-@@ -258,4 +347,262 @@
- height += prefInsets.top + prefInsets.bottom;
- return new Dimension(width, height);
- }
-+
-+ /////////////////////////// Private functions ////////////////////////
-+ /**
-+ * Creates the key listener to handle tab navigation in JRadioButton Group.
-+ */
-+ private KeyListener createKeyListener() {
-+ if (keyListener == null) {
-+ keyListener = new KeyHandler();
-+ }
-+ return keyListener;
-+ }
-+
-+
-+ private boolean isValidRadioButtonObj(Object obj) {
-+ return ((obj instanceof JRadioButton) &&
-+ ((JRadioButton) obj).isVisible() &&
-+ ((JRadioButton) obj).isEnabled());
-+ }
-+
-+ /**
-+ * Select radio button based on "Previous" or "Next" operation
-+ *
-+ * @param event, the event object.
-+ * @param next, indicate if it's next one
-+ */
-+ private void selectRadioButton(ActionEvent event, boolean next) {
-+ // Get the source of the event.
-+ Object eventSrc = event.getSource();
-+
-+ // Check whether the source is JRadioButton, it so, whether it is visible
-+ if (!isValidRadioButtonObj(eventSrc))
-+ return;
-+
-+ ButtonGroupInfo btnGroupInfo = new ButtonGroupInfo((JRadioButton)eventSrc);
-+ btnGroupInfo.selectNewButton(next);
-+ }
-+
-+ /////////////////////////// Inner Classes ////////////////////////
-+ @SuppressWarnings("serial")
-+ private class SelectPreviousBtn extends AbstractAction {
-+ public SelectPreviousBtn() {
-+ super("Previous");
-+ }
-+
-+ public void actionPerformed(ActionEvent e) {
-+ BasicRadioButtonUI.this.selectRadioButton(e, false);
-+ }
-+ }
-+
-+ @SuppressWarnings("serial")
-+ private class SelectNextBtn extends AbstractAction{
-+ public SelectNextBtn() {
-+ super("Next");
-+ }
-+
-+ public void actionPerformed(ActionEvent e) {
-+ BasicRadioButtonUI.this.selectRadioButton(e, true);
-+ }
-+ }
-+
-+ /**
-+ * ButtonGroupInfo, used to get related info in button group
-+ * for given radio button
-+ */
-+ private class ButtonGroupInfo {
-+
-+ JRadioButton activeBtn = null;
-+
-+ JRadioButton firstBtn = null;
-+ JRadioButton lastBtn = null;
-+
-+ JRadioButton previousBtn = null;
-+ JRadioButton nextBtn = null;
-+
-+ HashSet<JRadioButton> btnsInGroup = null;
-+
-+ boolean srcFound = false;
-+ public ButtonGroupInfo(JRadioButton btn) {
-+ activeBtn = btn;
-+ btnsInGroup = new HashSet<JRadioButton>();
-+ }
-+
-+ // Check if given object is in the button group
-+ boolean containsInGroup(Object obj){
-+ return btnsInGroup.contains(obj);
-+ }
-+
-+ // Check if the next object to gain focus belongs
-+ // to the button group or not
-+ Component getFocusTransferBaseComponent(boolean next){
-+ Component focusBaseComp = activeBtn;
-+ Window container = SwingUtilities.getWindowAncestor(activeBtn);
-+ if (container != null) {
-+ FocusTraversalPolicy policy = container.getFocusTraversalPolicy();
-+ Component comp = next ? policy.getComponentAfter(container, activeBtn)
-+ : policy.getComponentBefore(container, activeBtn);
-+
-+ // If next component in the button group, use last/first button as base focus
-+ // otherwise, use the activeBtn as the base focus
-+ if (containsInGroup(comp)) {
-+ focusBaseComp = next ? lastBtn : firstBtn;
-+ }
-+ }
-+
-+ return focusBaseComp;
-+ }
-+
-+ boolean getButtonGroupInfo() {
-+ if (activeBtn == null)
-+ return false;
-+
-+ btnsInGroup.clear();
-+
-+ // Get the button model from the source.
-+ ButtonModel model = activeBtn.getModel();
-+ if (!(model instanceof DefaultButtonModel))
-+ return false;
-+
-+ // If the button model is DefaultButtonModel, and use it, otherwise return.
-+ DefaultButtonModel bm = (DefaultButtonModel) model;
-+
-+ // get the ButtonGroup of the button from the button model
-+ ButtonGroup group = bm.getGroup();
-+ if (group == null)
-+ return false;
-+
-+ // Get all the buttons in the group
-+ Enumeration<AbstractButton> e = group.getElements();
-+ if (e == null)
-+ return false;
-+
-+ while (e.hasMoreElements()) {
-+ AbstractButton curElement = e.nextElement();
-+ if (!isValidRadioButtonObj(curElement))
-+ continue;
-+
-+ btnsInGroup.add((JRadioButton) curElement);
-+
-+ // If firstBtn is not set yet, curElement is that first button
-+ if (null == firstBtn)
-+ firstBtn = (JRadioButton) curElement;
-+
-+ if (activeBtn == curElement)
-+ srcFound = true;
-+ else if (!srcFound) {
-+ // The source has not been yet found and the current element
-+ // is the last previousBtn
-+ previousBtn = (JRadioButton) curElement;
-+ } else if (nextBtn == null) {
-+ // The source has been found and the current element
-+ // is the next valid button of the list
-+ nextBtn = (JRadioButton) curElement;
-+ }
-+
-+ // Set new last "valid" JRadioButton of the list
-+ lastBtn = (JRadioButton) curElement;
-+ }
-+
-+ return true;
-+ }
-+
-+ /**
-+ * Find the new radio button that focus needs to be
-+ * moved to in the group, select the button
-+ *
-+ * @param next, indicate if it's arrow up/left or down/right
-+ */
-+ void selectNewButton(boolean next) {
-+ if (!getButtonGroupInfo())
-+ return;
-+
-+ if (srcFound) {
-+ JRadioButton newSelectedBtn = null;
-+ if (next) {
-+ // Select Next button. Cycle to the first button if the source
-+ // button is the last of the group.
-+ newSelectedBtn = (null == nextBtn) ? firstBtn : nextBtn;
-+ } else {
-+ // Select previous button. Cycle to the last button if the source
-+ // button is the first button of the group.
-+ newSelectedBtn = (null == previousBtn) ? lastBtn : previousBtn;
-+ }
-+ if (newSelectedBtn != null &&
-+ (newSelectedBtn != activeBtn)) {
-+ newSelectedBtn.requestFocusInWindow();
-+ newSelectedBtn.setSelected(true);
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Find the button group the passed in JRadioButton belongs to, and
-+ * move focus to next component of the last button in the group
-+ * or previous component of first button
-+ *
-+ * @param next, indicate if jump to next component or previous
-+ */
-+ void jumpToNextComponent(boolean next) {
-+ if (!getButtonGroupInfo()){
-+ // In case the button does not belong to any group, it needs
-+ // to be treated as a component
-+ if (activeBtn != null){
-+ lastBtn = activeBtn;
-+ firstBtn = activeBtn;
-+ }
-+ else
-+ return;
-+ }
-+
-+ // Update the component we will use as base to transfer
-+ // focus from
-+ JComponent compTransferFocusFrom = activeBtn;
-+
-+ // If next component in the parent window is not in
-+ // the button group, current active button will be
-+ // base, otherwise, the base will be first or last
-+ // button in the button group
-+ Component focusBase = getFocusTransferBaseComponent(next);
-+ if (focusBase != null){
-+ if (next) {
-+ KeyboardFocusManager.
-+ getCurrentKeyboardFocusManager().focusNextComponent(focusBase);
-+ } else {
-+ KeyboardFocusManager.
-+ getCurrentKeyboardFocusManager().focusPreviousComponent(focusBase);
-+ }
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Radiobutton KeyListener
-+ */
-+ private class KeyHandler implements KeyListener {
-+
-+ // This listener checks if the key event is a KeyEvent.VK_TAB
-+ // or shift + KeyEvent.VK_TAB event on a radio button, consume the event
-+ // if so and move the focus to next/previous component
-+ public void keyPressed(KeyEvent e) {
-+ if (e.getKeyCode() == KeyEvent.VK_TAB) {
-+ // Get the source of the event.
-+ Object eventSrc = e.getSource();
-+
-+ // Check whether the source is a visible and enabled JRadioButton
-+ if (isValidRadioButtonObj(eventSrc)) {
-+ e.consume();
-+ ButtonGroupInfo btnGroupInfo = new ButtonGroupInfo((JRadioButton)eventSrc);
-+ btnGroupInfo.jumpToNextComponent(!e.isShiftDown());
-+ }
-+ }
-+ }
-+
-+ public void keyReleased(KeyEvent e) {
-+ }
-+
-+ public void keyTyped(KeyEvent e) {
-+ }
-+ }
- }
---- ./jdk/src/share/classes/javax/swing/text/FlowView.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/swing/text/FlowView.java Fri Apr 10 09:21:28 2015 -0700
-@@ -800,14 +800,22 @@
- @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);
-+ // Update the view responsible for the changed element by invocation of
-+ // super method.
-+ super.forwardUpdate(ec, e, a, f);
-+ // Re-calculate the update indexes and update the views followed by
-+ // the changed place. Note: we update the views only when insertion or
-+ // removal takes place.
-+ DocumentEvent.EventType type = e.getType();
-+ if (type == DocumentEvent.EventType.INSERT ||
-+ type == DocumentEvent.EventType.REMOVE) {
-+ firstUpdateIndex = Math.min((lastUpdateIndex + 1), (getViewCount() - 1));
-+ lastUpdateIndex = Math.max((getViewCount() - 1), 0);
-+ for (int i = firstUpdateIndex; i <= lastUpdateIndex; i++) {
-+ View v = getView(i);
-+ if (v != null) {
-+ v.updateAfterChange();
-+ }
- }
- }
- }
---- ./jdk/src/share/classes/javax/swing/text/GlyphView.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/swing/text/GlyphView.java Fri Apr 10 09:21:28 2015 -0700
-@@ -963,6 +963,14 @@
- }
- }
-
-+ /** {@inheritDoc} */
-+ @Override
-+ void updateAfterChange() {
-+ // Drop the break spots. They will be re-calculated during
-+ // layout. It is necessary for proper line break calculation.
-+ breakSpots = null;
-+ }
-+
- /**
- * Class to hold data needed to justify this GlyphView in a PargraphView.Row
- */
---- ./jdk/src/share/classes/javax/swing/text/View.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/swing/text/View.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1195,6 +1195,13 @@
- }
-
- /**
-+ * Updates the view to reflect the changes.
-+ */
-+ void updateAfterChange() {
-+ // Do nothing by default. Should be overridden in subclasses, if any.
-+ }
-+
-+ /**
- * 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
---- ./jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1371,8 +1371,13 @@
- Element parent = elem.getParentElement();
-
- if (parent != null) {
-+ // If we are going to insert the string into the body
-+ // section, it is necessary to set the corrsponding flag.
-+ if (HTML.Tag.BODY.name.equals(parent.getName())) {
-+ insertInBody = true;
-+ }
- int offset = elem.getEndOffset();
-- if (offset > getLength()) {
-+ if (offset > (getLength() + 1)) {
- offset--;
- }
- else if (elem.isLeaf() && getText(offset - 1, 1).
-@@ -1380,6 +1385,10 @@
- offset--;
- }
- insertHTML(parent, offset, htmlText, false);
-+ // Cleanup the flag, if any.
-+ if (insertInBody) {
-+ insertInBody = false;
-+ }
- }
- }
- }
-@@ -1818,6 +1827,11 @@
- private static char[] NEWLINE;
-
- /**
-+ * Indicates that direct insertion to body section takes place.
-+ */
-+ private boolean insertInBody = false;
-+
-+ /**
- * I18N property key.
- *
- * @see AbstractDocument#I18NProperty
-@@ -2566,7 +2580,9 @@
- // Assume content should be added.
- foundInsertTag(false);
- foundInsertTag = true;
-- inParagraph = impliedP = true;
-+ // If content is added directly to the body, it should
-+ // be wrapped by p-implied.
-+ inParagraph = impliedP = !insertInBody;
- }
- if (data.length >= 1) {
- addContent(data, 0, data.length);
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/jdk/net/ExtendedSocketOptions.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,60 @@
-+/*
-+ * 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 jdk.net;
-+
-+import java.net.SocketOption;
-+
-+/**
-+ * Defines extended socket options, beyond those defined in
-+ * {@link java.net.StandardSocketOptions}. These options may be platform
-+ * specific.
-+ *
-+ */
-+public final class ExtendedSocketOptions {
-+
-+ private static class ExtSocketOption<T> implements SocketOption<T> {
-+ private final String name;
-+ private final Class<T> type;
-+ ExtSocketOption(String name, Class<T> type) {
-+ this.name = name;
-+ this.type = type;
-+ }
-+ @Override public String name() { return name; }
-+ @Override public Class<T> type() { return type; }
-+ @Override public String toString() { return name; }
-+ }
-+
-+ private ExtendedSocketOptions() {}
-+
-+ /**
-+ * Service level properties. When a security manager is installed,
-+ * setting or getting this option requires a {@link NetworkPermission}
-+ * {@code ("setOption.SO_FLOW_SLA")} or {@code "getOption.SO_FLOW_SLA"}
-+ * respectively.
-+ */
-+ public static final SocketOption<SocketFlow> SO_FLOW_SLA = new
-+ ExtSocketOption<SocketFlow>("SO_FLOW_SLA", SocketFlow.class);
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/jdk/net/NetworkPermission.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+
-+package jdk.net;
-+
-+import java.security.BasicPermission;
-+
-+/**
-+ * Represents permission to access the extended networking capabilities
-+ * defined in the jdk.net package. These permissions contain a target
-+ * name, but no actions list. Callers either possess the permission or not.
-+ * <p>
-+ * The following targets are defined:
-+ * <p>
-+ * <table border=1 cellpadding=5 summary="permission target name,
-+ * what the target allows,and associated risks">
-+ * <tr>
-+ * <th>Permission Target Name</th>
-+ * <th>What the Permission Allows</th>
-+ * <th>Risks of Allowing this Permission</th>
-+ * </tr>
-+ * <tr>
-+ * <td>setOption.SO_FLOW_SLA</td>
-+ * <td>set the {@link ExtendedSocketOptions#SO_FLOW_SLA SO_FLOW_SLA} option
-+ * on any socket that supports it</td>
-+ * <td>allows caller to set a higher priority or bandwidth allocation
-+ * to sockets it creates, than they might otherwise be allowed.</td>
-+ * </tr>
-+ * <tr>
-+ * <td>getOption.SO_FLOW_SLA</td>
-+ * <td>retrieve the {@link ExtendedSocketOptions#SO_FLOW_SLA SO_FLOW_SLA}
-+ * setting from any socket that supports the option</td>
-+ * <td>allows caller access to SLA information that it might not
-+ * otherwise have</td>
-+ * </tr></table>
-+ *
-+ * @see jdk.net.ExtendedSocketOptions
-+ *
-+ */
-+
-+public final class NetworkPermission extends BasicPermission {
-+
-+ private static final long serialVersionUID = -2012939586906722291L;
-+
-+ /**
-+ * Creates a NetworkPermission with the given target name.
-+ *
-+ * @param name the permission target name
-+ * @throws NullPointerException if {@code name} is {@code null}.
-+ * @throws IllegalArgumentException if {@code name} is empty.
-+ */
-+ public NetworkPermission(String name) {
-+ super(name);
-+ }
-+
-+ /**
-+ * Creates a NetworkPermission with the given target name.
-+ *
-+ * @param name the permission target name
-+ * @param actions should be {@code null}. Is ignored if not.
-+ * @throws NullPointerException if {@code name} is {@code null}.
-+ * @throws IllegalArgumentException if {@code name} is empty.
-+ */
-+ public NetworkPermission(String name, String actions) {
-+ super(name, actions);
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/jdk/net/SocketFlow.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,165 @@
-+/*
-+ * 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 jdk.net;
-+
-+
-+/**
-+ * Represents the service level properties for the platform specific socket
-+ * option {@link ExtendedSocketOptions#SO_FLOW_SLA}.
-+ * <p>
-+ * The priority and bandwidth parameters must be set before
-+ * setting the socket option.
-+ * <p>
-+ * When the {@code SO_FLOW_SLA} option is set then it may not take effect
-+ * immediately. If the value of the socket option is obtained with
-+ * {@code getOption()} then the status may be returned as {@code INPROGRESS}
-+ * until it takes effect. The priority and bandwidth values are only valid when
-+ * the status is returned as OK.
-+ * <p>
-+ * When a security manager is installed, a {@link NetworkPermission}
-+ * is required to set or get this option.
-+ *
-+ */
-+
-+public class SocketFlow {
-+
-+ private static final int UNSET = -1;
-+ public static final int NORMAL_PRIORITY = 1;
-+ public static final int HIGH_PRIORITY = 2;
-+
-+ private int priority = NORMAL_PRIORITY;
-+
-+ private long bandwidth = UNSET;
-+
-+ private Status status = Status.NO_STATUS;
-+
-+ private SocketFlow() {}
-+
-+ /**
-+ * Enumeration of the return values from the SO_FLOW_SLA
-+ * socket option. Both setting and getting the option return
-+ * one of these statuses, which reflect the state of socket's
-+ * flow.
-+ *
-+ */
-+ public enum Status {
-+ /**
-+ * Set or get socket option has not been called yet. Status
-+ * values can only be retrieved after calling set or get.
-+ */
-+ NO_STATUS,
-+ /**
-+ * Flow successfully created.
-+ */
-+ OK,
-+ /**
-+ * Caller has no permission to create flow.
-+ */
-+ NO_PERMISSION,
-+ /**
-+ * Flow can not be created because socket is not connected.
-+ */
-+ NOT_CONNECTED,
-+ /**
-+ * Flow creation not supported for this socket.
-+ */
-+ NOT_SUPPORTED,
-+ /**
-+ * A flow already exists with identical attributes.
-+ */
-+ ALREADY_CREATED,
-+ /**
-+ * A flow is being created.
-+ */
-+ IN_PROGRESS,
-+ /**
-+ * Some other unspecified error.
-+ */
-+ OTHER
-+ }
-+
-+ /**
-+ * Creates a new SocketFlow that can be used to set the SO_FLOW_SLA
-+ * socket option and create a socket flow.
-+ */
-+ public static SocketFlow create() {
-+ return new SocketFlow();
-+ }
-+
-+ /**
-+ * Sets this SocketFlow's priority. Must be either NORMAL_PRIORITY
-+ * HIGH_PRIORITY. If not set, a flow's priority is normal.
-+ *
-+ * @throws IllegalArgumentException if priority is not NORMAL_PRIORITY or
-+ * HIGH_PRIORITY.
-+ */
-+ public SocketFlow priority(int priority) {
-+ if (priority != NORMAL_PRIORITY && priority != HIGH_PRIORITY) {
-+ throw new IllegalArgumentException("invalid priority");
-+ }
-+ this.priority = priority;
-+ return this;
-+ }
-+
-+ /**
-+ * Sets this SocketFlow's bandwidth. Must be greater than or equal to zero.
-+ * A value of zero drops all packets for the socket.
-+ *
-+ * @throws IllegalArgumentException if bandwidth is less than zero.
-+ */
-+ public SocketFlow bandwidth(long bandwidth) {
-+ if (bandwidth < 0) {
-+ throw new IllegalArgumentException("invalid bandwidth");
-+ } else {
-+ this.bandwidth = bandwidth;
-+ }
-+ return this;
-+ }
-+
-+ /**
-+ * Returns this SocketFlow's priority.
-+ */
-+ public int priority() {
-+ return priority;
-+ }
-+
-+ /**
-+ * Returns this SocketFlow's bandwidth.
-+ *
-+ * @return this SocketFlow's bandwidth, or {@code -1} if status is not OK.
-+ */
-+ public long bandwidth() {
-+ return bandwidth;
-+ }
-+
-+ /**
-+ * Returns the Status value of this SocketFlow. NO_STATUS is returned
-+ * if the object was not used in a call to set or get the option.
-+ */
-+ public Status status() {
-+ return status;
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/jdk/net/Sockets.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,406 @@
-+/*
-+ * 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 jdk.net;
-+
-+import java.net.*;
-+import java.io.IOException;
-+import java.io.FileDescriptor;
-+import java.security.PrivilegedAction;
-+import java.security.AccessController;
-+import java.lang.reflect.*;
-+import java.util.Set;
-+import java.util.HashSet;
-+import java.util.HashMap;
-+import java.util.Collections;
-+import sun.net.ExtendedOptionsImpl;
-+
-+/**
-+ * Defines static methods to set and get socket options defined by the
-+ * {@link java.net.SocketOption} interface. All of the standard options defined
-+ * by {@link java.net.Socket}, {@link java.net.ServerSocket}, and
-+ * {@link java.net.DatagramSocket} can be set this way, as well as additional
-+ * or platform specific options supported by each socket type.
-+ * <p>
-+ * The {@link #supportedOptions(Class)} method can be called to determine
-+ * the complete set of options available (per socket type) on the
-+ * current system.
-+ * <p>
-+ * When a security manager is installed, some non-standard socket options
-+ * may require a security permission before being set or get.
-+ * The details are specified in {@link ExtendedSocketOptions}. No permission
-+ * is required for {@link java.net.StandardSocketOption}s.
-+ *
-+ * @see java.nio.channels.NetworkChannel
-+ */
-+public class Sockets {
-+
-+ private final static HashMap<Class<?>,Set<SocketOption<?>>>
-+ options = new HashMap<>();
-+
-+ static {
-+ initOptionSets();
-+ AccessController.doPrivileged(
-+ new java.security.PrivilegedAction<Void>() {
-+ public Void run() {
-+ initMethods();
-+ return null;
-+ }
-+ }
-+ );
-+ }
-+
-+ private static Method siSetOption;
-+ private static Method siGetOption;
-+ private static Method dsiSetOption;
-+ private static Method dsiGetOption;
-+
-+ private static void initMethods() {
-+ try {
-+ Class<?> clazz = Class.forName("java.net.SocketSecrets");
-+
-+ siSetOption = clazz.getDeclaredMethod(
-+ "setOption", Object.class,
-+ SocketOption.class, Object.class
-+ );
-+ siSetOption.setAccessible(true);
-+
-+ siGetOption = clazz.getDeclaredMethod(
-+ "getOption", Object.class, SocketOption.class
-+ );
-+ siGetOption.setAccessible(true);
-+
-+ dsiSetOption = clazz.getDeclaredMethod(
-+ "setOption", DatagramSocket.class,
-+ SocketOption.class, Object.class
-+ );
-+ dsiSetOption.setAccessible(true);
-+
-+ dsiGetOption = clazz.getDeclaredMethod(
-+ "getOption", DatagramSocket.class, SocketOption.class
-+ );
-+ dsiGetOption.setAccessible(true);
-+ } catch (ReflectiveOperationException e) {
-+ throw new Error(e);
-+ }
-+ }
-+
-+ private static <T> void invokeSet(
-+ Method method, Object socket,
-+ SocketOption<T> option, T value) throws IOException
-+ {
-+ try {
-+ method.invoke(null, socket, option, value);
-+ } catch (Exception e) {
-+ if (e instanceof InvocationTargetException) {
-+ Throwable t = ((InvocationTargetException)e).getTargetException();
-+ if (t instanceof IOException) {
-+ throw (IOException)t;
-+ } else if (t instanceof RuntimeException) {
-+ throw (RuntimeException)t;
-+ }
-+ }
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ private static <T> T invokeGet(
-+ Method method, Object socket, SocketOption<T> option) throws IOException
-+ {
-+ try {
-+ return (T)method.invoke(null, socket, option);
-+ } catch (Exception e) {
-+ if (e instanceof InvocationTargetException) {
-+ Throwable t = ((InvocationTargetException)e).getTargetException();
-+ if (t instanceof IOException) {
-+ throw (IOException)t;
-+ } else if (t instanceof RuntimeException) {
-+ throw (RuntimeException)t;
-+ }
-+ }
-+ throw new RuntimeException(e);
-+ }
-+ }
-+
-+ private Sockets() {}
-+
-+ /**
-+ * Sets the value of a socket option on a {@link java.net.Socket}
-+ *
-+ * @param s the socket
-+ * @param name The socket option
-+ * @param value The value of the socket option. May be null for some
-+ * options.
-+ *
-+ * @throws UnsupportedOperationException if the socket does not support
-+ * the option.
-+ *
-+ * @throws IllegalArgumentException if the value is not valid for
-+ * the option.
-+ *
-+ * @throws IOException if an I/O error occurs, or socket is closed.
-+ *
-+ * @throws SecurityException if a security manager is set and the
-+ * caller does not have any required permission.
-+ *
-+ * @throws NullPointerException if name is null
-+ *
-+ * @see java.net.StandardSocketOptions
-+ */
-+ public static <T> void setOption(Socket s, SocketOption<T> name, T value) throws IOException
-+ {
-+ if (!isSupported(Socket.class, name)) {
-+ throw new UnsupportedOperationException(name.name());
-+ }
-+ invokeSet(siSetOption, s, name, value);
-+ }
-+
-+ /**
-+ * Returns the value of a socket option from a {@link java.net.Socket}
-+ *
-+ * @param s the socket
-+ * @param name The socket option
-+ *
-+ * @return The value of the socket option.
-+ *
-+ * @throws UnsupportedOperationException if the socket does not support
-+ * the option.
-+ *
-+ * @throws IOException if an I/O error occurs
-+ *
-+ * @throws SecurityException if a security manager is set and the
-+ * caller does not have any required permission.
-+ *
-+ * @throws NullPointerException if name is null
-+ *
-+ * @see java.net.StandardSocketOptions
-+ */
-+ public static <T> T getOption(Socket s, SocketOption<T> name) throws IOException
-+ {
-+ if (!isSupported(Socket.class, name)) {
-+ throw new UnsupportedOperationException(name.name());
-+ }
-+ return invokeGet(siGetOption, s, name);
-+ }
-+
-+ /**
-+ * Sets the value of a socket option on a {@link java.net.ServerSocket}
-+ *
-+ * @param s the socket
-+ * @param name The socket option
-+ * @param value The value of the socket option.
-+ *
-+ * @throws UnsupportedOperationException if the socket does not support
-+ * the option.
-+ *
-+ * @throws IllegalArgumentException if the value is not valid for
-+ * the option.
-+ *
-+ * @throws IOException if an I/O error occurs
-+ *
-+ * @throws NullPointerException if name is null
-+ *
-+ * @throws SecurityException if a security manager is set and the
-+ * caller does not have any required permission.
-+ *
-+ * @see java.net.StandardSocketOptions
-+ */
-+ public static <T> void setOption(ServerSocket s, SocketOption<T> name, T value) throws IOException
-+ {
-+ if (!isSupported(ServerSocket.class, name)) {
-+ throw new UnsupportedOperationException(name.name());
-+ }
-+ invokeSet(siSetOption, s, name, value);
-+ }
-+
-+ /**
-+ * Returns the value of a socket option from a {@link java.net.ServerSocket}
-+ *
-+ * @param s the socket
-+ * @param name The socket option
-+ *
-+ * @return The value of the socket option.
-+ *
-+ * @throws UnsupportedOperationException if the socket does not support
-+ * the option.
-+ *
-+ * @throws IOException if an I/O error occurs
-+ *
-+ * @throws NullPointerException if name is null
-+ *
-+ * @throws SecurityException if a security manager is set and the
-+ * caller does not have any required permission.
-+ *
-+ * @see java.net.StandardSocketOptions
-+ */
-+ public static <T> T getOption(ServerSocket s, SocketOption<T> name) throws IOException
-+ {
-+ if (!isSupported(ServerSocket.class, name)) {
-+ throw new UnsupportedOperationException(name.name());
-+ }
-+ return invokeGet(siGetOption, s, name);
-+ }
-+
-+ /**
-+ * Sets the value of a socket option on a {@link java.net.DatagramSocket}
-+ * or {@link java.net.MulticastSocket}
-+ *
-+ * @param s the socket
-+ * @param name The socket option
-+ * @param value The value of the socket option.
-+ *
-+ * @throws UnsupportedOperationException if the socket does not support
-+ * the option.
-+ *
-+ * @throws IllegalArgumentException if the value is not valid for
-+ * the option.
-+ *
-+ * @throws IOException if an I/O error occurs
-+ *
-+ * @throws NullPointerException if name is null
-+ *
-+ * @throws SecurityException if a security manager is set and the
-+ * caller does not have any required permission.
-+ *
-+ * @see java.net.StandardSocketOptions
-+ */
-+ public static <T> void setOption(DatagramSocket s, SocketOption<T> name, T value) throws IOException
-+ {
-+ if (!isSupported(s.getClass(), name)) {
-+ throw new UnsupportedOperationException(name.name());
-+ }
-+ invokeSet(dsiSetOption, s, name, value);
-+ }
-+
-+ /**
-+ * Returns the value of a socket option from a
-+ * {@link java.net.DatagramSocket} or {@link java.net.MulticastSocket}
-+ *
-+ * @param s the socket
-+ * @param name The socket option
-+ *
-+ * @return The value of the socket option.
-+ *
-+ * @throws UnsupportedOperationException if the socket does not support
-+ * the option.
-+ *
-+ * @throws IOException if an I/O error occurs
-+ *
-+ * @throws NullPointerException if name is null
-+ *
-+ * @throws SecurityException if a security manager is set and the
-+ * caller does not have any required permission.
-+ *
-+ * @see java.net.StandardSocketOptions
-+ */
-+ public static <T> T getOption(DatagramSocket s, SocketOption<T> name) throws IOException
-+ {
-+ if (!isSupported(s.getClass(), name)) {
-+ throw new UnsupportedOperationException(name.name());
-+ }
-+ return invokeGet(dsiGetOption, s, name);
-+ }
-+
-+ /**
-+ * Returns a set of {@link java.net.SocketOption}s supported by the
-+ * given socket type. This set may include standard options and also
-+ * non standard extended options.
-+ *
-+ * @param socketType the type of java.net socket
-+ *
-+ * @throws IllegalArgumentException if socketType is not a valid
-+ * socket type from the java.net package.
-+ */
-+ public static Set<SocketOption<?>> supportedOptions(Class<?> socketType) {
-+ Set<SocketOption<?>> set = options.get(socketType);
-+ if (set == null) {
-+ throw new IllegalArgumentException("unknown socket type");
-+ }
-+ return set;
-+ }
-+
-+ private static boolean isSupported(Class<?> type, SocketOption<?> option) {
-+ Set<SocketOption<?>> options = supportedOptions(type);
-+ return options.contains(option);
-+ }
-+
-+ private static void initOptionSets() {
-+ boolean flowsupported = ExtendedOptionsImpl.flowSupported();
-+
-+ // Socket
-+
-+ Set<SocketOption<?>> set = new HashSet<>();
-+ set.add(StandardSocketOptions.SO_KEEPALIVE);
-+ set.add(StandardSocketOptions.SO_SNDBUF);
-+ set.add(StandardSocketOptions.SO_RCVBUF);
-+ set.add(StandardSocketOptions.SO_REUSEADDR);
-+ set.add(StandardSocketOptions.SO_LINGER);
-+ set.add(StandardSocketOptions.IP_TOS);
-+ set.add(StandardSocketOptions.TCP_NODELAY);
-+ if (flowsupported) {
-+ set.add(ExtendedSocketOptions.SO_FLOW_SLA);
-+ }
-+ set = Collections.unmodifiableSet(set);
-+ options.put(Socket.class, set);
-+
-+ // ServerSocket
-+
-+ set = new HashSet<>();
-+ set.add(StandardSocketOptions.SO_RCVBUF);
-+ set.add(StandardSocketOptions.SO_REUSEADDR);
-+ set.add(StandardSocketOptions.IP_TOS);
-+ set = Collections.unmodifiableSet(set);
-+ options.put(ServerSocket.class, set);
-+
-+ // DatagramSocket
-+
-+ set = new HashSet<>();
-+ set.add(StandardSocketOptions.SO_SNDBUF);
-+ set.add(StandardSocketOptions.SO_RCVBUF);
-+ set.add(StandardSocketOptions.SO_REUSEADDR);
-+ set.add(StandardSocketOptions.IP_TOS);
-+ if (flowsupported) {
-+ set.add(ExtendedSocketOptions.SO_FLOW_SLA);
-+ }
-+ set = Collections.unmodifiableSet(set);
-+ options.put(DatagramSocket.class, set);
-+
-+ // MulticastSocket
-+
-+ set = new HashSet<>();
-+ set.add(StandardSocketOptions.SO_SNDBUF);
-+ set.add(StandardSocketOptions.SO_RCVBUF);
-+ set.add(StandardSocketOptions.SO_REUSEADDR);
-+ set.add(StandardSocketOptions.IP_TOS);
-+ set.add(StandardSocketOptions.IP_MULTICAST_IF);
-+ set.add(StandardSocketOptions.IP_MULTICAST_TTL);
-+ set.add(StandardSocketOptions.IP_MULTICAST_LOOP);
-+ if (flowsupported) {
-+ set.add(ExtendedSocketOptions.SO_FLOW_SLA);
-+ }
-+ set = Collections.unmodifiableSet(set);
-+ options.put(MulticastSocket.class, set);
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/jdk/net/package-info.java Fri Apr 10 09:21:28 2015 -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. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/**
-+ * Platform specific socket options for the {@code java.net} and {@code java.nio.channels}
-+ * socket classes.
-+ *
-+ */
-+
-+package jdk.net;
---- ./jdk/src/share/classes/sun/awt/AWTAccessor.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/awt/AWTAccessor.java Fri Apr 10 09:21:28 2015 -0700
-@@ -650,6 +650,11 @@
- * Sets extendedKeyCode field for KeyEvent
- */
- void setExtendedKeyCode(KeyEvent ev, long extendedKeyCode);
-+
-+ /**
-+ * Gets original source for KeyEvent
-+ */
-+ Component getOriginalSource(KeyEvent ev);
- }
-
- /**
---- ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1365,6 +1365,15 @@
- // bytes and dump them into a byte array. For text flavors, decode back
- // to a String and recur to reencode according to the requested format.
- } else if (flavor.isRepresentationClassInputStream()) {
-+
-+ // Workaround to JDK-8024061: Exception thrown when drag and drop
-+ // between two components is executed quickly.
-+ // and JDK-8065098: JColorChooser no longer supports drag and drop
-+ // between two JVM instances
-+ if (!(obj instanceof InputStream)) {
-+ return new byte[0];
-+ }
-+
- InputStream is = (InputStream)obj;
- boolean eof = false;
- int avail = is.available();
-@@ -2911,6 +2920,14 @@
- return comp;
- }
-
-+ if (flavor1.isFlavorTextType()) {
-+ return 1;
-+ }
-+
-+ if (flavor2.isFlavorTextType()) {
-+ return -1;
-+ }
-+
- // Next, look for application/x-java-* types. Prefer unknown
- // MIME types because if the user provides his own data flavor,
- // it will likely be the most descriptive one.
---- ./jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -239,13 +239,6 @@
-
- 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 Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/awt/image/BytePackedRaster.java Fri Apr 10 09:21:28 2015 -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/management/jmxremote/ConnectorBootstrap.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java Fri Apr 10 09:21:28 2015 -0700
-@@ -777,7 +777,7 @@
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, mbs);
- connServer.start();
- } catch (IOException e) {
-- if (connServer == null) {
-+ if (connServer == null || connServer.getAddress() == null) {
- throw new AgentConfigurationError(CONNECTOR_SERVER_IO_ERROR,
- e, url.toString());
- } else {
---- ./jdk/src/share/classes/sun/misc/ProxyGenerator.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/misc/ProxyGenerator.java Fri Apr 10 09:21:28 2015 -0700
-@@ -27,11 +27,15 @@
-
- import java.io.ByteArrayOutputStream;
- import java.io.DataOutputStream;
-+import java.io.File;
- import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.OutputStream;
- import java.lang.reflect.Array;
- import java.lang.reflect.Method;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.LinkedList;
-@@ -327,10 +331,16 @@
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
- try {
-- FileOutputStream file =
-- new FileOutputStream(dotToSlash(name) + ".class");
-- file.write(classFile);
-- file.close();
-+ int i = name.lastIndexOf('.');
-+ Path path;
-+ if (i > 0) {
-+ Path dir = Paths.get(name.substring(0, i).replace('.', File.separatorChar));
-+ Files.createDirectories(dir);
-+ path = dir.resolve(name.substring(i+1, name.length()) + ".class");
-+ } else {
-+ path = Paths.get(name + ".class");
-+ }
-+ Files.write(path, classFile);
- return null;
- } catch (IOException e) {
- throw new InternalError(
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/classes/sun/net/ExtendedOptionsImpl.java Fri Apr 10 09:21:28 2015 -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. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.net.*;
-+import jdk.net.*;
-+import java.io.IOException;
-+import java.io.FileDescriptor;
-+import java.security.PrivilegedAction;
-+import java.security.AccessController;
-+import java.lang.reflect.Field;
-+import java.util.Set;
-+import java.util.HashSet;
-+import java.util.HashMap;
-+import java.util.Collections;
-+
-+/**
-+ * Contains the native implementation for extended socket options
-+ * together with some other static utilities
-+ */
-+public class ExtendedOptionsImpl {
-+
-+ static {
-+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
-+ @Override
-+ public Void run() {
-+ System.loadLibrary("net");
-+ return null;
-+ }});
-+ init();
-+ }
-+
-+ private ExtendedOptionsImpl() {}
-+
-+ public static void checkSetOptionPermission(SocketOption<?> option) {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm == null) {
-+ return;
-+ }
-+ String check = "setOption." + option.name();
-+ sm.checkPermission(new NetworkPermission(check));
-+ }
-+
-+ public static void checkGetOptionPermission(SocketOption<?> option) {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm == null) {
-+ return;
-+ }
-+ String check = "getOption." + option.name();
-+ sm.checkPermission(new NetworkPermission(check));
-+ }
-+
-+ public static void checkValueType(Object value, Class<?> type) {
-+ if (!type.isAssignableFrom(value.getClass())) {
-+ String s = "Found: " + value.getClass().toString() + " Expected: "
-+ + type.toString();
-+ throw new IllegalArgumentException(s);
-+ }
-+ }
-+
-+ private static native void init();
-+
-+ /*
-+ * Extension native implementations
-+ *
-+ * SO_FLOW_SLA
-+ */
-+ public static native void setFlowOption(FileDescriptor fd, SocketFlow f);
-+ public static native void getFlowOption(FileDescriptor fd, SocketFlow f);
-+ public static native boolean flowSupported();
-+}
---- ./jdk/src/share/classes/sun/net/httpserver/ServerImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/net/httpserver/ServerImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -330,15 +330,7 @@
- public void run() {
- while (!finished) {
- try {
-- ListIterator<HttpConnection> li =
-- connsToRegister.listIterator();
-- for (HttpConnection c : connsToRegister) {
-- reRegister(c);
-- }
-- connsToRegister.clear();
--
- List<Event> list = null;
-- selector.select(1000);
- synchronized (lolock) {
- if (events.size() > 0) {
- list = events;
-@@ -352,8 +344,14 @@
- }
- }
-
-+ for (HttpConnection c : connsToRegister) {
-+ reRegister(c);
-+ }
-+ connsToRegister.clear();
-+
-+ selector.select(1000);
-+
- /* process the selected list now */
--
- Set<SelectionKey> selected = selector.selectedKeys();
- Iterator<SelectionKey> iter = selected.iterator();
- while (iter.hasNext()) {
---- ./jdk/src/share/classes/sun/net/www/http/HttpClient.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/net/www/http/HttpClient.java Fri Apr 10 09:21:28 2015 -0700
-@@ -643,9 +643,10 @@
- cachedHttpClient = false;
- if (!failedOnce && requests != null) {
- failedOnce = true;
-- if (getRequestMethod().equals("CONNECT") ||
-- (httpuc.getRequestMethod().equals("POST") &&
-- (!retryPostProp || streaming))) {
-+ if (getRequestMethod().equals("CONNECT")
-+ || streaming
-+ || (httpuc.getRequestMethod().equals("POST")
-+ && !retryPostProp)) {
- // do not retry the request
- } else {
- // try once more
-@@ -755,9 +756,10 @@
- } else if (nread != 8) {
- if (!failedOnce && requests != null) {
- failedOnce = true;
-- if (getRequestMethod().equals("CONNECT") ||
-- (httpuc.getRequestMethod().equals("POST") &&
-- (!retryPostProp || streaming))) {
-+ if (getRequestMethod().equals("CONNECT")
-+ || streaming
-+ || (httpuc.getRequestMethod().equals("POST")
-+ && !retryPostProp)) {
- // do not retry the request
- } else {
- closeServer();
---- ./jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1093,7 +1093,7 @@
-
- boolean expectContinue = false;
- String expects = requests.findValue("Expect");
-- if ("100-Continue".equalsIgnoreCase(expects)) {
-+ if ("100-Continue".equalsIgnoreCase(expects) && streaming()) {
- http.setIgnoreContinue(false);
- expectContinue = true;
- }
---- ./jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Fri Apr 10 09:21:28 2015 -0700
-@@ -192,22 +192,6 @@
- return userAgent;
- }
-
-- // should remove once HttpClient.newHttpProxy is putback
-- private static Proxy newHttpProxy(String proxyHost, int proxyPort) {
-- InetSocketAddress saddr = null;
-- final String phost = proxyHost;
-- final int pport = proxyPort < 0 ? httpsPortNumber : proxyPort;
-- try {
-- saddr = java.security.AccessController.doPrivileged(new
-- java.security.PrivilegedExceptionAction<InetSocketAddress>() {
-- public InetSocketAddress run() {
-- return new InetSocketAddress(phost, pport);
-- }});
-- } catch (java.security.PrivilegedActionException pae) {
-- }
-- return new Proxy(Proxy.Type.HTTP, saddr);
-- }
--
- // CONSTRUCTOR, FACTORY
-
-
-@@ -251,7 +235,7 @@
- throws IOException {
- this(sf, url,
- (proxyHost == null? null:
-- HttpsClient.newHttpProxy(proxyHost, proxyPort)),
-+ HttpClient.newHttpProxy(proxyHost, proxyPort, "https")),
- connectTimeout);
- }
-
-@@ -261,6 +245,11 @@
- HttpsClient(SSLSocketFactory sf, URL url, Proxy proxy,
- int connectTimeout)
- throws IOException {
-+ PlatformLogger logger = HttpURLConnection.getHttpLogger();
-+ if (logger.isLoggable(PlatformLogger.FINEST)) {
-+ logger.finest("Creating new HttpsClient with url:" + url + " and proxy:" + proxy +
-+ " with connect timeout:" + connectTimeout);
-+ }
- this.proxy = proxy;
- setSSLSocketFactory(sf);
- this.proxyDisabled = true;
-@@ -317,7 +306,7 @@
-
- return HttpsClient.New(sf, url, hv,
- (proxyHost == null? null :
-- HttpsClient.newHttpProxy(proxyHost, proxyPort)),
-+ HttpClient.newHttpProxy(proxyHost, proxyPort, "https")),
- useCache, connectTimeout, httpuc);
- }
-
-@@ -329,6 +318,11 @@
- if (p == null) {
- p = Proxy.NO_PROXY;
- }
-+ PlatformLogger logger = HttpURLConnection.getHttpLogger();
-+ if (logger.isLoggable(PlatformLogger.FINEST)) {
-+ logger.finest("Looking for HttpClient for URL " + url +
-+ " and proxy value of " + p);
-+ }
- HttpsClient ret = null;
- if (useCache) {
- /* see if one's already around */
-@@ -342,14 +336,13 @@
-
- if (ret != null) {
- if ((ret.proxy != null && ret.proxy.equals(p)) ||
-- (ret.proxy == null && p == null)) {
-+ (ret.proxy == null && p == Proxy.NO_PROXY)) {
- synchronized (ret) {
- ret.cachedHttpClient = true;
- assert ret.inCache;
- ret.inCache = false;
- if (httpuc != null && ret.needsTunneling())
- httpuc.setTunnelState(TUNNELING);
-- PlatformLogger logger = HttpURLConnection.getHttpLogger();
- if (logger.isLoggable(PlatformLogger.FINEST)) {
- logger.finest("KeepAlive stream retrieved from the cache, " + ret);
- }
-@@ -360,6 +353,9 @@
- // This should be fine as it is very rare that a connection
- // to the same host will not use the same proxy.
- synchronized(ret) {
-+ if (logger.isLoggable(PlatformLogger.FINEST)) {
-+ logger.finest("Not returning this connection to cache: " + ret);
-+ }
- ret.inCache = false;
- ret.closeServer();
- }
---- ./jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -39,6 +39,7 @@
- import java.util.concurrent.*;
- import java.util.concurrent.locks.*;
- import sun.net.NetHooks;
-+import sun.net.ExtendedOptionsImpl;
-
- /**
- * Base implementation of AsynchronousSocketChannel
-@@ -508,6 +509,9 @@
- set.add(StandardSocketOptions.SO_KEEPALIVE);
- set.add(StandardSocketOptions.SO_REUSEADDR);
- set.add(StandardSocketOptions.TCP_NODELAY);
-+ if (ExtendedOptionsImpl.flowSupported()) {
-+ set.add(jdk.net.ExtendedSocketOptions.SO_FLOW_SLA);
-+ }
- return Collections.unmodifiableSet(set);
- }
- }
---- ./jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -33,6 +33,7 @@
- import java.nio.channels.spi.*;
- import java.util.*;
- import sun.net.ResourceManager;
-+import sun.net.ExtendedOptionsImpl;
-
-
- /**
-@@ -194,15 +195,8 @@
- synchronized (stateLock) {
- ensureOpen();
-
-- if (name == StandardSocketOptions.IP_TOS) {
-- // IPv4 only; no-op for IPv6
-- if (family == StandardProtocolFamily.INET) {
-- Net.setSocketOption(fd, family, name, value);
-- }
-- return this;
-- }
--
-- if (name == StandardSocketOptions.IP_MULTICAST_TTL ||
-+ if (name == StandardSocketOptions.IP_TOS ||
-+ name == StandardSocketOptions.IP_MULTICAST_TTL ||
- name == StandardSocketOptions.IP_MULTICAST_LOOP)
- {
- // options are protocol dependent
-@@ -255,16 +249,8 @@
- synchronized (stateLock) {
- ensureOpen();
-
-- if (name == StandardSocketOptions.IP_TOS) {
-- // IPv4 only; always return 0 on IPv6
-- if (family == StandardProtocolFamily.INET) {
-- return (T) Net.getSocketOption(fd, family, name);
-- } else {
-- return (T) Integer.valueOf(0);
-- }
-- }
--
-- if (name == StandardSocketOptions.IP_MULTICAST_TTL ||
-+ if (name == StandardSocketOptions.IP_TOS ||
-+ name == StandardSocketOptions.IP_MULTICAST_TTL ||
- name == StandardSocketOptions.IP_MULTICAST_LOOP)
- {
- return (T) Net.getSocketOption(fd, family, name);
-@@ -317,6 +303,9 @@
- set.add(StandardSocketOptions.IP_MULTICAST_IF);
- set.add(StandardSocketOptions.IP_MULTICAST_TTL);
- set.add(StandardSocketOptions.IP_MULTICAST_LOOP);
-+ if (ExtendedOptionsImpl.flowSupported()) {
-+ set.add(jdk.net.ExtendedSocketOptions.SO_FLOW_SLA);
-+ }
- return Collections.unmodifiableSet(set);
- }
- }
---- ./jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -397,30 +397,13 @@
- //
- private static volatile boolean fileSupported = true;
-
-- private long transferToDirectly(long position, int icount,
-- WritableByteChannel target)
-+ private long transferToDirectlyInternal(long position, int icount,
-+ WritableByteChannel target,
-+ FileDescriptor targetFD)
- throws IOException
- {
-- if (!transferSupported)
-- return IOStatus.UNSUPPORTED;
--
-- FileDescriptor targetFD = null;
-- if (target instanceof FileChannelImpl) {
-- if (!fileSupported)
-- return IOStatus.UNSUPPORTED_CASE;
-- targetFD = ((FileChannelImpl)target).fd;
-- } else if (target instanceof SelChImpl) {
-- // Direct transfer to pipe causes EINVAL on some configurations
-- if ((target instanceof SinkChannelImpl) && !pipeSupported)
-- return IOStatus.UNSUPPORTED_CASE;
-- targetFD = ((SelChImpl)target).getFD();
-- }
-- if (targetFD == null)
-- return IOStatus.UNSUPPORTED;
-- int thisFDVal = IOUtil.fdVal(fd);
-- int targetFDVal = IOUtil.fdVal(targetFD);
-- if (thisFDVal == targetFDVal) // Not supported on some configurations
-- return IOStatus.UNSUPPORTED;
-+ assert !nd.transferToDirectlyNeedsPositionLock() ||
-+ Thread.holdsLock(positionLock);
-
- long n = -1;
- int ti = -1;
-@@ -430,7 +413,7 @@
- if (!isOpen())
- return -1;
- do {
-- n = transferTo0(thisFDVal, position, icount, targetFDVal);
-+ n = transferTo0(fd, position, icount, targetFD);
- } while ((n == IOStatus.INTERRUPTED) && isOpen());
- if (n == IOStatus.UNSUPPORTED_CASE) {
- if (target instanceof SinkChannelImpl)
-@@ -451,6 +434,54 @@
- }
- }
-
-+ private long transferToDirectly(long position, int icount,
-+ WritableByteChannel target)
-+ throws IOException
-+ {
-+ if (!transferSupported)
-+ return IOStatus.UNSUPPORTED;
-+
-+ FileDescriptor targetFD = null;
-+ if (target instanceof FileChannelImpl) {
-+ if (!fileSupported)
-+ return IOStatus.UNSUPPORTED_CASE;
-+ targetFD = ((FileChannelImpl)target).fd;
-+ } else if (target instanceof SelChImpl) {
-+ // Direct transfer to pipe causes EINVAL on some configurations
-+ if ((target instanceof SinkChannelImpl) && !pipeSupported)
-+ return IOStatus.UNSUPPORTED_CASE;
-+
-+ // Platform-specific restrictions. Now there is only one:
-+ // Direct transfer to non-blocking channel could be forbidden
-+ SelectableChannel sc = (SelectableChannel)target;
-+ if (!nd.canTransferToDirectly(sc))
-+ return IOStatus.UNSUPPORTED_CASE;
-+
-+ targetFD = ((SelChImpl)target).getFD();
-+ }
-+
-+ if (targetFD == null)
-+ return IOStatus.UNSUPPORTED;
-+ int thisFDVal = IOUtil.fdVal(fd);
-+ int targetFDVal = IOUtil.fdVal(targetFD);
-+ if (thisFDVal == targetFDVal) // Not supported on some configurations
-+ return IOStatus.UNSUPPORTED;
-+
-+ if (nd.transferToDirectlyNeedsPositionLock()) {
-+ synchronized (positionLock) {
-+ long pos = position();
-+ try {
-+ return transferToDirectlyInternal(position, icount,
-+ target, targetFD);
-+ } finally {
-+ position(pos);
-+ }
-+ }
-+ } else {
-+ return transferToDirectlyInternal(position, icount, target, targetFD);
-+ }
-+ }
-+
- // Maximum size to map when using a mapped buffer
- private static final long MAPPED_TRANSFER_SIZE = 8L*1024L*1024L;
-
-@@ -1157,7 +1188,8 @@
- private static native int unmap0(long address, long length);
-
- // Transfers from src to dst, or returns -2 if kernel can't do that
-- private native long transferTo0(int src, long position, long count, int dst);
-+ private native long transferTo0(FileDescriptor src, long position,
-+ long count, FileDescriptor dst);
-
- // Sets or reports this file's position
- // If offset is -1, the current position is returned
---- ./jdk/src/share/classes/sun/nio/ch/FileDispatcher.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/FileDispatcher.java Fri Apr 10 09:21:28 2015 -0700
-@@ -25,7 +25,9 @@
-
- package sun.nio.ch;
-
--import java.io.*;
-+import java.io.FileDescriptor;
-+import java.io.IOException;
-+import java.nio.channels.SelectableChannel;
-
- abstract class FileDispatcher extends NativeDispatcher {
-
-@@ -53,4 +55,8 @@
- */
- abstract FileDescriptor duplicateForMapping(FileDescriptor fd)
- throws IOException;
-+
-+ abstract boolean canTransferToDirectly(SelectableChannel sc);
-+
-+ abstract boolean transferToDirectlyNeedsPositionLock();
- }
---- ./jdk/src/share/classes/sun/nio/ch/Net.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/Net.java Fri Apr 10 09:21:28 2015 -0700
-@@ -27,11 +27,13 @@
-
- import java.io.*;
- import java.net.*;
-+import jdk.net.*;
- import java.nio.channels.*;
- import java.util.*;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.security.PrivilegedExceptionAction;
-+import sun.net.ExtendedOptionsImpl;
-
-
- class Net { // package-private
-@@ -54,30 +56,8 @@
- // set to true if exclusive binding is on for Windows
- private static final boolean exclusiveBind;
-
-- static {
-- int availLevel = isExclusiveBindAvailable();
-- if (availLevel >= 0) {
-- String exclBindProp =
-- java.security.AccessController.doPrivileged(
-- new PrivilegedAction<String>() {
-- @Override
-- public String run() {
-- return System.getProperty(
-- "sun.net.useExclusiveBind");
-- }
-- });
-- if (exclBindProp != null) {
-- exclusiveBind = exclBindProp.length() == 0 ?
-- true : Boolean.parseBoolean(exclBindProp);
-- } else if (availLevel == 1) {
-- exclusiveBind = true;
-- } else {
-- exclusiveBind = false;
-- }
-- } else {
-- exclusiveBind = false;
-- }
-- }
-+ // set to true if the fast tcp loopback should be enabled on Windows
-+ private static final boolean fastLoopback;
-
- // -- Miscellaneous utilities --
-
-@@ -327,6 +307,16 @@
-
- // only simple values supported by this method
- Class<?> type = name.type();
-+
-+ if (type == SocketFlow.class) {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkPermission(new NetworkPermission("setOption.SO_FLOW_SLA"));
-+ }
-+ ExtendedOptionsImpl.setFlowOption(fd, (SocketFlow)value);
-+ return;
-+ }
-+
- if (type != Integer.class && type != Boolean.class)
- throw new AssertionError("Should not reach here");
-
-@@ -370,7 +360,8 @@
- }
-
- boolean mayNeedConversion = (family == UNSPEC);
-- setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg);
-+ boolean isIPv6 = (family == StandardProtocolFamily.INET6);
-+ setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg, isIPv6);
- }
-
- static Object getSocketOption(FileDescriptor fd, ProtocolFamily family,
-@@ -379,6 +370,16 @@
- {
- Class<?> type = name.type();
-
-+ if (type == SocketFlow.class) {
-+ SecurityManager sm = System.getSecurityManager();
-+ if (sm != null) {
-+ sm.checkPermission(new NetworkPermission("getOption.SO_FLOW_SLA"));
-+ }
-+ SocketFlow flow = SocketFlow.create();
-+ ExtendedOptionsImpl.getFlowOption(fd, flow);
-+ return flow;
-+ }
-+
- // only simple values supported by this method
- if (type != Integer.class && type != Boolean.class)
- throw new AssertionError("Should not reach here");
-@@ -398,6 +399,23 @@
- }
- }
-
-+ public static boolean isFastTcpLoopbackRequested() {
-+ String loopbackProp = java.security.AccessController.doPrivileged(
-+ new PrivilegedAction<String>() {
-+ @Override
-+ public String run() {
-+ return System.getProperty("jdk.net.useFastTcpLoopback");
-+ }
-+ });
-+ boolean enable;
-+ if ("".equals(loopbackProp)) {
-+ enable = true;
-+ } else {
-+ enable = Boolean.parseBoolean(loopbackProp);
-+ }
-+ return enable;
-+ }
-+
- // -- Socket operations --
-
- private static native boolean isIPv6Available0();
-@@ -420,15 +438,16 @@
- throws IOException {
- boolean preferIPv6 = isIPv6Available() &&
- (family != StandardProtocolFamily.INET);
-- return IOUtil.newFD(socket0(preferIPv6, stream, false));
-+ return IOUtil.newFD(socket0(preferIPv6, stream, false, fastLoopback));
- }
-
- static FileDescriptor serverSocket(boolean stream) {
-- return IOUtil.newFD(socket0(isIPv6Available(), stream, true));
-+ return IOUtil.newFD(socket0(isIPv6Available(), stream, true, fastLoopback));
- }
-
- // Due to oddities SO_REUSEADDR on windows reuse is ignored
-- private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse);
-+ private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse,
-+ boolean fastLoopback);
-
- static void bind(FileDescriptor fd, InetAddress addr, int port)
- throws IOException
-@@ -507,7 +526,7 @@
- throws IOException;
-
- private static native void setIntOption0(FileDescriptor fd, boolean mayNeedConversion,
-- int level, int opt, int arg)
-+ int level, int opt, int arg, boolean isIPv6)
- throws IOException;
-
- // -- Multicast support --
-@@ -613,4 +632,30 @@
- initIDs();
- }
-
-+ static {
-+ int availLevel = isExclusiveBindAvailable();
-+ if (availLevel >= 0) {
-+ String exclBindProp =
-+ java.security.AccessController.doPrivileged(
-+ new PrivilegedAction<String>() {
-+ @Override
-+ public String run() {
-+ return System.getProperty(
-+ "sun.net.useExclusiveBind");
-+ }
-+ });
-+ if (exclBindProp != null) {
-+ exclusiveBind = exclBindProp.length() == 0 ?
-+ true : Boolean.parseBoolean(exclBindProp);
-+ } else if (availLevel == 1) {
-+ exclusiveBind = true;
-+ } else {
-+ exclusiveBind = false;
-+ }
-+ } else {
-+ exclusiveBind = false;
-+ }
-+
-+ fastLoopback = isFastTcpLoopbackRequested();
-+ }
- }
---- ./jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -133,6 +133,14 @@
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
-+
-+ if (name == StandardSocketOptions.IP_TOS) {
-+ ProtocolFamily family = Net.isIPv6Available() ?
-+ StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
-+ Net.setSocketOption(fd, family, name, value);
-+ return this;
-+ }
-+
- if (name == StandardSocketOptions.SO_REUSEADDR &&
- Net.useExclusiveBind())
- {
-@@ -177,6 +185,7 @@
- HashSet<SocketOption<?>> set = new HashSet<SocketOption<?>>(2);
- set.add(StandardSocketOptions.SO_RCVBUF);
- set.add(StandardSocketOptions.SO_REUSEADDR);
-+ set.add(StandardSocketOptions.IP_TOS);
- return Collections.unmodifiableSet(set);
- }
- }
---- ./jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -33,6 +33,7 @@
- import java.nio.channels.spi.*;
- import java.util.*;
- import sun.net.NetHooks;
-+import sun.net.ExtendedOptionsImpl;
- import sun.misc.IoTrace;
-
- /**
-@@ -172,14 +173,14 @@
- if (!isOpen())
- throw new ClosedChannelException();
-
-- // special handling for IP_TOS: no-op when IPv6
- if (name == StandardSocketOptions.IP_TOS) {
-- if (!Net.isIPv6Available())
-- Net.setSocketOption(fd, StandardProtocolFamily.INET, name, value);
-+ ProtocolFamily family = Net.isIPv6Available() ?
-+ StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
-+ Net.setSocketOption(fd, family, name, value);
- return this;
-- } else if (name == StandardSocketOptions.SO_REUSEADDR &&
-- Net.useExclusiveBind())
-- {
-+ }
-+
-+ if (name == StandardSocketOptions.SO_REUSEADDR && Net.useExclusiveBind()) {
- // SO_REUSEADDR emulated when using exclusive bind
- isReuseAddress = (Boolean)value;
- return this;
-@@ -214,8 +215,9 @@
-
- // special handling for IP_TOS: always return 0 when IPv6
- if (name == StandardSocketOptions.IP_TOS) {
-- return (Net.isIPv6Available()) ? (T) Integer.valueOf(0) :
-- (T) Net.getSocketOption(fd, StandardProtocolFamily.INET, name);
-+ ProtocolFamily family = Net.isIPv6Available() ?
-+ StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
-+ return (T) Net.getSocketOption(fd, family, name);
- }
-
- // no options that require special handling
-@@ -237,6 +239,9 @@
- // additional options required by socket adaptor
- set.add(StandardSocketOptions.IP_TOS);
- set.add(ExtendedSocketOption.SO_OOBINLINE);
-+ if (ExtendedOptionsImpl.flowSupported()) {
-+ set.add(jdk.net.ExtendedSocketOptions.SO_FLOW_SLA);
-+ }
- return Collections.unmodifiableSet(set);
- }
- }
---- ./jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java Fri Apr 10 09:21:28 2015 -0700
-@@ -109,7 +109,6 @@
- public static class Decoder extends CharsetDecoder
- implements DelegatableDecoder
- {
--
- final char[][] b2c;
- final char[] b2cSB;
- final int b2Min;
-@@ -120,7 +119,12 @@
- return CoderResult.UNDERFLOW;
- }
-
-- protected CoderResult crMalformedOrUnmappable(int b) {
-+ protected CoderResult crMalformedOrUnmappable(int b1, int b2) {
-+ if (b2c[b1] == B2C_UNMAPPABLE || // isNotLeadingByte(b1)
-+ b2c[b2] != B2C_UNMAPPABLE || // isLeadingByte(b2)
-+ decodeSingle(b2) != UNMAPPABLE_DECODING) { // isSingle(b2)
-+ return CoderResult.malformedForLength(1);
-+ }
- return CoderResult.unmappableForLength(2);
- }
-
-@@ -159,7 +163,7 @@
- int b2 = sa[sp + 1] & 0xff;
- if (b2 < b2Min || b2 > b2Max ||
- (c = b2c[b1][b2 - b2Min]) == UNMAPPABLE_DECODING) {
-- return crMalformedOrUnmappable(b1);
-+ return crMalformedOrUnmappable(b1, b2);
- }
- inSize++;
- }
-@@ -188,7 +192,7 @@
- int b2 = src.get() & 0xff;
- if (b2 < b2Min || b2 > b2Max ||
- (c = b2c[b1][b2 - b2Min]) == UNMAPPABLE_DECODING)
-- return crMalformedOrUnmappable(b1);
-+ return crMalformedOrUnmappable(b1, b2);
- inSize++;
- }
- dst.put(c);
-@@ -400,8 +404,8 @@
- return CoderResult.UNDERFLOW;
- }
-
-- protected CoderResult crMalformedOrUnmappable(int b) {
-- if (b == SS2 || b == SS3 )
-+ protected CoderResult crMalformedOrUnmappable(int b1, int b2) {
-+ if (b1 == SS2 || b1 == SS3 )
- return CoderResult.malformedForLength(1);
- return CoderResult.unmappableForLength(2);
- }
---- ./jdk/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java Fri Apr 10 09:21:28 2015 -0700
-@@ -33,6 +33,8 @@
- import java.nio.charset.Charset;
- import java.nio.charset.CharsetDecoder;
- import java.nio.charset.CoderResult;
-+import java.security.AccessController;
-+import sun.security.action.GetPropertyAction;
-
- abstract class DoubleByteDecoder
- extends CharsetDecoder
-@@ -52,6 +54,7 @@
- protected static final char REPLACE_CHAR = '\uFFFD';
- protected char highSurrogate;
- protected char lowSurrogate;
-+ private static volatile String bugLevel = null;
-
- protected DoubleByteDecoder(Charset cs, short[] index1, String[] index2,
- int start, int end ) {
-@@ -89,8 +92,16 @@
- b2 = sa[sp + 1] & 0xff;
- c = decodeDouble(b1, b2);
- inputSize = 2;
-- if (c == REPLACE_CHAR)
-- return CoderResult.unmappableForLength(inputSize);
-+ if (c == REPLACE_CHAR) {
-+ if (!isLegalLeadingByte(b1) ||
-+ isLegalLeadingByte(b2) ||
-+ decodeSingle((byte)b2) != REPLACE_CHAR ||
-+ atBugLevel("1.5")) {
-+ return CoderResult.unmappableForLength(1);
-+ } else {
-+ return CoderResult.unmappableForLength(inputSize);
-+ }
-+ }
- outputSize = (highSurrogate > 0) ? 2: 1;
- }
-
-@@ -132,10 +143,16 @@
- inputSize = 2;
-
- c = decodeDouble(b1, b2);
--
-- if (c == REPLACE_CHAR)
-- return CoderResult.unmappableForLength(2);
--
-+ if (c == REPLACE_CHAR) {
-+ if (!isLegalLeadingByte(b1) ||
-+ isLegalLeadingByte(b2) ||
-+ decodeSingle((byte)b2) != REPLACE_CHAR ||
-+ atBugLevel("1.5")) {
-+ return CoderResult.unmappableForLength(1);
-+ } else {
-+ return CoderResult.unmappableForLength(inputSize);
-+ }
-+ }
- outputSize = (highSurrogate > 0) ? 2: 1;
- }
- if (dst.remaining() < outputSize)
-@@ -179,4 +196,24 @@
- int n = (index1[byte1] & 0xf) * (end - start + 1) + (byte2 - start);
- return index2[index1[byte1] >> 4].charAt(n);
- }
-+
-+ /*
-+ * Should be changed by sublasses needing to enforce this
-+ */
-+ protected boolean isLegalLeadingByte(int b) {
-+ return b <= index1.length &&
-+ ((index1[b] >> 4) != 0 || (index1[b] & 0xff) != 0);
- }
-+
-+ static boolean atBugLevel(String bl) {
-+ if (bugLevel == null) {
-+ if (!sun.misc.VM.isBooted())
-+ return false;
-+ java.security.PrivilegedAction pa =
-+ new GetPropertyAction("sun.nio.cs.bugLevel");
-+ String value = (String)AccessController.doPrivileged(pa);
-+ bugLevel = (value != null) ? value : "";
-+ }
-+ return bugLevel.equals(bl);
-+ }
-+}
---- ./jdk/src/share/classes/sun/nio/cs/ext/SJIS.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/SJIS.java Fri Apr 10 09:21:28 2015 -0700
-@@ -108,6 +108,10 @@
- public CoderResult implFlush(CharBuffer out) {
- return super.implFlush(out);
- }
-+ protected boolean isLegalLeadingByte(int b) {
-+ return ((b >= 0x81 && b <= 0x9F) ||
-+ (b >= 0xE0 && b <= 0XEF));
-+ }
- }
-
- static class Encoder extends JIS_X_0208_Encoder {
---- ./jdk/src/share/classes/sun/print/RasterPrinterJob.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/print/RasterPrinterJob.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1335,34 +1335,7 @@
- setAttributes(attributes);
- // throw exception for invalid destination
- if (destinationAttr != null) {
-- // destinationAttr is null for Destination(new URI(""))
-- // because isAttributeValueSupported returns false in setAttributes
--
-- // Destination(new URI(" ")) throws URISyntaxException
-- File f = new File(destinationAttr);
-- try {
-- // check if this is a new file and if filename chars are valid
-- if (f.createNewFile()) {
-- f.delete();
-- }
-- } catch (IOException ioe) {
-- throw new PrinterException("Cannot write to file:"+
-- destinationAttr);
-- } catch (SecurityException se) {
-- //There is already file read/write access so at this point
-- // only delete access is denied. Just ignore it because in
-- // most cases the file created in createNewFile gets overwritten
-- // anyway.
-- }
--
-- File pFile = f.getParentFile();
-- if ((f.exists() &&
-- (!f.isFile() || !f.canWrite())) ||
-- ((pFile != null) &&
-- (!pFile.exists() || (pFile.exists() && !pFile.canWrite())))) {
-- throw new PrinterException("Cannot write to file:"+
-- destinationAttr);
-- }
-+ validateDestination(destinationAttr);
- }
- } else {
- spoolToService(psvc, attributes);
-@@ -1485,6 +1458,40 @@
- }
- }
-
-+ protected void validateDestination(String dest) throws PrinterException {
-+ if (dest == null) {
-+ return;
-+ }
-+ // dest is null for Destination(new URI(""))
-+ // because isAttributeValueSupported returns false in setAttributes
-+
-+ // Destination(new URI(" ")) throws URISyntaxException
-+ File f = new File(dest);
-+ try {
-+ // check if this is a new file and if filename chars are valid
-+ if (f.createNewFile()) {
-+ f.delete();
-+ }
-+ } catch (IOException ioe) {
-+ throw new PrinterException("Cannot write to file:"+
-+ dest);
-+ } catch (SecurityException se) {
-+ //There is already file read/write access so at this point
-+ // only delete access is denied. Just ignore it because in
-+ // most cases the file created in createNewFile gets overwritten
-+ // anyway.
-+ }
-+
-+ File pFile = f.getParentFile();
-+ if ((f.exists() &&
-+ (!f.isFile() || !f.canWrite())) ||
-+ ((pFile != null) &&
-+ (!pFile.exists() || (pFile.exists() && !pFile.canWrite())))) {
-+ throw new PrinterException("Cannot write to file:"+
-+ dest);
-+ }
-+ }
-+
- /**
- * updates a Paper object to reflect the current printer's selected
- * paper size and imageable area for that paper size.
---- ./jdk/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -32,7 +32,7 @@
- bootstrapping. */
-
- class BootstrapConstructorAccessorImpl extends ConstructorAccessorImpl {
-- private Constructor constructor;
-+ private final Constructor constructor;
-
- BootstrapConstructorAccessorImpl(Constructor c) {
- this.constructor = c;
---- ./jdk/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -33,7 +33,7 @@
-
- class InstantiationExceptionConstructorAccessorImpl
- extends ConstructorAccessorImpl {
-- private String message;
-+ private final String message;
-
- InstantiationExceptionConstructorAccessorImpl(String message) {
- this.message = message;
---- ./jdk/src/share/classes/sun/reflect/Label.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/Label.java Fri Apr 10 09:21:28 2015 -0700
-@@ -48,10 +48,10 @@
- }
- // This won't work for more than one assembler anyway, so this is
- // unnecessary
-- ClassFileAssembler asm;
-- short instrBCI;
-- short patchBCI;
-- int stackDepth;
-+ final ClassFileAssembler asm;
-+ final short instrBCI;
-+ final short patchBCI;
-+ final int stackDepth;
- }
- private List/*<PatchInfo>*/ patches = new ArrayList();
-
---- ./jdk/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -31,7 +31,7 @@
- afterward, switches to bytecode-based implementation */
-
- class NativeConstructorAccessorImpl extends ConstructorAccessorImpl {
-- private Constructor c;
-+ private final Constructor c;
- private DelegatingConstructorAccessorImpl parent;
- private int numInvocations;
-
---- ./jdk/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -31,7 +31,7 @@
- switches to bytecode-based implementation */
-
- class NativeMethodAccessorImpl extends MethodAccessorImpl {
-- private Method method;
-+ private final Method method;
- private DelegatingMethodAccessorImpl parent;
- private int numInvocations;
-
---- ./jdk/src/share/classes/sun/reflect/Reflection.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/Reflection.java Fri Apr 10 09:21:28 2015 -0700
-@@ -47,6 +47,7 @@
- map.put(Reflection.class,
- new String[] {"fieldFilterMap", "methodFilterMap"});
- map.put(System.class, new String[] {"security"});
-+ map.put(Class.class, new String[] {"classLoader"});
- fieldFilterMap = map;
-
- methodFilterMap = new HashMap<Class,String[]>();
---- ./jdk/src/share/classes/sun/reflect/ReflectionFactory.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/ReflectionFactory.java Fri Apr 10 09:21:28 2015 -0700
-@@ -48,9 +48,9 @@
- public class ReflectionFactory {
-
- private static boolean initted = false;
-- private static Permission reflectionFactoryAccessPerm
-+ private static final Permission reflectionFactoryAccessPerm
- = new RuntimePermission("reflectionFactoryAccess");
-- private static ReflectionFactory soleInstance = new ReflectionFactory();
-+ private static final ReflectionFactory soleInstance = new ReflectionFactory();
- // Provides access to package-private mechanisms in java.lang.reflect
- private static volatile LangReflectAccess langReflectAccess;
-
---- ./jdk/src/share/classes/sun/reflect/SignatureIterator.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/SignatureIterator.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,7 +28,7 @@
- /** Assists in iterating down a method's signature */
-
- public class SignatureIterator {
-- private String sig;
-+ private final String sig;
- private int idx;
-
- public SignatureIterator(String sig) {
---- ./jdk/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java Fri Apr 10 09:21:28 2015 -0700
-@@ -45,8 +45,8 @@
- * core reflection (java.lang.reflect).
- */
- public class CoreReflectionFactory implements GenericsFactory {
-- private GenericDeclaration decl;
-- private Scope scope;
-+ private final GenericDeclaration decl;
-+ private final Scope scope;
-
- private CoreReflectionFactory(GenericDeclaration d, Scope s) {
- decl = d;
---- ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -34,7 +34,7 @@
- */
- public class GenericArrayTypeImpl
- implements GenericArrayType {
-- private Type genericComponentType;
-+ private final Type genericComponentType;
-
- // private constructor enforces use of static factory
- private GenericArrayTypeImpl(Type ct) {
---- ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java Fri Apr 10 09:21:28 2015 -0700
-@@ -40,7 +40,7 @@
- *
- */
- public abstract class LazyReflectiveObjectGenerator {
-- private GenericsFactory factory; // cached factory
-+ private final GenericsFactory factory; // cached factory
-
- protected LazyReflectiveObjectGenerator(GenericsFactory f) {
- factory = f;
---- ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -38,9 +38,9 @@
- /** Implementing class for ParameterizedType interface. */
-
- public class ParameterizedTypeImpl implements ParameterizedType {
-- private Type[] actualTypeArguments;
-- private Class<?> rawType;
-- private Type ownerType;
-+ private final Type[] actualTypeArguments;
-+ private final Class<?> rawType;
-+ private final Type ownerType;
-
- private ParameterizedTypeImpl(Class<?> rawType,
- Type[] actualTypeArguments,
---- ./jdk/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java Fri Apr 10 09:21:28 2015 -0700
-@@ -40,9 +40,9 @@
-
- // A factory used to produce reflective objects. Provided when the
- //repository is created. Will vary across implementations.
-- private GenericsFactory factory;
-+ private final GenericsFactory factory;
-
-- private T tree; // the AST for the generic type info
-+ private final T tree; // the AST for the generic type info
-
- //accessors
- private GenericsFactory getFactory() { return factory;}
---- ./jdk/src/share/classes/sun/reflect/generics/repository/ClassRepository.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/repository/ClassRepository.java Fri Apr 10 09:21:28 2015 -0700
-@@ -40,8 +40,11 @@
- */
- public class ClassRepository extends GenericDeclRepository<ClassSignature> {
-
-- private Type superclass; // caches the generic superclass info
-- private Type[] superInterfaces; // caches the generic superinterface info
-+ /** The generic superclass info. Lazily initialized. */
-+ private volatile Type superclass;
-+
-+ /** The generic superinterface info. Lazily initialized. */
-+ private volatile Type[] superInterfaces;
-
- // private, to enforce use of static factory
- private ClassRepository(String rawSig, GenericsFactory f) {
-@@ -77,31 +80,34 @@
- * with which the repository was created.
- */
-
-- public Type getSuperclass(){
-+ public Type getSuperclass() {
-+ Type superclass = this.superclass;
- if (superclass == null) { // lazily initialize superclass
- Reifier r = getReifier(); // obtain visitor
- // Extract superclass subtree from AST and reify
- getTree().getSuperclass().accept(r);
- // extract result from visitor and cache it
- superclass = r.getResult();
-- }
-+ this.superclass = superclass;
-+ }
- return superclass; // return cached result
- }
-
-- public Type[] getSuperInterfaces(){
-+ public Type[] getSuperInterfaces() {
-+ Type[] superInterfaces = this.superInterfaces;
- if (superInterfaces == null) { // lazily initialize super interfaces
- // first, extract super interface subtree(s) from AST
- TypeTree[] ts = getTree().getSuperInterfaces();
- // create array to store reified subtree(s)
-- Type[] sis = new Type[ts.length];
-+ superInterfaces = new Type[ts.length];
- // reify all subtrees
- for (int i = 0; i < ts.length; i++) {
- Reifier r = getReifier(); // obtain visitor
- ts[i].accept(r);// reify subtree
- // extract result from visitor and store it
-- sis[i] = r.getResult();
-+ superInterfaces[i] = r.getResult();
- }
-- superInterfaces = sis; // cache overall result
-+ this.superInterfaces = superInterfaces;
- }
- return superInterfaces.clone(); // return cached result
- }
---- ./jdk/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java Fri Apr 10 09:21:28 2015 -0700
-@@ -42,7 +42,8 @@
- public abstract class GenericDeclRepository<S extends Signature>
- extends AbstractRepository<S> {
-
-- private TypeVariable[] typeParams; // caches the formal type parameters
-+ /** The formal type parameters. Lazily initialized. */
-+ private volatile TypeVariable[] typeParams;
-
- protected GenericDeclRepository(String rawSig, GenericsFactory f) {
- super(rawSig, f);
-@@ -55,8 +56,7 @@
- * If the corresponding field is non-null, it is returned.
- * If not, it is created lazily. This is done by selecting the appropriate
- * part of the tree and transforming it into a reflective object
-- * using a visitor.
-- * a visitor, which is created by feeding it the factory
-+ * using a visitor, which is created by feeding it the factory
- * with which the repository was created.
- */
-
-@@ -64,20 +64,21 @@
- * Return the formal type parameters of this generic declaration.
- * @return the formal type parameters of this generic declaration
- */
-- public TypeVariable/*<?>*/[] getTypeParameters(){
-+ public TypeVariable/*<?>*/[] getTypeParameters() {
-+ TypeVariable[] typeParams = this.typeParams;
- if (typeParams == null) { // lazily initialize type parameters
- // first, extract type parameter subtree(s) from AST
- FormalTypeParameter[] ftps = getTree().getFormalTypeParameters();
- // create array to store reified subtree(s)
-- TypeVariable[] tps = new TypeVariable[ftps.length];
-+ typeParams = new TypeVariable[ftps.length];
- // reify all subtrees
- for (int i = 0; i < ftps.length; i++) {
- Reifier r = getReifier(); // obtain visitor
- ftps[i].accept(r); // reify subtree
- // extract result from visitor and store it
-- tps[i] = (TypeVariable<?>) r.getResult();
-+ typeParams[i] = (TypeVariable) r.getResult();
- }
-- typeParams = tps; // cache overall result
-+ this.typeParams = typeParams; // cache overall result
- }
- return typeParams.clone(); // return cached result
- }
---- ./jdk/src/share/classes/sun/reflect/generics/scope/AbstractScope.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/scope/AbstractScope.java Fri Apr 10 09:21:28 2015 -0700
-@@ -41,8 +41,10 @@
- public abstract class AbstractScope<D extends GenericDeclaration>
- implements Scope {
-
-- private D recvr; // the declaration whose scope this instance represents
-- private Scope enclosingScope; // the enclosing scope of this scope
-+ private final D recvr; // the declaration whose scope this instance represents
-+
-+ /** The enclosing scope of this scope. Lazily initialized. */
-+ private volatile Scope enclosingScope;
-
- /**
- * Constructor. Takes a reflective object whose scope the newly
-@@ -71,7 +73,11 @@
- * @return the enclosing scope
- */
- protected Scope getEnclosingScope(){
-- if (enclosingScope == null) {enclosingScope = computeEnclosingScope();}
-+ Scope enclosingScope = this.enclosingScope;
-+ if (enclosingScope == null) {
-+ enclosingScope = computeEnclosingScope();
-+ this.enclosingScope = enclosingScope;
-+ }
- return enclosingScope;
- }
-
---- ./jdk/src/share/classes/sun/reflect/generics/scope/DummyScope.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/scope/DummyScope.java Fri Apr 10 09:21:28 2015 -0700
-@@ -38,7 +38,7 @@
- public class DummyScope implements Scope {
- // Caches the unique instance of this class; instances contain no data
- // so we can use the singleton pattern
-- private static DummyScope singleton = new DummyScope();
-+ private static final DummyScope singleton = new DummyScope();
-
- // constructor is private to enforce use of factory method
- private DummyScope(){}
---- ./jdk/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,7 +28,7 @@
- import sun.reflect.generics.visitor.TypeTreeVisitor;
-
- public class ArrayTypeSignature implements FieldTypeSignature {
-- private TypeSignature componentType;
-+ private final TypeSignature componentType;
-
- private ArrayTypeSignature(TypeSignature ct) {componentType = ct;}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type boolean. */
- public class BooleanSignature implements BaseType {
-- private static BooleanSignature singleton = new BooleanSignature();
-+ private static final BooleanSignature singleton = new BooleanSignature();
-
- private BooleanSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/BottomSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/BottomSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,7 +28,7 @@
- import sun.reflect.generics.visitor.TypeTreeVisitor;
-
- public class BottomSignature implements FieldTypeSignature {
-- private static BottomSignature singleton = new BottomSignature();
-+ private static final BottomSignature singleton = new BottomSignature();
-
- private BottomSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/ByteSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/ByteSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type byte. */
- public class ByteSignature implements BaseType {
-- private static ByteSignature singleton = new ByteSignature();
-+ private static final ByteSignature singleton = new ByteSignature();
-
- private ByteSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/CharSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/CharSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type char. */
- public class CharSignature implements BaseType {
-- private static CharSignature singleton = new CharSignature();
-+ private static final CharSignature singleton = new CharSignature();
-
- private CharSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/ClassSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/ClassSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,9 +28,9 @@
- import sun.reflect.generics.visitor.Visitor;
-
- public class ClassSignature implements Signature {
-- private FormalTypeParameter[] formalTypeParams;
-- private ClassTypeSignature superclass;
-- private ClassTypeSignature[] superInterfaces;
-+ private final FormalTypeParameter[] formalTypeParams;
-+ private final ClassTypeSignature superclass;
-+ private final ClassTypeSignature[] superInterfaces;
-
- private ClassSignature(FormalTypeParameter[] ftps,
- ClassTypeSignature sc,
---- ./jdk/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -33,7 +33,7 @@
- * AST representing class types.
- */
- public class ClassTypeSignature implements FieldTypeSignature {
-- private List<SimpleClassTypeSignature> path;
-+ private final List<SimpleClassTypeSignature> path;
-
-
- private ClassTypeSignature(List<SimpleClassTypeSignature> p) {
---- ./jdk/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type double. */
- public class DoubleSignature implements BaseType {
-- private static DoubleSignature singleton = new DoubleSignature();
-+ private static final DoubleSignature singleton = new DoubleSignature();
-
- private DoubleSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/FloatSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/FloatSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type float. */
- public class FloatSignature implements BaseType {
-- private static FloatSignature singleton = new FloatSignature();
-+ private static final FloatSignature singleton = new FloatSignature();
-
- private FloatSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
-
- /** AST that represents a formal type parameter. */
- public class FormalTypeParameter implements TypeTree {
-- private String name;
-- private FieldTypeSignature[] bounds;
-+ private final String name;
-+ private final FieldTypeSignature[] bounds;
-
- private FormalTypeParameter(String n, FieldTypeSignature[] bs) {
- name = n;
---- ./jdk/src/share/classes/sun/reflect/generics/tree/IntSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/IntSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type int. */
- public class IntSignature implements BaseType {
-- private static IntSignature singleton = new IntSignature();
-+ private static final IntSignature singleton = new IntSignature();
-
- private IntSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/LongSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/LongSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type long. */
- public class LongSignature implements BaseType {
-- private static LongSignature singleton = new LongSignature();
-+ private static final LongSignature singleton = new LongSignature();
-
- private LongSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,10 +28,10 @@
- import sun.reflect.generics.visitor.Visitor;
-
- public class MethodTypeSignature implements Signature {
-- private FormalTypeParameter[] formalTypeParams;
-- private TypeSignature[] parameterTypes;
-- private ReturnType returnType;
-- private FieldTypeSignature[] exceptionTypes;
-+ private final FormalTypeParameter[] formalTypeParams;
-+ private final TypeSignature[] parameterTypes;
-+ private final ReturnType returnType;
-+ private final FieldTypeSignature[] exceptionTypes;
-
- private MethodTypeSignature(FormalTypeParameter[] ftps,
- TypeSignature[] pts,
---- ./jdk/src/share/classes/sun/reflect/generics/tree/ShortSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/ShortSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -29,7 +29,7 @@
-
- /** AST that represents the type short. */
- public class ShortSignature implements BaseType {
-- private static ShortSignature singleton = new ShortSignature();
-+ private static final ShortSignature singleton = new ShortSignature();
-
- private ShortSignature(){}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,9 +28,9 @@
- import sun.reflect.generics.visitor.TypeTreeVisitor;
-
- public class SimpleClassTypeSignature implements FieldTypeSignature {
-- private boolean dollar;
-- private String name;
-- private TypeArgument[] typeArgs;
-+ private final boolean dollar;
-+ private final String name;
-+ private final TypeArgument[] typeArgs;
-
- private SimpleClassTypeSignature(String n, boolean dollar, TypeArgument[] tas) {
- name = n;
---- ./jdk/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -28,7 +28,7 @@
- import sun.reflect.generics.visitor.TypeTreeVisitor;
-
- public class TypeVariableSignature implements FieldTypeSignature {
-- private String identifier;
-+ private final String identifier;
-
- private TypeVariableSignature(String id) {identifier = id;}
-
---- ./jdk/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java Fri Apr 10 09:21:28 2015 -0700
-@@ -30,7 +30,7 @@
-
- /** AST that represents the pseudo-type void. */
- public class VoidDescriptor implements ReturnType {
-- private static VoidDescriptor singleton = new VoidDescriptor();
-+ private static final VoidDescriptor singleton = new VoidDescriptor();
-
- private VoidDescriptor(){}
-
---- ./jdk/src/share/classes/sun/reflect/misc/MethodUtil.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/reflect/misc/MethodUtil.java Fri Apr 10 09:21:28 2015 -0700
-@@ -80,9 +80,9 @@
- * Create a trampoline class.
- */
- public final class MethodUtil extends SecureClassLoader {
-- private static String MISC_PKG = "sun.reflect.misc.";
-- private static String TRAMPOLINE = MISC_PKG + "Trampoline";
-- private static Method bounce = getTrampoline();
-+ private static final String MISC_PKG = "sun.reflect.misc.";
-+ private static final String TRAMPOLINE = MISC_PKG + "Trampoline";
-+ private static final Method bounce = getTrampoline();
-
- private MethodUtil() {
- super();
---- ./jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java Fri Apr 10 09:21:28 2015 -0700
-@@ -40,10 +40,7 @@
- import sun.security.krb5.KrbException;
- import java.io.IOException;
- import java.util.ArrayList;
--import java.util.Iterator;
- import java.util.List;
--import java.util.Objects;
--import java.util.Set;
- import sun.misc.SharedSecrets;
- import sun.security.krb5.PrincipalName;
- /**
-@@ -189,16 +186,6 @@
- return subject;
- }
-
-- // A special KerberosKey, used as keys read from a KeyTab object.
-- // Each time new keys are read from KeyTab objects in the private
-- // credentials set, old ones are removed and new ones added.
-- public static class KeysFromKeyTab extends KerberosKey {
-- public KeysFromKeyTab(KerberosKey key) {
-- super(key.getPrincipal(), key.getEncoded(),
-- key.getKeyType(), key.getVersionNumber());
-- }
-- }
--
- /**
- * Credentials of a service, the private secret to authenticate its
- * identity, which can be:
-@@ -237,7 +224,7 @@
- // Compatibility with old behavior: even when there is no
- // KerberosPrincipal, we can find one from KerberosKeys
- List<KerberosKey> keys = SubjectComber.findMany(
-- subj, null, null, KerberosKey.class);
-+ subj, serverPrincipal, null, KerberosKey.class);
- if (!keys.isEmpty()) {
- sc.kp = keys.get(0).getPrincipal();
- serverPrincipal = sc.kp.getName();
-@@ -264,38 +251,17 @@
- }
-
- public KerberosKey[] getKKeys() {
-- if (ktabs.isEmpty()) {
-- return kk.toArray(new KerberosKey[kk.size()]);
-- } else {
- List<KerberosKey> keys = new ArrayList<>();
-+ for (KerberosKey k: kk) {
-+ keys.add(k);
-+ }
- for (KeyTab ktab: ktabs) {
- for (KerberosKey k: ktab.getKeys(kp)) {
- keys.add(k);
- }
- }
-- // Compatibility: also add keys to privCredSet. Remove old
-- // ones first, only remove those from keytab.
-- if (!subj.isReadOnly()) {
-- Set<Object> pcs = subj.getPrivateCredentials();
-- synchronized (pcs) {
-- Iterator<Object> iterator = pcs.iterator();
-- while (iterator.hasNext()) {
-- Object obj = iterator.next();
-- if (obj instanceof KeysFromKeyTab) {
-- KerberosKey key = (KerberosKey)obj;
-- if (Objects.equals(key.getPrincipal(), kp)) {
-- iterator.remove();
-- }
-- }
-- }
-- }
-- for (KerberosKey key: keys) {
-- subj.getPrivateCredentials().add(new KeysFromKeyTab(key));
-- }
-- }
- return keys.toArray(new KerberosKey[keys.size()]);
- }
-- }
-
- public EncryptionKey[] getEKeys() {
- KerberosKey[] kkeys = getKKeys();
---- ./jdk/src/share/classes/sun/security/krb5/Config.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/krb5/Config.java Fri Apr 10 09:21:28 2015 -0700
-@@ -799,8 +799,10 @@
-
- private static String trimmed(String s) {
- s = s.trim();
-- if (s.charAt(0) == '"' && s.charAt(s.length()-1) == '"' ||
-- s.charAt(0) == '\'' && s.charAt(s.length()-1) == '\'') {
-+ if (s.length() >= 2 &&
-+ ((s.charAt(0) == '"' && s.charAt(s.length()-1) == '"') ||
-+ (s.charAt(0) == '\'' && s.charAt(s.length()-1) == '\'')))
-+ {
- s = s.substring(1, s.length()-1).trim();
- }
- return s;
---- ./jdk/src/share/classes/sun/security/krb5/Credentials.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/krb5/Credentials.java Fri Apr 10 09:21:28 2015 -0700
-@@ -423,8 +423,10 @@
- if (DEBUG) {
- System.out.println(">> Acquire default native Credentials");
- }
-- result = acquireDefaultNativeCreds(
-- EType.getDefaults("default_tkt_enctypes"));
-+ int[] etypes = EType.getDefaults("default_tkt_enctypes");
-+ if (etypes != null) {
-+ result = acquireDefaultNativeCreds(etypes);
-+ }
- }
- }
- return result;
---- ./jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Fri Apr 10 09:21:28 2015 -0700
-@@ -555,6 +555,12 @@
-
- int ktype;
- boolean etypeFound = false;
-+
-+ // When no matched kvno is found, returns tke key of the same
-+ // etype with the highest kvno
-+ int kvno_found = 0;
-+ EncryptionKey key_found = null;
-+
- for (int i = 0; i < keys.length; i++) {
- ktype = keys[i].getEType();
- if (EType.isSupported(ktype)) {
-@@ -563,6 +569,10 @@
- etypeFound = true;
- if (versionMatches(kvno, kv)) {
- return keys[i];
-+ } else if (kv > kvno_found) {
-+ // kv is not null
-+ key_found = keys[i];
-+ kvno_found = kv;
- }
- }
- }
-@@ -580,12 +590,17 @@
- etypeFound = true;
- if (versionMatches(kvno, kv)) {
- return new EncryptionKey(etype, keys[i].getBytes());
-+ } else if (kv > kvno_found) {
-+ key_found = new EncryptionKey(etype, keys[i].getBytes());
-+ kvno_found = kv;
- }
- }
- }
- }
- if (etypeFound) {
-- throw new KrbException(Krb5.KRB_AP_ERR_BADKEYVER);
-+ return key_found;
-+ // For compatibility, will not fail here.
-+ //throw new KrbException(Krb5.KRB_AP_ERR_BADKEYVER);
- }
- return null;
- }
---- ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java Fri Apr 10 09:21:28 2015 -0700
-@@ -410,8 +410,7 @@
- String uidStr = null;
- long uid = 0;
-
-- if (osname.startsWith("SunOS") ||
-- (osname.startsWith("Linux"))) {
-+ if (!osname.startsWith("Windows")) {
- try {
- Class<?> c = Class.forName
- ("com.sun.security.auth.module.UnixSystem");
---- ./jdk/src/share/classes/sun/security/pkcs11/Config.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/pkcs11/Config.java Fri Apr 10 09:21:28 2015 -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
-@@ -583,16 +583,24 @@
- }
-
- private String parseLine() throws IOException {
-- String s = parseWord();
-+ // allow quoted string as part of line
-+ String s = null;
- while (true) {
- int token = nextToken();
- if ((token == TT_EOL) || (token == TT_EOF)) {
- break;
- }
-- if (token != TT_WORD) {
-+ if (token != TT_WORD && token != '\"') {
- throw excToken("Unexpected value");
- }
-- s = s + " " + st.sval;
-+ if (s == null) {
-+ s = st.sval;
-+ } else {
-+ s = s + " " + st.sval;
-+ }
-+ }
-+ if (s == null) {
-+ throw excToken("Unexpected empty line");
- }
- return s;
- }
---- ./jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -54,6 +54,7 @@
- import javax.crypto.Mac;
- import javax.security.auth.x500.X500Principal;
-
-+import sun.security.util.Debug;
- import sun.security.util.DerInputStream;
- import sun.security.util.DerOutputStream;
- import sun.security.util.DerValue;
-@@ -122,6 +123,8 @@
-
- public static final int VERSION_3 = 3;
-
-+ private static final Debug debug = Debug.getInstance("pkcs12");
-+
- private static final int keyBag[] = {1, 2, 840, 113549, 1, 12, 10, 1, 2};
- private static final int certBag[] = {1, 2, 840, 113549, 1, 12, 10, 1, 3};
-
-@@ -490,6 +493,11 @@
-
- entry.protectedPrivKey = key.clone();
- if (chain != null) {
-+ // validate cert-chain
-+ if ((chain.length > 1) && (!validateChain(chain))) {
-+ throw new KeyStoreException("Certificate chain is "
-+ + "not valid");
-+ }
- entry.chain = chain.clone();
- }
-
-@@ -901,7 +909,12 @@
- if (!(issuerDN.equals(subjectDN)))
- return false;
- }
-- return true;
-+
-+ // Check for loops in the chain. If there are repeated certs,
-+ // the Set of certs in the chain will contain fewer certs than
-+ // the chain
-+ Set<Certificate> set = new HashSet<>(Arrays.asList(certChain));
-+ return set.size() == certChain.length;
- }
-
-
-@@ -1356,7 +1369,24 @@
- ArrayList<X509Certificate> chain =
- new ArrayList<X509Certificate>();
- X509Certificate cert = findMatchedCertificate(entry);
-+
-+ mainloop:
- while (cert != null) {
-+ // Check for loops in the certificate chain
-+ if (!chain.isEmpty()) {
-+ for (X509Certificate chainCert : chain) {
-+ if (cert.equals(chainCert)) {
-+ if (debug != null) {
-+ debug.println("Loop detected in " +
-+ "certificate chain. Skip adding " +
-+ "repeated cert to chain. Subject: " +
-+ cert.getSubjectX500Principal()
-+ .toString());
-+ }
-+ break mainloop;
-+ }
-+ }
-+ }
- chain.add(cert);
- X500Principal issuerDN = cert.getIssuerX500Principal();
- if (issuerDN.equals(cert.getSubjectX500Principal())) {
---- ./jdk/src/share/classes/sun/security/provider/X509Factory.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/provider/X509Factory.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2011, 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
-@@ -78,6 +78,7 @@
- *
- * @exception CertificateException on parsing errors.
- */
-+ @Override
- public Certificate engineGenerateCertificate(InputStream is)
- throws CertificateException
- {
-@@ -101,8 +102,8 @@
- throw new IOException("Empty input");
- }
- } catch (IOException ioe) {
-- throw (CertificateException)new CertificateException
-- ("Could not parse certificate: " + ioe.toString()).initCause(ioe);
-+ throw new CertificateException("Could not parse certificate: " +
-+ ioe.toString(), ioe);
- }
- }
-
-@@ -138,6 +139,12 @@
- * It is useful for certificates that cannot be created via
- * generateCertificate() and for converting other X509Certificate
- * implementations to an X509CertImpl.
-+ *
-+ * @param c The source X509Certificate
-+ * @return An X509CertImpl object that is either a cached certificate or a
-+ * newly built X509CertImpl from the provided X509Certificate
-+ * @throws CertificateException if failures occur while obtaining the DER
-+ * encoding for certificate data.
- */
- public static synchronized X509CertImpl intern(X509Certificate c)
- throws CertificateException {
-@@ -168,6 +175,11 @@
- /**
- * Return an interned X509CRLImpl for the given certificate.
- * For more information, see intern(X509Certificate).
-+ * @param c The source X509CRL
-+ * @return An X509CRLImpl object that is either a cached CRL or a
-+ * newly built X509CRLImpl from the provided X509CRL
-+ * @throws CRLException if failures occur while obtaining the DER
-+ * encoding for CRL data.
- */
- public static synchronized X509CRLImpl intern(X509CRL c)
- throws CRLException {
-@@ -228,6 +240,7 @@
- * @exception CertificateException if an exception occurs while decoding
- * @since 1.4
- */
-+ @Override
- public CertPath engineGenerateCertPath(InputStream inStream)
- throws CertificateException
- {
-@@ -259,6 +272,7 @@
- * the encoding requested is not supported
- * @since 1.4
- */
-+ @Override
- public CertPath engineGenerateCertPath(InputStream inStream,
- String encoding) throws CertificateException
- {
-@@ -291,6 +305,7 @@
- * @exception CertificateException if an exception occurs
- * @since 1.4
- */
-+ @Override
- public CertPath
- engineGenerateCertPath(List<? extends Certificate> certificates)
- throws CertificateException
-@@ -310,6 +325,7 @@
- * <code>CertPath</code> encodings (as <code>String</code>s)
- * @since 1.4
- */
-+ @Override
- public Iterator<String> engineGetCertPathEncodings() {
- return(X509CertPath.getEncodingsStatic());
- }
-@@ -325,6 +341,7 @@
- *
- * @exception CertificateException on parsing errors.
- */
-+ @Override
- public Collection<? extends java.security.cert.Certificate>
- engineGenerateCertificates(InputStream is)
- throws CertificateException {
-@@ -350,6 +367,7 @@
- *
- * @exception CRLException on parsing errors.
- */
-+ @Override
- public CRL engineGenerateCRL(InputStream is)
- throws CRLException
- {
-@@ -387,6 +405,7 @@
- *
- * @exception CRLException on parsing errors.
- */
-+ @Override
- public Collection<? extends java.security.cert.CRL> engineGenerateCRLs(
- InputStream is) throws CRLException
- {
-@@ -409,10 +428,28 @@
- parseX509orPKCS7Cert(InputStream is)
- throws CertificateException, IOException
- {
-+ int peekByte;
-+ byte[] data;
-+ PushbackInputStream pbis = new PushbackInputStream(is);
- Collection<X509CertImpl> coll = new ArrayList<>();
-- byte[] data = readOneBlock(is);
-+
-+ // Test the InputStream for end-of-stream. If the stream's
-+ // initial state is already at end-of-stream then return
-+ // an empty collection. Otherwise, push the byte back into the
-+ // stream and let readOneBlock look for the first certificate.
-+ peekByte = pbis.read();
-+ if (peekByte == -1) {
-+ return new ArrayList<>(0);
-+ } else {
-+ pbis.unread(peekByte);
-+ data = readOneBlock(pbis);
-+ }
-+
-+ // If we end up with a null value after reading the first block
-+ // then we know the end-of-stream has been reached and no certificate
-+ // data has been found.
- if (data == null) {
-- return new ArrayList<>(0);
-+ throw new CertificateException("No certificate data found");
- }
- try {
- PKCS7 pkcs7 = new PKCS7(data);
-@@ -421,13 +458,13 @@
- if (certs != null) {
- return Arrays.asList(certs);
- } else {
-- // no crls provided
-+ // no certificates provided
- return new ArrayList<>(0);
- }
- } catch (ParsingException e) {
- while (data != null) {
- coll.add(new X509CertImpl(data));
-- data = readOneBlock(is);
-+ data = readOneBlock(pbis);
- }
- }
- return coll;
-@@ -442,10 +479,28 @@
- parseX509orPKCS7CRL(InputStream is)
- throws CRLException, IOException
- {
-+ int peekByte;
-+ byte[] data;
-+ PushbackInputStream pbis = new PushbackInputStream(is);
- Collection<X509CRLImpl> coll = new ArrayList<>();
-- byte[] data = readOneBlock(is);
-+
-+ // Test the InputStream for end-of-stream. If the stream's
-+ // initial state is already at end-of-stream then return
-+ // an empty collection. Otherwise, push the byte back into the
-+ // stream and let readOneBlock look for the first CRL.
-+ peekByte = pbis.read();
-+ if (peekByte == -1) {
-+ return new ArrayList<>(0);
-+ } else {
-+ pbis.unread(peekByte);
-+ data = readOneBlock(pbis);
-+ }
-+
-+ // If we end up with a null value after reading the first block
-+ // then we know the end-of-stream has been reached and no CRL
-+ // data has been found.
- if (data == null) {
-- return new ArrayList<>(0);
-+ throw new CRLException("No CRL data found");
- }
- try {
- PKCS7 pkcs7 = new PKCS7(data);
-@@ -460,7 +515,7 @@
- } catch (ParsingException e) {
- while (data != null) {
- coll.add(new X509CRLImpl(data));
-- data = readOneBlock(is);
-+ data = readOneBlock(pbis);
- }
- }
- return coll;
-@@ -623,7 +678,7 @@
-
- int n = is.read();
- if (n == -1) {
-- throw new IOException("BER/DER length info ansent");
-+ throw new IOException("BER/DER length info absent");
- }
- bout.write(n);
-
---- ./jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -508,10 +508,10 @@
- // set interim reasons mask to the intersection of
- // reasons in the DP and onlySomeReasons in the IDP
- boolean[] idpReasonFlags = reasons.getFlags();
-- for (int i = 0; i < idpReasonFlags.length; i++) {
-- if (idpReasonFlags[i] && pointReasonFlags[i]) {
-- interimReasonsMask[i] = true;
-- }
-+ for (int i = 0; i < interimReasonsMask.length; i++) {
-+ interimReasonsMask[i] =
-+ (i < idpReasonFlags.length && idpReasonFlags[i]) &&
-+ (i < pointReasonFlags.length && pointReasonFlags[i]);
- }
- } else {
- // set interim reasons mask to the value of
-@@ -525,7 +525,6 @@
- interimReasonsMask = pointReasonFlags.clone();
- } else {
- // set interim reasons mask to the special value all-reasons
-- interimReasonsMask = new boolean[9];
- Arrays.fill(interimReasonsMask, true);
- }
- }
-@@ -533,8 +532,10 @@
- // verify that interim reasons mask includes one or more reasons
- // not included in the reasons mask
- boolean oneOrMore = false;
-- for (int i=0; i < interimReasonsMask.length && !oneOrMore; i++) {
-- if (!reasonsMask[i] && interimReasonsMask[i]) {
-+ for (int i = 0; i < interimReasonsMask.length && !oneOrMore; i++) {
-+ if (interimReasonsMask[i] &&
-+ !(i < reasonsMask.length && reasonsMask[i]))
-+ {
- oneOrMore = true;
- }
- }
-@@ -652,11 +653,11 @@
- }
-
- // update reasonsMask
-- for (int i=0; i < interimReasonsMask.length; i++) {
-- if (!reasonsMask[i] && interimReasonsMask[i]) {
-- reasonsMask[i] = true;
-- }
-+ for (int i = 0; i < interimReasonsMask.length; i++) {
-+ reasonsMask[i] = reasonsMask[i] ||
-+ (i < interimReasonsMask.length && interimReasonsMask[i]);
- }
-+
- return true;
- }
-
---- ./jdk/src/share/classes/sun/security/rsa/RSACore.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/rsa/RSACore.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -102,12 +102,24 @@
-
- /**
- * Perform an RSA private key operation. Uses CRT if the key is a
-- * CRT key.
-+ * CRT key with additional verification check after the signature
-+ * is computed.
- */
-+ @Deprecated
- public static byte[] rsa(byte[] msg, RSAPrivateKey key)
- throws BadPaddingException {
-+ return rsa(msg, key, true);
-+ }
-+
-+ /**
-+ * Perform an RSA private key operation. Uses CRT if the key is a
-+ * CRT key. Set 'verify' to true if this function is used for
-+ * generating a signature.
-+ */
-+ public static byte[] rsa(byte[] msg, RSAPrivateKey key, boolean verify)
-+ throws BadPaddingException {
- if (key instanceof RSAPrivateCrtKey) {
-- return crtCrypt(msg, (RSAPrivateCrtKey)key);
-+ return crtCrypt(msg, (RSAPrivateCrtKey)key, verify);
- } else {
- return priCrypt(msg, key.getModulus(), key.getPrivateExponent());
- }
-@@ -148,10 +160,11 @@
- * RSA private key operations with CRT. Algorithm and variable naming
- * are taken from PKCS#1 v2.1, section 5.1.2.
- */
-- private static byte[] crtCrypt(byte[] msg, RSAPrivateCrtKey key)
-- throws BadPaddingException {
-+ private static byte[] crtCrypt(byte[] msg, RSAPrivateCrtKey key,
-+ boolean verify) throws BadPaddingException {
- BigInteger n = key.getModulus();
-- BigInteger c = parseMsg(msg, n);
-+ BigInteger c0 = parseMsg(msg, n);
-+ BigInteger c = c0;
- BigInteger p = key.getPrimeP();
- BigInteger q = key.getPrimeQ();
- BigInteger dP = key.getPrimeExponentP();
-@@ -184,6 +197,9 @@
- if (ENABLE_BLINDING) {
- m = m.multiply(brp.v).mod(n);
- }
-+ if (verify && !c0.equals(m.modPow(e, n))) {
-+ throw new BadPaddingException("RSA private key operation failed");
-+ }
-
- return toByteArray(m, getByteLength(n));
- }
---- ./jdk/src/share/classes/sun/security/rsa/RSASignature.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/rsa/RSASignature.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -174,7 +174,7 @@
- try {
- byte[] encoded = encodeSignature(digestOID, digest);
- byte[] padded = padding.pad(encoded);
-- byte[] encrypted = RSACore.rsa(padded, privateKey);
-+ byte[] encrypted = RSACore.rsa(padded, privateKey, true);
- return encrypted;
- } catch (GeneralSecurityException e) {
- throw new SignatureException("Could not sign data", e);
---- ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/ssl/Handshaker.java Fri Apr 10 09:21:28 2015 -0700
-@@ -637,6 +637,7 @@
- */
- ProtocolList getActiveProtocols() {
- if (activeProtocols == null) {
-+ boolean enabledSSL20Hello = false;
- ArrayList<ProtocolVersion> protocols = new ArrayList<>(4);
- EnumSet<CryptoPrimitive> cryptoPrimitives =
- EnumSet.<CryptoPrimitive>of(CryptoPrimitive.KEY_AGREEMENT);
-@@ -650,6 +651,12 @@
-
- continue;
- }
-+ // Need not to check the SSL20Hello protocol.
-+ if (protocol.v == ProtocolVersion.SSL20Hello.v) {
-+ enabledSSL20Hello = true;
-+ continue;
-+ }
-+
- boolean found = false;
- for (CipherSuite suite : enabledCipherSuites.collection()) {
- if (suite.isAvailable() && suite.obsoleted > protocol.v &&
-@@ -675,6 +682,11 @@
- "No available cipher suite for " + protocol);
- }
- }
-+
-+ if (!protocols.isEmpty() && enabledSSL20Hello) {
-+ protocols.add(ProtocolVersion.SSL20Hello);
-+ }
-+
- activeProtocols = new ProtocolList(protocols);
- }
-
---- ./jdk/src/share/classes/sun/security/util/Debug.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/util/Debug.java Fri Apr 10 09:21:28 2015 -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
-@@ -96,7 +96,15 @@
- System.err.println("codebase=<URL>");
- System.err.println(" only dump output if specified codebase");
- System.err.println(" is being checked");
--
-+ System.err.println();
-+ System.err.println("The following can be used with provider:");
-+ System.err.println();
-+ System.err.println("engine=<engines>");
-+ System.err.println(" only dump output for the specified list");
-+ System.err.println(" of JCA engines. Supported values:");
-+ System.err.println(" Cipher, KeyAgreement, KeyGenerator,");
-+ System.err.println(" KeyPairGenerator, KeyStore, Mac,");
-+ System.err.println(" MessageDigest, SecureRandom, Signature.");
- System.err.println();
- System.err.println("Note: Separate multiple options with a comma");
- System.exit(0);
---- ./jdk/src/share/classes/sun/security/util/HostnameChecker.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/util/HostnameChecker.java Fri Apr 10 09:21:28 2015 -0700
-@@ -26,6 +26,8 @@
- package sun.security.util;
-
- import java.io.IOException;
-+import java.net.InetAddress;
-+import java.net.UnknownHostException;
- import java.util.*;
-
- import java.security.Principal;
-@@ -148,6 +150,17 @@
- String ipAddress = (String)next.get(1);
- if (expectedIP.equalsIgnoreCase(ipAddress)) {
- return;
-+ } else {
-+ // compare InetAddress objects in order to ensure
-+ // equality between a long IPv6 address and its
-+ // abbreviated form.
-+ try {
-+ if (InetAddress.getByName(expectedIP).equals(
-+ InetAddress.getByName(ipAddress))) {
-+ return;
-+ }
-+ } catch (UnknownHostException e) {
-+ } catch (SecurityException e) {}
- }
- }
- }
---- ./jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -83,7 +83,8 @@
- * @param position the position in the bit string to check.
- */
- private boolean isSet(int position) {
-- return bitString[position];
-+ return (position < bitString.length) &&
-+ bitString[position];
- }
-
- /**
-@@ -275,41 +276,40 @@
- * Returns a printable representation of the KeyUsage.
- */
- public String toString() {
-- String s = super.toString() + "KeyUsage [\n";
-+ StringBuilder sb = new StringBuilder();
-+ sb.append(super.toString());
-+ sb.append("KeyUsage [\n");
-
-- try {
-- if (isSet(0)) {
-- s += " DigitalSignature\n";
-- }
-- if (isSet(1)) {
-- s += " Non_repudiation\n";
-- }
-- if (isSet(2)) {
-- s += " Key_Encipherment\n";
-- }
-- if (isSet(3)) {
-- s += " Data_Encipherment\n";
-- }
-- if (isSet(4)) {
-- s += " Key_Agreement\n";
-- }
-- if (isSet(5)) {
-- s += " Key_CertSign\n";
-- }
-- if (isSet(6)) {
-- s += " Crl_Sign\n";
-- }
-- if (isSet(7)) {
-- s += " Encipher_Only\n";
-- }
-- if (isSet(8)) {
-- s += " Decipher_Only\n";
-- }
-- } catch (ArrayIndexOutOfBoundsException ex) {}
-+ if (isSet(0)) {
-+ sb.append(" DigitalSignature\n");
-+ }
-+ if (isSet(1)) {
-+ sb.append(" Non_repudiation\n");
-+ }
-+ if (isSet(2)) {
-+ sb.append(" Key_Encipherment\n");
-+ }
-+ if (isSet(3)) {
-+ sb.append(" Data_Encipherment\n");
-+ }
-+ if (isSet(4)) {
-+ sb.append(" Key_Agreement\n");
-+ }
-+ if (isSet(5)) {
-+ sb.append(" Key_CertSign\n");
-+ }
-+ if (isSet(6)) {
-+ sb.append(" Crl_Sign\n");
-+ }
-+ if (isSet(7)) {
-+ sb.append(" Encipher_Only\n");
-+ }
-+ if (isSet(8)) {
-+ sb.append(" Decipher_Only\n");
-+ }
-+ sb.append("]\n");
-
-- s += "]\n";
--
-- return (s);
-+ return sb.toString();
- }
-
- /**
---- ./jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -136,7 +136,8 @@
- * @param position the position in the bit string to check.
- */
- private boolean isSet(int position) {
-- return bitString[position];
-+ return (position < bitString.length) &&
-+ bitString[position];
- }
-
- /**
-@@ -236,27 +237,34 @@
- * Returns a printable representation of the NetscapeCertType.
- */
- public String toString() {
-- String s = super.toString() + "NetscapeCertType [\n";
-+ StringBuilder sb = new StringBuilder();
-+ sb.append(super.toString());
-+ sb.append("NetscapeCertType [\n");
-
-- try {
-- if (isSet(getPosition(SSL_CLIENT)))
-- s += " SSL client\n";
-- if (isSet(getPosition(SSL_SERVER)))
-- s += " SSL server\n";
-- if (isSet(getPosition(S_MIME)))
-- s += " S/MIME\n";
-- if (isSet(getPosition(OBJECT_SIGNING)))
-- s += " Object Signing\n";
-- if (isSet(getPosition(SSL_CA)))
-- s += " SSL CA\n";
-- if (isSet(getPosition(S_MIME_CA)))
-- s += " S/MIME CA\n";
-- if (isSet(getPosition(OBJECT_SIGNING_CA)))
-- s += " Object Signing CA" ;
-- } catch (Exception e) { }
-+ if (isSet(0)) {
-+ sb.append(" SSL client\n");
-+ }
-+ if (isSet(1)) {
-+ sb.append(" SSL server\n");
-+ }
-+ if (isSet(2)) {
-+ sb.append(" S/MIME\n");
-+ }
-+ if (isSet(3)) {
-+ sb.append(" Object Signing\n");
-+ }
-+ if (isSet(5)) {
-+ sb.append(" SSL CA\n");
-+ }
-+ if (isSet(6)) {
-+ sb.append(" S/MIME CA\n");
-+ }
-+ if (isSet(7)) {
-+ sb.append(" Object Signing CA");
-+ }
-
-- s += "]\n";
-- return (s);
-+ sb.append("]\n");
-+ return sb.toString();
- }
-
- /**
---- ./jdk/src/share/classes/sun/security/x509/ReasonFlags.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/x509/ReasonFlags.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -99,7 +99,8 @@
- * @param position the position in the bit string to check.
- */
- private boolean isSet(int position) {
-- return bitString[position];
-+ return (position < bitString.length) &&
-+ bitString[position];
- }
-
- /**
-@@ -199,23 +200,38 @@
- * Returns a printable representation of the ReasonFlags.
- */
- public String toString() {
-- String s = "Reason Flags [\n";
-+ StringBuilder sb = new StringBuilder("Reason Flags [\n");
-
-- try {
-- if (isSet(0)) s += " Unused\n";
-- if (isSet(1)) s += " Key Compromise\n";
-- if (isSet(2)) s += " CA Compromise\n";
-- if (isSet(3)) s += " Affiliation_Changed\n";
-- if (isSet(4)) s += " Superseded\n";
-- if (isSet(5)) s += " Cessation Of Operation\n";
-- if (isSet(6)) s += " Certificate Hold\n";
-- if (isSet(7)) s += " Privilege Withdrawn\n";
-- if (isSet(8)) s += " AA Compromise\n";
-- } catch (ArrayIndexOutOfBoundsException ex) {}
-+ if (isSet(0)) {
-+ sb.append(" Unused\n");
-+ }
-+ if (isSet(1)) {
-+ sb.append(" Key Compromise\n");
-+ }
-+ if (isSet(2)) {
-+ sb.append(" CA Compromise\n");
-+ }
-+ if (isSet(3)) {
-+ sb.append(" Affiliation_Changed\n");
-+ }
-+ if (isSet(4)) {
-+ sb.append(" Superseded\n");
-+ }
-+ if (isSet(5)) {
-+ sb.append(" Cessation Of Operation\n");
-+ }
-+ if (isSet(6)) {
-+ sb.append(" Certificate Hold\n");
-+ }
-+ if (isSet(7)) {
-+ sb.append(" Privilege Withdrawn\n");
-+ }
-+ if (isSet(8)) {
-+ sb.append(" AA Compromise\n");
-+ }
-+ sb.append("]\n");
-
-- s += "]\n";
--
-- return (s);
-+ return sb.toString();
- }
-
- /**
---- ./jdk/src/share/classes/sun/text/resources/FormatData_sv_SE.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/text/resources/FormatData_sv_SE.java Fri Apr 10 09:21:28 2015 -0700
-@@ -52,7 +52,7 @@
- new String[] {
- "#,##0.###;-#,##0.###", // decimal pattern
- "#,##0.00 \u00A4;-#,##0.00 \u00A4", // currency pattern
-- "#,##0%" // percent pattern
-+ "#,##0 %" // percent pattern
- }
- },
- };
---- ./jdk/src/share/classes/sun/tools/jar/Main.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java Fri Apr 10 09:21:28 2015 -0700
-@@ -72,8 +72,9 @@
- * flag0: no zip compression (store only)
- * Mflag: DO NOT generate a manifest file (just ZIP)
- * iflag: generate jar index
-+ * pflag: preserve/don't strip leading slash and .. component from file name
- */
-- boolean cflag, uflag, xflag, tflag, vflag, flag0, Mflag, iflag;
-+ boolean cflag, uflag, xflag, tflag, vflag, flag0, Mflag, iflag, pflag;
-
- static final String MANIFEST_DIR = "META-INF/";
- static final String VERSION = "1.0";
-@@ -185,6 +186,7 @@
- addMainClass(manifest, ename);
- }
- }
-+ expand(null, files, false);
- OutputStream out;
- if (fname != null) {
- out = new FileOutputStream(fname);
-@@ -197,7 +199,6 @@
- vflag = false;
- }
- }
-- expand(null, files, false);
- create(new BufferedOutputStream(out, 4096), manifest);
- if (in != null) {
- in.close();
-@@ -245,7 +246,7 @@
- list(fname, files);
- } else {
- InputStream in = new FileInputStream(FileDescriptor.in);
-- try{
-+ try {
- list(new BufferedInputStream(in), files);
- } finally {
- in.close();
-@@ -361,6 +362,9 @@
- case 'e':
- ename = args[count++];
- break;
-+ case 'P':
-+ pflag = true;
-+ break;
- default:
- error(formatMsg("error.illegal.option",
- String.valueOf(flags.charAt(i))));
-@@ -607,7 +611,6 @@
- return updateOk;
- }
-
--
- private void addIndex(JarIndex index, ZipOutputStream zos)
- throws IOException
- {
-@@ -643,6 +646,47 @@
- }
- }
-
-+ private static final boolean isWinDriveLetter(char c) {
-+ return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'));
-+ }
-+
-+ private String safeName(String name) {
-+ if (!pflag) {
-+ int len = name.length();
-+ int i = name.lastIndexOf("../");
-+ if (i == -1) {
-+ i = 0;
-+ } else {
-+ i += 3; // strip any dot-dot components
-+ }
-+ if (File.separatorChar == '\\') {
-+ // the spec requests no drive letter. skip if
-+ // the entry name has one.
-+ while (i < len) {
-+ int off = i;
-+ if (i + 1 < len &&
-+ name.charAt(i + 1) == ':' &&
-+ isWinDriveLetter(name.charAt(i))) {
-+ i += 2;
-+ }
-+ while (i < len && name.charAt(i) == '/') {
-+ i++;
-+ }
-+ if (i == off) {
-+ break;
-+ }
-+ }
-+ } else {
-+ while (i < len && name.charAt(i) == '/') {
-+ i++;
-+ }
-+ }
-+ if (i != 0) {
-+ name = name.substring(i);
-+ }
-+ }
-+ return name;
-+ }
-
- private String entryName(String name) {
- name = name.replace(File.separatorChar, '/');
-@@ -654,10 +698,10 @@
- }
- }
- name = name.substring(matchPath.length());
--
-- if (name.startsWith("/")) {
-- name = name.substring(1);
-- } else if (name.startsWith("./")) {
-+ name = safeName(name);
-+ // the old implementaton doesn't remove
-+ // "./" if it was led by "/" (?)
-+ if (name.startsWith("./")) {
- name = name.substring(2);
- }
- return name;
-@@ -857,8 +901,11 @@
- for (ZipEntry ze : zes) {
- long lastModified = ze.getTime();
- if (lastModified != -1) {
-- File f = new File(ze.getName().replace('/', File.separatorChar));
-- f.setLastModified(lastModified);
-+ String name = safeName(ze.getName().replace(File.separatorChar, '/'));
-+ if (name.length() != 0) {
-+ File f = new File(name.replace('/', File.separatorChar));
-+ f.setLastModified(lastModified);
-+ }
- }
- }
- }
-@@ -902,7 +949,6 @@
- Enumeration<? extends ZipEntry> zes = zf.entries();
- while (zes.hasMoreElements()) {
- ZipEntry e = zes.nextElement();
-- InputStream is;
- if (files == null) {
- dirs.add(extractFile(zf.getInputStream(e), e));
- } else {
-@@ -926,8 +972,16 @@
- */
- ZipEntry extractFile(InputStream is, ZipEntry e) throws IOException {
- ZipEntry rc = null;
-- String name = e.getName();
-- File f = new File(e.getName().replace('/', File.separatorChar));
-+ // The spec requres all slashes MUST be forward '/', it is possible
-+ // an offending zip/jar entry may uses the backwards slash in its
-+ // name. It might cause problem on Windows platform as it skips
-+ // our "safe" check for leading slahs and dot-dot. So replace them
-+ // with '/'.
-+ String name = safeName(e.getName().replace(File.separatorChar, '/'));
-+ if (name.length() == 0) {
-+ return rc; // leading '/' or 'dot-dot' only path
-+ }
-+ File f = new File(name.replace('/', File.separatorChar));
- if (e.isDirectory()) {
- if (f.exists()) {
- if (!f.isDirectory()) {
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties Fri Apr 10 09:21:28 2015 -0700
-@@ -66,7 +66,7 @@
- (in = {0}) (out= {1})
-
- usage=\
--Usage: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\
-+Usage: jar {ctxui}[vfmn0PMe] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\
- Options:\n\
- \ \ -c create new archive\n\
- \ \ -t list table of contents for archive\n\
-@@ -78,6 +78,7 @@
- \ \ -e specify application entry point for stand-alone application \n\
- \ \ bundled into an executable jar file\n\
- \ \ -0 store only; use no ZIP compression\n\
-+\ \ -P preserve leading '/' (absolute path) and ".." (parent directory) components from file names\n\
- \ \ -M do not create a manifest file for the entries\n\
- \ \ -i generate index information for the specified jar files\n\
- \ \ -C change to the specified directory and include the following file\n\
---- ./jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/LocaleNames_sv.properties Fri Apr 10 09:21:28 2015 -0700
-@@ -1114,7 +1114,7 @@
- WS=Samoa
- YE=Jemen
- YT=Mayotte
--ZA=Sydafrika
-+ZA=Sydafrika
- ZM=Zambia
- ZW=Zimbabwe
-
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Venezuela Time", "VET",
- "Venezuela Summer Time", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Venezuelanische Zeit", "VET",
- "Venezuelanische Sommerzeit", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Hora de Venezuela", "VET",
- "Hora de verano de Venezuela", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Heure du Venezuela", "VET",
- "Heure d'\u00e9t\u00e9 du Venezuela", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Ora del Venezuela", "VET",
- "Ora estiva del Venezuela", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"\u30d9\u30cd\u30ba\u30a8\u30e9\u6642\u9593", "VET",
- "\u30d9\u30cd\u30ba\u30a8\u30e9\u590f\u6642\u9593", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"\ubca0\ub124\uc218\uc5d8\ub77c \uc2dc\uac04", "VET",
- "\ubca0\ub124\uc218\uc5d8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Fuso hor\u00e1rio da Venezuela", "VET",
- "Fuso hor\u00e1rio de ver\u00e3o da Venezuela", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"Venezuela, normaltid", "VET",
- "Venezuela, sommartid", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"\u59d4\u5185\u745e\u62c9\u65f6\u95f4", "VET",
- "\u59d4\u5185\u745e\u62c9\u590f\u4ee4\u65f6", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -331,7 +331,7 @@
- {"America/Buenos_Aires", AGT},
- {"America/Cambridge_Bay", MST},
- {"America/Campo_Grande", AMT},
-- {"America/Cancun", CST},
-+ {"America/Cancun", EST},
- {"America/Caracas", new String[] {"\u59d4\u5167\u745e\u62c9\u6642\u9593", "VET",
- "\u59d4\u5167\u745e\u62c9\u590f\u4ee4\u6642\u9593", "VEST"}},
- {"America/Catamarca", AGT},
---- ./jdk/src/share/demo/README Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/demo/README Fri Apr 10 09:21:28 2015 -0700
-@@ -4,3 +4,12 @@
- production-quality application, such as security checks, input
- validation, and proper error handling, might not be present in the
- sample code.
-+
-+In some cases, the default security settings may block an execution
-+of demo applets in a browser. To adjust the security settings, please
-+refer to the following resource:
-+
-+http://java.com/en/download/help/java_blocked.xml
-+
-+Some demo applets need to be accessed through the HTTP or HTTPS
-+protocols to enable access to the required resources.
---- ./jdk/src/share/javavm/export/jvm.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/javavm/export/jvm.h Fri Apr 10 09:21:28 2015 -0700
-@@ -437,9 +437,6 @@
- JNIEXPORT jobjectArray JNICALL
- JVM_GetClassInterfaces(JNIEnv *env, jclass cls);
-
--JNIEXPORT jobject JNICALL
--JVM_GetClassLoader(JNIEnv *env, jclass cls);
--
- JNIEXPORT jboolean JNICALL
- JVM_IsInterface(JNIEnv *env, jclass cls);
-
---- ./jdk/src/share/native/common/check_code.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/common/check_code.c Fri Apr 10 09:21:28 2015 -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
-@@ -1296,16 +1296,9 @@
- }
- (*env)->DeleteLocalRef(env, super);
-
-- /* The optimizer make cause this to happen on local code */
-+ /* The optimizer may cause this to happen on local code */
- if (not_found) {
--#ifdef BROKEN_JAVAC
-- jobject loader = JVM_GetClassLoader(env, context->class);
-- int has_loader = (loader != 0);
-- (*env)->DeleteLocalRef(env, loader);
-- if (has_loader)
--#endif /* BROKEN_JAVAC */
-- CCerror(context,
-- "Illegal use of nonvirtual function call");
-+ CCerror(context, "Illegal use of nonvirtual function call");
- }
- }
- }
---- ./jdk/src/share/native/java/io/io_util.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/io/io_util.c Fri Apr 10 09:21:28 2015 -0700
-@@ -214,13 +214,17 @@
- throwFileNotFoundException(JNIEnv *env, jstring path)
- {
- char buf[256];
-- jint n;
-+ size_t n;
- jobject x;
- jstring why = NULL;
-
-- n = JVM_GetLastErrorString(buf, sizeof(buf));
-+ n = getLastErrorString(buf, sizeof(buf));
- if (n > 0) {
-+#ifdef WIN32
-+ why = (*env)->NewStringUTF(env, buf);
-+#else
- why = JNU_NewStringPlatform(env, buf);
-+#endif
- }
- x = JNU_NewObjectByName(env,
- "java/io/FileNotFoundException",
---- ./jdk/src/share/native/java/io/io_util.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/io/io_util.h Fri Apr 10 09:21:28 2015 -0700
-@@ -54,7 +54,7 @@
- jint len, jboolean append, jfieldID fid);
- void fileOpen(JNIEnv *env, jobject this, jstring path, jfieldID fid, int flags);
- void throwFileNotFoundException(JNIEnv *env, jstring path);
--
-+size_t getLastErrorString(char *buf, size_t len);
-
- /*
- * Macros for managing platform strings. The typical usage pattern is:
---- ./jdk/src/share/native/java/lang/Class.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/lang/Class.c Fri Apr 10 09:21:28 2015 -0700
-@@ -45,7 +45,6 @@
- #define CLS "Ljava/lang/Class;"
- #define CPL "Lsun/reflect/ConstantPool;"
- #define STR "Ljava/lang/String;"
--#define JCL "Ljava/lang/ClassLoader;"
- #define FLD "Ljava/lang/reflect/Field;"
- #define MHD "Ljava/lang/reflect/Method;"
- #define CTR "Ljava/lang/reflect/Constructor;"
-@@ -56,7 +55,6 @@
- {"getName0", "()" STR, (void *)&JVM_GetClassName},
- {"getSuperclass", "()" CLS, NULL},
- {"getInterfaces", "()[" CLS, (void *)&JVM_GetClassInterfaces},
-- {"getClassLoader0", "()" JCL, (void *)&JVM_GetClassLoader},
- {"isInterface", "()Z", (void *)&JVM_IsInterface},
- {"getSigners", "()[" OBJ, (void *)&JVM_GetClassSigners},
- {"setSigners", "([" OBJ ")V", (void *)&JVM_SetClassSigners},
-@@ -81,7 +79,6 @@
- #undef OBJ
- #undef CLS
- #undef STR
--#undef JCL
- #undef FLD
- #undef MHD
- #undef CTR
---- ./jdk/src/share/native/java/net/Inet4Address.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/net/Inet4Address.c Fri Apr 10 09:21:28 2015 -0700
-@@ -46,5 +46,4 @@
- ia4_class = (*env)->NewGlobalRef(env, c);
- CHECK_NULL(ia4_class);
- ia4_ctrID = (*env)->GetMethodID(env, ia4_class, "<init>", "()V");
-- CHECK_NULL(ia4_ctrID);
- }
---- ./jdk/src/share/native/java/net/Inet6Address.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/net/Inet6Address.c Fri Apr 10 09:21:28 2015 -0700
-@@ -66,11 +66,10 @@
- ia6_cachedscopeidID = (*env)->GetFieldID(env, ia6_class, "cached_scope_id", "I");
- CHECK_NULL(ia6_cachedscopeidID);
- ia6_scopeidsetID = (*env)->GetFieldID(env, ia6h_class, "scope_id_set", "Z");
-- CHECK_NULL(ia6_scopeidID);
-+ CHECK_NULL(ia6_scopeidsetID);
- ia6_scopeifnameID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname", "Ljava/net/NetworkInterface;");
- CHECK_NULL(ia6_scopeifnameID);
- 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/InetAddress.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/net/InetAddress.c Fri Apr 10 09:21:28 2015 -0700
-@@ -64,5 +64,4 @@
- iac_familyID = (*env)->GetFieldID(env, iac_class, "family", "I");
- CHECK_NULL(iac_familyID);
- iac_hostNameID = (*env)->GetFieldID(env, iac_class, "hostName", "Ljava/lang/String;");
-- CHECK_NULL(iac_hostNameID);
- }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/net/jdk_net_SocketFlow.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,43 @@
-+/*
-+ * 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 <jni.h>
-+/* Header for class jdk_net_SocketFlow */
-+
-+#ifndef _Included_jdk_net_SocketFlow
-+#define _Included_jdk_net_SocketFlow
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#undef jdk_net_SocketFlow_UNSET
-+#define jdk_net_SocketFlow_UNSET -1L
-+#undef jdk_net_SocketFlow_NORMAL_PRIORITY
-+#define jdk_net_SocketFlow_NORMAL_PRIORITY 1L
-+#undef jdk_net_SocketFlow_HIGH_PRIORITY
-+#define jdk_net_SocketFlow_HIGH_PRIORITY 2L
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
---- ./jdk/src/share/native/java/net/net_util.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/net/net_util.h Fri Apr 10 09:21:28 2015 -0700
-@@ -40,7 +40,7 @@
- #define IPv6 2
-
- #define NET_ERROR(env, ex, msg) \
--{ if (!(*env)->ExceptionOccurred(env)) JNU_ThrowByName(env, ex, msg) }
-+{ if (!(*env)->ExceptionOccurred(env)) JNU_ThrowByName(env, ex, msg); }
-
- #define CHECK_NULL(x) if ((x) == NULL) return;
- #define CHECK_NULL_RETURN(x, y) if ((x) == NULL) return y;
-@@ -189,6 +189,9 @@
- JNIEXPORT int JNICALL
- NET_MapSocketOptionV6(jint cmd, int *level, int *optname);
-
-+JNIEXPORT jint JNICALL
-+NET_EnableFastTcpLoopback(int fd);
-+
- int getScopeID (struct sockaddr *);
-
- int cmpScopeID (unsigned int, struct sockaddr *);
---- ./jdk/src/share/native/java/util/zip/Deflater.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/util/zip/Deflater.c Fri Apr 10 09:21:28 2015 -0700
-@@ -68,10 +68,11 @@
- JNU_ThrowOutOfMemoryError(env, 0);
- return jlong_zero;
- } else {
-- char *msg;
-- switch (deflateInit2(strm, level, Z_DEFLATED,
-- nowrap ? -MAX_WBITS : MAX_WBITS,
-- DEF_MEM_LEVEL, strategy)) {
-+ const char *msg;
-+ int ret = deflateInit2(strm, level, Z_DEFLATED,
-+ nowrap ? -MAX_WBITS : MAX_WBITS,
-+ DEF_MEM_LEVEL, strategy);
-+ switch (ret) {
- case Z_OK:
- return ptr_to_jlong(strm);
- case Z_MEM_ERROR:
-@@ -83,7 +84,11 @@
- JNU_ThrowIllegalArgumentException(env, 0);
- return jlong_zero;
- default:
-- msg = strm->msg;
-+ msg = ((strm->msg != NULL) ? strm->msg :
-+ (ret == Z_VERSION_ERROR) ?
-+ "zlib returned Z_VERSION_ERROR: "
-+ "compile time and runtime zlib implementations differ" :
-+ "unknown error initializing zlib library");
- free(strm);
- JNU_ThrowInternalError(env, msg);
- return jlong_zero;
---- ./jdk/src/share/native/java/util/zip/Inflater.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/java/util/zip/Inflater.c Fri Apr 10 09:21:28 2015 -0700
-@@ -27,6 +27,7 @@
- * Native method support for java.util.zip.Inflater
- */
-
-+#include <stddef.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
-@@ -60,12 +61,13 @@
- {
- z_stream *strm = calloc(1, sizeof(z_stream));
-
-- if (strm == 0) {
-+ if (strm == NULL) {
- JNU_ThrowOutOfMemoryError(env, 0);
- return jlong_zero;
- } else {
-- char *msg;
-- switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
-+ const char *msg;
-+ int ret = inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS);
-+ switch (ret) {
- case Z_OK:
- return ptr_to_jlong(strm);
- case Z_MEM_ERROR:
-@@ -73,7 +75,13 @@
- JNU_ThrowOutOfMemoryError(env, 0);
- return jlong_zero;
- default:
-- msg = strm->msg;
-+ msg = ((strm->msg != NULL) ? strm->msg :
-+ (ret == Z_VERSION_ERROR) ?
-+ "zlib returned Z_VERSION_ERROR: "
-+ "compile time and runtime zlib implementations differ" :
-+ (ret == Z_STREAM_ERROR) ?
-+ "inflateInit2 returned Z_STREAM_ERROR" :
-+ "unknown error initializing zlib library");
- free(strm);
- JNU_ThrowInternalError(env, msg);
- return jlong_zero;
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,855 +0,0 @@
--
-- ChangeLog file for zlib
--
--Changes in 1.2.3 (18 July 2005)
--- Apply security vulnerability fixes to contrib/infback9 as well
--- Clean up some text files (carriage returns, trailing space)
--- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
--
--Changes in 1.2.2.4 (11 July 2005)
--- Add inflatePrime() function for starting inflation at bit boundary
--- Avoid some Visual C warnings in deflate.c
--- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-- compile
--- Fix some spelling errors in comments [Betts]
--- Correct inflateInit2() error return documentation in zlib.h
--- Added zran.c example of compressed data random access to examples
-- directory, shows use of inflatePrime()
--- Fix cast for assignments to strm->state in inflate.c and infback.c
--- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
--- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
--- Add cast in trees.c t avoid a warning [Oberhumer]
--- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
--- Update make_vms.com [Zinser]
--- Initialize state->write in inflateReset() since copied in inflate_fast()
--- Be more strict on incomplete code sets in inflate_table() and increase
-- ENOUGH and MAXD -- this repairs a possible security vulnerability for
-- invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for
-- discovering the vulnerability and providing test cases.
--- Add ia64 support to configure for HP-UX [Smith]
--- Add error return to gzread() for format or i/o error [Levin]
--- Use malloc.h for OS/2 [Necasek]
--
--Changes in 1.2.2.3 (27 May 2005)
--- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
--- Typecast fread() return values in gzio.c [Vollant]
--- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
--- Fix crc check bug in gzread() after gzungetc() [Heiner]
--- Add the deflateTune() function to adjust internal compression parameters
--- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
--- Remove an incorrect assertion in examples/zpipe.c
--- Add C++ wrapper in infback9.h [Donais]
--- Fix bug in inflateCopy() when decoding fixed codes
--- Note in zlib.h how much deflateSetDictionary() actually uses
--- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
--- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
--- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
--- Add gzdirect() function to indicate transparent reads
--- Update contrib/minizip [Vollant]
--- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
--- Add casts in crc32.c to avoid warnings [Oberhumer]
--- Add contrib/masmx64 [Vollant]
--- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
--
--Changes in 1.2.2.2 (30 December 2004)
--- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-- avoid implicit memcpy calls (portability for no-library compilation)
--- Increase sprintf() buffer size in gzdopen() to allow for large numbers
--- Add INFLATE_STRICT to check distances against zlib header
--- Improve WinCE errno handling and comments [Chang]
--- Remove comment about no gzip header processing in FAQ
--- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
--- Add updated make_vms.com [Coghlan], update README
--- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-- fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
--- Add FAQ entry and comments in deflate.c on uninitialized memory access
--- Add Solaris 9 make options in configure [Gilbert]
--- Allow strerror() usage in gzio.c for STDC
--- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
--- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
--- Use z_off_t for adler32_combine() and crc32_combine() lengths
--- Make adler32() much faster for small len
--- Use OS_CODE in deflate() default gzip header
--
--Changes in 1.2.2.1 (31 October 2004)
--- Allow inflateSetDictionary() call for raw inflate
--- Fix inflate header crc check bug for file names and comments
--- Add deflateSetHeader() and gz_header structure for custom gzip headers
--- Add inflateGetheader() to retrieve gzip headers
--- Add crc32_combine() and adler32_combine() functions
--- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
--- Use zstreamp consistently in zlib.h (inflate_back functions)
--- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-- and in contrib/inflate86/inffast.S [Truta, Anderson]
--- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
--- Update projects/README.projects and projects/visualc6 [Truta]
--- Update win32/DLL_FAQ.txt [Truta]
--- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
--- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
--- Use a new algorithm for setting strm->data_type in trees.c [Truta]
--- Do not define an exit() prototype in zutil.c unless DEBUG defined
--- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
--- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
--- Fix Darwin build version identification [Peterson]
--
--Changes in 1.2.2 (3 October 2004)
--- Update zlib.h comments on gzip in-memory processing
--- Set adler to 1 in inflateReset() to support Java test suite [Walles]
--- Add contrib/dotzlib [Ravn]
--- Update win32/DLL_FAQ.txt [Truta]
--- Update contrib/minizip [Vollant]
--- Move contrib/visual-basic.txt to old/ [Truta]
--- Fix assembler builds in projects/visualc6/ [Truta]
--
--Changes in 1.2.1.2 (9 September 2004)
--- Update INDEX file
--- Fix trees.c to update strm->data_type (no one ever noticed!)
--- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
--- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
--- Add limited multitasking protection to DYNAMIC_CRC_TABLE
--- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
--- Don't declare strerror() under VMS [Mozilla]
--- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
--- Update contrib/ada [Anisimkov]
--- Update contrib/minizip [Vollant]
--- Fix configure to not hardcode directories for Darwin [Peterson]
--- Fix gzio.c to not return error on empty files [Brown]
--- Fix indentation; update version in contrib/delphi/ZLib.pas and
-- contrib/pascal/zlibpas.pas [Truta]
--- Update mkasm.bat in contrib/masmx86 [Truta]
--- Update contrib/untgz [Truta]
--- Add projects/README.projects [Truta]
--- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
--- Update win32/DLL_FAQ.txt [Truta]
--- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
--- Remove an unnecessary assignment to curr in inftrees.c [Truta]
--- Add OS/2 to exe builds in configure [Poltorak]
--- Remove err dummy parameter in zlib.h [Kientzle]
--
--Changes in 1.2.1.1 (9 January 2004)
--- Update email address in README
--- Several FAQ updates
--- Fix a big fat bug in inftrees.c that prevented decoding valid
-- dynamic blocks with only literals and no distance codes --
-- Thanks to "Hot Emu" for the bug report and sample file
--- Add a note to puff.c on no distance codes case.
--
--Changes in 1.2.1 (17 November 2003)
--- Remove a tab in contrib/gzappend/gzappend.c
--- Update some interfaces in contrib for new zlib functions
--- Update zlib version number in some contrib entries
--- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
--- Support shared libraries on Hurd and KFreeBSD [Brown]
--- Fix error in NO_DIVIDE option of adler32.c
--
--Changes in 1.2.0.8 (4 November 2003)
--- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
--- Add experimental NO_DIVIDE #define in adler32.c
-- - Possibly faster on some processors (let me know if it is)
--- Correct Z_BLOCK to not return on first inflate call if no wrap
--- Fix strm->data_type on inflate() return to correctly indicate EOB
--- Add deflatePrime() function for appending in the middle of a byte
--- Add contrib/gzappend for an example of appending to a stream
--- Update win32/DLL_FAQ.txt [Truta]
--- Delete Turbo C comment in README [Truta]
--- Improve some indentation in zconf.h [Truta]
--- Fix infinite loop on bad input in configure script [Church]
--- Fix gzeof() for concatenated gzip files [Johnson]
--- Add example to contrib/visual-basic.txt [Michael B.]
--- Add -p to mkdir's in Makefile.in [vda]
--- Fix configure to properly detect presence or lack of printf functions
--- Add AS400 support [Monnerat]
--- Add a little Cygwin support [Wilson]
--
--Changes in 1.2.0.7 (21 September 2003)
--- Correct some debug formats in contrib/infback9
--- Cast a type in a debug statement in trees.c
--- Change search and replace delimiter in configure from % to # [Beebe]
--- Update contrib/untgz to 0.2 with various fixes [Truta]
--- Add build support for Amiga [Nikl]
--- Remove some directories in old that have been updated to 1.2
--- Add dylib building for Mac OS X in configure and Makefile.in
--- Remove old distribution stuff from Makefile
--- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
--- Update links in README
--
--Changes in 1.2.0.6 (13 September 2003)
--- Minor FAQ updates
--- Update contrib/minizip to 1.00 [Vollant]
--- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
--- Update POSTINC comment for 68060 [Nikl]
--- Add contrib/infback9 with deflate64 decoding (unsupported)
--- For MVS define NO_vsnprintf and undefine FAR [van Burik]
--- Add pragma for fdopen on MVS [van Burik]
--
--Changes in 1.2.0.5 (8 September 2003)
--- Add OF to inflateBackEnd() declaration in zlib.h
--- Remember start when using gzdopen in the middle of a file
--- Use internal off_t counters in gz* functions to properly handle seeks
--- Perform more rigorous check for distance-too-far in inffast.c
--- Add Z_BLOCK flush option to return from inflate at block boundary
--- Set strm->data_type on return from inflate
-- - Indicate bits unused, if at block boundary, and if in last block
--- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
--- Add condition so old NO_DEFLATE define still works for compatibility
--- FAQ update regarding the Windows DLL [Truta]
--- INDEX update: add qnx entry, remove aix entry [Truta]
--- Install zlib.3 into mandir [Wilson]
--- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
--- Adapt the zlib interface to the new DLL convention guidelines [Truta]
--- Introduce ZLIB_WINAPI macro to allow the export of functions using
-- the WINAPI calling convention, for Visual Basic [Vollant, Truta]
--- Update msdos and win32 scripts and makefiles [Truta]
--- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
--- Add contrib/ada [Anisimkov]
--- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
--- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
--- Add contrib/masm686 [Truta]
--- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-- [Truta, Vollant]
--- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
--- Remove contrib/delphi2; add a new contrib/delphi [Truta]
--- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
-- and fix some method prototypes [Truta]
--- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-- [Truta]
--- Avoid the use of backslash (\) in contrib/minizip [Vollant]
--- Fix file time handling in contrib/untgz; update makefiles [Truta]
--- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-- [Vollant]
--- Remove contrib/vstudio/vc15_16 [Vollant]
--- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
--- Update README.contrib [Truta]
--- Invert the assignment order of match_head and s->prev[...] in
-- INSERT_STRING [Truta]
--- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-- [Truta]
--- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
--- Fix prototype of syncsearch in inflate.c [Truta]
--- Introduce ASMINF macro to be enabled when using an ASM implementation
-- of inflate_fast [Truta]
--- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
--- Modify test_gzio in example.c to take a single file name as a
-- parameter [Truta]
--- Exit the example.c program if gzopen fails [Truta]
--- Add type casts around strlen in example.c [Truta]
--- Remove casting to sizeof in minigzip.c; give a proper type
-- to the variable compared with SUFFIX_LEN [Truta]
--- Update definitions of STDC and STDC99 in zconf.h [Truta]
--- Synchronize zconf.h with the new Windows DLL interface [Truta]
--- Use SYS16BIT instead of __32BIT__ to distinguish between
-- 16- and 32-bit platforms [Truta]
--- Use far memory allocators in small 16-bit memory models for
-- Turbo C [Truta]
--- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-- zlibCompileFlags [Truta]
--- Cygwin has vsnprintf [Wilson]
--- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
--- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
--
--Changes in 1.2.0.4 (10 August 2003)
--- Minor FAQ updates
--- Be more strict when checking inflateInit2's windowBits parameter
--- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
--- Add gzip wrapper option to deflateInit2 using windowBits
--- Add updated QNX rule in configure and qnx directory [Bonnefoy]
--- Make inflate distance-too-far checks more rigorous
--- Clean up FAR usage in inflate
--- Add casting to sizeof() in gzio.c and minigzip.c
--
--Changes in 1.2.0.3 (19 July 2003)
--- Fix silly error in gzungetc() implementation [Vollant]
--- Update contrib/minizip and contrib/vstudio [Vollant]
--- Fix printf format in example.c
--- Correct cdecl support in zconf.in.h [Anisimkov]
--- Minor FAQ updates
--
--Changes in 1.2.0.2 (13 July 2003)
--- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
--- Attempt to avoid warnings in crc32.c for pointer-int conversion
--- Add AIX to configure, remove aix directory [Bakker]
--- Add some casts to minigzip.c
--- Improve checking after insecure sprintf() or vsprintf() calls
--- Remove #elif's from crc32.c
--- Change leave label to inf_leave in inflate.c and infback.c to avoid
-- library conflicts
--- Remove inflate gzip decoding by default--only enable gzip decoding by
-- special request for stricter backward compatibility
--- Add zlibCompileFlags() function to return compilation information
--- More typecasting in deflate.c to avoid warnings
--- Remove leading underscore from _Capital #defines [Truta]
--- Fix configure to link shared library when testing
--- Add some Windows CE target adjustments [Mai]
--- Remove #define ZLIB_DLL in zconf.h [Vollant]
--- Add zlib.3 [Rodgers]
--- Update RFC URL in deflate.c and algorithm.txt [Mai]
--- Add zlib_dll_FAQ.txt to contrib [Truta]
--- Add UL to some constants [Truta]
--- Update minizip and vstudio [Vollant]
--- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
--- Expand use of NO_DUMMY_DECL to avoid all dummy structures
--- Added iostream3 to contrib [Schwardt]
--- Replace rewind() with fseek() for WinCE [Truta]
--- Improve setting of zlib format compression level flags
-- - Report 0 for huffman and rle strategies and for level == 0 or 1
-- - Report 2 only for level == 6
--- Only deal with 64K limit when necessary at compile time [Truta]
--- Allow TOO_FAR check to be turned off at compile time [Truta]
--- Add gzclearerr() function [Souza]
--- Add gzungetc() function
--
--Changes in 1.2.0.1 (17 March 2003)
--- Add Z_RLE strategy for run-length encoding [Truta]
-- - When Z_RLE requested, restrict matches to distance one
-- - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
--- Correct FASTEST compilation to allow level == 0
--- Clean up what gets compiled for FASTEST
--- Incorporate changes to zconf.in.h [Vollant]
-- - Refine detection of Turbo C need for dummy returns
-- - Refine ZLIB_DLL compilation
-- - Include additional header file on VMS for off_t typedef
--- Try to use _vsnprintf where it supplants vsprintf [Vollant]
--- Add some casts in inffast.c
--- Enchance comments in zlib.h on what happens if gzprintf() tries to
-- write more than 4095 bytes before compression
--- Remove unused state from inflateBackEnd()
--- Remove exit(0) from minigzip.c, example.c
--- Get rid of all those darn tabs
--- Add "check" target to Makefile.in that does the same thing as "test"
--- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
--- Update contrib/inflate86 [Anderson]
--- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
--- Add msdos and win32 directories with makefiles [Truta]
--- More additions and improvements to the FAQ
--
--Changes in 1.2.0 (9 March 2003)
--- New and improved inflate code
-- - About 20% faster
-- - Does not allocate 32K window unless and until needed
-- - Automatically detects and decompresses gzip streams
-- - Raw inflate no longer needs an extra dummy byte at end
-- - Added inflateBack functions using a callback interface--even faster
-- than inflate, useful for file utilities (gzip, zip)
-- - Added inflateCopy() function to record state for random access on
-- externally generated deflate streams (e.g. in gzip files)
-- - More readable code (I hope)
--- New and improved crc32()
-- - About 50% faster, thanks to suggestions from Rodney Brown
--- Add deflateBound() and compressBound() functions
--- Fix memory leak in deflateInit2()
--- Permit setting dictionary for raw deflate (for parallel deflate)
--- Fix const declaration for gzwrite()
--- Check for some malloc() failures in gzio.c
--- Fix bug in gzopen() on single-byte file 0x1f
--- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-- and next buffer doesn't start with 0x8b
--- Fix uncompress() to return Z_DATA_ERROR on truncated input
--- Free memory at end of example.c
--- Remove MAX #define in trees.c (conflicted with some libraries)
--- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
--- Declare malloc() and free() in gzio.c if STDC not defined
--- Use malloc() instead of calloc() in zutil.c if int big enough
--- Define STDC for AIX
--- Add aix/ with approach for compiling shared library on AIX
--- Add HP-UX support for shared libraries in configure
--- Add OpenUNIX support for shared libraries in configure
--- Use $cc instead of gcc to build shared library
--- Make prefix directory if needed when installing
--- Correct Macintosh avoidance of typedef Byte in zconf.h
--- Correct Turbo C memory allocation when under Linux
--- Use libz.a instead of -lz in Makefile (assure use of compiled library)
--- Update configure to check for snprintf or vsnprintf functions and their
-- return value, warn during make if using an insecure function
--- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-- is lost when library is used--resolution is to build new zconf.h
--- Documentation improvements (in zlib.h):
-- - Document raw deflate and inflate
-- - Update RFCs URL
-- - Point out that zlib and gzip formats are different
-- - Note that Z_BUF_ERROR is not fatal
-- - Document string limit for gzprintf() and possible buffer overflow
-- - Note requirement on avail_out when flushing
-- - Note permitted values of flush parameter of inflate()
--- Add some FAQs (and even answers) to the FAQ
--- Add contrib/inflate86/ for x86 faster inflate
--- Add contrib/blast/ for PKWare Data Compression Library decompression
--- Add contrib/puff/ simple inflate for deflate format description
--
--Changes in 1.1.4 (11 March 2002)
--- ZFREE was repeated on same allocation on some error conditions.
-- This creates a security problem described in
-- http://www.zlib.org/advisory-2002-03-11.txt
--- Returned incorrect error (Z_MEM_ERROR) on some invalid data
--- Avoid accesses before window for invalid distances with inflate window
-- less than 32K.
--- force windowBits > 8 to avoid a bug in the encoder for a window size
-- of 256 bytes. (A complete fix will be available in 1.1.5).
--
--Changes in 1.1.3 (9 July 1998)
--- fix "an inflate input buffer bug that shows up on rare but persistent
-- occasions" (Mark)
--- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
--- fix gzseek(..., SEEK_SET) in write mode
--- fix crc check after a gzeek (Frank Faubert)
--- fix miniunzip when the last entry in a zip file is itself a zip file
-- (J Lillge)
--- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-- See http://www.muppetlabs.com/~breadbox/software/assembly.html
--- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
--- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
--- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
--- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
--- added a FAQ file
--
--- Support gzdopen on Mac with Metrowerks (Jason Linhart)
--- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
--- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
--- avoid some warnings with Borland C (Tom Tanner)
--- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
--- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant)
--- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
--- use libdir and includedir in Makefile.in (Tim Mooney)
--- support shared libraries on OSF1 V4 (Tim Mooney)
--- remove so_locations in "make clean" (Tim Mooney)
--- fix maketree.c compilation error (Glenn, Mark)
--- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
--- new Makefile.riscos (Rich Walker)
--- initialize static descriptors in trees.c for embedded targets (Nick Smith)
--- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
--- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
--- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
--- fix maketree.c to allow clean compilation of inffixed.h (Mark)
--- fix parameter check in deflateCopy (Gunther Nikl)
--- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
--- Many portability patches by Christian Spieler:
-- . zutil.c, zutil.h: added "const" for zmem*
-- . Make_vms.com: fixed some typos
-- . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-- . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-- . msdos/Makefile.*: use model-dependent name for the built zlib library
-- . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-- new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
--- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
--- replace __far with _far for better portability (Christian Spieler, Tom Lane)
--- fix test for errno.h in configure (Tim Newsham)
--
--Changes in 1.1.2 (19 March 98)
--- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-- See http://www.winimage.com/zLibDll/unzip.html
--- preinitialize the inflate tables for fixed codes, to make the code
-- completely thread safe (Mark)
--- some simplifications and slight speed-up to the inflate code (Mark)
--- fix gzeof on non-compressed files (Allan Schrum)
--- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
--- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
--- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
--- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
--- do not wrap extern "C" around system includes (Tom Lane)
--- mention zlib binding for TCL in README (Andreas Kupries)
--- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
--- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
--- allow "configure --prefix $HOME" (Tim Mooney)
--- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
--- move Makefile.sas to amiga/Makefile.sas
--
--Changes in 1.1.1 (27 Feb 98)
--- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson)
--- remove block truncation heuristic which had very marginal effect for zlib
-- (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-- compression ratio on some files. This also allows inlining _tr_tally for
-- matches in deflate_slow.
--- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
--
--Changes in 1.1.0 (24 Feb 98)
--- do not return STREAM_END prematurely in inflate (John Bowler)
--- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
--- compile with -DFASTEST to get compression code optimized for speed only
--- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
--- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-- on Sun but significant on HP)
--
--- add a pointer to experimental unzip library in README (Gilles Vollant)
--- initialize variable gcc in configure (Chris Herborth)
--
--Changes in 1.0.9 (17 Feb 1998)
--- added gzputs and gzgets functions
--- do not clear eof flag in gzseek (Mark Diekhans)
--- fix gzseek for files in transparent mode (Mark Diekhans)
--- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
--- replace EXPORT with ZEXPORT to avoid conflict with other programs
--- added compress2 in zconf.h, zlib.def, zlib.dnt
--- new asm code from Gilles Vollant in contrib/asm386
--- simplify the inflate code (Mark):
-- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
-- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
-- . ZALLOC the value area for huft_build() instead of using stack
-- . Simplify Z_FINISH check in inflate()
--
--- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
--- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
--- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-- the declaration of FAR (Gilles VOllant)
--- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
--- read_buf buf parameter of type Bytef* instead of charf*
--- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
--- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
--- fix check for presence of directories in "make install" (Ian Willis)
--
--Changes in 1.0.8 (27 Jan 1998)
--- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
--- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
--- added compress2() to allow setting the compression level
--- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
--- use constant arrays for the static trees in trees.c instead of computing
-- them at run time (thanks to Ken Raeburn for this suggestion). To create
-- trees.h, compile with GEN_TREES_H and run "make test".
--- check return code of example in "make test" and display result
--- pass minigzip command line options to file_compress
--- simplifying code of inflateSync to avoid gcc 2.8 bug
--
--- support CC="gcc -Wall" in configure -s (QingLong)
--- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
--- fix test for shared library support to avoid compiler warnings
--- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
--- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
--- do not use fdopen for Metrowerks on Mac (Brad Pettit))
--- add checks for gzputc and gzputc in example.c
--- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
--- use const for the CRC table (Ken Raeburn)
--- fixed "make uninstall" for shared libraries
--- use Tracev instead of Trace in infblock.c
--- in example.c use correct compressed length for test_sync
--- suppress +vnocompatwarnings in configure for HPUX (not always supported)
--
--Changes in 1.0.7 (20 Jan 1998)
--- fix gzseek which was broken in write mode
--- return error for gzseek to negative absolute position
--- fix configure for Linux (Chun-Chung Chen)
--- increase stack space for MSC (Tim Wegner)
--- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
--- define EXPORTVA for gzprintf (Gilles Vollant)
--- added man page zlib.3 (Rick Rodgers)
--- for contrib/untgz, fix makedir() and improve Makefile
--
--- check gzseek in write mode in example.c
--- allocate extra buffer for seeks only if gzseek is actually called
--- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
--- add inflateSyncPoint in zconf.h
--- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
--
--Changes in 1.0.6 (19 Jan 1998)
--- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-- gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
--- Fix a deflate bug occurring only with compression level 0 (thanks to
-- Andy Buckler for finding this one).
--- In minigzip, pass transparently also the first byte for .Z files.
--- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
--- check Z_FINISH in inflate (thanks to Marc Schluper)
--- Implement deflateCopy (thanks to Adam Costello)
--- make static libraries by default in configure, add --shared option.
--- move MSDOS or Windows specific files to directory msdos
--- suppress the notion of partial flush to simplify the interface
-- (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
--- suppress history buffer provided by application to simplify the interface
-- (this feature was not implemented anyway in 1.0.4)
--- next_in and avail_in must be initialized before calling inflateInit or
-- inflateInit2
--- add EXPORT in all exported functions (for Windows DLL)
--- added Makefile.nt (thanks to Stephen Williams)
--- added the unsupported "contrib" directory:
-- contrib/asm386/ by Gilles Vollant <info@winimage.com>
-- 386 asm code replacing longest_match().
-- contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
-- A C++ I/O streams interface to the zlib gz* functions
-- contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
-- Another C++ I/O streams interface
-- contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-- A very simple tar.gz file extractor using zlib
-- contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
-- How to use compress(), uncompress() and the gz* functions from VB.
--- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-- level) in minigzip (thanks to Tom Lane)
--
--- use const for rommable constants in deflate
--- added test for gzseek and gztell in example.c
--- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
--- add undocumented function zError to convert error code to string
-- (for Tim Smithers)
--- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
--- Use default memcpy for Symantec MSDOS compiler.
--- Add EXPORT keyword for check_func (needed for Windows DLL)
--- add current directory to LD_LIBRARY_PATH for "make test"
--- create also a link for libz.so.1
--- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
--- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
--- added -soname for Linux in configure (Chun-Chung Chen,
--- assign numbers to the exported functions in zlib.def (for Windows DLL)
--- add advice in zlib.h for best usage of deflateSetDictionary
--- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
--- allow compilation with ANSI keywords only enabled for TurboC in large model
--- avoid "versionString"[0] (Borland bug)
--- add NEED_DUMMY_RETURN for Borland
--- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
--- allow compilation with CC
--- defined STDC for OS/2 (David Charlap)
--- limit external names to 8 chars for MVS (Thomas Lund)
--- in minigzip.c, use static buffers only for 16-bit systems
--- fix suffix check for "minigzip -d foo.gz"
--- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
--- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
--- added makelcc.bat for lcc-win32 (Tom St Denis)
--- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
--- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
--- check for unistd.h in configure (for off_t)
--- remove useless check parameter in inflate_blocks_free
--- avoid useless assignment of s->check to itself in inflate_blocks_new
--- do not flush twice in gzclose (thanks to Ken Raeburn)
--- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
--- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
--- work around buggy fclose on pipes for HP/UX
--- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
--- fix configure if CC is already equal to gcc
--
--Changes in 1.0.5 (3 Jan 98)
--- Fix inflate to terminate gracefully when fed corrupted or invalid data
--- Use const for rommable constants in inflate
--- Eliminate memory leaks on error conditions in inflate
--- Removed some vestigial code in inflate
--- Update web address in README
--
--Changes in 1.0.4 (24 Jul 96)
--- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-- bit, so the decompressor could decompress all the correct data but went
-- on to attempt decompressing extra garbage data. This affected minigzip too.
--- zlibVersion and gzerror return const char* (needed for DLL)
--- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
--- use z_error only for DEBUG (avoid problem with DLLs)
--
--Changes in 1.0.3 (2 Jul 96)
--- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-- small and medium models; this makes the library incompatible with previous
-- versions for these models. (No effect in large model or on other systems.)
--- return OK instead of BUF_ERROR if previous deflate call returned with
-- avail_out as zero but there is nothing to do
--- added memcmp for non STDC compilers
--- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
--- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
--- better check for 16-bit mode MSC (avoids problem with Symantec)
--
--Changes in 1.0.2 (23 May 96)
--- added Windows DLL support
--- added a function zlibVersion (for the DLL support)
--- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
--- Bytef is define's instead of typedef'd only for Borland C
--- avoid reading uninitialized memory in example.c
--- mention in README that the zlib format is now RFC1950
--- updated Makefile.dj2
--- added algorithm.doc
--
--Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
--- fix array overlay in deflate.c which sometimes caused bad compressed data
--- fix inflate bug with empty stored block
--- fix MSDOS medium model which was broken in 0.99
--- fix deflateParams() which could generated bad compressed data.
--- Bytef is define'd instead of typedef'ed (work around Borland bug)
--- added an INDEX file
--- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-- Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
--- speed up adler32 for modern machines without auto-increment
--- added -ansi for IRIX in configure
--- static_init_done in trees.c is an int
--- define unlink as delete for VMS
--- fix configure for QNX
--- add configure branch for SCO and HPUX
--- avoid many warnings (unused variables, dead assignments, etc...)
--- no fdopen for BeOS
--- fix the Watcom fix for 32 bit mode (define FAR as empty)
--- removed redefinition of Byte for MKWERKS
--- work around an MWKERKS bug (incorrect merge of all .h files)
--
--Changes in 0.99 (27 Jan 96)
--- allow preset dictionary shared between compressor and decompressor
--- allow compression level 0 (no compression)
--- add deflateParams in zlib.h: allow dynamic change of compression level
-- and compression strategy.
--- test large buffers and deflateParams in example.c
--- add optional "configure" to build zlib as a shared library
--- suppress Makefile.qnx, use configure instead
--- fixed deflate for 64-bit systems (detected on Cray)
--- fixed inflate_blocks for 64-bit systems (detected on Alpha)
--- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
--- always return Z_BUF_ERROR when deflate() has nothing to do
--- deflateInit and inflateInit are now macros to allow version checking
--- prefix all global functions and types with z_ with -DZ_PREFIX
--- make falloc completely reentrant (inftrees.c)
--- fixed very unlikely race condition in ct_static_init
--- free in reverse order of allocation to help memory manager
--- use zlib-1.0/* instead of zlib/* inside the tar.gz
--- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-- -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
--- allow gzread on concatenated .gz files
--- deflateEnd now returns Z_DATA_ERROR if it was premature
--- deflate is finally (?) fully deterministic (no matches beyond end of input)
--- Document Z_SYNC_FLUSH
--- add uninstall in Makefile
--- Check for __cpluplus in zlib.h
--- Better test in ct_align for partial flush
--- avoid harmless warnings for Borland C++
--- initialize hash_head in deflate.c
--- avoid warning on fdopen (gzio.c) for HP cc -Aa
--- include stdlib.h for STDC compilers
--- include errno.h for Cray
--- ignore error if ranlib doesn't exist
--- call ranlib twice for NeXTSTEP
--- use exec_prefix instead of prefix for libz.a
--- renamed ct_* as _tr_* to avoid conflict with applications
--- clear z->msg in inflateInit2 before any error return
--- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
--- fixed typo in zconf.h (_GNUC__ => __GNUC__)
--- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
--- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
--- in fcalloc, normalize pointer if size > 65520 bytes
--- don't use special fcalloc for 32 bit Borland C++
--- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
--- use Z_BINARY instead of BINARY
--- document that gzclose after gzdopen will close the file
--- allow "a" as mode in gzopen.
--- fix error checking in gzread
--- allow skipping .gz extra-field on pipes
--- added reference to Perl interface in README
--- put the crc table in FAR data (I dislike more and more the medium model :)
--- added get_crc_table
--- added a dimension to all arrays (Borland C can't count).
--- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
--- guard against multiple inclusion of *.h (for precompiled header on Mac)
--- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
--- don't use unsized arrays to avoid silly warnings by Visual C++:
-- warning C4746: 'inflate_mask' : unsized array treated as '__far'
-- (what's wrong with far data in far model?).
--- define enum out of inflate_blocks_state to allow compilation with C++
--
--Changes in 0.95 (16 Aug 95)
--- fix MSDOS small and medium model (now easier to adapt to any compiler)
--- inlined send_bits
--- fix the final (:-) bug for deflate with flush (output was correct but
-- not completely flushed in rare occasions).
--- default window size is same for compression and decompression
-- (it's now sufficient to set MAX_WBITS in zconf.h).
--- voidp -> voidpf and voidnp -> voidp (for consistency with other
-- typedefs and because voidnp was not near in large model).
--
--Changes in 0.94 (13 Aug 95)
--- support MSDOS medium model
--- fix deflate with flush (could sometimes generate bad output)
--- fix deflateReset (zlib header was incorrectly suppressed)
--- added support for VMS
--- allow a compression level in gzopen()
--- gzflush now calls fflush
--- For deflate with flush, flush even if no more input is provided.
--- rename libgz.a as libz.a
--- avoid complex expression in infcodes.c triggering Turbo C bug
--- work around a problem with gcc on Alpha (in INSERT_STRING)
--- don't use inline functions (problem with some gcc versions)
--- allow renaming of Byte, uInt, etc... with #define.
--- avoid warning about (unused) pointer before start of array in deflate.c
--- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
--- avoid reserved word 'new' in trees.c
--
--Changes in 0.93 (25 June 95)
--- temporarily disable inline functions
--- make deflate deterministic
--- give enough lookahead for PARTIAL_FLUSH
--- Set binary mode for stdin/stdout in minigzip.c for OS/2
--- don't even use signed char in inflate (not portable enough)
--- fix inflate memory leak for segmented architectures
--
--Changes in 0.92 (3 May 95)
--- don't assume that char is signed (problem on SGI)
--- Clear bit buffer when starting a stored block
--- no memcpy on Pyramid
--- suppressed inftest.c
--- optimized fill_window, put longest_match inline for gcc
--- optimized inflate on stored blocks.
--- untabify all sources to simplify patches
--
--Changes in 0.91 (2 May 95)
--- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
--- Document the memory requirements in zconf.h
--- added "make install"
--- fix sync search logic in inflateSync
--- deflate(Z_FULL_FLUSH) now works even if output buffer too short
--- after inflateSync, don't scare people with just "lo world"
--- added support for DJGPP
--
--Changes in 0.9 (1 May 95)
--- don't assume that zalloc clears the allocated memory (the TurboC bug
-- was Mark's bug after all :)
--- let again gzread copy uncompressed data unchanged (was working in 0.71)
--- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
--- added a test of inflateSync in example.c
--- moved MAX_WBITS to zconf.h because users might want to change that.
--- document explicitly that zalloc(64K) on MSDOS must return a normalized
-- pointer (zero offset)
--- added Makefiles for Microsoft C, Turbo C, Borland C++
--- faster crc32()
--
--Changes in 0.8 (29 April 95)
--- added fast inflate (inffast.c)
--- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-- is incompatible with previous versions of zlib which returned Z_OK.
--- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-- (actually that was not a compiler bug, see 0.81 above)
--- gzread no longer reads one extra byte in certain cases
--- In gzio destroy(), don't reference a freed structure
--- avoid many warnings for MSDOS
--- avoid the ERROR symbol which is used by MS Windows
--
--Changes in 0.71 (14 April 95)
--- Fixed more MSDOS compilation problems :( There is still a bug with
-- TurboC large model.
--
--Changes in 0.7 (14 April 95)
--- Added full inflate support.
--- Simplified the crc32() interface. The pre- and post-conditioning
-- (one's complement) is now done inside crc32(). WARNING: this is
-- incompatible with previous versions; see zlib.h for the new usage.
--
--Changes in 0.61 (12 April 95)
--- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
--
--Changes in 0.6 (11 April 95)
--- added minigzip.c
--- added gzdopen to reopen a file descriptor as gzFile
--- added transparent reading of non-gziped files in gzread.
--- fixed bug in gzread (don't read crc as data)
--- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
--- don't allocate big arrays in the stack (for MSDOS)
--- fix some MSDOS compilation problems
--
--Changes in 0.5:
--- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-- not yet Z_FULL_FLUSH.
--- support decompression but only in a single step (forced Z_FINISH)
--- added opaque object for zalloc and zfree.
--- added deflateReset and inflateReset
--- added a variable zlib_version for consistency checking.
--- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-- Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
--
--Changes in 0.4:
--- avoid "zip" everywhere, use zlib instead of ziplib.
--- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-- if compression method == 8.
--- added adler32 and crc32
--- renamed deflateOptions as deflateInit2, call one or the other but not both
--- added the method parameter for deflateInit2.
--- added inflateInit2
--- simplied considerably deflateInit and inflateInit by not supporting
-- user-provided history buffer. This is supported only in deflateInit2
-- and inflateInit2.
--
--Changes in 0.3:
--- prefix all macro names with Z_
--- use Z_FINISH instead of deflateEnd to finish compression.
--- added Z_HUFFMAN_ONLY
--- added gzerror()
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/README Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,125 +0,0 @@
--ZLIB DATA COMPRESSION LIBRARY
--
--zlib 1.2.3 is a general purpose data compression library. All the code is
--thread safe. The data format used by the zlib library is described by RFCs
--(Request for Comments) 1950 to 1952 in the files
--http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
--and rfc1952.txt (gzip format). These documents are also available in other
--formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
--
--All functions of the compression library are documented in the file zlib.h
--(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
--of the library is given in the file example.c which also tests that the library
--is working correctly. Another example is given in the file minigzip.c. The
--compression library itself is composed of all source files except example.c and
--minigzip.c.
--
--To compile all files and run the test program, follow the instructions given at
--the top of Makefile. In short "make test; make install" should work for most
--machines. For Unix: "./configure; make test; make install". For MSDOS, use one
--of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
--
--Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
--<info@winimage.com> for the Windows DLL version. The zlib home page is
--http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
--please check this site to verify that you have the latest version of zlib;
--otherwise get the latest version and check whether the problem still exists or
--not.
--
--PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
--for help.
--
--Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
--issue of Dr. Dobb's Journal; a copy of the article is available in
--http://dogma.net/markn/articles/zlibtool/zlibtool.htm
--
--The changes made in version 1.2.3 are documented in the file ChangeLog.
--
--Unsupported third party contributions are provided in directory "contrib".
--
--A Java implementation of zlib is available in the Java Development Kit
--http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
--See the zlib home page http://www.zlib.org for details.
--
--A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
--CPAN (Comprehensive Perl Archive Network) sites
--http://www.cpan.org/modules/by-module/Compress/
--
--A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
--available in Python 1.5 and later versions, see
--http://www.python.org/doc/lib/module-zlib.html
--
--A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
--availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
--
--An experimental package to read and write files in .zip format, written on top
--of zlib by Gilles Vollant <info@winimage.com>, is available in the
--contrib/minizip directory of zlib.
--
--
--Notes for some targets:
--
--- For Windows DLL versions, please see win32/DLL_FAQ.txt
--
--- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-- -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-- compiler flag). The compiler bug has been reported to SGI.
--
--- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-- when compiled with cc.
--
--- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-- necessary to get gzprintf working correctly. This is done by configure.
--
--- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-- other compilers. Use "make test" to check your compiler.
--
--- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
--
--- For PalmOs, see http://palmzlib.sourceforge.net/
--
--- When building a shared, i.e. dynamic library on Mac OS X, the library must be
-- installed before testing (do "make install" before "make test"), since the
-- library location is specified in the library.
--
--
--Acknowledgments:
--
-- The deflate format used by zlib was defined by Phil Katz. The deflate
-- and zlib specifications were written by L. Peter Deutsch. Thanks to all the
-- people who reported problems and suggested various improvements in zlib;
-- they are too numerous to cite here.
--
--Copyright notice:
--
-- (C) 1995-2004 Jean-loup Gailly and Mark Adler
--
-- This software is provided 'as-is', without any express or implied
-- warranty. In no event will the authors be held liable for any damages
-- arising from the use of this software.
--
-- Permission is granted to anyone to use this software for any purpose,
-- including commercial applications, and to alter it and redistribute it
-- freely, subject to the following restrictions:
--
-- 1. The origin of this software must not be misrepresented; you must not
-- claim that you wrote the original software. If you use this software
-- in a product, an acknowledgment in the product documentation would be
-- appreciated but is not required.
-- 2. Altered source versions must be plainly marked as such, and must not be
-- misrepresented as being the original software.
-- 3. This notice may not be removed or altered from any source distribution.
--
-- Jean-loup Gailly Mark Adler
-- jloup@gzip.org madler@alumni.caltech.edu
--
--If you use the zlib library in a product, we would appreciate *not*
--receiving lengthy legal documents to sign. The sources are provided
--for free but without warranty of any kind. The library has been
--entirely written by Jean-loup Gailly and Mark Adler; it does not
--include third-party code.
--
--If you redistribute modified sources, we would appreciate that you include
--in the file ChangeLog history information documenting your changes. Please
--read the FAQ for more information on the distribution of modified source
--versions.
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,103 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* compress.c -- compress a memory buffer
-- * Copyright (C) 1995-2003 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#define ZLIB_INTERNAL
--#include "zlib.h"
--
--/* ===========================================================================
-- Compresses the source buffer into the destination buffer. The level
-- parameter has the same meaning as in deflateInit. sourceLen is the byte
-- length of the source buffer. Upon entry, destLen is the total size of the
-- destination buffer, which must be at least 0.1% larger than sourceLen plus
-- 12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
--
-- compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-- memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-- Z_STREAM_ERROR if the level parameter is invalid.
--*/
--int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-- Bytef *dest;
-- uLongf *destLen;
-- const Bytef *source;
-- uLong sourceLen;
-- int level;
--{
-- z_stream stream;
-- int err;
--
-- stream.next_in = (Bytef*)source;
-- stream.avail_in = (uInt)sourceLen;
--#ifdef MAXSEG_64K
-- /* Check for source > 64K on 16-bit machine: */
-- if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
--#endif
-- stream.next_out = dest;
-- stream.avail_out = (uInt)*destLen;
-- if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
--
-- stream.zalloc = (alloc_func)0;
-- stream.zfree = (free_func)0;
-- stream.opaque = (voidpf)0;
--
-- err = deflateInit(&stream, level);
-- if (err != Z_OK) return err;
--
-- err = deflate(&stream, Z_FINISH);
-- if (err != Z_STREAM_END) {
-- deflateEnd(&stream);
-- return err == Z_OK ? Z_BUF_ERROR : err;
-- }
-- *destLen = stream.total_out;
--
-- err = deflateEnd(&stream);
-- return err;
--}
--
--/* ===========================================================================
-- */
--int ZEXPORT compress (dest, destLen, source, sourceLen)
-- Bytef *dest;
-- uLongf *destLen;
-- const Bytef *source;
-- uLong sourceLen;
--{
-- return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
--}
--
--/* ===========================================================================
-- If the default memLevel or windowBits for deflateInit() is changed, then
-- this function needs to be updated.
-- */
--uLong ZEXPORT compressBound (sourceLen)
-- uLong sourceLen;
--{
-- return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/crc32.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,465 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* crc32.h -- tables for rapid CRC calculation
-- * Generated automatically by crc32.c
-- */
--
--local const unsigned long FAR crc_table[TBLS][256] =
--{
-- {
-- 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-- 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-- 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-- 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-- 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-- 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-- 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-- 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-- 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-- 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-- 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-- 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-- 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-- 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-- 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-- 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-- 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-- 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-- 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-- 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-- 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-- 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-- 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-- 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-- 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-- 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-- 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-- 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-- 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-- 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-- 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-- 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-- 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-- 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-- 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-- 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-- 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-- 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-- 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-- 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-- 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-- 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-- 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-- 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-- 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-- 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-- 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-- 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-- 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-- 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-- 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-- 0x2d02ef8dUL
--#ifdef BYFOUR
-- },
-- {
-- 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-- 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-- 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-- 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-- 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-- 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-- 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-- 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-- 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-- 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-- 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-- 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-- 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-- 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-- 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-- 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-- 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-- 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-- 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-- 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-- 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-- 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-- 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-- 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-- 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-- 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-- 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-- 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-- 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-- 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-- 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-- 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-- 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-- 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-- 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-- 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-- 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-- 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-- 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-- 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-- 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-- 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-- 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-- 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-- 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-- 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-- 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-- 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-- 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-- 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-- 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-- 0x9324fd72UL
-- },
-- {
-- 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-- 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-- 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-- 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-- 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-- 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-- 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-- 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-- 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-- 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-- 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-- 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-- 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-- 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-- 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-- 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-- 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-- 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-- 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-- 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-- 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-- 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-- 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-- 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-- 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-- 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-- 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-- 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-- 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-- 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-- 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-- 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-- 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-- 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-- 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-- 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-- 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-- 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-- 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-- 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-- 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-- 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-- 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-- 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-- 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-- 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-- 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-- 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-- 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-- 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-- 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-- 0xbe9834edUL
-- },
-- {
-- 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-- 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-- 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-- 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-- 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-- 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-- 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-- 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-- 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-- 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-- 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-- 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-- 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-- 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-- 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-- 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-- 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-- 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-- 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-- 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-- 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-- 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-- 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-- 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-- 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-- 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-- 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-- 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-- 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-- 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-- 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-- 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-- 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-- 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-- 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-- 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-- 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-- 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-- 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-- 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-- 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-- 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-- 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-- 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-- 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-- 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-- 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-- 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-- 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-- 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-- 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-- 0xde0506f1UL
-- },
-- {
-- 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-- 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-- 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-- 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-- 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-- 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-- 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-- 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-- 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-- 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-- 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-- 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-- 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-- 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-- 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-- 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-- 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-- 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-- 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-- 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-- 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-- 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-- 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-- 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-- 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-- 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-- 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-- 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-- 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-- 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-- 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-- 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-- 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-- 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-- 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-- 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-- 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-- 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-- 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-- 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-- 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-- 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-- 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-- 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-- 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-- 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-- 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-- 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-- 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-- 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-- 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-- 0x8def022dUL
-- },
-- {
-- 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-- 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-- 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-- 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-- 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-- 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-- 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-- 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-- 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-- 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-- 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-- 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-- 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-- 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-- 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-- 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-- 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-- 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-- 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-- 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-- 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-- 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-- 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-- 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-- 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-- 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-- 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-- 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-- 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-- 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-- 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-- 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-- 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-- 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-- 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-- 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-- 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-- 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-- 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-- 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-- 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-- 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-- 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-- 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-- 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-- 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-- 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-- 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-- 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-- 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-- 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-- 0x72fd2493UL
-- },
-- {
-- 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-- 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-- 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-- 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-- 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-- 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-- 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-- 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-- 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-- 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-- 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-- 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-- 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-- 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-- 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-- 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-- 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-- 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-- 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-- 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-- 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-- 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-- 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-- 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-- 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-- 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-- 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-- 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-- 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-- 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-- 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-- 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-- 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-- 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-- 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-- 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-- 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-- 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-- 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-- 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-- 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-- 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-- 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-- 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-- 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-- 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-- 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-- 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-- 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-- 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-- 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-- 0xed3498beUL
-- },
-- {
-- 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-- 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-- 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-- 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-- 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-- 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-- 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-- 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-- 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-- 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-- 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-- 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-- 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-- 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-- 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-- 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-- 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-- 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-- 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-- 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-- 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-- 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-- 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-- 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-- 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-- 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-- 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-- 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-- 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-- 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-- 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-- 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-- 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-- 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-- 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-- 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-- 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-- 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-- 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-- 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-- 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-- 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-- 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-- 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-- 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-- 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-- 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-- 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-- 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-- 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-- 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-- 0xf10605deUL
--#endif
-- }
--};
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,1760 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* deflate.c -- compress data using the deflation algorithm
-- * Copyright (C) 1995-2005 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/*
-- * ALGORITHM
-- *
-- * The "deflation" process depends on being able to identify portions
-- * of the input text which are identical to earlier input (within a
-- * sliding window trailing behind the input currently being processed).
-- *
-- * The most straightforward technique turns out to be the fastest for
-- * most input files: try all possible matches and select the longest.
-- * The key feature of this algorithm is that insertions into the string
-- * dictionary are very simple and thus fast, and deletions are avoided
-- * completely. Insertions are performed at each input character, whereas
-- * string matches are performed only when the previous match ends. So it
-- * is preferable to spend more time in matches to allow very fast string
-- * insertions and avoid deletions. The matching algorithm for small
-- * strings is inspired from that of Rabin & Karp. A brute force approach
-- * is used to find longer strings when a small match has been found.
-- * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
-- * (by Leonid Broukhis).
-- * A previous version of this file used a more sophisticated algorithm
-- * (by Fiala and Greene) which is guaranteed to run in linear amortized
-- * time, but has a larger average cost, uses more memory and is patented.
-- * However the F&G algorithm may be faster for some highly redundant
-- * files if the parameter max_chain_length (described below) is too large.
-- *
-- * ACKNOWLEDGEMENTS
-- *
-- * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
-- * I found it in 'freeze' written by Leonid Broukhis.
-- * Thanks to many people for bug reports and testing.
-- *
-- * REFERENCES
-- *
-- * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
-- * Available in http://www.ietf.org/rfc/rfc1951.txt
-- *
-- * A description of the Rabin and Karp algorithm is given in the book
-- * "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
-- *
-- * Fiala,E.R., and Greene,D.H.
-- * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
-- *
-- */
--
--/* @(#) $Id$ */
--
--#include "deflate.h"
--
--const char deflate_copyright[] =
-- " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
--/*
-- If you use the zlib library in a product, an acknowledgment is welcome
-- in the documentation of your product. If for some reason you cannot
-- include such an acknowledgment, I would appreciate that you keep this
-- copyright string in the executable of your product.
-- */
--
--/* ===========================================================================
-- * Function prototypes.
-- */
--typedef enum {
-- need_more, /* block not completed, need more input or more output */
-- block_done, /* block flush performed */
-- finish_started, /* finish started, need only more output at next deflate */
-- finish_done /* finish done, accept no more input or output */
--} block_state;
--
--typedef block_state (*compress_func) OF((deflate_state *s, int flush));
--/* Compression function. Returns the block state after the call. */
--
--local void fill_window OF((deflate_state *s));
--local block_state deflate_stored OF((deflate_state *s, int flush));
--local block_state deflate_fast OF((deflate_state *s, int flush));
--#ifndef FASTEST
--local block_state deflate_slow OF((deflate_state *s, int flush));
--#endif
--local void lm_init OF((deflate_state *s));
--local void putShortMSB OF((deflate_state *s, uInt b));
--local void flush_pending OF((z_streamp strm));
--local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
--#ifndef FASTEST
--#ifdef ASMV
-- void match_init OF((void)); /* asm code initialization */
-- uInt longest_match OF((deflate_state *s, IPos cur_match));
--#else
--local uInt longest_match OF((deflate_state *s, IPos cur_match));
--#endif
--#endif
--local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
--
--#ifdef DEBUG
--local void check_match OF((deflate_state *s, IPos start, IPos match,
-- int length));
--#endif
--
--/* ===========================================================================
-- * Local data
-- */
--
--#define NIL 0
--/* Tail of hash chains */
--
--#ifndef TOO_FAR
--# define TOO_FAR 4096
--#endif
--/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
--
--#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
--/* Minimum amount of lookahead, except at the end of the input file.
-- * See deflate.c for comments about the MIN_MATCH+1.
-- */
--
--/* Values for max_lazy_match, good_match and max_chain_length, depending on
-- * the desired pack level (0..9). The values given below have been tuned to
-- * exclude worst case performance for pathological files. Better values may be
-- * found for specific files.
-- */
--typedef struct config_s {
-- ush good_length; /* reduce lazy search above this match length */
-- ush max_lazy; /* do not perform lazy search above this match length */
-- ush nice_length; /* quit search above this match length */
-- ush max_chain;
-- compress_func func;
--} config;
--
--#ifdef FASTEST
--local const config configuration_table[2] = {
--/* good lazy nice chain */
--/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
--/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */
--#else
--local const config configuration_table[10] = {
--/* good lazy nice chain */
--/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
--/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */
--/* 2 */ {4, 5, 16, 8, deflate_fast},
--/* 3 */ {4, 6, 32, 32, deflate_fast},
--
--/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */
--/* 5 */ {8, 16, 32, 32, deflate_slow},
--/* 6 */ {8, 16, 128, 128, deflate_slow},
--/* 7 */ {8, 32, 128, 256, deflate_slow},
--/* 8 */ {32, 128, 258, 1024, deflate_slow},
--/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
--#endif
--
--/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
-- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
-- * meaning.
-- */
--
--#define EQUAL 0
--/* result of memcmp for equal strings */
--
--#ifndef NO_DUMMY_DECL
--struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
--#endif
--
--/* ===========================================================================
-- * Update a hash value with the given input byte
-- * IN assertion: all calls to to UPDATE_HASH are made with consecutive
-- * input characters, so that a running hash key can be computed from the
-- * previous key instead of complete recalculation each time.
-- */
--#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
--
--
--/* ===========================================================================
-- * Insert string str in the dictionary and set match_head to the previous head
-- * of the hash chain (the most recent string with same hash key). Return
-- * the previous length of the hash chain.
-- * If this file is compiled with -DFASTEST, the compression level is forced
-- * to 1, and no hash chains are maintained.
-- * IN assertion: all calls to to INSERT_STRING are made with consecutive
-- * input characters and the first MIN_MATCH bytes of str are valid
-- * (except for the last MIN_MATCH-1 bytes of the input file).
-- */
--#ifdef FASTEST
--#define INSERT_STRING(s, str, match_head) \
-- (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-- match_head = s->head[s->ins_h], \
-- s->head[s->ins_h] = (Pos)(str))
--#else
--#define INSERT_STRING(s, str, match_head) \
-- (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-- match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-- s->head[s->ins_h] = (Pos)(str))
--#endif
--
--/* ===========================================================================
-- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
-- * prev[] will be initialized on the fly.
-- */
--#define CLEAR_HASH(s) \
-- s->head[s->hash_size-1] = NIL; \
-- zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
--
--/* ========================================================================= */
--int ZEXPORT deflateInit_(strm, level, version, stream_size)
-- z_streamp strm;
-- int level;
-- const char *version;
-- int stream_size;
--{
-- return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-- Z_DEFAULT_STRATEGY, version, stream_size);
-- /* To do: ignore strm->next_in if we use it as window */
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-- version, stream_size)
-- z_streamp strm;
-- int level;
-- int method;
-- int windowBits;
-- int memLevel;
-- int strategy;
-- const char *version;
-- int stream_size;
--{
-- deflate_state *s;
-- int wrap = 1;
-- static const char my_version[] = ZLIB_VERSION;
--
-- ushf *overlay;
-- /* We overlay pending_buf and d_buf+l_buf. This works since the average
-- * output size for (length,distance) codes is <= 24 bits.
-- */
--
-- if (version == Z_NULL || version[0] != my_version[0] ||
-- stream_size != sizeof(z_stream)) {
-- return Z_VERSION_ERROR;
-- }
-- if (strm == Z_NULL) return Z_STREAM_ERROR;
--
-- strm->msg = Z_NULL;
-- if (strm->zalloc == (alloc_func)0) {
-- strm->zalloc = zcalloc;
-- strm->opaque = (voidpf)0;
-- }
-- if (strm->zfree == (free_func)0) strm->zfree = zcfree;
--
--#ifdef FASTEST
-- if (level != 0) level = 1;
--#else
-- if (level == Z_DEFAULT_COMPRESSION) level = 6;
--#endif
--
-- if (windowBits < 0) { /* suppress zlib wrapper */
-- wrap = 0;
-- windowBits = -windowBits;
-- }
--#ifdef GZIP
-- else if (windowBits > 15) {
-- wrap = 2; /* write gzip wrapper instead */
-- windowBits -= 16;
-- }
--#endif
-- if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-- windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-- strategy < 0 || strategy > Z_FIXED) {
-- return Z_STREAM_ERROR;
-- }
-- if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */
-- s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-- if (s == Z_NULL) return Z_MEM_ERROR;
-- strm->state = (struct internal_state FAR *)s;
-- s->strm = strm;
--
-- s->wrap = wrap;
-- s->gzhead = Z_NULL;
-- s->w_bits = windowBits;
-- s->w_size = 1 << s->w_bits;
-- s->w_mask = s->w_size - 1;
--
-- s->hash_bits = memLevel + 7;
-- s->hash_size = 1 << s->hash_bits;
-- s->hash_mask = s->hash_size - 1;
-- s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
--
-- s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-- s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
-- s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
--
-- s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
--
-- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-- s->pending_buf = (uchf *) overlay;
-- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
--
-- if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-- s->pending_buf == Z_NULL) {
-- s->status = FINISH_STATE;
-- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
-- deflateEnd (strm);
-- return Z_MEM_ERROR;
-- }
-- s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
--
-- s->level = level;
-- s->strategy = strategy;
-- s->method = (Byte)method;
--
-- return deflateReset(strm);
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-- z_streamp strm;
-- const Bytef *dictionary;
-- uInt dictLength;
--{
-- deflate_state *s;
-- uInt length = dictLength;
-- uInt n;
-- IPos hash_head = 0;
--
-- if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-- strm->state->wrap == 2 ||
-- (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
-- return Z_STREAM_ERROR;
--
-- s = strm->state;
-- if (s->wrap)
-- strm->adler = adler32(strm->adler, dictionary, dictLength);
--
-- if (length < MIN_MATCH) return Z_OK;
-- if (length > MAX_DIST(s)) {
-- length = MAX_DIST(s);
-- dictionary += dictLength - length; /* use the tail of the dictionary */
-- }
-- zmemcpy(s->window, dictionary, length);
-- s->strstart = length;
-- s->block_start = (long)length;
--
-- /* Insert all strings in the hash table (except for the last two bytes).
-- * s->lookahead stays null, so s->ins_h will be recomputed at the next
-- * call of fill_window.
-- */
-- s->ins_h = s->window[0];
-- UPDATE_HASH(s, s->ins_h, s->window[1]);
-- for (n = 0; n <= length - MIN_MATCH; n++) {
-- INSERT_STRING(s, n, hash_head);
-- }
-- if (hash_head) hash_head = 0; /* to make compiler happy */
-- return Z_OK;
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateReset (strm)
-- z_streamp strm;
--{
-- deflate_state *s;
--
-- if (strm == Z_NULL || strm->state == Z_NULL ||
-- strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-- return Z_STREAM_ERROR;
-- }
--
-- strm->total_in = strm->total_out = 0;
-- strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-- strm->data_type = Z_UNKNOWN;
--
-- s = (deflate_state *)strm->state;
-- s->pending = 0;
-- s->pending_out = s->pending_buf;
--
-- if (s->wrap < 0) {
-- s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-- }
-- s->status = s->wrap ? INIT_STATE : BUSY_STATE;
-- strm->adler =
--#ifdef GZIP
-- s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
--#endif
-- adler32(0L, Z_NULL, 0);
-- s->last_flush = Z_NO_FLUSH;
--
-- _tr_init(s);
-- lm_init(s);
--
-- return Z_OK;
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateSetHeader (strm, head)
-- z_streamp strm;
-- gz_headerp head;
--{
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- if (strm->state->wrap != 2) return Z_STREAM_ERROR;
-- strm->state->gzhead = head;
-- return Z_OK;
--}
--
--/* ========================================================================= */
--int ZEXPORT deflatePrime (strm, bits, value)
-- z_streamp strm;
-- int bits;
-- int value;
--{
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- strm->state->bi_valid = bits;
-- strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
-- return Z_OK;
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateParams(strm, level, strategy)
-- z_streamp strm;
-- int level;
-- int strategy;
--{
-- deflate_state *s;
-- compress_func func;
-- int err = Z_OK;
--
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- s = strm->state;
--
--#ifdef FASTEST
-- if (level != 0) level = 1;
--#else
-- if (level == Z_DEFAULT_COMPRESSION) level = 6;
--#endif
-- if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-- return Z_STREAM_ERROR;
-- }
-- func = configuration_table[s->level].func;
--
-- if (func != configuration_table[level].func && strm->total_in != 0) {
-- /* Flush the last buffer: */
-- err = deflate(strm, Z_PARTIAL_FLUSH);
-- }
-- if (s->level != level) {
-- s->level = level;
-- s->max_lazy_match = configuration_table[level].max_lazy;
-- s->good_match = configuration_table[level].good_length;
-- s->nice_match = configuration_table[level].nice_length;
-- s->max_chain_length = configuration_table[level].max_chain;
-- }
-- s->strategy = strategy;
-- return err;
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-- z_streamp strm;
-- int good_length;
-- int max_lazy;
-- int nice_length;
-- int max_chain;
--{
-- deflate_state *s;
--
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- s = strm->state;
-- s->good_match = good_length;
-- s->max_lazy_match = max_lazy;
-- s->nice_match = nice_length;
-- s->max_chain_length = max_chain;
-- return Z_OK;
--}
--
--/* =========================================================================
-- * For the default windowBits of 15 and memLevel of 8, this function returns
-- * a close to exact, as well as small, upper bound on the compressed size.
-- * They are coded as constants here for a reason--if the #define's are
-- * changed, then this function needs to be changed as well. The return
-- * value for 15 and 8 only works for those exact settings.
-- *
-- * For any setting other than those defaults for windowBits and memLevel,
-- * the value returned is a conservative worst case for the maximum expansion
-- * resulting from using fixed blocks instead of stored blocks, which deflate
-- * can emit on compressed data for some combinations of the parameters.
-- *
-- * This function could be more sophisticated to provide closer upper bounds
-- * for every combination of windowBits and memLevel, as well as wrap.
-- * But even the conservative upper bound of about 14% expansion does not
-- * seem onerous for output buffer allocation.
-- */
--uLong ZEXPORT deflateBound(strm, sourceLen)
-- z_streamp strm;
-- uLong sourceLen;
--{
-- deflate_state *s;
-- uLong destLen;
--
-- /* conservative upper bound */
-- destLen = sourceLen +
-- ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
--
-- /* if can't get parameters, return conservative bound */
-- if (strm == Z_NULL || strm->state == Z_NULL)
-- return destLen;
--
-- /* if not default parameters, return conservative bound */
-- s = strm->state;
-- if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-- return destLen;
--
-- /* default settings: return tight bound for that case */
-- return compressBound(sourceLen);
--}
--
--/* =========================================================================
-- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
-- * IN assertion: the stream state is correct and there is enough room in
-- * pending_buf.
-- */
--local void putShortMSB (s, b)
-- deflate_state *s;
-- uInt b;
--{
-- put_byte(s, (Byte)(b >> 8));
-- put_byte(s, (Byte)(b & 0xff));
--}
--
--/* =========================================================================
-- * Flush as much pending output as possible. All deflate() output goes
-- * through this function so some applications may wish to modify it
-- * to avoid allocating a large strm->next_out buffer and copying into it.
-- * (See also read_buf()).
-- */
--local void flush_pending(strm)
-- z_streamp strm;
--{
-- unsigned len = strm->state->pending;
--
-- if (len > strm->avail_out) len = strm->avail_out;
-- if (len == 0) return;
--
-- zmemcpy(strm->next_out, strm->state->pending_out, len);
-- strm->next_out += len;
-- strm->state->pending_out += len;
-- strm->total_out += len;
-- strm->avail_out -= len;
-- strm->state->pending -= len;
-- if (strm->state->pending == 0) {
-- strm->state->pending_out = strm->state->pending_buf;
-- }
--}
--
--/* ========================================================================= */
--int ZEXPORT deflate (strm, flush)
-- z_streamp strm;
-- int flush;
--{
-- int old_flush; /* value of flush param for previous deflate call */
-- deflate_state *s;
--
-- if (strm == Z_NULL || strm->state == Z_NULL ||
-- flush > Z_FINISH || flush < 0) {
-- return Z_STREAM_ERROR;
-- }
-- s = strm->state;
--
-- if (strm->next_out == Z_NULL ||
-- (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-- (s->status == FINISH_STATE && flush != Z_FINISH)) {
-- ERR_RETURN(strm, Z_STREAM_ERROR);
-- }
-- if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
--
-- s->strm = strm; /* just in case */
-- old_flush = s->last_flush;
-- s->last_flush = flush;
--
-- /* Write the header */
-- if (s->status == INIT_STATE) {
--#ifdef GZIP
-- if (s->wrap == 2) {
-- strm->adler = crc32(0L, Z_NULL, 0);
-- put_byte(s, 31);
-- put_byte(s, 139);
-- put_byte(s, 8);
-- if (s->gzhead == NULL) {
-- put_byte(s, 0);
-- put_byte(s, 0);
-- put_byte(s, 0);
-- put_byte(s, 0);
-- put_byte(s, 0);
-- put_byte(s, s->level == 9 ? 2 :
-- (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-- 4 : 0));
-- put_byte(s, OS_CODE);
-- s->status = BUSY_STATE;
-- }
-- else {
-- put_byte(s, (s->gzhead->text ? 1 : 0) +
-- (s->gzhead->hcrc ? 2 : 0) +
-- (s->gzhead->extra == Z_NULL ? 0 : 4) +
-- (s->gzhead->name == Z_NULL ? 0 : 8) +
-- (s->gzhead->comment == Z_NULL ? 0 : 16)
-- );
-- put_byte(s, (Byte)(s->gzhead->time & 0xff));
-- put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-- put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-- put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-- put_byte(s, s->level == 9 ? 2 :
-- (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-- 4 : 0));
-- put_byte(s, s->gzhead->os & 0xff);
-- if (s->gzhead->extra != NULL) {
-- put_byte(s, s->gzhead->extra_len & 0xff);
-- put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-- }
-- if (s->gzhead->hcrc)
-- strm->adler = crc32(strm->adler, s->pending_buf,
-- s->pending);
-- s->gzindex = 0;
-- s->status = EXTRA_STATE;
-- }
-- }
-- else
--#endif
-- {
-- uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-- uInt level_flags;
--
-- if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-- level_flags = 0;
-- else if (s->level < 6)
-- level_flags = 1;
-- else if (s->level == 6)
-- level_flags = 2;
-- else
-- level_flags = 3;
-- header |= (level_flags << 6);
-- if (s->strstart != 0) header |= PRESET_DICT;
-- header += 31 - (header % 31);
--
-- s->status = BUSY_STATE;
-- putShortMSB(s, header);
--
-- /* Save the adler32 of the preset dictionary: */
-- if (s->strstart != 0) {
-- putShortMSB(s, (uInt)(strm->adler >> 16));
-- putShortMSB(s, (uInt)(strm->adler & 0xffff));
-- }
-- strm->adler = adler32(0L, Z_NULL, 0);
-- }
-- }
--#ifdef GZIP
-- if (s->status == EXTRA_STATE) {
-- if (s->gzhead->extra != NULL) {
-- uInt beg = s->pending; /* start of bytes to update crc */
--
-- while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-- if (s->pending == s->pending_buf_size) {
-- if (s->gzhead->hcrc && s->pending > beg)
-- strm->adler = crc32(strm->adler, s->pending_buf + beg,
-- s->pending - beg);
-- flush_pending(strm);
-- beg = s->pending;
-- if (s->pending == s->pending_buf_size)
-- break;
-- }
-- put_byte(s, s->gzhead->extra[s->gzindex]);
-- s->gzindex++;
-- }
-- if (s->gzhead->hcrc && s->pending > beg)
-- strm->adler = crc32(strm->adler, s->pending_buf + beg,
-- s->pending - beg);
-- if (s->gzindex == s->gzhead->extra_len) {
-- s->gzindex = 0;
-- s->status = NAME_STATE;
-- }
-- }
-- else
-- s->status = NAME_STATE;
-- }
-- if (s->status == NAME_STATE) {
-- if (s->gzhead->name != NULL) {
-- uInt beg = s->pending; /* start of bytes to update crc */
-- int val;
--
-- do {
-- if (s->pending == s->pending_buf_size) {
-- if (s->gzhead->hcrc && s->pending > beg)
-- strm->adler = crc32(strm->adler, s->pending_buf + beg,
-- s->pending - beg);
-- flush_pending(strm);
-- beg = s->pending;
-- if (s->pending == s->pending_buf_size) {
-- val = 1;
-- break;
-- }
-- }
-- val = s->gzhead->name[s->gzindex++];
-- put_byte(s, val);
-- } while (val != 0);
-- if (s->gzhead->hcrc && s->pending > beg)
-- strm->adler = crc32(strm->adler, s->pending_buf + beg,
-- s->pending - beg);
-- if (val == 0) {
-- s->gzindex = 0;
-- s->status = COMMENT_STATE;
-- }
-- }
-- else
-- s->status = COMMENT_STATE;
-- }
-- if (s->status == COMMENT_STATE) {
-- if (s->gzhead->comment != NULL) {
-- uInt beg = s->pending; /* start of bytes to update crc */
-- int val;
--
-- do {
-- if (s->pending == s->pending_buf_size) {
-- if (s->gzhead->hcrc && s->pending > beg)
-- strm->adler = crc32(strm->adler, s->pending_buf + beg,
-- s->pending - beg);
-- flush_pending(strm);
-- beg = s->pending;
-- if (s->pending == s->pending_buf_size) {
-- val = 1;
-- break;
-- }
-- }
-- val = s->gzhead->comment[s->gzindex++];
-- put_byte(s, val);
-- } while (val != 0);
-- if (s->gzhead->hcrc && s->pending > beg)
-- strm->adler = crc32(strm->adler, s->pending_buf + beg,
-- s->pending - beg);
-- if (val == 0)
-- s->status = HCRC_STATE;
-- }
-- else
-- s->status = HCRC_STATE;
-- }
-- if (s->status == HCRC_STATE) {
-- if (s->gzhead->hcrc) {
-- if (s->pending + 2 > s->pending_buf_size)
-- flush_pending(strm);
-- if (s->pending + 2 <= s->pending_buf_size) {
-- put_byte(s, (Byte)(strm->adler & 0xff));
-- put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-- strm->adler = crc32(0L, Z_NULL, 0);
-- s->status = BUSY_STATE;
-- }
-- }
-- else
-- s->status = BUSY_STATE;
-- }
--#endif
--
-- /* Flush as much pending output as possible */
-- if (s->pending != 0) {
-- flush_pending(strm);
-- if (strm->avail_out == 0) {
-- /* Since avail_out is 0, deflate will be called again with
-- * more output space, but possibly with both pending and
-- * avail_in equal to zero. There won't be anything to do,
-- * but this is not an error situation so make sure we
-- * return OK instead of BUF_ERROR at next call of deflate:
-- */
-- s->last_flush = -1;
-- return Z_OK;
-- }
--
-- /* Make sure there is something to do and avoid duplicate consecutive
-- * flushes. For repeated and useless calls with Z_FINISH, we keep
-- * returning Z_STREAM_END instead of Z_BUF_ERROR.
-- */
-- } else if (strm->avail_in == 0 && flush <= old_flush &&
-- flush != Z_FINISH) {
-- ERR_RETURN(strm, Z_BUF_ERROR);
-- }
--
-- /* User must not provide more input after the first FINISH: */
-- if (s->status == FINISH_STATE && strm->avail_in != 0) {
-- ERR_RETURN(strm, Z_BUF_ERROR);
-- }
--
-- /* Start a new block or continue the current one.
-- */
-- if (strm->avail_in != 0 || s->lookahead != 0 ||
-- (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-- block_state bstate;
--
-- bstate = (*(configuration_table[s->level].func))(s, flush);
--
-- if (bstate == finish_started || bstate == finish_done) {
-- s->status = FINISH_STATE;
-- }
-- if (bstate == need_more || bstate == finish_started) {
-- if (strm->avail_out == 0) {
-- s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-- }
-- return Z_OK;
-- /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-- * of deflate should use the same flush parameter to make sure
-- * that the flush is complete. So we don't have to output an
-- * empty block here, this will be done at next call. This also
-- * ensures that for a very small output buffer, we emit at most
-- * one empty block.
-- */
-- }
-- if (bstate == block_done) {
-- if (flush == Z_PARTIAL_FLUSH) {
-- _tr_align(s);
-- } else { /* FULL_FLUSH or SYNC_FLUSH */
-- _tr_stored_block(s, (char*)0, 0L, 0);
-- /* For a full flush, this empty block will be recognized
-- * as a special marker by inflate_sync().
-- */
-- if (flush == Z_FULL_FLUSH) {
-- CLEAR_HASH(s); /* forget history */
-- }
-- }
-- flush_pending(strm);
-- if (strm->avail_out == 0) {
-- s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-- return Z_OK;
-- }
-- }
-- }
-- Assert(strm->avail_out > 0, "bug2");
--
-- if (flush != Z_FINISH) return Z_OK;
-- if (s->wrap <= 0) return Z_STREAM_END;
--
-- /* Write the trailer */
--#ifdef GZIP
-- if (s->wrap == 2) {
-- put_byte(s, (Byte)(strm->adler & 0xff));
-- put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-- put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-- put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-- put_byte(s, (Byte)(strm->total_in & 0xff));
-- put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-- put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-- put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-- }
-- else
--#endif
-- {
-- putShortMSB(s, (uInt)(strm->adler >> 16));
-- putShortMSB(s, (uInt)(strm->adler & 0xffff));
-- }
-- flush_pending(strm);
-- /* If avail_out is zero, the application will call deflate again
-- * to flush the rest.
-- */
-- if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-- return s->pending != 0 ? Z_OK : Z_STREAM_END;
--}
--
--/* ========================================================================= */
--int ZEXPORT deflateEnd (strm)
-- z_streamp strm;
--{
-- int status;
--
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
--
-- status = strm->state->status;
-- if (status != INIT_STATE &&
-- status != EXTRA_STATE &&
-- status != NAME_STATE &&
-- status != COMMENT_STATE &&
-- status != HCRC_STATE &&
-- status != BUSY_STATE &&
-- status != FINISH_STATE) {
-- return Z_STREAM_ERROR;
-- }
--
-- /* Deallocate in reverse order of allocations: */
-- TRY_FREE(strm, strm->state->pending_buf);
-- TRY_FREE(strm, strm->state->head);
-- TRY_FREE(strm, strm->state->prev);
-- TRY_FREE(strm, strm->state->window);
--
-- ZFREE(strm, strm->state);
-- strm->state = Z_NULL;
--
-- return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
--}
--
--/* =========================================================================
-- * Copy the source state to the destination state.
-- * To simplify the source, this is not supported for 16-bit MSDOS (which
-- * doesn't have enough memory anyway to duplicate compression states).
-- */
--int ZEXPORT deflateCopy (dest, source)
-- z_streamp dest;
-- z_streamp source;
--{
--#ifdef MAXSEG_64K
-- return Z_STREAM_ERROR;
--#else
-- deflate_state *ds;
-- deflate_state *ss;
-- ushf *overlay;
--
--
-- if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-- return Z_STREAM_ERROR;
-- }
--
-- ss = source->state;
--
-- zmemcpy(dest, source, sizeof(z_stream));
--
-- ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-- if (ds == Z_NULL) return Z_MEM_ERROR;
-- dest->state = (struct internal_state FAR *) ds;
-- zmemcpy(ds, ss, sizeof(deflate_state));
-- ds->strm = dest;
--
-- ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-- ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
-- ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
-- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-- ds->pending_buf = (uchf *) overlay;
--
-- if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-- ds->pending_buf == Z_NULL) {
-- deflateEnd (dest);
-- return Z_MEM_ERROR;
-- }
-- /* following zmemcpy do not work for 16-bit MSDOS */
-- zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-- zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-- zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
-- zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
--
-- ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
--
-- ds->l_desc.dyn_tree = ds->dyn_ltree;
-- ds->d_desc.dyn_tree = ds->dyn_dtree;
-- ds->bl_desc.dyn_tree = ds->bl_tree;
--
-- return Z_OK;
--#endif /* MAXSEG_64K */
--}
--
--/* ===========================================================================
-- * Read a new buffer from the current input stream, update the adler32
-- * and total number of bytes read. All deflate() input goes through
-- * this function so some applications may wish to modify it to avoid
-- * allocating a large strm->next_in buffer and copying from it.
-- * (See also flush_pending()).
-- */
--local int read_buf(strm, buf, size)
-- z_streamp strm;
-- Bytef *buf;
-- unsigned size;
--{
-- unsigned len = strm->avail_in;
--
-- if (len > size) len = size;
-- if (len == 0) return 0;
--
-- strm->avail_in -= len;
--
-- if (strm->state->wrap == 1) {
-- strm->adler = adler32(strm->adler, strm->next_in, len);
-- }
--#ifdef GZIP
-- else if (strm->state->wrap == 2) {
-- strm->adler = crc32(strm->adler, strm->next_in, len);
-- }
--#endif
-- zmemcpy(buf, strm->next_in, len);
-- strm->next_in += len;
-- strm->total_in += len;
--
-- return (int)len;
--}
--
--/* ===========================================================================
-- * Initialize the "longest match" routines for a new zlib stream
-- */
--local void lm_init (s)
-- deflate_state *s;
--{
-- s->window_size = (ulg)2L*s->w_size;
--
-- CLEAR_HASH(s);
--
-- /* Set the default configuration parameters:
-- */
-- s->max_lazy_match = configuration_table[s->level].max_lazy;
-- s->good_match = configuration_table[s->level].good_length;
-- s->nice_match = configuration_table[s->level].nice_length;
-- s->max_chain_length = configuration_table[s->level].max_chain;
--
-- s->strstart = 0;
-- s->block_start = 0L;
-- s->lookahead = 0;
-- s->match_length = s->prev_length = MIN_MATCH-1;
-- s->match_available = 0;
-- s->ins_h = 0;
--#ifndef FASTEST
--#ifdef ASMV
-- match_init(); /* initialize the asm code */
--#endif
--#endif
--}
--
--#ifndef FASTEST
--/* ===========================================================================
-- * Set match_start to the longest match starting at the given string and
-- * return its length. Matches shorter or equal to prev_length are discarded,
-- * in which case the result is equal to prev_length and match_start is
-- * garbage.
-- * IN assertions: cur_match is the head of the hash chain for the current
-- * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
-- * OUT assertion: the match length is not greater than s->lookahead.
-- */
--#ifndef ASMV
--/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
-- * match.S. The code will be functionally equivalent.
-- */
--local uInt longest_match(s, cur_match)
-- deflate_state *s;
-- IPos cur_match; /* current match */
--{
-- unsigned chain_length = s->max_chain_length;/* max hash chain length */
-- register Bytef *scan = s->window + s->strstart; /* current string */
-- register Bytef *match; /* matched string */
-- register int len; /* length of current match */
-- int best_len = s->prev_length; /* best match length so far */
-- int nice_match = s->nice_match; /* stop if match long enough */
-- IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-- s->strstart - (IPos)MAX_DIST(s) : NIL;
-- /* Stop when cur_match becomes <= limit. To simplify the code,
-- * we prevent matches with the string of window index 0.
-- */
-- Posf *prev = s->prev;
-- uInt wmask = s->w_mask;
--
--#ifdef UNALIGNED_OK
-- /* Compare two bytes at a time. Note: this is not always beneficial.
-- * Try with and without -DUNALIGNED_OK to check.
-- */
-- register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-- register ush scan_start = *(ushf*)scan;
-- register ush scan_end = *(ushf*)(scan+best_len-1);
--#else
-- register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-- register Byte scan_end1 = scan[best_len-1];
-- register Byte scan_end = scan[best_len];
--#endif
--
-- /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-- * It is easy to get rid of this optimization if necessary.
-- */
-- Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
--
-- /* Do not waste too much time if we already have a good match: */
-- if (s->prev_length >= s->good_match) {
-- chain_length >>= 2;
-- }
-- /* Do not look for matches beyond the end of the input. This is necessary
-- * to make deflate deterministic.
-- */
-- if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
--
-- Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
--
-- do {
-- Assert(cur_match < s->strstart, "no future");
-- match = s->window + cur_match;
--
-- /* Skip to next match if the match length cannot increase
-- * or if the match length is less than 2. Note that the checks below
-- * for insufficient lookahead only occur occasionally for performance
-- * reasons. Therefore uninitialized memory will be accessed, and
-- * conditional jumps will be made that depend on those values.
-- * However the length of the match is limited to the lookahead, so
-- * the output of deflate is not affected by the uninitialized values.
-- */
--#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-- /* This code assumes sizeof(unsigned short) == 2. Do not use
-- * UNALIGNED_OK if your compiler uses a different size.
-- */
-- if (*(ushf*)(match+best_len-1) != scan_end ||
-- *(ushf*)match != scan_start) continue;
--
-- /* It is not necessary to compare scan[2] and match[2] since they are
-- * always equal when the other bytes match, given that the hash keys
-- * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-- * strstart+3, +5, ... up to strstart+257. We check for insufficient
-- * lookahead only every 4th comparison; the 128th check will be made
-- * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-- * necessary to put more guard bytes at the end of the window, or
-- * to check more often for insufficient lookahead.
-- */
-- Assert(scan[2] == match[2], "scan[2]?");
-- scan++, match++;
-- do {
-- } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-- scan < strend);
-- /* The funny "do {}" generates better code on most compilers */
--
-- /* Here, scan <= window+strstart+257 */
-- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-- if (*scan == *match) scan++;
--
-- len = (MAX_MATCH - 1) - (int)(strend-scan);
-- scan = strend - (MAX_MATCH-1);
--
--#else /* UNALIGNED_OK */
--
-- if (match[best_len] != scan_end ||
-- match[best_len-1] != scan_end1 ||
-- *match != *scan ||
-- *++match != scan[1]) continue;
--
-- /* The check at best_len-1 can be removed because it will be made
-- * again later. (This heuristic is not always a win.)
-- * It is not necessary to compare scan[2] and match[2] since they
-- * are always equal when the other bytes match, given that
-- * the hash keys are equal and that HASH_BITS >= 8.
-- */
-- scan += 2, match++;
-- Assert(*scan == *match, "match[2]?");
--
-- /* We check for insufficient lookahead only every 8th comparison;
-- * the 256th check will be made at strstart+258.
-- */
-- do {
-- } while (*++scan == *++match && *++scan == *++match &&
-- *++scan == *++match && *++scan == *++match &&
-- *++scan == *++match && *++scan == *++match &&
-- *++scan == *++match && *++scan == *++match &&
-- scan < strend);
--
-- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
--
-- len = MAX_MATCH - (int)(strend - scan);
-- scan = strend - MAX_MATCH;
--
--#endif /* UNALIGNED_OK */
--
-- if (len > best_len) {
-- s->match_start = cur_match;
-- best_len = len;
-- if (len >= nice_match) break;
--#ifdef UNALIGNED_OK
-- scan_end = *(ushf*)(scan+best_len-1);
--#else
-- scan_end1 = scan[best_len-1];
-- scan_end = scan[best_len];
--#endif
-- }
-- } while ((cur_match = prev[cur_match & wmask]) > limit
-- && --chain_length != 0);
--
-- if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-- return s->lookahead;
--}
--#endif /* ASMV */
--#endif /* FASTEST */
--
--/* ---------------------------------------------------------------------------
-- * Optimized version for level == 1 or strategy == Z_RLE only
-- */
--local uInt longest_match_fast(s, cur_match)
-- deflate_state *s;
-- IPos cur_match; /* current match */
--{
-- register Bytef *scan = s->window + s->strstart; /* current string */
-- register Bytef *match; /* matched string */
-- register int len; /* length of current match */
-- register Bytef *strend = s->window + s->strstart + MAX_MATCH;
--
-- /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-- * It is easy to get rid of this optimization if necessary.
-- */
-- Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
--
-- Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
--
-- Assert(cur_match < s->strstart, "no future");
--
-- match = s->window + cur_match;
--
-- /* Return failure if the match length is less than 2:
-- */
-- if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
--
-- /* The check at best_len-1 can be removed because it will be made
-- * again later. (This heuristic is not always a win.)
-- * It is not necessary to compare scan[2] and match[2] since they
-- * are always equal when the other bytes match, given that
-- * the hash keys are equal and that HASH_BITS >= 8.
-- */
-- scan += 2, match += 2;
-- Assert(*scan == *match, "match[2]?");
--
-- /* We check for insufficient lookahead only every 8th comparison;
-- * the 256th check will be made at strstart+258.
-- */
-- do {
-- } while (*++scan == *++match && *++scan == *++match &&
-- *++scan == *++match && *++scan == *++match &&
-- *++scan == *++match && *++scan == *++match &&
-- *++scan == *++match && *++scan == *++match &&
-- scan < strend);
--
-- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
--
-- len = MAX_MATCH - (int)(strend - scan);
--
-- if (len < MIN_MATCH) return MIN_MATCH - 1;
--
-- s->match_start = cur_match;
-- return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
--}
--
--#ifdef DEBUG
--/* ===========================================================================
-- * Check that the match at match_start is indeed a match.
-- */
--local void check_match(s, start, match, length)
-- deflate_state *s;
-- IPos start, match;
-- int length;
--{
-- /* check that the match is indeed a match */
-- if (zmemcmp(s->window + match,
-- s->window + start, length) != EQUAL) {
-- fprintf(stderr, " start %u, match %u, length %d\n",
-- start, match, length);
-- do {
-- fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-- } while (--length != 0);
-- z_error("invalid match");
-- }
-- if (z_verbose > 1) {
-- fprintf(stderr,"\\[%d,%d]", start-match, length);
-- do { putc(s->window[start++], stderr); } while (--length != 0);
-- }
--}
--#else
--# define check_match(s, start, match, length)
--#endif /* DEBUG */
--
--/* ===========================================================================
-- * Fill the window when the lookahead becomes insufficient.
-- * Updates strstart and lookahead.
-- *
-- * IN assertion: lookahead < MIN_LOOKAHEAD
-- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
-- * At least one byte has been read, or avail_in == 0; reads are
-- * performed for at least two bytes (required for the zip translate_eol
-- * option -- not supported here).
-- */
--local void fill_window(s)
-- deflate_state *s;
--{
-- register unsigned n, m;
-- register Posf *p;
-- unsigned more; /* Amount of free space at the end of the window. */
-- uInt wsize = s->w_size;
--
-- do {
-- more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
--
-- /* Deal with !@#$% 64K limit: */
-- if (sizeof(int) <= 2) {
-- if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-- more = wsize;
--
-- } else if (more == (unsigned)(-1)) {
-- /* Very unlikely, but possible on 16 bit machine if
-- * strstart == 0 && lookahead == 1 (input done a byte at time)
-- */
-- more--;
-- }
-- }
--
-- /* If the window is almost full and there is insufficient lookahead,
-- * move the upper half to the lower one to make room in the upper half.
-- */
-- if (s->strstart >= wsize+MAX_DIST(s)) {
--
-- zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-- s->match_start -= wsize;
-- s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
-- s->block_start -= (long) wsize;
--
-- /* Slide the hash table (could be avoided with 32 bit values
-- at the expense of memory usage). We slide even when level == 0
-- to keep the hash table consistent if we switch back to level > 0
-- later. (Using level 0 permanently is not an optimal usage of
-- zlib, so we don't care about this pathological case.)
-- */
-- /* %%% avoid this when Z_RLE */
-- n = s->hash_size;
-- p = &s->head[n];
-- do {
-- m = *--p;
-- *p = (Pos)(m >= wsize ? m-wsize : NIL);
-- } while (--n);
--
-- n = wsize;
--#ifndef FASTEST
-- p = &s->prev[n];
-- do {
-- m = *--p;
-- *p = (Pos)(m >= wsize ? m-wsize : NIL);
-- /* If n is not on any hash chain, prev[n] is garbage but
-- * its value will never be used.
-- */
-- } while (--n);
--#endif
-- more += wsize;
-- }
-- if (s->strm->avail_in == 0) return;
--
-- /* If there was no sliding:
-- * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-- * more == window_size - lookahead - strstart
-- * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-- * => more >= window_size - 2*WSIZE + 2
-- * In the BIG_MEM or MMAP case (not yet supported),
-- * window_size == input_size + MIN_LOOKAHEAD &&
-- * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-- * Otherwise, window_size == 2*WSIZE so more >= 2.
-- * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-- */
-- Assert(more >= 2, "more < 2");
--
-- n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-- s->lookahead += n;
--
-- /* Initialize the hash value now that we have some input: */
-- if (s->lookahead >= MIN_MATCH) {
-- s->ins_h = s->window[s->strstart];
-- UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
--#if MIN_MATCH != 3
-- Call UPDATE_HASH() MIN_MATCH-3 more times
--#endif
-- }
-- /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-- * but this is not important since only literal bytes will be emitted.
-- */
--
-- } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
--}
--
--/* ===========================================================================
-- * Flush the current block, with given end-of-file flag.
-- * IN assertion: strstart is set to the end of the current match.
-- */
--#define FLUSH_BLOCK_ONLY(s, eof) { \
-- _tr_flush_block(s, (s->block_start >= 0L ? \
-- (charf *)&s->window[(unsigned)s->block_start] : \
-- (charf *)Z_NULL), \
-- (ulg)((long)s->strstart - s->block_start), \
-- (eof)); \
-- s->block_start = s->strstart; \
-- flush_pending(s->strm); \
-- Tracev((stderr,"[FLUSH]")); \
--}
--
--/* Same but force premature exit if necessary. */
--#define FLUSH_BLOCK(s, eof) { \
-- FLUSH_BLOCK_ONLY(s, eof); \
-- if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
--}
--
--/* ===========================================================================
-- * Copy without compression as much as possible from the input stream, return
-- * the current block state.
-- * This function does not insert new strings in the dictionary since
-- * uncompressible data is probably not useful. This function is used
-- * only for the level=0 compression option.
-- * NOTE: this function should be optimized to avoid extra copying from
-- * window to pending_buf.
-- */
--local block_state deflate_stored(s, flush)
-- deflate_state *s;
-- int flush;
--{
-- /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-- * to pending_buf_size, and each stored block has a 5 byte header:
-- */
-- ulg max_block_size = 0xffff;
-- ulg max_start;
--
-- if (max_block_size > s->pending_buf_size - 5) {
-- max_block_size = s->pending_buf_size - 5;
-- }
--
-- /* Copy as much as possible from input to output: */
-- for (;;) {
-- /* Fill the window as much as possible: */
-- if (s->lookahead <= 1) {
--
-- Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-- s->block_start >= (long)s->w_size, "slide too late");
--
-- fill_window(s);
-- if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
--
-- if (s->lookahead == 0) break; /* flush the current block */
-- }
-- Assert(s->block_start >= 0L, "block gone");
--
-- s->strstart += s->lookahead;
-- s->lookahead = 0;
--
-- /* Emit a stored block if pending_buf will be full: */
-- max_start = s->block_start + max_block_size;
-- if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-- /* strstart == 0 is possible when wraparound on 16-bit machine */
-- s->lookahead = (uInt)(s->strstart - max_start);
-- s->strstart = (uInt)max_start;
-- FLUSH_BLOCK(s, 0);
-- }
-- /* Flush if we may have to slide, otherwise block_start may become
-- * negative and the data will be gone:
-- */
-- if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-- FLUSH_BLOCK(s, 0);
-- }
-- }
-- FLUSH_BLOCK(s, flush == Z_FINISH);
-- return flush == Z_FINISH ? finish_done : block_done;
--}
--
--/* ===========================================================================
-- * Compress as much as possible from the input stream, return the current
-- * block state.
-- * This function does not perform lazy evaluation of matches and inserts
-- * new strings in the dictionary only for unmatched strings or for short
-- * matches. It is used only for the fast compression options.
-- */
--local block_state deflate_fast(s, flush)
-- deflate_state *s;
-- int flush;
--{
-- IPos hash_head = NIL; /* head of the hash chain */
-- int bflush; /* set if current block must be flushed */
--
-- for (;;) {
-- /* Make sure that we always have enough lookahead, except
-- * at the end of the input file. We need MAX_MATCH bytes
-- * for the next match, plus MIN_MATCH bytes to insert the
-- * string following the next match.
-- */
-- if (s->lookahead < MIN_LOOKAHEAD) {
-- fill_window(s);
-- if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-- return need_more;
-- }
-- if (s->lookahead == 0) break; /* flush the current block */
-- }
--
-- /* Insert the string window[strstart .. strstart+2] in the
-- * dictionary, and set hash_head to the head of the hash chain:
-- */
-- if (s->lookahead >= MIN_MATCH) {
-- INSERT_STRING(s, s->strstart, hash_head);
-- }
--
-- /* Find the longest match, discarding those <= prev_length.
-- * At this point we have always match_length < MIN_MATCH
-- */
-- if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-- /* To simplify the code, we prevent matches with the string
-- * of window index 0 (in particular we have to avoid a match
-- * of the string with itself at the start of the input file).
-- */
--#ifdef FASTEST
-- if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
-- (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
-- s->match_length = longest_match_fast (s, hash_head);
-- }
--#else
-- if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-- s->match_length = longest_match (s, hash_head);
-- } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-- s->match_length = longest_match_fast (s, hash_head);
-- }
--#endif
-- /* longest_match() or longest_match_fast() sets match_start */
-- }
-- if (s->match_length >= MIN_MATCH) {
-- check_match(s, s->strstart, s->match_start, s->match_length);
--
-- _tr_tally_dist(s, s->strstart - s->match_start,
-- s->match_length - MIN_MATCH, bflush);
--
-- s->lookahead -= s->match_length;
--
-- /* Insert new strings in the hash table only if the match length
-- * is not too large. This saves time but degrades compression.
-- */
--#ifndef FASTEST
-- if (s->match_length <= s->max_insert_length &&
-- s->lookahead >= MIN_MATCH) {
-- s->match_length--; /* string at strstart already in table */
-- do {
-- s->strstart++;
-- INSERT_STRING(s, s->strstart, hash_head);
-- /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-- * always MIN_MATCH bytes ahead.
-- */
-- } while (--s->match_length != 0);
-- s->strstart++;
-- } else
--#endif
-- {
-- s->strstart += s->match_length;
-- s->match_length = 0;
-- s->ins_h = s->window[s->strstart];
-- UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
--#if MIN_MATCH != 3
-- Call UPDATE_HASH() MIN_MATCH-3 more times
--#endif
-- /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-- * matter since it will be recomputed at next deflate call.
-- */
-- }
-- } else {
-- /* No match, output a literal byte */
-- Tracevv((stderr,"%c", s->window[s->strstart]));
-- _tr_tally_lit (s, s->window[s->strstart], bflush);
-- s->lookahead--;
-- s->strstart++;
-- }
-- if (bflush) FLUSH_BLOCK(s, 0);
-- }
-- FLUSH_BLOCK(s, flush == Z_FINISH);
-- return flush == Z_FINISH ? finish_done : block_done;
--}
--
--#ifndef FASTEST
--/* ===========================================================================
-- * Same as above, but achieves better compression. We use a lazy
-- * evaluation for matches: a match is finally adopted only if there is
-- * no better match at the next window position.
-- */
--local block_state deflate_slow(s, flush)
-- deflate_state *s;
-- int flush;
--{
-- IPos hash_head = NIL; /* head of hash chain */
-- int bflush; /* set if current block must be flushed */
--
-- /* Process the input block. */
-- for (;;) {
-- /* Make sure that we always have enough lookahead, except
-- * at the end of the input file. We need MAX_MATCH bytes
-- * for the next match, plus MIN_MATCH bytes to insert the
-- * string following the next match.
-- */
-- if (s->lookahead < MIN_LOOKAHEAD) {
-- fill_window(s);
-- if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-- return need_more;
-- }
-- if (s->lookahead == 0) break; /* flush the current block */
-- }
--
-- /* Insert the string window[strstart .. strstart+2] in the
-- * dictionary, and set hash_head to the head of the hash chain:
-- */
-- if (s->lookahead >= MIN_MATCH) {
-- INSERT_STRING(s, s->strstart, hash_head);
-- }
--
-- /* Find the longest match, discarding those <= prev_length.
-- */
-- s->prev_length = s->match_length, s->prev_match = s->match_start;
-- s->match_length = MIN_MATCH-1;
--
-- if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-- s->strstart - hash_head <= MAX_DIST(s)) {
-- /* To simplify the code, we prevent matches with the string
-- * of window index 0 (in particular we have to avoid a match
-- * of the string with itself at the start of the input file).
-- */
-- if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-- s->match_length = longest_match (s, hash_head);
-- } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-- s->match_length = longest_match_fast (s, hash_head);
-- }
-- /* longest_match() or longest_match_fast() sets match_start */
--
-- if (s->match_length <= 5 && (s->strategy == Z_FILTERED
--#if TOO_FAR <= 32767
-- || (s->match_length == MIN_MATCH &&
-- s->strstart - s->match_start > TOO_FAR)
--#endif
-- )) {
--
-- /* If prev_match is also MIN_MATCH, match_start is garbage
-- * but we will ignore the current match anyway.
-- */
-- s->match_length = MIN_MATCH-1;
-- }
-- }
-- /* If there was a match at the previous step and the current
-- * match is not better, output the previous match:
-- */
-- if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-- uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-- /* Do not insert strings in hash table beyond this. */
--
-- check_match(s, s->strstart-1, s->prev_match, s->prev_length);
--
-- _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-- s->prev_length - MIN_MATCH, bflush);
--
-- /* Insert in hash table all strings up to the end of the match.
-- * strstart-1 and strstart are already inserted. If there is not
-- * enough lookahead, the last two strings are not inserted in
-- * the hash table.
-- */
-- s->lookahead -= s->prev_length-1;
-- s->prev_length -= 2;
-- do {
-- if (++s->strstart <= max_insert) {
-- INSERT_STRING(s, s->strstart, hash_head);
-- }
-- } while (--s->prev_length != 0);
-- s->match_available = 0;
-- s->match_length = MIN_MATCH-1;
-- s->strstart++;
--
-- if (bflush) FLUSH_BLOCK(s, 0);
--
-- } else if (s->match_available) {
-- /* If there was no match at the previous position, output a
-- * single literal. If there was a match but the current match
-- * is longer, truncate the previous match to a single literal.
-- */
-- Tracevv((stderr,"%c", s->window[s->strstart-1]));
-- _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-- if (bflush) {
-- FLUSH_BLOCK_ONLY(s, 0);
-- }
-- s->strstart++;
-- s->lookahead--;
-- if (s->strm->avail_out == 0) return need_more;
-- } else {
-- /* There is no previous match to compare with, wait for
-- * the next step to decide.
-- */
-- s->match_available = 1;
-- s->strstart++;
-- s->lookahead--;
-- }
-- }
-- Assert (flush != Z_NO_FLUSH, "no flush?");
-- if (s->match_available) {
-- Tracevv((stderr,"%c", s->window[s->strstart-1]));
-- _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-- s->match_available = 0;
-- }
-- FLUSH_BLOCK(s, flush == Z_FINISH);
-- return flush == Z_FINISH ? finish_done : block_done;
--}
--#endif /* FASTEST */
--
--#if 0
--/* ===========================================================================
-- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
-- * one. Do not maintain a hash table. (It will be regenerated if this run of
-- * deflate switches away from Z_RLE.)
-- */
--local block_state deflate_rle(s, flush)
-- deflate_state *s;
-- int flush;
--{
-- int bflush; /* set if current block must be flushed */
-- uInt run; /* length of run */
-- uInt max; /* maximum length of run */
-- uInt prev; /* byte at distance one to match */
-- Bytef *scan; /* scan for end of run */
--
-- for (;;) {
-- /* Make sure that we always have enough lookahead, except
-- * at the end of the input file. We need MAX_MATCH bytes
-- * for the longest encodable run.
-- */
-- if (s->lookahead < MAX_MATCH) {
-- fill_window(s);
-- if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
-- return need_more;
-- }
-- if (s->lookahead == 0) break; /* flush the current block */
-- }
--
-- /* See how many times the previous byte repeats */
-- run = 0;
-- if (s->strstart > 0) { /* if there is a previous byte, that is */
-- max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
-- scan = s->window + s->strstart - 1;
-- prev = *scan++;
-- do {
-- if (*scan++ != prev)
-- break;
-- } while (++run < max);
-- }
--
-- /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-- if (run >= MIN_MATCH) {
-- check_match(s, s->strstart, s->strstart - 1, run);
-- _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
-- s->lookahead -= run;
-- s->strstart += run;
-- } else {
-- /* No match, output a literal byte */
-- Tracevv((stderr,"%c", s->window[s->strstart]));
-- _tr_tally_lit (s, s->window[s->strstart], bflush);
-- s->lookahead--;
-- s->strstart++;
-- }
-- if (bflush) FLUSH_BLOCK(s, 0);
-- }
-- FLUSH_BLOCK(s, flush == Z_FINISH);
-- return flush == Z_FINISH ? finish_done : block_done;
--}
--#endif
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,355 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* deflate.h -- internal compression state
-- * Copyright (C) 1995-2004 Jean-loup Gailly
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* WARNING: this file should *not* be used by applications. It is
-- part of the implementation of the compression library and is
-- subject to change. Applications should only use zlib.h.
-- */
--
--/* @(#) $Id$ */
--
--#ifndef DEFLATE_H
--#define DEFLATE_H
--
--#include "zutil.h"
--
--/* define NO_GZIP when compiling if you want to disable gzip header and
-- trailer creation by deflate(). NO_GZIP would be used to avoid linking in
-- the crc code when it is not needed. For shared libraries, gzip encoding
-- should be left enabled. */
--#ifndef NO_GZIP
--# define GZIP
--#endif
--
--/* ===========================================================================
-- * Internal compression state.
-- */
--
--#define LENGTH_CODES 29
--/* number of length codes, not counting the special END_BLOCK code */
--
--#define LITERALS 256
--/* number of literal bytes 0..255 */
--
--#define L_CODES (LITERALS+1+LENGTH_CODES)
--/* number of Literal or Length codes, including the END_BLOCK code */
--
--#define D_CODES 30
--/* number of distance codes */
--
--#define BL_CODES 19
--/* number of codes used to transfer the bit lengths */
--
--#define HEAP_SIZE (2*L_CODES+1)
--/* maximum heap size */
--
--#define MAX_BITS 15
--/* All codes must not exceed MAX_BITS bits */
--
--#define INIT_STATE 42
--#define EXTRA_STATE 69
--#define NAME_STATE 73
--#define COMMENT_STATE 91
--#define HCRC_STATE 103
--#define BUSY_STATE 113
--#define FINISH_STATE 666
--/* Stream status */
--
--
--/* Data structure describing a single value and its code string. */
--typedef struct ct_data_s {
-- union {
-- ush freq; /* frequency count */
-- ush code; /* bit string */
-- } fc;
-- union {
-- ush dad; /* father node in Huffman tree */
-- ush len; /* length of bit string */
-- } dl;
--} FAR ct_data;
--
--#define Freq fc.freq
--#define Code fc.code
--#define Dad dl.dad
--#define Len dl.len
--
--typedef struct static_tree_desc_s static_tree_desc;
--
--typedef struct tree_desc_s {
-- ct_data *dyn_tree; /* the dynamic tree */
-- int max_code; /* largest code with non zero frequency */
-- static_tree_desc *stat_desc; /* the corresponding static tree */
--} FAR tree_desc;
--
--typedef ush Pos;
--typedef Pos FAR Posf;
--typedef unsigned IPos;
--
--/* A Pos is an index in the character window. We use short instead of int to
-- * save space in the various tables. IPos is used only for parameter passing.
-- */
--
--typedef struct internal_state {
-- z_streamp strm; /* pointer back to this zlib stream */
-- int status; /* as the name implies */
-- Bytef *pending_buf; /* output still pending */
-- ulg pending_buf_size; /* size of pending_buf */
-- Bytef *pending_out; /* next pending byte to output to the stream */
-- uInt pending; /* nb of bytes in the pending buffer */
-- int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
-- gz_headerp gzhead; /* gzip header information to write */
-- uInt gzindex; /* where in extra, name, or comment */
-- Byte method; /* STORED (for zip only) or DEFLATED */
-- int last_flush; /* value of flush param for previous deflate call */
--
-- /* used by deflate.c: */
--
-- uInt w_size; /* LZ77 window size (32K by default) */
-- uInt w_bits; /* log2(w_size) (8..16) */
-- uInt w_mask; /* w_size - 1 */
--
-- Bytef *window;
-- /* Sliding window. Input bytes are read into the second half of the window,
-- * and move to the first half later to keep a dictionary of at least wSize
-- * bytes. With this organization, matches are limited to a distance of
-- * wSize-MAX_MATCH bytes, but this ensures that IO is always
-- * performed with a length multiple of the block size. Also, it limits
-- * the window size to 64K, which is quite useful on MSDOS.
-- * To do: use the user input buffer as sliding window.
-- */
--
-- ulg window_size;
-- /* Actual size of window: 2*wSize, except when the user input buffer
-- * is directly used as sliding window.
-- */
--
-- Posf *prev;
-- /* Link to older string with same hash index. To limit the size of this
-- * array to 64K, this link is maintained only for the last 32K strings.
-- * An index in this array is thus a window index modulo 32K.
-- */
--
-- Posf *head; /* Heads of the hash chains or NIL. */
--
-- uInt ins_h; /* hash index of string to be inserted */
-- uInt hash_size; /* number of elements in hash table */
-- uInt hash_bits; /* log2(hash_size) */
-- uInt hash_mask; /* hash_size-1 */
--
-- uInt hash_shift;
-- /* Number of bits by which ins_h must be shifted at each input
-- * step. It must be such that after MIN_MATCH steps, the oldest
-- * byte no longer takes part in the hash key, that is:
-- * hash_shift * MIN_MATCH >= hash_bits
-- */
--
-- long block_start;
-- /* Window position at the beginning of the current output block. Gets
-- * negative when the window is moved backwards.
-- */
--
-- uInt match_length; /* length of best match */
-- IPos prev_match; /* previous match */
-- int match_available; /* set if previous match exists */
-- uInt strstart; /* start of string to insert */
-- uInt match_start; /* start of matching string */
-- uInt lookahead; /* number of valid bytes ahead in window */
--
-- uInt prev_length;
-- /* Length of the best match at previous step. Matches not greater than this
-- * are discarded. This is used in the lazy match evaluation.
-- */
--
-- uInt max_chain_length;
-- /* To speed up deflation, hash chains are never searched beyond this
-- * length. A higher limit improves compression ratio but degrades the
-- * speed.
-- */
--
-- uInt max_lazy_match;
-- /* Attempt to find a better match only when the current match is strictly
-- * smaller than this value. This mechanism is used only for compression
-- * levels >= 4.
-- */
--# define max_insert_length max_lazy_match
-- /* Insert new strings in the hash table only if the match length is not
-- * greater than this length. This saves time but degrades compression.
-- * max_insert_length is used only for compression levels <= 3.
-- */
--
-- int level; /* compression level (1..9) */
-- int strategy; /* favor or force Huffman coding*/
--
-- uInt good_match;
-- /* Use a faster search when the previous match is longer than this */
--
-- int nice_match; /* Stop searching when current match exceeds this */
--
-- /* used by trees.c: */
-- /* Didn't use ct_data typedef below to supress compiler warning */
-- struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
-- struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-- struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
--
-- struct tree_desc_s l_desc; /* desc. for literal tree */
-- struct tree_desc_s d_desc; /* desc. for distance tree */
-- struct tree_desc_s bl_desc; /* desc. for bit length tree */
--
-- ush bl_count[MAX_BITS+1];
-- /* number of codes at each bit length for an optimal tree */
--
-- int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */
-- int heap_len; /* number of elements in the heap */
-- int heap_max; /* element of largest frequency */
-- /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-- * The same heap array is used to build all trees.
-- */
--
-- uch depth[2*L_CODES+1];
-- /* Depth of each subtree used as tie breaker for trees of equal frequency
-- */
--
-- uchf *l_buf; /* buffer for literals or lengths */
--
-- uInt lit_bufsize;
-- /* Size of match buffer for literals/lengths. There are 4 reasons for
-- * limiting lit_bufsize to 64K:
-- * - frequencies can be kept in 16 bit counters
-- * - if compression is not successful for the first block, all input
-- * data is still in the window so we can still emit a stored block even
-- * when input comes from standard input. (This can also be done for
-- * all blocks if lit_bufsize is not greater than 32K.)
-- * - if compression is not successful for a file smaller than 64K, we can
-- * even emit a stored file instead of a stored block (saving 5 bytes).
-- * This is applicable only for zip (not gzip or zlib).
-- * - creating new Huffman trees less frequently may not provide fast
-- * adaptation to changes in the input data statistics. (Take for
-- * example a binary file with poorly compressible code followed by
-- * a highly compressible string table.) Smaller buffer sizes give
-- * fast adaptation but have of course the overhead of transmitting
-- * trees more frequently.
-- * - I can't count above 4
-- */
--
-- uInt last_lit; /* running index in l_buf */
--
-- ushf *d_buf;
-- /* Buffer for distances. To simplify the code, d_buf and l_buf have
-- * the same number of elements. To use different lengths, an extra flag
-- * array would be necessary.
-- */
--
-- ulg opt_len; /* bit length of current block with optimal trees */
-- ulg static_len; /* bit length of current block with static trees */
-- uInt matches; /* number of string matches in current block */
-- int last_eob_len; /* bit length of EOB code for last block */
--
--#ifdef DEBUG
-- ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-- ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
--#endif
--
-- ush bi_buf;
-- /* Output buffer. bits are inserted starting at the bottom (least
-- * significant bits).
-- */
-- int bi_valid;
-- /* Number of valid bits in bi_buf. All bits above the last valid bit
-- * are always zero.
-- */
--
--} FAR deflate_state;
--
--/* Output a byte on the stream.
-- * IN assertion: there is enough room in pending_buf.
-- */
--#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
--
--
--#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
--/* Minimum amount of lookahead, except at the end of the input file.
-- * See deflate.c for comments about the MIN_MATCH+1.
-- */
--
--#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD)
--/* In order to simplify the code, particularly on 16 bit machines, match
-- * distances are limited to MAX_DIST instead of WSIZE.
-- */
--
-- /* in trees.c */
--void _tr_init OF((deflate_state *s));
--int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
--void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len,
-- int eof));
--void _tr_align OF((deflate_state *s));
--void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-- int eof));
--
--#define d_code(dist) \
-- ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
--/* Mapping from a distance to a distance code. dist is the distance - 1 and
-- * must not have side effects. _dist_code[256] and _dist_code[257] are never
-- * used.
-- */
--
--#ifndef DEBUG
--/* Inline versions of _tr_tally for speed: */
--
--#if defined(GEN_TREES_H) || !defined(STDC)
-- extern uch _length_code[];
-- extern uch _dist_code[];
--#else
-- extern const uch _length_code[];
-- extern const uch _dist_code[];
--#endif
--
--# define _tr_tally_lit(s, c, flush) \
-- { uch cc = (c); \
-- s->d_buf[s->last_lit] = 0; \
-- s->l_buf[s->last_lit++] = cc; \
-- s->dyn_ltree[cc].Freq++; \
-- flush = (s->last_lit == s->lit_bufsize-1); \
-- }
--# define _tr_tally_dist(s, distance, length, flush) \
-- { uch len = (length); \
-- ush dist = (distance); \
-- s->d_buf[s->last_lit] = dist; \
-- s->l_buf[s->last_lit++] = len; \
-- dist--; \
-- s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-- s->dyn_dtree[d_code(dist)].Freq++; \
-- flush = (s->last_lit == s->lit_bufsize-1); \
-- }
--#else
--# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
--# define _tr_tally_dist(s, distance, length, flush) \
-- flush = _tr_tally(s, distance, length)
--#endif
--
--#endif /* DEFLATE_H */
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,1050 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* gzio.c -- IO on .gz files
-- * Copyright (C) 1995-2005 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- *
-- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
-- */
--
--/* @(#) $Id$ */
--
--#include <stdio.h>
--
--#include "zutil.h"
--
--#ifdef NO_DEFLATE /* for compatibility with old definition */
--# define NO_GZCOMPRESS
--#endif
--
--#ifndef NO_DUMMY_DECL
--struct internal_state {int dummy;}; /* for buggy compilers */
--#endif
--
--#ifndef Z_BUFSIZE
--# ifdef MAXSEG_64K
--# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
--# else
--# define Z_BUFSIZE 16384
--# endif
--#endif
--#ifndef Z_PRINTF_BUFSIZE
--# define Z_PRINTF_BUFSIZE 4096
--#endif
--
--#ifdef __MVS__
--# pragma map (fdopen , "\174\174FDOPEN")
-- FILE *fdopen(int, const char *);
--#endif
--
--#ifndef STDC
--extern voidp malloc OF((uInt size));
--extern void free OF((voidpf ptr));
--#endif
--
--#define ALLOC(size) malloc(size)
--#define TRYFREE(p) {if (p) free(p);}
--
--static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
--
--/* gzip flag byte */
--#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
--#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
--#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
--#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
--#define COMMENT 0x10 /* bit 4 set: file comment present */
--#define RESERVED 0xE0 /* bits 5..7: reserved */
--
--typedef struct gz_stream {
-- z_stream stream;
-- int z_err; /* error code for last stream operation */
-- int z_eof; /* set if end of input file */
-- FILE *file; /* .gz file */
-- Byte *inbuf; /* input buffer */
-- Byte *outbuf; /* output buffer */
-- uLong crc; /* crc32 of uncompressed data */
-- char *msg; /* error message */
-- char *path; /* path name for debugging only */
-- int transparent; /* 1 if input file is not a .gz file */
-- char mode; /* 'w' or 'r' */
-- z_off_t start; /* start of compressed data in file (header skipped) */
-- z_off_t in; /* bytes into deflate or inflate */
-- z_off_t out; /* bytes out of deflate or inflate */
-- int back; /* one character push-back */
-- int last; /* true if push-back is last character */
--} gz_stream;
--
--
--local gzFile gz_open OF((const char *path, const char *mode, int fd));
--local int do_flush OF((gzFile file, int flush));
--local int get_byte OF((gz_stream *s));
--local void check_header OF((gz_stream *s));
--local int destroy OF((gz_stream *s));
--local void putLong OF((FILE *file, uLong x));
--local uLong getLong OF((gz_stream *s));
--
--/* ===========================================================================
-- Opens a gzip (.gz) file for reading or writing. The mode parameter
-- is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-- or path name (if fd == -1).
-- gz_open returns NULL if the file could not be opened or if there was
-- insufficient memory to allocate the (de)compression state; errno
-- can be checked to distinguish the two cases (if errno is zero, the
-- zlib error is Z_MEM_ERROR).
--*/
--local gzFile gz_open (path, mode, fd)
-- const char *path;
-- const char *mode;
-- int fd;
--{
-- int err;
-- int level = Z_DEFAULT_COMPRESSION; /* compression level */
-- int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-- char *p = (char*)mode;
-- gz_stream *s;
-- char fmode[80]; /* copy of mode, without the compression level */
-- char *m = fmode;
--
-- if (!path || !mode) return Z_NULL;
--
-- s = (gz_stream *)ALLOC(sizeof(gz_stream));
-- if (!s) return Z_NULL;
--
-- s->stream.zalloc = (alloc_func)0;
-- s->stream.zfree = (free_func)0;
-- s->stream.opaque = (voidpf)0;
-- s->stream.next_in = s->inbuf = Z_NULL;
-- s->stream.next_out = s->outbuf = Z_NULL;
-- s->stream.avail_in = s->stream.avail_out = 0;
-- s->file = NULL;
-- s->z_err = Z_OK;
-- s->z_eof = 0;
-- s->in = 0;
-- s->out = 0;
-- s->back = EOF;
-- s->crc = crc32(0L, Z_NULL, 0);
-- s->msg = NULL;
-- s->transparent = 0;
--
-- s->path = (char*)ALLOC(strlen(path)+1);
-- if (s->path == NULL) {
-- return destroy(s), (gzFile)Z_NULL;
-- }
-- strcpy(s->path, path); /* do this early for debugging */
--
-- s->mode = '\0';
-- do {
-- if (*p == 'r') s->mode = 'r';
-- if (*p == 'w' || *p == 'a') s->mode = 'w';
-- if (*p >= '0' && *p <= '9') {
-- level = *p - '0';
-- } else if (*p == 'f') {
-- strategy = Z_FILTERED;
-- } else if (*p == 'h') {
-- strategy = Z_HUFFMAN_ONLY;
-- } else if (*p == 'R') {
-- strategy = Z_RLE;
-- } else {
-- *m++ = *p; /* copy the mode */
-- }
-- } while (*p++ && m != fmode + sizeof(fmode));
-- if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
--
-- if (s->mode == 'w') {
--#ifdef NO_GZCOMPRESS
-- err = Z_STREAM_ERROR;
--#else
-- err = deflateInit2(&(s->stream), level,
-- Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-- /* windowBits is passed < 0 to suppress zlib header */
--
-- s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
--#endif
-- if (err != Z_OK || s->outbuf == Z_NULL) {
-- return destroy(s), (gzFile)Z_NULL;
-- }
-- } else {
-- s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
--
-- err = inflateInit2(&(s->stream), -MAX_WBITS);
-- /* windowBits is passed < 0 to tell that there is no zlib header.
-- * Note that in this case inflate *requires* an extra "dummy" byte
-- * after the compressed stream in order to complete decompression and
-- * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-- * present after the compressed stream.
-- */
-- if (err != Z_OK || s->inbuf == Z_NULL) {
-- return destroy(s), (gzFile)Z_NULL;
-- }
-- }
-- s->stream.avail_out = Z_BUFSIZE;
--
-- errno = 0;
-- s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
--
-- if (s->file == NULL) {
-- return destroy(s), (gzFile)Z_NULL;
-- }
-- if (s->mode == 'w') {
-- /* Write a very simple .gz header:
-- */
-- fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-- Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-- s->start = 10L;
-- /* We use 10L instead of ftell(s->file) to because ftell causes an
-- * fflush on some systems. This version of the library doesn't use
-- * start anyway in write mode, so this initialization is not
-- * necessary.
-- */
-- } else {
-- check_header(s); /* skip the .gz header */
-- s->start = ftell(s->file) - s->stream.avail_in;
-- }
--
-- return (gzFile)s;
--}
--
--/* ===========================================================================
-- Opens a gzip (.gz) file for reading or writing.
--*/
--gzFile ZEXPORT gzopen (path, mode)
-- const char *path;
-- const char *mode;
--{
-- return gz_open (path, mode, -1);
--}
--
--/* ===========================================================================
-- Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-- to mimic the behavio(u)r of fdopen.
--*/
--gzFile ZEXPORT gzdopen (fd, mode)
-- int fd;
-- const char *mode;
--{
-- char name[46]; /* allow for up to 128-bit integers */
--
-- if (fd < 0) return (gzFile)Z_NULL;
-- sprintf(name, "<fd:%d>", fd); /* for debugging */
--
-- return gz_open (name, mode, fd);
--}
--
--/* ===========================================================================
-- * Update the compression level and strategy
-- */
--int ZEXPORT gzsetparams (file, level, strategy)
-- gzFile file;
-- int level;
-- int strategy;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
--
-- /* Make room to allow flushing */
-- if (s->stream.avail_out == 0) {
--
-- s->stream.next_out = s->outbuf;
-- if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-- s->z_err = Z_ERRNO;
-- }
-- s->stream.avail_out = Z_BUFSIZE;
-- }
--
-- return deflateParams (&(s->stream), level, strategy);
--}
--
--/* ===========================================================================
-- Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-- for end of file.
-- IN assertion: the stream s has been sucessfully opened for reading.
--*/
--local int get_byte(s)
-- gz_stream *s;
--{
-- if (s->z_eof) return EOF;
-- if (s->stream.avail_in == 0) {
-- errno = 0;
-- s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-- if (s->stream.avail_in == 0) {
-- s->z_eof = 1;
-- if (ferror(s->file)) s->z_err = Z_ERRNO;
-- return EOF;
-- }
-- s->stream.next_in = s->inbuf;
-- }
-- s->stream.avail_in--;
-- return *(s->stream.next_in)++;
--}
--
--/* ===========================================================================
-- Check the gzip header of a gz_stream opened for reading. Set the stream
-- mode to transparent if the gzip magic header is not present; set s->err
-- to Z_DATA_ERROR if the magic header is present but the rest of the header
-- is incorrect.
-- IN assertion: the stream s has already been created sucessfully;
-- s->stream.avail_in is zero for the first time, but may be non-zero
-- for concatenated .gz files.
--*/
--local void check_header(s)
-- gz_stream *s;
--{
-- int method; /* method byte */
-- int flags; /* flags byte */
-- uInt len;
-- int c;
--
-- /* Assure two bytes in the buffer so we can peek ahead -- handle case
-- where first byte of header is at the end of the buffer after the last
-- gzip segment */
-- len = s->stream.avail_in;
-- if (len < 2) {
-- if (len) s->inbuf[0] = s->stream.next_in[0];
-- errno = 0;
-- len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
-- if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
-- s->stream.avail_in += len;
-- s->stream.next_in = s->inbuf;
-- if (s->stream.avail_in < 2) {
-- s->transparent = s->stream.avail_in;
-- return;
-- }
-- }
--
-- /* Peek ahead to check the gzip magic header */
-- if (s->stream.next_in[0] != gz_magic[0] ||
-- s->stream.next_in[1] != gz_magic[1]) {
-- s->transparent = 1;
-- return;
-- }
-- s->stream.avail_in -= 2;
-- s->stream.next_in += 2;
--
-- /* Check the rest of the gzip header */
-- method = get_byte(s);
-- flags = get_byte(s);
-- if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-- s->z_err = Z_DATA_ERROR;
-- return;
-- }
--
-- /* Discard time, xflags and OS code: */
-- for (len = 0; len < 6; len++) (void)get_byte(s);
--
-- if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-- len = (uInt)get_byte(s);
-- len += ((uInt)get_byte(s))<<8;
-- /* len is garbage if EOF but the loop below will quit anyway */
-- while (len-- != 0 && get_byte(s) != EOF) ;
-- }
-- if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-- while ((c = get_byte(s)) != 0 && c != EOF) ;
-- }
-- if ((flags & COMMENT) != 0) { /* skip the .gz file comment */
-- while ((c = get_byte(s)) != 0 && c != EOF) ;
-- }
-- if ((flags & HEAD_CRC) != 0) { /* skip the header crc */
-- for (len = 0; len < 2; len++) (void)get_byte(s);
-- }
-- s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
--}
--
-- /* ===========================================================================
-- * Cleanup then free the given gz_stream. Return a zlib error code.
-- Try freeing in the reverse order of allocations.
-- */
--local int destroy (s)
-- gz_stream *s;
--{
-- int err = Z_OK;
--
-- if (!s) return Z_STREAM_ERROR;
--
-- TRYFREE(s->msg);
--
-- if (s->stream.state != NULL) {
-- if (s->mode == 'w') {
--#ifdef NO_GZCOMPRESS
-- err = Z_STREAM_ERROR;
--#else
-- err = deflateEnd(&(s->stream));
--#endif
-- } else if (s->mode == 'r') {
-- err = inflateEnd(&(s->stream));
-- }
-- }
-- if (s->file != NULL && fclose(s->file)) {
--#ifdef ESPIPE
-- if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
--#endif
-- err = Z_ERRNO;
-- }
-- if (s->z_err < 0) err = s->z_err;
--
-- TRYFREE(s->inbuf);
-- TRYFREE(s->outbuf);
-- TRYFREE(s->path);
-- TRYFREE(s);
-- return err;
--}
--
--/* ===========================================================================
-- Reads the given number of uncompressed bytes from the compressed file.
-- gzread returns the number of bytes actually read (0 for end of file).
--*/
--int ZEXPORT gzread (file, buf, len)
-- gzFile file;
-- voidp buf;
-- unsigned len;
--{
-- gz_stream *s = (gz_stream*)file;
-- Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-- Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */
--
-- if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
--
-- if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-- if (s->z_err == Z_STREAM_END) return 0; /* EOF */
--
-- next_out = (Byte*)buf;
-- s->stream.next_out = (Bytef*)buf;
-- s->stream.avail_out = len;
--
-- if (s->stream.avail_out && s->back != EOF) {
-- *next_out++ = s->back;
-- s->stream.next_out++;
-- s->stream.avail_out--;
-- s->back = EOF;
-- s->out++;
-- start++;
-- if (s->last) {
-- s->z_err = Z_STREAM_END;
-- return 1;
-- }
-- }
--
-- while (s->stream.avail_out != 0) {
--
-- if (s->transparent) {
-- /* Copy first the lookahead bytes: */
-- uInt n = s->stream.avail_in;
-- if (n > s->stream.avail_out) n = s->stream.avail_out;
-- if (n > 0) {
-- zmemcpy(s->stream.next_out, s->stream.next_in, n);
-- next_out += n;
-- s->stream.next_out = next_out;
-- s->stream.next_in += n;
-- s->stream.avail_out -= n;
-- s->stream.avail_in -= n;
-- }
-- if (s->stream.avail_out > 0) {
-- s->stream.avail_out -=
-- (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
-- }
-- len -= s->stream.avail_out;
-- s->in += len;
-- s->out += len;
-- if (len == 0) s->z_eof = 1;
-- return (int)len;
-- }
-- if (s->stream.avail_in == 0 && !s->z_eof) {
--
-- errno = 0;
-- s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-- if (s->stream.avail_in == 0) {
-- s->z_eof = 1;
-- if (ferror(s->file)) {
-- s->z_err = Z_ERRNO;
-- break;
-- }
-- }
-- s->stream.next_in = s->inbuf;
-- }
-- s->in += s->stream.avail_in;
-- s->out += s->stream.avail_out;
-- s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-- s->in -= s->stream.avail_in;
-- s->out -= s->stream.avail_out;
--
-- if (s->z_err == Z_STREAM_END) {
-- /* Check CRC and original size */
-- s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-- start = s->stream.next_out;
--
-- if (getLong(s) != s->crc) {
-- s->z_err = Z_DATA_ERROR;
-- } else {
-- (void)getLong(s);
-- /* The uncompressed length returned by above getlong() may be
-- * different from s->out in case of concatenated .gz files.
-- * Check for such files:
-- */
-- check_header(s);
-- if (s->z_err == Z_OK) {
-- inflateReset(&(s->stream));
-- s->crc = crc32(0L, Z_NULL, 0);
-- }
-- }
-- }
-- if (s->z_err != Z_OK || s->z_eof) break;
-- }
-- s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
--
-- if (len == s->stream.avail_out &&
-- (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
-- return -1;
-- return (int)(len - s->stream.avail_out);
--}
--
--
--/* ===========================================================================
-- Reads one byte from the compressed file. gzgetc returns this byte
-- or -1 in case of end of file or error.
--*/
--int ZEXPORT gzgetc(file)
-- gzFile file;
--{
-- unsigned char c;
--
-- return gzread(file, &c, 1) == 1 ? c : -1;
--}
--
--
--/* ===========================================================================
-- Push one byte back onto the stream.
--*/
--int ZEXPORT gzungetc(c, file)
-- int c;
-- gzFile file;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
-- s->back = c;
-- s->out--;
-- s->last = (s->z_err == Z_STREAM_END);
-- if (s->last) s->z_err = Z_OK;
-- s->z_eof = 0;
-- return c;
--}
--
--
--/* ===========================================================================
-- Reads bytes from the compressed file until len-1 characters are
-- read, or a newline character is read and transferred to buf, or an
-- end-of-file condition is encountered. The string is then terminated
-- with a null character.
-- gzgets returns buf, or Z_NULL in case of error.
--
-- The current implementation is not optimized at all.
--*/
--char * ZEXPORT gzgets(file, buf, len)
-- gzFile file;
-- char *buf;
-- int len;
--{
-- char *b = buf;
-- if (buf == Z_NULL || len <= 0) return Z_NULL;
--
-- while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-- *buf = '\0';
-- return b == buf && len > 0 ? Z_NULL : b;
--}
--
--
--#ifndef NO_GZCOMPRESS
--/* ===========================================================================
-- Writes the given number of uncompressed bytes into the compressed file.
-- gzwrite returns the number of bytes actually written (0 in case of error).
--*/
--int ZEXPORT gzwrite (file, buf, len)
-- gzFile file;
-- voidpc buf;
-- unsigned len;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
--
-- s->stream.next_in = (Bytef*)buf;
-- s->stream.avail_in = len;
--
-- while (s->stream.avail_in != 0) {
--
-- if (s->stream.avail_out == 0) {
--
-- s->stream.next_out = s->outbuf;
-- if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-- s->z_err = Z_ERRNO;
-- break;
-- }
-- s->stream.avail_out = Z_BUFSIZE;
-- }
-- s->in += s->stream.avail_in;
-- s->out += s->stream.avail_out;
-- s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-- s->in -= s->stream.avail_in;
-- s->out -= s->stream.avail_out;
-- if (s->z_err != Z_OK) break;
-- }
-- s->crc = crc32(s->crc, (const Bytef *)buf, len);
--
-- return (int)(len - s->stream.avail_in);
--}
--
--
--/* ===========================================================================
-- Converts, formats, and writes the args to the compressed file under
-- control of the format string, as in fprintf. gzprintf returns the number of
-- uncompressed bytes actually written (0 in case of error).
--*/
--#ifdef STDC
--#include <stdarg.h>
--
--int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
--{
-- char buf[Z_PRINTF_BUFSIZE];
-- va_list va;
-- int len;
--
-- buf[sizeof(buf) - 1] = 0;
-- va_start(va, format);
--#ifdef NO_vsnprintf
--# ifdef HAS_vsprintf_void
-- (void)vsprintf(buf, format, va);
-- va_end(va);
-- for (len = 0; len < sizeof(buf); len++)
-- if (buf[len] == 0) break;
--# else
-- len = vsprintf(buf, format, va);
-- va_end(va);
--# endif
--#else
--# ifdef HAS_vsnprintf_void
-- (void)vsnprintf(buf, sizeof(buf), format, va);
-- va_end(va);
-- len = strlen(buf);
--# else
-- len = vsnprintf(buf, sizeof(buf), format, va);
-- va_end(va);
--# endif
--#endif
-- if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-- return 0;
-- return gzwrite(file, buf, (unsigned)len);
--}
--#else /* not ANSI C */
--
--int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-- gzFile file;
-- const char *format;
-- int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
--{
-- char buf[Z_PRINTF_BUFSIZE];
-- int len;
--
-- buf[sizeof(buf) - 1] = 0;
--#ifdef NO_snprintf
--# ifdef HAS_sprintf_void
-- sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-- for (len = 0; len < sizeof(buf); len++)
-- if (buf[len] == 0) break;
--# else
-- len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
--# endif
--#else
--# ifdef HAS_snprintf_void
-- snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-- len = strlen(buf);
--# else
-- len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
--# endif
--#endif
-- if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-- return 0;
-- return gzwrite(file, buf, len);
--}
--#endif
--
--/* ===========================================================================
-- Writes c, converted to an unsigned char, into the compressed file.
-- gzputc returns the value that was written, or -1 in case of error.
--*/
--int ZEXPORT gzputc(file, c)
-- gzFile file;
-- int c;
--{
-- unsigned char cc = (unsigned char) c; /* required for big endian systems */
--
-- return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
--}
--
--
--/* ===========================================================================
-- Writes the given null-terminated string to the compressed file, excluding
-- the terminating null character.
-- gzputs returns the number of characters written, or -1 in case of error.
--*/
--int ZEXPORT gzputs(file, s)
-- gzFile file;
-- const char *s;
--{
-- return gzwrite(file, (char*)s, (unsigned)strlen(s));
--}
--
--
--/* ===========================================================================
-- Flushes all pending output into the compressed file. The parameter
-- flush is as in the deflate() function.
--*/
--local int do_flush (file, flush)
-- gzFile file;
-- int flush;
--{
-- uInt len;
-- int done = 0;
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
--
-- s->stream.avail_in = 0; /* should be zero already anyway */
--
-- for (;;) {
-- len = Z_BUFSIZE - s->stream.avail_out;
--
-- if (len != 0) {
-- if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-- s->z_err = Z_ERRNO;
-- return Z_ERRNO;
-- }
-- s->stream.next_out = s->outbuf;
-- s->stream.avail_out = Z_BUFSIZE;
-- }
-- if (done) break;
-- s->out += s->stream.avail_out;
-- s->z_err = deflate(&(s->stream), flush);
-- s->out -= s->stream.avail_out;
--
-- /* Ignore the second of two consecutive flushes: */
-- if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
--
-- /* deflate has finished flushing only when it hasn't used up
-- * all the available space in the output buffer:
-- */
-- done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
--
-- if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-- }
-- return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
--}
--
--int ZEXPORT gzflush (file, flush)
-- gzFile file;
-- int flush;
--{
-- gz_stream *s = (gz_stream*)file;
-- int err = do_flush (file, flush);
--
-- if (err) return err;
-- fflush(s->file);
-- return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
--}
--#endif /* NO_GZCOMPRESS */
--
--/* ===========================================================================
-- Sets the starting position for the next gzread or gzwrite on the given
-- compressed file. The offset represents a number of bytes in the
-- gzseek returns the resulting offset location as measured in bytes from
-- the beginning of the uncompressed stream, or -1 in case of error.
-- SEEK_END is not implemented, returns error.
-- In this version of the library, gzseek can be extremely slow.
--*/
--z_off_t ZEXPORT gzseek (file, offset, whence)
-- gzFile file;
-- z_off_t offset;
-- int whence;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || whence == SEEK_END ||
-- s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-- return -1L;
-- }
--
-- if (s->mode == 'w') {
--#ifdef NO_GZCOMPRESS
-- return -1L;
--#else
-- if (whence == SEEK_SET) {
-- offset -= s->in;
-- }
-- if (offset < 0) return -1L;
--
-- /* At this point, offset is the number of zero bytes to write. */
-- if (s->inbuf == Z_NULL) {
-- s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-- if (s->inbuf == Z_NULL) return -1L;
-- zmemzero(s->inbuf, Z_BUFSIZE);
-- }
-- while (offset > 0) {
-- uInt size = Z_BUFSIZE;
-- if (offset < Z_BUFSIZE) size = (uInt)offset;
--
-- size = gzwrite(file, s->inbuf, size);
-- if (size == 0) return -1L;
--
-- offset -= size;
-- }
-- return s->in;
--#endif
-- }
-- /* Rest of function is for reading only */
--
-- /* compute absolute position */
-- if (whence == SEEK_CUR) {
-- offset += s->out;
-- }
-- if (offset < 0) return -1L;
--
-- if (s->transparent) {
-- /* map to fseek */
-- s->back = EOF;
-- s->stream.avail_in = 0;
-- s->stream.next_in = s->inbuf;
-- if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
--
-- s->in = s->out = offset;
-- return offset;
-- }
--
-- /* For a negative seek, rewind and use positive seek */
-- if (offset >= s->out) {
-- offset -= s->out;
-- } else if (gzrewind(file) < 0) {
-- return -1L;
-- }
-- /* offset is now the number of bytes to skip. */
--
-- if (offset != 0 && s->outbuf == Z_NULL) {
-- s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-- if (s->outbuf == Z_NULL) return -1L;
-- }
-- if (offset && s->back != EOF) {
-- s->back = EOF;
-- s->out++;
-- offset--;
-- if (s->last) s->z_err = Z_STREAM_END;
-- }
-- while (offset > 0) {
-- int size = Z_BUFSIZE;
-- if (offset < Z_BUFSIZE) size = (int)offset;
--
-- size = gzread(file, s->outbuf, (uInt)size);
-- if (size <= 0) return -1L;
-- offset -= size;
-- }
-- return s->out;
--}
--
--/* ===========================================================================
-- Rewinds input file.
--*/
--int ZEXPORT gzrewind (file)
-- gzFile file;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || s->mode != 'r') return -1;
--
-- s->z_err = Z_OK;
-- s->z_eof = 0;
-- s->back = EOF;
-- s->stream.avail_in = 0;
-- s->stream.next_in = s->inbuf;
-- s->crc = crc32(0L, Z_NULL, 0);
-- if (!s->transparent) (void)inflateReset(&s->stream);
-- s->in = 0;
-- s->out = 0;
-- return fseek(s->file, s->start, SEEK_SET);
--}
--
--/* ===========================================================================
-- Returns the starting position for the next gzread or gzwrite on the
-- given compressed file. This position represents a number of bytes in the
-- uncompressed data stream.
--*/
--z_off_t ZEXPORT gztell (file)
-- gzFile file;
--{
-- return gzseek(file, 0L, SEEK_CUR);
--}
--
--/* ===========================================================================
-- Returns 1 when EOF has previously been detected reading the given
-- input stream, otherwise zero.
--*/
--int ZEXPORT gzeof (file)
-- gzFile file;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- /* With concatenated compressed files that can have embedded
-- * crc trailers, z_eof is no longer the only/best indicator of EOF
-- * on a gz_stream. Handle end-of-stream error explicitly here.
-- */
-- if (s == NULL || s->mode != 'r') return 0;
-- if (s->z_eof) return 1;
-- return s->z_err == Z_STREAM_END;
--}
--
--/* ===========================================================================
-- Returns 1 if reading and doing so transparently, otherwise zero.
--*/
--int ZEXPORT gzdirect (file)
-- gzFile file;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL || s->mode != 'r') return 0;
-- return s->transparent;
--}
--
--/* ===========================================================================
-- Outputs a long in LSB order to the given file
--*/
--local void putLong (file, x)
-- FILE *file;
-- uLong x;
--{
-- int n;
-- for (n = 0; n < 4; n++) {
-- fputc((int)(x & 0xff), file);
-- x >>= 8;
-- }
--}
--
--/* ===========================================================================
-- Reads a long in LSB order from the given gz_stream. Sets z_err in case
-- of error.
--*/
--local uLong getLong (s)
-- gz_stream *s;
--{
-- uLong x = (uLong)get_byte(s);
-- int c;
--
-- x += ((uLong)get_byte(s))<<8;
-- x += ((uLong)get_byte(s))<<16;
-- c = get_byte(s);
-- if (c == EOF) s->z_err = Z_DATA_ERROR;
-- x += ((uLong)c)<<24;
-- return x;
--}
--
--/* ===========================================================================
-- Flushes all pending output if necessary, closes the compressed file
-- and deallocates all the (de)compression state.
--*/
--int ZEXPORT gzclose (file)
-- gzFile file;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL) return Z_STREAM_ERROR;
--
-- if (s->mode == 'w') {
--#ifdef NO_GZCOMPRESS
-- return Z_STREAM_ERROR;
--#else
-- if (do_flush (file, Z_FINISH) != Z_OK)
-- return destroy((gz_stream*)file);
--
-- putLong (s->file, s->crc);
-- putLong (s->file, (uLong)(s->in & 0xffffffff));
--#endif
-- }
-- return destroy((gz_stream*)file);
--}
--
--#ifdef STDC
--# define zstrerror(errnum) strerror(errnum)
--#else
--# define zstrerror(errnum) ""
--#endif
--
--/* ===========================================================================
-- Returns the error message for the last error which occurred on the
-- given compressed file. errnum is set to zlib error number. If an
-- error occurred in the file system and not in the compression library,
-- errnum is set to Z_ERRNO and the application may consult errno
-- to get the exact error code.
--*/
--const char * ZEXPORT gzerror (file, errnum)
-- gzFile file;
-- int *errnum;
--{
-- char *m;
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL) {
-- *errnum = Z_STREAM_ERROR;
-- return (const char*)ERR_MSG(Z_STREAM_ERROR);
-- }
-- *errnum = s->z_err;
-- if (*errnum == Z_OK) return (const char*)"";
--
-- m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
--
-- if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
--
-- TRYFREE(s->msg);
-- s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-- if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
-- strcpy(s->msg, s->path);
-- strcat(s->msg, ": ");
-- strcat(s->msg, m);
-- return (const char*)s->msg;
--}
--
--/* ===========================================================================
-- Clear the error and end-of-file flags, and do the same for the real file.
--*/
--void ZEXPORT gzclearerr (file)
-- gzFile file;
--{
-- gz_stream *s = (gz_stream*)file;
--
-- if (s == NULL) return;
-- if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
-- s->z_eof = 0;
-- clearerr(s->file);
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,647 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* infback.c -- inflate using a call-back interface
-- * Copyright (C) 1995-2005 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/*
-- This code is largely copied from inflate.c. Normally either infback.o or
-- inflate.o would be linked into an application--not both. The interface
-- with inffast.c is retained so that optimized assembler-coded versions of
-- inflate_fast() can be used with either inflate.c or infback.c.
-- */
--
--#include "zutil.h"
--#include "inftrees.h"
--#include "inflate.h"
--#include "inffast.h"
--
--/* function prototypes */
--local void fixedtables OF((struct inflate_state FAR *state));
--
--/*
-- strm provides memory allocation functions in zalloc and zfree, or
-- Z_NULL to use the library memory allocation functions.
--
-- windowBits is in the range 8..15, and window is a user-supplied
-- window and output buffer that is 2**windowBits bytes.
-- */
--int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
--z_streamp strm;
--int windowBits;
--unsigned char FAR *window;
--const char *version;
--int stream_size;
--{
-- struct inflate_state FAR *state;
--
-- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-- stream_size != (int)(sizeof(z_stream)))
-- return Z_VERSION_ERROR;
-- if (strm == Z_NULL || window == Z_NULL ||
-- windowBits < 8 || windowBits > 15)
-- return Z_STREAM_ERROR;
-- strm->msg = Z_NULL; /* in case we return an error */
-- if (strm->zalloc == (alloc_func)0) {
-- strm->zalloc = zcalloc;
-- strm->opaque = (voidpf)0;
-- }
-- if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-- state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-- sizeof(struct inflate_state));
-- if (state == Z_NULL) return Z_MEM_ERROR;
-- Tracev((stderr, "inflate: allocated\n"));
-- strm->state = (struct internal_state FAR *)state;
-- state->dmax = 32768U;
-- state->wbits = windowBits;
-- state->wsize = 1U << windowBits;
-- state->window = window;
-- state->write = 0;
-- state->whave = 0;
-- return Z_OK;
--}
--
--/*
-- Return state with length and distance decoding tables and index sizes set to
-- fixed code decoding. Normally this returns fixed tables from inffixed.h.
-- If BUILDFIXED is defined, then instead this routine builds the tables the
-- first time it's called, and returns those tables the first time and
-- thereafter. This reduces the size of the code by about 2K bytes, in
-- exchange for a little execution time. However, BUILDFIXED should not be
-- used for threaded applications, since the rewriting of the tables and virgin
-- may not be thread-safe.
-- */
--local void fixedtables(state)
--struct inflate_state FAR *state;
--{
--#ifdef BUILDFIXED
-- static int virgin = 1;
-- static code *lenfix, *distfix;
-- static code fixed[544];
--
-- /* build fixed huffman tables if first call (may not be thread safe) */
-- if (virgin) {
-- unsigned sym, bits;
-- static code *next;
--
-- /* literal/length table */
-- sym = 0;
-- while (sym < 144) state->lens[sym++] = 8;
-- while (sym < 256) state->lens[sym++] = 9;
-- while (sym < 280) state->lens[sym++] = 7;
-- while (sym < 288) state->lens[sym++] = 8;
-- next = fixed;
-- lenfix = next;
-- bits = 9;
-- inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
--
-- /* distance table */
-- sym = 0;
-- while (sym < 32) state->lens[sym++] = 5;
-- distfix = next;
-- bits = 5;
-- inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
--
-- /* do this just once */
-- virgin = 0;
-- }
--#else /* !BUILDFIXED */
--# include "inffixed.h"
--#endif /* BUILDFIXED */
-- state->lencode = lenfix;
-- state->lenbits = 9;
-- state->distcode = distfix;
-- state->distbits = 5;
--}
--
--/* Macros for inflateBack(): */
--
--/* Load returned state from inflate_fast() */
--#define LOAD() \
-- do { \
-- put = strm->next_out; \
-- left = strm->avail_out; \
-- next = strm->next_in; \
-- have = strm->avail_in; \
-- hold = state->hold; \
-- bits = state->bits; \
-- } while (0)
--
--/* Set state from registers for inflate_fast() */
--#define RESTORE() \
-- do { \
-- strm->next_out = put; \
-- strm->avail_out = left; \
-- strm->next_in = next; \
-- strm->avail_in = have; \
-- state->hold = hold; \
-- state->bits = bits; \
-- } while (0)
--
--/* Clear the input bit accumulator */
--#define INITBITS() \
-- do { \
-- hold = 0; \
-- bits = 0; \
-- } while (0)
--
--/* Assure that some input is available. If input is requested, but denied,
-- then return a Z_BUF_ERROR from inflateBack(). */
--#define PULL() \
-- do { \
-- if (have == 0) { \
-- have = in(in_desc, &next); \
-- if (have == 0) { \
-- next = Z_NULL; \
-- ret = Z_BUF_ERROR; \
-- goto inf_leave; \
-- } \
-- } \
-- } while (0)
--
--/* Get a byte of input into the bit accumulator, or return from inflateBack()
-- with an error if there is no input available. */
--#define PULLBYTE() \
-- do { \
-- PULL(); \
-- have--; \
-- hold += (unsigned long)(*next++) << bits; \
-- bits += 8; \
-- } while (0)
--
--/* Assure that there are at least n bits in the bit accumulator. If there is
-- not enough available input to do that, then return from inflateBack() with
-- an error. */
--#define NEEDBITS(n) \
-- do { \
-- while (bits < (unsigned)(n)) \
-- PULLBYTE(); \
-- } while (0)
--
--/* Return the low n bits of the bit accumulator (n < 16) */
--#define BITS(n) \
-- ((unsigned)hold & ((1U << (n)) - 1))
--
--/* Remove n bits from the bit accumulator */
--#define DROPBITS(n) \
-- do { \
-- hold >>= (n); \
-- bits -= (unsigned)(n); \
-- } while (0)
--
--/* Remove zero to seven bits as needed to go to a byte boundary */
--#define BYTEBITS() \
-- do { \
-- hold >>= bits & 7; \
-- bits -= bits & 7; \
-- } while (0)
--
--/* Assure that some output space is available, by writing out the window
-- if it's full. If the write fails, return from inflateBack() with a
-- Z_BUF_ERROR. */
--#define ROOM() \
-- do { \
-- if (left == 0) { \
-- put = state->window; \
-- left = state->wsize; \
-- state->whave = left; \
-- if (out(out_desc, put, left)) { \
-- ret = Z_BUF_ERROR; \
-- goto inf_leave; \
-- } \
-- } \
-- } while (0)
--
--/*
-- strm provides the memory allocation functions and window buffer on input,
-- and provides information on the unused input on return. For Z_DATA_ERROR
-- returns, strm will also provide an error message.
--
-- in() and out() are the call-back input and output functions. When
-- inflateBack() needs more input, it calls in(). When inflateBack() has
-- filled the window with output, or when it completes with data in the
-- window, it calls out() to write out the data. The application must not
-- change the provided input until in() is called again or inflateBack()
-- returns. The application must not change the window/output buffer until
-- inflateBack() returns.
--
-- in() and out() are called with a descriptor parameter provided in the
-- inflateBack() call. This parameter can be a structure that provides the
-- information required to do the read or write, as well as accumulated
-- information on the input and output such as totals and check values.
--
-- in() should return zero on failure. out() should return non-zero on
-- failure. If either in() or out() fails, than inflateBack() returns a
-- Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it
-- was in() or out() that caused in the error. Otherwise, inflateBack()
-- returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-- error, or Z_MEM_ERROR if it could not allocate memory for the state.
-- inflateBack() can also return Z_STREAM_ERROR if the input parameters
-- are not correct, i.e. strm is Z_NULL or the state was not initialized.
-- */
--int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
--z_streamp strm;
--in_func in;
--void FAR *in_desc;
--out_func out;
--void FAR *out_desc;
--{
-- struct inflate_state FAR *state;
-- unsigned char FAR *next; /* next input */
-- unsigned char FAR *put; /* next output */
-- unsigned have, left; /* available input and output */
-- unsigned long hold; /* bit buffer */
-- unsigned bits; /* bits in bit buffer */
-- unsigned copy; /* number of stored or match bytes to copy */
-- unsigned char FAR *from; /* where to copy match bytes from */
-- code this; /* current decoding table entry */
-- code last; /* parent table entry */
-- unsigned len; /* length to copy for repeats, bits to drop */
-- int ret; /* return code */
-- static const unsigned short order[19] = /* permutation of code lengths */
-- {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
--
-- /* Check that the strm exists and that the state was initialized */
-- if (strm == Z_NULL || strm->state == Z_NULL)
-- return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
--
-- /* Reset the state */
-- strm->msg = Z_NULL;
-- state->mode = TYPE;
-- state->last = 0;
-- state->whave = 0;
-- next = strm->next_in;
-- have = next != Z_NULL ? strm->avail_in : 0;
-- hold = 0;
-- bits = 0;
-- put = state->window;
-- left = state->wsize;
--
-- /* Inflate until end of block marked as last */
-- for (;;)
-- switch (state->mode) {
-- case TYPE:
-- /* determine and dispatch block type */
-- if (state->last) {
-- BYTEBITS();
-- state->mode = DONE;
-- break;
-- }
-- NEEDBITS(3);
-- state->last = BITS(1);
-- DROPBITS(1);
-- switch (BITS(2)) {
-- case 0: /* stored block */
-- Tracev((stderr, "inflate: stored block%s\n",
-- state->last ? " (last)" : ""));
-- state->mode = STORED;
-- break;
-- case 1: /* fixed block */
-- fixedtables(state);
-- Tracev((stderr, "inflate: fixed codes block%s\n",
-- state->last ? " (last)" : ""));
-- state->mode = LEN; /* decode codes */
-- break;
-- case 2: /* dynamic block */
-- Tracev((stderr, "inflate: dynamic codes block%s\n",
-- state->last ? " (last)" : ""));
-- state->mode = TABLE;
-- break;
-- case 3:
-- strm->msg = (char *)"invalid block type";
-- state->mode = BAD;
-- }
-- DROPBITS(2);
-- break;
--
-- case STORED:
-- /* get and verify stored block length */
-- BYTEBITS(); /* go to byte boundary */
-- NEEDBITS(32);
-- if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-- strm->msg = (char *)"invalid stored block lengths";
-- state->mode = BAD;
-- break;
-- }
-- state->length = (unsigned)hold & 0xffff;
-- Tracev((stderr, "inflate: stored length %u\n",
-- state->length));
-- INITBITS();
--
-- /* copy stored block from input to output */
-- while (state->length != 0) {
-- copy = state->length;
-- PULL();
-- ROOM();
-- if (copy > have) copy = have;
-- if (copy > left) copy = left;
-- zmemcpy(put, next, copy);
-- have -= copy;
-- next += copy;
-- left -= copy;
-- put += copy;
-- state->length -= copy;
-- }
-- Tracev((stderr, "inflate: stored end\n"));
-- state->mode = TYPE;
-- break;
--
-- case TABLE:
-- /* get dynamic table entries descriptor */
-- NEEDBITS(14);
-- state->nlen = BITS(5) + 257;
-- DROPBITS(5);
-- state->ndist = BITS(5) + 1;
-- DROPBITS(5);
-- state->ncode = BITS(4) + 4;
-- DROPBITS(4);
--#ifndef PKZIP_BUG_WORKAROUND
-- if (state->nlen > 286 || state->ndist > 30) {
-- strm->msg = (char *)"too many length or distance symbols";
-- state->mode = BAD;
-- break;
-- }
--#endif
-- Tracev((stderr, "inflate: table sizes ok\n"));
--
-- /* get code length code lengths (not a typo) */
-- state->have = 0;
-- while (state->have < state->ncode) {
-- NEEDBITS(3);
-- state->lens[order[state->have++]] = (unsigned short)BITS(3);
-- DROPBITS(3);
-- }
-- while (state->have < 19)
-- state->lens[order[state->have++]] = 0;
-- state->next = state->codes;
-- state->lencode = (code const FAR *)(state->next);
-- state->lenbits = 7;
-- ret = inflate_table(CODES, state->lens, 19, &(state->next),
-- &(state->lenbits), state->work);
-- if (ret) {
-- strm->msg = (char *)"invalid code lengths set";
-- state->mode = BAD;
-- break;
-- }
-- Tracev((stderr, "inflate: code lengths ok\n"));
--
-- /* get length and distance code code lengths */
-- state->have = 0;
-- while (state->have < state->nlen + state->ndist) {
-- for (;;) {
-- this = state->lencode[BITS(state->lenbits)];
-- if ((unsigned)(this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- if (this.val < 16) {
-- NEEDBITS(this.bits);
-- DROPBITS(this.bits);
-- state->lens[state->have++] = this.val;
-- }
-- else {
-- if (this.val == 16) {
-- NEEDBITS(this.bits + 2);
-- DROPBITS(this.bits);
-- if (state->have == 0) {
-- strm->msg = (char *)"invalid bit length repeat";
-- state->mode = BAD;
-- break;
-- }
-- len = (unsigned)(state->lens[state->have - 1]);
-- copy = 3 + BITS(2);
-- DROPBITS(2);
-- }
-- else if (this.val == 17) {
-- NEEDBITS(this.bits + 3);
-- DROPBITS(this.bits);
-- len = 0;
-- copy = 3 + BITS(3);
-- DROPBITS(3);
-- }
-- else {
-- NEEDBITS(this.bits + 7);
-- DROPBITS(this.bits);
-- len = 0;
-- copy = 11 + BITS(7);
-- DROPBITS(7);
-- }
-- if (state->have + copy > state->nlen + state->ndist) {
-- strm->msg = (char *)"invalid bit length repeat";
-- state->mode = BAD;
-- break;
-- }
-- while (copy--)
-- state->lens[state->have++] = (unsigned short)len;
-- }
-- }
--
-- /* handle error breaks in while */
-- if (state->mode == BAD) break;
--
-- /* build code tables */
-- state->next = state->codes;
-- state->lencode = (code const FAR *)(state->next);
-- state->lenbits = 9;
-- ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-- &(state->lenbits), state->work);
-- if (ret) {
-- strm->msg = (char *)"invalid literal/lengths set";
-- state->mode = BAD;
-- break;
-- }
-- state->distcode = (code const FAR *)(state->next);
-- state->distbits = 6;
-- ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-- &(state->next), &(state->distbits), state->work);
-- if (ret) {
-- strm->msg = (char *)"invalid distances set";
-- state->mode = BAD;
-- break;
-- }
-- Tracev((stderr, "inflate: codes ok\n"));
-- state->mode = LEN;
--
-- case LEN:
-- /* use inflate_fast() if we have enough input and output */
-- if (have >= 6 && left >= 258) {
-- RESTORE();
-- if (state->whave < state->wsize)
-- state->whave = state->wsize - left;
-- inflate_fast(strm, state->wsize);
-- LOAD();
-- break;
-- }
--
-- /* get a literal, length, or end-of-block code */
-- for (;;) {
-- this = state->lencode[BITS(state->lenbits)];
-- if ((unsigned)(this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- if (this.op && (this.op & 0xf0) == 0) {
-- last = this;
-- for (;;) {
-- this = state->lencode[last.val +
-- (BITS(last.bits + last.op) >> last.bits)];
-- if ((unsigned)(last.bits + this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- DROPBITS(last.bits);
-- }
-- DROPBITS(this.bits);
-- state->length = (unsigned)this.val;
--
-- /* process literal */
-- if (this.op == 0) {
-- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-- "inflate: literal '%c'\n" :
-- "inflate: literal 0x%02x\n", this.val));
-- ROOM();
-- *put++ = (unsigned char)(state->length);
-- left--;
-- state->mode = LEN;
-- break;
-- }
--
-- /* process end of block */
-- if (this.op & 32) {
-- Tracevv((stderr, "inflate: end of block\n"));
-- state->mode = TYPE;
-- break;
-- }
--
-- /* invalid code */
-- if (this.op & 64) {
-- strm->msg = (char *)"invalid literal/length code";
-- state->mode = BAD;
-- break;
-- }
--
-- /* length code -- get extra bits, if any */
-- state->extra = (unsigned)(this.op) & 15;
-- if (state->extra != 0) {
-- NEEDBITS(state->extra);
-- state->length += BITS(state->extra);
-- DROPBITS(state->extra);
-- }
-- Tracevv((stderr, "inflate: length %u\n", state->length));
--
-- /* get distance code */
-- for (;;) {
-- this = state->distcode[BITS(state->distbits)];
-- if ((unsigned)(this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- if ((this.op & 0xf0) == 0) {
-- last = this;
-- for (;;) {
-- this = state->distcode[last.val +
-- (BITS(last.bits + last.op) >> last.bits)];
-- if ((unsigned)(last.bits + this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- DROPBITS(last.bits);
-- }
-- DROPBITS(this.bits);
-- if (this.op & 64) {
-- strm->msg = (char *)"invalid distance code";
-- state->mode = BAD;
-- break;
-- }
-- state->offset = (unsigned)this.val;
--
-- /* get distance extra bits, if any */
-- state->extra = (unsigned)(this.op) & 15;
-- if (state->extra != 0) {
-- NEEDBITS(state->extra);
-- state->offset += BITS(state->extra);
-- DROPBITS(state->extra);
-- }
-- if (state->offset > state->wsize - (state->whave < state->wsize ?
-- left : 0)) {
-- strm->msg = (char *)"invalid distance too far back";
-- state->mode = BAD;
-- break;
-- }
-- Tracevv((stderr, "inflate: distance %u\n", state->offset));
--
-- /* copy match from window to output */
-- do {
-- ROOM();
-- copy = state->wsize - state->offset;
-- if (copy < left) {
-- from = put + copy;
-- copy = left - copy;
-- }
-- else {
-- from = put - state->offset;
-- copy = left;
-- }
-- if (copy > state->length) copy = state->length;
-- state->length -= copy;
-- left -= copy;
-- do {
-- *put++ = *from++;
-- } while (--copy);
-- } while (state->length != 0);
-- break;
--
-- case DONE:
-- /* inflate stream terminated properly -- write leftover output */
-- ret = Z_STREAM_END;
-- if (left < state->wsize) {
-- if (out(out_desc, state->window, state->wsize - left))
-- ret = Z_BUF_ERROR;
-- }
-- goto inf_leave;
--
-- case BAD:
-- ret = Z_DATA_ERROR;
-- goto inf_leave;
--
-- default: /* can't happen, but makes compilers happy */
-- ret = Z_STREAM_ERROR;
-- goto inf_leave;
-- }
--
-- /* Return unused input */
-- inf_leave:
-- strm->next_in = next;
-- strm->avail_in = have;
-- return ret;
--}
--
--int ZEXPORT inflateBackEnd(strm)
--z_streamp strm;
--{
-- if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-- return Z_STREAM_ERROR;
-- ZFREE(strm, strm->state);
-- strm->state = Z_NULL;
-- Tracev((stderr, "inflate: end\n"));
-- return Z_OK;
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,342 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* inffast.c -- fast decoding
-- * Copyright (C) 1995-2004 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--#include "zutil.h"
--#include "inftrees.h"
--#include "inflate.h"
--#include "inffast.h"
--
--#ifndef ASMINF
--
--/* Allow machine dependent optimization for post-increment or pre-increment.
-- Based on testing to date,
-- Pre-increment preferred for:
-- - PowerPC G3 (Adler)
-- - MIPS R5000 (Randers-Pehrson)
-- Post-increment preferred for:
-- - none
-- No measurable difference:
-- - Pentium III (Anderson)
-- - M68060 (Nikl)
-- */
--#ifdef POSTINC
--# define OFF 0
--# define PUP(a) *(a)++
--#else
--# define OFF 1
--# define PUP(a) *++(a)
--#endif
--
--/*
-- Decode literal, length, and distance codes and write out the resulting
-- literal and match bytes until either not enough input or output is
-- available, an end-of-block is encountered, or a data error is encountered.
-- When large enough input and output buffers are supplied to inflate(), for
-- example, a 16K input buffer and a 64K output buffer, more than 95% of the
-- inflate execution time is spent in this routine.
--
-- Entry assumptions:
--
-- state->mode == LEN
-- strm->avail_in >= 6
-- strm->avail_out >= 258
-- start >= strm->avail_out
-- state->bits < 8
--
-- On return, state->mode is one of:
--
-- LEN -- ran out of enough output space or enough available input
-- TYPE -- reached end of block code, inflate() to interpret next block
-- BAD -- error in block data
--
-- Notes:
--
-- - The maximum input bits used by a length/distance pair is 15 bits for the
-- length code, 5 bits for the length extra, 15 bits for the distance code,
-- and 13 bits for the distance extra. This totals 48 bits, or six bytes.
-- Therefore if strm->avail_in >= 6, then there is enough input to avoid
-- checking for available input while decoding.
--
-- - The maximum bytes that a single length/distance pair can output is 258
-- bytes, which is the maximum length that can be coded. inflate_fast()
-- requires strm->avail_out >= 258 for each loop to avoid checking for
-- output space.
-- */
--void inflate_fast(strm, start)
--z_streamp strm;
--unsigned start; /* inflate()'s starting value for strm->avail_out */
--{
-- struct inflate_state FAR *state;
-- unsigned char FAR *in; /* local strm->next_in */
-- unsigned char FAR *last; /* while in < last, enough input available */
-- unsigned char FAR *out; /* local strm->next_out */
-- unsigned char FAR *beg; /* inflate()'s initial strm->next_out */
-- unsigned char FAR *end; /* while out < end, enough space available */
--#ifdef INFLATE_STRICT
-- unsigned dmax; /* maximum distance from zlib header */
--#endif
-- unsigned wsize; /* window size or zero if not using window */
-- unsigned whave; /* valid bytes in the window */
-- unsigned write; /* window write index */
-- unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */
-- unsigned long hold; /* local strm->hold */
-- unsigned bits; /* local strm->bits */
-- code const FAR *lcode; /* local strm->lencode */
-- code const FAR *dcode; /* local strm->distcode */
-- unsigned lmask; /* mask for first level of length codes */
-- unsigned dmask; /* mask for first level of distance codes */
-- code this; /* retrieved table entry */
-- unsigned op; /* code bits, operation, extra bits, or */
-- /* window position, window bytes to copy */
-- unsigned len; /* match length, unused bytes */
-- unsigned dist; /* match distance */
-- unsigned char FAR *from; /* where to copy match from */
--
-- /* copy state to local variables */
-- state = (struct inflate_state FAR *)strm->state;
-- in = strm->next_in - OFF;
-- last = in + (strm->avail_in - 5);
-- out = strm->next_out - OFF;
-- beg = out - (start - strm->avail_out);
-- end = out + (strm->avail_out - 257);
--#ifdef INFLATE_STRICT
-- dmax = state->dmax;
--#endif
-- wsize = state->wsize;
-- whave = state->whave;
-- write = state->write;
-- window = state->window;
-- hold = state->hold;
-- bits = state->bits;
-- lcode = state->lencode;
-- dcode = state->distcode;
-- lmask = (1U << state->lenbits) - 1;
-- dmask = (1U << state->distbits) - 1;
--
-- /* decode literals and length/distances until end-of-block or not enough
-- input data or output space */
-- do {
-- if (bits < 15) {
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- }
-- this = lcode[hold & lmask];
-- dolen:
-- op = (unsigned)(this.bits);
-- hold >>= op;
-- bits -= op;
-- op = (unsigned)(this.op);
-- if (op == 0) { /* literal */
-- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-- "inflate: literal '%c'\n" :
-- "inflate: literal 0x%02x\n", this.val));
-- PUP(out) = (unsigned char)(this.val);
-- }
-- else if (op & 16) { /* length base */
-- len = (unsigned)(this.val);
-- op &= 15; /* number of extra bits */
-- if (op) {
-- if (bits < op) {
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- }
-- len += (unsigned)hold & ((1U << op) - 1);
-- hold >>= op;
-- bits -= op;
-- }
-- Tracevv((stderr, "inflate: length %u\n", len));
-- if (bits < 15) {
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- }
-- this = dcode[hold & dmask];
-- dodist:
-- op = (unsigned)(this.bits);
-- hold >>= op;
-- bits -= op;
-- op = (unsigned)(this.op);
-- if (op & 16) { /* distance base */
-- dist = (unsigned)(this.val);
-- op &= 15; /* number of extra bits */
-- if (bits < op) {
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- if (bits < op) {
-- hold += (unsigned long)(PUP(in)) << bits;
-- bits += 8;
-- }
-- }
-- dist += (unsigned)hold & ((1U << op) - 1);
--#ifdef INFLATE_STRICT
-- if (dist > dmax) {
-- strm->msg = (char *)"invalid distance too far back";
-- state->mode = BAD;
-- break;
-- }
--#endif
-- hold >>= op;
-- bits -= op;
-- Tracevv((stderr, "inflate: distance %u\n", dist));
-- op = (unsigned)(out - beg); /* max distance in output */
-- if (dist > op) { /* see if copy from window */
-- op = dist - op; /* distance back in window */
-- if (op > whave) {
-- strm->msg = (char *)"invalid distance too far back";
-- state->mode = BAD;
-- break;
-- }
-- from = window - OFF;
-- if (write == 0) { /* very common case */
-- from += wsize - op;
-- if (op < len) { /* some from window */
-- len -= op;
-- do {
-- PUP(out) = PUP(from);
-- } while (--op);
-- from = out - dist; /* rest from output */
-- }
-- }
-- else if (write < op) { /* wrap around window */
-- from += wsize + write - op;
-- op -= write;
-- if (op < len) { /* some from end of window */
-- len -= op;
-- do {
-- PUP(out) = PUP(from);
-- } while (--op);
-- from = window - OFF;
-- if (write < len) { /* some from start of window */
-- op = write;
-- len -= op;
-- do {
-- PUP(out) = PUP(from);
-- } while (--op);
-- from = out - dist; /* rest from output */
-- }
-- }
-- }
-- else { /* contiguous in window */
-- from += write - op;
-- if (op < len) { /* some from window */
-- len -= op;
-- do {
-- PUP(out) = PUP(from);
-- } while (--op);
-- from = out - dist; /* rest from output */
-- }
-- }
-- while (len > 2) {
-- PUP(out) = PUP(from);
-- PUP(out) = PUP(from);
-- PUP(out) = PUP(from);
-- len -= 3;
-- }
-- if (len) {
-- PUP(out) = PUP(from);
-- if (len > 1)
-- PUP(out) = PUP(from);
-- }
-- }
-- else {
-- from = out - dist; /* copy direct from output */
-- do { /* minimum length is three */
-- PUP(out) = PUP(from);
-- PUP(out) = PUP(from);
-- PUP(out) = PUP(from);
-- len -= 3;
-- } while (len > 2);
-- if (len) {
-- PUP(out) = PUP(from);
-- if (len > 1)
-- PUP(out) = PUP(from);
-- }
-- }
-- }
-- else if ((op & 64) == 0) { /* 2nd level distance code */
-- this = dcode[this.val + (hold & ((1U << op) - 1))];
-- goto dodist;
-- }
-- else {
-- strm->msg = (char *)"invalid distance code";
-- state->mode = BAD;
-- break;
-- }
-- }
-- else if ((op & 64) == 0) { /* 2nd level length code */
-- this = lcode[this.val + (hold & ((1U << op) - 1))];
-- goto dolen;
-- }
-- else if (op & 32) { /* end-of-block */
-- Tracevv((stderr, "inflate: end of block\n"));
-- state->mode = TYPE;
-- break;
-- }
-- else {
-- strm->msg = (char *)"invalid literal/length code";
-- state->mode = BAD;
-- break;
-- }
-- } while (in < last && out < end);
--
-- /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-- len = bits >> 3;
-- in -= len;
-- bits -= len << 3;
-- hold &= (1U << bits) - 1;
--
-- /* update state and return */
-- strm->next_in = in + OFF;
-- strm->next_out = out + OFF;
-- strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-- strm->avail_out = (unsigned)(out < end ?
-- 257 + (end - out) : 257 - (out - end));
-- state->hold = hold;
-- state->bits = bits;
-- return;
--}
--
--/*
-- inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-- - Using bit fields for code structure
-- - Different op definition to avoid & for extra bits (do & for table bits)
-- - Three separate decoding do-loops for direct, window, and write == 0
-- - Special case for distance > 1 copies to do overlapped load and store copy
-- - Explicit branch predictions (based on measured branch probabilities)
-- - Deferring match copy and interspersed it with decoding subsequent codes
-- - Swapping literal/length else
-- - Swapping window/direct else
-- - Larger unrolled copy loops (three is about right)
-- - Moving len -= 3 statement into middle of loop
-- */
--
--#endif /* !ASMINF */
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,35 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* inffast.h -- header to use inffast.c
-- * Copyright (C) 1995-2003 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* WARNING: this file should *not* be used by applications. It is
-- part of the implementation of the compression library and is
-- subject to change. Applications should only use zlib.h.
-- */
--
--void inflate_fast OF((z_streamp strm, unsigned start));
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,118 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
-- /* inffixed.h -- table for decoding fixed codes
-- * Generated automatically by makefixed().
-- */
--
-- /* WARNING: this file should *not* be used by applications. It
-- is part of the implementation of the compression library and
-- is subject to change. Applications should only use zlib.h.
-- */
--
-- static const code lenfix[512] = {
-- {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-- {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-- {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-- {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-- {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-- {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-- {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-- {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-- {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-- {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-- {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-- {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-- {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-- {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-- {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-- {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-- {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-- {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-- {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-- {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-- {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-- {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-- {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-- {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-- {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-- {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-- {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-- {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-- {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-- {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-- {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-- {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-- {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-- {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-- {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-- {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-- {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-- {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-- {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-- {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-- {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-- {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-- {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-- {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-- {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-- {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-- {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-- {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-- {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-- {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-- {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-- {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-- {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-- {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-- {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-- {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-- {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-- {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-- {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-- {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-- {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-- {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-- {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-- {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-- {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-- {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-- {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-- {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-- {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-- {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-- {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-- {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-- {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-- {0,9,255}
-- };
--
-- static const code distfix[32] = {
-- {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-- {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-- {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-- {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-- {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-- {22,5,193},{64,5,0}
-- };
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,1392 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* inflate.c -- zlib decompression
-- * Copyright (C) 1995-2005 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/*
-- * Change history:
-- *
-- * 1.2.beta0 24 Nov 2002
-- * - First version -- complete rewrite of inflate to simplify code, avoid
-- * creation of window when not needed, minimize use of window when it is
-- * needed, make inffast.c even faster, implement gzip decoding, and to
-- * improve code readability and style over the previous zlib inflate code
-- *
-- * 1.2.beta1 25 Nov 2002
-- * - Use pointers for available input and output checking in inffast.c
-- * - Remove input and output counters in inffast.c
-- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
-- * - Remove unnecessary second byte pull from length extra in inffast.c
-- * - Unroll direct copy to three copies per loop in inffast.c
-- *
-- * 1.2.beta2 4 Dec 2002
-- * - Change external routine names to reduce potential conflicts
-- * - Correct filename to inffixed.h for fixed tables in inflate.c
-- * - Make hbuf[] unsigned char to match parameter type in inflate.c
-- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
-- * to avoid negation problem on Alphas (64 bit) in inflate.c
-- *
-- * 1.2.beta3 22 Dec 2002
-- * - Add comments on state->bits assertion in inffast.c
-- * - Add comments on op field in inftrees.h
-- * - Fix bug in reuse of allocated window after inflateReset()
-- * - Remove bit fields--back to byte structure for speed
-- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
-- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
-- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
-- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
-- * - Use local copies of stream next and avail values, as well as local bit
-- * buffer and bit count in inflate()--for speed when inflate_fast() not used
-- *
-- * 1.2.beta4 1 Jan 2003
-- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
-- * - Move a comment on output buffer sizes from inffast.c to inflate.c
-- * - Add comments in inffast.c to introduce the inflate_fast() routine
-- * - Rearrange window copies in inflate_fast() for speed and simplification
-- * - Unroll last copy for window match in inflate_fast()
-- * - Use local copies of window variables in inflate_fast() for speed
-- * - Pull out common write == 0 case for speed in inflate_fast()
-- * - Make op and len in inflate_fast() unsigned for consistency
-- * - Add FAR to lcode and dcode declarations in inflate_fast()
-- * - Simplified bad distance check in inflate_fast()
-- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
-- * source file infback.c to provide a call-back interface to inflate for
-- * programs like gzip and unzip -- uses window as output buffer to avoid
-- * window copying
-- *
-- * 1.2.beta5 1 Jan 2003
-- * - Improved inflateBack() interface to allow the caller to provide initial
-- * input in strm.
-- * - Fixed stored blocks bug in inflateBack()
-- *
-- * 1.2.beta6 4 Jan 2003
-- * - Added comments in inffast.c on effectiveness of POSTINC
-- * - Typecasting all around to reduce compiler warnings
-- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
-- * make compilers happy
-- * - Changed type of window in inflateBackInit() to unsigned char *
-- *
-- * 1.2.beta7 27 Jan 2003
-- * - Changed many types to unsigned or unsigned short to avoid warnings
-- * - Added inflateCopy() function
-- *
-- * 1.2.0 9 Mar 2003
-- * - Changed inflateBack() interface to provide separate opaque descriptors
-- * for the in() and out() functions
-- * - Changed inflateBack() argument and in_func typedef to swap the length
-- * and buffer address return values for the input function
-- * - Check next_in and next_out for Z_NULL on entry to inflate()
-- *
-- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
-- */
--
--#include "zutil.h"
--#include "inftrees.h"
--#include "inflate.h"
--#include "inffast.h"
--
--#ifdef MAKEFIXED
--# ifndef BUILDFIXED
--# define BUILDFIXED
--# endif
--#endif
--
--/* function prototypes */
--local void fixedtables OF((struct inflate_state FAR *state));
--local int updatewindow OF((z_streamp strm, unsigned out));
--#ifdef BUILDFIXED
-- void makefixed OF((void));
--#endif
--local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
-- unsigned len));
--
--int ZEXPORT inflateReset(strm)
--z_streamp strm;
--{
-- struct inflate_state FAR *state;
--
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- strm->total_in = strm->total_out = state->total = 0;
-- strm->msg = Z_NULL;
-- strm->adler = 1; /* to support ill-conceived Java test suite */
-- state->mode = HEAD;
-- state->last = 0;
-- state->havedict = 0;
-- state->dmax = 32768U;
-- state->head = Z_NULL;
-- state->wsize = 0;
-- state->whave = 0;
-- state->write = 0;
-- state->hold = 0;
-- state->bits = 0;
-- state->lencode = state->distcode = state->next = state->codes;
-- Tracev((stderr, "inflate: reset\n"));
-- return Z_OK;
--}
--
--int ZEXPORT inflatePrime(strm, bits, value)
--z_streamp strm;
--int bits;
--int value;
--{
-- struct inflate_state FAR *state;
--
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-- value &= (1L << bits) - 1;
-- state->hold += value << state->bits;
-- state->bits += bits;
-- return Z_OK;
--}
--
--int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
--z_streamp strm;
--int windowBits;
--const char *version;
--int stream_size;
--{
-- struct inflate_state FAR *state;
--
-- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-- stream_size != (int)(sizeof(z_stream)))
-- return Z_VERSION_ERROR;
-- if (strm == Z_NULL) return Z_STREAM_ERROR;
-- strm->msg = Z_NULL; /* in case we return an error */
-- if (strm->zalloc == (alloc_func)0) {
-- strm->zalloc = zcalloc;
-- strm->opaque = (voidpf)0;
-- }
-- if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-- state = (struct inflate_state FAR *)
-- ZALLOC(strm, 1, sizeof(struct inflate_state));
-- if (state == Z_NULL) return Z_MEM_ERROR;
-- Tracev((stderr, "inflate: allocated\n"));
-- strm->state = (struct internal_state FAR *)state;
-- if (windowBits < 0) {
-- state->wrap = 0;
-- windowBits = -windowBits;
-- }
-- else {
-- state->wrap = (windowBits >> 4) + 1;
--#ifdef GUNZIP
-- if (windowBits < 48) windowBits &= 15;
--#endif
-- }
-- if (windowBits < 8 || windowBits > 15) {
-- ZFREE(strm, state);
-- strm->state = Z_NULL;
-- return Z_STREAM_ERROR;
-- }
-- state->wbits = (unsigned)windowBits;
-- state->window = Z_NULL;
-- return inflateReset(strm);
--}
--
--int ZEXPORT inflateInit_(strm, version, stream_size)
--z_streamp strm;
--const char *version;
--int stream_size;
--{
-- return inflateInit2_(strm, DEF_WBITS, version, stream_size);
--}
--
--/*
-- Return state with length and distance decoding tables and index sizes set to
-- fixed code decoding. Normally this returns fixed tables from inffixed.h.
-- If BUILDFIXED is defined, then instead this routine builds the tables the
-- first time it's called, and returns those tables the first time and
-- thereafter. This reduces the size of the code by about 2K bytes, in
-- exchange for a little execution time. However, BUILDFIXED should not be
-- used for threaded applications, since the rewriting of the tables and virgin
-- may not be thread-safe.
-- */
--local void fixedtables(state)
--struct inflate_state FAR *state;
--{
--#ifdef BUILDFIXED
-- static int virgin = 1;
-- static code *lenfix, *distfix;
-- static code fixed[544];
--
-- /* build fixed huffman tables if first call (may not be thread safe) */
-- if (virgin) {
-- unsigned sym, bits;
-- static code *next;
--
-- /* literal/length table */
-- sym = 0;
-- while (sym < 144) state->lens[sym++] = 8;
-- while (sym < 256) state->lens[sym++] = 9;
-- while (sym < 280) state->lens[sym++] = 7;
-- while (sym < 288) state->lens[sym++] = 8;
-- next = fixed;
-- lenfix = next;
-- bits = 9;
-- inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
--
-- /* distance table */
-- sym = 0;
-- while (sym < 32) state->lens[sym++] = 5;
-- distfix = next;
-- bits = 5;
-- inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
--
-- /* do this just once */
-- virgin = 0;
-- }
--#else /* !BUILDFIXED */
--# include "inffixed.h"
--#endif /* BUILDFIXED */
-- state->lencode = lenfix;
-- state->lenbits = 9;
-- state->distcode = distfix;
-- state->distbits = 5;
--}
--
--#ifdef MAKEFIXED
--#include <stdio.h>
--
--/*
-- Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also
-- defines BUILDFIXED, so the tables are built on the fly. makefixed() writes
-- those tables to stdout, which would be piped to inffixed.h. A small program
-- can simply call makefixed to do this:
--
-- void makefixed(void);
--
-- int main(void)
-- {
-- makefixed();
-- return 0;
-- }
--
-- Then that can be linked with zlib built with MAKEFIXED defined and run:
--
-- a.out > inffixed.h
-- */
--void makefixed()
--{
-- unsigned low, size;
-- struct inflate_state state;
--
-- fixedtables(&state);
-- puts(" /* inffixed.h -- table for decoding fixed codes");
-- puts(" * Generated automatically by makefixed().");
-- puts(" */");
-- puts("");
-- puts(" /* WARNING: this file should *not* be used by applications.");
-- puts(" It is part of the implementation of this library and is");
-- puts(" subject to change. Applications should only use zlib.h.");
-- puts(" */");
-- puts("");
-- size = 1U << 9;
-- printf(" static const code lenfix[%u] = {", size);
-- low = 0;
-- for (;;) {
-- if ((low % 7) == 0) printf("\n ");
-- printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-- state.lencode[low].val);
-- if (++low == size) break;
-- putchar(',');
-- }
-- puts("\n };");
-- size = 1U << 5;
-- printf("\n static const code distfix[%u] = {", size);
-- low = 0;
-- for (;;) {
-- if ((low % 6) == 0) printf("\n ");
-- printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-- state.distcode[low].val);
-- if (++low == size) break;
-- putchar(',');
-- }
-- puts("\n };");
--}
--#endif /* MAKEFIXED */
--
--/*
-- Update the window with the last wsize (normally 32K) bytes written before
-- returning. If window does not exist yet, create it. This is only called
-- when a window is already in use, or when output has been written during this
-- inflate call, but the end of the deflate stream has not been reached yet.
-- It is also called to create a window for dictionary data when a dictionary
-- is loaded.
--
-- Providing output buffers larger than 32K to inflate() should provide a speed
-- advantage, since only the last 32K of output is copied to the sliding window
-- upon return from inflate(), and since all distances after the first 32K of
-- output will fall in the output data, making match copies simpler and faster.
-- The advantage may be dependent on the size of the processor's data caches.
-- */
--local int updatewindow(strm, out)
--z_streamp strm;
--unsigned out;
--{
-- struct inflate_state FAR *state;
-- unsigned copy, dist;
--
-- state = (struct inflate_state FAR *)strm->state;
--
-- /* if it hasn't been done already, allocate space for the window */
-- if (state->window == Z_NULL) {
-- state->window = (unsigned char FAR *)
-- ZALLOC(strm, 1U << state->wbits,
-- sizeof(unsigned char));
-- if (state->window == Z_NULL) return 1;
-- }
--
-- /* if window not in use yet, initialize */
-- if (state->wsize == 0) {
-- state->wsize = 1U << state->wbits;
-- state->write = 0;
-- state->whave = 0;
-- }
--
-- /* copy state->wsize or less output bytes into the circular window */
-- copy = out - strm->avail_out;
-- if (copy >= state->wsize) {
-- zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
-- state->write = 0;
-- state->whave = state->wsize;
-- }
-- else {
-- dist = state->wsize - state->write;
-- if (dist > copy) dist = copy;
-- zmemcpy(state->window + state->write, strm->next_out - copy, dist);
-- copy -= dist;
-- if (copy) {
-- zmemcpy(state->window, strm->next_out - copy, copy);
-- state->write = copy;
-- state->whave = state->wsize;
-- }
-- else {
-- state->write += dist;
-- if (state->write == state->wsize) state->write = 0;
-- if (state->whave < state->wsize) state->whave += dist;
-- }
-- }
-- return 0;
--}
--
--/* Macros for inflate(): */
--
--/* check function to use adler32() for zlib or crc32() for gzip */
--#ifdef GUNZIP
--# define UPDATE(check, buf, len) \
-- (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
--#else
--# define UPDATE(check, buf, len) adler32(check, buf, len)
--#endif
--
--/* check macros for header crc */
--#ifdef GUNZIP
--# define CRC2(check, word) \
-- do { \
-- hbuf[0] = (unsigned char)(word); \
-- hbuf[1] = (unsigned char)((word) >> 8); \
-- check = crc32(check, hbuf, 2); \
-- } while (0)
--
--# define CRC4(check, word) \
-- do { \
-- hbuf[0] = (unsigned char)(word); \
-- hbuf[1] = (unsigned char)((word) >> 8); \
-- hbuf[2] = (unsigned char)((word) >> 16); \
-- hbuf[3] = (unsigned char)((word) >> 24); \
-- check = crc32(check, hbuf, 4); \
-- } while (0)
--#endif
--
--/* Load registers with state in inflate() for speed */
--#define LOAD() \
-- do { \
-- put = strm->next_out; \
-- left = strm->avail_out; \
-- next = strm->next_in; \
-- have = strm->avail_in; \
-- hold = state->hold; \
-- bits = state->bits; \
-- } while (0)
--
--/* Restore state from registers in inflate() */
--#define RESTORE() \
-- do { \
-- strm->next_out = put; \
-- strm->avail_out = left; \
-- strm->next_in = next; \
-- strm->avail_in = have; \
-- state->hold = hold; \
-- state->bits = bits; \
-- } while (0)
--
--/* Clear the input bit accumulator */
--#define INITBITS() \
-- do { \
-- hold = 0; \
-- bits = 0; \
-- } while (0)
--
--/* Get a byte of input into the bit accumulator, or return from inflate()
-- if there is no input available. */
--#define PULLBYTE() \
-- do { \
-- if (have == 0) goto inf_leave; \
-- have--; \
-- hold += (unsigned long)(*next++) << bits; \
-- bits += 8; \
-- } while (0)
--
--/* Assure that there are at least n bits in the bit accumulator. If there is
-- not enough available input to do that, then return from inflate(). */
--#define NEEDBITS(n) \
-- do { \
-- while (bits < (unsigned)(n)) \
-- PULLBYTE(); \
-- } while (0)
--
--/* Return the low n bits of the bit accumulator (n < 16) */
--#define BITS(n) \
-- ((unsigned)hold & ((1U << (n)) - 1))
--
--/* Remove n bits from the bit accumulator */
--#define DROPBITS(n) \
-- do { \
-- hold >>= (n); \
-- bits -= (unsigned)(n); \
-- } while (0)
--
--/* Remove zero to seven bits as needed to go to a byte boundary */
--#define BYTEBITS() \
-- do { \
-- hold >>= bits & 7; \
-- bits -= bits & 7; \
-- } while (0)
--
--/* Reverse the bytes in a 32-bit value */
--#define REVERSE(q) \
-- ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-- (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
--
--/*
-- inflate() uses a state machine to process as much input data and generate as
-- much output data as possible before returning. The state machine is
-- structured roughly as follows:
--
-- for (;;) switch (state) {
-- ...
-- case STATEn:
-- if (not enough input data or output space to make progress)
-- return;
-- ... make progress ...
-- state = STATEm;
-- break;
-- ...
-- }
--
-- so when inflate() is called again, the same case is attempted again, and
-- if the appropriate resources are provided, the machine proceeds to the
-- next state. The NEEDBITS() macro is usually the way the state evaluates
-- whether it can proceed or should return. NEEDBITS() does the return if
-- the requested bits are not available. The typical use of the BITS macros
-- is:
--
-- NEEDBITS(n);
-- ... do something with BITS(n) ...
-- DROPBITS(n);
--
-- where NEEDBITS(n) either returns from inflate() if there isn't enough
-- input left to load n bits into the accumulator, or it continues. BITS(n)
-- gives the low n bits in the accumulator. When done, DROPBITS(n) drops
-- the low n bits off the accumulator. INITBITS() clears the accumulator
-- and sets the number of available bits to zero. BYTEBITS() discards just
-- enough bits to put the accumulator on a byte boundary. After BYTEBITS()
-- and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
--
-- NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-- if there is no input available. The decoding of variable length codes uses
-- PULLBYTE() directly in order to pull just enough bytes to decode the next
-- code, and no more.
--
-- Some states loop until they get enough input, making sure that enough
-- state information is maintained to continue the loop where it left off
-- if NEEDBITS() returns in the loop. For example, want, need, and keep
-- would all have to actually be part of the saved state in case NEEDBITS()
-- returns:
--
-- case STATEw:
-- while (want < need) {
-- NEEDBITS(n);
-- keep[want++] = BITS(n);
-- DROPBITS(n);
-- }
-- state = STATEx;
-- case STATEx:
--
-- As shown above, if the next state is also the next case, then the break
-- is omitted.
--
-- A state may also return if there is not enough output space available to
-- complete that state. Those states are copying stored data, writing a
-- literal byte, and copying a matching string.
--
-- When returning, a "goto inf_leave" is used to update the total counters,
-- update the check value, and determine whether any progress has been made
-- during that inflate() call in order to return the proper return code.
-- Progress is defined as a change in either strm->avail_in or strm->avail_out.
-- When there is a window, goto inf_leave will update the window with the last
-- output written. If a goto inf_leave occurs in the middle of decompression
-- and there is no window currently, goto inf_leave will create one and copy
-- output to the window for the next call of inflate().
--
-- In this implementation, the flush parameter of inflate() only affects the
-- return code (per zlib.h). inflate() always writes as much as possible to
-- strm->next_out, given the space available and the provided input--the effect
-- documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers
-- the allocation of and copying into a sliding window until necessary, which
-- provides the effect documented in zlib.h for Z_FINISH when the entire input
-- stream available. So the only thing the flush parameter actually does is:
-- when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it
-- will return Z_BUF_ERROR if it has not reached the end of the stream.
-- */
--
--int ZEXPORT inflate(strm, flush)
--z_streamp strm;
--int flush;
--{
-- struct inflate_state FAR *state;
-- unsigned char FAR *next; /* next input */
-- unsigned char FAR *put; /* next output */
-- unsigned have, left; /* available input and output */
-- unsigned long hold; /* bit buffer */
-- unsigned bits; /* bits in bit buffer */
-- unsigned in, out; /* save starting available input and output */
-- unsigned copy; /* number of stored or match bytes to copy */
-- unsigned char FAR *from; /* where to copy match bytes from */
-- code this; /* current decoding table entry */
-- code last; /* parent table entry */
-- unsigned len; /* length to copy for repeats, bits to drop */
-- int ret; /* return code */
--#ifdef GUNZIP
-- unsigned char hbuf[4]; /* buffer for gzip header crc calculation */
--#endif
-- static const unsigned short order[19] = /* permutation of code lengths */
-- {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
--
-- if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-- (strm->next_in == Z_NULL && strm->avail_in != 0))
-- return Z_STREAM_ERROR;
--
-- state = (struct inflate_state FAR *)strm->state;
-- if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */
-- LOAD();
-- in = have;
-- out = left;
-- ret = Z_OK;
-- for (;;)
-- switch (state->mode) {
-- case HEAD:
-- if (state->wrap == 0) {
-- state->mode = TYPEDO;
-- break;
-- }
-- NEEDBITS(16);
--#ifdef GUNZIP
-- if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */
-- state->check = crc32(0L, Z_NULL, 0);
-- CRC2(state->check, hold);
-- INITBITS();
-- state->mode = FLAGS;
-- break;
-- }
-- state->flags = 0; /* expect zlib header */
-- if (state->head != Z_NULL)
-- state->head->done = -1;
-- if (!(state->wrap & 1) || /* check if zlib header allowed */
--#else
-- if (
--#endif
-- ((BITS(8) << 8) + (hold >> 8)) % 31) {
-- strm->msg = (char *)"incorrect header check";
-- state->mode = BAD;
-- break;
-- }
-- if (BITS(4) != Z_DEFLATED) {
-- strm->msg = (char *)"unknown compression method";
-- state->mode = BAD;
-- break;
-- }
-- DROPBITS(4);
-- len = BITS(4) + 8;
-- if (len > state->wbits) {
-- strm->msg = (char *)"invalid window size";
-- state->mode = BAD;
-- break;
-- }
-- state->dmax = 1U << len;
-- Tracev((stderr, "inflate: zlib header ok\n"));
-- strm->adler = state->check = adler32(0L, Z_NULL, 0);
-- state->mode = hold & 0x200 ? DICTID : TYPE;
-- INITBITS();
-- break;
--#ifdef GUNZIP
-- case FLAGS:
-- NEEDBITS(16);
-- state->flags = (int)(hold);
-- if ((state->flags & 0xff) != Z_DEFLATED) {
-- strm->msg = (char *)"unknown compression method";
-- state->mode = BAD;
-- break;
-- }
-- if (state->flags & 0xe000) {
-- strm->msg = (char *)"unknown header flags set";
-- state->mode = BAD;
-- break;
-- }
-- if (state->head != Z_NULL)
-- state->head->text = (int)((hold >> 8) & 1);
-- if (state->flags & 0x0200) CRC2(state->check, hold);
-- INITBITS();
-- state->mode = TIME;
-- case TIME:
-- NEEDBITS(32);
-- if (state->head != Z_NULL)
-- state->head->time = hold;
-- if (state->flags & 0x0200) CRC4(state->check, hold);
-- INITBITS();
-- state->mode = OS;
-- case OS:
-- NEEDBITS(16);
-- if (state->head != Z_NULL) {
-- state->head->xflags = (int)(hold & 0xff);
-- state->head->os = (int)(hold >> 8);
-- }
-- if (state->flags & 0x0200) CRC2(state->check, hold);
-- INITBITS();
-- state->mode = EXLEN;
-- case EXLEN:
-- if (state->flags & 0x0400) {
-- NEEDBITS(16);
-- state->length = (unsigned)(hold);
-- if (state->head != Z_NULL)
-- state->head->extra_len = (unsigned)hold;
-- if (state->flags & 0x0200) CRC2(state->check, hold);
-- INITBITS();
-- }
-- else if (state->head != Z_NULL)
-- state->head->extra = Z_NULL;
-- state->mode = EXTRA;
-- case EXTRA:
-- if (state->flags & 0x0400) {
-- copy = state->length;
-- if (copy > have) copy = have;
-- if (copy) {
-- if (state->head != Z_NULL &&
-- state->head->extra != Z_NULL) {
-- len = state->head->extra_len - state->length;
-- zmemcpy(state->head->extra + len, next,
-- len + copy > state->head->extra_max ?
-- state->head->extra_max - len : copy);
-- }
-- if (state->flags & 0x0200)
-- state->check = crc32(state->check, next, copy);
-- have -= copy;
-- next += copy;
-- state->length -= copy;
-- }
-- if (state->length) goto inf_leave;
-- }
-- state->length = 0;
-- state->mode = NAME;
-- case NAME:
-- if (state->flags & 0x0800) {
-- if (have == 0) goto inf_leave;
-- copy = 0;
-- do {
-- len = (unsigned)(next[copy++]);
-- if (state->head != Z_NULL &&
-- state->head->name != Z_NULL &&
-- state->length < state->head->name_max)
-- state->head->name[state->length++] = len;
-- } while (len && copy < have);
-- if (state->flags & 0x0200)
-- state->check = crc32(state->check, next, copy);
-- have -= copy;
-- next += copy;
-- if (len) goto inf_leave;
-- }
-- else if (state->head != Z_NULL)
-- state->head->name = Z_NULL;
-- state->length = 0;
-- state->mode = COMMENT;
-- case COMMENT:
-- if (state->flags & 0x1000) {
-- if (have == 0) goto inf_leave;
-- copy = 0;
-- do {
-- len = (unsigned)(next[copy++]);
-- if (state->head != Z_NULL &&
-- state->head->comment != Z_NULL &&
-- state->length < state->head->comm_max)
-- state->head->comment[state->length++] = len;
-- } while (len && copy < have);
-- if (state->flags & 0x0200)
-- state->check = crc32(state->check, next, copy);
-- have -= copy;
-- next += copy;
-- if (len) goto inf_leave;
-- }
-- else if (state->head != Z_NULL)
-- state->head->comment = Z_NULL;
-- state->mode = HCRC;
-- case HCRC:
-- if (state->flags & 0x0200) {
-- NEEDBITS(16);
-- if (hold != (state->check & 0xffff)) {
-- strm->msg = (char *)"header crc mismatch";
-- state->mode = BAD;
-- break;
-- }
-- INITBITS();
-- }
-- if (state->head != Z_NULL) {
-- state->head->hcrc = (int)((state->flags >> 9) & 1);
-- state->head->done = 1;
-- }
-- strm->adler = state->check = crc32(0L, Z_NULL, 0);
-- state->mode = TYPE;
-- break;
--#endif
-- case DICTID:
-- NEEDBITS(32);
-- strm->adler = state->check = REVERSE(hold);
-- INITBITS();
-- state->mode = DICT;
-- case DICT:
-- if (state->havedict == 0) {
-- RESTORE();
-- return Z_NEED_DICT;
-- }
-- strm->adler = state->check = adler32(0L, Z_NULL, 0);
-- state->mode = TYPE;
-- case TYPE:
-- if (flush == Z_BLOCK) goto inf_leave;
-- case TYPEDO:
-- if (state->last) {
-- BYTEBITS();
-- state->mode = CHECK;
-- break;
-- }
-- NEEDBITS(3);
-- state->last = BITS(1);
-- DROPBITS(1);
-- switch (BITS(2)) {
-- case 0: /* stored block */
-- Tracev((stderr, "inflate: stored block%s\n",
-- state->last ? " (last)" : ""));
-- state->mode = STORED;
-- break;
-- case 1: /* fixed block */
-- fixedtables(state);
-- Tracev((stderr, "inflate: fixed codes block%s\n",
-- state->last ? " (last)" : ""));
-- state->mode = LEN; /* decode codes */
-- break;
-- case 2: /* dynamic block */
-- Tracev((stderr, "inflate: dynamic codes block%s\n",
-- state->last ? " (last)" : ""));
-- state->mode = TABLE;
-- break;
-- case 3:
-- strm->msg = (char *)"invalid block type";
-- state->mode = BAD;
-- }
-- DROPBITS(2);
-- break;
-- case STORED:
-- BYTEBITS(); /* go to byte boundary */
-- NEEDBITS(32);
-- if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-- strm->msg = (char *)"invalid stored block lengths";
-- state->mode = BAD;
-- break;
-- }
-- state->length = (unsigned)hold & 0xffff;
-- Tracev((stderr, "inflate: stored length %u\n",
-- state->length));
-- INITBITS();
-- state->mode = COPY;
-- case COPY:
-- copy = state->length;
-- if (copy) {
-- if (copy > have) copy = have;
-- if (copy > left) copy = left;
-- if (copy == 0) goto inf_leave;
-- zmemcpy(put, next, copy);
-- have -= copy;
-- next += copy;
-- left -= copy;
-- put += copy;
-- state->length -= copy;
-- break;
-- }
-- Tracev((stderr, "inflate: stored end\n"));
-- state->mode = TYPE;
-- break;
-- case TABLE:
-- NEEDBITS(14);
-- state->nlen = BITS(5) + 257;
-- DROPBITS(5);
-- state->ndist = BITS(5) + 1;
-- DROPBITS(5);
-- state->ncode = BITS(4) + 4;
-- DROPBITS(4);
--#ifndef PKZIP_BUG_WORKAROUND
-- if (state->nlen > 286 || state->ndist > 30) {
-- strm->msg = (char *)"too many length or distance symbols";
-- state->mode = BAD;
-- break;
-- }
--#endif
-- Tracev((stderr, "inflate: table sizes ok\n"));
-- state->have = 0;
-- state->mode = LENLENS;
-- case LENLENS:
-- while (state->have < state->ncode) {
-- NEEDBITS(3);
-- state->lens[order[state->have++]] = (unsigned short)BITS(3);
-- DROPBITS(3);
-- }
-- while (state->have < 19)
-- state->lens[order[state->have++]] = 0;
-- state->next = state->codes;
-- state->lencode = (code const FAR *)(state->next);
-- state->lenbits = 7;
-- ret = inflate_table(CODES, state->lens, 19, &(state->next),
-- &(state->lenbits), state->work);
-- if (ret) {
-- strm->msg = (char *)"invalid code lengths set";
-- state->mode = BAD;
-- break;
-- }
-- Tracev((stderr, "inflate: code lengths ok\n"));
-- state->have = 0;
-- state->mode = CODELENS;
-- case CODELENS:
-- while (state->have < state->nlen + state->ndist) {
-- for (;;) {
-- this = state->lencode[BITS(state->lenbits)];
-- if ((unsigned)(this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- if (this.val < 16) {
-- NEEDBITS(this.bits);
-- DROPBITS(this.bits);
-- state->lens[state->have++] = this.val;
-- }
-- else {
-- if (this.val == 16) {
-- NEEDBITS(this.bits + 2);
-- DROPBITS(this.bits);
-- if (state->have == 0) {
-- strm->msg = (char *)"invalid bit length repeat";
-- state->mode = BAD;
-- break;
-- }
-- len = state->lens[state->have - 1];
-- copy = 3 + BITS(2);
-- DROPBITS(2);
-- }
-- else if (this.val == 17) {
-- NEEDBITS(this.bits + 3);
-- DROPBITS(this.bits);
-- len = 0;
-- copy = 3 + BITS(3);
-- DROPBITS(3);
-- }
-- else {
-- NEEDBITS(this.bits + 7);
-- DROPBITS(this.bits);
-- len = 0;
-- copy = 11 + BITS(7);
-- DROPBITS(7);
-- }
-- if (state->have + copy > state->nlen + state->ndist) {
-- strm->msg = (char *)"invalid bit length repeat";
-- state->mode = BAD;
-- break;
-- }
-- while (copy--)
-- state->lens[state->have++] = (unsigned short)len;
-- }
-- }
--
-- /* handle error breaks in while */
-- if (state->mode == BAD) break;
--
-- /* build code tables */
-- state->next = state->codes;
-- state->lencode = (code const FAR *)(state->next);
-- state->lenbits = 9;
-- ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-- &(state->lenbits), state->work);
-- if (ret) {
-- strm->msg = (char *)"invalid literal/lengths set";
-- state->mode = BAD;
-- break;
-- }
-- state->distcode = (code const FAR *)(state->next);
-- state->distbits = 6;
-- ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-- &(state->next), &(state->distbits), state->work);
-- if (ret) {
-- strm->msg = (char *)"invalid distances set";
-- state->mode = BAD;
-- break;
-- }
-- Tracev((stderr, "inflate: codes ok\n"));
-- state->mode = LEN;
-- case LEN:
-- if (have >= 6 && left >= 258) {
-- RESTORE();
-- inflate_fast(strm, out);
-- LOAD();
-- break;
-- }
-- for (;;) {
-- this = state->lencode[BITS(state->lenbits)];
-- if ((unsigned)(this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- if (this.op && (this.op & 0xf0) == 0) {
-- last = this;
-- for (;;) {
-- this = state->lencode[last.val +
-- (BITS(last.bits + last.op) >> last.bits)];
-- if ((unsigned)(last.bits + this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- DROPBITS(last.bits);
-- }
-- DROPBITS(this.bits);
-- state->length = (unsigned)this.val;
-- if ((int)(this.op) == 0) {
-- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-- "inflate: literal '%c'\n" :
-- "inflate: literal 0x%02x\n", this.val));
-- state->mode = LIT;
-- break;
-- }
-- if (this.op & 32) {
-- Tracevv((stderr, "inflate: end of block\n"));
-- state->mode = TYPE;
-- break;
-- }
-- if (this.op & 64) {
-- strm->msg = (char *)"invalid literal/length code";
-- state->mode = BAD;
-- break;
-- }
-- state->extra = (unsigned)(this.op) & 15;
-- state->mode = LENEXT;
-- case LENEXT:
-- if (state->extra) {
-- NEEDBITS(state->extra);
-- state->length += BITS(state->extra);
-- DROPBITS(state->extra);
-- }
-- Tracevv((stderr, "inflate: length %u\n", state->length));
-- state->mode = DIST;
-- case DIST:
-- for (;;) {
-- this = state->distcode[BITS(state->distbits)];
-- if ((unsigned)(this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- if ((this.op & 0xf0) == 0) {
-- last = this;
-- for (;;) {
-- this = state->distcode[last.val +
-- (BITS(last.bits + last.op) >> last.bits)];
-- if ((unsigned)(last.bits + this.bits) <= bits) break;
-- PULLBYTE();
-- }
-- DROPBITS(last.bits);
-- }
-- DROPBITS(this.bits);
-- if (this.op & 64) {
-- strm->msg = (char *)"invalid distance code";
-- state->mode = BAD;
-- break;
-- }
-- state->offset = (unsigned)this.val;
-- state->extra = (unsigned)(this.op) & 15;
-- state->mode = DISTEXT;
-- case DISTEXT:
-- if (state->extra) {
-- NEEDBITS(state->extra);
-- state->offset += BITS(state->extra);
-- DROPBITS(state->extra);
-- }
--#ifdef INFLATE_STRICT
-- if (state->offset > state->dmax) {
-- strm->msg = (char *)"invalid distance too far back";
-- state->mode = BAD;
-- break;
-- }
--#endif
-- if (state->offset > state->whave + out - left) {
-- strm->msg = (char *)"invalid distance too far back";
-- state->mode = BAD;
-- break;
-- }
-- Tracevv((stderr, "inflate: distance %u\n", state->offset));
-- state->mode = MATCH;
-- case MATCH:
-- if (left == 0) goto inf_leave;
-- copy = out - left;
-- if (state->offset > copy) { /* copy from window */
-- copy = state->offset - copy;
-- if (copy > state->write) {
-- copy -= state->write;
-- from = state->window + (state->wsize - copy);
-- }
-- else
-- from = state->window + (state->write - copy);
-- if (copy > state->length) copy = state->length;
-- }
-- else { /* copy from output */
-- from = put - state->offset;
-- copy = state->length;
-- }
-- if (copy > left) copy = left;
-- left -= copy;
-- state->length -= copy;
-- do {
-- *put++ = *from++;
-- } while (--copy);
-- if (state->length == 0) state->mode = LEN;
-- break;
-- case LIT:
-- if (left == 0) goto inf_leave;
-- *put++ = (unsigned char)(state->length);
-- left--;
-- state->mode = LEN;
-- break;
-- case CHECK:
-- if (state->wrap) {
-- NEEDBITS(32);
-- out -= left;
-- strm->total_out += out;
-- state->total += out;
-- if (out)
-- strm->adler = state->check =
-- UPDATE(state->check, put - out, out);
-- out = left;
-- if ((
--#ifdef GUNZIP
-- state->flags ? hold :
--#endif
-- REVERSE(hold)) != state->check) {
-- strm->msg = (char *)"incorrect data check";
-- state->mode = BAD;
-- break;
-- }
-- INITBITS();
-- Tracev((stderr, "inflate: check matches trailer\n"));
-- }
--#ifdef GUNZIP
-- state->mode = LENGTH;
-- case LENGTH:
-- if (state->wrap && state->flags) {
-- NEEDBITS(32);
-- if (hold != (state->total & 0xffffffffUL)) {
-- strm->msg = (char *)"incorrect length check";
-- state->mode = BAD;
-- break;
-- }
-- INITBITS();
-- Tracev((stderr, "inflate: length matches trailer\n"));
-- }
--#endif
-- state->mode = DONE;
-- case DONE:
-- ret = Z_STREAM_END;
-- goto inf_leave;
-- case BAD:
-- ret = Z_DATA_ERROR;
-- goto inf_leave;
-- case MEM:
-- return Z_MEM_ERROR;
-- case SYNC:
-- default:
-- return Z_STREAM_ERROR;
-- }
--
-- /*
-- Return from inflate(), updating the total counts and the check value.
-- If there was no progress during the inflate() call, return a buffer
-- error. Call updatewindow() to create and/or update the window state.
-- Note: a memory error from inflate() is non-recoverable.
-- */
-- inf_leave:
-- RESTORE();
-- if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-- if (updatewindow(strm, out)) {
-- state->mode = MEM;
-- return Z_MEM_ERROR;
-- }
-- in -= strm->avail_in;
-- out -= strm->avail_out;
-- strm->total_in += in;
-- strm->total_out += out;
-- state->total += out;
-- if (state->wrap && out)
-- strm->adler = state->check =
-- UPDATE(state->check, strm->next_out - out, out);
-- strm->data_type = state->bits + (state->last ? 64 : 0) +
-- (state->mode == TYPE ? 128 : 0);
-- if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-- ret = Z_BUF_ERROR;
-- return ret;
--}
--
--int ZEXPORT inflateEnd(strm)
--z_streamp strm;
--{
-- struct inflate_state FAR *state;
-- if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-- return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- if (state->window != Z_NULL) ZFREE(strm, state->window);
-- ZFREE(strm, strm->state);
-- strm->state = Z_NULL;
-- Tracev((stderr, "inflate: end\n"));
-- return Z_OK;
--}
--
--int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
--z_streamp strm;
--const Bytef *dictionary;
--uInt dictLength;
--{
-- struct inflate_state FAR *state;
-- unsigned long id;
--
-- /* check state */
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- if (state->wrap != 0 && state->mode != DICT)
-- return Z_STREAM_ERROR;
--
-- /* check for correct dictionary id */
-- if (state->mode == DICT) {
-- id = adler32(0L, Z_NULL, 0);
-- id = adler32(id, dictionary, dictLength);
-- if (id != state->check)
-- return Z_DATA_ERROR;
-- }
--
-- /* copy dictionary to window */
-- if (updatewindow(strm, strm->avail_out)) {
-- state->mode = MEM;
-- return Z_MEM_ERROR;
-- }
-- if (dictLength > state->wsize) {
-- zmemcpy(state->window, dictionary + dictLength - state->wsize,
-- state->wsize);
-- state->whave = state->wsize;
-- }
-- else {
-- zmemcpy(state->window + state->wsize - dictLength, dictionary,
-- dictLength);
-- state->whave = dictLength;
-- }
-- state->havedict = 1;
-- Tracev((stderr, "inflate: dictionary set\n"));
-- return Z_OK;
--}
--
--int ZEXPORT inflateGetHeader(strm, head)
--z_streamp strm;
--gz_headerp head;
--{
-- struct inflate_state FAR *state;
--
-- /* check state */
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
--
-- /* save header structure */
-- state->head = head;
-- head->done = 0;
-- return Z_OK;
--}
--
--/*
-- Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found
-- or when out of input. When called, *have is the number of pattern bytes
-- found in order so far, in 0..3. On return *have is updated to the new
-- state. If on return *have equals four, then the pattern was found and the
-- return value is how many bytes were read including the last byte of the
-- pattern. If *have is less than four, then the pattern has not been found
-- yet and the return value is len. In the latter case, syncsearch() can be
-- called again with more data and the *have state. *have is initialized to
-- zero for the first call.
-- */
--local unsigned syncsearch(have, buf, len)
--unsigned FAR *have;
--unsigned char FAR *buf;
--unsigned len;
--{
-- unsigned got;
-- unsigned next;
--
-- got = *have;
-- next = 0;
-- while (next < len && got < 4) {
-- if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-- got++;
-- else if (buf[next])
-- got = 0;
-- else
-- got = 4 - got;
-- next++;
-- }
-- *have = got;
-- return next;
--}
--
--int ZEXPORT inflateSync(strm)
--z_streamp strm;
--{
-- unsigned len; /* number of bytes to look at or looked at */
-- unsigned long in, out; /* temporary to save total_in and total_out */
-- unsigned char buf[4]; /* to restore bit buffer to byte string */
-- struct inflate_state FAR *state;
--
-- /* check parameters */
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
--
-- /* if first time, start search in bit buffer */
-- if (state->mode != SYNC) {
-- state->mode = SYNC;
-- state->hold <<= state->bits & 7;
-- state->bits -= state->bits & 7;
-- len = 0;
-- while (state->bits >= 8) {
-- buf[len++] = (unsigned char)(state->hold);
-- state->hold >>= 8;
-- state->bits -= 8;
-- }
-- state->have = 0;
-- syncsearch(&(state->have), buf, len);
-- }
--
-- /* search available input */
-- len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-- strm->avail_in -= len;
-- strm->next_in += len;
-- strm->total_in += len;
--
-- /* return no joy or set up to restart inflate() on a new block */
-- if (state->have != 4) return Z_DATA_ERROR;
-- in = strm->total_in; out = strm->total_out;
-- inflateReset(strm);
-- strm->total_in = in; strm->total_out = out;
-- state->mode = TYPE;
-- return Z_OK;
--}
--
--/*
-- Returns true if inflate is currently at the end of a block generated by
-- Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-- implementation to provide an additional safety check. PPP uses
-- Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-- block. When decompressing, PPP checks that at the end of input packet,
-- inflate is waiting for these length bytes.
-- */
--int ZEXPORT inflateSyncPoint(strm)
--z_streamp strm;
--{
-- struct inflate_state FAR *state;
--
-- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)strm->state;
-- return state->mode == STORED && state->bits == 0;
--}
--
--int ZEXPORT inflateCopy(dest, source)
--z_streamp dest;
--z_streamp source;
--{
-- struct inflate_state FAR *state;
-- struct inflate_state FAR *copy;
-- unsigned char FAR *window;
-- unsigned wsize;
--
-- /* check input */
-- if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-- source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-- return Z_STREAM_ERROR;
-- state = (struct inflate_state FAR *)source->state;
--
-- /* allocate space */
-- copy = (struct inflate_state FAR *)
-- ZALLOC(source, 1, sizeof(struct inflate_state));
-- if (copy == Z_NULL) return Z_MEM_ERROR;
-- window = Z_NULL;
-- if (state->window != Z_NULL) {
-- window = (unsigned char FAR *)
-- ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-- if (window == Z_NULL) {
-- ZFREE(source, copy);
-- return Z_MEM_ERROR;
-- }
-- }
--
-- /* copy state */
-- zmemcpy(dest, source, sizeof(z_stream));
-- zmemcpy(copy, state, sizeof(struct inflate_state));
-- if (state->lencode >= state->codes &&
-- state->lencode <= state->codes + ENOUGH - 1) {
-- copy->lencode = copy->codes + (state->lencode - state->codes);
-- copy->distcode = copy->codes + (state->distcode - state->codes);
-- }
-- copy->next = copy->codes + (state->next - state->codes);
-- if (window != Z_NULL) {
-- wsize = 1U << state->wbits;
-- zmemcpy(window, state->window, wsize);
-- }
-- copy->window = window;
-- dest->state = (struct internal_state FAR *)copy;
-- return Z_OK;
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,139 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* inflate.h -- internal inflate state definition
-- * Copyright (C) 1995-2004 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* WARNING: this file should *not* be used by applications. It is
-- part of the implementation of the compression library and is
-- subject to change. Applications should only use zlib.h.
-- */
--
--/* define NO_GZIP when compiling if you want to disable gzip header and
-- trailer decoding by inflate(). NO_GZIP would be used to avoid linking in
-- the crc code when it is not needed. For shared libraries, gzip decoding
-- should be left enabled. */
--#ifndef NO_GZIP
--# define GUNZIP
--#endif
--
--/* Possible inflate modes between inflate() calls */
--typedef enum {
-- HEAD, /* i: waiting for magic header */
-- FLAGS, /* i: waiting for method and flags (gzip) */
-- TIME, /* i: waiting for modification time (gzip) */
-- OS, /* i: waiting for extra flags and operating system (gzip) */
-- EXLEN, /* i: waiting for extra length (gzip) */
-- EXTRA, /* i: waiting for extra bytes (gzip) */
-- NAME, /* i: waiting for end of file name (gzip) */
-- COMMENT, /* i: waiting for end of comment (gzip) */
-- HCRC, /* i: waiting for header crc (gzip) */
-- DICTID, /* i: waiting for dictionary check value */
-- DICT, /* waiting for inflateSetDictionary() call */
-- TYPE, /* i: waiting for type bits, including last-flag bit */
-- TYPEDO, /* i: same, but skip check to exit inflate on new block */
-- STORED, /* i: waiting for stored size (length and complement) */
-- COPY, /* i/o: waiting for input or output to copy stored block */
-- TABLE, /* i: waiting for dynamic block table lengths */
-- LENLENS, /* i: waiting for code length code lengths */
-- CODELENS, /* i: waiting for length/lit and distance code lengths */
-- LEN, /* i: waiting for length/lit code */
-- LENEXT, /* i: waiting for length extra bits */
-- DIST, /* i: waiting for distance code */
-- DISTEXT, /* i: waiting for distance extra bits */
-- MATCH, /* o: waiting for output space to copy string */
-- LIT, /* o: waiting for output space to write literal */
-- CHECK, /* i: waiting for 32-bit check value */
-- LENGTH, /* i: waiting for 32-bit length (gzip) */
-- DONE, /* finished check, done -- remain here until reset */
-- BAD, /* got a data error -- remain here until reset */
-- MEM, /* got an inflate() memory error -- remain here until reset */
-- SYNC /* looking for synchronization bytes to restart inflate() */
--} inflate_mode;
--
--/*
-- State transitions between above modes -
--
-- (most modes can go to the BAD or MEM mode -- not shown for clarity)
--
-- Process header:
-- HEAD -> (gzip) or (zlib)
-- (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
-- NAME -> COMMENT -> HCRC -> TYPE
-- (zlib) -> DICTID or TYPE
-- DICTID -> DICT -> TYPE
-- Read deflate blocks:
-- TYPE -> STORED or TABLE or LEN or CHECK
-- STORED -> COPY -> TYPE
-- TABLE -> LENLENS -> CODELENS -> LEN
-- Read deflate codes:
-- LEN -> LENEXT or LIT or TYPE
-- LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-- LIT -> LEN
-- Process trailer:
-- CHECK -> LENGTH -> DONE
-- */
--
--/* state maintained between inflate() calls. Approximately 7K bytes. */
--struct inflate_state {
-- inflate_mode mode; /* current inflate mode */
-- int last; /* true if processing last block */
-- int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
-- int havedict; /* true if dictionary provided */
-- int flags; /* gzip header method and flags (0 if zlib) */
-- unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
-- unsigned long check; /* protected copy of check value */
-- unsigned long total; /* protected copy of output count */
-- gz_headerp head; /* where to save gzip header information */
-- /* sliding window */
-- unsigned wbits; /* log base 2 of requested window size */
-- unsigned wsize; /* window size or zero if not using window */
-- unsigned whave; /* valid bytes in the window */
-- unsigned write; /* window write index */
-- unsigned char FAR *window; /* allocated sliding window, if needed */
-- /* bit accumulator */
-- unsigned long hold; /* input bit accumulator */
-- unsigned bits; /* number of bits in "in" */
-- /* for string and stored block copying */
-- unsigned length; /* literal or length of data to copy */
-- unsigned offset; /* distance back to copy string from */
-- /* for table and code decoding */
-- unsigned extra; /* extra bits needed */
-- /* fixed and dynamic code tables */
-- code const FAR *lencode; /* starting table for length/literal codes */
-- code const FAR *distcode; /* starting table for distance codes */
-- unsigned lenbits; /* index bits for lencode */
-- unsigned distbits; /* index bits for distcode */
-- /* dynamic table building */
-- unsigned ncode; /* number of code length code lengths */
-- unsigned nlen; /* number of length code lengths */
-- unsigned ndist; /* number of distance code lengths */
-- unsigned have; /* number of code lengths in lens[] */
-- code FAR *next; /* next available space in codes[] */
-- unsigned short lens[320]; /* temporary storage for code lengths */
-- unsigned short work[288]; /* work area for code table building */
-- code codes[ENOUGH]; /* space for code tables */
--};
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,353 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* inftrees.c -- generate Huffman trees for efficient decoding
-- * Copyright (C) 1995-2005 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--#include "zutil.h"
--#include "inftrees.h"
--
--#define MAXBITS 15
--
--const char inflate_copyright[] =
-- " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
--/*
-- If you use the zlib library in a product, an acknowledgment is welcome
-- in the documentation of your product. If for some reason you cannot
-- include such an acknowledgment, I would appreciate that you keep this
-- copyright string in the executable of your product.
-- */
--
--/*
-- Build a set of tables to decode the provided canonical Huffman code.
-- The code lengths are lens[0..codes-1]. The result starts at *table,
-- whose indices are 0..2^bits-1. work is a writable array of at least
-- lens shorts, which is used as a work area. type is the type of code
-- to be generated, CODES, LENS, or DISTS. On return, zero is success,
-- -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
-- on return points to the next available entry's address. bits is the
-- requested root table index bits, and on return it is the actual root
-- table index bits. It will differ if the request is greater than the
-- longest code or if it is less than the shortest code.
-- */
--int inflate_table(type, lens, codes, table, bits, work)
--codetype type;
--unsigned short FAR *lens;
--unsigned codes;
--code FAR * FAR *table;
--unsigned FAR *bits;
--unsigned short FAR *work;
--{
-- unsigned len; /* a code's length in bits */
-- unsigned sym; /* index of code symbols */
-- unsigned min, max; /* minimum and maximum code lengths */
-- unsigned root; /* number of index bits for root table */
-- unsigned curr; /* number of index bits for current table */
-- unsigned drop; /* code bits to drop for sub-table */
-- int left; /* number of prefix codes available */
-- unsigned used; /* code entries in table used */
-- unsigned huff; /* Huffman code */
-- unsigned incr; /* for incrementing code, index */
-- unsigned fill; /* index for replicating entries */
-- unsigned low; /* low bits for current root entry */
-- unsigned mask; /* mask for low root bits */
-- code this; /* table entry for duplication */
-- code FAR *next; /* next available space in table */
-- const unsigned short FAR *base; /* base value table to use */
-- const unsigned short FAR *extra; /* extra bits table to use */
-- int end; /* use base and extra for symbol > end */
-- unsigned short count[MAXBITS+1]; /* number of codes of each length */
-- unsigned short offs[MAXBITS+1]; /* offsets in table for each length */
-- static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-- 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-- 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-- static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-- 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
-- static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-- 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-- 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-- 8193, 12289, 16385, 24577, 0, 0};
-- static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-- 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-- 23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-- 28, 28, 29, 29, 64, 64};
--
-- /*
-- Process a set of code lengths to create a canonical Huffman code. The
-- code lengths are lens[0..codes-1]. Each length corresponds to the
-- symbols 0..codes-1. The Huffman code is generated by first sorting the
-- symbols by length from short to long, and retaining the symbol order
-- for codes with equal lengths. Then the code starts with all zero bits
-- for the first code of the shortest length, and the codes are integer
-- increments for the same length, and zeros are appended as the length
-- increases. For the deflate format, these bits are stored backwards
-- from their more natural integer increment ordering, and so when the
-- decoding tables are built in the large loop below, the integer codes
-- are incremented backwards.
--
-- This routine assumes, but does not check, that all of the entries in
-- lens[] are in the range 0..MAXBITS. The caller must assure this.
-- 1..MAXBITS is interpreted as that code length. zero means that that
-- symbol does not occur in this code.
--
-- The codes are sorted by computing a count of codes for each length,
-- creating from that a table of starting indices for each length in the
-- sorted table, and then entering the symbols in order in the sorted
-- table. The sorted table is work[], with that space being provided by
-- the caller.
--
-- The length counts are used for other purposes as well, i.e. finding
-- the minimum and maximum length codes, determining if there are any
-- codes at all, checking for a valid set of lengths, and looking ahead
-- at length counts to determine sub-table sizes when building the
-- decoding tables.
-- */
--
-- /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-- for (len = 0; len <= MAXBITS; len++)
-- count[len] = 0;
-- for (sym = 0; sym < codes; sym++)
-- count[lens[sym]]++;
--
-- /* bound code lengths, force root to be within code lengths */
-- root = *bits;
-- for (max = MAXBITS; max >= 1; max--)
-- if (count[max] != 0) break;
-- if (root > max) root = max;
-- if (max == 0) { /* no symbols to code at all */
-- this.op = (unsigned char)64; /* invalid code marker */
-- this.bits = (unsigned char)1;
-- this.val = (unsigned short)0;
-- *(*table)++ = this; /* make a table to force an error */
-- *(*table)++ = this;
-- *bits = 1;
-- return 0; /* no symbols, but wait for decoding to report error */
-- }
-- for (min = 1; min <= MAXBITS; min++)
-- if (count[min] != 0) break;
-- if (root < min) root = min;
--
-- /* check for an over-subscribed or incomplete set of lengths */
-- left = 1;
-- for (len = 1; len <= MAXBITS; len++) {
-- left <<= 1;
-- left -= count[len];
-- if (left < 0) return -1; /* over-subscribed */
-- }
-- if (left > 0 && (type == CODES || max != 1))
-- return -1; /* incomplete set */
--
-- /* generate offsets into symbol table for each length for sorting */
-- offs[1] = 0;
-- for (len = 1; len < MAXBITS; len++)
-- offs[len + 1] = offs[len] + count[len];
--
-- /* sort symbols by length, by symbol order within each length */
-- for (sym = 0; sym < codes; sym++)
-- if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
--
-- /*
-- Create and fill in decoding tables. In this loop, the table being
-- filled is at next and has curr index bits. The code being used is huff
-- with length len. That code is converted to an index by dropping drop
-- bits off of the bottom. For codes where len is less than drop + curr,
-- those top drop + curr - len bits are incremented through all values to
-- fill the table with replicated entries.
--
-- root is the number of index bits for the root table. When len exceeds
-- root, sub-tables are created pointed to by the root entry with an index
-- of the low root bits of huff. This is saved in low to check for when a
-- new sub-table should be started. drop is zero when the root table is
-- being filled, and drop is root when sub-tables are being filled.
--
-- When a new sub-table is needed, it is necessary to look ahead in the
-- code lengths to determine what size sub-table is needed. The length
-- counts are used for this, and so count[] is decremented as codes are
-- entered in the tables.
--
-- used keeps track of how many table entries have been allocated from the
-- provided *table space. It is checked when a LENS table is being made
-- against the space in *table, ENOUGH, minus the maximum space needed by
-- the worst case distance code, MAXD. This should never happen, but the
-- sufficiency of ENOUGH has not been proven exhaustively, hence the check.
-- This assumes that when type == LENS, bits == 9.
--
-- sym increments through all symbols, and the loop terminates when
-- all codes of length max, i.e. all codes, have been processed. This
-- routine permits incomplete codes, so another loop after this one fills
-- in the rest of the decoding tables with invalid code markers.
-- */
--
-- /* set up for code type */
-- switch (type) {
-- case CODES:
-- base = extra = work; /* dummy value--not used */
-- end = 19;
-- break;
-- case LENS:
-- base = lbase;
-- base -= 257;
-- extra = lext;
-- extra -= 257;
-- end = 256;
-- break;
-- default: /* DISTS */
-- base = dbase;
-- extra = dext;
-- end = -1;
-- }
--
-- /* initialize state for loop */
-- huff = 0; /* starting code */
-- sym = 0; /* starting code symbol */
-- len = min; /* starting code length */
-- next = *table; /* current table to fill in */
-- curr = root; /* current table index bits */
-- drop = 0; /* current bits to drop from code for index */
-- low = (unsigned)(-1); /* trigger new sub-table when len > root */
-- used = 1U << root; /* use root table entries */
-- mask = used - 1; /* mask for comparing low */
--
-- /* check available table space */
-- if (type == LENS && used >= ENOUGH - MAXD)
-- return 1;
--
-- /* process all codes and make table entries */
-- for (;;) {
-- /* create table entry */
-- this.bits = (unsigned char)(len - drop);
-- if ((int)(work[sym]) < end) {
-- this.op = (unsigned char)0;
-- this.val = work[sym];
-- }
-- else if ((int)(work[sym]) > end) {
-- this.op = (unsigned char)(extra[work[sym]]);
-- this.val = base[work[sym]];
-- }
-- else {
-- this.op = (unsigned char)(32 + 64); /* end of block */
-- this.val = 0;
-- }
--
-- /* replicate for those indices with low len bits equal to huff */
-- incr = 1U << (len - drop);
-- fill = 1U << curr;
-- min = fill; /* save offset to next table */
-- do {
-- fill -= incr;
-- next[(huff >> drop) + fill] = this;
-- } while (fill != 0);
--
-- /* backwards increment the len-bit code huff */
-- incr = 1U << (len - 1);
-- while (huff & incr)
-- incr >>= 1;
-- if (incr != 0) {
-- huff &= incr - 1;
-- huff += incr;
-- }
-- else
-- huff = 0;
--
-- /* go to next symbol, update count, len */
-- sym++;
-- if (--(count[len]) == 0) {
-- if (len == max) break;
-- len = lens[work[sym]];
-- }
--
-- /* create new sub-table if needed */
-- if (len > root && (huff & mask) != low) {
-- /* if first time, transition to sub-tables */
-- if (drop == 0)
-- drop = root;
--
-- /* increment past last table */
-- next += min; /* here min is 1 << curr */
--
-- /* determine length of next table */
-- curr = len - drop;
-- left = (int)(1 << curr);
-- while (curr + drop < max) {
-- left -= count[curr + drop];
-- if (left <= 0) break;
-- curr++;
-- left <<= 1;
-- }
--
-- /* check for enough space */
-- used += 1U << curr;
-- if (type == LENS && used >= ENOUGH - MAXD)
-- return 1;
--
-- /* point entry in root table to sub-table */
-- low = huff & mask;
-- (*table)[low].op = (unsigned char)curr;
-- (*table)[low].bits = (unsigned char)root;
-- (*table)[low].val = (unsigned short)(next - *table);
-- }
-- }
--
-- /*
-- Fill in rest of table for incomplete codes. This loop is similar to the
-- loop above in incrementing huff for table indices. It is assumed that
-- len is equal to curr + drop, so there is no loop needed to increment
-- through high index bits. When the current sub-table is filled, the loop
-- drops back to the root table to fill in any remaining entries there.
-- */
-- this.op = (unsigned char)64; /* invalid code marker */
-- this.bits = (unsigned char)(len - drop);
-- this.val = (unsigned short)0;
-- while (huff != 0) {
-- /* when done with sub-table, drop back to root table */
-- if (drop != 0 && (huff & mask) != low) {
-- drop = 0;
-- len = root;
-- next = *table;
-- this.bits = (unsigned char)len;
-- }
--
-- /* put invalid code marker in table */
-- next[huff >> drop] = this;
--
-- /* backwards increment the len-bit code huff */
-- incr = 1U << (len - 1);
-- while (huff & incr)
-- incr >>= 1;
-- if (incr != 0) {
-- huff &= incr - 1;
-- huff += incr;
-- }
-- else
-- huff = 0;
-- }
--
-- /* set return parameters */
-- *table += used;
-- *bits = root;
-- return 0;
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,79 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* inftrees.h -- header to use inftrees.c
-- * Copyright (C) 1995-2005 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* WARNING: this file should *not* be used by applications. It is
-- part of the implementation of the compression library and is
-- subject to change. Applications should only use zlib.h.
-- */
--
--/* Structure for decoding tables. Each entry provides either the
-- information needed to do the operation requested by the code that
-- indexed that table entry, or it provides a pointer to another
-- table that indexes more bits of the code. op indicates whether
-- the entry is a pointer to another table, a literal, a length or
-- distance, an end-of-block, or an invalid code. For a table
-- pointer, the low four bits of op is the number of index bits of
-- that table. For a length or distance, the low four bits of op
-- is the number of extra bits to get after the code. bits is
-- the number of bits in this code or part of the code to drop off
-- of the bit buffer. val is the actual byte to output in the case
-- of a literal, the base length or distance, or the offset from
-- the current table to the next table. Each entry is four bytes. */
--typedef struct {
-- unsigned char op; /* operation, extra bits, table bits */
-- unsigned char bits; /* bits in this part of the code */
-- unsigned short val; /* offset in table or code value */
--} code;
--
--/* op values as set by inflate_table():
-- 00000000 - literal
-- 0000tttt - table link, tttt != 0 is the number of table index bits
-- 0001eeee - length or distance, eeee is the number of extra bits
-- 01100000 - end of block
-- 01000000 - invalid code
-- */
--
--/* Maximum size of dynamic tree. The maximum found in a long but non-
-- exhaustive search was 1444 code structures (852 for length/literals
-- and 592 for distances, the latter actually the result of an
-- exhaustive search). The true maximum is not known, but the value
-- below is more than safe. */
--#define ENOUGH 2048
--#define MAXD 592
--
--/* Type of code to build for inftable() */
--typedef enum {
-- CODES,
-- LENS,
-- DISTS
--} codetype;
--
--extern int inflate_table OF((codetype type, unsigned short FAR *lens,
-- unsigned codes, code FAR * FAR *table,
-- unsigned FAR *bits, unsigned short FAR *work));
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,10 +0,0 @@
--(1)renamed
-- adler32.c -> zadler32.c
-- zcrc32c -> zcrc32.c
--
--(2)added _LP64 to make uLong a 32-bit int on 64-bit platform
-- zconf.h:
-- uLong -> 32-bit int
--
--(3)updated crc32.c/crc32()
-- unsigned long -> uLong
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,25 +0,0 @@
----- /home/sherman/TL/zlib-1.2.3_ORG/crc32.c Sun Jun 12 16:56:07 2005
--+++ zcrc32.c Tue Aug 25 14:22:41 2009
--@@ -216,8 +216,8 @@
-- #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
--
-- /* ========================================================================= */
---unsigned long ZEXPORT crc32(crc, buf, len)
--- unsigned long crc;
--+uLong ZEXPORT crc32(crc, buf, len)
--+ uLong crc;
-- const unsigned char FAR *buf;
-- unsigned len;
-- {
--@@ -234,9 +234,9 @@
--
-- endian = 1;
-- if (*((unsigned char *)(&endian)))
--- return crc32_little(crc, buf, len);
--+ return (uLong)crc32_little(crc, buf, len);
-- else
--- return crc32_big(crc, buf, len);
--+ return (uLong)crc32_big(crc, buf, len);
-- }
-- #endif /* BYFOUR */
-- crc = crc ^ 0xffffffffUL;
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,11 +0,0 @@
----- /home/sherman/TL/zlib-1.2.3_ORG/inflate.c Tue Jun 14 14:50:12 2005
--+++ inflate.c Tue Aug 25 14:22:09 2009
--@@ -1263,7 +1263,7 @@
-- z_streamp strm;
-- {
-- unsigned len; /* number of bytes to look at or looked at */
--- unsigned long in, out; /* temporary to save total_in and total_out */
--+ long long in, out; /* temporary to save total_in and total_out */
-- unsigned char buf[4]; /* to restore bit buffer to byte string */
-- struct inflate_state FAR *state;
--
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,24 +0,0 @@
----- /home/sherman/TL/zlib-1.2.3_ORG/zconf.h Fri May 27 23:40:35 2005
--+++ zconf.h Tue Aug 25 14:22:28 2009
--@@ -8,6 +8,9 @@
-- #ifndef ZCONF_H
-- #define ZCONF_H
--
--+/* for _LP64 */
--+#include <sys/types.h>
--+
-- /*
-- * If you *really* need a unique prefix for all types and library functions,
-- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
--@@ -261,7 +264,11 @@
-- typedef unsigned char Byte; /* 8 bits */
-- #endif
-- typedef unsigned int uInt; /* 16 bits or more */
--+#ifdef _LP64
--+typedef unsigned int uLong; /* 32 bits or more */
--+#else
-- typedef unsigned long uLong; /* 32 bits or more */
--+#endif
--
-- #ifdef SMALL_MEDIUM
-- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,25 +0,0 @@
----- /home/sherman/TL/zlib-1.2.3_ORG/zlib.h Sun Jul 17 19:26:49 2005
--+++ zlib.h Tue Aug 25 14:22:50 2009
--@@ -82,11 +82,11 @@
-- typedef struct z_stream_s {
-- Bytef *next_in; /* next input byte */
-- uInt avail_in; /* number of bytes available at next_in */
--- uLong total_in; /* total nb of input bytes read so far */
--+ long long total_in; /* total nb of input bytes read so far */
--
-- Bytef *next_out; /* next output byte should be put there */
-- uInt avail_out; /* remaining free space at next_out */
--- uLong total_out; /* total nb of bytes output so far */
--+ long long total_out;/* total nb of bytes output so far */
--
-- char *msg; /* last error message, NULL if no error */
-- struct internal_state FAR *state; /* not visible by applications */
--@@ -1348,7 +1348,7 @@
--
-- ZEXTERN const char * ZEXPORT zError OF((int));
-- ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
---ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
--+ZEXTERN const unsigned long FAR * ZEXPORT get_crc_table OF((void));
--
-- #ifdef __cplusplus
-- }
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,1243 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* trees.c -- output deflated data using Huffman coding
-- * Copyright (C) 1995-2005 Jean-loup Gailly
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/*
-- * ALGORITHM
-- *
-- * The "deflation" process uses several Huffman trees. The more
-- * common source values are represented by shorter bit sequences.
-- *
-- * Each code tree is stored in a compressed form which is itself
-- * a Huffman encoding of the lengths of all the code strings (in
-- * ascending order by source values). The actual code strings are
-- * reconstructed from the lengths in the inflate process, as described
-- * in the deflate specification.
-- *
-- * REFERENCES
-- *
-- * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
-- * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
-- *
-- * Storer, James A.
-- * Data Compression: Methods and Theory, pp. 49-50.
-- * Computer Science Press, 1988. ISBN 0-7167-8156-5.
-- *
-- * Sedgewick, R.
-- * Algorithms, p290.
-- * Addison-Wesley, 1983. ISBN 0-201-06672-6.
-- */
--
--/* @(#) $Id$ */
--
--/* #define GEN_TREES_H */
--
--#include "deflate.h"
--
--#ifdef DEBUG
--# include <ctype.h>
--#endif
--
--/* ===========================================================================
-- * Constants
-- */
--
--#define MAX_BL_BITS 7
--/* Bit length codes must not exceed MAX_BL_BITS bits */
--
--#define END_BLOCK 256
--/* end of block literal code */
--
--#define REP_3_6 16
--/* repeat previous bit length 3-6 times (2 bits of repeat count) */
--
--#define REPZ_3_10 17
--/* repeat a zero length 3-10 times (3 bits of repeat count) */
--
--#define REPZ_11_138 18
--/* repeat a zero length 11-138 times (7 bits of repeat count) */
--
--local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-- = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
--
--local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-- = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
--
--local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-- = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
--
--local const uch bl_order[BL_CODES]
-- = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
--/* The lengths of the bit length codes are sent in order of decreasing
-- * probability, to avoid transmitting the lengths for unused bit length codes.
-- */
--
--#define Buf_size (8 * 2*sizeof(char))
--/* Number of bits used within bi_buf. (bi_buf might be implemented on
-- * more than 16 bits on some systems.)
-- */
--
--/* ===========================================================================
-- * Local data. These are initialized only once.
-- */
--
--#define DIST_CODE_LEN 512 /* see definition of array dist_code below */
--
--#if defined(GEN_TREES_H) || !defined(STDC)
--/* non ANSI compilers may not accept trees.h */
--
--local ct_data static_ltree[L_CODES+2];
--/* The static literal tree. Since the bit lengths are imposed, there is no
-- * need for the L_CODES extra codes used during heap construction. However
-- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
-- * below).
-- */
--
--local ct_data static_dtree[D_CODES];
--/* The static distance tree. (Actually a trivial tree since all codes use
-- * 5 bits.)
-- */
--
--uch _dist_code[DIST_CODE_LEN];
--/* Distance codes. The first 256 values correspond to the distances
-- * 3 .. 258, the last 256 values correspond to the top 8 bits of
-- * the 15 bit distances.
-- */
--
--uch _length_code[MAX_MATCH-MIN_MATCH+1];
--/* length code for each normalized match length (0 == MIN_MATCH) */
--
--local int base_length[LENGTH_CODES];
--/* First normalized length for each code (0 = MIN_MATCH) */
--
--local int base_dist[D_CODES];
--/* First normalized distance for each code (0 = distance of 1) */
--
--#else
--# include "trees.h"
--#endif /* GEN_TREES_H */
--
--struct static_tree_desc_s {
-- const ct_data *static_tree; /* static tree or NULL */
-- const intf *extra_bits; /* extra bits for each code or NULL */
-- int extra_base; /* base index for extra_bits */
-- int elems; /* max number of elements in the tree */
-- int max_length; /* max bit length for the codes */
--};
--
--local static_tree_desc static_l_desc =
--{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
--
--local static_tree_desc static_d_desc =
--{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS};
--
--local static_tree_desc static_bl_desc =
--{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS};
--
--/* ===========================================================================
-- * Local (static) routines in this file.
-- */
--
--local void tr_static_init OF((void));
--local void init_block OF((deflate_state *s));
--local void pqdownheap OF((deflate_state *s, ct_data *tree, int k));
--local void gen_bitlen OF((deflate_state *s, tree_desc *desc));
--local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count));
--local void build_tree OF((deflate_state *s, tree_desc *desc));
--local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code));
--local void send_tree OF((deflate_state *s, ct_data *tree, int max_code));
--local int build_bl_tree OF((deflate_state *s));
--local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-- int blcodes));
--local void compress_block OF((deflate_state *s, ct_data *ltree,
-- ct_data *dtree));
--local void set_data_type OF((deflate_state *s));
--local unsigned bi_reverse OF((unsigned value, int length));
--local void bi_windup OF((deflate_state *s));
--local void bi_flush OF((deflate_state *s));
--local void copy_block OF((deflate_state *s, charf *buf, unsigned len,
-- int header));
--
--#ifdef GEN_TREES_H
--local void gen_trees_header OF((void));
--#endif
--
--#ifndef DEBUG
--# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-- /* Send a code of the given tree. c and tree must not have side effects */
--
--#else /* DEBUG */
--# define send_code(s, c, tree) \
-- { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-- send_bits(s, tree[c].Code, tree[c].Len); }
--#endif
--
--/* ===========================================================================
-- * Output a short LSB first on the stream.
-- * IN assertion: there is enough room in pendingBuf.
-- */
--#define put_short(s, w) { \
-- put_byte(s, (uch)((w) & 0xff)); \
-- put_byte(s, (uch)((ush)(w) >> 8)); \
--}
--
--/* ===========================================================================
-- * Send a value on a given number of bits.
-- * IN assertion: length <= 16 and value fits in length bits.
-- */
--#ifdef DEBUG
--local void send_bits OF((deflate_state *s, int value, int length));
--
--local void send_bits(s, value, length)
-- deflate_state *s;
-- int value; /* value to send */
-- int length; /* number of bits */
--{
-- Tracevv((stderr," l %2d v %4x ", length, value));
-- Assert(length > 0 && length <= 15, "invalid length");
-- s->bits_sent += (ulg)length;
--
-- /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-- * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-- * unused bits in value.
-- */
-- if (s->bi_valid > (int)Buf_size - length) {
-- s->bi_buf |= (value << s->bi_valid);
-- put_short(s, s->bi_buf);
-- s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-- s->bi_valid += length - Buf_size;
-- } else {
-- s->bi_buf |= value << s->bi_valid;
-- s->bi_valid += length;
-- }
--}
--#else /* !DEBUG */
--
--#define send_bits(s, value, length) \
--{ int len = length;\
-- if (s->bi_valid > (int)Buf_size - len) {\
-- int val = value;\
-- s->bi_buf |= (val << s->bi_valid);\
-- put_short(s, s->bi_buf);\
-- s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-- s->bi_valid += len - Buf_size;\
-- } else {\
-- s->bi_buf |= (value) << s->bi_valid;\
-- s->bi_valid += len;\
-- }\
--}
--#endif /* DEBUG */
--
--
--/* the arguments must not have side effects */
--
--/* ===========================================================================
-- * Initialize the various 'constant' tables.
-- */
--local void tr_static_init()
--{
--#if defined(GEN_TREES_H) || !defined(STDC)
-- static int static_init_done = 0;
-- int n; /* iterates over tree elements */
-- int bits; /* bit counter */
-- int length; /* length value */
-- int code; /* code value */
-- int dist; /* distance index */
-- ush bl_count[MAX_BITS+1];
-- /* number of codes at each bit length for an optimal tree */
--
-- if (static_init_done) return;
--
-- /* For some embedded targets, global variables are not initialized: */
-- static_l_desc.static_tree = static_ltree;
-- static_l_desc.extra_bits = extra_lbits;
-- static_d_desc.static_tree = static_dtree;
-- static_d_desc.extra_bits = extra_dbits;
-- static_bl_desc.extra_bits = extra_blbits;
--
-- /* Initialize the mapping length (0..255) -> length code (0..28) */
-- length = 0;
-- for (code = 0; code < LENGTH_CODES-1; code++) {
-- base_length[code] = length;
-- for (n = 0; n < (1<<extra_lbits[code]); n++) {
-- _length_code[length++] = (uch)code;
-- }
-- }
-- Assert (length == 256, "tr_static_init: length != 256");
-- /* Note that the length 255 (match length 258) can be represented
-- * in two different ways: code 284 + 5 bits or code 285, so we
-- * overwrite length_code[255] to use the best encoding:
-- */
-- _length_code[length-1] = (uch)code;
--
-- /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-- dist = 0;
-- for (code = 0 ; code < 16; code++) {
-- base_dist[code] = dist;
-- for (n = 0; n < (1<<extra_dbits[code]); n++) {
-- _dist_code[dist++] = (uch)code;
-- }
-- }
-- Assert (dist == 256, "tr_static_init: dist != 256");
-- dist >>= 7; /* from now on, all distances are divided by 128 */
-- for ( ; code < D_CODES; code++) {
-- base_dist[code] = dist << 7;
-- for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-- _dist_code[256 + dist++] = (uch)code;
-- }
-- }
-- Assert (dist == 256, "tr_static_init: 256+dist != 512");
--
-- /* Construct the codes of the static literal tree */
-- for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-- n = 0;
-- while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-- while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-- while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-- while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-- /* Codes 286 and 287 do not exist, but we must include them in the
-- * tree construction to get a canonical Huffman tree (longest code
-- * all ones)
-- */
-- gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
--
-- /* The static distance tree is trivial: */
-- for (n = 0; n < D_CODES; n++) {
-- static_dtree[n].Len = 5;
-- static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-- }
-- static_init_done = 1;
--
--# ifdef GEN_TREES_H
-- gen_trees_header();
--# endif
--#endif /* defined(GEN_TREES_H) || !defined(STDC) */
--}
--
--/* ===========================================================================
-- * Genererate the file trees.h describing the static trees.
-- */
--#ifdef GEN_TREES_H
--# ifndef DEBUG
--# include <stdio.h>
--# endif
--
--# define SEPARATOR(i, last, width) \
-- ((i) == (last)? "\n};\n\n" : \
-- ((i) % (width) == (width)-1 ? ",\n" : ", "))
--
--void gen_trees_header()
--{
-- FILE *header = fopen("trees.h", "w");
-- int i;
--
-- Assert (header != NULL, "Can't open trees.h");
-- fprintf(header,
-- "/* header created automatically with -DGEN_TREES_H */\n\n");
--
-- fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-- for (i = 0; i < L_CODES+2; i++) {
-- fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-- static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-- }
--
-- fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-- for (i = 0; i < D_CODES; i++) {
-- fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-- static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-- }
--
-- fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
-- for (i = 0; i < DIST_CODE_LEN; i++) {
-- fprintf(header, "%2u%s", _dist_code[i],
-- SEPARATOR(i, DIST_CODE_LEN-1, 20));
-- }
--
-- fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-- for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-- fprintf(header, "%2u%s", _length_code[i],
-- SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-- }
--
-- fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-- for (i = 0; i < LENGTH_CODES; i++) {
-- fprintf(header, "%1u%s", base_length[i],
-- SEPARATOR(i, LENGTH_CODES-1, 20));
-- }
--
-- fprintf(header, "local const int base_dist[D_CODES] = {\n");
-- for (i = 0; i < D_CODES; i++) {
-- fprintf(header, "%5u%s", base_dist[i],
-- SEPARATOR(i, D_CODES-1, 10));
-- }
--
-- fclose(header);
--}
--#endif /* GEN_TREES_H */
--
--/* ===========================================================================
-- * Initialize the tree data structures for a new zlib stream.
-- */
--void _tr_init(s)
-- deflate_state *s;
--{
-- tr_static_init();
--
-- s->l_desc.dyn_tree = s->dyn_ltree;
-- s->l_desc.stat_desc = &static_l_desc;
--
-- s->d_desc.dyn_tree = s->dyn_dtree;
-- s->d_desc.stat_desc = &static_d_desc;
--
-- s->bl_desc.dyn_tree = s->bl_tree;
-- s->bl_desc.stat_desc = &static_bl_desc;
--
-- s->bi_buf = 0;
-- s->bi_valid = 0;
-- s->last_eob_len = 8; /* enough lookahead for inflate */
--#ifdef DEBUG
-- s->compressed_len = 0L;
-- s->bits_sent = 0L;
--#endif
--
-- /* Initialize the first block of the first file: */
-- init_block(s);
--}
--
--/* ===========================================================================
-- * Initialize a new block.
-- */
--local void init_block(s)
-- deflate_state *s;
--{
-- int n; /* iterates over tree elements */
--
-- /* Initialize the trees. */
-- for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0;
-- for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0;
-- for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
--
-- s->dyn_ltree[END_BLOCK].Freq = 1;
-- s->opt_len = s->static_len = 0L;
-- s->last_lit = s->matches = 0;
--}
--
--#define SMALLEST 1
--/* Index within the heap array of least frequent node in the Huffman tree */
--
--
--/* ===========================================================================
-- * Remove the smallest element from the heap and recreate the heap with
-- * one less element. Updates heap and heap_len.
-- */
--#define pqremove(s, tree, top) \
--{\
-- top = s->heap[SMALLEST]; \
-- s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-- pqdownheap(s, tree, SMALLEST); \
--}
--
--/* ===========================================================================
-- * Compares to subtrees, using the tree depth as tie breaker when
-- * the subtrees have equal frequency. This minimizes the worst case length.
-- */
--#define smaller(tree, n, m, depth) \
-- (tree[n].Freq < tree[m].Freq || \
-- (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
--
--/* ===========================================================================
-- * Restore the heap property by moving down the tree starting at node k,
-- * exchanging a node with the smallest of its two sons if necessary, stopping
-- * when the heap property is re-established (each father smaller than its
-- * two sons).
-- */
--local void pqdownheap(s, tree, k)
-- deflate_state *s;
-- ct_data *tree; /* the tree to restore */
-- int k; /* node to move down */
--{
-- int v = s->heap[k];
-- int j = k << 1; /* left son of k */
-- while (j <= s->heap_len) {
-- /* Set j to the smallest of the two sons: */
-- if (j < s->heap_len &&
-- smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-- j++;
-- }
-- /* Exit if v is smaller than both sons */
-- if (smaller(tree, v, s->heap[j], s->depth)) break;
--
-- /* Exchange v with the smallest son */
-- s->heap[k] = s->heap[j]; k = j;
--
-- /* And continue down the tree, setting j to the left son of k */
-- j <<= 1;
-- }
-- s->heap[k] = v;
--}
--
--/* ===========================================================================
-- * Compute the optimal bit lengths for a tree and update the total bit length
-- * for the current block.
-- * IN assertion: the fields freq and dad are set, heap[heap_max] and
-- * above are the tree nodes sorted by increasing frequency.
-- * OUT assertions: the field len is set to the optimal bit length, the
-- * array bl_count contains the frequencies for each bit length.
-- * The length opt_len is updated; static_len is also updated if stree is
-- * not null.
-- */
--local void gen_bitlen(s, desc)
-- deflate_state *s;
-- tree_desc *desc; /* the tree descriptor */
--{
-- ct_data *tree = desc->dyn_tree;
-- int max_code = desc->max_code;
-- const ct_data *stree = desc->stat_desc->static_tree;
-- const intf *extra = desc->stat_desc->extra_bits;
-- int base = desc->stat_desc->extra_base;
-- int max_length = desc->stat_desc->max_length;
-- int h; /* heap index */
-- int n, m; /* iterate over the tree elements */
-- int bits; /* bit length */
-- int xbits; /* extra bits */
-- ush f; /* frequency */
-- int overflow = 0; /* number of elements with bit length too large */
--
-- for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
--
-- /* In a first pass, compute the optimal bit lengths (which may
-- * overflow in the case of the bit length tree).
-- */
-- tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
--
-- for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-- n = s->heap[h];
-- bits = tree[tree[n].Dad].Len + 1;
-- if (bits > max_length) bits = max_length, overflow++;
-- tree[n].Len = (ush)bits;
-- /* We overwrite tree[n].Dad which is no longer needed */
--
-- if (n > max_code) continue; /* not a leaf node */
--
-- s->bl_count[bits]++;
-- xbits = 0;
-- if (n >= base) xbits = extra[n-base];
-- f = tree[n].Freq;
-- s->opt_len += (ulg)f * (bits + xbits);
-- if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-- }
-- if (overflow == 0) return;
--
-- Trace((stderr,"\nbit length overflow\n"));
-- /* This happens for example on obj2 and pic of the Calgary corpus */
--
-- /* Find the first bit length which could increase: */
-- do {
-- bits = max_length-1;
-- while (s->bl_count[bits] == 0) bits--;
-- s->bl_count[bits]--; /* move one leaf down the tree */
-- s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-- s->bl_count[max_length]--;
-- /* The brother of the overflow item also moves one step up,
-- * but this does not affect bl_count[max_length]
-- */
-- overflow -= 2;
-- } while (overflow > 0);
--
-- /* Now recompute all bit lengths, scanning in increasing frequency.
-- * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-- * lengths instead of fixing only the wrong ones. This idea is taken
-- * from 'ar' written by Haruhiko Okumura.)
-- */
-- for (bits = max_length; bits != 0; bits--) {
-- n = s->bl_count[bits];
-- while (n != 0) {
-- m = s->heap[--h];
-- if (m > max_code) continue;
-- if ((unsigned) tree[m].Len != (unsigned) bits) {
-- Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-- s->opt_len += ((long)bits - (long)tree[m].Len)
-- *(long)tree[m].Freq;
-- tree[m].Len = (ush)bits;
-- }
-- n--;
-- }
-- }
--}
--
--/* ===========================================================================
-- * Generate the codes for a given tree and bit counts (which need not be
-- * optimal).
-- * IN assertion: the array bl_count contains the bit length statistics for
-- * the given tree and the field len is set for all tree elements.
-- * OUT assertion: the field code is set for all tree elements of non
-- * zero code length.
-- */
--local void gen_codes (tree, max_code, bl_count)
-- ct_data *tree; /* the tree to decorate */
-- int max_code; /* largest code with non zero frequency */
-- ushf *bl_count; /* number of codes at each bit length */
--{
-- ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-- ush code = 0; /* running code value */
-- int bits; /* bit index */
-- int n; /* code index */
--
-- /* The distribution counts are first used to generate the code values
-- * without bit reversal.
-- */
-- for (bits = 1; bits <= MAX_BITS; bits++) {
-- next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-- }
-- /* Check that the bit counts in bl_count are consistent. The last code
-- * must be all ones.
-- */
-- Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-- "inconsistent bit counts");
-- Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
--
-- for (n = 0; n <= max_code; n++) {
-- int len = tree[n].Len;
-- if (len == 0) continue;
-- /* Now reverse the bits */
-- tree[n].Code = bi_reverse(next_code[len]++, len);
--
-- Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-- n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-- }
--}
--
--/* ===========================================================================
-- * Construct one Huffman tree and assigns the code bit strings and lengths.
-- * Update the total bit length for the current block.
-- * IN assertion: the field freq is set for all tree elements.
-- * OUT assertions: the fields len and code are set to the optimal bit length
-- * and corresponding code. The length opt_len is updated; static_len is
-- * also updated if stree is not null. The field max_code is set.
-- */
--local void build_tree(s, desc)
-- deflate_state *s;
-- tree_desc *desc; /* the tree descriptor */
--{
-- ct_data *tree = desc->dyn_tree;
-- const ct_data *stree = desc->stat_desc->static_tree;
-- int elems = desc->stat_desc->elems;
-- int n, m; /* iterate over heap elements */
-- int max_code = -1; /* largest code with non zero frequency */
-- int node; /* new node being created */
--
-- /* Construct the initial heap, with least frequent element in
-- * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-- * heap[0] is not used.
-- */
-- s->heap_len = 0, s->heap_max = HEAP_SIZE;
--
-- for (n = 0; n < elems; n++) {
-- if (tree[n].Freq != 0) {
-- s->heap[++(s->heap_len)] = max_code = n;
-- s->depth[n] = 0;
-- } else {
-- tree[n].Len = 0;
-- }
-- }
--
-- /* The pkzip format requires that at least one distance code exists,
-- * and that at least one bit should be sent even if there is only one
-- * possible code. So to avoid special checks later on we force at least
-- * two codes of non zero frequency.
-- */
-- while (s->heap_len < 2) {
-- node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-- tree[node].Freq = 1;
-- s->depth[node] = 0;
-- s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-- /* node is 0 or 1 so it does not have extra bits */
-- }
-- desc->max_code = max_code;
--
-- /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-- * establish sub-heaps of increasing lengths:
-- */
-- for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
--
-- /* Construct the Huffman tree by repeatedly combining the least two
-- * frequent nodes.
-- */
-- node = elems; /* next internal node of the tree */
-- do {
-- pqremove(s, tree, n); /* n = node of least frequency */
-- m = s->heap[SMALLEST]; /* m = node of next least frequency */
--
-- s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-- s->heap[--(s->heap_max)] = m;
--
-- /* Create a new node father of n and m */
-- tree[node].Freq = tree[n].Freq + tree[m].Freq;
-- s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-- s->depth[n] : s->depth[m]) + 1);
-- tree[n].Dad = tree[m].Dad = (ush)node;
--#ifdef DUMP_BL_TREE
-- if (tree == s->bl_tree) {
-- fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-- node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-- }
--#endif
-- /* and insert the new node in the heap */
-- s->heap[SMALLEST] = node++;
-- pqdownheap(s, tree, SMALLEST);
--
-- } while (s->heap_len >= 2);
--
-- s->heap[--(s->heap_max)] = s->heap[SMALLEST];
--
-- /* At this point, the fields freq and dad are set. We can now
-- * generate the bit lengths.
-- */
-- gen_bitlen(s, (tree_desc *)desc);
--
-- /* The field len is now set, we can generate the bit codes */
-- gen_codes ((ct_data *)tree, max_code, s->bl_count);
--}
--
--/* ===========================================================================
-- * Scan a literal or distance tree to determine the frequencies of the codes
-- * in the bit length tree.
-- */
--local void scan_tree (s, tree, max_code)
-- deflate_state *s;
-- ct_data *tree; /* the tree to be scanned */
-- int max_code; /* and its largest code of non zero frequency */
--{
-- int n; /* iterates over all tree elements */
-- int prevlen = -1; /* last emitted length */
-- int curlen; /* length of current code */
-- int nextlen = tree[0].Len; /* length of next code */
-- int count = 0; /* repeat count of the current code */
-- int max_count = 7; /* max repeat count */
-- int min_count = 4; /* min repeat count */
--
-- if (nextlen == 0) max_count = 138, min_count = 3;
-- tree[max_code+1].Len = (ush)0xffff; /* guard */
--
-- for (n = 0; n <= max_code; n++) {
-- curlen = nextlen; nextlen = tree[n+1].Len;
-- if (++count < max_count && curlen == nextlen) {
-- continue;
-- } else if (count < min_count) {
-- s->bl_tree[curlen].Freq += count;
-- } else if (curlen != 0) {
-- if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-- s->bl_tree[REP_3_6].Freq++;
-- } else if (count <= 10) {
-- s->bl_tree[REPZ_3_10].Freq++;
-- } else {
-- s->bl_tree[REPZ_11_138].Freq++;
-- }
-- count = 0; prevlen = curlen;
-- if (nextlen == 0) {
-- max_count = 138, min_count = 3;
-- } else if (curlen == nextlen) {
-- max_count = 6, min_count = 3;
-- } else {
-- max_count = 7, min_count = 4;
-- }
-- }
--}
--
--/* ===========================================================================
-- * Send a literal or distance tree in compressed form, using the codes in
-- * bl_tree.
-- */
--local void send_tree (s, tree, max_code)
-- deflate_state *s;
-- ct_data *tree; /* the tree to be scanned */
-- int max_code; /* and its largest code of non zero frequency */
--{
-- int n; /* iterates over all tree elements */
-- int prevlen = -1; /* last emitted length */
-- int curlen; /* length of current code */
-- int nextlen = tree[0].Len; /* length of next code */
-- int count = 0; /* repeat count of the current code */
-- int max_count = 7; /* max repeat count */
-- int min_count = 4; /* min repeat count */
--
-- /* tree[max_code+1].Len = -1; */ /* guard already set */
-- if (nextlen == 0) max_count = 138, min_count = 3;
--
-- for (n = 0; n <= max_code; n++) {
-- curlen = nextlen; nextlen = tree[n+1].Len;
-- if (++count < max_count && curlen == nextlen) {
-- continue;
-- } else if (count < min_count) {
-- do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
--
-- } else if (curlen != 0) {
-- if (curlen != prevlen) {
-- send_code(s, curlen, s->bl_tree); count--;
-- }
-- Assert(count >= 3 && count <= 6, " 3_6?");
-- send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
--
-- } else if (count <= 10) {
-- send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
--
-- } else {
-- send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-- }
-- count = 0; prevlen = curlen;
-- if (nextlen == 0) {
-- max_count = 138, min_count = 3;
-- } else if (curlen == nextlen) {
-- max_count = 6, min_count = 3;
-- } else {
-- max_count = 7, min_count = 4;
-- }
-- }
--}
--
--/* ===========================================================================
-- * Construct the Huffman tree for the bit lengths and return the index in
-- * bl_order of the last bit length code to send.
-- */
--local int build_bl_tree(s)
-- deflate_state *s;
--{
-- int max_blindex; /* index of last bit length code of non zero freq */
--
-- /* Determine the bit length frequencies for literal and distance trees */
-- scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-- scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
--
-- /* Build the bit length tree: */
-- build_tree(s, (tree_desc *)(&(s->bl_desc)));
-- /* opt_len now includes the length of the tree representations, except
-- * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-- */
--
-- /* Determine the number of bit length codes to send. The pkzip format
-- * requires that at least 4 bit length codes be sent. (appnote.txt says
-- * 3 but the actual value used is 4.)
-- */
-- for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-- if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-- }
-- /* Update opt_len to include the bit length tree and counts */
-- s->opt_len += 3*(max_blindex+1) + 5+5+4;
-- Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-- s->opt_len, s->static_len));
--
-- return max_blindex;
--}
--
--/* ===========================================================================
-- * Send the header for a block using dynamic Huffman trees: the counts, the
-- * lengths of the bit length codes, the literal tree and the distance tree.
-- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
-- */
--local void send_all_trees(s, lcodes, dcodes, blcodes)
-- deflate_state *s;
-- int lcodes, dcodes, blcodes; /* number of codes for each tree */
--{
-- int rank; /* index in bl_order */
--
-- Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-- Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-- "too many codes");
-- Tracev((stderr, "\nbl counts: "));
-- send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-- send_bits(s, dcodes-1, 5);
-- send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */
-- for (rank = 0; rank < blcodes; rank++) {
-- Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-- send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-- }
-- Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
--
-- send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-- Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
--
-- send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-- Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
--}
--
--/* ===========================================================================
-- * Send a stored block
-- */
--void _tr_stored_block(s, buf, stored_len, eof)
-- deflate_state *s;
-- charf *buf; /* input block */
-- ulg stored_len; /* length of input block */
-- int eof; /* true if this is the last block for a file */
--{
-- send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */
--#ifdef DEBUG
-- s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-- s->compressed_len += (stored_len + 4) << 3;
--#endif
-- copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
--}
--
--/* ===========================================================================
-- * Send one empty static block to give enough lookahead for inflate.
-- * This takes 10 bits, of which 7 may remain in the bit buffer.
-- * The current inflate code requires 9 bits of lookahead. If the
-- * last two codes for the previous block (real code plus EOB) were coded
-- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
-- * the last real code. In this case we send two empty static blocks instead
-- * of one. (There are no problems if the previous block is stored or fixed.)
-- * To simplify the code, we assume the worst case of last real code encoded
-- * on one bit only.
-- */
--void _tr_align(s)
-- deflate_state *s;
--{
-- send_bits(s, STATIC_TREES<<1, 3);
-- send_code(s, END_BLOCK, static_ltree);
--#ifdef DEBUG
-- s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
--#endif
-- bi_flush(s);
-- /* Of the 10 bits for the empty block, we have already sent
-- * (10 - bi_valid) bits. The lookahead for the last real code (before
-- * the EOB of the previous block) was thus at least one plus the length
-- * of the EOB plus what we have just sent of the empty static block.
-- */
-- if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-- send_bits(s, STATIC_TREES<<1, 3);
-- send_code(s, END_BLOCK, static_ltree);
--#ifdef DEBUG
-- s->compressed_len += 10L;
--#endif
-- bi_flush(s);
-- }
-- s->last_eob_len = 7;
--}
--
--/* ===========================================================================
-- * Determine the best encoding for the current block: dynamic trees, static
-- * trees or store, and output the encoded block to the zip file.
-- */
--void _tr_flush_block(s, buf, stored_len, eof)
-- deflate_state *s;
-- charf *buf; /* input block, or NULL if too old */
-- ulg stored_len; /* length of input block */
-- int eof; /* true if this is the last block for a file */
--{
-- ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-- int max_blindex = 0; /* index of last bit length code of non zero freq */
--
-- /* Build the Huffman trees unless a stored block is forced */
-- if (s->level > 0) {
--
-- /* Check if the file is binary or text */
-- if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
-- set_data_type(s);
--
-- /* Construct the literal and distance trees */
-- build_tree(s, (tree_desc *)(&(s->l_desc)));
-- Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-- s->static_len));
--
-- build_tree(s, (tree_desc *)(&(s->d_desc)));
-- Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-- s->static_len));
-- /* At this point, opt_len and static_len are the total bit lengths of
-- * the compressed block data, excluding the tree representations.
-- */
--
-- /* Build the bit length tree for the above two trees, and get the index
-- * in bl_order of the last bit length code to send.
-- */
-- max_blindex = build_bl_tree(s);
--
-- /* Determine the best encoding. Compute the block lengths in bytes. */
-- opt_lenb = (s->opt_len+3+7)>>3;
-- static_lenb = (s->static_len+3+7)>>3;
--
-- Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-- opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-- s->last_lit));
--
-- if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
--
-- } else {
-- Assert(buf != (char*)0, "lost buf");
-- opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-- }
--
--#ifdef FORCE_STORED
-- if (buf != (char*)0) { /* force stored block */
--#else
-- if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-- /* 4: two words for the lengths */
--#endif
-- /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-- * Otherwise we can't have processed more than WSIZE input bytes since
-- * the last block flush, because compression would have been
-- * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-- * transform a block into a stored block.
-- */
-- _tr_stored_block(s, buf, stored_len, eof);
--
--#ifdef FORCE_STATIC
-- } else if (static_lenb >= 0) { /* force static trees */
--#else
-- } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
--#endif
-- send_bits(s, (STATIC_TREES<<1)+eof, 3);
-- compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
--#ifdef DEBUG
-- s->compressed_len += 3 + s->static_len;
--#endif
-- } else {
-- send_bits(s, (DYN_TREES<<1)+eof, 3);
-- send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-- max_blindex+1);
-- compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
--#ifdef DEBUG
-- s->compressed_len += 3 + s->opt_len;
--#endif
-- }
-- Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-- /* The above check is made mod 2^32, for files larger than 512 MB
-- * and uLong implemented on 32 bits.
-- */
-- init_block(s);
--
-- if (eof) {
-- bi_windup(s);
--#ifdef DEBUG
-- s->compressed_len += 7; /* align on byte boundary */
--#endif
-- }
-- Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-- s->compressed_len-7*eof));
--}
--
--/* ===========================================================================
-- * Save the match info and tally the frequency counts. Return true if
-- * the current block must be flushed.
-- */
--int _tr_tally (s, dist, lc)
-- deflate_state *s;
-- unsigned dist; /* distance of matched string */
-- unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
--{
-- s->d_buf[s->last_lit] = (ush)dist;
-- s->l_buf[s->last_lit++] = (uch)lc;
-- if (dist == 0) {
-- /* lc is the unmatched char */
-- s->dyn_ltree[lc].Freq++;
-- } else {
-- s->matches++;
-- /* Here, lc is the match length - MIN_MATCH */
-- dist--; /* dist = match distance - 1 */
-- Assert((ush)dist < (ush)MAX_DIST(s) &&
-- (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-- (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match");
--
-- s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-- s->dyn_dtree[d_code(dist)].Freq++;
-- }
--
--#ifdef TRUNCATE_BLOCK
-- /* Try to guess if it is profitable to stop the current block here */
-- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-- /* Compute an upper bound for the compressed length */
-- ulg out_length = (ulg)s->last_lit*8L;
-- ulg in_length = (ulg)((long)s->strstart - s->block_start);
-- int dcode;
-- for (dcode = 0; dcode < D_CODES; dcode++) {
-- out_length += (ulg)s->dyn_dtree[dcode].Freq *
-- (5L+extra_dbits[dcode]);
-- }
-- out_length >>= 3;
-- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-- s->last_lit, in_length, out_length,
-- 100L - out_length*100L/in_length));
-- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-- }
--#endif
-- return (s->last_lit == s->lit_bufsize-1);
-- /* We avoid equality with lit_bufsize because of wraparound at 64K
-- * on 16 bit machines and because stored blocks are restricted to
-- * 64K-1 bytes.
-- */
--}
--
--/* ===========================================================================
-- * Send the block data compressed using the given Huffman trees
-- */
--local void compress_block(s, ltree, dtree)
-- deflate_state *s;
-- ct_data *ltree; /* literal tree */
-- ct_data *dtree; /* distance tree */
--{
-- unsigned dist; /* distance of matched string */
-- int lc; /* match length or unmatched char (if dist == 0) */
-- unsigned lx = 0; /* running index in l_buf */
-- unsigned code; /* the code to send */
-- int extra; /* number of extra bits to send */
--
-- if (s->last_lit != 0) do {
-- dist = s->d_buf[lx];
-- lc = s->l_buf[lx++];
-- if (dist == 0) {
-- send_code(s, lc, ltree); /* send a literal byte */
-- Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-- } else {
-- /* Here, lc is the match length - MIN_MATCH */
-- code = _length_code[lc];
-- send_code(s, code+LITERALS+1, ltree); /* send the length code */
-- extra = extra_lbits[code];
-- if (extra != 0) {
-- lc -= base_length[code];
-- send_bits(s, lc, extra); /* send the extra length bits */
-- }
-- dist--; /* dist is now the match distance - 1 */
-- code = d_code(dist);
-- Assert (code < D_CODES, "bad d_code");
--
-- send_code(s, code, dtree); /* send the distance code */
-- extra = extra_dbits[code];
-- if (extra != 0) {
-- dist -= base_dist[code];
-- send_bits(s, dist, extra); /* send the extra distance bits */
-- }
-- } /* literal or match pair ? */
--
-- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-- "pendingBuf overflow");
--
-- } while (lx < s->last_lit);
--
-- send_code(s, END_BLOCK, ltree);
-- s->last_eob_len = ltree[END_BLOCK].Len;
--}
--
--/* ===========================================================================
-- * Set the data type to BINARY or TEXT, using a crude approximation:
-- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
-- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
-- * IN assertion: the fields Freq of dyn_ltree are set.
-- */
--local void set_data_type(s)
-- deflate_state *s;
--{
-- int n;
--
-- for (n = 0; n < 9; n++)
-- if (s->dyn_ltree[n].Freq != 0)
-- break;
-- if (n == 9)
-- for (n = 14; n < 32; n++)
-- if (s->dyn_ltree[n].Freq != 0)
-- break;
-- s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
--}
--
--/* ===========================================================================
-- * Reverse the first len bits of a code, using straightforward code (a faster
-- * method would use a table)
-- * IN assertion: 1 <= len <= 15
-- */
--local unsigned bi_reverse(code, len)
-- unsigned code; /* the value to invert */
-- int len; /* its bit length */
--{
-- register unsigned res = 0;
-- do {
-- res |= code & 1;
-- code >>= 1, res <<= 1;
-- } while (--len > 0);
-- return res >> 1;
--}
--
--/* ===========================================================================
-- * Flush the bit buffer, keeping at most 7 bits in it.
-- */
--local void bi_flush(s)
-- deflate_state *s;
--{
-- if (s->bi_valid == 16) {
-- put_short(s, s->bi_buf);
-- s->bi_buf = 0;
-- s->bi_valid = 0;
-- } else if (s->bi_valid >= 8) {
-- put_byte(s, (Byte)s->bi_buf);
-- s->bi_buf >>= 8;
-- s->bi_valid -= 8;
-- }
--}
--
--/* ===========================================================================
-- * Flush the bit buffer and align the output on a byte boundary
-- */
--local void bi_windup(s)
-- deflate_state *s;
--{
-- if (s->bi_valid > 8) {
-- put_short(s, s->bi_buf);
-- } else if (s->bi_valid > 0) {
-- put_byte(s, (Byte)s->bi_buf);
-- }
-- s->bi_buf = 0;
-- s->bi_valid = 0;
--#ifdef DEBUG
-- s->bits_sent = (s->bits_sent+7) & ~7;
--#endif
--}
--
--/* ===========================================================================
-- * Copy a stored block, storing first the length and its
-- * one's complement if requested.
-- */
--local void copy_block(s, buf, len, header)
-- deflate_state *s;
-- charf *buf; /* the input data */
-- unsigned len; /* its length */
-- int header; /* true if block header must be written */
--{
-- bi_windup(s); /* align on byte boundary */
-- s->last_eob_len = 8; /* enough lookahead for inflate */
--
-- if (header) {
-- put_short(s, (ush)len);
-- put_short(s, (ush)~len);
--#ifdef DEBUG
-- s->bits_sent += 2*16;
--#endif
-- }
--#ifdef DEBUG
-- s->bits_sent += (ulg)len<<3;
--#endif
-- while (len--) {
-- put_byte(s, *buf++);
-- }
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,152 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* header created automatically with -DGEN_TREES_H */
--
--local const ct_data static_ltree[L_CODES+2] = {
--{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}},
--{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}},
--{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}},
--{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}},
--{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}},
--{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}},
--{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}},
--{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}},
--{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}},
--{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}},
--{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}},
--{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}},
--{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}},
--{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}},
--{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}},
--{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}},
--{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}},
--{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}},
--{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}},
--{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}},
--{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}},
--{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}},
--{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}},
--{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}},
--{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}},
--{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}},
--{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}},
--{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}},
--{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}},
--{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}},
--{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}},
--{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}},
--{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}},
--{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}},
--{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}},
--{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}},
--{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}},
--{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}},
--{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}},
--{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}},
--{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}},
--{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}},
--{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}},
--{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}},
--{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}},
--{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}},
--{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}},
--{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}},
--{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}},
--{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}},
--{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}},
--{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}},
--{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}},
--{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}},
--{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}},
--{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}},
--{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}},
--{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}}
--};
--
--local const ct_data static_dtree[D_CODES] = {
--{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
--{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
--{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
--{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
--{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
--{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
--};
--
--const uch _dist_code[DIST_CODE_LEN] = {
-- 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
-- 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
--10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
--11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
--12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
--13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
--13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
--14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
--14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
--14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
--15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
--15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
--15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17,
--18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
--23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
--24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
--26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
--26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
--27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
--27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
--28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
--28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
--28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
--29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
--29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
--29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
--};
--
--const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
-- 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
--13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
--17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
--19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
--21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
--22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
--23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
--24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
--25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
--25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
--26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
--26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
--27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
--};
--
--local const int base_length[LENGTH_CODES] = {
--0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
--64, 80, 96, 112, 128, 160, 192, 224, 0
--};
--
--local const int base_dist[D_CODES] = {
-- 0, 1, 2, 3, 4, 6, 8, 12, 16, 24,
-- 32, 48, 64, 96, 128, 192, 256, 384, 512, 768,
-- 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576
--};
--
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,85 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* uncompr.c -- decompress a memory buffer
-- * Copyright (C) 1995-2003 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#define ZLIB_INTERNAL
--#include "zlib.h"
--
--/* ===========================================================================
-- Decompresses the source buffer into the destination buffer. sourceLen is
-- the byte length of the source buffer. Upon entry, destLen is the total
-- size of the destination buffer, which must be large enough to hold the
-- entire uncompressed data. (The size of the uncompressed data must have
-- been saved previously by the compressor and transmitted to the decompressor
-- by some mechanism outside the scope of this compression library.)
-- Upon exit, destLen is the actual size of the compressed buffer.
-- This function can be used to decompress a whole file at once if the
-- input file is mmap'ed.
--
-- uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-- enough memory, Z_BUF_ERROR if there was not enough room in the output
-- buffer, or Z_DATA_ERROR if the input data was corrupted.
--*/
--int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-- Bytef *dest;
-- uLongf *destLen;
-- const Bytef *source;
-- uLong sourceLen;
--{
-- z_stream stream;
-- int err;
--
-- stream.next_in = (Bytef*)source;
-- stream.avail_in = (uInt)sourceLen;
-- /* Check for source > 64K on 16-bit machine: */
-- if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
--
-- stream.next_out = dest;
-- stream.avail_out = (uInt)*destLen;
-- if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
--
-- stream.zalloc = (alloc_func)0;
-- stream.zfree = (free_func)0;
--
-- err = inflateInit(&stream);
-- if (err != Z_OK) return err;
--
-- err = inflate(&stream, Z_FINISH);
-- if (err != Z_STREAM_END) {
-- inflateEnd(&stream);
-- if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-- return Z_DATA_ERROR;
-- return err;
-- }
-- *destLen = (uLong)stream.total_out;
--
-- err = inflateEnd(&stream);
-- return err;
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,173 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* adler32.c -- compute the Adler-32 checksum of a data stream
-- * Copyright (C) 1995-2004 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#define ZLIB_INTERNAL
--#include "zlib.h"
--
--#define BASE 65521UL /* largest prime smaller than 65536 */
--#define NMAX 5552
--/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
--
--#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;}
--#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1);
--#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2);
--#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4);
--#define DO16(buf) DO8(buf,0); DO8(buf,8);
--
--/* use NO_DIVIDE if your processor does not do division in hardware */
--#ifdef NO_DIVIDE
--# define MOD(a) \
-- do { \
-- if (a >= (BASE << 16)) a -= (BASE << 16); \
-- if (a >= (BASE << 15)) a -= (BASE << 15); \
-- if (a >= (BASE << 14)) a -= (BASE << 14); \
-- if (a >= (BASE << 13)) a -= (BASE << 13); \
-- if (a >= (BASE << 12)) a -= (BASE << 12); \
-- if (a >= (BASE << 11)) a -= (BASE << 11); \
-- if (a >= (BASE << 10)) a -= (BASE << 10); \
-- if (a >= (BASE << 9)) a -= (BASE << 9); \
-- if (a >= (BASE << 8)) a -= (BASE << 8); \
-- if (a >= (BASE << 7)) a -= (BASE << 7); \
-- if (a >= (BASE << 6)) a -= (BASE << 6); \
-- if (a >= (BASE << 5)) a -= (BASE << 5); \
-- if (a >= (BASE << 4)) a -= (BASE << 4); \
-- if (a >= (BASE << 3)) a -= (BASE << 3); \
-- if (a >= (BASE << 2)) a -= (BASE << 2); \
-- if (a >= (BASE << 1)) a -= (BASE << 1); \
-- if (a >= BASE) a -= BASE; \
-- } while (0)
--# define MOD4(a) \
-- do { \
-- if (a >= (BASE << 4)) a -= (BASE << 4); \
-- if (a >= (BASE << 3)) a -= (BASE << 3); \
-- if (a >= (BASE << 2)) a -= (BASE << 2); \
-- if (a >= (BASE << 1)) a -= (BASE << 1); \
-- if (a >= BASE) a -= BASE; \
-- } while (0)
--#else
--# define MOD(a) a %= BASE
--# define MOD4(a) a %= BASE
--#endif
--
--/* ========================================================================= */
--uLong ZEXPORT adler32(adler, buf, len)
-- uLong adler;
-- const Bytef *buf;
-- uInt len;
--{
-- unsigned long sum2;
-- unsigned n;
--
-- /* split Adler-32 into component sums */
-- sum2 = (adler >> 16) & 0xffff;
-- adler &= 0xffff;
--
-- /* in case user likes doing a byte at a time, keep it fast */
-- if (len == 1) {
-- adler += buf[0];
-- if (adler >= BASE)
-- adler -= BASE;
-- sum2 += adler;
-- if (sum2 >= BASE)
-- sum2 -= BASE;
-- return adler | (sum2 << 16);
-- }
--
-- /* initial Adler-32 value (deferred check for len == 1 speed) */
-- if (buf == Z_NULL)
-- return 1L;
--
-- /* in case short lengths are provided, keep it somewhat fast */
-- if (len < 16) {
-- while (len--) {
-- adler += *buf++;
-- sum2 += adler;
-- }
-- if (adler >= BASE)
-- adler -= BASE;
-- MOD4(sum2); /* only added so many BASE's */
-- return adler | (sum2 << 16);
-- }
--
-- /* do length NMAX blocks -- requires just one modulo operation */
-- while (len >= NMAX) {
-- len -= NMAX;
-- n = NMAX / 16; /* NMAX is divisible by 16 */
-- do {
-- DO16(buf); /* 16 sums unrolled */
-- buf += 16;
-- } while (--n);
-- MOD(adler);
-- MOD(sum2);
-- }
--
-- /* do remaining bytes (less than NMAX, still just one modulo) */
-- if (len) { /* avoid modulos if none remaining */
-- while (len >= 16) {
-- len -= 16;
-- DO16(buf);
-- buf += 16;
-- }
-- while (len--) {
-- adler += *buf++;
-- sum2 += adler;
-- }
-- MOD(adler);
-- MOD(sum2);
-- }
--
-- /* return recombined sums */
-- return adler | (sum2 << 16);
--}
--
--/* ========================================================================= */
--uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-- uLong adler1;
-- uLong adler2;
-- z_off_t len2;
--{
-- unsigned long sum1;
-- unsigned long sum2;
-- unsigned rem;
--
-- /* the derivation of this formula is left as an exercise for the reader */
-- rem = (unsigned)(len2 % BASE);
-- sum1 = adler1 & 0xffff;
-- sum2 = rem * sum1;
-- MOD(sum2);
-- sum1 += (adler2 & 0xffff) + BASE - 1;
-- sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-- if (sum1 > BASE) sum1 -= BASE;
-- if (sum1 > BASE) sum1 -= BASE;
-- if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
-- if (sum2 > BASE) sum2 -= BASE;
-- return sum1 | (sum2 << 16);
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,363 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* zconf.h -- configuration of the zlib compression library
-- * Copyright (C) 1995-2005 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#ifndef ZCONF_H
--#define ZCONF_H
--
--/* for _LP64 */
--#include <sys/types.h>
--
--/*
-- * If you *really* need a unique prefix for all types and library functions,
-- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-- */
--#ifdef Z_PREFIX
--# define deflateInit_ z_deflateInit_
--# define deflate z_deflate
--# define deflateEnd z_deflateEnd
--# define inflateInit_ z_inflateInit_
--# define inflate z_inflate
--# define inflateEnd z_inflateEnd
--# define deflateInit2_ z_deflateInit2_
--# define deflateSetDictionary z_deflateSetDictionary
--# define deflateCopy z_deflateCopy
--# define deflateReset z_deflateReset
--# define deflateParams z_deflateParams
--# define deflateBound z_deflateBound
--# define deflatePrime z_deflatePrime
--# define inflateInit2_ z_inflateInit2_
--# define inflateSetDictionary z_inflateSetDictionary
--# define inflateSync z_inflateSync
--# define inflateSyncPoint z_inflateSyncPoint
--# define inflateCopy z_inflateCopy
--# define inflateReset z_inflateReset
--# define inflateBack z_inflateBack
--# define inflateBackEnd z_inflateBackEnd
--# define compress z_compress
--# define compress2 z_compress2
--# define compressBound z_compressBound
--# define uncompress z_uncompress
--# define adler32 z_adler32
--# define crc32 z_crc32
--# define get_crc_table z_get_crc_table
--# define zError z_zError
--
--# define alloc_func z_alloc_func
--# define free_func z_free_func
--# define in_func z_in_func
--# define out_func z_out_func
--# define Byte z_Byte
--# define uInt z_uInt
--# define uLong z_uLong
--# define Bytef z_Bytef
--# define charf z_charf
--# define intf z_intf
--# define uIntf z_uIntf
--# define uLongf z_uLongf
--# define voidpf z_voidpf
--# define voidp z_voidp
--#endif
--
--#if defined(__MSDOS__) && !defined(MSDOS)
--# define MSDOS
--#endif
--#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
--# define OS2
--#endif
--#if defined(_WINDOWS) && !defined(WINDOWS)
--# define WINDOWS
--#endif
--#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
--# ifndef WIN32
--# define WIN32
--# endif
--#endif
--#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
--# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
--# ifndef SYS16BIT
--# define SYS16BIT
--# endif
--# endif
--#endif
--
--/*
-- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
-- * than 64k bytes at a time (needed on systems with 16-bit int).
-- */
--#ifdef SYS16BIT
--# define MAXSEG_64K
--#endif
--#ifdef MSDOS
--# define UNALIGNED_OK
--#endif
--
--#ifdef __STDC_VERSION__
--# ifndef STDC
--# define STDC
--# endif
--# if __STDC_VERSION__ >= 199901L
--# ifndef STDC99
--# define STDC99
--# endif
--# endif
--#endif
--#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
--# define STDC
--#endif
--#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
--# define STDC
--#endif
--#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
--# define STDC
--#endif
--#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
--# define STDC
--#endif
--
--#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
--# define STDC
--#endif
--
--#ifndef STDC
--# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
--# define const /* note: need a more gentle solution here */
--# endif
--#endif
--
--/* Some Mac compilers merge all .h files incorrectly: */
--#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
--# define NO_DUMMY_DECL
--#endif
--
--/* Maximum value for memLevel in deflateInit2 */
--#ifndef MAX_MEM_LEVEL
--# ifdef MAXSEG_64K
--# define MAX_MEM_LEVEL 8
--# else
--# define MAX_MEM_LEVEL 9
--# endif
--#endif
--
--/* Maximum value for windowBits in deflateInit2 and inflateInit2.
-- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
-- * created by gzip. (Files created by minigzip can still be extracted by
-- * gzip.)
-- */
--#ifndef MAX_WBITS
--# define MAX_WBITS 15 /* 32K LZ77 window */
--#endif
--
--/* The memory requirements for deflate are (in bytes):
-- (1 << (windowBits+2)) + (1 << (memLevel+9))
-- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
-- plus a few kilobytes for small objects. For example, if you want to reduce
-- the default memory requirements from 256K to 128K, compile with
-- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
-- Of course this will generally degrade compression (there's no free lunch).
--
-- The memory requirements for inflate are (in bytes) 1 << windowBits
-- that is, 32K for windowBits=15 (default value) plus a few kilobytes
-- for small objects.
--*/
--
-- /* Type declarations */
--
--#ifndef OF /* function prototypes */
--# ifdef STDC
--# define OF(args) args
--# else
--# define OF(args) ()
--# endif
--#endif
--
--/* The following definitions for FAR are needed only for MSDOS mixed
-- * model programming (small or medium model with some far allocations).
-- * This was tested only with MSC; for other MSDOS compilers you may have
-- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
-- * just define FAR to be empty.
-- */
--#ifdef SYS16BIT
--# if defined(M_I86SM) || defined(M_I86MM)
-- /* MSC small or medium model */
--# define SMALL_MEDIUM
--# ifdef _MSC_VER
--# define FAR _far
--# else
--# define FAR far
--# endif
--# endif
--# if (defined(__SMALL__) || defined(__MEDIUM__))
-- /* Turbo C small or medium model */
--# define SMALL_MEDIUM
--# ifdef __BORLANDC__
--# define FAR _far
--# else
--# define FAR far
--# endif
--# endif
--#endif
--
--#if defined(WINDOWS) || defined(WIN32)
-- /* If building or using zlib as a DLL, define ZLIB_DLL.
-- * This is not mandatory, but it offers a little performance increase.
-- */
--# ifdef ZLIB_DLL
--# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
--# ifdef ZLIB_INTERNAL
--# define ZEXTERN extern __declspec(dllexport)
--# else
--# define ZEXTERN extern __declspec(dllimport)
--# endif
--# endif
--# endif /* ZLIB_DLL */
-- /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-- * define ZLIB_WINAPI.
-- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-- */
--# ifdef ZLIB_WINAPI
--# ifdef FAR
--# undef FAR
--# endif
--# include <windows.h>
-- /* No need for _export, use ZLIB.DEF instead. */
-- /* For complete Windows compatibility, use WINAPI, not __stdcall. */
--# define ZEXPORT WINAPI
--# ifdef WIN32
--# define ZEXPORTVA WINAPIV
--# else
--# define ZEXPORTVA FAR CDECL
--# endif
--# endif
--#endif
--
--#if defined (__BEOS__)
--# ifdef ZLIB_DLL
--# ifdef ZLIB_INTERNAL
--# define ZEXPORT __declspec(dllexport)
--# define ZEXPORTVA __declspec(dllexport)
--# else
--# define ZEXPORT __declspec(dllimport)
--# define ZEXPORTVA __declspec(dllimport)
--# endif
--# endif
--#endif
--
--#ifndef ZEXTERN
--# define ZEXTERN extern
--#endif
--#ifndef ZEXPORT
--# define ZEXPORT
--#endif
--#ifndef ZEXPORTVA
--# define ZEXPORTVA
--#endif
--
--#ifndef FAR
--# define FAR
--#endif
--
--#if !defined(__MACTYPES__)
--typedef unsigned char Byte; /* 8 bits */
--#endif
--typedef unsigned int uInt; /* 16 bits or more */
--#ifdef _LP64
--typedef unsigned int uLong; /* 32 bits or more */
--#else
--typedef unsigned long uLong; /* 32 bits or more */
--#endif
--
--#ifdef SMALL_MEDIUM
-- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
--# define Bytef Byte FAR
--#else
-- typedef Byte FAR Bytef;
--#endif
--typedef char FAR charf;
--typedef int FAR intf;
--typedef uInt FAR uIntf;
--typedef uLong FAR uLongf;
--
--#ifdef STDC
-- typedef void const *voidpc;
-- typedef void FAR *voidpf;
-- typedef void *voidp;
--#else
-- typedef Byte const *voidpc;
-- typedef Byte FAR *voidpf;
-- typedef Byte *voidp;
--#endif
--
--#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
--# include <sys/types.h> /* for off_t */
--# include <unistd.h> /* for SEEK_* and off_t */
--# ifdef VMS
--# include <unixio.h> /* for off_t */
--# endif
--# define z_off_t off_t
--#endif
--#ifndef SEEK_SET
--# define SEEK_SET 0 /* Seek from beginning of file. */
--# define SEEK_CUR 1 /* Seek from current position. */
--# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
--#endif
--#ifndef z_off_t
--# define z_off_t long
--#endif
--
--#if defined(__OS400__)
--# define NO_vsnprintf
--#endif
--
--#if defined(__MVS__)
--# define NO_vsnprintf
--# ifdef FAR
--# undef FAR
--# endif
--#endif
--
--/* MVS linker does not support external names larger than 8 bytes */
--#if defined(__MVS__)
--# pragma map(deflateInit_,"DEIN")
--# pragma map(deflateInit2_,"DEIN2")
--# pragma map(deflateEnd,"DEEND")
--# pragma map(deflateBound,"DEBND")
--# pragma map(inflateInit_,"ININ")
--# pragma map(inflateInit2_,"ININ2")
--# pragma map(inflateEnd,"INEND")
--# pragma map(inflateSync,"INSY")
--# pragma map(inflateSetDictionary,"INSEDI")
--# pragma map(compressBound,"CMBND")
--# pragma map(inflate_table,"INTABL")
--# pragma map(inflate_fast,"INFA")
--# pragma map(inflate_copyright,"INCOPY")
--#endif
--
--#endif /* ZCONF_H */
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,447 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* crc32.c -- compute the CRC-32 of a data stream
-- * Copyright (C) 1995-2005 Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- *
-- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
-- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
-- * tables for updating the shift register in one step with three exclusive-ors
-- * instead of four steps with four exclusive-ors. This results in about a
-- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
-- */
--
--/* @(#) $Id$ */
--
--/*
-- Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-- protection on the static variables used to control the first-use generation
-- of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-- first call get_crc_table() to initialize the tables before allowing more than
-- one thread to use crc32().
-- */
--
--#ifdef MAKECRCH
--# include <stdio.h>
--# ifndef DYNAMIC_CRC_TABLE
--# define DYNAMIC_CRC_TABLE
--# endif /* !DYNAMIC_CRC_TABLE */
--#endif /* MAKECRCH */
--
--#include "zutil.h" /* for STDC and FAR definitions */
--
--#define local static
--
--/* Find a four-byte integer type for crc32_little() and crc32_big(). */
--#ifndef NOBYFOUR
--# ifdef STDC /* need ANSI C limits.h to determine sizes */
--# include <limits.h>
--# define BYFOUR
--# if (UINT_MAX == 0xffffffffUL)
-- typedef unsigned int u4;
--# else
--# if (ULONG_MAX == 0xffffffffUL)
-- typedef unsigned long u4;
--# else
--# if (USHRT_MAX == 0xffffffffUL)
-- typedef unsigned short u4;
--# else
--# undef BYFOUR /* can't find a four-byte integer type! */
--# endif
--# endif
--# endif
--# endif /* STDC */
--#endif /* !NOBYFOUR */
--
--/* Definitions for doing the crc four data bytes at a time. */
--#ifdef BYFOUR
--# define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
-- (((w)&0xff00)<<8)+(((w)&0xff)<<24))
-- local unsigned long crc32_little OF((unsigned long,
-- const unsigned char FAR *, unsigned));
-- local unsigned long crc32_big OF((unsigned long,
-- const unsigned char FAR *, unsigned));
--# define TBLS 8
--#else
--# define TBLS 1
--#endif /* BYFOUR */
--
--/* Local functions for crc concatenation */
--local unsigned long gf2_matrix_times OF((unsigned long *mat,
-- unsigned long vec));
--local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
--
--#ifdef DYNAMIC_CRC_TABLE
--
--local volatile int crc_table_empty = 1;
--local unsigned long FAR crc_table[TBLS][256];
--local void make_crc_table OF((void));
--#ifdef MAKECRCH
-- local void write_table OF((FILE *, const unsigned long FAR *));
--#endif /* MAKECRCH */
--/*
-- Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-- x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
--
-- Polynomials over GF(2) are represented in binary, one bit per coefficient,
-- with the lowest powers in the most significant bit. Then adding polynomials
-- is just exclusive-or, and multiplying a polynomial by x is a right shift by
-- one. If we call the above polynomial p, and represent a byte as the
-- polynomial q, also with the lowest power in the most significant bit (so the
-- byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-- where a mod b means the remainder after dividing a by b.
--
-- This calculation is done using the shift-register method of multiplying and
-- taking the remainder. The register is initialized to zero, and for each
-- incoming bit, x^32 is added mod p to the register if the bit is a one (where
-- x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-- x (which is shifting right by one and adding x^32 mod p if the bit shifted
-- out is a one). We start with the highest power (least significant bit) of
-- q and repeat for all eight bits of q.
--
-- The first table is simply the CRC of all possible eight bit values. This is
-- all the information needed to generate CRCs on data a byte at a time for all
-- combinations of CRC register values and incoming bytes. The remaining tables
-- allow for word-at-a-time CRC calculation for both big-endian and little-
-- endian machines, where a word is four bytes.
--*/
--local void make_crc_table()
--{
-- unsigned long c;
-- int n, k;
-- unsigned long poly; /* polynomial exclusive-or pattern */
-- /* terms of polynomial defining this crc (except x^32): */
-- static volatile int first = 1; /* flag to limit concurrent making */
-- static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
--
-- /* See if another task is already doing this (not thread-safe, but better
-- than nothing -- significantly reduces duration of vulnerability in
-- case the advice about DYNAMIC_CRC_TABLE is ignored) */
-- if (first) {
-- first = 0;
--
-- /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-- poly = 0UL;
-- for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-- poly |= 1UL << (31 - p[n]);
--
-- /* generate a crc for every 8-bit value */
-- for (n = 0; n < 256; n++) {
-- c = (unsigned long)n;
-- for (k = 0; k < 8; k++)
-- c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-- crc_table[0][n] = c;
-- }
--
--#ifdef BYFOUR
-- /* generate crc for each value followed by one, two, and three zeros,
-- and then the byte reversal of those as well as the first table */
-- for (n = 0; n < 256; n++) {
-- c = crc_table[0][n];
-- crc_table[4][n] = REV(c);
-- for (k = 1; k < 4; k++) {
-- c = crc_table[0][c & 0xff] ^ (c >> 8);
-- crc_table[k][n] = c;
-- crc_table[k + 4][n] = REV(c);
-- }
-- }
--#endif /* BYFOUR */
--
-- crc_table_empty = 0;
-- }
-- else { /* not first */
-- /* wait for the other guy to finish (not efficient, but rare) */
-- while (crc_table_empty)
-- ;
-- }
--
--#ifdef MAKECRCH
-- /* write out CRC tables to crc32.h */
-- {
-- FILE *out;
--
-- out = fopen("crc32.h", "w");
-- if (out == NULL) return;
-- fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-- fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-- fprintf(out, "local const unsigned long FAR ");
-- fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");
-- write_table(out, crc_table[0]);
--# ifdef BYFOUR
-- fprintf(out, "#ifdef BYFOUR\n");
-- for (k = 1; k < 8; k++) {
-- fprintf(out, " },\n {\n");
-- write_table(out, crc_table[k]);
-- }
-- fprintf(out, "#endif\n");
--# endif /* BYFOUR */
-- fprintf(out, " }\n};\n");
-- fclose(out);
-- }
--#endif /* MAKECRCH */
--}
--
--#ifdef MAKECRCH
--local void write_table(out, table)
-- FILE *out;
-- const unsigned long FAR *table;
--{
-- int n;
--
-- for (n = 0; n < 256; n++)
-- fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n],
-- n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
--}
--#endif /* MAKECRCH */
--
--#else /* !DYNAMIC_CRC_TABLE */
--/* ========================================================================
-- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
-- */
--#include "crc32.h"
--#endif /* DYNAMIC_CRC_TABLE */
--
--/* =========================================================================
-- * This function can be used by asm versions of crc32()
-- */
--const unsigned long FAR * ZEXPORT get_crc_table()
--{
--#ifdef DYNAMIC_CRC_TABLE
-- if (crc_table_empty)
-- make_crc_table();
--#endif /* DYNAMIC_CRC_TABLE */
-- return (const unsigned long FAR *)crc_table;
--}
--
--/* ========================================================================= */
--#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
--#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
--
--/* ========================================================================= */
--uLong ZEXPORT crc32(crc, buf, len)
-- uLong crc;
-- const unsigned char FAR *buf;
-- unsigned len;
--{
-- if (buf == Z_NULL) return 0UL;
--
--#ifdef DYNAMIC_CRC_TABLE
-- if (crc_table_empty)
-- make_crc_table();
--#endif /* DYNAMIC_CRC_TABLE */
--
--#ifdef BYFOUR
-- if (sizeof(void *) == sizeof(ptrdiff_t)) {
-- u4 endian;
--
-- endian = 1;
-- if (*((unsigned char *)(&endian)))
-- return (uLong)crc32_little(crc, buf, len);
-- else
-- return (uLong)crc32_big(crc, buf, len);
-- }
--#endif /* BYFOUR */
-- crc = crc ^ 0xffffffffUL;
-- while (len >= 8) {
-- DO8;
-- len -= 8;
-- }
-- if (len) do {
-- DO1;
-- } while (--len);
-- return crc ^ 0xffffffffUL;
--}
--
--#ifdef BYFOUR
--
--/* ========================================================================= */
--#define DOLIT4 c ^= *buf4++; \
-- c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-- crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
--#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
--
--/* ========================================================================= */
--local unsigned long crc32_little(crc, buf, len)
-- unsigned long crc;
-- const unsigned char FAR *buf;
-- unsigned len;
--{
-- register u4 c;
-- register const u4 FAR *buf4;
--
-- c = (u4)crc;
-- c = ~c;
-- while (len && ((ptrdiff_t)buf & 3)) {
-- c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-- len--;
-- }
--
-- buf4 = (const u4 FAR *)(const void FAR *)buf;
-- while (len >= 32) {
-- DOLIT32;
-- len -= 32;
-- }
-- while (len >= 4) {
-- DOLIT4;
-- len -= 4;
-- }
-- buf = (const unsigned char FAR *)buf4;
--
-- if (len) do {
-- c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-- } while (--len);
-- c = ~c;
-- return (unsigned long)c;
--}
--
--/* ========================================================================= */
--#define DOBIG4 c ^= *++buf4; \
-- c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-- crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
--#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
--
--/* ========================================================================= */
--local unsigned long crc32_big(crc, buf, len)
-- unsigned long crc;
-- const unsigned char FAR *buf;
-- unsigned len;
--{
-- register u4 c;
-- register const u4 FAR *buf4;
--
-- c = REV((u4)crc);
-- c = ~c;
-- while (len && ((ptrdiff_t)buf & 3)) {
-- c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-- len--;
-- }
--
-- buf4 = (const u4 FAR *)(const void FAR *)buf;
-- buf4--;
-- while (len >= 32) {
-- DOBIG32;
-- len -= 32;
-- }
-- while (len >= 4) {
-- DOBIG4;
-- len -= 4;
-- }
-- buf4++;
-- buf = (const unsigned char FAR *)buf4;
--
-- if (len) do {
-- c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-- } while (--len);
-- c = ~c;
-- return (unsigned long)(REV(c));
--}
--
--#endif /* BYFOUR */
--
--#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
--
--/* ========================================================================= */
--local unsigned long gf2_matrix_times(mat, vec)
-- unsigned long *mat;
-- unsigned long vec;
--{
-- unsigned long sum;
--
-- sum = 0;
-- while (vec) {
-- if (vec & 1)
-- sum ^= *mat;
-- vec >>= 1;
-- mat++;
-- }
-- return sum;
--}
--
--/* ========================================================================= */
--local void gf2_matrix_square(square, mat)
-- unsigned long *square;
-- unsigned long *mat;
--{
-- int n;
--
-- for (n = 0; n < GF2_DIM; n++)
-- square[n] = gf2_matrix_times(mat, mat[n]);
--}
--
--/* ========================================================================= */
--uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-- uLong crc1;
-- uLong crc2;
-- z_off_t len2;
--{
-- int n;
-- unsigned long row;
-- unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */
-- unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */
--
-- /* degenerate case */
-- if (len2 == 0)
-- return crc1;
--
-- /* put operator for one zero bit in odd */
-- odd[0] = 0xedb88320UL; /* CRC-32 polynomial */
-- row = 1;
-- for (n = 1; n < GF2_DIM; n++) {
-- odd[n] = row;
-- row <<= 1;
-- }
--
-- /* put operator for two zero bits in even */
-- gf2_matrix_square(even, odd);
--
-- /* put operator for four zero bits in odd */
-- gf2_matrix_square(odd, even);
--
-- /* apply len2 zeros to crc1 (first square will put the operator for one
-- zero byte, eight zero bits, in even) */
-- do {
-- /* apply zeros operator for this bit of len2 */
-- gf2_matrix_square(even, odd);
-- if (len2 & 1)
-- crc1 = gf2_matrix_times(even, crc1);
-- len2 >>= 1;
--
-- /* if no more bits set, then done */
-- if (len2 == 0)
-- break;
--
-- /* another iteration of the loop with odd and even swapped */
-- gf2_matrix_square(odd, even);
-- if (len2 & 1)
-- crc1 = gf2_matrix_times(odd, crc1);
-- len2 >>= 1;
--
-- /* if no more bits set, then done */
-- } while (len2 != 0);
--
-- /* return combined crc */
-- crc1 ^= crc2;
-- return crc1;
--}
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,1381 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* zlib.h -- interface of the 'zlib' general purpose compression library
-- version 1.2.3, July 18th, 2005
--
-- Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
--
-- This software is provided 'as-is', without any express or implied
-- warranty. In no event will the authors be held liable for any damages
-- arising from the use of this software.
--
-- Permission is granted to anyone to use this software for any purpose,
-- including commercial applications, and to alter it and redistribute it
-- freely, subject to the following restrictions:
--
-- 1. The origin of this software must not be misrepresented; you must not
-- claim that you wrote the original software. If you use this software
-- in a product, an acknowledgment in the product documentation would be
-- appreciated but is not required.
-- 2. Altered source versions must be plainly marked as such, and must not be
-- misrepresented as being the original software.
-- 3. This notice may not be removed or altered from any source distribution.
--
-- Jean-loup Gailly Mark Adler
-- jloup@gzip.org madler@alumni.caltech.edu
--
--
-- The data format used by the zlib library is described by RFCs (Request for
-- Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-- (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
--*/
--
--#ifndef ZLIB_H
--#define ZLIB_H
--
--#include "zconf.h"
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#define ZLIB_VERSION "1.2.3"
--#define ZLIB_VERNUM 0x1230
--
--/*
-- The 'zlib' compression library provides in-memory compression and
-- decompression functions, including integrity checks of the uncompressed
-- data. This version of the library supports only one compression method
-- (deflation) but other algorithms will be added later and will have the same
-- stream interface.
--
-- Compression can be done in a single step if the buffers are large
-- enough (for example if an input file is mmap'ed), or can be done by
-- repeated calls of the compression function. In the latter case, the
-- application must provide more input and/or consume the output
-- (providing more output space) before each call.
--
-- The compressed data format used by default by the in-memory functions is
-- the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-- around a deflate stream, which is itself documented in RFC 1951.
--
-- The library also supports reading and writing files in gzip (.gz) format
-- with an interface similar to that of stdio using the functions that start
-- with "gz". The gzip format is different from the zlib format. gzip is a
-- gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
--
-- This library can optionally read and write gzip streams in memory as well.
--
-- The zlib format was designed to be compact and fast for use in memory
-- and on communications channels. The gzip format was designed for single-
-- file compression on file systems, has a larger header than zlib to maintain
-- directory information, and uses a different, slower check method than zlib.
--
-- The library does not install any signal handler. The decoder checks
-- the consistency of the compressed data, so the library should never
-- crash even in case of corrupted input.
--*/
--
--typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
--typedef void (*free_func) OF((voidpf opaque, voidpf address));
--
--struct internal_state;
--
--typedef struct z_stream_s {
-- Bytef *next_in; /* next input byte */
-- uInt avail_in; /* number of bytes available at next_in */
-- uLong total_in; /* total nb of input bytes read so far */
--
-- Bytef *next_out; /* next output byte should be put there */
-- uInt avail_out; /* remaining free space at next_out */
-- uLong total_out; /* total nb of bytes output so far */
--
-- char *msg; /* last error message, NULL if no error */
-- struct internal_state FAR *state; /* not visible by applications */
--
-- alloc_func zalloc; /* used to allocate the internal state */
-- free_func zfree; /* used to free the internal state */
-- voidpf opaque; /* private data object passed to zalloc and zfree */
--
-- int data_type; /* best guess about the data type: binary or text */
-- uLong adler; /* adler32 value of the uncompressed data */
-- uLong reserved; /* reserved for future use */
--} z_stream;
--
--typedef z_stream FAR *z_streamp;
--
--/*
-- gzip header information passed to and from zlib routines. See RFC 1952
-- for more details on the meanings of these fields.
--*/
--typedef struct gz_header_s {
-- int text; /* true if compressed data believed to be text */
-- uLong time; /* modification time */
-- int xflags; /* extra flags (not used when writing a gzip file) */
-- int os; /* operating system */
-- Bytef *extra; /* pointer to extra field or Z_NULL if none */
-- uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
-- uInt extra_max; /* space at extra (only when reading header) */
-- Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
-- uInt name_max; /* space at name (only when reading header) */
-- Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
-- uInt comm_max; /* space at comment (only when reading header) */
-- int hcrc; /* true if there was or will be a header crc */
-- int done; /* true when done reading gzip header (not used
-- when writing a gzip file) */
--} gz_header;
--
--typedef gz_header FAR *gz_headerp;
--
--/*
-- The application must update next_in and avail_in when avail_in has
-- dropped to zero. It must update next_out and avail_out when avail_out
-- has dropped to zero. The application must initialize zalloc, zfree and
-- opaque before calling the init function. All other fields are set by the
-- compression library and must not be updated by the application.
--
-- The opaque value provided by the application will be passed as the first
-- parameter for calls of zalloc and zfree. This can be useful for custom
-- memory management. The compression library attaches no meaning to the
-- opaque value.
--
-- zalloc must return Z_NULL if there is not enough memory for the object.
-- If zlib is used in a multi-threaded application, zalloc and zfree must be
-- thread safe.
--
-- On 16-bit systems, the functions zalloc and zfree must be able to allocate
-- exactly 65536 bytes, but will not be required to allocate more than this
-- if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-- pointers returned by zalloc for objects of exactly 65536 bytes *must*
-- have their offset normalized to zero. The default allocation function
-- provided by this library ensures this (see zutil.c). To reduce memory
-- requirements and avoid any allocation of 64K objects, at the expense of
-- compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
--
-- The fields total_in and total_out can be used for statistics or
-- progress reports. After compression, total_in holds the total size of
-- the uncompressed data and may be saved for use in the decompressor
-- (particularly if the decompressor wants to decompress everything in
-- a single step).
--*/
--
-- /* constants */
--
--#define Z_NO_FLUSH 0
--#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
--#define Z_SYNC_FLUSH 2
--#define Z_FULL_FLUSH 3
--#define Z_FINISH 4
--#define Z_BLOCK 5
--/* Allowed flush values; see deflate() and inflate() below for details */
--
--#define Z_OK 0
--#define Z_STREAM_END 1
--#define Z_NEED_DICT 2
--#define Z_ERRNO (-1)
--#define Z_STREAM_ERROR (-2)
--#define Z_DATA_ERROR (-3)
--#define Z_MEM_ERROR (-4)
--#define Z_BUF_ERROR (-5)
--#define Z_VERSION_ERROR (-6)
--/* Return codes for the compression/decompression functions. Negative
-- * values are errors, positive values are used for special but normal events.
-- */
--
--#define Z_NO_COMPRESSION 0
--#define Z_BEST_SPEED 1
--#define Z_BEST_COMPRESSION 9
--#define Z_DEFAULT_COMPRESSION (-1)
--/* compression levels */
--
--#define Z_FILTERED 1
--#define Z_HUFFMAN_ONLY 2
--#define Z_RLE 3
--#define Z_FIXED 4
--#define Z_DEFAULT_STRATEGY 0
--/* compression strategy; see deflateInit2() below for details */
--
--#define Z_BINARY 0
--#define Z_TEXT 1
--#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
--#define Z_UNKNOWN 2
--/* Possible values of the data_type field (though see inflate()) */
--
--#define Z_DEFLATED 8
--/* The deflate compression method (the only one supported in this version) */
--
--#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
--
--#define zlib_version zlibVersion()
--/* for compatibility with versions < 1.0.2 */
--
-- /* basic functions */
--
--ZEXTERN const char * ZEXPORT zlibVersion OF((void));
--/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-- If the first character differs, the library code actually used is
-- not compatible with the zlib.h header file used by the application.
-- This check is automatically made by deflateInit and inflateInit.
-- */
--
--/*
--ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
--
-- Initializes the internal stream state for compression. The fields
-- zalloc, zfree and opaque must be initialized before by the caller.
-- If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-- use default allocation functions.
--
-- The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-- 1 gives best speed, 9 gives best compression, 0 gives no compression at
-- all (the input data is simply copied a block at a time).
-- Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-- compression (currently equivalent to level 6).
--
-- deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-- enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-- Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-- with the version assumed by the caller (ZLIB_VERSION).
-- msg is set to null if there is no error message. deflateInit does not
-- perform any compression: this will be done by deflate().
--*/
--
--
--ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
--/*
-- deflate compresses as much data as possible, and stops when the input
-- buffer becomes empty or the output buffer becomes full. It may introduce some
-- output latency (reading input without producing any output) except when
-- forced to flush.
--
-- The detailed semantics are as follows. deflate performs one or both of the
-- following actions:
--
-- - Compress more input starting at next_in and update next_in and avail_in
-- accordingly. If not all input can be processed (because there is not
-- enough room in the output buffer), next_in and avail_in are updated and
-- processing will resume at this point for the next call of deflate().
--
-- - Provide more output starting at next_out and update next_out and avail_out
-- accordingly. This action is forced if the parameter flush is non zero.
-- Forcing flush frequently degrades the compression ratio, so this parameter
-- should be set only when necessary (in interactive applications).
-- Some output may be provided even if flush is not set.
--
-- Before the call of deflate(), the application should ensure that at least
-- one of the actions is possible, by providing more input and/or consuming
-- more output, and updating avail_in or avail_out accordingly; avail_out
-- should never be zero before the call. The application can consume the
-- compressed output when it wants, for example when the output buffer is full
-- (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-- and with zero avail_out, it must be called again after making room in the
-- output buffer because there might be more output pending.
--
-- Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-- decide how much data to accumualte before producing output, in order to
-- maximize compression.
--
-- If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-- flushed to the output buffer and the output is aligned on a byte boundary, so
-- that the decompressor can get all input data available so far. (In particular
-- avail_in is zero after the call if enough output space has been provided
-- before the call.) Flushing may degrade compression for some compression
-- algorithms and so it should be used only when necessary.
--
-- If flush is set to Z_FULL_FLUSH, all output is flushed as with
-- Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-- restart from this point if previous compressed data has been damaged or if
-- random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-- compression.
--
-- If deflate returns with avail_out == 0, this function must be called again
-- with the same value of the flush parameter and more output space (updated
-- avail_out), until the flush is complete (deflate returns with non-zero
-- avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-- avail_out is greater than six to avoid repeated flush markers due to
-- avail_out == 0 on return.
--
-- If the parameter flush is set to Z_FINISH, pending input is processed,
-- pending output is flushed and deflate returns with Z_STREAM_END if there
-- was enough output space; if deflate returns with Z_OK, this function must be
-- called again with Z_FINISH and more output space (updated avail_out) but no
-- more input data, until it returns with Z_STREAM_END or an error. After
-- deflate has returned Z_STREAM_END, the only possible operations on the
-- stream are deflateReset or deflateEnd.
--
-- Z_FINISH can be used immediately after deflateInit if all the compression
-- is to be done in a single step. In this case, avail_out must be at least
-- the value returned by deflateBound (see below). If deflate does not return
-- Z_STREAM_END, then it must be called again as described above.
--
-- deflate() sets strm->adler to the adler32 checksum of all input read
-- so far (that is, total_in bytes).
--
-- deflate() may update strm->data_type if it can make a good guess about
-- the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-- binary. This field is only for information purposes and does not affect
-- the compression algorithm in any manner.
--
-- deflate() returns Z_OK if some progress has been made (more input
-- processed or more output produced), Z_STREAM_END if all input has been
-- consumed and all output has been produced (only when flush is set to
-- Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-- if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-- (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-- fatal, and deflate() can be called again with more input and more output
-- space to continue compressing.
--*/
--
--
--ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
--/*
-- All dynamically allocated data structures for this stream are freed.
-- This function discards any unprocessed input and does not flush any
-- pending output.
--
-- deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-- stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-- prematurely (some input or output was discarded). In the error case,
-- msg may be set but then points to a static string (which must not be
-- deallocated).
--*/
--
--
--/*
--ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
--
-- Initializes the internal stream state for decompression. The fields
-- next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-- the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-- value depends on the compression method), inflateInit determines the
-- compression method from the zlib header and allocates all data structures
-- accordingly; otherwise the allocation will be deferred to the first call of
-- inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-- use default allocation functions.
--
-- inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-- memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-- version assumed by the caller. msg is set to null if there is no error
-- message. inflateInit does not perform any decompression apart from reading
-- the zlib header if present: this will be done by inflate(). (So next_in and
-- avail_in may be modified, but next_out and avail_out are unchanged.)
--*/
--
--
--ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
--/*
-- inflate decompresses as much data as possible, and stops when the input
-- buffer becomes empty or the output buffer becomes full. It may introduce
-- some output latency (reading input without producing any output) except when
-- forced to flush.
--
-- The detailed semantics are as follows. inflate performs one or both of the
-- following actions:
--
-- - Decompress more input starting at next_in and update next_in and avail_in
-- accordingly. If not all input can be processed (because there is not
-- enough room in the output buffer), next_in is updated and processing
-- will resume at this point for the next call of inflate().
--
-- - Provide more output starting at next_out and update next_out and avail_out
-- accordingly. inflate() provides as much output as possible, until there
-- is no more input data or no more space in the output buffer (see below
-- about the flush parameter).
--
-- Before the call of inflate(), the application should ensure that at least
-- one of the actions is possible, by providing more input and/or consuming
-- more output, and updating the next_* and avail_* values accordingly.
-- The application can consume the uncompressed output when it wants, for
-- example when the output buffer is full (avail_out == 0), or after each
-- call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-- must be called again after making room in the output buffer because there
-- might be more output pending.
--
-- The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-- Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-- output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-- if and when it gets to the next deflate block boundary. When decoding the
-- zlib or gzip format, this will cause inflate() to return immediately after
-- the header and before the first block. When doing a raw inflate, inflate()
-- will go ahead and process the first block, and will return when it gets to
-- the end of that block, or when it runs out of data.
--
-- The Z_BLOCK option assists in appending to or combining deflate streams.
-- Also to assist in this, on return inflate() will set strm->data_type to the
-- number of unused bits in the last byte taken from strm->next_in, plus 64
-- if inflate() is currently decoding the last block in the deflate stream,
-- plus 128 if inflate() returned immediately after decoding an end-of-block
-- code or decoding the complete header up to just before the first byte of the
-- deflate stream. The end-of-block will not be indicated until all of the
-- uncompressed data from that block has been written to strm->next_out. The
-- number of unused bits may in general be greater than seven, except when
-- bit 7 of data_type is set, in which case the number of unused bits will be
-- less than eight.
--
-- inflate() should normally be called until it returns Z_STREAM_END or an
-- error. However if all decompression is to be performed in a single step
-- (a single call of inflate), the parameter flush should be set to
-- Z_FINISH. In this case all pending input is processed and all pending
-- output is flushed; avail_out must be large enough to hold all the
-- uncompressed data. (The size of the uncompressed data may have been saved
-- by the compressor for this purpose.) The next operation on this stream must
-- be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-- is never required, but can be used to inform inflate that a faster approach
-- may be used for the single inflate() call.
--
-- In this implementation, inflate() always flushes as much output as
-- possible to the output buffer, and always uses the faster approach on the
-- first call. So the only effect of the flush parameter in this implementation
-- is on the return value of inflate(), as noted below, or when it returns early
-- because Z_BLOCK is used.
--
-- If a preset dictionary is needed after this call (see inflateSetDictionary
-- below), inflate sets strm->adler to the adler32 checksum of the dictionary
-- chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-- strm->adler to the adler32 checksum of all output produced so far (that is,
-- total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-- below. At the end of the stream, inflate() checks that its computed adler32
-- checksum is equal to that saved by the compressor and returns Z_STREAM_END
-- only if the checksum is correct.
--
-- inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-- deflate data. The header type is detected automatically. Any information
-- contained in the gzip header is not retained, so applications that need that
-- information should instead use raw inflate, see inflateInit2() below, or
-- inflateBack() and perform their own processing of the gzip header and
-- trailer.
--
-- inflate() returns Z_OK if some progress has been made (more input processed
-- or more output produced), Z_STREAM_END if the end of the compressed data has
-- been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-- preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-- corrupted (input stream not conforming to the zlib format or incorrect check
-- value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-- if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-- Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-- output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-- inflate() can be called again with more input and more output space to
-- continue decompressing. If Z_DATA_ERROR is returned, the application may then
-- call inflateSync() to look for a good compression block if a partial recovery
-- of the data is desired.
--*/
--
--
--ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
--/*
-- All dynamically allocated data structures for this stream are freed.
-- This function discards any unprocessed input and does not flush any
-- pending output.
--
-- inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-- was inconsistent. In the error case, msg may be set but then points to a
-- static string (which must not be deallocated).
--*/
--
-- /* Advanced functions */
--
--/*
-- The following functions are needed only in some special applications.
--*/
--
--/*
--ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-- int level,
-- int method,
-- int windowBits,
-- int memLevel,
-- int strategy));
--
-- This is another version of deflateInit with more compression options. The
-- fields next_in, zalloc, zfree and opaque must be initialized before by
-- the caller.
--
-- The method parameter is the compression method. It must be Z_DEFLATED in
-- this version of the library.
--
-- The windowBits parameter is the base two logarithm of the window size
-- (the size of the history buffer). It should be in the range 8..15 for this
-- version of the library. Larger values of this parameter result in better
-- compression at the expense of memory usage. The default value is 15 if
-- deflateInit is used instead.
--
-- windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-- determines the window size. deflate() will then generate raw deflate data
-- with no zlib header or trailer, and will not compute an adler32 check value.
--
-- windowBits can also be greater than 15 for optional gzip encoding. Add
-- 16 to windowBits to write a simple gzip header and trailer around the
-- compressed data instead of a zlib wrapper. The gzip header will have no
-- file name, no extra data, no comment, no modification time (set to zero),
-- no header crc, and the operating system will be set to 255 (unknown). If a
-- gzip stream is being written, strm->adler is a crc32 instead of an adler32.
--
-- The memLevel parameter specifies how much memory should be allocated
-- for the internal compression state. memLevel=1 uses minimum memory but
-- is slow and reduces compression ratio; memLevel=9 uses maximum memory
-- for optimal speed. The default value is 8. See zconf.h for total memory
-- usage as a function of windowBits and memLevel.
--
-- The strategy parameter is used to tune the compression algorithm. Use the
-- value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-- filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-- string match), or Z_RLE to limit match distances to one (run-length
-- encoding). Filtered data consists mostly of small values with a somewhat
-- random distribution. In this case, the compression algorithm is tuned to
-- compress them better. The effect of Z_FILTERED is to force more Huffman
-- coding and less string matching; it is somewhat intermediate between
-- Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-- Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-- parameter only affects the compression ratio but not the correctness of the
-- compressed output even if it is not set appropriately. Z_FIXED prevents the
-- use of dynamic Huffman codes, allowing for a simpler decoder for special
-- applications.
--
-- deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-- memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-- method). msg is set to null if there is no error message. deflateInit2 does
-- not perform any compression: this will be done by deflate().
--*/
--
--ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-- const Bytef *dictionary,
-- uInt dictLength));
--/*
-- Initializes the compression dictionary from the given byte sequence
-- without producing any compressed output. This function must be called
-- immediately after deflateInit, deflateInit2 or deflateReset, before any
-- call of deflate. The compressor and decompressor must use exactly the same
-- dictionary (see inflateSetDictionary).
--
-- The dictionary should consist of strings (byte sequences) that are likely
-- to be encountered later in the data to be compressed, with the most commonly
-- used strings preferably put towards the end of the dictionary. Using a
-- dictionary is most useful when the data to be compressed is short and can be
-- predicted with good accuracy; the data can then be compressed better than
-- with the default empty dictionary.
--
-- Depending on the size of the compression data structures selected by
-- deflateInit or deflateInit2, a part of the dictionary may in effect be
-- discarded, for example if the dictionary is larger than the window size in
-- deflate or deflate2. Thus the strings most likely to be useful should be
-- put at the end of the dictionary, not at the front. In addition, the
-- current implementation of deflate will use at most the window size minus
-- 262 bytes of the provided dictionary.
--
-- Upon return of this function, strm->adler is set to the adler32 value
-- of the dictionary; the decompressor may later use this value to determine
-- which dictionary has been used by the compressor. (The adler32 value
-- applies to the whole dictionary even if only a subset of the dictionary is
-- actually used by the compressor.) If a raw deflate was requested, then the
-- adler32 value is not computed and strm->adler is not set.
--
-- deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-- parameter is invalid (such as NULL dictionary) or the stream state is
-- inconsistent (for example if deflate has already been called for this stream
-- or if the compression method is bsort). deflateSetDictionary does not
-- perform any compression: this will be done by deflate().
--*/
--
--ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-- z_streamp source));
--/*
-- Sets the destination stream as a complete copy of the source stream.
--
-- This function can be useful when several compression strategies will be
-- tried, for example when there are several ways of pre-processing the input
-- data with a filter. The streams that will be discarded should then be freed
-- by calling deflateEnd. Note that deflateCopy duplicates the internal
-- compression state which can be quite large, so this strategy is slow and
-- can consume lots of memory.
--
-- deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-- enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-- (such as zalloc being NULL). msg is left unchanged in both source and
-- destination.
--*/
--
--ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
--/*
-- This function is equivalent to deflateEnd followed by deflateInit,
-- but does not free and reallocate all the internal compression state.
-- The stream will keep the same compression level and any other attributes
-- that may have been set by deflateInit2.
--
-- deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-- stream state was inconsistent (such as zalloc or state being NULL).
--*/
--
--ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-- int level,
-- int strategy));
--/*
-- Dynamically update the compression level and compression strategy. The
-- interpretation of level and strategy is as in deflateInit2. This can be
-- used to switch between compression and straight copy of the input data, or
-- to switch to a different kind of input data requiring a different
-- strategy. If the compression level is changed, the input available so far
-- is compressed with the old level (and may be flushed); the new level will
-- take effect only at the next call of deflate().
--
-- Before the call of deflateParams, the stream state must be set as for
-- a call of deflate(), since the currently available input may have to
-- be compressed and flushed. In particular, strm->avail_out must be non-zero.
--
-- deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-- stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-- if strm->avail_out was zero.
--*/
--
--ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-- int good_length,
-- int max_lazy,
-- int nice_length,
-- int max_chain));
--/*
-- Fine tune deflate's internal compression parameters. This should only be
-- used by someone who understands the algorithm used by zlib's deflate for
-- searching for the best matching string, and even then only by the most
-- fanatic optimizer trying to squeeze out the last compressed bit for their
-- specific input data. Read the deflate.c source code for the meaning of the
-- max_lazy, good_length, nice_length, and max_chain parameters.
--
-- deflateTune() can be called after deflateInit() or deflateInit2(), and
-- returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
-- */
--
--ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-- uLong sourceLen));
--/*
-- deflateBound() returns an upper bound on the compressed size after
-- deflation of sourceLen bytes. It must be called after deflateInit()
-- or deflateInit2(). This would be used to allocate an output buffer
-- for deflation in a single pass, and so would be called before deflate().
--*/
--
--ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-- int bits,
-- int value));
--/*
-- deflatePrime() inserts bits in the deflate output stream. The intent
-- is that this function is used to start off the deflate output with the
-- bits leftover from a previous deflate stream when appending to it. As such,
-- this function can only be used for raw deflate, and must be used before the
-- first deflate() call after a deflateInit2() or deflateReset(). bits must be
-- less than or equal to 16, and that many of the least significant bits of
-- value will be inserted in the output.
--
-- deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-- stream state was inconsistent.
--*/
--
--ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-- gz_headerp head));
--/*
-- deflateSetHeader() provides gzip header information for when a gzip
-- stream is requested by deflateInit2(). deflateSetHeader() may be called
-- after deflateInit2() or deflateReset() and before the first call of
-- deflate(). The text, time, os, extra field, name, and comment information
-- in the provided gz_header structure are written to the gzip header (xflag is
-- ignored -- the extra flags are set according to the compression level). The
-- caller must assure that, if not Z_NULL, name and comment are terminated with
-- a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-- available there. If hcrc is true, a gzip header crc is included. Note that
-- the current versions of the command-line version of gzip (up through version
-- 1.3.x) do not support header crc's, and will report that it is a "multi-part
-- gzip file" and give up.
--
-- If deflateSetHeader is not used, the default gzip header has text false,
-- the time set to zero, and os set to 255, with no extra, name, or comment
-- fields. The gzip header is returned to the default state by deflateReset().
--
-- deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-- stream state was inconsistent.
--*/
--
--/*
--ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-- int windowBits));
--
-- This is another version of inflateInit with an extra parameter. The
-- fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-- before by the caller.
--
-- The windowBits parameter is the base two logarithm of the maximum window
-- size (the size of the history buffer). It should be in the range 8..15 for
-- this version of the library. The default value is 15 if inflateInit is used
-- instead. windowBits must be greater than or equal to the windowBits value
-- provided to deflateInit2() while compressing, or it must be equal to 15 if
-- deflateInit2() was not used. If a compressed stream with a larger window
-- size is given as input, inflate() will return with the error code
-- Z_DATA_ERROR instead of trying to allocate a larger window.
--
-- windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-- determines the window size. inflate() will then process raw deflate data,
-- not looking for a zlib or gzip header, not generating a check value, and not
-- looking for any check values for comparison at the end of the stream. This
-- is for use with other formats that use the deflate compressed data format
-- such as zip. Those formats provide their own check values. If a custom
-- format is developed using the raw deflate format for compressed data, it is
-- recommended that a check value such as an adler32 or a crc32 be applied to
-- the uncompressed data as is done in the zlib, gzip, and zip formats. For
-- most applications, the zlib format should be used as is. Note that comments
-- above on the use in deflateInit2() applies to the magnitude of windowBits.
--
-- windowBits can also be greater than 15 for optional gzip decoding. Add
-- 32 to windowBits to enable zlib and gzip decoding with automatic header
-- detection, or add 16 to decode only the gzip format (the zlib format will
-- return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is
-- a crc32 instead of an adler32.
--
-- inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-- memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-- is set to null if there is no error message. inflateInit2 does not perform
-- any decompression apart from reading the zlib header if present: this will
-- be done by inflate(). (So next_in and avail_in may be modified, but next_out
-- and avail_out are unchanged.)
--*/
--
--ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-- const Bytef *dictionary,
-- uInt dictLength));
--/*
-- Initializes the decompression dictionary from the given uncompressed byte
-- sequence. This function must be called immediately after a call of inflate,
-- if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-- can be determined from the adler32 value returned by that call of inflate.
-- The compressor and decompressor must use exactly the same dictionary (see
-- deflateSetDictionary). For raw inflate, this function can be called
-- immediately after inflateInit2() or inflateReset() and before any call of
-- inflate() to set the dictionary. The application must insure that the
-- dictionary that was used for compression is provided.
--
-- inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-- parameter is invalid (such as NULL dictionary) or the stream state is
-- inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-- expected one (incorrect adler32 value). inflateSetDictionary does not
-- perform any decompression: this will be done by subsequent calls of
-- inflate().
--*/
--
--ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
--/*
-- Skips invalid compressed data until a full flush point (see above the
-- description of deflate with Z_FULL_FLUSH) can be found, or until all
-- available input is skipped. No output is provided.
--
-- inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-- if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-- or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-- case, the application may save the current current value of total_in which
-- indicates where valid compressed data was found. In the error case, the
-- application may repeatedly call inflateSync, providing more input each time,
-- until success or end of the input data.
--*/
--
--ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-- z_streamp source));
--/*
-- Sets the destination stream as a complete copy of the source stream.
--
-- This function can be useful when randomly accessing a large stream. The
-- first pass through the stream can periodically record the inflate state,
-- allowing restarting inflate at those points when randomly accessing the
-- stream.
--
-- inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-- enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-- (such as zalloc being NULL). msg is left unchanged in both source and
-- destination.
--*/
--
--ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
--/*
-- This function is equivalent to inflateEnd followed by inflateInit,
-- but does not free and reallocate all the internal decompression state.
-- The stream will keep attributes that may have been set by inflateInit2.
--
-- inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-- stream state was inconsistent (such as zalloc or state being NULL).
--*/
--
--ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-- int bits,
-- int value));
--/*
-- This function inserts bits in the inflate input stream. The intent is
-- that this function is used to start inflating at a bit position in the
-- middle of a byte. The provided bits will be used before any bytes are used
-- from next_in. This function should only be used with raw inflate, and
-- should be used before the first inflate() call after inflateInit2() or
-- inflateReset(). bits must be less than or equal to 16, and that many of the
-- least significant bits of value will be inserted in the input.
--
-- inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-- stream state was inconsistent.
--*/
--
--ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-- gz_headerp head));
--/*
-- inflateGetHeader() requests that gzip header information be stored in the
-- provided gz_header structure. inflateGetHeader() may be called after
-- inflateInit2() or inflateReset(), and before the first call of inflate().
-- As inflate() processes the gzip stream, head->done is zero until the header
-- is completed, at which time head->done is set to one. If a zlib stream is
-- being decoded, then head->done is set to -1 to indicate that there will be
-- no gzip header information forthcoming. Note that Z_BLOCK can be used to
-- force inflate() to return immediately after header processing is complete
-- and before any actual data is decompressed.
--
-- The text, time, xflags, and os fields are filled in with the gzip header
-- contents. hcrc is set to true if there is a header CRC. (The header CRC
-- was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-- contains the maximum number of bytes to write to extra. Once done is true,
-- extra_len contains the actual extra field length, and extra contains the
-- extra field, or that field truncated if extra_max is less than extra_len.
-- If name is not Z_NULL, then up to name_max characters are written there,
-- terminated with a zero unless the length is greater than name_max. If
-- comment is not Z_NULL, then up to comm_max characters are written there,
-- terminated with a zero unless the length is greater than comm_max. When
-- any of extra, name, or comment are not Z_NULL and the respective field is
-- not present in the header, then that field is set to Z_NULL to signal its
-- absence. This allows the use of deflateSetHeader() with the returned
-- structure to duplicate the header. However if those fields are set to
-- allocated memory, then the application will need to save those pointers
-- elsewhere so that they can be eventually freed.
--
-- If inflateGetHeader is not used, then the header information is simply
-- discarded. The header is always checked for validity, including the header
-- CRC if present. inflateReset() will reset the process to discard the header
-- information. The application would need to call inflateGetHeader() again to
-- retrieve the header from the next gzip stream.
--
-- inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-- stream state was inconsistent.
--*/
--
--/*
--ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-- unsigned char FAR *window));
--
-- Initialize the internal stream state for decompression using inflateBack()
-- calls. The fields zalloc, zfree and opaque in strm must be initialized
-- before the call. If zalloc and zfree are Z_NULL, then the default library-
-- derived memory allocation routines are used. windowBits is the base two
-- logarithm of the window size, in the range 8..15. window is a caller
-- supplied buffer of that size. Except for special applications where it is
-- assured that deflate was used with small window sizes, windowBits must be 15
-- and a 32K byte window must be supplied to be able to decompress general
-- deflate streams.
--
-- See inflateBack() for the usage of these routines.
--
-- inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-- be allocated, or Z_VERSION_ERROR if the version of the library does not
-- match the version of the header file.
--*/
--
--typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
--typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
--
--ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-- in_func in, void FAR *in_desc,
-- out_func out, void FAR *out_desc));
--/*
-- inflateBack() does a raw inflate with a single call using a call-back
-- interface for input and output. This is more efficient than inflate() for
-- file i/o applications in that it avoids copying between the output and the
-- sliding window by simply making the window itself the output buffer. This
-- function trusts the application to not change the output buffer passed by
-- the output function, at least until inflateBack() returns.
--
-- inflateBackInit() must be called first to allocate the internal state
-- and to initialize the state with the user-provided window buffer.
-- inflateBack() may then be used multiple times to inflate a complete, raw
-- deflate stream with each call. inflateBackEnd() is then called to free
-- the allocated state.
--
-- A raw deflate stream is one with no zlib or gzip header or trailer.
-- This routine would normally be used in a utility that reads zip or gzip
-- files and writes out uncompressed files. The utility would decode the
-- header and process the trailer on its own, hence this routine expects
-- only the raw deflate stream to decompress. This is different from the
-- normal behavior of inflate(), which expects either a zlib or gzip header and
-- trailer around the deflate stream.
--
-- inflateBack() uses two subroutines supplied by the caller that are then
-- called by inflateBack() for input and output. inflateBack() calls those
-- routines until it reads a complete deflate stream and writes out all of the
-- uncompressed data, or until it encounters an error. The function's
-- parameters and return types are defined above in the in_func and out_func
-- typedefs. inflateBack() will call in(in_desc, &buf) which should return the
-- number of bytes of provided input, and a pointer to that input in buf. If
-- there is no input available, in() must return zero--buf is ignored in that
-- case--and inflateBack() will return a buffer error. inflateBack() will call
-- out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out()
-- should return zero on success, or non-zero on failure. If out() returns
-- non-zero, inflateBack() will return with an error. Neither in() nor out()
-- are permitted to change the contents of the window provided to
-- inflateBackInit(), which is also the buffer that out() uses to write from.
-- The length written by out() will be at most the window size. Any non-zero
-- amount of input may be provided by in().
--
-- For convenience, inflateBack() can be provided input on the first call by
-- setting strm->next_in and strm->avail_in. If that input is exhausted, then
-- in() will be called. Therefore strm->next_in must be initialized before
-- calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
-- immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
-- must also be initialized, and then if strm->avail_in is not zero, input will
-- initially be taken from strm->next_in[0 .. strm->avail_in - 1].
--
-- The in_desc and out_desc parameters of inflateBack() is passed as the
-- first parameter of in() and out() respectively when they are called. These
-- descriptors can be optionally used to pass any information that the caller-
-- supplied in() and out() functions need to do their job.
--
-- On return, inflateBack() will set strm->next_in and strm->avail_in to
-- pass back any unused input that was provided by the last in() call. The
-- return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-- if in() or out() returned an error, Z_DATA_ERROR if there was a format
-- error in the deflate stream (in which case strm->msg is set to indicate the
-- nature of the error), or Z_STREAM_ERROR if the stream was not properly
-- initialized. In the case of Z_BUF_ERROR, an input or output error can be
-- distinguished using strm->next_in which will be Z_NULL only if in() returned
-- an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-- out() returning non-zero. (in() will always be called before out(), so
-- strm->next_in is assured to be defined if out() returns non-zero.) Note
-- that inflateBack() cannot return Z_OK.
--*/
--
--ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
--/*
-- All memory allocated by inflateBackInit() is freed.
--
-- inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-- state was inconsistent.
--*/
--
--ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
--/* Return flags indicating compile-time options.
--
-- Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-- 1.0: size of uInt
-- 3.2: size of uLong
-- 5.4: size of voidpf (pointer)
-- 7.6: size of z_off_t
--
-- Compiler, assembler, and debug options:
-- 8: DEBUG
-- 9: ASMV or ASMINF -- use ASM code
-- 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-- 11: 0 (reserved)
--
-- One-time table building (smaller code, but not thread-safe if true):
-- 12: BUILDFIXED -- build static block decoding tables when needed
-- 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-- 14,15: 0 (reserved)
--
-- Library content (indicates missing functionality):
-- 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-- deflate code when not needed)
-- 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-- and decode gzip streams (to avoid linking crc code)
-- 18-19: 0 (reserved)
--
-- Operation variations (changes in library functionality):
-- 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-- 21: FASTEST -- deflate algorithm with only one, lowest compression level
-- 22,23: 0 (reserved)
--
-- The sprintf variant used by gzprintf (zero is best):
-- 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-- 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-- 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
--
-- Remainder:
-- 27-31: 0 (reserved)
-- */
--
--
-- /* utility functions */
--
--/*
-- The following utility functions are implemented on top of the
-- basic stream-oriented functions. To simplify the interface, some
-- default options are assumed (compression level and memory usage,
-- standard memory allocation functions). The source code of these
-- utility functions can easily be modified if you need special options.
--*/
--
--ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
-- const Bytef *source, uLong sourceLen));
--/*
-- Compresses the source buffer into the destination buffer. sourceLen is
-- the byte length of the source buffer. Upon entry, destLen is the total
-- size of the destination buffer, which must be at least the value returned
-- by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-- compressed buffer.
-- This function can be used to compress a whole file at once if the
-- input file is mmap'ed.
-- compress returns Z_OK if success, Z_MEM_ERROR if there was not
-- enough memory, Z_BUF_ERROR if there was not enough room in the output
-- buffer.
--*/
--
--ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
-- const Bytef *source, uLong sourceLen,
-- int level));
--/*
-- Compresses the source buffer into the destination buffer. The level
-- parameter has the same meaning as in deflateInit. sourceLen is the byte
-- length of the source buffer. Upon entry, destLen is the total size of the
-- destination buffer, which must be at least the value returned by
-- compressBound(sourceLen). Upon exit, destLen is the actual size of the
-- compressed buffer.
--
-- compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-- memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-- Z_STREAM_ERROR if the level parameter is invalid.
--*/
--
--ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
--/*
-- compressBound() returns an upper bound on the compressed size after
-- compress() or compress2() on sourceLen bytes. It would be used before
-- a compress() or compress2() call to allocate the destination buffer.
--*/
--
--ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
-- const Bytef *source, uLong sourceLen));
--/*
-- Decompresses the source buffer into the destination buffer. sourceLen is
-- the byte length of the source buffer. Upon entry, destLen is the total
-- size of the destination buffer, which must be large enough to hold the
-- entire uncompressed data. (The size of the uncompressed data must have
-- been saved previously by the compressor and transmitted to the decompressor
-- by some mechanism outside the scope of this compression library.)
-- Upon exit, destLen is the actual size of the compressed buffer.
-- This function can be used to decompress a whole file at once if the
-- input file is mmap'ed.
--
-- uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-- enough memory, Z_BUF_ERROR if there was not enough room in the output
-- buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
--*/
--
--
--typedef voidp gzFile;
--
--ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
--/*
-- Opens a gzip (.gz) file for reading or writing. The mode parameter
-- is as in fopen ("rb" or "wb") but can also include a compression level
-- ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-- Huffman only compression as in "wb1h", or 'R' for run-length encoding
-- as in "wb1R". (See the description of deflateInit2 for more information
-- about the strategy parameter.)
--
-- gzopen can be used to read a file which is not in gzip format; in this
-- case gzread will directly read from the file without decompression.
--
-- gzopen returns NULL if the file could not be opened or if there was
-- insufficient memory to allocate the (de)compression state; errno
-- can be checked to distinguish the two cases (if errno is zero, the
-- zlib error is Z_MEM_ERROR). */
--
--ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
--/*
-- gzdopen() associates a gzFile with the file descriptor fd. File
-- descriptors are obtained from calls like open, dup, creat, pipe or
-- fileno (in the file has been previously opened with fopen).
-- The mode parameter is as in gzopen.
-- The next call of gzclose on the returned gzFile will also close the
-- file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-- descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-- gzdopen returns NULL if there was insufficient memory to allocate
-- the (de)compression state.
--*/
--
--ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
--/*
-- Dynamically update the compression level or strategy. See the description
-- of deflateInit2 for the meaning of these parameters.
-- gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-- opened for writing.
--*/
--
--ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
--/*
-- Reads the given number of uncompressed bytes from the compressed file.
-- If the input file was not in gzip format, gzread copies the given number
-- of bytes into the buffer.
-- gzread returns the number of uncompressed bytes actually read (0 for
-- end of file, -1 for error). */
--
--ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-- voidpc buf, unsigned len));
--/*
-- Writes the given number of uncompressed bytes into the compressed file.
-- gzwrite returns the number of uncompressed bytes actually written
-- (0 in case of error).
--*/
--
--ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
--/*
-- Converts, formats, and writes the args to the compressed file under
-- control of the format string, as in fprintf. gzprintf returns the number of
-- uncompressed bytes actually written (0 in case of error). The number of
-- uncompressed bytes written is limited to 4095. The caller should assure that
-- this limit is not exceeded. If it is exceeded, then gzprintf() will return
-- return an error (0) with nothing written. In this case, there may also be a
-- buffer overflow with unpredictable consequences, which is possible only if
-- zlib was compiled with the insecure functions sprintf() or vsprintf()
-- because the secure snprintf() or vsnprintf() functions were not available.
--*/
--
--ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
--/*
-- Writes the given null-terminated string to the compressed file, excluding
-- the terminating null character.
-- gzputs returns the number of characters written, or -1 in case of error.
--*/
--
--ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
--/*
-- Reads bytes from the compressed file until len-1 characters are read, or
-- a newline character is read and transferred to buf, or an end-of-file
-- condition is encountered. The string is then terminated with a null
-- character.
-- gzgets returns buf, or Z_NULL in case of error.
--*/
--
--ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
--/*
-- Writes c, converted to an unsigned char, into the compressed file.
-- gzputc returns the value that was written, or -1 in case of error.
--*/
--
--ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
--/*
-- Reads one byte from the compressed file. gzgetc returns this byte
-- or -1 in case of end of file or error.
--*/
--
--ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
--/*
-- Push one character back onto the stream to be read again later.
-- Only one character of push-back is allowed. gzungetc() returns the
-- character pushed, or -1 on failure. gzungetc() will fail if a
-- character has been pushed but not read yet, or if c is -1. The pushed
-- character will be discarded if the stream is repositioned with gzseek()
-- or gzrewind().
--*/
--
--ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
--/*
-- Flushes all pending output into the compressed file. The parameter
-- flush is as in the deflate() function. The return value is the zlib
-- error number (see function gzerror below). gzflush returns Z_OK if
-- the flush parameter is Z_FINISH and all output could be flushed.
-- gzflush should be called only when strictly necessary because it can
-- degrade compression.
--*/
--
--ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-- z_off_t offset, int whence));
--/*
-- Sets the starting position for the next gzread or gzwrite on the
-- given compressed file. The offset represents a number of bytes in the
-- uncompressed data stream. The whence parameter is defined as in lseek(2);
-- the value SEEK_END is not supported.
-- If the file is opened for reading, this function is emulated but can be
-- extremely slow. If the file is opened for writing, only forward seeks are
-- supported; gzseek then compresses a sequence of zeroes up to the new
-- starting position.
--
-- gzseek returns the resulting offset location as measured in bytes from
-- the beginning of the uncompressed stream, or -1 in case of error, in
-- particular if the file is opened for writing and the new starting position
-- would be before the current position.
--*/
--
--ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
--/*
-- Rewinds the given file. This function is supported only for reading.
--
-- gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
--*/
--
--ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
--/*
-- Returns the starting position for the next gzread or gzwrite on the
-- given compressed file. This position represents a number of bytes in the
-- uncompressed data stream.
--
-- gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
--*/
--
--ZEXTERN int ZEXPORT gzeof OF((gzFile file));
--/*
-- Returns 1 when EOF has previously been detected reading the given
-- input stream, otherwise zero.
--*/
--
--ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
--/*
-- Returns 1 if file is being read directly without decompression, otherwise
-- zero.
--*/
--
--ZEXTERN int ZEXPORT gzclose OF((gzFile file));
--/*
-- Flushes all pending output if necessary, closes the compressed file
-- and deallocates all the (de)compression state. The return value is the zlib
-- error number (see function gzerror below).
--*/
--
--ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
--/*
-- Returns the error message for the last error which occurred on the
-- given compressed file. errnum is set to zlib error number. If an
-- error occurred in the file system and not in the compression library,
-- errnum is set to Z_ERRNO and the application may consult errno
-- to get the exact error code.
--*/
--
--ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
--/*
-- Clears the error and end-of-file flags for file. This is analogous to the
-- clearerr() function in stdio. This is useful for continuing to read a gzip
-- file that is being written concurrently.
--*/
--
-- /* checksum functions */
--
--/*
-- These functions are not related to compression but are exported
-- anyway because they might be useful in applications using the
-- compression library.
--*/
--
--ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
--/*
-- Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-- return the updated checksum. If buf is NULL, this function returns
-- the required initial value for the checksum.
-- An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-- much faster. Usage example:
--
-- uLong adler = adler32(0L, Z_NULL, 0);
--
-- while (read_buffer(buffer, length) != EOF) {
-- adler = adler32(adler, buffer, length);
-- }
-- if (adler != original_adler) error();
--*/
--
--ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-- z_off_t len2));
--/*
-- Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
-- and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-- each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
-- seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
--*/
--
--ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
--/*
-- Update a running CRC-32 with the bytes buf[0..len-1] and return the
-- updated CRC-32. If buf is NULL, this function returns the required initial
-- value for the for the crc. Pre- and post-conditioning (one's complement) is
-- performed within this function so it shouldn't be done by the application.
-- Usage example:
--
-- uLong crc = crc32(0L, Z_NULL, 0);
--
-- while (read_buffer(buffer, length) != EOF) {
-- crc = crc32(crc, buffer, length);
-- }
-- if (crc != original_crc) error();
--*/
--
--ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
--
--/*
-- Combine two CRC-32 check values into one. For two sequences of bytes,
-- seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-- calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
-- check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-- len2.
--*/
--
--
-- /* various hacks, don't look :) */
--
--/* deflateInit and inflateInit are macros to allow checking the zlib version
-- * and the compiler's view of z_stream:
-- */
--ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-- const char *version, int stream_size));
--ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-- const char *version, int stream_size));
--ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
-- int windowBits, int memLevel,
-- int strategy, const char *version,
-- int stream_size));
--ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
-- const char *version, int stream_size));
--ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-- unsigned char FAR *window,
-- const char *version,
-- int stream_size));
--#define deflateInit(strm, level) \
-- deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
--#define inflateInit(strm) \
-- inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
--#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-- deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-- (strategy), ZLIB_VERSION, sizeof(z_stream))
--#define inflateInit2(strm, windowBits) \
-- inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
--#define inflateBackInit(strm, windowBits, window) \
-- inflateBackInit_((strm), (windowBits), (window), \
-- ZLIB_VERSION, sizeof(z_stream))
--
--
--#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-- struct internal_state {int dummy;}; /* hack for buggy compilers */
--#endif
--
--ZEXTERN const char * ZEXPORT zError OF((int));
--ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
--ZEXTERN const unsigned long FAR * ZEXPORT get_crc_table OF((void));
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* ZLIB_H */
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,342 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* zutil.c -- target dependent utility functions for the compression library
-- * Copyright (C) 1995-2005 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#include "zutil.h"
--
--#ifndef NO_DUMMY_DECL
--struct internal_state {int dummy;}; /* for buggy compilers */
--#endif
--
--const char * const z_errmsg[10] = {
--"need dictionary", /* Z_NEED_DICT 2 */
--"stream end", /* Z_STREAM_END 1 */
--"", /* Z_OK 0 */
--"file error", /* Z_ERRNO (-1) */
--"stream error", /* Z_STREAM_ERROR (-2) */
--"data error", /* Z_DATA_ERROR (-3) */
--"insufficient memory", /* Z_MEM_ERROR (-4) */
--"buffer error", /* Z_BUF_ERROR (-5) */
--"incompatible version",/* Z_VERSION_ERROR (-6) */
--""};
--
--
--const char * ZEXPORT zlibVersion()
--{
-- return ZLIB_VERSION;
--}
--
--uLong ZEXPORT zlibCompileFlags()
--{
-- uLong flags;
--
-- flags = 0;
-- switch (sizeof(uInt)) {
-- case 2: break;
-- case 4: flags += 1; break;
-- case 8: flags += 2; break;
-- default: flags += 3;
-- }
-- switch (sizeof(uLong)) {
-- case 2: break;
-- case 4: flags += 1 << 2; break;
-- case 8: flags += 2 << 2; break;
-- default: flags += 3 << 2;
-- }
-- switch (sizeof(voidpf)) {
-- case 2: break;
-- case 4: flags += 1 << 4; break;
-- case 8: flags += 2 << 4; break;
-- default: flags += 3 << 4;
-- }
-- switch (sizeof(z_off_t)) {
-- case 2: break;
-- case 4: flags += 1 << 6; break;
-- case 8: flags += 2 << 6; break;
-- default: flags += 3 << 6;
-- }
--#ifdef DEBUG
-- flags += 1 << 8;
--#endif
--#if defined(ASMV) || defined(ASMINF)
-- flags += 1 << 9;
--#endif
--#ifdef ZLIB_WINAPI
-- flags += 1 << 10;
--#endif
--#ifdef BUILDFIXED
-- flags += 1 << 12;
--#endif
--#ifdef DYNAMIC_CRC_TABLE
-- flags += 1 << 13;
--#endif
--#ifdef NO_GZCOMPRESS
-- flags += 1L << 16;
--#endif
--#ifdef NO_GZIP
-- flags += 1L << 17;
--#endif
--#ifdef PKZIP_BUG_WORKAROUND
-- flags += 1L << 20;
--#endif
--#ifdef FASTEST
-- flags += 1L << 21;
--#endif
--#ifdef STDC
--# ifdef NO_vsnprintf
-- flags += 1L << 25;
--# ifdef HAS_vsprintf_void
-- flags += 1L << 26;
--# endif
--# else
--# ifdef HAS_vsnprintf_void
-- flags += 1L << 26;
--# endif
--# endif
--#else
-- flags += 1L << 24;
--# ifdef NO_snprintf
-- flags += 1L << 25;
--# ifdef HAS_sprintf_void
-- flags += 1L << 26;
--# endif
--# else
--# ifdef HAS_snprintf_void
-- flags += 1L << 26;
--# endif
--# endif
--#endif
-- return flags;
--}
--
--#ifdef DEBUG
--
--# ifndef verbose
--# define verbose 0
--# endif
--int z_verbose = verbose;
--
--void z_error (m)
-- char *m;
--{
-- fprintf(stderr, "%s\n", m);
-- exit(1);
--}
--#endif
--
--/* exported to allow conversion of error code to string for compress() and
-- * uncompress()
-- */
--const char * ZEXPORT zError(err)
-- int err;
--{
-- return ERR_MSG(err);
--}
--
--#if defined(_WIN32_WCE)
-- /* The Microsoft C Run-Time Library for Windows CE doesn't have
-- * errno. We define it as a global variable to simplify porting.
-- * Its value is always 0 and should not be used.
-- */
-- int errno = 0;
--#endif
--
--#ifndef HAVE_MEMCPY
--
--void zmemcpy(dest, source, len)
-- Bytef* dest;
-- const Bytef* source;
-- uInt len;
--{
-- if (len == 0) return;
-- do {
-- *dest++ = *source++; /* ??? to be unrolled */
-- } while (--len != 0);
--}
--
--int zmemcmp(s1, s2, len)
-- const Bytef* s1;
-- const Bytef* s2;
-- uInt len;
--{
-- uInt j;
--
-- for (j = 0; j < len; j++) {
-- if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-- }
-- return 0;
--}
--
--void zmemzero(dest, len)
-- Bytef* dest;
-- uInt len;
--{
-- if (len == 0) return;
-- do {
-- *dest++ = 0; /* ??? to be unrolled */
-- } while (--len != 0);
--}
--#endif
--
--
--#ifdef SYS16BIT
--
--#ifdef __TURBOC__
--/* Turbo C in 16-bit mode */
--
--# define MY_ZCALLOC
--
--/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
-- * and farmalloc(64K) returns a pointer with an offset of 8, so we
-- * must fix the pointer. Warning: the pointer must be put back to its
-- * original form in order to free it, use zcfree().
-- */
--
--#define MAX_PTR 10
--/* 10*64K = 640K */
--
--local int next_ptr = 0;
--
--typedef struct ptr_table_s {
-- voidpf org_ptr;
-- voidpf new_ptr;
--} ptr_table;
--
--local ptr_table table[MAX_PTR];
--/* This table is used to remember the original form of pointers
-- * to large buffers (64K). Such pointers are normalized with a zero offset.
-- * Since MSDOS is not a preemptive multitasking OS, this table is not
-- * protected from concurrent access. This hack doesn't work anyway on
-- * a protected system like OS/2. Use Microsoft C instead.
-- */
--
--voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
--{
-- voidpf buf = opaque; /* just to make some compilers happy */
-- ulg bsize = (ulg)items*size;
--
-- /* If we allocate less than 65520 bytes, we assume that farmalloc
-- * will return a usable pointer which doesn't have to be normalized.
-- */
-- if (bsize < 65520L) {
-- buf = farmalloc(bsize);
-- if (*(ush*)&buf != 0) return buf;
-- } else {
-- buf = farmalloc(bsize + 16L);
-- }
-- if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-- table[next_ptr].org_ptr = buf;
--
-- /* Normalize the pointer to seg:0 */
-- *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-- *(ush*)&buf = 0;
-- table[next_ptr++].new_ptr = buf;
-- return buf;
--}
--
--void zcfree (voidpf opaque, voidpf ptr)
--{
-- int n;
-- if (*(ush*)&ptr != 0) { /* object < 64K */
-- farfree(ptr);
-- return;
-- }
-- /* Find the original pointer */
-- for (n = 0; n < next_ptr; n++) {
-- if (ptr != table[n].new_ptr) continue;
--
-- farfree(table[n].org_ptr);
-- while (++n < next_ptr) {
-- table[n-1] = table[n];
-- }
-- next_ptr--;
-- return;
-- }
-- ptr = opaque; /* just to make some compilers happy */
-- Assert(0, "zcfree: ptr not found");
--}
--
--#endif /* __TURBOC__ */
--
--
--#ifdef M_I86
--/* Microsoft C in 16-bit mode */
--
--# define MY_ZCALLOC
--
--#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
--# define _halloc halloc
--# define _hfree hfree
--#endif
--
--voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
--{
-- if (opaque) opaque = 0; /* to make compiler happy */
-- return _halloc((long)items, size);
--}
--
--void zcfree (voidpf opaque, voidpf ptr)
--{
-- if (opaque) opaque = 0; /* to make compiler happy */
-- _hfree(ptr);
--}
--
--#endif /* M_I86 */
--
--#endif /* SYS16BIT */
--
--
--#ifndef MY_ZCALLOC /* Any system without a special alloc function */
--
--#ifndef STDC
--extern voidp malloc OF((uInt size));
--extern voidp calloc OF((uInt items, uInt size));
--extern void free OF((voidpf ptr));
--#endif
--
--voidpf zcalloc (opaque, items, size)
-- voidpf opaque;
-- unsigned items;
-- unsigned size;
--{
-- if (opaque) items += size - size; /* make compiler happy */
-- return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-- (voidpf)calloc(items, size);
--}
--
--void zcfree (opaque, ptr)
-- voidpf opaque;
-- voidpf ptr;
--{
-- free(ptr);
-- if (opaque) return; /* make compiler happy */
--}
--
--#endif /* MY_ZCALLOC */
---- ./jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,294 +0,0 @@
--/*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--/* zutil.h -- internal interface and configuration of the compression library
-- * Copyright (C) 1995-2005 Jean-loup Gailly.
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* WARNING: this file should *not* be used by applications. It is
-- part of the implementation of the compression library and is
-- subject to change. Applications should only use zlib.h.
-- */
--
--/* @(#) $Id$ */
--
--#ifndef ZUTIL_H
--#define ZUTIL_H
--
--#define ZLIB_INTERNAL
--#include "zlib.h"
--
--#ifdef STDC
--# ifndef _WIN32_WCE
--# include <stddef.h>
--# endif
--# include <string.h>
--# include <stdlib.h>
--#endif
--#ifdef NO_ERRNO_H
--# ifdef _WIN32_WCE
-- /* The Microsoft C Run-Time Library for Windows CE doesn't have
-- * errno. We define it as a global variable to simplify porting.
-- * Its value is always 0 and should not be used. We rename it to
-- * avoid conflict with other libraries that use the same workaround.
-- */
--# define errno z_errno
--# endif
-- extern int errno;
--#else
--# ifndef _WIN32_WCE
--# include <errno.h>
--# endif
--#endif
--
--#ifndef local
--# define local static
--#endif
--/* compile with -Dlocal if your debugger can't find static symbols */
--
--typedef unsigned char uch;
--typedef uch FAR uchf;
--typedef unsigned short ush;
--typedef ush FAR ushf;
--typedef unsigned long ulg;
--
--extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
--/* (size given to avoid silly warnings with Visual C++) */
--
--#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
--
--#define ERR_RETURN(strm,err) \
-- return (strm->msg = (char*)ERR_MSG(err), (err))
--/* To be used only when the state is known to be valid */
--
-- /* common constants */
--
--#ifndef DEF_WBITS
--# define DEF_WBITS MAX_WBITS
--#endif
--/* default windowBits for decompression. MAX_WBITS is for compression only */
--
--#if MAX_MEM_LEVEL >= 8
--# define DEF_MEM_LEVEL 8
--#else
--# define DEF_MEM_LEVEL MAX_MEM_LEVEL
--#endif
--/* default memLevel */
--
--#define STORED_BLOCK 0
--#define STATIC_TREES 1
--#define DYN_TREES 2
--/* The three kinds of block type */
--
--#define MIN_MATCH 3
--#define MAX_MATCH 258
--/* The minimum and maximum match lengths */
--
--#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
--
-- /* target dependencies */
--
--#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
--# define OS_CODE 0x00
--# if defined(__TURBOC__) || defined(__BORLANDC__)
--# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-- /* Allow compilation with ANSI keywords only enabled */
-- void _Cdecl farfree( void *block );
-- void *_Cdecl farmalloc( unsigned long nbytes );
--# else
--# include <alloc.h>
--# endif
--# else /* MSC or DJGPP */
--# include <malloc.h>
--# endif
--#endif
--
--#ifdef AMIGA
--# define OS_CODE 0x01
--#endif
--
--#if defined(VAXC) || defined(VMS)
--# define OS_CODE 0x02
--# define F_OPEN(name, mode) \
-- fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
--#endif
--
--#if defined(ATARI) || defined(atarist)
--# define OS_CODE 0x05
--#endif
--
--#ifdef OS2
--# define OS_CODE 0x06
--# ifdef M_I86
-- #include <malloc.h>
--# endif
--#endif
--
--#if defined(MACOS) || defined(TARGET_OS_MAC)
--# define OS_CODE 0x07
--# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
--# include <unix.h> /* for fdopen */
--# else
--# ifndef fdopen
--# define fdopen(fd,mode) NULL /* No fdopen() */
--# endif
--# endif
--#endif
--
--#ifdef TOPS20
--# define OS_CODE 0x0a
--#endif
--
--#ifdef WIN32
--# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
--# define OS_CODE 0x0b
--# endif
--#endif
--
--#ifdef __50SERIES /* Prime/PRIMOS */
--# define OS_CODE 0x0f
--#endif
--
--#if defined(_BEOS_) || defined(RISCOS)
--# define fdopen(fd,mode) NULL /* No fdopen() */
--#endif
--
--#if (defined(_MSC_VER) && (_MSC_VER > 600))
--# if defined(_WIN32_WCE)
--# define fdopen(fd,mode) NULL /* No fdopen() */
--# ifndef _PTRDIFF_T_DEFINED
-- typedef int ptrdiff_t;
--# define _PTRDIFF_T_DEFINED
--# endif
--# else
--# define fdopen(fd,type) _fdopen(fd,type)
--# endif
--#endif
--
-- /* common defaults */
--
--#ifndef OS_CODE
--# define OS_CODE 0x03 /* assume Unix */
--#endif
--
--#ifndef F_OPEN
--# define F_OPEN(name, mode) fopen((name), (mode))
--#endif
--
-- /* functions */
--
--#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
--# ifndef HAVE_VSNPRINTF
--# define HAVE_VSNPRINTF
--# endif
--#endif
--#if defined(__CYGWIN__)
--# ifndef HAVE_VSNPRINTF
--# define HAVE_VSNPRINTF
--# endif
--#endif
--#ifndef HAVE_VSNPRINTF
--# ifdef MSDOS
-- /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-- but for now we just assume it doesn't. */
--# define NO_vsnprintf
--# endif
--# ifdef __TURBOC__
--# define NO_vsnprintf
--# endif
--# ifdef WIN32
-- /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
--# if !defined(vsnprintf) && !defined(NO_vsnprintf) && (!defined(_MSC_VER) || (_MSC_VER < 1500))
-- /* Only needed before Visual Studio 2008 */
--# define vsnprintf _vsnprintf
--# endif
--# endif
--# ifdef __SASC
--# define NO_vsnprintf
--# endif
--#endif
--#ifdef VMS
--# define NO_vsnprintf
--#endif
--
--#if defined(pyr)
--# define NO_MEMCPY
--#endif
--#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
-- /* Use our own functions for small and medium model with MSC <= 5.0.
-- * You may have to use the same strategy for Borland C (untested).
-- * The __SC__ check is for Symantec.
-- */
--# define NO_MEMCPY
--#endif
--#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
--# define HAVE_MEMCPY
--#endif
--#ifdef HAVE_MEMCPY
--# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
--# define zmemcpy _fmemcpy
--# define zmemcmp _fmemcmp
--# define zmemzero(dest, len) _fmemset(dest, 0, len)
--# else
--# define zmemcpy memcpy
--# define zmemcmp memcmp
--# define zmemzero(dest, len) memset(dest, 0, len)
--# endif
--#else
-- extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-- extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-- extern void zmemzero OF((Bytef* dest, uInt len));
--#endif
--
--/* Diagnostic functions */
--#ifdef DEBUG
--# include <stdio.h>
-- extern int z_verbose;
-- extern void z_error OF((char *m));
--# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
--# define Trace(x) {if (z_verbose>=0) fprintf x ;}
--# define Tracev(x) {if (z_verbose>0) fprintf x ;}
--# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
--# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
--# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
--#else
--# define Assert(cond,msg)
--# define Trace(x)
--# define Tracev(x)
--# define Tracevv(x)
--# define Tracec(c,x)
--# define Tracecv(c,x)
--#endif
--
--
--voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
--void zcfree OF((voidpf opaque, voidpf ptr));
--
--#define ZALLOC(strm, items, size) \
-- (*((strm)->zalloc))((strm)->opaque, (items), (size))
--#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
--#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
--
--#endif /* ZUTIL_H */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/ChangeLog Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,1472 @@
-+
-+ ChangeLog file for zlib
-+
-+Changes in 1.2.8 (28 Apr 2013)
-+- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
-+- Do not force Z_CONST for C++
-+- Clean up contrib/vstudio [Ro§]
-+- Correct spelling error in zlib.h
-+- Fix mixed line endings in contrib/vstudio
-+
-+Changes in 1.2.7.3 (13 Apr 2013)
-+- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
-+
-+Changes in 1.2.7.2 (13 Apr 2013)
-+- Change check for a four-byte type back to hexadecimal
-+- Fix typo in win32/Makefile.msc
-+- Add casts in gzwrite.c for pointer differences
-+
-+Changes in 1.2.7.1 (24 Mar 2013)
-+- Replace use of unsafe string functions with snprintf if available
-+- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
-+- Fix gzgetc undefine when Z_PREFIX set [Turk]
-+- Eliminate use of mktemp in Makefile (not always available)
-+- Fix bug in 'F' mode for gzopen()
-+- Add inflateGetDictionary() function
-+- Correct comment in deflate.h
-+- Use _snprintf for snprintf in Microsoft C
-+- On Darwin, only use /usr/bin/libtool if libtool is not Apple
-+- Delete "--version" file if created by "ar --version" [Richard G.]
-+- Fix configure check for veracity of compiler error return codes
-+- Fix CMake compilation of static lib for MSVC2010 x64
-+- Remove unused variable in infback9.c
-+- Fix argument checks in gzlog_compress() and gzlog_write()
-+- Clean up the usage of z_const and respect const usage within zlib
-+- Clean up examples/gzlog.[ch] comparisons of different types
-+- Avoid shift equal to bits in type (caused endless loop)
-+- Fix unintialized value bug in gzputc() introduced by const patches
-+- Fix memory allocation error in examples/zran.c [Nor]
-+- Fix bug where gzopen(), gzclose() would write an empty file
-+- Fix bug in gzclose() when gzwrite() runs out of memory
-+- Check for input buffer malloc failure in examples/gzappend.c
-+- Add note to contrib/blast to use binary mode in stdio
-+- Fix comparisons of differently signed integers in contrib/blast
-+- Check for invalid code length codes in contrib/puff
-+- Fix serious but very rare decompression bug in inftrees.c
-+- Update inflateBack() comments, since inflate() can be faster
-+- Use underscored I/O function names for WINAPI_FAMILY
-+- Add _tr_flush_bits to the external symbols prefixed by --zprefix
-+- Add contrib/vstudio/vc10 pre-build step for static only
-+- Quote --version-script argument in CMakeLists.txt
-+- Don't specify --version-script on Apple platforms in CMakeLists.txt
-+- Fix casting error in contrib/testzlib/testzlib.c
-+- Fix types in contrib/minizip to match result of get_crc_table()
-+- Simplify contrib/vstudio/vc10 with 'd' suffix
-+- Add TOP support to win32/Makefile.msc
-+- Suport i686 and amd64 assembler builds in CMakeLists.txt
-+- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
-+- Add vc11 and vc12 build files to contrib/vstudio
-+- Add gzvprintf() as an undocumented function in zlib
-+- Fix configure for Sun shell
-+- Remove runtime check in configure for four-byte integer type
-+- Add casts and consts to ease user conversion to C++
-+- Add man pages for minizip and miniunzip
-+- In Makefile uninstall, don't rm if preceding cd fails
-+- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
-+
-+Changes in 1.2.7 (2 May 2012)
-+- Replace use of memmove() with a simple copy for portability
-+- Test for existence of strerror
-+- Restore gzgetc_ for backward compatibility with 1.2.6
-+- Fix build with non-GNU make on Solaris
-+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
-+- Include unistd.h for Watcom C
-+- Use __WATCOMC__ instead of __WATCOM__
-+- Do not use the visibility attribute if NO_VIZ defined
-+- Improve the detection of no hidden visibility attribute
-+- Avoid using __int64 for gcc or solo compilation
-+- Cast to char * in gzprintf to avoid warnings [Zinser]
-+- Fix make_vms.com for VAX [Zinser]
-+- Don't use library or built-in byte swaps
-+- Simplify test and use of gcc hidden attribute
-+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
-+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
-+- Fix bug in test/minigzip.c for configure --solo
-+- Fix contrib/vstudio project link errors [Mohanathas]
-+- Add ability to choose the builder in make_vms.com [Schweda]
-+- Add DESTDIR support to mingw32 win32/Makefile.gcc
-+- Fix comments in win32/Makefile.gcc for proper usage
-+- Allow overriding the default install locations for cmake
-+- Generate and install the pkg-config file with cmake
-+- Build both a static and a shared version of zlib with cmake
-+- Include version symbols for cmake builds
-+- If using cmake with MSVC, add the source directory to the includes
-+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
-+- Move obsolete emx makefile to old [Truta]
-+- Allow the use of -Wundef when compiling or using zlib
-+- Avoid the use of the -u option with mktemp
-+- Improve inflate() documentation on the use of Z_FINISH
-+- Recognize clang as gcc
-+- Add gzopen_w() in Windows for wide character path names
-+- Rename zconf.h in CMakeLists.txt to move it out of the way
-+- Add source directory in CMakeLists.txt for building examples
-+- Look in build directory for zlib.pc in CMakeLists.txt
-+- Remove gzflags from zlibvc.def in vc9 and vc10
-+- Fix contrib/minizip compilation in the MinGW environment
-+- Update ./configure for Solaris, support --64 [Mooney]
-+- Remove -R. from Solaris shared build (possible security issue)
-+- Avoid race condition for parallel make (-j) running example
-+- Fix type mismatch between get_crc_table() and crc_table
-+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
-+- Fix the path to zlib.map in CMakeLists.txt
-+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
-+- Add instructions to win32/Makefile.gcc for shared install [Torri]
-+
-+Changes in 1.2.6.1 (12 Feb 2012)
-+- Avoid the use of the Objective-C reserved name "id"
-+- Include io.h in gzguts.h for Microsoft compilers
-+- Fix problem with ./configure --prefix and gzgetc macro
-+- Include gz_header definition when compiling zlib solo
-+- Put gzflags() functionality back in zutil.c
-+- Avoid library header include in crc32.c for Z_SOLO
-+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
-+- Minor cleanup in contrib/minizip/zip.c [Vollant]
-+- Update make_vms.com [Zinser]
-+- Remove unnecessary gzgetc_ function
-+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
-+- Fix minor typo in zlib.h comments [Rzesniowiecki]
-+
-+Changes in 1.2.6 (29 Jan 2012)
-+- Update the Pascal interface in contrib/pascal
-+- Fix function numbers for gzgetc_ in zlibvc.def files
-+- Fix configure.ac for contrib/minizip [Schiffer]
-+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
-+- Have ./configure use the compiler return code for error indication
-+- Fix CMakeLists.txt for cross compilation [McClure]
-+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
-+- Fix compilation of contrib/minizip on FreeBSD [Marquez]
-+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
-+- Include io.h for Turbo C / Borland C on all platforms [Truta]
-+- Make version explicit in contrib/minizip/configure.ac [Bosmans]
-+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
-+- Minor cleanup up contrib/minizip/unzip.c [Vollant]
-+- Fix bug when compiling minizip with C++ [Vollant]
-+- Protect for long name and extra fields in contrib/minizip [Vollant]
-+- Avoid some warnings in contrib/minizip [Vollant]
-+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
-+- Add missing libs to minizip linker command
-+- Add support for VPATH builds in contrib/minizip
-+- Add an --enable-demos option to contrib/minizip/configure
-+- Add the generation of configure.log by ./configure
-+- Exit when required parameters not provided to win32/Makefile.gcc
-+- Have gzputc return the character written instead of the argument
-+- Use the -m option on ldconfig for BSD systems [Tobias]
-+- Correct in zlib.map when deflateResetKeep was added
-+
-+Changes in 1.2.5.3 (15 Jan 2012)
-+- Restore gzgetc function for binary compatibility
-+- Do not use _lseeki64 under Borland C++ [Truta]
-+- Update win32/Makefile.msc to build test/*.c [Truta]
-+- Remove old/visualc6 given CMakefile and other alternatives
-+- Update AS400 build files and documentation [Monnerat]
-+- Update win32/Makefile.gcc to build test/*.c [Truta]
-+- Permit stronger flushes after Z_BLOCK flushes
-+- Avoid extraneous empty blocks when doing empty flushes
-+- Permit Z_NULL arguments to deflatePending
-+- Allow deflatePrime() to insert bits in the middle of a stream
-+- Remove second empty static block for Z_PARTIAL_FLUSH
-+- Write out all of the available bits when using Z_BLOCK
-+- Insert the first two strings in the hash table after a flush
-+
-+Changes in 1.2.5.2 (17 Dec 2011)
-+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
-+- use relative symlinks for shared libs
-+- Avoid searching past window for Z_RLE strategy
-+- Assure that high-water mark initialization is always applied in deflate
-+- Add assertions to fill_window() in deflate.c to match comments
-+- Update python link in README
-+- Correct spelling error in gzread.c
-+- Fix bug in gzgets() for a concatenated empty gzip stream
-+- Correct error in comment for gz_make()
-+- Change gzread() and related to ignore junk after gzip streams
-+- Allow gzread() and related to continue after gzclearerr()
-+- Allow gzrewind() and gzseek() after a premature end-of-file
-+- Simplify gzseek() now that raw after gzip is ignored
-+- Change gzgetc() to a macro for speed (~40% speedup in testing)
-+- Fix gzclose() to return the actual error last encountered
-+- Always add large file support for windows
-+- Include zconf.h for windows large file support
-+- Include zconf.h.cmakein for windows large file support
-+- Update zconf.h.cmakein on make distclean
-+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
-+- Clarify how gzopen() appends in zlib.h comments
-+- Correct documentation of gzdirect() since junk at end now ignored
-+- Add a transparent write mode to gzopen() when 'T' is in the mode
-+- Update python link in zlib man page
-+- Get inffixed.h and MAKEFIXED result to match
-+- Add a ./config --solo option to make zlib subset with no libary use
-+- Add undocumented inflateResetKeep() function for CAB file decoding
-+- Add --cover option to ./configure for gcc coverage testing
-+- Add #define ZLIB_CONST option to use const in the z_stream interface
-+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
-+- Note behavior of uncompress() to provide as much data as it can
-+- Add files in contrib/minizip to aid in building libminizip
-+- Split off AR options in Makefile.in and configure
-+- Change ON macro to Z_ARG to avoid application conflicts
-+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
-+- Include io.h for Turbo C / Borland C++
-+- Move example.c and minigzip.c to test/
-+- Simplify incomplete code table filling in inflate_table()
-+- Remove code from inflate.c and infback.c that is impossible to execute
-+- Test the inflate code with full coverage
-+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
-+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
-+- Fix gzwrite.c to accommodate reduced memory zlib compilation
-+- Have inflate() with Z_FINISH avoid the allocation of a window
-+- Do not set strm->adler when doing raw inflate
-+- Fix gzeof() to behave just like feof() when read is not past end of file
-+- Fix bug in gzread.c when end-of-file is reached
-+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
-+- Document gzread() capability to read concurrently written files
-+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
-+
-+Changes in 1.2.5.1 (10 Sep 2011)
-+- Update FAQ entry on shared builds (#13)
-+- Avoid symbolic argument to chmod in Makefile.in
-+- Fix bug and add consts in contrib/puff [Oberhumer]
-+- Update contrib/puff/zeros.raw test file to have all block types
-+- Add full coverage test for puff in contrib/puff/Makefile
-+- Fix static-only-build install in Makefile.in
-+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
-+- Add libz.a dependency to shared in Makefile.in for parallel builds
-+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
-+- Replace $(...) with `...` in configure for non-bash sh [Bowler]
-+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
-+- Add solaris* to Linux* in configure to allow gcc use [Groffen]
-+- Add *bsd* to Linux* case in configure [Bar-Lev]
-+- Add inffast.obj to dependencies in win32/Makefile.msc
-+- Correct spelling error in deflate.h [Kohler]
-+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
-+- Add test to configure for GNU C looking for gcc in output of $cc -v
-+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
-+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
-+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
-+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
-+- Make stronger test in zconf.h to include unistd.h for LFS
-+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
-+- Fix zlib.h LFS support when Z_PREFIX used
-+- Add updated as400 support (removed from old) [Monnerat]
-+- Avoid deflate sensitivity to volatile input data
-+- Avoid division in adler32_combine for NO_DIVIDE
-+- Clarify the use of Z_FINISH with deflateBound() amount of space
-+- Set binary for output file in puff.c
-+- Use u4 type for crc_table to avoid conversion warnings
-+- Apply casts in zlib.h to avoid conversion warnings
-+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
-+- Improve inflateSync() documentation to note indeterminancy
-+- Add deflatePending() function to return the amount of pending output
-+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
-+- Add a check in configure for stdarg.h, use for gzprintf()
-+- Check that pointers fit in ints when gzprint() compiled old style
-+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
-+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
-+- Add debug records in assmebler code [Londer]
-+- Update RFC references to use http://tools.ietf.org/html/... [Li]
-+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
-+
-+Changes in 1.2.5 (19 Apr 2010)
-+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
-+- Default to libdir as sharedlibdir in configure [Nieder]
-+- Update copyright dates on modified source files
-+- Update trees.c to be able to generate modified trees.h
-+- Exit configure for MinGW, suggesting win32/Makefile.gcc
-+- Check for NULL path in gz_open [Homurlu]
-+
-+Changes in 1.2.4.5 (18 Apr 2010)
-+- Set sharedlibdir in configure [Torok]
-+- Set LDFLAGS in Makefile.in [Bar-Lev]
-+- Avoid mkdir objs race condition in Makefile.in [Bowler]
-+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
-+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
-+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
-+
-+Changes in 1.2.4.4 (18 Apr 2010)
-+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
-+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
-+- Try to use bash or ksh regardless of functionality of /bin/sh
-+- Fix configure incompatibility with NetBSD sh
-+- Remove attempt to run under bash or ksh since have better NetBSD fix
-+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
-+- Add diagnostic messages when using CROSS_PREFIX in configure
-+- Added --sharedlibdir option to configure [Weigelt]
-+- Use hidden visibility attribute when available [Frysinger]
-+
-+Changes in 1.2.4.3 (10 Apr 2010)
-+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
-+- Use CROSS_PREFIX for nm [Bar-Lev]
-+- Assume _LARGEFILE64_SOURCE defined is equivalent to true
-+- Avoid use of undefined symbols in #if with && and ||
-+- Make *64 prototypes in gzguts.h consistent with functions
-+- Add -shared load option for MinGW in configure [Bowler]
-+- Move z_off64_t to public interface, use instead of off64_t
-+- Remove ! from shell test in configure (not portable to Solaris)
-+- Change +0 macro tests to -0 for possibly increased portability
-+
-+Changes in 1.2.4.2 (9 Apr 2010)
-+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
-+- Really provide prototypes for *64 functions when building without LFS
-+- Only define unlink() in minigzip.c if unistd.h not included
-+- Update README to point to contrib/vstudio project files
-+- Move projects/vc6 to old/ and remove projects/
-+- Include stdlib.h in minigzip.c for setmode() definition under WinCE
-+- Clean up assembler builds in win32/Makefile.msc [Rowe]
-+- Include sys/types.h for Microsoft for off_t definition
-+- Fix memory leak on error in gz_open()
-+- Symbolize nm as $NM in configure [Weigelt]
-+- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
-+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
-+- Fix bug in gzeof() to take into account unused input data
-+- Avoid initialization of structures with variables in puff.c
-+- Updated win32/README-WIN32.txt [Rowe]
-+
-+Changes in 1.2.4.1 (28 Mar 2010)
-+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
-+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
-+- Restore "for debugging" comment on sprintf() in gzlib.c
-+- Remove fdopen for MVS from gzguts.h
-+- Put new README-WIN32.txt in win32 [Rowe]
-+- Add check for shell to configure and invoke another shell if needed
-+- Fix big fat stinking bug in gzseek() on uncompressed files
-+- Remove vestigial F_OPEN64 define in zutil.h
-+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
-+- Avoid errors on non-LFS systems when applications define LFS macros
-+- Set EXE to ".exe" in configure for MINGW [Kahle]
-+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
-+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
-+- Add DLL install in win32/makefile.gcc [Bar-Lev]
-+- Allow Linux* or linux* from uname in configure [Bar-Lev]
-+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
-+- Add cross-compilation prefixes to configure [Bar-Lev]
-+- Match type exactly in gz_load() invocation in gzread.c
-+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
-+- Provide prototypes for *64 functions when building zlib without LFS
-+- Don't use -lc when linking shared library on MinGW
-+- Remove errno.h check in configure and vestigial errno code in zutil.h
-+
-+Changes in 1.2.4 (14 Mar 2010)
-+- Fix VER3 extraction in configure for no fourth subversion
-+- Update zlib.3, add docs to Makefile.in to make .pdf out of it
-+- Add zlib.3.pdf to distribution
-+- Don't set error code in gzerror() if passed pointer is NULL
-+- Apply destination directory fixes to CMakeLists.txt [Lowman]
-+- Move #cmakedefine's to a new zconf.in.cmakein
-+- Restore zconf.h for builds that don't use configure or cmake
-+- Add distclean to dummy Makefile for convenience
-+- Update and improve INDEX, README, and FAQ
-+- Update CMakeLists.txt for the return of zconf.h [Lowman]
-+- Update contrib/vstudio/vc9 and vc10 [Vollant]
-+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
-+- Apply license and readme changes to contrib/asm686 [Raiter]
-+- Check file name lengths and add -c option in minigzip.c [Li]
-+- Update contrib/amd64 and contrib/masmx86/ [Vollant]
-+- Avoid use of "eof" parameter in trees.c to not shadow library variable
-+- Update make_vms.com for removal of zlibdefs.h [Zinser]
-+- Update assembler code and vstudio projects in contrib [Vollant]
-+- Remove outdated assembler code contrib/masm686 and contrib/asm586
-+- Remove old vc7 and vc8 from contrib/vstudio
-+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
-+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
-+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
-+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
-+- Fix bug in void-returning vsprintf() case in gzwrite.c
-+- Fix name change from inflate.h in contrib/inflate86/inffas86.c
-+- Check if temporary file exists before removing in make_vms.com [Zinser]
-+- Fix make install and uninstall for --static option
-+- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
-+- Update readme.txt in contrib/masmx64 and masmx86 to assemble
-+
-+Changes in 1.2.3.9 (21 Feb 2010)
-+- Expunge gzio.c
-+- Move as400 build information to old
-+- Fix updates in contrib/minizip and contrib/vstudio
-+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
-+- Delete zconf.h (made by configure) [Weigelt]
-+- Change zconf.in.h to zconf.h.in per convention [Weigelt]
-+- Check for NULL buf in gzgets()
-+- Return empty string for gzgets() with len == 1 (like fgets())
-+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
-+- Update minizip to 1.1 [Vollant]
-+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
-+- Note in zlib.h that gzerror() should be used to distinguish from EOF
-+- Remove use of snprintf() from gzlib.c
-+- Fix bug in gzseek()
-+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
-+- Fix zconf.h generation in CMakeLists.txt [Lowman]
-+- Improve comments in zconf.h where modified by configure
-+
-+Changes in 1.2.3.8 (13 Feb 2010)
-+- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
-+- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
-+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
-+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
-+- Fix missing error return in gzflush(), add zlib.h note
-+- Add *64 functions to zlib.map [Levin]
-+- Fix signed/unsigned comparison in gz_comp()
-+- Use SFLAGS when testing shared linking in configure
-+- Add --64 option to ./configure to use -m64 with gcc
-+- Fix ./configure --help to correctly name options
-+- Have make fail if a test fails [Levin]
-+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
-+- Remove assembler object files from contrib
-+
-+Changes in 1.2.3.7 (24 Jan 2010)
-+- Always gzopen() with O_LARGEFILE if available
-+- Fix gzdirect() to work immediately after gzopen() or gzdopen()
-+- Make gzdirect() more precise when the state changes while reading
-+- Improve zlib.h documentation in many places
-+- Catch memory allocation failure in gz_open()
-+- Complete close operation if seek forward in gzclose_w() fails
-+- Return Z_ERRNO from gzclose_r() if close() fails
-+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
-+- Return zero for gzwrite() errors to match zlib.h description
-+- Return -1 on gzputs() error to match zlib.h description
-+- Add zconf.in.h to allow recovery from configure modification [Weigelt]
-+- Fix static library permissions in Makefile.in [Weigelt]
-+- Avoid warnings in configure tests that hide functionality [Weigelt]
-+- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
-+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
-+- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
-+- Keep object files in subdirectories to reduce the clutter somewhat
-+- Remove default Makefile and zlibdefs.h, add dummy Makefile
-+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
-+- Remove zlibdefs.h completely -- modify zconf.h instead
-+
-+Changes in 1.2.3.6 (17 Jan 2010)
-+- Avoid void * arithmetic in gzread.c and gzwrite.c
-+- Make compilers happier with const char * for gz_error message
-+- Avoid unused parameter warning in inflate.c
-+- Avoid signed-unsigned comparison warning in inflate.c
-+- Indent #pragma's for traditional C
-+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
-+- Correct email address in configure for system options
-+- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
-+- Update zlib.map [Brown]
-+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
-+- Apply various fixes to CMakeLists.txt [Lowman]
-+- Add checks on len in gzread() and gzwrite()
-+- Add error message for no more room for gzungetc()
-+- Remove zlib version check in gzwrite()
-+- Defer compression of gzprintf() result until need to
-+- Use snprintf() in gzdopen() if available
-+- Remove USE_MMAP configuration determination (only used by minigzip)
-+- Remove examples/pigz.c (available separately)
-+- Update examples/gun.c to 1.6
-+
-+Changes in 1.2.3.5 (8 Jan 2010)
-+- Add space after #if in zutil.h for some compilers
-+- Fix relatively harmless bug in deflate_fast() [Exarevsky]
-+- Fix same problem in deflate_slow()
-+- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
-+- Add deflate_rle() for faster Z_RLE strategy run-length encoding
-+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
-+- Change name of "write" variable in inffast.c to avoid library collisions
-+- Fix premature EOF from gzread() in gzio.c [Brown]
-+- Use zlib header window size if windowBits is 0 in inflateInit2()
-+- Remove compressBound() call in deflate.c to avoid linking compress.o
-+- Replace use of errno in gz* with functions, support WinCE [Alves]
-+- Provide alternative to perror() in minigzip.c for WinCE [Alves]
-+- Don't use _vsnprintf on later versions of MSVC [Lowman]
-+- Add CMake build script and input file [Lowman]
-+- Update contrib/minizip to 1.1 [Svensson, Vollant]
-+- Moved nintendods directory from contrib to .
-+- Replace gzio.c with a new set of routines with the same functionality
-+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
-+- Update contrib/minizip to 1.1b
-+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
-+
-+Changes in 1.2.3.4 (21 Dec 2009)
-+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
-+- Update comments in configure and Makefile.in for default --shared
-+- Fix test -z's in configure [Marquess]
-+- Build examplesh and minigzipsh when not testing
-+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
-+- Import LDFLAGS from the environment in configure
-+- Fix configure to populate SFLAGS with discovered CFLAGS options
-+- Adapt make_vms.com to the new Makefile.in [Zinser]
-+- Add zlib2ansi script for C++ compilation [Marquess]
-+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
-+- Add AMD64 assembler code for longest match to contrib [Teterin]
-+- Include options from $SFLAGS when doing $LDSHARED
-+- Simplify 64-bit file support by introducing z_off64_t type
-+- Make shared object files in objs directory to work around old Sun cc
-+- Use only three-part version number for Darwin shared compiles
-+- Add rc option to ar in Makefile.in for when ./configure not run
-+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
-+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
-+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
-+- Rename Makefile.in targets allstatic to static and allshared to shared
-+- Fix static and shared Makefile.in targets to be independent
-+- Correct error return bug in gz_open() by setting state [Brown]
-+- Put spaces before ;;'s in configure for better sh compatibility
-+- Add pigz.c (parallel implementation of gzip) to examples/
-+- Correct constant in crc32.c to UL [Leventhal]
-+- Reject negative lengths in crc32_combine()
-+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
-+- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
-+- Correct typo in doc/algorithm.txt [Janik]
-+- Fix bug in adler32_combine() [Zhu]
-+- Catch missing-end-of-block-code error in all inflates and in puff
-+ Assures that random input to inflate eventually results in an error
-+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
-+- Update ENOUGH and its usage to reflect discovered bounds
-+- Fix gzerror() error report on empty input file [Brown]
-+- Add ush casts in trees.c to avoid pedantic runtime errors
-+- Fix typo in zlib.h uncompress() description [Reiss]
-+- Correct inflate() comments with regard to automatic header detection
-+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
-+- Put new version of gzlog (2.0) in examples with interruption recovery
-+- Add puff compile option to permit invalid distance-too-far streams
-+- Add puff TEST command options, ability to read piped input
-+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
-+ _LARGEFILE64_SOURCE not defined
-+- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
-+- Fix deflateSetDictionary() to use all 32K for output consistency
-+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
-+- Clear bytes after deflate lookahead to avoid use of uninitialized data
-+- Change a limit in inftrees.c to be more transparent to Coverity Prevent
-+- Update win32/zlib.def with exported symbols from zlib.h
-+- Correct spelling errors in zlib.h [Willem, Sobrado]
-+- Allow Z_BLOCK for deflate() to force a new block
-+- Allow negative bits in inflatePrime() to delete existing bit buffer
-+- Add Z_TREES flush option to inflate() to return at end of trees
-+- Add inflateMark() to return current state information for random access
-+- Add Makefile for NintendoDS to contrib [Costa]
-+- Add -w in configure compile tests to avoid spurious warnings [Beucler]
-+- Fix typos in zlib.h comments for deflateSetDictionary()
-+- Fix EOF detection in transparent gzread() [Maier]
-+
-+Changes in 1.2.3.3 (2 October 2006)
-+- Make --shared the default for configure, add a --static option
-+- Add compile option to permit invalid distance-too-far streams
-+- Add inflateUndermine() function which is required to enable above
-+- Remove use of "this" variable name for C++ compatibility [Marquess]
-+- Add testing of shared library in make test, if shared library built
-+- Use ftello() and fseeko() if available instead of ftell() and fseek()
-+- Provide two versions of all functions that use the z_off_t type for
-+ binary compatibility -- a normal version and a 64-bit offset version,
-+ per the Large File Support Extension when _LARGEFILE64_SOURCE is
-+ defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
-+ is defined to be 64
-+- Add a --uname= option to configure to perhaps help with cross-compiling
-+
-+Changes in 1.2.3.2 (3 September 2006)
-+- Turn off silly Borland warnings [Hay]
-+- Use off64_t and define _LARGEFILE64_SOURCE when present
-+- Fix missing dependency on inffixed.h in Makefile.in
-+- Rig configure --shared to build both shared and static [Teredesai, Truta]
-+- Remove zconf.in.h and instead create a new zlibdefs.h file
-+- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
-+- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
-+
-+Changes in 1.2.3.1 (16 August 2006)
-+- Add watcom directory with OpenWatcom make files [Daniel]
-+- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
-+- Update make_vms.com [Zinser]
-+- Use -fPIC for shared build in configure [Teredesai, Nicholson]
-+- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-+- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
-+- Add some FAQ entries about the contrib directory
-+- Update the MVS question in the FAQ
-+- Avoid extraneous reads after EOF in gzio.c [Brown]
-+- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
-+- Add comments to zlib.h about gzerror() usage [Brown]
-+- Set extra flags in gzip header in gzopen() like deflate() does
-+- Make configure options more compatible with double-dash conventions
-+ [Weigelt]
-+- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
-+- Fix uninstall target in Makefile.in [Truta]
-+- Add pkgconfig support [Weigelt]
-+- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
-+- Replace set_data_type() with a more accurate detect_data_type() in
-+ trees.c, according to the txtvsbin.txt document [Truta]
-+- Swap the order of #include <stdio.h> and #include "zlib.h" in
-+ gzio.c, example.c and minigzip.c [Truta]
-+- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
-+ Truta] (where?)
-+- Fix target "clean" from win32/Makefile.bor [Truta]
-+- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
-+- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
-+- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
-+- Enable browse info in the "Debug" and "ASM Debug" configurations in
-+ the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
-+- Add pkgconfig support [Weigelt]
-+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
-+ for use in win32/zlib1.rc [Polushin, Rowe, Truta]
-+- Add a document that explains the new text detection scheme to
-+ doc/txtvsbin.txt [Truta]
-+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
-+- Move algorithm.txt into doc/ [Truta]
-+- Synchronize FAQ with website
-+- Fix compressBound(), was low for some pathological cases [Fearnley]
-+- Take into account wrapper variations in deflateBound()
-+- Set examples/zpipe.c input and output to binary mode for Windows
-+- Update examples/zlib_how.html with new zpipe.c (also web site)
-+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
-+ that gcc became pickier in 4.0)
-+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
-+ un-versioned, the patch adds versioning only for symbols introduced in
-+ zlib-1.2.0 or later. It also declares as local those symbols which are
-+ not designed to be exported." [Levin]
-+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
-+- Do not initialize global static by default in trees.c, add a response
-+ NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
-+- Don't use strerror() in gzio.c under WinCE [Yakimov]
-+- Don't use errno.h in zutil.h under WinCE [Yakimov]
-+- Move arguments for AR to its usage to allow replacing ar [Marot]
-+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
-+- Improve inflateInit() and inflateInit2() documentation
-+- Fix structure size comment in inflate.h
-+- Change configure help option from --h* to --help [Santos]
-+
-+Changes in 1.2.3 (18 July 2005)
-+- Apply security vulnerability fixes to contrib/infback9 as well
-+- Clean up some text files (carriage returns, trailing space)
-+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
-+
-+Changes in 1.2.2.4 (11 July 2005)
-+- Add inflatePrime() function for starting inflation at bit boundary
-+- Avoid some Visual C warnings in deflate.c
-+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-+ compile
-+- Fix some spelling errors in comments [Betts]
-+- Correct inflateInit2() error return documentation in zlib.h
-+- Add zran.c example of compressed data random access to examples
-+ directory, shows use of inflatePrime()
-+- Fix cast for assignments to strm->state in inflate.c and infback.c
-+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
-+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
-+- Add cast in trees.c t avoid a warning [Oberhumer]
-+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
-+- Update make_vms.com [Zinser]
-+- Initialize state->write in inflateReset() since copied in inflate_fast()
-+- Be more strict on incomplete code sets in inflate_table() and increase
-+ ENOUGH and MAXD -- this repairs a possible security vulnerability for
-+ invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for
-+ discovering the vulnerability and providing test cases.
-+- Add ia64 support to configure for HP-UX [Smith]
-+- Add error return to gzread() for format or i/o error [Levin]
-+- Use malloc.h for OS/2 [Necasek]
-+
-+Changes in 1.2.2.3 (27 May 2005)
-+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-+- Typecast fread() return values in gzio.c [Vollant]
-+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-+- Fix crc check bug in gzread() after gzungetc() [Heiner]
-+- Add the deflateTune() function to adjust internal compression parameters
-+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-+- Remove an incorrect assertion in examples/zpipe.c
-+- Add C++ wrapper in infback9.h [Donais]
-+- Fix bug in inflateCopy() when decoding fixed codes
-+- Note in zlib.h how much deflateSetDictionary() actually uses
-+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
-+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
-+- Add gzdirect() function to indicate transparent reads
-+- Update contrib/minizip [Vollant]
-+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
-+- Add casts in crc32.c to avoid warnings [Oberhumer]
-+- Add contrib/masmx64 [Vollant]
-+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
-+
-+Changes in 1.2.2.2 (30 December 2004)
-+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-+ avoid implicit memcpy calls (portability for no-library compilation)
-+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-+- Add INFLATE_STRICT to check distances against zlib header
-+- Improve WinCE errno handling and comments [Chang]
-+- Remove comment about no gzip header processing in FAQ
-+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-+- Add updated make_vms.com [Coghlan], update README
-+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-+ fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
-+- Add FAQ entry and comments in deflate.c on uninitialized memory access
-+- Add Solaris 9 make options in configure [Gilbert]
-+- Allow strerror() usage in gzio.c for STDC
-+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
-+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
-+- Use z_off_t for adler32_combine() and crc32_combine() lengths
-+- Make adler32() much faster for small len
-+- Use OS_CODE in deflate() default gzip header
-+
-+Changes in 1.2.2.1 (31 October 2004)
-+- Allow inflateSetDictionary() call for raw inflate
-+- Fix inflate header crc check bug for file names and comments
-+- Add deflateSetHeader() and gz_header structure for custom gzip headers
-+- Add inflateGetheader() to retrieve gzip headers
-+- Add crc32_combine() and adler32_combine() functions
-+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-+- Use zstreamp consistently in zlib.h (inflate_back functions)
-+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-+ and in contrib/inflate86/inffast.S [Truta, Anderson]
-+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
-+- Update projects/README.projects and projects/visualc6 [Truta]
-+- Update win32/DLL_FAQ.txt [Truta]
-+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
-+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
-+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
-+- Do not define an exit() prototype in zutil.c unless DEBUG defined
-+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
-+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-+- Fix Darwin build version identification [Peterson]
-+
-+Changes in 1.2.2 (3 October 2004)
-+- Update zlib.h comments on gzip in-memory processing
-+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
-+- Add contrib/dotzlib [Ravn]
-+- Update win32/DLL_FAQ.txt [Truta]
-+- Update contrib/minizip [Vollant]
-+- Move contrib/visual-basic.txt to old/ [Truta]
-+- Fix assembler builds in projects/visualc6/ [Truta]
-+
-+Changes in 1.2.1.2 (9 September 2004)
-+- Update INDEX file
-+- Fix trees.c to update strm->data_type (no one ever noticed!)
-+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
-+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
-+- Don't declare strerror() under VMS [Mozilla]
-+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-+- Update contrib/ada [Anisimkov]
-+- Update contrib/minizip [Vollant]
-+- Fix configure to not hardcode directories for Darwin [Peterson]
-+- Fix gzio.c to not return error on empty files [Brown]
-+- Fix indentation; update version in contrib/delphi/ZLib.pas and
-+ contrib/pascal/zlibpas.pas [Truta]
-+- Update mkasm.bat in contrib/masmx86 [Truta]
-+- Update contrib/untgz [Truta]
-+- Add projects/README.projects [Truta]
-+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
-+- Update win32/DLL_FAQ.txt [Truta]
-+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
-+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
-+- Add OS/2 to exe builds in configure [Poltorak]
-+- Remove err dummy parameter in zlib.h [Kientzle]
-+
-+Changes in 1.2.1.1 (9 January 2004)
-+- Update email address in README
-+- Several FAQ updates
-+- Fix a big fat bug in inftrees.c that prevented decoding valid
-+ dynamic blocks with only literals and no distance codes --
-+ Thanks to "Hot Emu" for the bug report and sample file
-+- Add a note to puff.c on no distance codes case.
-+
-+Changes in 1.2.1 (17 November 2003)
-+- Remove a tab in contrib/gzappend/gzappend.c
-+- Update some interfaces in contrib for new zlib functions
-+- Update zlib version number in some contrib entries
-+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
-+- Support shared libraries on Hurd and KFreeBSD [Brown]
-+- Fix error in NO_DIVIDE option of adler32.c
-+
-+Changes in 1.2.0.8 (4 November 2003)
-+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-+- Add experimental NO_DIVIDE #define in adler32.c
-+ - Possibly faster on some processors (let me know if it is)
-+- Correct Z_BLOCK to not return on first inflate call if no wrap
-+- Fix strm->data_type on inflate() return to correctly indicate EOB
-+- Add deflatePrime() function for appending in the middle of a byte
-+- Add contrib/gzappend for an example of appending to a stream
-+- Update win32/DLL_FAQ.txt [Truta]
-+- Delete Turbo C comment in README [Truta]
-+- Improve some indentation in zconf.h [Truta]
-+- Fix infinite loop on bad input in configure script [Church]
-+- Fix gzeof() for concatenated gzip files [Johnson]
-+- Add example to contrib/visual-basic.txt [Michael B.]
-+- Add -p to mkdir's in Makefile.in [vda]
-+- Fix configure to properly detect presence or lack of printf functions
-+- Add AS400 support [Monnerat]
-+- Add a little Cygwin support [Wilson]
-+
-+Changes in 1.2.0.7 (21 September 2003)
-+- Correct some debug formats in contrib/infback9
-+- Cast a type in a debug statement in trees.c
-+- Change search and replace delimiter in configure from % to # [Beebe]
-+- Update contrib/untgz to 0.2 with various fixes [Truta]
-+- Add build support for Amiga [Nikl]
-+- Remove some directories in old that have been updated to 1.2
-+- Add dylib building for Mac OS X in configure and Makefile.in
-+- Remove old distribution stuff from Makefile
-+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-+- Update links in README
-+
-+Changes in 1.2.0.6 (13 September 2003)
-+- Minor FAQ updates
-+- Update contrib/minizip to 1.00 [Vollant]
-+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
-+- Update POSTINC comment for 68060 [Nikl]
-+- Add contrib/infback9 with deflate64 decoding (unsupported)
-+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
-+- Add pragma for fdopen on MVS [van Burik]
-+
-+Changes in 1.2.0.5 (8 September 2003)
-+- Add OF to inflateBackEnd() declaration in zlib.h
-+- Remember start when using gzdopen in the middle of a file
-+- Use internal off_t counters in gz* functions to properly handle seeks
-+- Perform more rigorous check for distance-too-far in inffast.c
-+- Add Z_BLOCK flush option to return from inflate at block boundary
-+- Set strm->data_type on return from inflate
-+ - Indicate bits unused, if at block boundary, and if in last block
-+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-+- Add condition so old NO_DEFLATE define still works for compatibility
-+- FAQ update regarding the Windows DLL [Truta]
-+- INDEX update: add qnx entry, remove aix entry [Truta]
-+- Install zlib.3 into mandir [Wilson]
-+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
-+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
-+- Introduce ZLIB_WINAPI macro to allow the export of functions using
-+ the WINAPI calling convention, for Visual Basic [Vollant, Truta]
-+- Update msdos and win32 scripts and makefiles [Truta]
-+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
-+- Add contrib/ada [Anisimkov]
-+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
-+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
-+- Add contrib/masm686 [Truta]
-+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-+ [Truta, Vollant]
-+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
-+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
-+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
-+ and fix some method prototypes [Truta]
-+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-+ [Truta]
-+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
-+- Fix file time handling in contrib/untgz; update makefiles [Truta]
-+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-+ [Vollant]
-+- Remove contrib/vstudio/vc15_16 [Vollant]
-+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
-+- Update README.contrib [Truta]
-+- Invert the assignment order of match_head and s->prev[...] in
-+ INSERT_STRING [Truta]
-+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-+ [Truta]
-+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
-+- Fix prototype of syncsearch in inflate.c [Truta]
-+- Introduce ASMINF macro to be enabled when using an ASM implementation
-+ of inflate_fast [Truta]
-+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
-+- Modify test_gzio in example.c to take a single file name as a
-+ parameter [Truta]
-+- Exit the example.c program if gzopen fails [Truta]
-+- Add type casts around strlen in example.c [Truta]
-+- Remove casting to sizeof in minigzip.c; give a proper type
-+ to the variable compared with SUFFIX_LEN [Truta]
-+- Update definitions of STDC and STDC99 in zconf.h [Truta]
-+- Synchronize zconf.h with the new Windows DLL interface [Truta]
-+- Use SYS16BIT instead of __32BIT__ to distinguish between
-+ 16- and 32-bit platforms [Truta]
-+- Use far memory allocators in small 16-bit memory models for
-+ Turbo C [Truta]
-+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-+ zlibCompileFlags [Truta]
-+- Cygwin has vsnprintf [Wilson]
-+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
-+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
-+
-+Changes in 1.2.0.4 (10 August 2003)
-+- Minor FAQ updates
-+- Be more strict when checking inflateInit2's windowBits parameter
-+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-+- Add gzip wrapper option to deflateInit2 using windowBits
-+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
-+- Make inflate distance-too-far checks more rigorous
-+- Clean up FAR usage in inflate
-+- Add casting to sizeof() in gzio.c and minigzip.c
-+
-+Changes in 1.2.0.3 (19 July 2003)
-+- Fix silly error in gzungetc() implementation [Vollant]
-+- Update contrib/minizip and contrib/vstudio [Vollant]
-+- Fix printf format in example.c
-+- Correct cdecl support in zconf.in.h [Anisimkov]
-+- Minor FAQ updates
-+
-+Changes in 1.2.0.2 (13 July 2003)
-+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-+- Attempt to avoid warnings in crc32.c for pointer-int conversion
-+- Add AIX to configure, remove aix directory [Bakker]
-+- Add some casts to minigzip.c
-+- Improve checking after insecure sprintf() or vsprintf() calls
-+- Remove #elif's from crc32.c
-+- Change leave label to inf_leave in inflate.c and infback.c to avoid
-+ library conflicts
-+- Remove inflate gzip decoding by default--only enable gzip decoding by
-+ special request for stricter backward compatibility
-+- Add zlibCompileFlags() function to return compilation information
-+- More typecasting in deflate.c to avoid warnings
-+- Remove leading underscore from _Capital #defines [Truta]
-+- Fix configure to link shared library when testing
-+- Add some Windows CE target adjustments [Mai]
-+- Remove #define ZLIB_DLL in zconf.h [Vollant]
-+- Add zlib.3 [Rodgers]
-+- Update RFC URL in deflate.c and algorithm.txt [Mai]
-+- Add zlib_dll_FAQ.txt to contrib [Truta]
-+- Add UL to some constants [Truta]
-+- Update minizip and vstudio [Vollant]
-+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-+- Added iostream3 to contrib [Schwardt]
-+- Replace rewind() with fseek() for WinCE [Truta]
-+- Improve setting of zlib format compression level flags
-+ - Report 0 for huffman and rle strategies and for level == 0 or 1
-+ - Report 2 only for level == 6
-+- Only deal with 64K limit when necessary at compile time [Truta]
-+- Allow TOO_FAR check to be turned off at compile time [Truta]
-+- Add gzclearerr() function [Souza]
-+- Add gzungetc() function
-+
-+Changes in 1.2.0.1 (17 March 2003)
-+- Add Z_RLE strategy for run-length encoding [Truta]
-+ - When Z_RLE requested, restrict matches to distance one
-+ - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-+- Correct FASTEST compilation to allow level == 0
-+- Clean up what gets compiled for FASTEST
-+- Incorporate changes to zconf.in.h [Vollant]
-+ - Refine detection of Turbo C need for dummy returns
-+ - Refine ZLIB_DLL compilation
-+ - Include additional header file on VMS for off_t typedef
-+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
-+- Add some casts in inffast.c
-+- Enchance comments in zlib.h on what happens if gzprintf() tries to
-+ write more than 4095 bytes before compression
-+- Remove unused state from inflateBackEnd()
-+- Remove exit(0) from minigzip.c, example.c
-+- Get rid of all those darn tabs
-+- Add "check" target to Makefile.in that does the same thing as "test"
-+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-+- Update contrib/inflate86 [Anderson]
-+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
-+- Add msdos and win32 directories with makefiles [Truta]
-+- More additions and improvements to the FAQ
-+
-+Changes in 1.2.0 (9 March 2003)
-+- New and improved inflate code
-+ - About 20% faster
-+ - Does not allocate 32K window unless and until needed
-+ - Automatically detects and decompresses gzip streams
-+ - Raw inflate no longer needs an extra dummy byte at end
-+ - Added inflateBack functions using a callback interface--even faster
-+ than inflate, useful for file utilities (gzip, zip)
-+ - Added inflateCopy() function to record state for random access on
-+ externally generated deflate streams (e.g. in gzip files)
-+ - More readable code (I hope)
-+- New and improved crc32()
-+ - About 50% faster, thanks to suggestions from Rodney Brown
-+- Add deflateBound() and compressBound() functions
-+- Fix memory leak in deflateInit2()
-+- Permit setting dictionary for raw deflate (for parallel deflate)
-+- Fix const declaration for gzwrite()
-+- Check for some malloc() failures in gzio.c
-+- Fix bug in gzopen() on single-byte file 0x1f
-+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-+ and next buffer doesn't start with 0x8b
-+- Fix uncompress() to return Z_DATA_ERROR on truncated input
-+- Free memory at end of example.c
-+- Remove MAX #define in trees.c (conflicted with some libraries)
-+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
-+- Declare malloc() and free() in gzio.c if STDC not defined
-+- Use malloc() instead of calloc() in zutil.c if int big enough
-+- Define STDC for AIX
-+- Add aix/ with approach for compiling shared library on AIX
-+- Add HP-UX support for shared libraries in configure
-+- Add OpenUNIX support for shared libraries in configure
-+- Use $cc instead of gcc to build shared library
-+- Make prefix directory if needed when installing
-+- Correct Macintosh avoidance of typedef Byte in zconf.h
-+- Correct Turbo C memory allocation when under Linux
-+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-+- Update configure to check for snprintf or vsnprintf functions and their
-+ return value, warn during make if using an insecure function
-+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-+ is lost when library is used--resolution is to build new zconf.h
-+- Documentation improvements (in zlib.h):
-+ - Document raw deflate and inflate
-+ - Update RFCs URL
-+ - Point out that zlib and gzip formats are different
-+ - Note that Z_BUF_ERROR is not fatal
-+ - Document string limit for gzprintf() and possible buffer overflow
-+ - Note requirement on avail_out when flushing
-+ - Note permitted values of flush parameter of inflate()
-+- Add some FAQs (and even answers) to the FAQ
-+- Add contrib/inflate86/ for x86 faster inflate
-+- Add contrib/blast/ for PKWare Data Compression Library decompression
-+- Add contrib/puff/ simple inflate for deflate format description
-+
-+Changes in 1.1.4 (11 March 2002)
-+- ZFREE was repeated on same allocation on some error conditions.
-+ This creates a security problem described in
-+ http://www.zlib.org/advisory-2002-03-11.txt
-+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-+- Avoid accesses before window for invalid distances with inflate window
-+ less than 32K.
-+- force windowBits > 8 to avoid a bug in the encoder for a window size
-+ of 256 bytes. (A complete fix will be available in 1.1.5).
-+
-+Changes in 1.1.3 (9 July 1998)
-+- fix "an inflate input buffer bug that shows up on rare but persistent
-+ occasions" (Mark)
-+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-+- fix gzseek(..., SEEK_SET) in write mode
-+- fix crc check after a gzeek (Frank Faubert)
-+- fix miniunzip when the last entry in a zip file is itself a zip file
-+ (J Lillge)
-+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-+ See http://www.muppetlabs.com/~breadbox/software/assembly.html
-+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-+- added a FAQ file
-+
-+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-+- avoid some warnings with Borland C (Tom Tanner)
-+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-+- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant)
-+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-+- use libdir and includedir in Makefile.in (Tim Mooney)
-+- support shared libraries on OSF1 V4 (Tim Mooney)
-+- remove so_locations in "make clean" (Tim Mooney)
-+- fix maketree.c compilation error (Glenn, Mark)
-+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-+- new Makefile.riscos (Rich Walker)
-+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-+- fix parameter check in deflateCopy (Gunther Nikl)
-+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-+- Many portability patches by Christian Spieler:
-+ . zutil.c, zutil.h: added "const" for zmem*
-+ . Make_vms.com: fixed some typos
-+ . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-+ . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-+ . msdos/Makefile.*: use model-dependent name for the built zlib library
-+ . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-+ new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-+- fix test for errno.h in configure (Tim Newsham)
-+
-+Changes in 1.1.2 (19 March 98)
-+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-+ See http://www.winimage.com/zLibDll/unzip.html
-+- preinitialize the inflate tables for fixed codes, to make the code
-+ completely thread safe (Mark)
-+- some simplifications and slight speed-up to the inflate code (Mark)
-+- fix gzeof on non-compressed files (Allan Schrum)
-+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-+- do not wrap extern "C" around system includes (Tom Lane)
-+- mention zlib binding for TCL in README (Andreas Kupries)
-+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-+- allow "configure --prefix $HOME" (Tim Mooney)
-+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-+- move Makefile.sas to amiga/Makefile.sas
-+
-+Changes in 1.1.1 (27 Feb 98)
-+- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson)
-+- remove block truncation heuristic which had very marginal effect for zlib
-+ (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-+ compression ratio on some files. This also allows inlining _tr_tally for
-+ matches in deflate_slow.
-+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-+
-+Changes in 1.1.0 (24 Feb 98)
-+- do not return STREAM_END prematurely in inflate (John Bowler)
-+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-+- compile with -DFASTEST to get compression code optimized for speed only
-+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-+ on Sun but significant on HP)
-+
-+- add a pointer to experimental unzip library in README (Gilles Vollant)
-+- initialize variable gcc in configure (Chris Herborth)
-+
-+Changes in 1.0.9 (17 Feb 1998)
-+- added gzputs and gzgets functions
-+- do not clear eof flag in gzseek (Mark Diekhans)
-+- fix gzseek for files in transparent mode (Mark Diekhans)
-+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-+- replace EXPORT with ZEXPORT to avoid conflict with other programs
-+- added compress2 in zconf.h, zlib.def, zlib.dnt
-+- new asm code from Gilles Vollant in contrib/asm386
-+- simplify the inflate code (Mark):
-+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
-+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
-+ . ZALLOC the value area for huft_build() instead of using stack
-+ . Simplify Z_FINISH check in inflate()
-+
-+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-+ the declaration of FAR (Gilles VOllant)
-+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-+- read_buf buf parameter of type Bytef* instead of charf*
-+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-+- fix check for presence of directories in "make install" (Ian Willis)
-+
-+Changes in 1.0.8 (27 Jan 1998)
-+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-+- added compress2() to allow setting the compression level
-+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-+- use constant arrays for the static trees in trees.c instead of computing
-+ them at run time (thanks to Ken Raeburn for this suggestion). To create
-+ trees.h, compile with GEN_TREES_H and run "make test".
-+- check return code of example in "make test" and display result
-+- pass minigzip command line options to file_compress
-+- simplifying code of inflateSync to avoid gcc 2.8 bug
-+
-+- support CC="gcc -Wall" in configure -s (QingLong)
-+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-+- fix test for shared library support to avoid compiler warnings
-+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-+- add checks for gzputc and gzputc in example.c
-+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-+- use const for the CRC table (Ken Raeburn)
-+- fixed "make uninstall" for shared libraries
-+- use Tracev instead of Trace in infblock.c
-+- in example.c use correct compressed length for test_sync
-+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-+
-+Changes in 1.0.7 (20 Jan 1998)
-+- fix gzseek which was broken in write mode
-+- return error for gzseek to negative absolute position
-+- fix configure for Linux (Chun-Chung Chen)
-+- increase stack space for MSC (Tim Wegner)
-+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-+- define EXPORTVA for gzprintf (Gilles Vollant)
-+- added man page zlib.3 (Rick Rodgers)
-+- for contrib/untgz, fix makedir() and improve Makefile
-+
-+- check gzseek in write mode in example.c
-+- allocate extra buffer for seeks only if gzseek is actually called
-+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-+- add inflateSyncPoint in zconf.h
-+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-+
-+Changes in 1.0.6 (19 Jan 1998)
-+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-+ gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-+- Fix a deflate bug occurring only with compression level 0 (thanks to
-+ Andy Buckler for finding this one).
-+- In minigzip, pass transparently also the first byte for .Z files.
-+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-+- check Z_FINISH in inflate (thanks to Marc Schluper)
-+- Implement deflateCopy (thanks to Adam Costello)
-+- make static libraries by default in configure, add --shared option.
-+- move MSDOS or Windows specific files to directory msdos
-+- suppress the notion of partial flush to simplify the interface
-+ (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-+- suppress history buffer provided by application to simplify the interface
-+ (this feature was not implemented anyway in 1.0.4)
-+- next_in and avail_in must be initialized before calling inflateInit or
-+ inflateInit2
-+- add EXPORT in all exported functions (for Windows DLL)
-+- added Makefile.nt (thanks to Stephen Williams)
-+- added the unsupported "contrib" directory:
-+ contrib/asm386/ by Gilles Vollant <info@winimage.com>
-+ 386 asm code replacing longest_match().
-+ contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
-+ A C++ I/O streams interface to the zlib gz* functions
-+ contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
-+ Another C++ I/O streams interface
-+ contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-+ A very simple tar.gz file extractor using zlib
-+ contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
-+ How to use compress(), uncompress() and the gz* functions from VB.
-+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-+ level) in minigzip (thanks to Tom Lane)
-+
-+- use const for rommable constants in deflate
-+- added test for gzseek and gztell in example.c
-+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-+- add undocumented function zError to convert error code to string
-+ (for Tim Smithers)
-+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-+- Use default memcpy for Symantec MSDOS compiler.
-+- Add EXPORT keyword for check_func (needed for Windows DLL)
-+- add current directory to LD_LIBRARY_PATH for "make test"
-+- create also a link for libz.so.1
-+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-+- added -soname for Linux in configure (Chun-Chung Chen,
-+- assign numbers to the exported functions in zlib.def (for Windows DLL)
-+- add advice in zlib.h for best usage of deflateSetDictionary
-+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-+- allow compilation with ANSI keywords only enabled for TurboC in large model
-+- avoid "versionString"[0] (Borland bug)
-+- add NEED_DUMMY_RETURN for Borland
-+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-+- allow compilation with CC
-+- defined STDC for OS/2 (David Charlap)
-+- limit external names to 8 chars for MVS (Thomas Lund)
-+- in minigzip.c, use static buffers only for 16-bit systems
-+- fix suffix check for "minigzip -d foo.gz"
-+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-+- added makelcc.bat for lcc-win32 (Tom St Denis)
-+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-+- check for unistd.h in configure (for off_t)
-+- remove useless check parameter in inflate_blocks_free
-+- avoid useless assignment of s->check to itself in inflate_blocks_new
-+- do not flush twice in gzclose (thanks to Ken Raeburn)
-+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-+- work around buggy fclose on pipes for HP/UX
-+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-+- fix configure if CC is already equal to gcc
-+
-+Changes in 1.0.5 (3 Jan 98)
-+- Fix inflate to terminate gracefully when fed corrupted or invalid data
-+- Use const for rommable constants in inflate
-+- Eliminate memory leaks on error conditions in inflate
-+- Removed some vestigial code in inflate
-+- Update web address in README
-+
-+Changes in 1.0.4 (24 Jul 96)
-+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-+ bit, so the decompressor could decompress all the correct data but went
-+ on to attempt decompressing extra garbage data. This affected minigzip too.
-+- zlibVersion and gzerror return const char* (needed for DLL)
-+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-+- use z_error only for DEBUG (avoid problem with DLLs)
-+
-+Changes in 1.0.3 (2 Jul 96)
-+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-+ small and medium models; this makes the library incompatible with previous
-+ versions for these models. (No effect in large model or on other systems.)
-+- return OK instead of BUF_ERROR if previous deflate call returned with
-+ avail_out as zero but there is nothing to do
-+- added memcmp for non STDC compilers
-+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-+- better check for 16-bit mode MSC (avoids problem with Symantec)
-+
-+Changes in 1.0.2 (23 May 96)
-+- added Windows DLL support
-+- added a function zlibVersion (for the DLL support)
-+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-+- Bytef is define's instead of typedef'd only for Borland C
-+- avoid reading uninitialized memory in example.c
-+- mention in README that the zlib format is now RFC1950
-+- updated Makefile.dj2
-+- added algorithm.doc
-+
-+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
-+- fix array overlay in deflate.c which sometimes caused bad compressed data
-+- fix inflate bug with empty stored block
-+- fix MSDOS medium model which was broken in 0.99
-+- fix deflateParams() which could generated bad compressed data.
-+- Bytef is define'd instead of typedef'ed (work around Borland bug)
-+- added an INDEX file
-+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-+ Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-+- speed up adler32 for modern machines without auto-increment
-+- added -ansi for IRIX in configure
-+- static_init_done in trees.c is an int
-+- define unlink as delete for VMS
-+- fix configure for QNX
-+- add configure branch for SCO and HPUX
-+- avoid many warnings (unused variables, dead assignments, etc...)
-+- no fdopen for BeOS
-+- fix the Watcom fix for 32 bit mode (define FAR as empty)
-+- removed redefinition of Byte for MKWERKS
-+- work around an MWKERKS bug (incorrect merge of all .h files)
-+
-+Changes in 0.99 (27 Jan 96)
-+- allow preset dictionary shared between compressor and decompressor
-+- allow compression level 0 (no compression)
-+- add deflateParams in zlib.h: allow dynamic change of compression level
-+ and compression strategy.
-+- test large buffers and deflateParams in example.c
-+- add optional "configure" to build zlib as a shared library
-+- suppress Makefile.qnx, use configure instead
-+- fixed deflate for 64-bit systems (detected on Cray)
-+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-+- always return Z_BUF_ERROR when deflate() has nothing to do
-+- deflateInit and inflateInit are now macros to allow version checking
-+- prefix all global functions and types with z_ with -DZ_PREFIX
-+- make falloc completely reentrant (inftrees.c)
-+- fixed very unlikely race condition in ct_static_init
-+- free in reverse order of allocation to help memory manager
-+- use zlib-1.0/* instead of zlib/* inside the tar.gz
-+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-+ -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-+- allow gzread on concatenated .gz files
-+- deflateEnd now returns Z_DATA_ERROR if it was premature
-+- deflate is finally (?) fully deterministic (no matches beyond end of input)
-+- Document Z_SYNC_FLUSH
-+- add uninstall in Makefile
-+- Check for __cpluplus in zlib.h
-+- Better test in ct_align for partial flush
-+- avoid harmless warnings for Borland C++
-+- initialize hash_head in deflate.c
-+- avoid warning on fdopen (gzio.c) for HP cc -Aa
-+- include stdlib.h for STDC compilers
-+- include errno.h for Cray
-+- ignore error if ranlib doesn't exist
-+- call ranlib twice for NeXTSTEP
-+- use exec_prefix instead of prefix for libz.a
-+- renamed ct_* as _tr_* to avoid conflict with applications
-+- clear z->msg in inflateInit2 before any error return
-+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-+- in fcalloc, normalize pointer if size > 65520 bytes
-+- don't use special fcalloc for 32 bit Borland C++
-+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-+- use Z_BINARY instead of BINARY
-+- document that gzclose after gzdopen will close the file
-+- allow "a" as mode in gzopen.
-+- fix error checking in gzread
-+- allow skipping .gz extra-field on pipes
-+- added reference to Perl interface in README
-+- put the crc table in FAR data (I dislike more and more the medium model :)
-+- added get_crc_table
-+- added a dimension to all arrays (Borland C can't count).
-+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-+- guard against multiple inclusion of *.h (for precompiled header on Mac)
-+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-+- don't use unsized arrays to avoid silly warnings by Visual C++:
-+ warning C4746: 'inflate_mask' : unsized array treated as '__far'
-+ (what's wrong with far data in far model?).
-+- define enum out of inflate_blocks_state to allow compilation with C++
-+
-+Changes in 0.95 (16 Aug 95)
-+- fix MSDOS small and medium model (now easier to adapt to any compiler)
-+- inlined send_bits
-+- fix the final (:-) bug for deflate with flush (output was correct but
-+ not completely flushed in rare occasions).
-+- default window size is same for compression and decompression
-+ (it's now sufficient to set MAX_WBITS in zconf.h).
-+- voidp -> voidpf and voidnp -> voidp (for consistency with other
-+ typedefs and because voidnp was not near in large model).
-+
-+Changes in 0.94 (13 Aug 95)
-+- support MSDOS medium model
-+- fix deflate with flush (could sometimes generate bad output)
-+- fix deflateReset (zlib header was incorrectly suppressed)
-+- added support for VMS
-+- allow a compression level in gzopen()
-+- gzflush now calls fflush
-+- For deflate with flush, flush even if no more input is provided.
-+- rename libgz.a as libz.a
-+- avoid complex expression in infcodes.c triggering Turbo C bug
-+- work around a problem with gcc on Alpha (in INSERT_STRING)
-+- don't use inline functions (problem with some gcc versions)
-+- allow renaming of Byte, uInt, etc... with #define.
-+- avoid warning about (unused) pointer before start of array in deflate.c
-+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-+- avoid reserved word 'new' in trees.c
-+
-+Changes in 0.93 (25 June 95)
-+- temporarily disable inline functions
-+- make deflate deterministic
-+- give enough lookahead for PARTIAL_FLUSH
-+- Set binary mode for stdin/stdout in minigzip.c for OS/2
-+- don't even use signed char in inflate (not portable enough)
-+- fix inflate memory leak for segmented architectures
-+
-+Changes in 0.92 (3 May 95)
-+- don't assume that char is signed (problem on SGI)
-+- Clear bit buffer when starting a stored block
-+- no memcpy on Pyramid
-+- suppressed inftest.c
-+- optimized fill_window, put longest_match inline for gcc
-+- optimized inflate on stored blocks.
-+- untabify all sources to simplify patches
-+
-+Changes in 0.91 (2 May 95)
-+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-+- Document the memory requirements in zconf.h
-+- added "make install"
-+- fix sync search logic in inflateSync
-+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-+- after inflateSync, don't scare people with just "lo world"
-+- added support for DJGPP
-+
-+Changes in 0.9 (1 May 95)
-+- don't assume that zalloc clears the allocated memory (the TurboC bug
-+ was Mark's bug after all :)
-+- let again gzread copy uncompressed data unchanged (was working in 0.71)
-+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-+- added a test of inflateSync in example.c
-+- moved MAX_WBITS to zconf.h because users might want to change that.
-+- document explicitly that zalloc(64K) on MSDOS must return a normalized
-+ pointer (zero offset)
-+- added Makefiles for Microsoft C, Turbo C, Borland C++
-+- faster crc32()
-+
-+Changes in 0.8 (29 April 95)
-+- added fast inflate (inffast.c)
-+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-+ is incompatible with previous versions of zlib which returned Z_OK.
-+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-+ (actually that was not a compiler bug, see 0.81 above)
-+- gzread no longer reads one extra byte in certain cases
-+- In gzio destroy(), don't reference a freed structure
-+- avoid many warnings for MSDOS
-+- avoid the ERROR symbol which is used by MS Windows
-+
-+Changes in 0.71 (14 April 95)
-+- Fixed more MSDOS compilation problems :( There is still a bug with
-+ TurboC large model.
-+
-+Changes in 0.7 (14 April 95)
-+- Added full inflate support.
-+- Simplified the crc32() interface. The pre- and post-conditioning
-+ (one's complement) is now done inside crc32(). WARNING: this is
-+ incompatible with previous versions; see zlib.h for the new usage.
-+
-+Changes in 0.61 (12 April 95)
-+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-+
-+Changes in 0.6 (11 April 95)
-+- added minigzip.c
-+- added gzdopen to reopen a file descriptor as gzFile
-+- added transparent reading of non-gziped files in gzread.
-+- fixed bug in gzread (don't read crc as data)
-+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-+- don't allocate big arrays in the stack (for MSDOS)
-+- fix some MSDOS compilation problems
-+
-+Changes in 0.5:
-+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-+ not yet Z_FULL_FLUSH.
-+- support decompression but only in a single step (forced Z_FINISH)
-+- added opaque object for zalloc and zfree.
-+- added deflateReset and inflateReset
-+- added a variable zlib_version for consistency checking.
-+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-+ Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-+
-+Changes in 0.4:
-+- avoid "zip" everywhere, use zlib instead of ziplib.
-+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-+ if compression method == 8.
-+- added adler32 and crc32
-+- renamed deflateOptions as deflateInit2, call one or the other but not both
-+- added the method parameter for deflateInit2.
-+- added inflateInit2
-+- simplied considerably deflateInit and inflateInit by not supporting
-+ user-provided history buffer. This is supported only in deflateInit2
-+ and inflateInit2.
-+
-+Changes in 0.3:
-+- prefix all macro names with Z_
-+- use Z_FINISH instead of deflateEnd to finish compression.
-+- added Z_HUFFMAN_ONLY
-+- added gzerror()
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/README Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,115 @@
-+ZLIB DATA COMPRESSION LIBRARY
-+
-+zlib 1.2.8 is a general purpose data compression library. All the code is
-+thread safe. The data format used by the zlib library is described by RFCs
-+(Request for Comments) 1950 to 1952 in the files
-+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
-+rfc1952 (gzip format).
-+
-+All functions of the compression library are documented in the file zlib.h
-+(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
-+of the library is given in the file test/example.c which also tests that
-+the library is working correctly. Another example is given in the file
-+test/minigzip.c. The compression library itself is composed of all source
-+files in the root directory.
-+
-+To compile all files and run the test program, follow the instructions given at
-+the top of Makefile.in. In short "./configure; make test", and if that goes
-+well, "make install" should work for most flavors of Unix. For Windows, use
-+one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use
-+make_vms.com.
-+
-+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-+<info@winimage.com> for the Windows DLL version. The zlib home page is
-+http://zlib.net/ . Before reporting a problem, please check this site to
-+verify that you have the latest version of zlib; otherwise get the latest
-+version and check whether the problem still exists or not.
-+
-+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
-+
-+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
-+issue of Dr. Dobb's Journal; a copy of the article is available at
-+http://marknelson.us/1997/01/01/zlib-engine/ .
-+
-+The changes made in version 1.2.8 are documented in the file ChangeLog.
-+
-+Unsupported third party contributions are provided in directory contrib/ .
-+
-+zlib is available in Java using the java.util.zip package, documented at
-+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
-+
-+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
-+at CPAN (Comprehensive Perl Archive Network) sites, including
-+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
-+
-+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-+available in Python 1.5 and later versions, see
-+http://docs.python.org/library/zlib.html .
-+
-+zlib is built into tcl: http://wiki.tcl.tk/4610 .
-+
-+An experimental package to read and write files in .zip format, written on top
-+of zlib by Gilles Vollant <info@winimage.com>, is available in the
-+contrib/minizip directory of zlib.
-+
-+
-+Notes for some targets:
-+
-+- For Windows DLL versions, please see win32/DLL_FAQ.txt
-+
-+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-+ -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-+ compiler flag). The compiler bug has been reported to SGI.
-+
-+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-+ when compiled with cc.
-+
-+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-+ necessary to get gzprintf working correctly. This is done by configure.
-+
-+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-+ other compilers. Use "make test" to check your compiler.
-+
-+- gzdopen is not supported on RISCOS or BEOS.
-+
-+- For PalmOs, see http://palmzlib.sourceforge.net/
-+
-+
-+Acknowledgments:
-+
-+ The deflate format used by zlib was defined by Phil Katz. The deflate and
-+ zlib specifications were written by L. Peter Deutsch. Thanks to all the
-+ people who reported problems and suggested various improvements in zlib; they
-+ are too numerous to cite here.
-+
-+Copyright notice:
-+
-+ (C) 1995-2013 Jean-loup Gailly and Mark Adler
-+
-+ This software is provided 'as-is', without any express or implied
-+ warranty. In no event will the authors be held liable for any damages
-+ arising from the use of this software.
-+
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+
-+ 1. The origin of this software must not be misrepresented; you must not
-+ claim that you wrote the original software. If you use this software
-+ in a product, an acknowledgment in the product documentation would be
-+ appreciated but is not required.
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+ misrepresented as being the original software.
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+ Jean-loup Gailly Mark Adler
-+ jloup@gzip.org madler@alumni.caltech.edu
-+
-+If you use the zlib library in a product, we would appreciate *not* receiving
-+lengthy legal documents to sign. The sources are provided for free but without
-+warranty of any kind. The library has been entirely written by Jean-loup
-+Gailly and Mark Adler; it does not include third-party code.
-+
-+If you redistribute modified sources, we would appreciate that you include in
-+the file ChangeLog history information documenting your changes. Please read
-+the FAQ for more information on the distribution of modified source versions.
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/compress.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,104 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* compress.c -- compress a memory buffer
-+ * Copyright (C) 1995-2005 Jean-loup Gailly.
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#define ZLIB_INTERNAL
-+#include "zlib.h"
-+
-+/* ===========================================================================
-+ Compresses the source buffer into the destination buffer. The level
-+ parameter has the same meaning as in deflateInit. sourceLen is the byte
-+ length of the source buffer. Upon entry, destLen is the total size of the
-+ destination buffer, which must be at least 0.1% larger than sourceLen plus
-+ 12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-+
-+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-+ Z_STREAM_ERROR if the level parameter is invalid.
-+*/
-+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-+ Bytef *dest;
-+ uLongf *destLen;
-+ const Bytef *source;
-+ uLong sourceLen;
-+ int level;
-+{
-+ z_stream stream;
-+ int err;
-+
-+ stream.next_in = (z_const Bytef *)source;
-+ stream.avail_in = (uInt)sourceLen;
-+#ifdef MAXSEG_64K
-+ /* Check for source > 64K on 16-bit machine: */
-+ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-+#endif
-+ stream.next_out = dest;
-+ stream.avail_out = (uInt)*destLen;
-+ if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-+
-+ stream.zalloc = (alloc_func)0;
-+ stream.zfree = (free_func)0;
-+ stream.opaque = (voidpf)0;
-+
-+ err = deflateInit(&stream, level);
-+ if (err != Z_OK) return err;
-+
-+ err = deflate(&stream, Z_FINISH);
-+ if (err != Z_STREAM_END) {
-+ deflateEnd(&stream);
-+ return err == Z_OK ? Z_BUF_ERROR : err;
-+ }
-+ *destLen = stream.total_out;
-+
-+ err = deflateEnd(&stream);
-+ return err;
-+}
-+
-+/* ===========================================================================
-+ */
-+int ZEXPORT compress (dest, destLen, source, sourceLen)
-+ Bytef *dest;
-+ uLongf *destLen;
-+ const Bytef *source;
-+ uLong sourceLen;
-+{
-+ return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-+}
-+
-+/* ===========================================================================
-+ If the default memLevel or windowBits for deflateInit() is changed, then
-+ this function needs to be updated.
-+ */
-+uLong ZEXPORT compressBound (sourceLen)
-+ uLong sourceLen;
-+{
-+ return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-+ (sourceLen >> 25) + 13;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,465 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* crc32.h -- tables for rapid CRC calculation
-+ * Generated automatically by crc32.c
-+ */
-+
-+local const z_crc_t FAR crc_table[TBLS][256] =
-+{
-+ {
-+ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-+ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-+ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-+ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-+ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-+ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-+ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-+ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-+ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-+ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-+ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-+ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-+ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-+ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-+ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-+ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-+ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-+ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-+ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-+ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-+ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-+ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-+ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-+ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-+ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-+ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-+ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-+ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-+ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-+ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-+ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-+ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-+ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-+ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-+ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-+ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-+ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-+ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-+ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-+ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-+ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-+ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-+ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-+ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-+ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-+ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-+ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-+ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-+ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-+ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-+ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-+ 0x2d02ef8dUL
-+#ifdef BYFOUR
-+ },
-+ {
-+ 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-+ 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-+ 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-+ 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-+ 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-+ 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-+ 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-+ 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-+ 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-+ 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-+ 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-+ 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-+ 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-+ 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-+ 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-+ 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-+ 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-+ 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-+ 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-+ 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-+ 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-+ 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-+ 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-+ 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-+ 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-+ 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-+ 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-+ 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-+ 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-+ 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-+ 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-+ 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-+ 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-+ 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-+ 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-+ 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-+ 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-+ 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-+ 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-+ 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-+ 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-+ 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-+ 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-+ 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-+ 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-+ 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-+ 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-+ 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-+ 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-+ 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-+ 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-+ 0x9324fd72UL
-+ },
-+ {
-+ 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-+ 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-+ 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-+ 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-+ 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-+ 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-+ 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-+ 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-+ 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-+ 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-+ 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-+ 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-+ 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-+ 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-+ 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-+ 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-+ 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-+ 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-+ 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-+ 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-+ 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-+ 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-+ 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-+ 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-+ 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-+ 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-+ 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-+ 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-+ 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-+ 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-+ 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-+ 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-+ 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-+ 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-+ 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-+ 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-+ 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-+ 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-+ 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-+ 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-+ 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-+ 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-+ 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-+ 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-+ 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-+ 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-+ 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-+ 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-+ 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-+ 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-+ 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-+ 0xbe9834edUL
-+ },
-+ {
-+ 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-+ 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-+ 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-+ 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-+ 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-+ 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-+ 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-+ 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-+ 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-+ 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-+ 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-+ 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-+ 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-+ 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-+ 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-+ 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-+ 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-+ 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-+ 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-+ 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-+ 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-+ 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-+ 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-+ 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-+ 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-+ 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-+ 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-+ 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-+ 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-+ 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-+ 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-+ 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-+ 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-+ 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-+ 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-+ 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-+ 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-+ 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-+ 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-+ 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-+ 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-+ 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-+ 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-+ 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-+ 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-+ 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-+ 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-+ 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-+ 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-+ 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-+ 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-+ 0xde0506f1UL
-+ },
-+ {
-+ 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-+ 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-+ 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-+ 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-+ 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-+ 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-+ 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-+ 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-+ 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-+ 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-+ 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-+ 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-+ 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-+ 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-+ 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-+ 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-+ 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-+ 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-+ 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-+ 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-+ 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-+ 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-+ 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-+ 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-+ 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-+ 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-+ 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-+ 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-+ 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-+ 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-+ 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-+ 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-+ 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-+ 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-+ 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-+ 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-+ 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-+ 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-+ 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-+ 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-+ 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-+ 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-+ 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-+ 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-+ 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-+ 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-+ 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-+ 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-+ 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-+ 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-+ 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-+ 0x8def022dUL
-+ },
-+ {
-+ 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-+ 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-+ 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-+ 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-+ 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-+ 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-+ 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-+ 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-+ 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-+ 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-+ 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-+ 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-+ 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-+ 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-+ 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-+ 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-+ 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-+ 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-+ 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-+ 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-+ 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-+ 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-+ 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-+ 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-+ 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-+ 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-+ 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-+ 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-+ 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-+ 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-+ 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-+ 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-+ 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-+ 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-+ 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-+ 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-+ 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-+ 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-+ 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-+ 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-+ 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-+ 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-+ 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-+ 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-+ 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-+ 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-+ 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-+ 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-+ 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-+ 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-+ 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-+ 0x72fd2493UL
-+ },
-+ {
-+ 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-+ 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-+ 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-+ 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-+ 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-+ 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-+ 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-+ 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-+ 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-+ 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-+ 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-+ 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-+ 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-+ 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-+ 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-+ 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-+ 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-+ 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-+ 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-+ 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-+ 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-+ 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-+ 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-+ 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-+ 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-+ 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-+ 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-+ 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-+ 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-+ 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-+ 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-+ 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-+ 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-+ 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-+ 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-+ 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-+ 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-+ 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-+ 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-+ 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-+ 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-+ 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-+ 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-+ 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-+ 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-+ 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-+ 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-+ 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-+ 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-+ 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-+ 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-+ 0xed3498beUL
-+ },
-+ {
-+ 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-+ 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-+ 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-+ 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-+ 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-+ 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-+ 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-+ 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-+ 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-+ 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-+ 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-+ 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-+ 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-+ 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-+ 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-+ 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-+ 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-+ 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-+ 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-+ 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-+ 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-+ 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-+ 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-+ 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-+ 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-+ 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-+ 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-+ 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-+ 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-+ 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-+ 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-+ 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-+ 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-+ 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-+ 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-+ 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-+ 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-+ 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-+ 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-+ 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-+ 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-+ 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-+ 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-+ 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-+ 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-+ 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-+ 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-+ 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-+ 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-+ 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-+ 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-+ 0xf10605deUL
-+#endif
-+ }
-+};
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/deflate.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,1991 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* deflate.c -- compress data using the deflation algorithm
-+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/*
-+ * ALGORITHM
-+ *
-+ * The "deflation" process depends on being able to identify portions
-+ * of the input text which are identical to earlier input (within a
-+ * sliding window trailing behind the input currently being processed).
-+ *
-+ * The most straightforward technique turns out to be the fastest for
-+ * most input files: try all possible matches and select the longest.
-+ * The key feature of this algorithm is that insertions into the string
-+ * dictionary are very simple and thus fast, and deletions are avoided
-+ * completely. Insertions are performed at each input character, whereas
-+ * string matches are performed only when the previous match ends. So it
-+ * is preferable to spend more time in matches to allow very fast string
-+ * insertions and avoid deletions. The matching algorithm for small
-+ * strings is inspired from that of Rabin & Karp. A brute force approach
-+ * is used to find longer strings when a small match has been found.
-+ * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
-+ * (by Leonid Broukhis).
-+ * A previous version of this file used a more sophisticated algorithm
-+ * (by Fiala and Greene) which is guaranteed to run in linear amortized
-+ * time, but has a larger average cost, uses more memory and is patented.
-+ * However the F&G algorithm may be faster for some highly redundant
-+ * files if the parameter max_chain_length (described below) is too large.
-+ *
-+ * ACKNOWLEDGEMENTS
-+ *
-+ * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
-+ * I found it in 'freeze' written by Leonid Broukhis.
-+ * Thanks to many people for bug reports and testing.
-+ *
-+ * REFERENCES
-+ *
-+ * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
-+ * Available in http://tools.ietf.org/html/rfc1951
-+ *
-+ * A description of the Rabin and Karp algorithm is given in the book
-+ * "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
-+ *
-+ * Fiala,E.R., and Greene,D.H.
-+ * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
-+ *
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#include "deflate.h"
-+
-+const char deflate_copyright[] =
-+ " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
-+/*
-+ If you use the zlib library in a product, an acknowledgment is welcome
-+ in the documentation of your product. If for some reason you cannot
-+ include such an acknowledgment, I would appreciate that you keep this
-+ copyright string in the executable of your product.
-+ */
-+
-+/* ===========================================================================
-+ * Function prototypes.
-+ */
-+typedef enum {
-+ need_more, /* block not completed, need more input or more output */
-+ block_done, /* block flush performed */
-+ finish_started, /* finish started, need only more output at next deflate */
-+ finish_done /* finish done, accept no more input or output */
-+} block_state;
-+
-+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-+/* Compression function. Returns the block state after the call. */
-+
-+local void fill_window OF((deflate_state *s));
-+local block_state deflate_stored OF((deflate_state *s, int flush));
-+local block_state deflate_fast OF((deflate_state *s, int flush));
-+#ifndef FASTEST
-+local block_state deflate_slow OF((deflate_state *s, int flush));
-+#endif
-+local block_state deflate_rle OF((deflate_state *s, int flush));
-+local block_state deflate_huff OF((deflate_state *s, int flush));
-+local void lm_init OF((deflate_state *s));
-+local void putShortMSB OF((deflate_state *s, uInt b));
-+local void flush_pending OF((z_streamp strm));
-+local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-+#ifdef ASMV
-+ void match_init OF((void)); /* asm code initialization */
-+ uInt longest_match OF((deflate_state *s, IPos cur_match));
-+#else
-+local uInt longest_match OF((deflate_state *s, IPos cur_match));
-+#endif
-+
-+#ifdef DEBUG
-+local void check_match OF((deflate_state *s, IPos start, IPos match,
-+ int length));
-+#endif
-+
-+/* ===========================================================================
-+ * Local data
-+ */
-+
-+#define NIL 0
-+/* Tail of hash chains */
-+
-+#ifndef TOO_FAR
-+# define TOO_FAR 4096
-+#endif
-+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-+
-+/* Values for max_lazy_match, good_match and max_chain_length, depending on
-+ * the desired pack level (0..9). The values given below have been tuned to
-+ * exclude worst case performance for pathological files. Better values may be
-+ * found for specific files.
-+ */
-+typedef struct config_s {
-+ ush good_length; /* reduce lazy search above this match length */
-+ ush max_lazy; /* do not perform lazy search above this match length */
-+ ush nice_length; /* quit search above this match length */
-+ ush max_chain;
-+ compress_func func;
-+} config;
-+
-+#ifdef FASTEST
-+local const config configuration_table[2] = {
-+/* good lazy nice chain */
-+/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
-+/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */
-+#else
-+local const config configuration_table[10] = {
-+/* good lazy nice chain */
-+/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
-+/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */
-+/* 2 */ {4, 5, 16, 8, deflate_fast},
-+/* 3 */ {4, 6, 32, 32, deflate_fast},
-+
-+/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */
-+/* 5 */ {8, 16, 32, 32, deflate_slow},
-+/* 6 */ {8, 16, 128, 128, deflate_slow},
-+/* 7 */ {8, 32, 128, 256, deflate_slow},
-+/* 8 */ {32, 128, 258, 1024, deflate_slow},
-+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-+#endif
-+
-+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
-+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
-+ * meaning.
-+ */
-+
-+#define EQUAL 0
-+/* result of memcmp for equal strings */
-+
-+#ifndef NO_DUMMY_DECL
-+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-+#endif
-+
-+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
-+
-+/* ===========================================================================
-+ * Update a hash value with the given input byte
-+ * IN assertion: all calls to to UPDATE_HASH are made with consecutive
-+ * input characters, so that a running hash key can be computed from the
-+ * previous key instead of complete recalculation each time.
-+ */
-+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-+
-+
-+/* ===========================================================================
-+ * Insert string str in the dictionary and set match_head to the previous head
-+ * of the hash chain (the most recent string with same hash key). Return
-+ * the previous length of the hash chain.
-+ * If this file is compiled with -DFASTEST, the compression level is forced
-+ * to 1, and no hash chains are maintained.
-+ * IN assertion: all calls to to INSERT_STRING are made with consecutive
-+ * input characters and the first MIN_MATCH bytes of str are valid
-+ * (except for the last MIN_MATCH-1 bytes of the input file).
-+ */
-+#ifdef FASTEST
-+#define INSERT_STRING(s, str, match_head) \
-+ (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-+ match_head = s->head[s->ins_h], \
-+ s->head[s->ins_h] = (Pos)(str))
-+#else
-+#define INSERT_STRING(s, str, match_head) \
-+ (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-+ match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-+ s->head[s->ins_h] = (Pos)(str))
-+#endif
-+
-+/* ===========================================================================
-+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
-+ * prev[] will be initialized on the fly.
-+ */
-+#define CLEAR_HASH(s) \
-+ s->head[s->hash_size-1] = NIL; \
-+ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateInit_(strm, level, version, stream_size)
-+ z_streamp strm;
-+ int level;
-+ const char *version;
-+ int stream_size;
-+{
-+ return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-+ Z_DEFAULT_STRATEGY, version, stream_size);
-+ /* To do: ignore strm->next_in if we use it as window */
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-+ version, stream_size)
-+ z_streamp strm;
-+ int level;
-+ int method;
-+ int windowBits;
-+ int memLevel;
-+ int strategy;
-+ const char *version;
-+ int stream_size;
-+{
-+ deflate_state *s;
-+ int wrap = 1;
-+ static const char my_version[] = ZLIB_VERSION;
-+
-+ ushf *overlay;
-+ /* We overlay pending_buf and d_buf+l_buf. This works since the average
-+ * output size for (length,distance) codes is <= 24 bits.
-+ */
-+
-+ if (version == Z_NULL || version[0] != my_version[0] ||
-+ stream_size != sizeof(z_stream)) {
-+ return Z_VERSION_ERROR;
-+ }
-+ if (strm == Z_NULL) return Z_STREAM_ERROR;
-+
-+ strm->msg = Z_NULL;
-+ if (strm->zalloc == (alloc_func)0) {
-+#ifdef Z_SOLO
-+ return Z_STREAM_ERROR;
-+#else
-+ strm->zalloc = zcalloc;
-+ strm->opaque = (voidpf)0;
-+#endif
-+ }
-+ if (strm->zfree == (free_func)0)
-+#ifdef Z_SOLO
-+ return Z_STREAM_ERROR;
-+#else
-+ strm->zfree = zcfree;
-+#endif
-+
-+#ifdef FASTEST
-+ if (level != 0) level = 1;
-+#else
-+ if (level == Z_DEFAULT_COMPRESSION) level = 6;
-+#endif
-+
-+ if (windowBits < 0) { /* suppress zlib wrapper */
-+ wrap = 0;
-+ windowBits = -windowBits;
-+ }
-+#ifdef GZIP
-+ else if (windowBits > 15) {
-+ wrap = 2; /* write gzip wrapper instead */
-+ windowBits -= 16;
-+ }
-+#endif
-+ if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-+ windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-+ strategy < 0 || strategy > Z_FIXED) {
-+ return Z_STREAM_ERROR;
-+ }
-+ if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */
-+ s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-+ if (s == Z_NULL) return Z_MEM_ERROR;
-+ strm->state = (struct internal_state FAR *)s;
-+ s->strm = strm;
-+
-+ s->wrap = wrap;
-+ s->gzhead = Z_NULL;
-+ s->w_bits = windowBits;
-+ s->w_size = 1 << s->w_bits;
-+ s->w_mask = s->w_size - 1;
-+
-+ s->hash_bits = memLevel + 7;
-+ s->hash_size = 1 << s->hash_bits;
-+ s->hash_mask = s->hash_size - 1;
-+ s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-+
-+ s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-+ s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
-+ s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
-+
-+ s->high_water = 0; /* nothing written to s->window yet */
-+
-+ s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-+
-+ overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-+ s->pending_buf = (uchf *) overlay;
-+ s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-+
-+ if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-+ s->pending_buf == Z_NULL) {
-+ s->status = FINISH_STATE;
-+ strm->msg = ERR_MSG(Z_MEM_ERROR);
-+ deflateEnd (strm);
-+ return Z_MEM_ERROR;
-+ }
-+ s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-+ s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-+
-+ s->level = level;
-+ s->strategy = strategy;
-+ s->method = (Byte)method;
-+
-+ return deflateReset(strm);
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-+ z_streamp strm;
-+ const Bytef *dictionary;
-+ uInt dictLength;
-+{
-+ deflate_state *s;
-+ uInt str, n;
-+ int wrap;
-+ unsigned avail;
-+ z_const unsigned char *next;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
-+ return Z_STREAM_ERROR;
-+ s = strm->state;
-+ wrap = s->wrap;
-+ if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-+ return Z_STREAM_ERROR;
-+
-+ /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-+ if (wrap == 1)
-+ strm->adler = adler32(strm->adler, dictionary, dictLength);
-+ s->wrap = 0; /* avoid computing Adler-32 in read_buf */
-+
-+ /* if dictionary would fill window, just replace the history */
-+ if (dictLength >= s->w_size) {
-+ if (wrap == 0) { /* already empty otherwise */
-+ CLEAR_HASH(s);
-+ s->strstart = 0;
-+ s->block_start = 0L;
-+ s->insert = 0;
-+ }
-+ dictionary += dictLength - s->w_size; /* use the tail */
-+ dictLength = s->w_size;
-+ }
-+
-+ /* insert dictionary into window and hash */
-+ avail = strm->avail_in;
-+ next = strm->next_in;
-+ strm->avail_in = dictLength;
-+ strm->next_in = (z_const Bytef *)dictionary;
-+ fill_window(s);
-+ while (s->lookahead >= MIN_MATCH) {
-+ str = s->strstart;
-+ n = s->lookahead - (MIN_MATCH-1);
-+ do {
-+ UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-+#ifndef FASTEST
-+ s->prev[str & s->w_mask] = s->head[s->ins_h];
-+#endif
-+ s->head[s->ins_h] = (Pos)str;
-+ str++;
-+ } while (--n);
-+ s->strstart = str;
-+ s->lookahead = MIN_MATCH-1;
-+ fill_window(s);
-+ }
-+ s->strstart += s->lookahead;
-+ s->block_start = (long)s->strstart;
-+ s->insert = s->lookahead;
-+ s->lookahead = 0;
-+ s->match_length = s->prev_length = MIN_MATCH-1;
-+ s->match_available = 0;
-+ strm->next_in = next;
-+ strm->avail_in = avail;
-+ s->wrap = wrap;
-+ return Z_OK;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateResetKeep (strm)
-+ z_streamp strm;
-+{
-+ deflate_state *s;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL ||
-+ strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-+ return Z_STREAM_ERROR;
-+ }
-+
-+ strm->total_in = strm->total_out = 0;
-+ strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-+ strm->data_type = Z_UNKNOWN;
-+
-+ s = (deflate_state *)strm->state;
-+ s->pending = 0;
-+ s->pending_out = s->pending_buf;
-+
-+ if (s->wrap < 0) {
-+ s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-+ }
-+ s->status = s->wrap ? INIT_STATE : BUSY_STATE;
-+ strm->adler =
-+#ifdef GZIP
-+ s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-+#endif
-+ adler32(0L, Z_NULL, 0);
-+ s->last_flush = Z_NO_FLUSH;
-+
-+ _tr_init(s);
-+
-+ return Z_OK;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateReset (strm)
-+ z_streamp strm;
-+{
-+ int ret;
-+
-+ ret = deflateResetKeep(strm);
-+ if (ret == Z_OK)
-+ lm_init(strm->state);
-+ return ret;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateSetHeader (strm, head)
-+ z_streamp strm;
-+ gz_headerp head;
-+{
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ if (strm->state->wrap != 2) return Z_STREAM_ERROR;
-+ strm->state->gzhead = head;
-+ return Z_OK;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflatePending (strm, pending, bits)
-+ unsigned *pending;
-+ int *bits;
-+ z_streamp strm;
-+{
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ if (pending != Z_NULL)
-+ *pending = strm->state->pending;
-+ if (bits != Z_NULL)
-+ *bits = strm->state->bi_valid;
-+ return Z_OK;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflatePrime (strm, bits, value)
-+ z_streamp strm;
-+ int bits;
-+ int value;
-+{
-+ deflate_state *s;
-+ int put;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ s = strm->state;
-+ if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-+ return Z_BUF_ERROR;
-+ do {
-+ put = Buf_size - s->bi_valid;
-+ if (put > bits)
-+ put = bits;
-+ s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
-+ s->bi_valid += put;
-+ _tr_flush_bits(s);
-+ value >>= put;
-+ bits -= put;
-+ } while (bits);
-+ return Z_OK;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateParams(strm, level, strategy)
-+ z_streamp strm;
-+ int level;
-+ int strategy;
-+{
-+ deflate_state *s;
-+ compress_func func;
-+ int err = Z_OK;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ s = strm->state;
-+
-+#ifdef FASTEST
-+ if (level != 0) level = 1;
-+#else
-+ if (level == Z_DEFAULT_COMPRESSION) level = 6;
-+#endif
-+ if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-+ return Z_STREAM_ERROR;
-+ }
-+ func = configuration_table[s->level].func;
-+
-+ if ((strategy != s->strategy || func != configuration_table[level].func) &&
-+ strm->total_in != 0) {
-+ /* Flush the last buffer: */
-+ err = deflate(strm, Z_BLOCK);
-+ if (err == Z_BUF_ERROR && s->pending == 0)
-+ err = Z_OK;
-+ }
-+ if (s->level != level) {
-+ s->level = level;
-+ s->max_lazy_match = configuration_table[level].max_lazy;
-+ s->good_match = configuration_table[level].good_length;
-+ s->nice_match = configuration_table[level].nice_length;
-+ s->max_chain_length = configuration_table[level].max_chain;
-+ }
-+ s->strategy = strategy;
-+ return err;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-+ z_streamp strm;
-+ int good_length;
-+ int max_lazy;
-+ int nice_length;
-+ int max_chain;
-+{
-+ deflate_state *s;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ s = strm->state;
-+ s->good_match = good_length;
-+ s->max_lazy_match = max_lazy;
-+ s->nice_match = nice_length;
-+ s->max_chain_length = max_chain;
-+ return Z_OK;
-+}
-+
-+/* =========================================================================
-+ * For the default windowBits of 15 and memLevel of 8, this function returns
-+ * a close to exact, as well as small, upper bound on the compressed size.
-+ * They are coded as constants here for a reason--if the #define's are
-+ * changed, then this function needs to be changed as well. The return
-+ * value for 15 and 8 only works for those exact settings.
-+ *
-+ * For any setting other than those defaults for windowBits and memLevel,
-+ * the value returned is a conservative worst case for the maximum expansion
-+ * resulting from using fixed blocks instead of stored blocks, which deflate
-+ * can emit on compressed data for some combinations of the parameters.
-+ *
-+ * This function could be more sophisticated to provide closer upper bounds for
-+ * every combination of windowBits and memLevel. But even the conservative
-+ * upper bound of about 14% expansion does not seem onerous for output buffer
-+ * allocation.
-+ */
-+uLong ZEXPORT deflateBound(strm, sourceLen)
-+ z_streamp strm;
-+ uLong sourceLen;
-+{
-+ deflate_state *s;
-+ uLong complen, wraplen;
-+ Bytef *str;
-+
-+ /* conservative upper bound for compressed data */
-+ complen = sourceLen +
-+ ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-+
-+ /* if can't get parameters, return conservative bound plus zlib wrapper */
-+ if (strm == Z_NULL || strm->state == Z_NULL)
-+ return complen + 6;
-+
-+ /* compute wrapper length */
-+ s = strm->state;
-+ switch (s->wrap) {
-+ case 0: /* raw deflate */
-+ wraplen = 0;
-+ break;
-+ case 1: /* zlib wrapper */
-+ wraplen = 6 + (s->strstart ? 4 : 0);
-+ break;
-+ case 2: /* gzip wrapper */
-+ wraplen = 18;
-+ if (s->gzhead != Z_NULL) { /* user-supplied gzip header */
-+ if (s->gzhead->extra != Z_NULL)
-+ wraplen += 2 + s->gzhead->extra_len;
-+ str = s->gzhead->name;
-+ if (str != Z_NULL)
-+ do {
-+ wraplen++;
-+ } while (*str++);
-+ str = s->gzhead->comment;
-+ if (str != Z_NULL)
-+ do {
-+ wraplen++;
-+ } while (*str++);
-+ if (s->gzhead->hcrc)
-+ wraplen += 2;
-+ }
-+ break;
-+ default: /* for compiler happiness */
-+ wraplen = 6;
-+ }
-+
-+ /* if not default parameters, return conservative bound */
-+ if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-+ return complen + wraplen;
-+
-+ /* default settings: return tight bound for that case */
-+ return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-+ (sourceLen >> 25) + 13 - 6 + wraplen;
-+}
-+
-+/* =========================================================================
-+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
-+ * IN assertion: the stream state is correct and there is enough room in
-+ * pending_buf.
-+ */
-+local void putShortMSB (s, b)
-+ deflate_state *s;
-+ uInt b;
-+{
-+ put_byte(s, (Byte)(b >> 8));
-+ put_byte(s, (Byte)(b & 0xff));
-+}
-+
-+/* =========================================================================
-+ * Flush as much pending output as possible. All deflate() output goes
-+ * through this function so some applications may wish to modify it
-+ * to avoid allocating a large strm->next_out buffer and copying into it.
-+ * (See also read_buf()).
-+ */
-+local void flush_pending(strm)
-+ z_streamp strm;
-+{
-+ unsigned len;
-+ deflate_state *s = strm->state;
-+
-+ _tr_flush_bits(s);
-+ len = s->pending;
-+ if (len > strm->avail_out) len = strm->avail_out;
-+ if (len == 0) return;
-+
-+ zmemcpy(strm->next_out, s->pending_out, len);
-+ strm->next_out += len;
-+ s->pending_out += len;
-+ strm->total_out += len;
-+ strm->avail_out -= len;
-+ s->pending -= len;
-+ if (s->pending == 0) {
-+ s->pending_out = s->pending_buf;
-+ }
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflate (strm, flush)
-+ z_streamp strm;
-+ int flush;
-+{
-+ int old_flush; /* value of flush param for previous deflate call */
-+ deflate_state *s;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL ||
-+ flush > Z_BLOCK || flush < 0) {
-+ return Z_STREAM_ERROR;
-+ }
-+ s = strm->state;
-+
-+ if (strm->next_out == Z_NULL ||
-+ (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-+ (s->status == FINISH_STATE && flush != Z_FINISH)) {
-+ ERR_RETURN(strm, Z_STREAM_ERROR);
-+ }
-+ if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-+
-+ s->strm = strm; /* just in case */
-+ old_flush = s->last_flush;
-+ s->last_flush = flush;
-+
-+ /* Write the header */
-+ if (s->status == INIT_STATE) {
-+#ifdef GZIP
-+ if (s->wrap == 2) {
-+ strm->adler = crc32(0L, Z_NULL, 0);
-+ put_byte(s, 31);
-+ put_byte(s, 139);
-+ put_byte(s, 8);
-+ if (s->gzhead == Z_NULL) {
-+ put_byte(s, 0);
-+ put_byte(s, 0);
-+ put_byte(s, 0);
-+ put_byte(s, 0);
-+ put_byte(s, 0);
-+ put_byte(s, s->level == 9 ? 2 :
-+ (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-+ 4 : 0));
-+ put_byte(s, OS_CODE);
-+ s->status = BUSY_STATE;
-+ }
-+ else {
-+ put_byte(s, (s->gzhead->text ? 1 : 0) +
-+ (s->gzhead->hcrc ? 2 : 0) +
-+ (s->gzhead->extra == Z_NULL ? 0 : 4) +
-+ (s->gzhead->name == Z_NULL ? 0 : 8) +
-+ (s->gzhead->comment == Z_NULL ? 0 : 16)
-+ );
-+ put_byte(s, (Byte)(s->gzhead->time & 0xff));
-+ put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-+ put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-+ put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-+ put_byte(s, s->level == 9 ? 2 :
-+ (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-+ 4 : 0));
-+ put_byte(s, s->gzhead->os & 0xff);
-+ if (s->gzhead->extra != Z_NULL) {
-+ put_byte(s, s->gzhead->extra_len & 0xff);
-+ put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-+ }
-+ if (s->gzhead->hcrc)
-+ strm->adler = crc32(strm->adler, s->pending_buf,
-+ s->pending);
-+ s->gzindex = 0;
-+ s->status = EXTRA_STATE;
-+ }
-+ }
-+ else
-+#endif
-+ {
-+ uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-+ uInt level_flags;
-+
-+ if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-+ level_flags = 0;
-+ else if (s->level < 6)
-+ level_flags = 1;
-+ else if (s->level == 6)
-+ level_flags = 2;
-+ else
-+ level_flags = 3;
-+ header |= (level_flags << 6);
-+ if (s->strstart != 0) header |= PRESET_DICT;
-+ header += 31 - (header % 31);
-+
-+ s->status = BUSY_STATE;
-+ putShortMSB(s, header);
-+
-+ /* Save the adler32 of the preset dictionary: */
-+ if (s->strstart != 0) {
-+ putShortMSB(s, (uInt)(strm->adler >> 16));
-+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
-+ }
-+ strm->adler = adler32(0L, Z_NULL, 0);
-+ }
-+ }
-+#ifdef GZIP
-+ if (s->status == EXTRA_STATE) {
-+ if (s->gzhead->extra != Z_NULL) {
-+ uInt beg = s->pending; /* start of bytes to update crc */
-+
-+ while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-+ if (s->pending == s->pending_buf_size) {
-+ if (s->gzhead->hcrc && s->pending > beg)
-+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
-+ s->pending - beg);
-+ flush_pending(strm);
-+ beg = s->pending;
-+ if (s->pending == s->pending_buf_size)
-+ break;
-+ }
-+ put_byte(s, s->gzhead->extra[s->gzindex]);
-+ s->gzindex++;
-+ }
-+ if (s->gzhead->hcrc && s->pending > beg)
-+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
-+ s->pending - beg);
-+ if (s->gzindex == s->gzhead->extra_len) {
-+ s->gzindex = 0;
-+ s->status = NAME_STATE;
-+ }
-+ }
-+ else
-+ s->status = NAME_STATE;
-+ }
-+ if (s->status == NAME_STATE) {
-+ if (s->gzhead->name != Z_NULL) {
-+ uInt beg = s->pending; /* start of bytes to update crc */
-+ int val;
-+
-+ do {
-+ if (s->pending == s->pending_buf_size) {
-+ if (s->gzhead->hcrc && s->pending > beg)
-+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
-+ s->pending - beg);
-+ flush_pending(strm);
-+ beg = s->pending;
-+ if (s->pending == s->pending_buf_size) {
-+ val = 1;
-+ break;
-+ }
-+ }
-+ val = s->gzhead->name[s->gzindex++];
-+ put_byte(s, val);
-+ } while (val != 0);
-+ if (s->gzhead->hcrc && s->pending > beg)
-+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
-+ s->pending - beg);
-+ if (val == 0) {
-+ s->gzindex = 0;
-+ s->status = COMMENT_STATE;
-+ }
-+ }
-+ else
-+ s->status = COMMENT_STATE;
-+ }
-+ if (s->status == COMMENT_STATE) {
-+ if (s->gzhead->comment != Z_NULL) {
-+ uInt beg = s->pending; /* start of bytes to update crc */
-+ int val;
-+
-+ do {
-+ if (s->pending == s->pending_buf_size) {
-+ if (s->gzhead->hcrc && s->pending > beg)
-+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
-+ s->pending - beg);
-+ flush_pending(strm);
-+ beg = s->pending;
-+ if (s->pending == s->pending_buf_size) {
-+ val = 1;
-+ break;
-+ }
-+ }
-+ val = s->gzhead->comment[s->gzindex++];
-+ put_byte(s, val);
-+ } while (val != 0);
-+ if (s->gzhead->hcrc && s->pending > beg)
-+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
-+ s->pending - beg);
-+ if (val == 0)
-+ s->status = HCRC_STATE;
-+ }
-+ else
-+ s->status = HCRC_STATE;
-+ }
-+ if (s->status == HCRC_STATE) {
-+ if (s->gzhead->hcrc) {
-+ if (s->pending + 2 > s->pending_buf_size)
-+ flush_pending(strm);
-+ if (s->pending + 2 <= s->pending_buf_size) {
-+ put_byte(s, (Byte)(strm->adler & 0xff));
-+ put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-+ strm->adler = crc32(0L, Z_NULL, 0);
-+ s->status = BUSY_STATE;
-+ }
-+ }
-+ else
-+ s->status = BUSY_STATE;
-+ }
-+#endif
-+
-+ /* Flush as much pending output as possible */
-+ if (s->pending != 0) {
-+ flush_pending(strm);
-+ if (strm->avail_out == 0) {
-+ /* Since avail_out is 0, deflate will be called again with
-+ * more output space, but possibly with both pending and
-+ * avail_in equal to zero. There won't be anything to do,
-+ * but this is not an error situation so make sure we
-+ * return OK instead of BUF_ERROR at next call of deflate:
-+ */
-+ s->last_flush = -1;
-+ return Z_OK;
-+ }
-+
-+ /* Make sure there is something to do and avoid duplicate consecutive
-+ * flushes. For repeated and useless calls with Z_FINISH, we keep
-+ * returning Z_STREAM_END instead of Z_BUF_ERROR.
-+ */
-+ } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
-+ flush != Z_FINISH) {
-+ ERR_RETURN(strm, Z_BUF_ERROR);
-+ }
-+
-+ /* User must not provide more input after the first FINISH: */
-+ if (s->status == FINISH_STATE && strm->avail_in != 0) {
-+ ERR_RETURN(strm, Z_BUF_ERROR);
-+ }
-+
-+ /* Start a new block or continue the current one.
-+ */
-+ if (strm->avail_in != 0 || s->lookahead != 0 ||
-+ (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-+ block_state bstate;
-+
-+ bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-+ (s->strategy == Z_RLE ? deflate_rle(s, flush) :
-+ (*(configuration_table[s->level].func))(s, flush));
-+
-+ if (bstate == finish_started || bstate == finish_done) {
-+ s->status = FINISH_STATE;
-+ }
-+ if (bstate == need_more || bstate == finish_started) {
-+ if (strm->avail_out == 0) {
-+ s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-+ }
-+ return Z_OK;
-+ /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-+ * of deflate should use the same flush parameter to make sure
-+ * that the flush is complete. So we don't have to output an
-+ * empty block here, this will be done at next call. This also
-+ * ensures that for a very small output buffer, we emit at most
-+ * one empty block.
-+ */
-+ }
-+ if (bstate == block_done) {
-+ if (flush == Z_PARTIAL_FLUSH) {
-+ _tr_align(s);
-+ } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-+ _tr_stored_block(s, (char*)0, 0L, 0);
-+ /* For a full flush, this empty block will be recognized
-+ * as a special marker by inflate_sync().
-+ */
-+ if (flush == Z_FULL_FLUSH) {
-+ CLEAR_HASH(s); /* forget history */
-+ if (s->lookahead == 0) {
-+ s->strstart = 0;
-+ s->block_start = 0L;
-+ s->insert = 0;
-+ }
-+ }
-+ }
-+ flush_pending(strm);
-+ if (strm->avail_out == 0) {
-+ s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-+ return Z_OK;
-+ }
-+ }
-+ }
-+ Assert(strm->avail_out > 0, "bug2");
-+
-+ if (flush != Z_FINISH) return Z_OK;
-+ if (s->wrap <= 0) return Z_STREAM_END;
-+
-+ /* Write the trailer */
-+#ifdef GZIP
-+ if (s->wrap == 2) {
-+ put_byte(s, (Byte)(strm->adler & 0xff));
-+ put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-+ put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-+ put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-+ put_byte(s, (Byte)(strm->total_in & 0xff));
-+ put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-+ put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-+ put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-+ }
-+ else
-+#endif
-+ {
-+ putShortMSB(s, (uInt)(strm->adler >> 16));
-+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
-+ }
-+ flush_pending(strm);
-+ /* If avail_out is zero, the application will call deflate again
-+ * to flush the rest.
-+ */
-+ if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-+ return s->pending != 0 ? Z_OK : Z_STREAM_END;
-+}
-+
-+/* ========================================================================= */
-+int ZEXPORT deflateEnd (strm)
-+ z_streamp strm;
-+{
-+ int status;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+
-+ status = strm->state->status;
-+ if (status != INIT_STATE &&
-+ status != EXTRA_STATE &&
-+ status != NAME_STATE &&
-+ status != COMMENT_STATE &&
-+ status != HCRC_STATE &&
-+ status != BUSY_STATE &&
-+ status != FINISH_STATE) {
-+ return Z_STREAM_ERROR;
-+ }
-+
-+ /* Deallocate in reverse order of allocations: */
-+ TRY_FREE(strm, strm->state->pending_buf);
-+ TRY_FREE(strm, strm->state->head);
-+ TRY_FREE(strm, strm->state->prev);
-+ TRY_FREE(strm, strm->state->window);
-+
-+ ZFREE(strm, strm->state);
-+ strm->state = Z_NULL;
-+
-+ return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-+}
-+
-+/* =========================================================================
-+ * Copy the source state to the destination state.
-+ * To simplify the source, this is not supported for 16-bit MSDOS (which
-+ * doesn't have enough memory anyway to duplicate compression states).
-+ */
-+int ZEXPORT deflateCopy (dest, source)
-+ z_streamp dest;
-+ z_streamp source;
-+{
-+#ifdef MAXSEG_64K
-+ return Z_STREAM_ERROR;
-+#else
-+ deflate_state *ds;
-+ deflate_state *ss;
-+ ushf *overlay;
-+
-+
-+ if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-+ return Z_STREAM_ERROR;
-+ }
-+
-+ ss = source->state;
-+
-+ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-+
-+ ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-+ if (ds == Z_NULL) return Z_MEM_ERROR;
-+ dest->state = (struct internal_state FAR *) ds;
-+ zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
-+ ds->strm = dest;
-+
-+ ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-+ ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
-+ ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
-+ overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-+ ds->pending_buf = (uchf *) overlay;
-+
-+ if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-+ ds->pending_buf == Z_NULL) {
-+ deflateEnd (dest);
-+ return Z_MEM_ERROR;
-+ }
-+ /* following zmemcpy do not work for 16-bit MSDOS */
-+ zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-+ zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
-+ zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-+ zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-+
-+ ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-+ ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-+ ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-+
-+ ds->l_desc.dyn_tree = ds->dyn_ltree;
-+ ds->d_desc.dyn_tree = ds->dyn_dtree;
-+ ds->bl_desc.dyn_tree = ds->bl_tree;
-+
-+ return Z_OK;
-+#endif /* MAXSEG_64K */
-+}
-+
-+/* ===========================================================================
-+ * Read a new buffer from the current input stream, update the adler32
-+ * and total number of bytes read. All deflate() input goes through
-+ * this function so some applications may wish to modify it to avoid
-+ * allocating a large strm->next_in buffer and copying from it.
-+ * (See also flush_pending()).
-+ */
-+local int read_buf(strm, buf, size)
-+ z_streamp strm;
-+ Bytef *buf;
-+ unsigned size;
-+{
-+ unsigned len = strm->avail_in;
-+
-+ if (len > size) len = size;
-+ if (len == 0) return 0;
-+
-+ strm->avail_in -= len;
-+
-+ zmemcpy(buf, strm->next_in, len);
-+ if (strm->state->wrap == 1) {
-+ strm->adler = adler32(strm->adler, buf, len);
-+ }
-+#ifdef GZIP
-+ else if (strm->state->wrap == 2) {
-+ strm->adler = crc32(strm->adler, buf, len);
-+ }
-+#endif
-+ strm->next_in += len;
-+ strm->total_in += len;
-+
-+ return (int)len;
-+}
-+
-+/* ===========================================================================
-+ * Initialize the "longest match" routines for a new zlib stream
-+ */
-+local void lm_init (s)
-+ deflate_state *s;
-+{
-+ s->window_size = (ulg)2L*s->w_size;
-+
-+ CLEAR_HASH(s);
-+
-+ /* Set the default configuration parameters:
-+ */
-+ s->max_lazy_match = configuration_table[s->level].max_lazy;
-+ s->good_match = configuration_table[s->level].good_length;
-+ s->nice_match = configuration_table[s->level].nice_length;
-+ s->max_chain_length = configuration_table[s->level].max_chain;
-+
-+ s->strstart = 0;
-+ s->block_start = 0L;
-+ s->lookahead = 0;
-+ s->insert = 0;
-+ s->match_length = s->prev_length = MIN_MATCH-1;
-+ s->match_available = 0;
-+ s->ins_h = 0;
-+#ifndef FASTEST
-+#ifdef ASMV
-+ match_init(); /* initialize the asm code */
-+#endif
-+#endif
-+}
-+
-+#ifndef FASTEST
-+/* ===========================================================================
-+ * Set match_start to the longest match starting at the given string and
-+ * return its length. Matches shorter or equal to prev_length are discarded,
-+ * in which case the result is equal to prev_length and match_start is
-+ * garbage.
-+ * IN assertions: cur_match is the head of the hash chain for the current
-+ * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
-+ * OUT assertion: the match length is not greater than s->lookahead.
-+ */
-+#ifndef ASMV
-+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
-+ * match.S. The code will be functionally equivalent.
-+ */
-+local uInt longest_match(s, cur_match)
-+ deflate_state *s;
-+ IPos cur_match; /* current match */
-+{
-+ unsigned chain_length = s->max_chain_length;/* max hash chain length */
-+ register Bytef *scan = s->window + s->strstart; /* current string */
-+ register Bytef *match; /* matched string */
-+ register int len; /* length of current match */
-+ int best_len = s->prev_length; /* best match length so far */
-+ int nice_match = s->nice_match; /* stop if match long enough */
-+ IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-+ s->strstart - (IPos)MAX_DIST(s) : NIL;
-+ /* Stop when cur_match becomes <= limit. To simplify the code,
-+ * we prevent matches with the string of window index 0.
-+ */
-+ Posf *prev = s->prev;
-+ uInt wmask = s->w_mask;
-+
-+#ifdef UNALIGNED_OK
-+ /* Compare two bytes at a time. Note: this is not always beneficial.
-+ * Try with and without -DUNALIGNED_OK to check.
-+ */
-+ register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-+ register ush scan_start = *(ushf*)scan;
-+ register ush scan_end = *(ushf*)(scan+best_len-1);
-+#else
-+ register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-+ register Byte scan_end1 = scan[best_len-1];
-+ register Byte scan_end = scan[best_len];
-+#endif
-+
-+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-+ * It is easy to get rid of this optimization if necessary.
-+ */
-+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-+
-+ /* Do not waste too much time if we already have a good match: */
-+ if (s->prev_length >= s->good_match) {
-+ chain_length >>= 2;
-+ }
-+ /* Do not look for matches beyond the end of the input. This is necessary
-+ * to make deflate deterministic.
-+ */
-+ if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-+
-+ Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-+
-+ do {
-+ Assert(cur_match < s->strstart, "no future");
-+ match = s->window + cur_match;
-+
-+ /* Skip to next match if the match length cannot increase
-+ * or if the match length is less than 2. Note that the checks below
-+ * for insufficient lookahead only occur occasionally for performance
-+ * reasons. Therefore uninitialized memory will be accessed, and
-+ * conditional jumps will be made that depend on those values.
-+ * However the length of the match is limited to the lookahead, so
-+ * the output of deflate is not affected by the uninitialized values.
-+ */
-+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-+ /* This code assumes sizeof(unsigned short) == 2. Do not use
-+ * UNALIGNED_OK if your compiler uses a different size.
-+ */
-+ if (*(ushf*)(match+best_len-1) != scan_end ||
-+ *(ushf*)match != scan_start) continue;
-+
-+ /* It is not necessary to compare scan[2] and match[2] since they are
-+ * always equal when the other bytes match, given that the hash keys
-+ * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-+ * strstart+3, +5, ... up to strstart+257. We check for insufficient
-+ * lookahead only every 4th comparison; the 128th check will be made
-+ * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-+ * necessary to put more guard bytes at the end of the window, or
-+ * to check more often for insufficient lookahead.
-+ */
-+ Assert(scan[2] == match[2], "scan[2]?");
-+ scan++, match++;
-+ do {
-+ } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-+ scan < strend);
-+ /* The funny "do {}" generates better code on most compilers */
-+
-+ /* Here, scan <= window+strstart+257 */
-+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-+ if (*scan == *match) scan++;
-+
-+ len = (MAX_MATCH - 1) - (int)(strend-scan);
-+ scan = strend - (MAX_MATCH-1);
-+
-+#else /* UNALIGNED_OK */
-+
-+ if (match[best_len] != scan_end ||
-+ match[best_len-1] != scan_end1 ||
-+ *match != *scan ||
-+ *++match != scan[1]) continue;
-+
-+ /* The check at best_len-1 can be removed because it will be made
-+ * again later. (This heuristic is not always a win.)
-+ * It is not necessary to compare scan[2] and match[2] since they
-+ * are always equal when the other bytes match, given that
-+ * the hash keys are equal and that HASH_BITS >= 8.
-+ */
-+ scan += 2, match++;
-+ Assert(*scan == *match, "match[2]?");
-+
-+ /* We check for insufficient lookahead only every 8th comparison;
-+ * the 256th check will be made at strstart+258.
-+ */
-+ do {
-+ } while (*++scan == *++match && *++scan == *++match &&
-+ *++scan == *++match && *++scan == *++match &&
-+ *++scan == *++match && *++scan == *++match &&
-+ *++scan == *++match && *++scan == *++match &&
-+ scan < strend);
-+
-+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-+
-+ len = MAX_MATCH - (int)(strend - scan);
-+ scan = strend - MAX_MATCH;
-+
-+#endif /* UNALIGNED_OK */
-+
-+ if (len > best_len) {
-+ s->match_start = cur_match;
-+ best_len = len;
-+ if (len >= nice_match) break;
-+#ifdef UNALIGNED_OK
-+ scan_end = *(ushf*)(scan+best_len-1);
-+#else
-+ scan_end1 = scan[best_len-1];
-+ scan_end = scan[best_len];
-+#endif
-+ }
-+ } while ((cur_match = prev[cur_match & wmask]) > limit
-+ && --chain_length != 0);
-+
-+ if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-+ return s->lookahead;
-+}
-+#endif /* ASMV */
-+
-+#else /* FASTEST */
-+
-+/* ---------------------------------------------------------------------------
-+ * Optimized version for FASTEST only
-+ */
-+local uInt longest_match(s, cur_match)
-+ deflate_state *s;
-+ IPos cur_match; /* current match */
-+{
-+ register Bytef *scan = s->window + s->strstart; /* current string */
-+ register Bytef *match; /* matched string */
-+ register int len; /* length of current match */
-+ register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-+
-+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-+ * It is easy to get rid of this optimization if necessary.
-+ */
-+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-+
-+ Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-+
-+ Assert(cur_match < s->strstart, "no future");
-+
-+ match = s->window + cur_match;
-+
-+ /* Return failure if the match length is less than 2:
-+ */
-+ if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-+
-+ /* The check at best_len-1 can be removed because it will be made
-+ * again later. (This heuristic is not always a win.)
-+ * It is not necessary to compare scan[2] and match[2] since they
-+ * are always equal when the other bytes match, given that
-+ * the hash keys are equal and that HASH_BITS >= 8.
-+ */
-+ scan += 2, match += 2;
-+ Assert(*scan == *match, "match[2]?");
-+
-+ /* We check for insufficient lookahead only every 8th comparison;
-+ * the 256th check will be made at strstart+258.
-+ */
-+ do {
-+ } while (*++scan == *++match && *++scan == *++match &&
-+ *++scan == *++match && *++scan == *++match &&
-+ *++scan == *++match && *++scan == *++match &&
-+ *++scan == *++match && *++scan == *++match &&
-+ scan < strend);
-+
-+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-+
-+ len = MAX_MATCH - (int)(strend - scan);
-+
-+ if (len < MIN_MATCH) return MIN_MATCH - 1;
-+
-+ s->match_start = cur_match;
-+ return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-+}
-+
-+#endif /* FASTEST */
-+
-+#ifdef DEBUG
-+/* ===========================================================================
-+ * Check that the match at match_start is indeed a match.
-+ */
-+local void check_match(s, start, match, length)
-+ deflate_state *s;
-+ IPos start, match;
-+ int length;
-+{
-+ /* check that the match is indeed a match */
-+ if (zmemcmp(s->window + match,
-+ s->window + start, length) != EQUAL) {
-+ fprintf(stderr, " start %u, match %u, length %d\n",
-+ start, match, length);
-+ do {
-+ fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-+ } while (--length != 0);
-+ z_error("invalid match");
-+ }
-+ if (z_verbose > 1) {
-+ fprintf(stderr,"\\[%d,%d]", start-match, length);
-+ do { putc(s->window[start++], stderr); } while (--length != 0);
-+ }
-+}
-+#else
-+# define check_match(s, start, match, length)
-+#endif /* DEBUG */
-+
-+/* ===========================================================================
-+ * Fill the window when the lookahead becomes insufficient.
-+ * Updates strstart and lookahead.
-+ *
-+ * IN assertion: lookahead < MIN_LOOKAHEAD
-+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
-+ * At least one byte has been read, or avail_in == 0; reads are
-+ * performed for at least two bytes (required for the zip translate_eol
-+ * option -- not supported here).
-+ */
-+local void fill_window(s)
-+ deflate_state *s;
-+{
-+ register unsigned n, m;
-+ register Posf *p;
-+ unsigned more; /* Amount of free space at the end of the window. */
-+ uInt wsize = s->w_size;
-+
-+ Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-+
-+ do {
-+ more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-+
-+ /* Deal with !@#$% 64K limit: */
-+ if (sizeof(int) <= 2) {
-+ if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-+ more = wsize;
-+
-+ } else if (more == (unsigned)(-1)) {
-+ /* Very unlikely, but possible on 16 bit machine if
-+ * strstart == 0 && lookahead == 1 (input done a byte at time)
-+ */
-+ more--;
-+ }
-+ }
-+
-+ /* If the window is almost full and there is insufficient lookahead,
-+ * move the upper half to the lower one to make room in the upper half.
-+ */
-+ if (s->strstart >= wsize+MAX_DIST(s)) {
-+
-+ zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-+ s->match_start -= wsize;
-+ s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
-+ s->block_start -= (long) wsize;
-+
-+ /* Slide the hash table (could be avoided with 32 bit values
-+ at the expense of memory usage). We slide even when level == 0
-+ to keep the hash table consistent if we switch back to level > 0
-+ later. (Using level 0 permanently is not an optimal usage of
-+ zlib, so we don't care about this pathological case.)
-+ */
-+ n = s->hash_size;
-+ p = &s->head[n];
-+ do {
-+ m = *--p;
-+ *p = (Pos)(m >= wsize ? m-wsize : NIL);
-+ } while (--n);
-+
-+ n = wsize;
-+#ifndef FASTEST
-+ p = &s->prev[n];
-+ do {
-+ m = *--p;
-+ *p = (Pos)(m >= wsize ? m-wsize : NIL);
-+ /* If n is not on any hash chain, prev[n] is garbage but
-+ * its value will never be used.
-+ */
-+ } while (--n);
-+#endif
-+ more += wsize;
-+ }
-+ if (s->strm->avail_in == 0) break;
-+
-+ /* If there was no sliding:
-+ * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-+ * more == window_size - lookahead - strstart
-+ * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-+ * => more >= window_size - 2*WSIZE + 2
-+ * In the BIG_MEM or MMAP case (not yet supported),
-+ * window_size == input_size + MIN_LOOKAHEAD &&
-+ * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-+ * Otherwise, window_size == 2*WSIZE so more >= 2.
-+ * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-+ */
-+ Assert(more >= 2, "more < 2");
-+
-+ n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-+ s->lookahead += n;
-+
-+ /* Initialize the hash value now that we have some input: */
-+ if (s->lookahead + s->insert >= MIN_MATCH) {
-+ uInt str = s->strstart - s->insert;
-+ s->ins_h = s->window[str];
-+ UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-+#if MIN_MATCH != 3
-+ Call UPDATE_HASH() MIN_MATCH-3 more times
-+#endif
-+ while (s->insert) {
-+ UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-+#ifndef FASTEST
-+ s->prev[str & s->w_mask] = s->head[s->ins_h];
-+#endif
-+ s->head[s->ins_h] = (Pos)str;
-+ str++;
-+ s->insert--;
-+ if (s->lookahead + s->insert < MIN_MATCH)
-+ break;
-+ }
-+ }
-+ /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-+ * but this is not important since only literal bytes will be emitted.
-+ */
-+
-+ } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-+
-+ /* If the WIN_INIT bytes after the end of the current data have never been
-+ * written, then zero those bytes in order to avoid memory check reports of
-+ * the use of uninitialized (or uninitialised as Julian writes) bytes by
-+ * the longest match routines. Update the high water mark for the next
-+ * time through here. WIN_INIT is set to MAX_MATCH since the longest match
-+ * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-+ */
-+ if (s->high_water < s->window_size) {
-+ ulg curr = s->strstart + (ulg)(s->lookahead);
-+ ulg init;
-+
-+ if (s->high_water < curr) {
-+ /* Previous high water mark below current data -- zero WIN_INIT
-+ * bytes or up to end of window, whichever is less.
-+ */
-+ init = s->window_size - curr;
-+ if (init > WIN_INIT)
-+ init = WIN_INIT;
-+ zmemzero(s->window + curr, (unsigned)init);
-+ s->high_water = curr + init;
-+ }
-+ else if (s->high_water < (ulg)curr + WIN_INIT) {
-+ /* High water mark at or above current data, but below current data
-+ * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-+ * to end of window, whichever is less.
-+ */
-+ init = (ulg)curr + WIN_INIT - s->high_water;
-+ if (init > s->window_size - s->high_water)
-+ init = s->window_size - s->high_water;
-+ zmemzero(s->window + s->high_water, (unsigned)init);
-+ s->high_water += init;
-+ }
-+ }
-+
-+ Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-+ "not enough room for search");
-+}
-+
-+/* ===========================================================================
-+ * Flush the current block, with given end-of-file flag.
-+ * IN assertion: strstart is set to the end of the current match.
-+ */
-+#define FLUSH_BLOCK_ONLY(s, last) { \
-+ _tr_flush_block(s, (s->block_start >= 0L ? \
-+ (charf *)&s->window[(unsigned)s->block_start] : \
-+ (charf *)Z_NULL), \
-+ (ulg)((long)s->strstart - s->block_start), \
-+ (last)); \
-+ s->block_start = s->strstart; \
-+ flush_pending(s->strm); \
-+ Tracev((stderr,"[FLUSH]")); \
-+}
-+
-+/* Same but force premature exit if necessary. */
-+#define FLUSH_BLOCK(s, last) { \
-+ FLUSH_BLOCK_ONLY(s, last); \
-+ if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-+}
-+
-+/* ===========================================================================
-+ * Copy without compression as much as possible from the input stream, return
-+ * the current block state.
-+ * This function does not insert new strings in the dictionary since
-+ * uncompressible data is probably not useful. This function is used
-+ * only for the level=0 compression option.
-+ * NOTE: this function should be optimized to avoid extra copying from
-+ * window to pending_buf.
-+ */
-+local block_state deflate_stored(s, flush)
-+ deflate_state *s;
-+ int flush;
-+{
-+ /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-+ * to pending_buf_size, and each stored block has a 5 byte header:
-+ */
-+ ulg max_block_size = 0xffff;
-+ ulg max_start;
-+
-+ if (max_block_size > s->pending_buf_size - 5) {
-+ max_block_size = s->pending_buf_size - 5;
-+ }
-+
-+ /* Copy as much as possible from input to output: */
-+ for (;;) {
-+ /* Fill the window as much as possible: */
-+ if (s->lookahead <= 1) {
-+
-+ Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-+ s->block_start >= (long)s->w_size, "slide too late");
-+
-+ fill_window(s);
-+ if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-+
-+ if (s->lookahead == 0) break; /* flush the current block */
-+ }
-+ Assert(s->block_start >= 0L, "block gone");
-+
-+ s->strstart += s->lookahead;
-+ s->lookahead = 0;
-+
-+ /* Emit a stored block if pending_buf will be full: */
-+ max_start = s->block_start + max_block_size;
-+ if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-+ /* strstart == 0 is possible when wraparound on 16-bit machine */
-+ s->lookahead = (uInt)(s->strstart - max_start);
-+ s->strstart = (uInt)max_start;
-+ FLUSH_BLOCK(s, 0);
-+ }
-+ /* Flush if we may have to slide, otherwise block_start may become
-+ * negative and the data will be gone:
-+ */
-+ if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-+ FLUSH_BLOCK(s, 0);
-+ }
-+ }
-+ s->insert = 0;
-+ if (flush == Z_FINISH) {
-+ FLUSH_BLOCK(s, 1);
-+ return finish_done;
-+ }
-+ if ((long)s->strstart > s->block_start)
-+ FLUSH_BLOCK(s, 0);
-+ return block_done;
-+}
-+
-+/* ===========================================================================
-+ * Compress as much as possible from the input stream, return the current
-+ * block state.
-+ * This function does not perform lazy evaluation of matches and inserts
-+ * new strings in the dictionary only for unmatched strings or for short
-+ * matches. It is used only for the fast compression options.
-+ */
-+local block_state deflate_fast(s, flush)
-+ deflate_state *s;
-+ int flush;
-+{
-+ IPos hash_head; /* head of the hash chain */
-+ int bflush; /* set if current block must be flushed */
-+
-+ for (;;) {
-+ /* Make sure that we always have enough lookahead, except
-+ * at the end of the input file. We need MAX_MATCH bytes
-+ * for the next match, plus MIN_MATCH bytes to insert the
-+ * string following the next match.
-+ */
-+ if (s->lookahead < MIN_LOOKAHEAD) {
-+ fill_window(s);
-+ if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-+ return need_more;
-+ }
-+ if (s->lookahead == 0) break; /* flush the current block */
-+ }
-+
-+ /* Insert the string window[strstart .. strstart+2] in the
-+ * dictionary, and set hash_head to the head of the hash chain:
-+ */
-+ hash_head = NIL;
-+ if (s->lookahead >= MIN_MATCH) {
-+ INSERT_STRING(s, s->strstart, hash_head);
-+ }
-+
-+ /* Find the longest match, discarding those <= prev_length.
-+ * At this point we have always match_length < MIN_MATCH
-+ */
-+ if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-+ /* To simplify the code, we prevent matches with the string
-+ * of window index 0 (in particular we have to avoid a match
-+ * of the string with itself at the start of the input file).
-+ */
-+ s->match_length = longest_match (s, hash_head);
-+ /* longest_match() sets match_start */
-+ }
-+ if (s->match_length >= MIN_MATCH) {
-+ check_match(s, s->strstart, s->match_start, s->match_length);
-+
-+ _tr_tally_dist(s, s->strstart - s->match_start,
-+ s->match_length - MIN_MATCH, bflush);
-+
-+ s->lookahead -= s->match_length;
-+
-+ /* Insert new strings in the hash table only if the match length
-+ * is not too large. This saves time but degrades compression.
-+ */
-+#ifndef FASTEST
-+ if (s->match_length <= s->max_insert_length &&
-+ s->lookahead >= MIN_MATCH) {
-+ s->match_length--; /* string at strstart already in table */
-+ do {
-+ s->strstart++;
-+ INSERT_STRING(s, s->strstart, hash_head);
-+ /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-+ * always MIN_MATCH bytes ahead.
-+ */
-+ } while (--s->match_length != 0);
-+ s->strstart++;
-+ } else
-+#endif
-+ {
-+ s->strstart += s->match_length;
-+ s->match_length = 0;
-+ s->ins_h = s->window[s->strstart];
-+ UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-+#if MIN_MATCH != 3
-+ Call UPDATE_HASH() MIN_MATCH-3 more times
-+#endif
-+ /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-+ * matter since it will be recomputed at next deflate call.
-+ */
-+ }
-+ } else {
-+ /* No match, output a literal byte */
-+ Tracevv((stderr,"%c", s->window[s->strstart]));
-+ _tr_tally_lit (s, s->window[s->strstart], bflush);
-+ s->lookahead--;
-+ s->strstart++;
-+ }
-+ if (bflush) FLUSH_BLOCK(s, 0);
-+ }
-+ s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-+ if (flush == Z_FINISH) {
-+ FLUSH_BLOCK(s, 1);
-+ return finish_done;
-+ }
-+ if (s->last_lit)
-+ FLUSH_BLOCK(s, 0);
-+ return block_done;
-+}
-+
-+#ifndef FASTEST
-+/* ===========================================================================
-+ * Same as above, but achieves better compression. We use a lazy
-+ * evaluation for matches: a match is finally adopted only if there is
-+ * no better match at the next window position.
-+ */
-+local block_state deflate_slow(s, flush)
-+ deflate_state *s;
-+ int flush;
-+{
-+ IPos hash_head; /* head of hash chain */
-+ int bflush; /* set if current block must be flushed */
-+
-+ /* Process the input block. */
-+ for (;;) {
-+ /* Make sure that we always have enough lookahead, except
-+ * at the end of the input file. We need MAX_MATCH bytes
-+ * for the next match, plus MIN_MATCH bytes to insert the
-+ * string following the next match.
-+ */
-+ if (s->lookahead < MIN_LOOKAHEAD) {
-+ fill_window(s);
-+ if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-+ return need_more;
-+ }
-+ if (s->lookahead == 0) break; /* flush the current block */
-+ }
-+
-+ /* Insert the string window[strstart .. strstart+2] in the
-+ * dictionary, and set hash_head to the head of the hash chain:
-+ */
-+ hash_head = NIL;
-+ if (s->lookahead >= MIN_MATCH) {
-+ INSERT_STRING(s, s->strstart, hash_head);
-+ }
-+
-+ /* Find the longest match, discarding those <= prev_length.
-+ */
-+ s->prev_length = s->match_length, s->prev_match = s->match_start;
-+ s->match_length = MIN_MATCH-1;
-+
-+ if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-+ s->strstart - hash_head <= MAX_DIST(s)) {
-+ /* To simplify the code, we prevent matches with the string
-+ * of window index 0 (in particular we have to avoid a match
-+ * of the string with itself at the start of the input file).
-+ */
-+ s->match_length = longest_match (s, hash_head);
-+ /* longest_match() sets match_start */
-+
-+ if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-+#if TOO_FAR <= 32767
-+ || (s->match_length == MIN_MATCH &&
-+ s->strstart - s->match_start > TOO_FAR)
-+#endif
-+ )) {
-+
-+ /* If prev_match is also MIN_MATCH, match_start is garbage
-+ * but we will ignore the current match anyway.
-+ */
-+ s->match_length = MIN_MATCH-1;
-+ }
-+ }
-+ /* If there was a match at the previous step and the current
-+ * match is not better, output the previous match:
-+ */
-+ if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-+ uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-+ /* Do not insert strings in hash table beyond this. */
-+
-+ check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-+
-+ _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-+ s->prev_length - MIN_MATCH, bflush);
-+
-+ /* Insert in hash table all strings up to the end of the match.
-+ * strstart-1 and strstart are already inserted. If there is not
-+ * enough lookahead, the last two strings are not inserted in
-+ * the hash table.
-+ */
-+ s->lookahead -= s->prev_length-1;
-+ s->prev_length -= 2;
-+ do {
-+ if (++s->strstart <= max_insert) {
-+ INSERT_STRING(s, s->strstart, hash_head);
-+ }
-+ } while (--s->prev_length != 0);
-+ s->match_available = 0;
-+ s->match_length = MIN_MATCH-1;
-+ s->strstart++;
-+
-+ if (bflush) FLUSH_BLOCK(s, 0);
-+
-+ } else if (s->match_available) {
-+ /* If there was no match at the previous position, output a
-+ * single literal. If there was a match but the current match
-+ * is longer, truncate the previous match to a single literal.
-+ */
-+ Tracevv((stderr,"%c", s->window[s->strstart-1]));
-+ _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-+ if (bflush) {
-+ FLUSH_BLOCK_ONLY(s, 0);
-+ }
-+ s->strstart++;
-+ s->lookahead--;
-+ if (s->strm->avail_out == 0) return need_more;
-+ } else {
-+ /* There is no previous match to compare with, wait for
-+ * the next step to decide.
-+ */
-+ s->match_available = 1;
-+ s->strstart++;
-+ s->lookahead--;
-+ }
-+ }
-+ Assert (flush != Z_NO_FLUSH, "no flush?");
-+ if (s->match_available) {
-+ Tracevv((stderr,"%c", s->window[s->strstart-1]));
-+ _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-+ s->match_available = 0;
-+ }
-+ s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-+ if (flush == Z_FINISH) {
-+ FLUSH_BLOCK(s, 1);
-+ return finish_done;
-+ }
-+ if (s->last_lit)
-+ FLUSH_BLOCK(s, 0);
-+ return block_done;
-+}
-+#endif /* FASTEST */
-+
-+/* ===========================================================================
-+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
-+ * one. Do not maintain a hash table. (It will be regenerated if this run of
-+ * deflate switches away from Z_RLE.)
-+ */
-+local block_state deflate_rle(s, flush)
-+ deflate_state *s;
-+ int flush;
-+{
-+ int bflush; /* set if current block must be flushed */
-+ uInt prev; /* byte at distance one to match */
-+ Bytef *scan, *strend; /* scan goes up to strend for length of run */
-+
-+ for (;;) {
-+ /* Make sure that we always have enough lookahead, except
-+ * at the end of the input file. We need MAX_MATCH bytes
-+ * for the longest run, plus one for the unrolled loop.
-+ */
-+ if (s->lookahead <= MAX_MATCH) {
-+ fill_window(s);
-+ if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
-+ return need_more;
-+ }
-+ if (s->lookahead == 0) break; /* flush the current block */
-+ }
-+
-+ /* See how many times the previous byte repeats */
-+ s->match_length = 0;
-+ if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
-+ scan = s->window + s->strstart - 1;
-+ prev = *scan;
-+ if (prev == *++scan && prev == *++scan && prev == *++scan) {
-+ strend = s->window + s->strstart + MAX_MATCH;
-+ do {
-+ } while (prev == *++scan && prev == *++scan &&
-+ prev == *++scan && prev == *++scan &&
-+ prev == *++scan && prev == *++scan &&
-+ prev == *++scan && prev == *++scan &&
-+ scan < strend);
-+ s->match_length = MAX_MATCH - (int)(strend - scan);
-+ if (s->match_length > s->lookahead)
-+ s->match_length = s->lookahead;
-+ }
-+ Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-+ }
-+
-+ /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-+ if (s->match_length >= MIN_MATCH) {
-+ check_match(s, s->strstart, s->strstart - 1, s->match_length);
-+
-+ _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-+
-+ s->lookahead -= s->match_length;
-+ s->strstart += s->match_length;
-+ s->match_length = 0;
-+ } else {
-+ /* No match, output a literal byte */
-+ Tracevv((stderr,"%c", s->window[s->strstart]));
-+ _tr_tally_lit (s, s->window[s->strstart], bflush);
-+ s->lookahead--;
-+ s->strstart++;
-+ }
-+ if (bflush) FLUSH_BLOCK(s, 0);
-+ }
-+ s->insert = 0;
-+ if (flush == Z_FINISH) {
-+ FLUSH_BLOCK(s, 1);
-+ return finish_done;
-+ }
-+ if (s->last_lit)
-+ FLUSH_BLOCK(s, 0);
-+ return block_done;
-+}
-+
-+/* ===========================================================================
-+ * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table.
-+ * (It will be regenerated if this run of deflate switches away from Huffman.)
-+ */
-+local block_state deflate_huff(s, flush)
-+ deflate_state *s;
-+ int flush;
-+{
-+ int bflush; /* set if current block must be flushed */
-+
-+ for (;;) {
-+ /* Make sure that we have a literal to write. */
-+ if (s->lookahead == 0) {
-+ fill_window(s);
-+ if (s->lookahead == 0) {
-+ if (flush == Z_NO_FLUSH)
-+ return need_more;
-+ break; /* flush the current block */
-+ }
-+ }
-+
-+ /* Output a literal byte */
-+ s->match_length = 0;
-+ Tracevv((stderr,"%c", s->window[s->strstart]));
-+ _tr_tally_lit (s, s->window[s->strstart], bflush);
-+ s->lookahead--;
-+ s->strstart++;
-+ if (bflush) FLUSH_BLOCK(s, 0);
-+ }
-+ s->insert = 0;
-+ if (flush == Z_FINISH) {
-+ FLUSH_BLOCK(s, 1);
-+ return finish_done;
-+ }
-+ if (s->last_lit)
-+ FLUSH_BLOCK(s, 0);
-+ return block_done;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/deflate.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,370 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* deflate.h -- internal compression state
-+ * Copyright (C) 1995-2012 Jean-loup Gailly
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* WARNING: this file should *not* be used by applications. It is
-+ part of the implementation of the compression library and is
-+ subject to change. Applications should only use zlib.h.
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#ifndef DEFLATE_H
-+#define DEFLATE_H
-+
-+#include "zutil.h"
-+
-+/* define NO_GZIP when compiling if you want to disable gzip header and
-+ trailer creation by deflate(). NO_GZIP would be used to avoid linking in
-+ the crc code when it is not needed. For shared libraries, gzip encoding
-+ should be left enabled. */
-+#ifndef NO_GZIP
-+# define GZIP
-+#endif
-+
-+/* ===========================================================================
-+ * Internal compression state.
-+ */
-+
-+#define LENGTH_CODES 29
-+/* number of length codes, not counting the special END_BLOCK code */
-+
-+#define LITERALS 256
-+/* number of literal bytes 0..255 */
-+
-+#define L_CODES (LITERALS+1+LENGTH_CODES)
-+/* number of Literal or Length codes, including the END_BLOCK code */
-+
-+#define D_CODES 30
-+/* number of distance codes */
-+
-+#define BL_CODES 19
-+/* number of codes used to transfer the bit lengths */
-+
-+#define HEAP_SIZE (2*L_CODES+1)
-+/* maximum heap size */
-+
-+#define MAX_BITS 15
-+/* All codes must not exceed MAX_BITS bits */
-+
-+#define Buf_size 16
-+/* size of bit buffer in bi_buf */
-+
-+#define INIT_STATE 42
-+#define EXTRA_STATE 69
-+#define NAME_STATE 73
-+#define COMMENT_STATE 91
-+#define HCRC_STATE 103
-+#define BUSY_STATE 113
-+#define FINISH_STATE 666
-+/* Stream status */
-+
-+
-+/* Data structure describing a single value and its code string. */
-+typedef struct ct_data_s {
-+ union {
-+ ush freq; /* frequency count */
-+ ush code; /* bit string */
-+ } fc;
-+ union {
-+ ush dad; /* father node in Huffman tree */
-+ ush len; /* length of bit string */
-+ } dl;
-+} FAR ct_data;
-+
-+#define Freq fc.freq
-+#define Code fc.code
-+#define Dad dl.dad
-+#define Len dl.len
-+
-+typedef struct static_tree_desc_s static_tree_desc;
-+
-+typedef struct tree_desc_s {
-+ ct_data *dyn_tree; /* the dynamic tree */
-+ int max_code; /* largest code with non zero frequency */
-+ static_tree_desc *stat_desc; /* the corresponding static tree */
-+} FAR tree_desc;
-+
-+typedef ush Pos;
-+typedef Pos FAR Posf;
-+typedef unsigned IPos;
-+
-+/* A Pos is an index in the character window. We use short instead of int to
-+ * save space in the various tables. IPos is used only for parameter passing.
-+ */
-+
-+typedef struct internal_state {
-+ z_streamp strm; /* pointer back to this zlib stream */
-+ int status; /* as the name implies */
-+ Bytef *pending_buf; /* output still pending */
-+ ulg pending_buf_size; /* size of pending_buf */
-+ Bytef *pending_out; /* next pending byte to output to the stream */
-+ uInt pending; /* nb of bytes in the pending buffer */
-+ int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
-+ gz_headerp gzhead; /* gzip header information to write */
-+ uInt gzindex; /* where in extra, name, or comment */
-+ Byte method; /* can only be DEFLATED */
-+ int last_flush; /* value of flush param for previous deflate call */
-+
-+ /* used by deflate.c: */
-+
-+ uInt w_size; /* LZ77 window size (32K by default) */
-+ uInt w_bits; /* log2(w_size) (8..16) */
-+ uInt w_mask; /* w_size - 1 */
-+
-+ Bytef *window;
-+ /* Sliding window. Input bytes are read into the second half of the window,
-+ * and move to the first half later to keep a dictionary of at least wSize
-+ * bytes. With this organization, matches are limited to a distance of
-+ * wSize-MAX_MATCH bytes, but this ensures that IO is always
-+ * performed with a length multiple of the block size. Also, it limits
-+ * the window size to 64K, which is quite useful on MSDOS.
-+ * To do: use the user input buffer as sliding window.
-+ */
-+
-+ ulg window_size;
-+ /* Actual size of window: 2*wSize, except when the user input buffer
-+ * is directly used as sliding window.
-+ */
-+
-+ Posf *prev;
-+ /* Link to older string with same hash index. To limit the size of this
-+ * array to 64K, this link is maintained only for the last 32K strings.
-+ * An index in this array is thus a window index modulo 32K.
-+ */
-+
-+ Posf *head; /* Heads of the hash chains or NIL. */
-+
-+ uInt ins_h; /* hash index of string to be inserted */
-+ uInt hash_size; /* number of elements in hash table */
-+ uInt hash_bits; /* log2(hash_size) */
-+ uInt hash_mask; /* hash_size-1 */
-+
-+ uInt hash_shift;
-+ /* Number of bits by which ins_h must be shifted at each input
-+ * step. It must be such that after MIN_MATCH steps, the oldest
-+ * byte no longer takes part in the hash key, that is:
-+ * hash_shift * MIN_MATCH >= hash_bits
-+ */
-+
-+ long block_start;
-+ /* Window position at the beginning of the current output block. Gets
-+ * negative when the window is moved backwards.
-+ */
-+
-+ uInt match_length; /* length of best match */
-+ IPos prev_match; /* previous match */
-+ int match_available; /* set if previous match exists */
-+ uInt strstart; /* start of string to insert */
-+ uInt match_start; /* start of matching string */
-+ uInt lookahead; /* number of valid bytes ahead in window */
-+
-+ uInt prev_length;
-+ /* Length of the best match at previous step. Matches not greater than this
-+ * are discarded. This is used in the lazy match evaluation.
-+ */
-+
-+ uInt max_chain_length;
-+ /* To speed up deflation, hash chains are never searched beyond this
-+ * length. A higher limit improves compression ratio but degrades the
-+ * speed.
-+ */
-+
-+ uInt max_lazy_match;
-+ /* Attempt to find a better match only when the current match is strictly
-+ * smaller than this value. This mechanism is used only for compression
-+ * levels >= 4.
-+ */
-+# define max_insert_length max_lazy_match
-+ /* Insert new strings in the hash table only if the match length is not
-+ * greater than this length. This saves time but degrades compression.
-+ * max_insert_length is used only for compression levels <= 3.
-+ */
-+
-+ int level; /* compression level (1..9) */
-+ int strategy; /* favor or force Huffman coding*/
-+
-+ uInt good_match;
-+ /* Use a faster search when the previous match is longer than this */
-+
-+ int nice_match; /* Stop searching when current match exceeds this */
-+
-+ /* used by trees.c: */
-+ /* Didn't use ct_data typedef below to suppress compiler warning */
-+ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
-+ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-+ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
-+
-+ struct tree_desc_s l_desc; /* desc. for literal tree */
-+ struct tree_desc_s d_desc; /* desc. for distance tree */
-+ struct tree_desc_s bl_desc; /* desc. for bit length tree */
-+
-+ ush bl_count[MAX_BITS+1];
-+ /* number of codes at each bit length for an optimal tree */
-+
-+ int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */
-+ int heap_len; /* number of elements in the heap */
-+ int heap_max; /* element of largest frequency */
-+ /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-+ * The same heap array is used to build all trees.
-+ */
-+
-+ uch depth[2*L_CODES+1];
-+ /* Depth of each subtree used as tie breaker for trees of equal frequency
-+ */
-+
-+ uchf *l_buf; /* buffer for literals or lengths */
-+
-+ uInt lit_bufsize;
-+ /* Size of match buffer for literals/lengths. There are 4 reasons for
-+ * limiting lit_bufsize to 64K:
-+ * - frequencies can be kept in 16 bit counters
-+ * - if compression is not successful for the first block, all input
-+ * data is still in the window so we can still emit a stored block even
-+ * when input comes from standard input. (This can also be done for
-+ * all blocks if lit_bufsize is not greater than 32K.)
-+ * - if compression is not successful for a file smaller than 64K, we can
-+ * even emit a stored file instead of a stored block (saving 5 bytes).
-+ * This is applicable only for zip (not gzip or zlib).
-+ * - creating new Huffman trees less frequently may not provide fast
-+ * adaptation to changes in the input data statistics. (Take for
-+ * example a binary file with poorly compressible code followed by
-+ * a highly compressible string table.) Smaller buffer sizes give
-+ * fast adaptation but have of course the overhead of transmitting
-+ * trees more frequently.
-+ * - I can't count above 4
-+ */
-+
-+ uInt last_lit; /* running index in l_buf */
-+
-+ ushf *d_buf;
-+ /* Buffer for distances. To simplify the code, d_buf and l_buf have
-+ * the same number of elements. To use different lengths, an extra flag
-+ * array would be necessary.
-+ */
-+
-+ ulg opt_len; /* bit length of current block with optimal trees */
-+ ulg static_len; /* bit length of current block with static trees */
-+ uInt matches; /* number of string matches in current block */
-+ uInt insert; /* bytes at end of window left to insert */
-+
-+#ifdef DEBUG
-+ ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-+ ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
-+#endif
-+
-+ ush bi_buf;
-+ /* Output buffer. bits are inserted starting at the bottom (least
-+ * significant bits).
-+ */
-+ int bi_valid;
-+ /* Number of valid bits in bi_buf. All bits above the last valid bit
-+ * are always zero.
-+ */
-+
-+ ulg high_water;
-+ /* High water mark offset in window for initialized bytes -- bytes above
-+ * this are set to zero in order to avoid memory check warnings when
-+ * longest match routines access bytes past the input. This is then
-+ * updated to the new high water mark.
-+ */
-+
-+} FAR deflate_state;
-+
-+/* Output a byte on the stream.
-+ * IN assertion: there is enough room in pending_buf.
-+ */
-+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
-+
-+
-+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-+/* Minimum amount of lookahead, except at the end of the input file.
-+ * See deflate.c for comments about the MIN_MATCH+1.
-+ */
-+
-+#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD)
-+/* In order to simplify the code, particularly on 16 bit machines, match
-+ * distances are limited to MAX_DIST instead of WSIZE.
-+ */
-+
-+#define WIN_INIT MAX_MATCH
-+/* Number of bytes after end of data in window to initialize in order to avoid
-+ memory checker errors from longest match routines */
-+
-+ /* in trees.c */
-+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-+ ulg stored_len, int last));
-+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-+ ulg stored_len, int last));
-+
-+#define d_code(dist) \
-+ ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-+/* Mapping from a distance to a distance code. dist is the distance - 1 and
-+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
-+ * used.
-+ */
-+
-+#ifndef DEBUG
-+/* Inline versions of _tr_tally for speed: */
-+
-+#if defined(GEN_TREES_H) || !defined(STDC)
-+ extern uch ZLIB_INTERNAL _length_code[];
-+ extern uch ZLIB_INTERNAL _dist_code[];
-+#else
-+ extern const uch ZLIB_INTERNAL _length_code[];
-+ extern const uch ZLIB_INTERNAL _dist_code[];
-+#endif
-+
-+# define _tr_tally_lit(s, c, flush) \
-+ { uch cc = (c); \
-+ s->d_buf[s->last_lit] = 0; \
-+ s->l_buf[s->last_lit++] = cc; \
-+ s->dyn_ltree[cc].Freq++; \
-+ flush = (s->last_lit == s->lit_bufsize-1); \
-+ }
-+# define _tr_tally_dist(s, distance, length, flush) \
-+ { uch len = (length); \
-+ ush dist = (distance); \
-+ s->d_buf[s->last_lit] = dist; \
-+ s->l_buf[s->last_lit++] = len; \
-+ dist--; \
-+ s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-+ s->dyn_dtree[d_code(dist)].Freq++; \
-+ flush = (s->last_lit == s->lit_bufsize-1); \
-+ }
-+#else
-+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-+# define _tr_tally_dist(s, distance, length, flush) \
-+ flush = _tr_tally(s, distance, length)
-+#endif
-+
-+#endif /* DEFLATE_H */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/gzclose.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,49 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* gzclose.c -- zlib gzclose() function
-+ * Copyright (C) 2004, 2010 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "gzguts.h"
-+
-+/* gzclose() is in a separate file so that it is linked in only if it is used.
-+ That way the other gzclose functions can be used instead to avoid linking in
-+ unneeded compression or decompression routines. */
-+int ZEXPORT gzclose(file)
-+ gzFile file;
-+{
-+#ifndef NO_GZCOMPRESS
-+ gz_statep state;
-+
-+ if (file == NULL)
-+ return Z_STREAM_ERROR;
-+ state = (gz_statep)file;
-+
-+ return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
-+#else
-+ return gzclose_r(file);
-+#endif
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/gzguts.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,233 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* gzguts.h -- zlib internal header definitions for gz* operations
-+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#ifdef _LARGEFILE64_SOURCE
-+# ifndef _LARGEFILE_SOURCE
-+# define _LARGEFILE_SOURCE 1
-+# endif
-+# ifdef _FILE_OFFSET_BITS
-+# undef _FILE_OFFSET_BITS
-+# endif
-+#endif
-+
-+#ifdef HAVE_HIDDEN
-+# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-+#else
-+# define ZLIB_INTERNAL
-+#endif
-+
-+#include <stdio.h>
-+#include "zlib.h"
-+#ifdef STDC
-+# include <string.h>
-+# include <stdlib.h>
-+# include <limits.h>
-+#endif
-+#include <fcntl.h>
-+
-+#ifdef _WIN32
-+# include <stddef.h>
-+#endif
-+
-+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
-+# include <io.h>
-+#endif
-+
-+#ifdef WINAPI_FAMILY
-+# define open _open
-+# define read _read
-+# define write _write
-+# define close _close
-+#endif
-+
-+#ifdef NO_DEFLATE /* for compatibility with old definition */
-+# define NO_GZCOMPRESS
-+#endif
-+
-+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-+# ifndef HAVE_VSNPRINTF
-+# define HAVE_VSNPRINTF
-+# endif
-+#endif
-+
-+#if defined(__CYGWIN__)
-+# ifndef HAVE_VSNPRINTF
-+# define HAVE_VSNPRINTF
-+# endif
-+#endif
-+
-+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
-+# ifndef HAVE_VSNPRINTF
-+# define HAVE_VSNPRINTF
-+# endif
-+#endif
-+
-+#ifndef HAVE_VSNPRINTF
-+# ifdef MSDOS
-+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-+ but for now we just assume it doesn't. */
-+# define NO_vsnprintf
-+# endif
-+# ifdef __TURBOC__
-+# define NO_vsnprintf
-+# endif
-+# ifdef WIN32
-+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-+# if !defined(vsnprintf) && !defined(NO_vsnprintf)
-+# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-+# define vsnprintf _vsnprintf
-+# endif
-+# endif
-+# endif
-+# ifdef __SASC
-+# define NO_vsnprintf
-+# endif
-+# ifdef VMS
-+# define NO_vsnprintf
-+# endif
-+# ifdef __OS400__
-+# define NO_vsnprintf
-+# endif
-+# ifdef __MVS__
-+# define NO_vsnprintf
-+# endif
-+#endif
-+
-+/* unlike snprintf (which is required in C99, yet still not supported by
-+ Microsoft more than a decade later!), _snprintf does not guarantee null
-+ termination of the result -- however this is only used in gzlib.c where
-+ the result is assured to fit in the space provided */
-+#ifdef _MSC_VER
-+# define snprintf _snprintf
-+#endif
-+
-+#ifndef local
-+# define local static
-+#endif
-+/* compile with -Dlocal if your debugger can't find static symbols */
-+
-+/* gz* functions always use library allocation functions */
-+#ifndef STDC
-+ extern voidp malloc OF((uInt size));
-+ extern void free OF((voidpf ptr));
-+#endif
-+
-+/* get errno and strerror definition */
-+#if defined UNDER_CE
-+# include <windows.h>
-+# define zstrerror() gz_strwinerror((DWORD)GetLastError())
-+#else
-+# ifndef NO_STRERROR
-+# include <errno.h>
-+# define zstrerror() strerror(errno)
-+# else
-+# define zstrerror() "stdio error (consult errno)"
-+# endif
-+#endif
-+
-+/* provide prototypes for these when building zlib without LFS */
-+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-+ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-+ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-+ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-+#endif
-+
-+/* default memLevel */
-+#if MAX_MEM_LEVEL >= 8
-+# define DEF_MEM_LEVEL 8
-+#else
-+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-+#endif
-+
-+/* default i/o buffer size -- double this for output when reading (this and
-+ twice this must be able to fit in an unsigned type) */
-+#define GZBUFSIZE 8192
-+
-+/* gzip modes, also provide a little integrity check on the passed structure */
-+#define GZ_NONE 0
-+#define GZ_READ 7247
-+#define GZ_WRITE 31153
-+#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */
-+
-+/* values for gz_state how */
-+#define LOOK 0 /* look for a gzip header */
-+#define COPY 1 /* copy input directly */
-+#define GZIP 2 /* decompress a gzip stream */
-+
-+/* internal gzip file state data structure */
-+typedef struct {
-+ /* exposed contents for gzgetc() macro */
-+ struct gzFile_s x; /* "x" for exposed */
-+ /* x.have: number of bytes available at x.next */
-+ /* x.next: next output data to deliver or write */
-+ /* x.pos: current position in uncompressed data */
-+ /* used for both reading and writing */
-+ int mode; /* see gzip modes above */
-+ int fd; /* file descriptor */
-+ char *path; /* path or fd for error messages */
-+ unsigned size; /* buffer size, zero if not allocated yet */
-+ unsigned want; /* requested buffer size, default is GZBUFSIZE */
-+ unsigned char *in; /* input buffer */
-+ unsigned char *out; /* output buffer (double-sized when reading) */
-+ int direct; /* 0 if processing gzip, 1 if transparent */
-+ /* just for reading */
-+ int how; /* 0: get header, 1: copy, 2: decompress */
-+ z_off64_t start; /* where the gzip data started, for rewinding */
-+ int eof; /* true if end of input file reached */
-+ int past; /* true if read requested past end */
-+ /* just for writing */
-+ int level; /* compression level */
-+ int strategy; /* compression strategy */
-+ /* seek request */
-+ z_off64_t skip; /* amount to skip (already rewound if backwards) */
-+ int seek; /* true if seek request pending */
-+ /* error information */
-+ int err; /* error code */
-+ char *msg; /* error message */
-+ /* zlib inflate or deflate stream */
-+ z_stream strm; /* stream structure in-place (not a pointer) */
-+} gz_state;
-+typedef gz_state FAR *gz_statep;
-+
-+/* shared functions */
-+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
-+#if defined UNDER_CE
-+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
-+#endif
-+
-+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
-+ value -- needed when comparing unsigned to z_off64_t, which is signed
-+ (possible z_off64_t types off_t, off64_t, and long are all signed) */
-+#ifdef INT_MAX
-+# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-+#else
-+unsigned ZLIB_INTERNAL gz_intmax OF((void));
-+# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-+#endif
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/gzlib.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,658 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* gzlib.c -- zlib functions common to reading and writing gzip files
-+ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "gzguts.h"
-+
-+#if defined(_WIN32) && !defined(__BORLANDC__)
-+# define LSEEK _lseeki64
-+#else
-+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-+# define LSEEK lseek64
-+#else
-+# define LSEEK lseek
-+#endif
-+#endif
-+
-+/* Local functions */
-+local void gz_reset OF((gz_statep));
-+local gzFile gz_open OF((const void *, int, const char *));
-+
-+#if defined UNDER_CE
-+
-+/* Map the Windows error number in ERROR to a locale-dependent error message
-+ string and return a pointer to it. Typically, the values for ERROR come
-+ from GetLastError.
-+
-+ The string pointed to shall not be modified by the application, but may be
-+ overwritten by a subsequent call to gz_strwinerror
-+
-+ The gz_strwinerror function does not change the current setting of
-+ GetLastError. */
-+char ZLIB_INTERNAL *gz_strwinerror (error)
-+ DWORD error;
-+{
-+ static char buf[1024];
-+
-+ wchar_t *msgbuf;
-+ DWORD lasterr = GetLastError();
-+ DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
-+ | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-+ NULL,
-+ error,
-+ 0, /* Default language */
-+ (LPVOID)&msgbuf,
-+ 0,
-+ NULL);
-+ if (chars != 0) {
-+ /* If there is an \r\n appended, zap it. */
-+ if (chars >= 2
-+ && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
-+ chars -= 2;
-+ msgbuf[chars] = 0;
-+ }
-+
-+ if (chars > sizeof (buf) - 1) {
-+ chars = sizeof (buf) - 1;
-+ msgbuf[chars] = 0;
-+ }
-+
-+ wcstombs(buf, msgbuf, chars + 1);
-+ LocalFree(msgbuf);
-+ }
-+ else {
-+ sprintf(buf, "unknown win32 error (%ld)", error);
-+ }
-+
-+ SetLastError(lasterr);
-+ return buf;
-+}
-+
-+#endif /* UNDER_CE */
-+
-+/* Reset gzip file state */
-+local void gz_reset(state)
-+ gz_statep state;
-+{
-+ state->x.have = 0; /* no output data available */
-+ if (state->mode == GZ_READ) { /* for reading ... */
-+ state->eof = 0; /* not at end of file */
-+ state->past = 0; /* have not read past end yet */
-+ state->how = LOOK; /* look for gzip header */
-+ }
-+ state->seek = 0; /* no seek request pending */
-+ gz_error(state, Z_OK, NULL); /* clear error */
-+ state->x.pos = 0; /* no uncompressed data yet */
-+ state->strm.avail_in = 0; /* no input data yet */
-+}
-+
-+/* Open a gzip file either by name or file descriptor. */
-+local gzFile gz_open(path, fd, mode)
-+ const void *path;
-+ int fd;
-+ const char *mode;
-+{
-+ gz_statep state;
-+ size_t len;
-+ int oflag;
-+#ifdef O_CLOEXEC
-+ int cloexec = 0;
-+#endif
-+#ifdef O_EXCL
-+ int exclusive = 0;
-+#endif
-+
-+ /* check input */
-+ if (path == NULL)
-+ return NULL;
-+
-+ /* allocate gzFile structure to return */
-+ state = (gz_statep)malloc(sizeof(gz_state));
-+ if (state == NULL)
-+ return NULL;
-+ state->size = 0; /* no buffers allocated yet */
-+ state->want = GZBUFSIZE; /* requested buffer size */
-+ state->msg = NULL; /* no error message yet */
-+
-+ /* interpret mode */
-+ state->mode = GZ_NONE;
-+ state->level = Z_DEFAULT_COMPRESSION;
-+ state->strategy = Z_DEFAULT_STRATEGY;
-+ state->direct = 0;
-+ while (*mode) {
-+ if (*mode >= '0' && *mode <= '9')
-+ state->level = *mode - '0';
-+ else
-+ switch (*mode) {
-+ case 'r':
-+ state->mode = GZ_READ;
-+ break;
-+#ifndef NO_GZCOMPRESS
-+ case 'w':
-+ state->mode = GZ_WRITE;
-+ break;
-+ case 'a':
-+ state->mode = GZ_APPEND;
-+ break;
-+#endif
-+ case '+': /* can't read and write at the same time */
-+ free(state);
-+ return NULL;
-+ case 'b': /* ignore -- will request binary anyway */
-+ break;
-+#ifdef O_CLOEXEC
-+ case 'e':
-+ cloexec = 1;
-+ break;
-+#endif
-+#ifdef O_EXCL
-+ case 'x':
-+ exclusive = 1;
-+ break;
-+#endif
-+ case 'f':
-+ state->strategy = Z_FILTERED;
-+ break;
-+ case 'h':
-+ state->strategy = Z_HUFFMAN_ONLY;
-+ break;
-+ case 'R':
-+ state->strategy = Z_RLE;
-+ break;
-+ case 'F':
-+ state->strategy = Z_FIXED;
-+ break;
-+ case 'T':
-+ state->direct = 1;
-+ break;
-+ default: /* could consider as an error, but just ignore */
-+ ;
-+ }
-+ mode++;
-+ }
-+
-+ /* must provide an "r", "w", or "a" */
-+ if (state->mode == GZ_NONE) {
-+ free(state);
-+ return NULL;
-+ }
-+
-+ /* can't force transparent read */
-+ if (state->mode == GZ_READ) {
-+ if (state->direct) {
-+ free(state);
-+ return NULL;
-+ }
-+ state->direct = 1; /* for empty file */
-+ }
-+
-+ /* save the path name for error messages */
-+#ifdef _WIN32
-+ if (fd == -2) {
-+ len = wcstombs(NULL, path, 0);
-+ if (len == (size_t)-1)
-+ len = 0;
-+ }
-+ else
-+#endif
-+ len = strlen((const char *)path);
-+ state->path = (char *)malloc(len + 1);
-+ if (state->path == NULL) {
-+ free(state);
-+ return NULL;
-+ }
-+#ifdef _WIN32
-+ if (fd == -2)
-+ if (len)
-+ wcstombs(state->path, path, len + 1);
-+ else
-+ *(state->path) = 0;
-+ else
-+#endif
-+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-+ snprintf(state->path, len + 1, "%s", (const char *)path);
-+#else
-+ strcpy(state->path, path);
-+#endif
-+
-+ /* compute the flags for open() */
-+ oflag =
-+#ifdef O_LARGEFILE
-+ O_LARGEFILE |
-+#endif
-+#ifdef O_BINARY
-+ O_BINARY |
-+#endif
-+#ifdef O_CLOEXEC
-+ (cloexec ? O_CLOEXEC : 0) |
-+#endif
-+ (state->mode == GZ_READ ?
-+ O_RDONLY :
-+ (O_WRONLY | O_CREAT |
-+#ifdef O_EXCL
-+ (exclusive ? O_EXCL : 0) |
-+#endif
-+ (state->mode == GZ_WRITE ?
-+ O_TRUNC :
-+ O_APPEND)));
-+
-+ /* open the file with the appropriate flags (or just use fd) */
-+ state->fd = fd > -1 ? fd : (
-+#ifdef _WIN32
-+ fd == -2 ? _wopen(path, oflag, 0666) :
-+#endif
-+ open((const char *)path, oflag, 0666));
-+ if (state->fd == -1) {
-+ free(state->path);
-+ free(state);
-+ return NULL;
-+ }
-+ if (state->mode == GZ_APPEND)
-+ state->mode = GZ_WRITE; /* simplify later checks */
-+
-+ /* save the current position for rewinding (only if reading) */
-+ if (state->mode == GZ_READ) {
-+ state->start = LSEEK(state->fd, 0, SEEK_CUR);
-+ if (state->start == -1) state->start = 0;
-+ }
-+
-+ /* initialize stream */
-+ gz_reset(state);
-+
-+ /* return stream */
-+ return (gzFile)state;
-+}
-+
-+/* -- see zlib.h -- */
-+gzFile ZEXPORT gzopen(path, mode)
-+ const char *path;
-+ const char *mode;
-+{
-+ return gz_open(path, -1, mode);
-+}
-+
-+/* -- see zlib.h -- */
-+gzFile ZEXPORT gzopen64(path, mode)
-+ const char *path;
-+ const char *mode;
-+{
-+ return gz_open(path, -1, mode);
-+}
-+
-+/* -- see zlib.h -- */
-+gzFile ZEXPORT gzdopen(fd, mode)
-+ int fd;
-+ const char *mode;
-+{
-+ char *path; /* identifier for error messages */
-+ gzFile gz;
-+
-+ if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
-+ return NULL;
-+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-+ snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
-+#else
-+ sprintf(path, "<fd:%d>", fd); /* for debugging */
-+#endif
-+ gz = gz_open(path, fd, mode);
-+ free(path);
-+ return gz;
-+}
-+
-+/* -- see zlib.h -- */
-+#ifdef _WIN32
-+gzFile ZEXPORT gzopen_w(path, mode)
-+ const wchar_t *path;
-+ const char *mode;
-+{
-+ return gz_open(path, -2, mode);
-+}
-+#endif
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzbuffer(file, size)
-+ gzFile file;
-+ unsigned size;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return -1;
-+
-+ /* make sure we haven't already allocated memory */
-+ if (state->size != 0)
-+ return -1;
-+
-+ /* check and set requested size */
-+ if (size < 2)
-+ size = 2; /* need two bytes to check magic header */
-+ state->want = size;
-+ return 0;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzrewind(file)
-+ gzFile file;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+
-+ /* check that we're reading and that there's no error */
-+ if (state->mode != GZ_READ ||
-+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
-+ return -1;
-+
-+ /* back up and start over */
-+ if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
-+ return -1;
-+ gz_reset(state);
-+ return 0;
-+}
-+
-+/* -- see zlib.h -- */
-+z_off64_t ZEXPORT gzseek64(file, offset, whence)
-+ gzFile file;
-+ z_off64_t offset;
-+ int whence;
-+{
-+ unsigned n;
-+ z_off64_t ret;
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return -1;
-+
-+ /* check that there's no error */
-+ if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-+ return -1;
-+
-+ /* can only seek from start or relative to current position */
-+ if (whence != SEEK_SET && whence != SEEK_CUR)
-+ return -1;
-+
-+ /* normalize offset to a SEEK_CUR specification */
-+ if (whence == SEEK_SET)
-+ offset -= state->x.pos;
-+ else if (state->seek)
-+ offset += state->skip;
-+ state->seek = 0;
-+
-+ /* if within raw area while reading, just go there */
-+ if (state->mode == GZ_READ && state->how == COPY &&
-+ state->x.pos + offset >= 0) {
-+ ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
-+ if (ret == -1)
-+ return -1;
-+ state->x.have = 0;
-+ state->eof = 0;
-+ state->past = 0;
-+ state->seek = 0;
-+ gz_error(state, Z_OK, NULL);
-+ state->strm.avail_in = 0;
-+ state->x.pos += offset;
-+ return state->x.pos;
-+ }
-+
-+ /* calculate skip amount, rewinding if needed for back seek when reading */
-+ if (offset < 0) {
-+ if (state->mode != GZ_READ) /* writing -- can't go backwards */
-+ return -1;
-+ offset += state->x.pos;
-+ if (offset < 0) /* before start of file! */
-+ return -1;
-+ if (gzrewind(file) == -1) /* rewind, then skip to offset */
-+ return -1;
-+ }
-+
-+ /* if reading, skip what's in output buffer (one less gzgetc() check) */
-+ if (state->mode == GZ_READ) {
-+ n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
-+ (unsigned)offset : state->x.have;
-+ state->x.have -= n;
-+ state->x.next += n;
-+ state->x.pos += n;
-+ offset -= n;
-+ }
-+
-+ /* request skip (if not zero) */
-+ if (offset) {
-+ state->seek = 1;
-+ state->skip = offset;
-+ }
-+ return state->x.pos + offset;
-+}
-+
-+/* -- see zlib.h -- */
-+z_off_t ZEXPORT gzseek(file, offset, whence)
-+ gzFile file;
-+ z_off_t offset;
-+ int whence;
-+{
-+ z_off64_t ret;
-+
-+ ret = gzseek64(file, (z_off64_t)offset, whence);
-+ return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-+}
-+
-+/* -- see zlib.h -- */
-+z_off64_t ZEXPORT gztell64(file)
-+ gzFile file;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return -1;
-+
-+ /* return position */
-+ return state->x.pos + (state->seek ? state->skip : 0);
-+}
-+
-+/* -- see zlib.h -- */
-+z_off_t ZEXPORT gztell(file)
-+ gzFile file;
-+{
-+ z_off64_t ret;
-+
-+ ret = gztell64(file);
-+ return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-+}
-+
-+/* -- see zlib.h -- */
-+z_off64_t ZEXPORT gzoffset64(file)
-+ gzFile file;
-+{
-+ z_off64_t offset;
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return -1;
-+
-+ /* compute and return effective offset in file */
-+ offset = LSEEK(state->fd, 0, SEEK_CUR);
-+ if (offset == -1)
-+ return -1;
-+ if (state->mode == GZ_READ) /* reading */
-+ offset -= state->strm.avail_in; /* don't count buffered input */
-+ return offset;
-+}
-+
-+/* -- see zlib.h -- */
-+z_off_t ZEXPORT gzoffset(file)
-+ gzFile file;
-+{
-+ z_off64_t ret;
-+
-+ ret = gzoffset64(file);
-+ return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzeof(file)
-+ gzFile file;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return 0;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return 0;
-+
-+ /* return end-of-file state */
-+ return state->mode == GZ_READ ? state->past : 0;
-+}
-+
-+/* -- see zlib.h -- */
-+const char * ZEXPORT gzerror(file, errnum)
-+ gzFile file;
-+ int *errnum;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return NULL;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return NULL;
-+
-+ /* return error information */
-+ if (errnum != NULL)
-+ *errnum = state->err;
-+ return state->err == Z_MEM_ERROR ? "out of memory" :
-+ (state->msg == NULL ? "" : state->msg);
-+}
-+
-+/* -- see zlib.h -- */
-+void ZEXPORT gzclearerr(file)
-+ gzFile file;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure and check integrity */
-+ if (file == NULL)
-+ return;
-+ state = (gz_statep)file;
-+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-+ return;
-+
-+ /* clear error and end-of-file */
-+ if (state->mode == GZ_READ) {
-+ state->eof = 0;
-+ state->past = 0;
-+ }
-+ gz_error(state, Z_OK, NULL);
-+}
-+
-+/* Create an error message in allocated memory and set state->err and
-+ state->msg accordingly. Free any previous error message already there. Do
-+ not try to free or allocate space if the error is Z_MEM_ERROR (out of
-+ memory). Simply save the error message as a static string. If there is an
-+ allocation failure constructing the error message, then convert the error to
-+ out of memory. */
-+void ZLIB_INTERNAL gz_error(state, err, msg)
-+ gz_statep state;
-+ int err;
-+ const char *msg;
-+{
-+ /* free previously allocated message and clear */
-+ if (state->msg != NULL) {
-+ if (state->err != Z_MEM_ERROR)
-+ free(state->msg);
-+ state->msg = NULL;
-+ }
-+
-+ /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
-+ if (err != Z_OK && err != Z_BUF_ERROR)
-+ state->x.have = 0;
-+
-+ /* set error code, and if no message, then done */
-+ state->err = err;
-+ if (msg == NULL)
-+ return;
-+
-+ /* for an out of memory error, return literal string when requested */
-+ if (err == Z_MEM_ERROR)
-+ return;
-+
-+ /* construct error message with path */
-+ if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
-+ NULL) {
-+ state->err = Z_MEM_ERROR;
-+ return;
-+ }
-+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-+ snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
-+ "%s%s%s", state->path, ": ", msg);
-+#else
-+ strcpy(state->msg, state->path);
-+ strcat(state->msg, ": ");
-+ strcat(state->msg, msg);
-+#endif
-+ return;
-+}
-+
-+#ifndef INT_MAX
-+/* portably return maximum value for an int (when limits.h presumed not
-+ available) -- we need to do this to cover cases where 2's complement not
-+ used, since C standard permits 1's complement and sign-bit representations,
-+ otherwise we could just use ((unsigned)-1) >> 1 */
-+unsigned ZLIB_INTERNAL gz_intmax()
-+{
-+ unsigned p, q;
-+
-+ p = 1;
-+ do {
-+ q = p;
-+ p <<= 1;
-+ p++;
-+ } while (p > q);
-+ return q >> 1;
-+}
-+#endif
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/gzread.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,618 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* gzread.c -- zlib functions for reading gzip files
-+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "gzguts.h"
-+
-+/* Local functions */
-+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
-+local int gz_avail OF((gz_statep));
-+local int gz_look OF((gz_statep));
-+local int gz_decomp OF((gz_statep));
-+local int gz_fetch OF((gz_statep));
-+local int gz_skip OF((gz_statep, z_off64_t));
-+
-+/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from
-+ state->fd, and update state->eof, state->err, and state->msg as appropriate.
-+ This function needs to loop on read(), since read() is not guaranteed to
-+ read the number of bytes requested, depending on the type of descriptor. */
-+local int gz_load(state, buf, len, have)
-+ gz_statep state;
-+ unsigned char *buf;
-+ unsigned len;
-+ unsigned *have;
-+{
-+ int ret;
-+
-+ *have = 0;
-+ do {
-+ ret = read(state->fd, buf + *have, len - *have);
-+ if (ret <= 0)
-+ break;
-+ *have += ret;
-+ } while (*have < len);
-+ if (ret < 0) {
-+ gz_error(state, Z_ERRNO, zstrerror());
-+ return -1;
-+ }
-+ if (ret == 0)
-+ state->eof = 1;
-+ return 0;
-+}
-+
-+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
-+ error, 0 otherwise. Note that the eof flag is set when the end of the input
-+ file is reached, even though there may be unused data in the buffer. Once
-+ that data has been used, no more attempts will be made to read the file.
-+ If strm->avail_in != 0, then the current data is moved to the beginning of
-+ the input buffer, and then the remainder of the buffer is loaded with the
-+ available data from the input file. */
-+local int gz_avail(state)
-+ gz_statep state;
-+{
-+ unsigned got;
-+ z_streamp strm = &(state->strm);
-+
-+ if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-+ return -1;
-+ if (state->eof == 0) {
-+ if (strm->avail_in) { /* copy what's there to the start */
-+ unsigned char *p = state->in;
-+ unsigned const char *q = strm->next_in;
-+ unsigned n = strm->avail_in;
-+ do {
-+ *p++ = *q++;
-+ } while (--n);
-+ }
-+ if (gz_load(state, state->in + strm->avail_in,
-+ state->size - strm->avail_in, &got) == -1)
-+ return -1;
-+ strm->avail_in += got;
-+ strm->next_in = state->in;
-+ }
-+ return 0;
-+}
-+
-+/* Look for gzip header, set up for inflate or copy. state->x.have must be 0.
-+ If this is the first time in, allocate required memory. state->how will be
-+ left unchanged if there is no more input data available, will be set to COPY
-+ if there is no gzip header and direct copying will be performed, or it will
-+ be set to GZIP for decompression. If direct copying, then leftover input
-+ data from the input buffer will be copied to the output buffer. In that
-+ case, all further file reads will be directly to either the output buffer or
-+ a user buffer. If decompressing, the inflate state will be initialized.
-+ gz_look() will return 0 on success or -1 on failure. */
-+local int gz_look(state)
-+ gz_statep state;
-+{
-+ z_streamp strm = &(state->strm);
-+
-+ /* allocate read buffers and inflate memory */
-+ if (state->size == 0) {
-+ /* allocate buffers */
-+ state->in = (unsigned char *)malloc(state->want);
-+ state->out = (unsigned char *)malloc(state->want << 1);
-+ if (state->in == NULL || state->out == NULL) {
-+ if (state->out != NULL)
-+ free(state->out);
-+ if (state->in != NULL)
-+ free(state->in);
-+ gz_error(state, Z_MEM_ERROR, "out of memory");
-+ return -1;
-+ }
-+ state->size = state->want;
-+
-+ /* allocate inflate memory */
-+ state->strm.zalloc = Z_NULL;
-+ state->strm.zfree = Z_NULL;
-+ state->strm.opaque = Z_NULL;
-+ state->strm.avail_in = 0;
-+ state->strm.next_in = Z_NULL;
-+ if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) { /* gunzip */
-+ free(state->out);
-+ free(state->in);
-+ state->size = 0;
-+ gz_error(state, Z_MEM_ERROR, "out of memory");
-+ return -1;
-+ }
-+ }
-+
-+ /* get at least the magic bytes in the input buffer */
-+ if (strm->avail_in < 2) {
-+ if (gz_avail(state) == -1)
-+ return -1;
-+ if (strm->avail_in == 0)
-+ return 0;
-+ }
-+
-+ /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
-+ a logical dilemma here when considering the case of a partially written
-+ gzip file, to wit, if a single 31 byte is written, then we cannot tell
-+ whether this is a single-byte file, or just a partially written gzip
-+ file -- for here we assume that if a gzip file is being written, then
-+ the header will be written in a single operation, so that reading a
-+ single byte is sufficient indication that it is not a gzip file) */
-+ if (strm->avail_in > 1 &&
-+ strm->next_in[0] == 31 && strm->next_in[1] == 139) {
-+ inflateReset(strm);
-+ state->how = GZIP;
-+ state->direct = 0;
-+ return 0;
-+ }
-+
-+ /* no gzip header -- if we were decoding gzip before, then this is trailing
-+ garbage. Ignore the trailing garbage and finish. */
-+ if (state->direct == 0) {
-+ strm->avail_in = 0;
-+ state->eof = 1;
-+ state->x.have = 0;
-+ return 0;
-+ }
-+
-+ /* doing raw i/o, copy any leftover input to output -- this assumes that
-+ the output buffer is larger than the input buffer, which also assures
-+ space for gzungetc() */
-+ state->x.next = state->out;
-+ if (strm->avail_in) {
-+ memcpy(state->x.next, strm->next_in, strm->avail_in);
-+ state->x.have = strm->avail_in;
-+ strm->avail_in = 0;
-+ }
-+ state->how = COPY;
-+ state->direct = 1;
-+ return 0;
-+}
-+
-+/* Decompress from input to the provided next_out and avail_out in the state.
-+ On return, state->x.have and state->x.next point to the just decompressed
-+ data. If the gzip stream completes, state->how is reset to LOOK to look for
-+ the next gzip stream or raw data, once state->x.have is depleted. Returns 0
-+ on success, -1 on failure. */
-+local int gz_decomp(state)
-+ gz_statep state;
-+{
-+ int ret = Z_OK;
-+ unsigned had;
-+ z_streamp strm = &(state->strm);
-+
-+ /* fill output buffer up to end of deflate stream */
-+ had = strm->avail_out;
-+ do {
-+ /* get more input for inflate() */
-+ if (strm->avail_in == 0 && gz_avail(state) == -1)
-+ return -1;
-+ if (strm->avail_in == 0) {
-+ gz_error(state, Z_BUF_ERROR, "unexpected end of file");
-+ break;
-+ }
-+
-+ /* decompress and handle errors */
-+ ret = inflate(strm, Z_NO_FLUSH);
-+ if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
-+ gz_error(state, Z_STREAM_ERROR,
-+ "internal error: inflate stream corrupt");
-+ return -1;
-+ }
-+ if (ret == Z_MEM_ERROR) {
-+ gz_error(state, Z_MEM_ERROR, "out of memory");
-+ return -1;
-+ }
-+ if (ret == Z_DATA_ERROR) { /* deflate stream invalid */
-+ gz_error(state, Z_DATA_ERROR,
-+ strm->msg == NULL ? "compressed data error" : strm->msg);
-+ return -1;
-+ }
-+ } while (strm->avail_out && ret != Z_STREAM_END);
-+
-+ /* update available output */
-+ state->x.have = had - strm->avail_out;
-+ state->x.next = strm->next_out - state->x.have;
-+
-+ /* if the gzip stream completed successfully, look for another */
-+ if (ret == Z_STREAM_END)
-+ state->how = LOOK;
-+
-+ /* good decompression */
-+ return 0;
-+}
-+
-+/* Fetch data and put it in the output buffer. Assumes state->x.have is 0.
-+ Data is either copied from the input file or decompressed from the input
-+ file depending on state->how. If state->how is LOOK, then a gzip header is
-+ looked for to determine whether to copy or decompress. Returns -1 on error,
-+ otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the
-+ end of the input file has been reached and all data has been processed. */
-+local int gz_fetch(state)
-+ gz_statep state;
-+{
-+ z_streamp strm = &(state->strm);
-+
-+ do {
-+ switch(state->how) {
-+ case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */
-+ if (gz_look(state) == -1)
-+ return -1;
-+ if (state->how == LOOK)
-+ return 0;
-+ break;
-+ case COPY: /* -> COPY */
-+ if (gz_load(state, state->out, state->size << 1, &(state->x.have))
-+ == -1)
-+ return -1;
-+ state->x.next = state->out;
-+ return 0;
-+ case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */
-+ strm->avail_out = state->size << 1;
-+ strm->next_out = state->out;
-+ if (gz_decomp(state) == -1)
-+ return -1;
-+ }
-+ } while (state->x.have == 0 && (!state->eof || strm->avail_in));
-+ return 0;
-+}
-+
-+/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */
-+local int gz_skip(state, len)
-+ gz_statep state;
-+ z_off64_t len;
-+{
-+ unsigned n;
-+
-+ /* skip over len bytes or reach end-of-file, whichever comes first */
-+ while (len)
-+ /* skip over whatever is in output buffer */
-+ if (state->x.have) {
-+ n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
-+ (unsigned)len : state->x.have;
-+ state->x.have -= n;
-+ state->x.next += n;
-+ state->x.pos += n;
-+ len -= n;
-+ }
-+
-+ /* output buffer empty -- return if we're at the end of the input */
-+ else if (state->eof && state->strm.avail_in == 0)
-+ break;
-+
-+ /* need more data to skip -- load up output buffer */
-+ else {
-+ /* get more output, looking for header if required */
-+ if (gz_fetch(state) == -1)
-+ return -1;
-+ }
-+ return 0;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzread(file, buf, len)
-+ gzFile file;
-+ voidp buf;
-+ unsigned len;
-+{
-+ unsigned got, n;
-+ gz_statep state;
-+ z_streamp strm;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ strm = &(state->strm);
-+
-+ /* check that we're reading and that there's no (serious) error */
-+ if (state->mode != GZ_READ ||
-+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
-+ return -1;
-+
-+ /* since an int is returned, make sure len fits in one, otherwise return
-+ with an error (this avoids the flaw in the interface) */
-+ if ((int)len < 0) {
-+ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-+ return -1;
-+ }
-+
-+ /* if len is zero, avoid unnecessary operations */
-+ if (len == 0)
-+ return 0;
-+
-+ /* process a skip request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_skip(state, state->skip) == -1)
-+ return -1;
-+ }
-+
-+ /* get len bytes to buf, or less than len if at the end */
-+ got = 0;
-+ do {
-+ /* first just try copying data from the output buffer */
-+ if (state->x.have) {
-+ n = state->x.have > len ? len : state->x.have;
-+ memcpy(buf, state->x.next, n);
-+ state->x.next += n;
-+ state->x.have -= n;
-+ }
-+
-+ /* output buffer empty -- return if we're at the end of the input */
-+ else if (state->eof && strm->avail_in == 0) {
-+ state->past = 1; /* tried to read past end */
-+ break;
-+ }
-+
-+ /* need output data -- for small len or new stream load up our output
-+ buffer */
-+ else if (state->how == LOOK || len < (state->size << 1)) {
-+ /* get more output, looking for header if required */
-+ if (gz_fetch(state) == -1)
-+ return -1;
-+ continue; /* no progress yet -- go back to copy above */
-+ /* the copy above assures that we will leave with space in the
-+ output buffer, allowing at least one gzungetc() to succeed */
-+ }
-+
-+ /* large len -- read directly into user buffer */
-+ else if (state->how == COPY) { /* read directly */
-+ if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
-+ return -1;
-+ }
-+
-+ /* large len -- decompress directly into user buffer */
-+ else { /* state->how == GZIP */
-+ strm->avail_out = len;
-+ strm->next_out = (unsigned char *)buf;
-+ if (gz_decomp(state) == -1)
-+ return -1;
-+ n = state->x.have;
-+ state->x.have = 0;
-+ }
-+
-+ /* update progress */
-+ len -= n;
-+ buf = (char *)buf + n;
-+ got += n;
-+ state->x.pos += n;
-+ } while (len);
-+
-+ /* return number of bytes read into user buffer (will fit in int) */
-+ return (int)got;
-+}
-+
-+/* -- see zlib.h -- */
-+#ifdef Z_PREFIX_SET
-+# undef z_gzgetc
-+#else
-+# undef gzgetc
-+#endif
-+int ZEXPORT gzgetc(file)
-+ gzFile file;
-+{
-+ int ret;
-+ unsigned char buf[1];
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+
-+ /* check that we're reading and that there's no (serious) error */
-+ if (state->mode != GZ_READ ||
-+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
-+ return -1;
-+
-+ /* try output buffer (no need to check for skip request) */
-+ if (state->x.have) {
-+ state->x.have--;
-+ state->x.pos++;
-+ return *(state->x.next)++;
-+ }
-+
-+ /* nothing there -- try gzread() */
-+ ret = gzread(file, buf, 1);
-+ return ret < 1 ? -1 : buf[0];
-+}
-+
-+int ZEXPORT gzgetc_(file)
-+gzFile file;
-+{
-+ return gzgetc(file);
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzungetc(c, file)
-+ int c;
-+ gzFile file;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+
-+ /* check that we're reading and that there's no (serious) error */
-+ if (state->mode != GZ_READ ||
-+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
-+ return -1;
-+
-+ /* process a skip request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_skip(state, state->skip) == -1)
-+ return -1;
-+ }
-+
-+ /* can't push EOF */
-+ if (c < 0)
-+ return -1;
-+
-+ /* if output buffer empty, put byte at end (allows more pushing) */
-+ if (state->x.have == 0) {
-+ state->x.have = 1;
-+ state->x.next = state->out + (state->size << 1) - 1;
-+ state->x.next[0] = c;
-+ state->x.pos--;
-+ state->past = 0;
-+ return c;
-+ }
-+
-+ /* if no room, give up (must have already done a gzungetc()) */
-+ if (state->x.have == (state->size << 1)) {
-+ gz_error(state, Z_DATA_ERROR, "out of room to push characters");
-+ return -1;
-+ }
-+
-+ /* slide output data if needed and insert byte before existing data */
-+ if (state->x.next == state->out) {
-+ unsigned char *src = state->out + state->x.have;
-+ unsigned char *dest = state->out + (state->size << 1);
-+ while (src > state->out)
-+ *--dest = *--src;
-+ state->x.next = dest;
-+ }
-+ state->x.have++;
-+ state->x.next--;
-+ state->x.next[0] = c;
-+ state->x.pos--;
-+ state->past = 0;
-+ return c;
-+}
-+
-+/* -- see zlib.h -- */
-+char * ZEXPORT gzgets(file, buf, len)
-+ gzFile file;
-+ char *buf;
-+ int len;
-+{
-+ unsigned left, n;
-+ char *str;
-+ unsigned char *eol;
-+ gz_statep state;
-+
-+ /* check parameters and get internal structure */
-+ if (file == NULL || buf == NULL || len < 1)
-+ return NULL;
-+ state = (gz_statep)file;
-+
-+ /* check that we're reading and that there's no (serious) error */
-+ if (state->mode != GZ_READ ||
-+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
-+ return NULL;
-+
-+ /* process a skip request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_skip(state, state->skip) == -1)
-+ return NULL;
-+ }
-+
-+ /* copy output bytes up to new line or len - 1, whichever comes first --
-+ append a terminating zero to the string (we don't check for a zero in
-+ the contents, let the user worry about that) */
-+ str = buf;
-+ left = (unsigned)len - 1;
-+ if (left) do {
-+ /* assure that something is in the output buffer */
-+ if (state->x.have == 0 && gz_fetch(state) == -1)
-+ return NULL; /* error */
-+ if (state->x.have == 0) { /* end of file */
-+ state->past = 1; /* read past end */
-+ break; /* return what we have */
-+ }
-+
-+ /* look for end-of-line in current output buffer */
-+ n = state->x.have > left ? left : state->x.have;
-+ eol = (unsigned char *)memchr(state->x.next, '\n', n);
-+ if (eol != NULL)
-+ n = (unsigned)(eol - state->x.next) + 1;
-+
-+ /* copy through end-of-line, or remainder if not found */
-+ memcpy(buf, state->x.next, n);
-+ state->x.have -= n;
-+ state->x.next += n;
-+ state->x.pos += n;
-+ left -= n;
-+ buf += n;
-+ } while (left && eol == NULL);
-+
-+ /* return terminated string, or if nothing, end of file */
-+ if (buf == str)
-+ return NULL;
-+ buf[0] = 0;
-+ return str;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzdirect(file)
-+ gzFile file;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return 0;
-+ state = (gz_statep)file;
-+
-+ /* if the state is not known, but we can find out, then do so (this is
-+ mainly for right after a gzopen() or gzdopen()) */
-+ if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
-+ (void)gz_look(state);
-+
-+ /* return 1 if transparent, 0 if processing a gzip stream */
-+ return state->direct;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzclose_r(file)
-+ gzFile file;
-+{
-+ int ret, err;
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return Z_STREAM_ERROR;
-+ state = (gz_statep)file;
-+
-+ /* check that we're reading */
-+ if (state->mode != GZ_READ)
-+ return Z_STREAM_ERROR;
-+
-+ /* free memory and close file */
-+ if (state->size) {
-+ inflateEnd(&(state->strm));
-+ free(state->out);
-+ free(state->in);
-+ }
-+ err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
-+ gz_error(state, Z_OK, NULL);
-+ free(state->path);
-+ ret = close(state->fd);
-+ free(state);
-+ return ret ? Z_ERRNO : err;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/gzwrite.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,601 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* gzwrite.c -- zlib functions for writing gzip files
-+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "gzguts.h"
-+
-+/* Local functions */
-+local int gz_init OF((gz_statep));
-+local int gz_comp OF((gz_statep, int));
-+local int gz_zero OF((gz_statep, z_off64_t));
-+
-+/* Initialize state for writing a gzip file. Mark initialization by setting
-+ state->size to non-zero. Return -1 on failure or 0 on success. */
-+local int gz_init(state)
-+ gz_statep state;
-+{
-+ int ret;
-+ z_streamp strm = &(state->strm);
-+
-+ /* allocate input buffer */
-+ state->in = (unsigned char *)malloc(state->want);
-+ if (state->in == NULL) {
-+ gz_error(state, Z_MEM_ERROR, "out of memory");
-+ return -1;
-+ }
-+
-+ /* only need output buffer and deflate state if compressing */
-+ if (!state->direct) {
-+ /* allocate output buffer */
-+ state->out = (unsigned char *)malloc(state->want);
-+ if (state->out == NULL) {
-+ free(state->in);
-+ gz_error(state, Z_MEM_ERROR, "out of memory");
-+ return -1;
-+ }
-+
-+ /* allocate deflate memory, set up for gzip compression */
-+ strm->zalloc = Z_NULL;
-+ strm->zfree = Z_NULL;
-+ strm->opaque = Z_NULL;
-+ ret = deflateInit2(strm, state->level, Z_DEFLATED,
-+ MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
-+ if (ret != Z_OK) {
-+ free(state->out);
-+ free(state->in);
-+ gz_error(state, Z_MEM_ERROR, "out of memory");
-+ return -1;
-+ }
-+ }
-+
-+ /* mark state as initialized */
-+ state->size = state->want;
-+
-+ /* initialize write buffer if compressing */
-+ if (!state->direct) {
-+ strm->avail_out = state->size;
-+ strm->next_out = state->out;
-+ state->x.next = strm->next_out;
-+ }
-+ return 0;
-+}
-+
-+/* Compress whatever is at avail_in and next_in and write to the output file.
-+ Return -1 if there is an error writing to the output file, otherwise 0.
-+ flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH,
-+ then the deflate() state is reset to start a new gzip stream. If gz->direct
-+ is true, then simply write to the output file without compressing, and
-+ ignore flush. */
-+local int gz_comp(state, flush)
-+ gz_statep state;
-+ int flush;
-+{
-+ int ret, got;
-+ unsigned have;
-+ z_streamp strm = &(state->strm);
-+
-+ /* allocate memory if this is the first time through */
-+ if (state->size == 0 && gz_init(state) == -1)
-+ return -1;
-+
-+ /* write directly if requested */
-+ if (state->direct) {
-+ got = write(state->fd, strm->next_in, strm->avail_in);
-+ if (got < 0 || (unsigned)got != strm->avail_in) {
-+ gz_error(state, Z_ERRNO, zstrerror());
-+ return -1;
-+ }
-+ strm->avail_in = 0;
-+ return 0;
-+ }
-+
-+ /* run deflate() on provided input until it produces no more output */
-+ ret = Z_OK;
-+ do {
-+ /* write out current buffer contents if full, or if flushing, but if
-+ doing Z_FINISH then don't write until we get to Z_STREAM_END */
-+ if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
-+ (flush != Z_FINISH || ret == Z_STREAM_END))) {
-+ have = (unsigned)(strm->next_out - state->x.next);
-+ if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
-+ (unsigned)got != have)) {
-+ gz_error(state, Z_ERRNO, zstrerror());
-+ return -1;
-+ }
-+ if (strm->avail_out == 0) {
-+ strm->avail_out = state->size;
-+ strm->next_out = state->out;
-+ }
-+ state->x.next = strm->next_out;
-+ }
-+
-+ /* compress */
-+ have = strm->avail_out;
-+ ret = deflate(strm, flush);
-+ if (ret == Z_STREAM_ERROR) {
-+ gz_error(state, Z_STREAM_ERROR,
-+ "internal error: deflate stream corrupt");
-+ return -1;
-+ }
-+ have -= strm->avail_out;
-+ } while (have);
-+
-+ /* if that completed a deflate stream, allow another to start */
-+ if (flush == Z_FINISH)
-+ deflateReset(strm);
-+
-+ /* all done, no errors */
-+ return 0;
-+}
-+
-+/* Compress len zeros to output. Return -1 on error, 0 on success. */
-+local int gz_zero(state, len)
-+ gz_statep state;
-+ z_off64_t len;
-+{
-+ int first;
-+ unsigned n;
-+ z_streamp strm = &(state->strm);
-+
-+ /* consume whatever's left in the input buffer */
-+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-+ return -1;
-+
-+ /* compress len zeros (len guaranteed > 0) */
-+ first = 1;
-+ while (len) {
-+ n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
-+ (unsigned)len : state->size;
-+ if (first) {
-+ memset(state->in, 0, n);
-+ first = 0;
-+ }
-+ strm->avail_in = n;
-+ strm->next_in = state->in;
-+ state->x.pos += n;
-+ if (gz_comp(state, Z_NO_FLUSH) == -1)
-+ return -1;
-+ len -= n;
-+ }
-+ return 0;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzwrite(file, buf, len)
-+ gzFile file;
-+ voidpc buf;
-+ unsigned len;
-+{
-+ unsigned put = len;
-+ gz_statep state;
-+ z_streamp strm;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return 0;
-+ state = (gz_statep)file;
-+ strm = &(state->strm);
-+
-+ /* check that we're writing and that there's no error */
-+ if (state->mode != GZ_WRITE || state->err != Z_OK)
-+ return 0;
-+
-+ /* since an int is returned, make sure len fits in one, otherwise return
-+ with an error (this avoids the flaw in the interface) */
-+ if ((int)len < 0) {
-+ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-+ return 0;
-+ }
-+
-+ /* if len is zero, avoid unnecessary operations */
-+ if (len == 0)
-+ return 0;
-+
-+ /* allocate memory if this is the first time through */
-+ if (state->size == 0 && gz_init(state) == -1)
-+ return 0;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ return 0;
-+ }
-+
-+ /* for small len, copy to input buffer, otherwise compress directly */
-+ if (len < state->size) {
-+ /* copy to input buffer, compress when full */
-+ do {
-+ unsigned have, copy;
-+
-+ if (strm->avail_in == 0)
-+ strm->next_in = state->in;
-+ have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-+ copy = state->size - have;
-+ if (copy > len)
-+ copy = len;
-+ memcpy(state->in + have, buf, copy);
-+ strm->avail_in += copy;
-+ state->x.pos += copy;
-+ buf = (const char *)buf + copy;
-+ len -= copy;
-+ if (len && gz_comp(state, Z_NO_FLUSH) == -1)
-+ return 0;
-+ } while (len);
-+ }
-+ else {
-+ /* consume whatever's left in the input buffer */
-+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-+ return 0;
-+
-+ /* directly compress user buffer to file */
-+ strm->avail_in = len;
-+ strm->next_in = (z_const Bytef *)buf;
-+ state->x.pos += len;
-+ if (gz_comp(state, Z_NO_FLUSH) == -1)
-+ return 0;
-+ }
-+
-+ /* input was all buffered or compressed (put will fit in int) */
-+ return (int)put;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzputc(file, c)
-+ gzFile file;
-+ int c;
-+{
-+ unsigned have;
-+ unsigned char buf[1];
-+ gz_statep state;
-+ z_streamp strm;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ strm = &(state->strm);
-+
-+ /* check that we're writing and that there's no error */
-+ if (state->mode != GZ_WRITE || state->err != Z_OK)
-+ return -1;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ return -1;
-+ }
-+
-+ /* try writing to input buffer for speed (state->size == 0 if buffer not
-+ initialized) */
-+ if (state->size) {
-+ if (strm->avail_in == 0)
-+ strm->next_in = state->in;
-+ have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-+ if (have < state->size) {
-+ state->in[have] = c;
-+ strm->avail_in++;
-+ state->x.pos++;
-+ return c & 0xff;
-+ }
-+ }
-+
-+ /* no room in buffer or not initialized, use gz_write() */
-+ buf[0] = c;
-+ if (gzwrite(file, buf, 1) != 1)
-+ return -1;
-+ return c & 0xff;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzputs(file, str)
-+ gzFile file;
-+ const char *str;
-+{
-+ int ret;
-+ unsigned len;
-+
-+ /* write string */
-+ len = (unsigned)strlen(str);
-+ ret = gzwrite(file, str, len);
-+ return ret == 0 && len != 0 ? -1 : ret;
-+}
-+
-+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-+#include <stdarg.h>
-+
-+/* -- see zlib.h -- */
-+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
-+{
-+ int size, len;
-+ gz_statep state;
-+ z_streamp strm;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ strm = &(state->strm);
-+
-+ /* check that we're writing and that there's no error */
-+ if (state->mode != GZ_WRITE || state->err != Z_OK)
-+ return 0;
-+
-+ /* make sure we have some buffer space */
-+ if (state->size == 0 && gz_init(state) == -1)
-+ return 0;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ return 0;
-+ }
-+
-+ /* consume whatever's left in the input buffer */
-+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-+ return 0;
-+
-+ /* do the printf() into the input buffer, put length in len */
-+ size = (int)(state->size);
-+ state->in[size - 1] = 0;
-+#ifdef NO_vsnprintf
-+# ifdef HAS_vsprintf_void
-+ (void)vsprintf((char *)(state->in), format, va);
-+ for (len = 0; len < size; len++)
-+ if (state->in[len] == 0) break;
-+# else
-+ len = vsprintf((char *)(state->in), format, va);
-+# endif
-+#else
-+# ifdef HAS_vsnprintf_void
-+ (void)vsnprintf((char *)(state->in), size, format, va);
-+ len = strlen((char *)(state->in));
-+# else
-+ len = vsnprintf((char *)(state->in), size, format, va);
-+# endif
-+#endif
-+
-+ /* check that printf() results fit in buffer */
-+ if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
-+ return 0;
-+
-+ /* update buffer and position, defer compression until needed */
-+ strm->avail_in = (unsigned)len;
-+ strm->next_in = state->in;
-+ state->x.pos += len;
-+ return len;
-+}
-+
-+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
-+{
-+ va_list va;
-+ int ret;
-+
-+ va_start(va, format);
-+ ret = gzvprintf(file, format, va);
-+ va_end(va);
-+ return ret;
-+}
-+
-+#else /* !STDC && !Z_HAVE_STDARG_H */
-+
-+/* -- see zlib.h -- */
-+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-+ gzFile file;
-+ const char *format;
-+ int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-+{
-+ int size, len;
-+ gz_statep state;
-+ z_streamp strm;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+ strm = &(state->strm);
-+
-+ /* check that can really pass pointer in ints */
-+ if (sizeof(int) != sizeof(void *))
-+ return 0;
-+
-+ /* check that we're writing and that there's no error */
-+ if (state->mode != GZ_WRITE || state->err != Z_OK)
-+ return 0;
-+
-+ /* make sure we have some buffer space */
-+ if (state->size == 0 && gz_init(state) == -1)
-+ return 0;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ return 0;
-+ }
-+
-+ /* consume whatever's left in the input buffer */
-+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-+ return 0;
-+
-+ /* do the printf() into the input buffer, put length in len */
-+ size = (int)(state->size);
-+ state->in[size - 1] = 0;
-+#ifdef NO_snprintf
-+# ifdef HAS_sprintf_void
-+ sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
-+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-+ for (len = 0; len < size; len++)
-+ if (state->in[len] == 0) break;
-+# else
-+ len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
-+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-+# endif
-+#else
-+# ifdef HAS_snprintf_void
-+ snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-+ len = strlen((char *)(state->in));
-+# else
-+ len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
-+ a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
-+ a19, a20);
-+# endif
-+#endif
-+
-+ /* check that printf() results fit in buffer */
-+ if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
-+ return 0;
-+
-+ /* update buffer and position, defer compression until needed */
-+ strm->avail_in = (unsigned)len;
-+ strm->next_in = state->in;
-+ state->x.pos += len;
-+ return len;
-+}
-+
-+#endif
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzflush(file, flush)
-+ gzFile file;
-+ int flush;
-+{
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return -1;
-+ state = (gz_statep)file;
-+
-+ /* check that we're writing and that there's no error */
-+ if (state->mode != GZ_WRITE || state->err != Z_OK)
-+ return Z_STREAM_ERROR;
-+
-+ /* check flush parameter */
-+ if (flush < 0 || flush > Z_FINISH)
-+ return Z_STREAM_ERROR;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ return -1;
-+ }
-+
-+ /* compress remaining data with requested flush */
-+ gz_comp(state, flush);
-+ return state->err;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzsetparams(file, level, strategy)
-+ gzFile file;
-+ int level;
-+ int strategy;
-+{
-+ gz_statep state;
-+ z_streamp strm;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return Z_STREAM_ERROR;
-+ state = (gz_statep)file;
-+ strm = &(state->strm);
-+
-+ /* check that we're writing and that there's no error */
-+ if (state->mode != GZ_WRITE || state->err != Z_OK)
-+ return Z_STREAM_ERROR;
-+
-+ /* if no change is requested, then do nothing */
-+ if (level == state->level && strategy == state->strategy)
-+ return Z_OK;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ return -1;
-+ }
-+
-+ /* change compression parameters for subsequent input */
-+ if (state->size) {
-+ /* flush previous input with previous parameters before changing */
-+ if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
-+ return state->err;
-+ deflateParams(strm, level, strategy);
-+ }
-+ state->level = level;
-+ state->strategy = strategy;
-+ return Z_OK;
-+}
-+
-+/* -- see zlib.h -- */
-+int ZEXPORT gzclose_w(file)
-+ gzFile file;
-+{
-+ int ret = Z_OK;
-+ gz_statep state;
-+
-+ /* get internal structure */
-+ if (file == NULL)
-+ return Z_STREAM_ERROR;
-+ state = (gz_statep)file;
-+
-+ /* check that we're writing */
-+ if (state->mode != GZ_WRITE)
-+ return Z_STREAM_ERROR;
-+
-+ /* check for seek request */
-+ if (state->seek) {
-+ state->seek = 0;
-+ if (gz_zero(state, state->skip) == -1)
-+ ret = state->err;
-+ }
-+
-+ /* flush, free memory, and close file */
-+ if (gz_comp(state, Z_FINISH) == -1)
-+ ret = state->err;
-+ if (state->size) {
-+ if (!state->direct) {
-+ (void)deflateEnd(&(state->strm));
-+ free(state->out);
-+ }
-+ free(state->in);
-+ }
-+ gz_error(state, Z_OK, NULL);
-+ free(state->path);
-+ if (close(state->fd) == -1)
-+ ret = Z_ERRNO;
-+ free(state);
-+ return ret;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/infback.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,664 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* infback.c -- inflate using a call-back interface
-+ * Copyright (C) 1995-2011 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/*
-+ This code is largely copied from inflate.c. Normally either infback.o or
-+ inflate.o would be linked into an application--not both. The interface
-+ with inffast.c is retained so that optimized assembler-coded versions of
-+ inflate_fast() can be used with either inflate.c or infback.c.
-+ */
-+
-+#include "zutil.h"
-+#include "inftrees.h"
-+#include "inflate.h"
-+#include "inffast.h"
-+
-+/* function prototypes */
-+local void fixedtables OF((struct inflate_state FAR *state));
-+
-+/*
-+ strm provides memory allocation functions in zalloc and zfree, or
-+ Z_NULL to use the library memory allocation functions.
-+
-+ windowBits is in the range 8..15, and window is a user-supplied
-+ window and output buffer that is 2**windowBits bytes.
-+ */
-+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-+z_streamp strm;
-+int windowBits;
-+unsigned char FAR *window;
-+const char *version;
-+int stream_size;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-+ stream_size != (int)(sizeof(z_stream)))
-+ return Z_VERSION_ERROR;
-+ if (strm == Z_NULL || window == Z_NULL ||
-+ windowBits < 8 || windowBits > 15)
-+ return Z_STREAM_ERROR;
-+ strm->msg = Z_NULL; /* in case we return an error */
-+ if (strm->zalloc == (alloc_func)0) {
-+#ifdef Z_SOLO
-+ return Z_STREAM_ERROR;
-+#else
-+ strm->zalloc = zcalloc;
-+ strm->opaque = (voidpf)0;
-+#endif
-+ }
-+ if (strm->zfree == (free_func)0)
-+#ifdef Z_SOLO
-+ return Z_STREAM_ERROR;
-+#else
-+ strm->zfree = zcfree;
-+#endif
-+ state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-+ sizeof(struct inflate_state));
-+ if (state == Z_NULL) return Z_MEM_ERROR;
-+ Tracev((stderr, "inflate: allocated\n"));
-+ strm->state = (struct internal_state FAR *)state;
-+ state->dmax = 32768U;
-+ state->wbits = windowBits;
-+ state->wsize = 1U << windowBits;
-+ state->window = window;
-+ state->wnext = 0;
-+ state->whave = 0;
-+ return Z_OK;
-+}
-+
-+/*
-+ Return state with length and distance decoding tables and index sizes set to
-+ fixed code decoding. Normally this returns fixed tables from inffixed.h.
-+ If BUILDFIXED is defined, then instead this routine builds the tables the
-+ first time it's called, and returns those tables the first time and
-+ thereafter. This reduces the size of the code by about 2K bytes, in
-+ exchange for a little execution time. However, BUILDFIXED should not be
-+ used for threaded applications, since the rewriting of the tables and virgin
-+ may not be thread-safe.
-+ */
-+local void fixedtables(state)
-+struct inflate_state FAR *state;
-+{
-+#ifdef BUILDFIXED
-+ static int virgin = 1;
-+ static code *lenfix, *distfix;
-+ static code fixed[544];
-+
-+ /* build fixed huffman tables if first call (may not be thread safe) */
-+ if (virgin) {
-+ unsigned sym, bits;
-+ static code *next;
-+
-+ /* literal/length table */
-+ sym = 0;
-+ while (sym < 144) state->lens[sym++] = 8;
-+ while (sym < 256) state->lens[sym++] = 9;
-+ while (sym < 280) state->lens[sym++] = 7;
-+ while (sym < 288) state->lens[sym++] = 8;
-+ next = fixed;
-+ lenfix = next;
-+ bits = 9;
-+ inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-+
-+ /* distance table */
-+ sym = 0;
-+ while (sym < 32) state->lens[sym++] = 5;
-+ distfix = next;
-+ bits = 5;
-+ inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-+
-+ /* do this just once */
-+ virgin = 0;
-+ }
-+#else /* !BUILDFIXED */
-+# include "inffixed.h"
-+#endif /* BUILDFIXED */
-+ state->lencode = lenfix;
-+ state->lenbits = 9;
-+ state->distcode = distfix;
-+ state->distbits = 5;
-+}
-+
-+/* Macros for inflateBack(): */
-+
-+/* Load returned state from inflate_fast() */
-+#define LOAD() \
-+ do { \
-+ put = strm->next_out; \
-+ left = strm->avail_out; \
-+ next = strm->next_in; \
-+ have = strm->avail_in; \
-+ hold = state->hold; \
-+ bits = state->bits; \
-+ } while (0)
-+
-+/* Set state from registers for inflate_fast() */
-+#define RESTORE() \
-+ do { \
-+ strm->next_out = put; \
-+ strm->avail_out = left; \
-+ strm->next_in = next; \
-+ strm->avail_in = have; \
-+ state->hold = hold; \
-+ state->bits = bits; \
-+ } while (0)
-+
-+/* Clear the input bit accumulator */
-+#define INITBITS() \
-+ do { \
-+ hold = 0; \
-+ bits = 0; \
-+ } while (0)
-+
-+/* Assure that some input is available. If input is requested, but denied,
-+ then return a Z_BUF_ERROR from inflateBack(). */
-+#define PULL() \
-+ do { \
-+ if (have == 0) { \
-+ have = in(in_desc, &next); \
-+ if (have == 0) { \
-+ next = Z_NULL; \
-+ ret = Z_BUF_ERROR; \
-+ goto inf_leave; \
-+ } \
-+ } \
-+ } while (0)
-+
-+/* Get a byte of input into the bit accumulator, or return from inflateBack()
-+ with an error if there is no input available. */
-+#define PULLBYTE() \
-+ do { \
-+ PULL(); \
-+ have--; \
-+ hold += (unsigned long)(*next++) << bits; \
-+ bits += 8; \
-+ } while (0)
-+
-+/* Assure that there are at least n bits in the bit accumulator. If there is
-+ not enough available input to do that, then return from inflateBack() with
-+ an error. */
-+#define NEEDBITS(n) \
-+ do { \
-+ while (bits < (unsigned)(n)) \
-+ PULLBYTE(); \
-+ } while (0)
-+
-+/* Return the low n bits of the bit accumulator (n < 16) */
-+#define BITS(n) \
-+ ((unsigned)hold & ((1U << (n)) - 1))
-+
-+/* Remove n bits from the bit accumulator */
-+#define DROPBITS(n) \
-+ do { \
-+ hold >>= (n); \
-+ bits -= (unsigned)(n); \
-+ } while (0)
-+
-+/* Remove zero to seven bits as needed to go to a byte boundary */
-+#define BYTEBITS() \
-+ do { \
-+ hold >>= bits & 7; \
-+ bits -= bits & 7; \
-+ } while (0)
-+
-+/* Assure that some output space is available, by writing out the window
-+ if it's full. If the write fails, return from inflateBack() with a
-+ Z_BUF_ERROR. */
-+#define ROOM() \
-+ do { \
-+ if (left == 0) { \
-+ put = state->window; \
-+ left = state->wsize; \
-+ state->whave = left; \
-+ if (out(out_desc, put, left)) { \
-+ ret = Z_BUF_ERROR; \
-+ goto inf_leave; \
-+ } \
-+ } \
-+ } while (0)
-+
-+/*
-+ strm provides the memory allocation functions and window buffer on input,
-+ and provides information on the unused input on return. For Z_DATA_ERROR
-+ returns, strm will also provide an error message.
-+
-+ in() and out() are the call-back input and output functions. When
-+ inflateBack() needs more input, it calls in(). When inflateBack() has
-+ filled the window with output, or when it completes with data in the
-+ window, it calls out() to write out the data. The application must not
-+ change the provided input until in() is called again or inflateBack()
-+ returns. The application must not change the window/output buffer until
-+ inflateBack() returns.
-+
-+ in() and out() are called with a descriptor parameter provided in the
-+ inflateBack() call. This parameter can be a structure that provides the
-+ information required to do the read or write, as well as accumulated
-+ information on the input and output such as totals and check values.
-+
-+ in() should return zero on failure. out() should return non-zero on
-+ failure. If either in() or out() fails, than inflateBack() returns a
-+ Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it
-+ was in() or out() that caused in the error. Otherwise, inflateBack()
-+ returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-+ error, or Z_MEM_ERROR if it could not allocate memory for the state.
-+ inflateBack() can also return Z_STREAM_ERROR if the input parameters
-+ are not correct, i.e. strm is Z_NULL or the state was not initialized.
-+ */
-+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-+z_streamp strm;
-+in_func in;
-+void FAR *in_desc;
-+out_func out;
-+void FAR *out_desc;
-+{
-+ struct inflate_state FAR *state;
-+ z_const unsigned char FAR *next; /* next input */
-+ unsigned char FAR *put; /* next output */
-+ unsigned have, left; /* available input and output */
-+ unsigned long hold; /* bit buffer */
-+ unsigned bits; /* bits in bit buffer */
-+ unsigned copy; /* number of stored or match bytes to copy */
-+ unsigned char FAR *from; /* where to copy match bytes from */
-+ code here; /* current decoding table entry */
-+ code last; /* parent table entry */
-+ unsigned len; /* length to copy for repeats, bits to drop */
-+ int ret; /* return code */
-+ static const unsigned short order[19] = /* permutation of code lengths */
-+ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-+
-+ /* Check that the strm exists and that the state was initialized */
-+ if (strm == Z_NULL || strm->state == Z_NULL)
-+ return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+
-+ /* Reset the state */
-+ strm->msg = Z_NULL;
-+ state->mode = TYPE;
-+ state->last = 0;
-+ state->whave = 0;
-+ next = strm->next_in;
-+ have = next != Z_NULL ? strm->avail_in : 0;
-+ hold = 0;
-+ bits = 0;
-+ put = state->window;
-+ left = state->wsize;
-+
-+ /* Inflate until end of block marked as last */
-+ for (;;)
-+ switch (state->mode) {
-+ case TYPE:
-+ /* determine and dispatch block type */
-+ if (state->last) {
-+ BYTEBITS();
-+ state->mode = DONE;
-+ break;
-+ }
-+ NEEDBITS(3);
-+ state->last = BITS(1);
-+ DROPBITS(1);
-+ switch (BITS(2)) {
-+ case 0: /* stored block */
-+ Tracev((stderr, "inflate: stored block%s\n",
-+ state->last ? " (last)" : ""));
-+ state->mode = STORED;
-+ break;
-+ case 1: /* fixed block */
-+ fixedtables(state);
-+ Tracev((stderr, "inflate: fixed codes block%s\n",
-+ state->last ? " (last)" : ""));
-+ state->mode = LEN; /* decode codes */
-+ break;
-+ case 2: /* dynamic block */
-+ Tracev((stderr, "inflate: dynamic codes block%s\n",
-+ state->last ? " (last)" : ""));
-+ state->mode = TABLE;
-+ break;
-+ case 3:
-+ strm->msg = (char *)"invalid block type";
-+ state->mode = BAD;
-+ }
-+ DROPBITS(2);
-+ break;
-+
-+ case STORED:
-+ /* get and verify stored block length */
-+ BYTEBITS(); /* go to byte boundary */
-+ NEEDBITS(32);
-+ if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-+ strm->msg = (char *)"invalid stored block lengths";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->length = (unsigned)hold & 0xffff;
-+ Tracev((stderr, "inflate: stored length %u\n",
-+ state->length));
-+ INITBITS();
-+
-+ /* copy stored block from input to output */
-+ while (state->length != 0) {
-+ copy = state->length;
-+ PULL();
-+ ROOM();
-+ if (copy > have) copy = have;
-+ if (copy > left) copy = left;
-+ zmemcpy(put, next, copy);
-+ have -= copy;
-+ next += copy;
-+ left -= copy;
-+ put += copy;
-+ state->length -= copy;
-+ }
-+ Tracev((stderr, "inflate: stored end\n"));
-+ state->mode = TYPE;
-+ break;
-+
-+ case TABLE:
-+ /* get dynamic table entries descriptor */
-+ NEEDBITS(14);
-+ state->nlen = BITS(5) + 257;
-+ DROPBITS(5);
-+ state->ndist = BITS(5) + 1;
-+ DROPBITS(5);
-+ state->ncode = BITS(4) + 4;
-+ DROPBITS(4);
-+#ifndef PKZIP_BUG_WORKAROUND
-+ if (state->nlen > 286 || state->ndist > 30) {
-+ strm->msg = (char *)"too many length or distance symbols";
-+ state->mode = BAD;
-+ break;
-+ }
-+#endif
-+ Tracev((stderr, "inflate: table sizes ok\n"));
-+
-+ /* get code length code lengths (not a typo) */
-+ state->have = 0;
-+ while (state->have < state->ncode) {
-+ NEEDBITS(3);
-+ state->lens[order[state->have++]] = (unsigned short)BITS(3);
-+ DROPBITS(3);
-+ }
-+ while (state->have < 19)
-+ state->lens[order[state->have++]] = 0;
-+ state->next = state->codes;
-+ state->lencode = (code const FAR *)(state->next);
-+ state->lenbits = 7;
-+ ret = inflate_table(CODES, state->lens, 19, &(state->next),
-+ &(state->lenbits), state->work);
-+ if (ret) {
-+ strm->msg = (char *)"invalid code lengths set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ Tracev((stderr, "inflate: code lengths ok\n"));
-+
-+ /* get length and distance code code lengths */
-+ state->have = 0;
-+ while (state->have < state->nlen + state->ndist) {
-+ for (;;) {
-+ here = state->lencode[BITS(state->lenbits)];
-+ if ((unsigned)(here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ if (here.val < 16) {
-+ DROPBITS(here.bits);
-+ state->lens[state->have++] = here.val;
-+ }
-+ else {
-+ if (here.val == 16) {
-+ NEEDBITS(here.bits + 2);
-+ DROPBITS(here.bits);
-+ if (state->have == 0) {
-+ strm->msg = (char *)"invalid bit length repeat";
-+ state->mode = BAD;
-+ break;
-+ }
-+ len = (unsigned)(state->lens[state->have - 1]);
-+ copy = 3 + BITS(2);
-+ DROPBITS(2);
-+ }
-+ else if (here.val == 17) {
-+ NEEDBITS(here.bits + 3);
-+ DROPBITS(here.bits);
-+ len = 0;
-+ copy = 3 + BITS(3);
-+ DROPBITS(3);
-+ }
-+ else {
-+ NEEDBITS(here.bits + 7);
-+ DROPBITS(here.bits);
-+ len = 0;
-+ copy = 11 + BITS(7);
-+ DROPBITS(7);
-+ }
-+ if (state->have + copy > state->nlen + state->ndist) {
-+ strm->msg = (char *)"invalid bit length repeat";
-+ state->mode = BAD;
-+ break;
-+ }
-+ while (copy--)
-+ state->lens[state->have++] = (unsigned short)len;
-+ }
-+ }
-+
-+ /* handle error breaks in while */
-+ if (state->mode == BAD) break;
-+
-+ /* check for end-of-block code (better have one) */
-+ if (state->lens[256] == 0) {
-+ strm->msg = (char *)"invalid code -- missing end-of-block";
-+ state->mode = BAD;
-+ break;
-+ }
-+
-+ /* build code tables -- note: do not change the lenbits or distbits
-+ values here (9 and 6) without reading the comments in inftrees.h
-+ concerning the ENOUGH constants, which depend on those values */
-+ state->next = state->codes;
-+ state->lencode = (code const FAR *)(state->next);
-+ state->lenbits = 9;
-+ ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-+ &(state->lenbits), state->work);
-+ if (ret) {
-+ strm->msg = (char *)"invalid literal/lengths set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->distcode = (code const FAR *)(state->next);
-+ state->distbits = 6;
-+ ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-+ &(state->next), &(state->distbits), state->work);
-+ if (ret) {
-+ strm->msg = (char *)"invalid distances set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ Tracev((stderr, "inflate: codes ok\n"));
-+ state->mode = LEN;
-+
-+ case LEN:
-+ /* use inflate_fast() if we have enough input and output */
-+ if (have >= 6 && left >= 258) {
-+ RESTORE();
-+ if (state->whave < state->wsize)
-+ state->whave = state->wsize - left;
-+ inflate_fast(strm, state->wsize);
-+ LOAD();
-+ break;
-+ }
-+
-+ /* get a literal, length, or end-of-block code */
-+ for (;;) {
-+ here = state->lencode[BITS(state->lenbits)];
-+ if ((unsigned)(here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ if (here.op && (here.op & 0xf0) == 0) {
-+ last = here;
-+ for (;;) {
-+ here = state->lencode[last.val +
-+ (BITS(last.bits + last.op) >> last.bits)];
-+ if ((unsigned)(last.bits + here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ DROPBITS(last.bits);
-+ }
-+ DROPBITS(here.bits);
-+ state->length = (unsigned)here.val;
-+
-+ /* process literal */
-+ if (here.op == 0) {
-+ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-+ "inflate: literal '%c'\n" :
-+ "inflate: literal 0x%02x\n", here.val));
-+ ROOM();
-+ *put++ = (unsigned char)(state->length);
-+ left--;
-+ state->mode = LEN;
-+ break;
-+ }
-+
-+ /* process end of block */
-+ if (here.op & 32) {
-+ Tracevv((stderr, "inflate: end of block\n"));
-+ state->mode = TYPE;
-+ break;
-+ }
-+
-+ /* invalid code */
-+ if (here.op & 64) {
-+ strm->msg = (char *)"invalid literal/length code";
-+ state->mode = BAD;
-+ break;
-+ }
-+
-+ /* length code -- get extra bits, if any */
-+ state->extra = (unsigned)(here.op) & 15;
-+ if (state->extra != 0) {
-+ NEEDBITS(state->extra);
-+ state->length += BITS(state->extra);
-+ DROPBITS(state->extra);
-+ }
-+ Tracevv((stderr, "inflate: length %u\n", state->length));
-+
-+ /* get distance code */
-+ for (;;) {
-+ here = state->distcode[BITS(state->distbits)];
-+ if ((unsigned)(here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ if ((here.op & 0xf0) == 0) {
-+ last = here;
-+ for (;;) {
-+ here = state->distcode[last.val +
-+ (BITS(last.bits + last.op) >> last.bits)];
-+ if ((unsigned)(last.bits + here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ DROPBITS(last.bits);
-+ }
-+ DROPBITS(here.bits);
-+ if (here.op & 64) {
-+ strm->msg = (char *)"invalid distance code";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->offset = (unsigned)here.val;
-+
-+ /* get distance extra bits, if any */
-+ state->extra = (unsigned)(here.op) & 15;
-+ if (state->extra != 0) {
-+ NEEDBITS(state->extra);
-+ state->offset += BITS(state->extra);
-+ DROPBITS(state->extra);
-+ }
-+ if (state->offset > state->wsize - (state->whave < state->wsize ?
-+ left : 0)) {
-+ strm->msg = (char *)"invalid distance too far back";
-+ state->mode = BAD;
-+ break;
-+ }
-+ Tracevv((stderr, "inflate: distance %u\n", state->offset));
-+
-+ /* copy match from window to output */
-+ do {
-+ ROOM();
-+ copy = state->wsize - state->offset;
-+ if (copy < left) {
-+ from = put + copy;
-+ copy = left - copy;
-+ }
-+ else {
-+ from = put - state->offset;
-+ copy = left;
-+ }
-+ if (copy > state->length) copy = state->length;
-+ state->length -= copy;
-+ left -= copy;
-+ do {
-+ *put++ = *from++;
-+ } while (--copy);
-+ } while (state->length != 0);
-+ break;
-+
-+ case DONE:
-+ /* inflate stream terminated properly -- write leftover output */
-+ ret = Z_STREAM_END;
-+ if (left < state->wsize) {
-+ if (out(out_desc, state->window, state->wsize - left))
-+ ret = Z_BUF_ERROR;
-+ }
-+ goto inf_leave;
-+
-+ case BAD:
-+ ret = Z_DATA_ERROR;
-+ goto inf_leave;
-+
-+ default: /* can't happen, but makes compilers happy */
-+ ret = Z_STREAM_ERROR;
-+ goto inf_leave;
-+ }
-+
-+ /* Return unused input */
-+ inf_leave:
-+ strm->next_in = next;
-+ strm->avail_in = have;
-+ return ret;
-+}
-+
-+int ZEXPORT inflateBackEnd(strm)
-+z_streamp strm;
-+{
-+ if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-+ return Z_STREAM_ERROR;
-+ ZFREE(strm, strm->state);
-+ strm->state = Z_NULL;
-+ Tracev((stderr, "inflate: end\n"));
-+ return Z_OK;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inffast.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,364 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* inffast.c -- fast decoding
-+ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "zutil.h"
-+#include "inftrees.h"
-+#include "inflate.h"
-+#include "inffast.h"
-+
-+#ifndef ASMINF
-+
-+/* Allow machine dependent optimization for post-increment or pre-increment.
-+ Based on testing to date,
-+ Pre-increment preferred for:
-+ - PowerPC G3 (Adler)
-+ - MIPS R5000 (Randers-Pehrson)
-+ Post-increment preferred for:
-+ - none
-+ No measurable difference:
-+ - Pentium III (Anderson)
-+ - M68060 (Nikl)
-+ */
-+#ifdef POSTINC
-+# define OFF 0
-+# define PUP(a) *(a)++
-+#else
-+# define OFF 1
-+# define PUP(a) *++(a)
-+#endif
-+
-+/*
-+ Decode literal, length, and distance codes and write out the resulting
-+ literal and match bytes until either not enough input or output is
-+ available, an end-of-block is encountered, or a data error is encountered.
-+ When large enough input and output buffers are supplied to inflate(), for
-+ example, a 16K input buffer and a 64K output buffer, more than 95% of the
-+ inflate execution time is spent in this routine.
-+
-+ Entry assumptions:
-+
-+ state->mode == LEN
-+ strm->avail_in >= 6
-+ strm->avail_out >= 258
-+ start >= strm->avail_out
-+ state->bits < 8
-+
-+ On return, state->mode is one of:
-+
-+ LEN -- ran out of enough output space or enough available input
-+ TYPE -- reached end of block code, inflate() to interpret next block
-+ BAD -- error in block data
-+
-+ Notes:
-+
-+ - The maximum input bits used by a length/distance pair is 15 bits for the
-+ length code, 5 bits for the length extra, 15 bits for the distance code,
-+ and 13 bits for the distance extra. This totals 48 bits, or six bytes.
-+ Therefore if strm->avail_in >= 6, then there is enough input to avoid
-+ checking for available input while decoding.
-+
-+ - The maximum bytes that a single length/distance pair can output is 258
-+ bytes, which is the maximum length that can be coded. inflate_fast()
-+ requires strm->avail_out >= 258 for each loop to avoid checking for
-+ output space.
-+ */
-+void ZLIB_INTERNAL inflate_fast(strm, start)
-+z_streamp strm;
-+unsigned start; /* inflate()'s starting value for strm->avail_out */
-+{
-+ struct inflate_state FAR *state;
-+ z_const unsigned char FAR *in; /* local strm->next_in */
-+ z_const unsigned char FAR *last; /* have enough input while in < last */
-+ unsigned char FAR *out; /* local strm->next_out */
-+ unsigned char FAR *beg; /* inflate()'s initial strm->next_out */
-+ unsigned char FAR *end; /* while out < end, enough space available */
-+#ifdef INFLATE_STRICT
-+ unsigned dmax; /* maximum distance from zlib header */
-+#endif
-+ unsigned wsize; /* window size or zero if not using window */
-+ unsigned whave; /* valid bytes in the window */
-+ unsigned wnext; /* window write index */
-+ unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */
-+ unsigned long hold; /* local strm->hold */
-+ unsigned bits; /* local strm->bits */
-+ code const FAR *lcode; /* local strm->lencode */
-+ code const FAR *dcode; /* local strm->distcode */
-+ unsigned lmask; /* mask for first level of length codes */
-+ unsigned dmask; /* mask for first level of distance codes */
-+ code here; /* retrieved table entry */
-+ unsigned op; /* code bits, operation, extra bits, or */
-+ /* window position, window bytes to copy */
-+ unsigned len; /* match length, unused bytes */
-+ unsigned dist; /* match distance */
-+ unsigned char FAR *from; /* where to copy match from */
-+
-+ /* copy state to local variables */
-+ state = (struct inflate_state FAR *)strm->state;
-+ in = strm->next_in - OFF;
-+ last = in + (strm->avail_in - 5);
-+ out = strm->next_out - OFF;
-+ beg = out - (start - strm->avail_out);
-+ end = out + (strm->avail_out - 257);
-+#ifdef INFLATE_STRICT
-+ dmax = state->dmax;
-+#endif
-+ wsize = state->wsize;
-+ whave = state->whave;
-+ wnext = state->wnext;
-+ window = state->window;
-+ hold = state->hold;
-+ bits = state->bits;
-+ lcode = state->lencode;
-+ dcode = state->distcode;
-+ lmask = (1U << state->lenbits) - 1;
-+ dmask = (1U << state->distbits) - 1;
-+
-+ /* decode literals and length/distances until end-of-block or not enough
-+ input data or output space */
-+ do {
-+ if (bits < 15) {
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ }
-+ here = lcode[hold & lmask];
-+ dolen:
-+ op = (unsigned)(here.bits);
-+ hold >>= op;
-+ bits -= op;
-+ op = (unsigned)(here.op);
-+ if (op == 0) { /* literal */
-+ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-+ "inflate: literal '%c'\n" :
-+ "inflate: literal 0x%02x\n", here.val));
-+ PUP(out) = (unsigned char)(here.val);
-+ }
-+ else if (op & 16) { /* length base */
-+ len = (unsigned)(here.val);
-+ op &= 15; /* number of extra bits */
-+ if (op) {
-+ if (bits < op) {
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ }
-+ len += (unsigned)hold & ((1U << op) - 1);
-+ hold >>= op;
-+ bits -= op;
-+ }
-+ Tracevv((stderr, "inflate: length %u\n", len));
-+ if (bits < 15) {
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ }
-+ here = dcode[hold & dmask];
-+ dodist:
-+ op = (unsigned)(here.bits);
-+ hold >>= op;
-+ bits -= op;
-+ op = (unsigned)(here.op);
-+ if (op & 16) { /* distance base */
-+ dist = (unsigned)(here.val);
-+ op &= 15; /* number of extra bits */
-+ if (bits < op) {
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ if (bits < op) {
-+ hold += (unsigned long)(PUP(in)) << bits;
-+ bits += 8;
-+ }
-+ }
-+ dist += (unsigned)hold & ((1U << op) - 1);
-+#ifdef INFLATE_STRICT
-+ if (dist > dmax) {
-+ strm->msg = (char *)"invalid distance too far back";
-+ state->mode = BAD;
-+ break;
-+ }
-+#endif
-+ hold >>= op;
-+ bits -= op;
-+ Tracevv((stderr, "inflate: distance %u\n", dist));
-+ op = (unsigned)(out - beg); /* max distance in output */
-+ if (dist > op) { /* see if copy from window */
-+ op = dist - op; /* distance back in window */
-+ if (op > whave) {
-+ if (state->sane) {
-+ strm->msg =
-+ (char *)"invalid distance too far back";
-+ state->mode = BAD;
-+ break;
-+ }
-+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-+ if (len <= op - whave) {
-+ do {
-+ PUP(out) = 0;
-+ } while (--len);
-+ continue;
-+ }
-+ len -= op - whave;
-+ do {
-+ PUP(out) = 0;
-+ } while (--op > whave);
-+ if (op == 0) {
-+ from = out - dist;
-+ do {
-+ PUP(out) = PUP(from);
-+ } while (--len);
-+ continue;
-+ }
-+#endif
-+ }
-+ from = window - OFF;
-+ if (wnext == 0) { /* very common case */
-+ from += wsize - op;
-+ if (op < len) { /* some from window */
-+ len -= op;
-+ do {
-+ PUP(out) = PUP(from);
-+ } while (--op);
-+ from = out - dist; /* rest from output */
-+ }
-+ }
-+ else if (wnext < op) { /* wrap around window */
-+ from += wsize + wnext - op;
-+ op -= wnext;
-+ if (op < len) { /* some from end of window */
-+ len -= op;
-+ do {
-+ PUP(out) = PUP(from);
-+ } while (--op);
-+ from = window - OFF;
-+ if (wnext < len) { /* some from start of window */
-+ op = wnext;
-+ len -= op;
-+ do {
-+ PUP(out) = PUP(from);
-+ } while (--op);
-+ from = out - dist; /* rest from output */
-+ }
-+ }
-+ }
-+ else { /* contiguous in window */
-+ from += wnext - op;
-+ if (op < len) { /* some from window */
-+ len -= op;
-+ do {
-+ PUP(out) = PUP(from);
-+ } while (--op);
-+ from = out - dist; /* rest from output */
-+ }
-+ }
-+ while (len > 2) {
-+ PUP(out) = PUP(from);
-+ PUP(out) = PUP(from);
-+ PUP(out) = PUP(from);
-+ len -= 3;
-+ }
-+ if (len) {
-+ PUP(out) = PUP(from);
-+ if (len > 1)
-+ PUP(out) = PUP(from);
-+ }
-+ }
-+ else {
-+ from = out - dist; /* copy direct from output */
-+ do { /* minimum length is three */
-+ PUP(out) = PUP(from);
-+ PUP(out) = PUP(from);
-+ PUP(out) = PUP(from);
-+ len -= 3;
-+ } while (len > 2);
-+ if (len) {
-+ PUP(out) = PUP(from);
-+ if (len > 1)
-+ PUP(out) = PUP(from);
-+ }
-+ }
-+ }
-+ else if ((op & 64) == 0) { /* 2nd level distance code */
-+ here = dcode[here.val + (hold & ((1U << op) - 1))];
-+ goto dodist;
-+ }
-+ else {
-+ strm->msg = (char *)"invalid distance code";
-+ state->mode = BAD;
-+ break;
-+ }
-+ }
-+ else if ((op & 64) == 0) { /* 2nd level length code */
-+ here = lcode[here.val + (hold & ((1U << op) - 1))];
-+ goto dolen;
-+ }
-+ else if (op & 32) { /* end-of-block */
-+ Tracevv((stderr, "inflate: end of block\n"));
-+ state->mode = TYPE;
-+ break;
-+ }
-+ else {
-+ strm->msg = (char *)"invalid literal/length code";
-+ state->mode = BAD;
-+ break;
-+ }
-+ } while (in < last && out < end);
-+
-+ /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-+ len = bits >> 3;
-+ in -= len;
-+ bits -= len << 3;
-+ hold &= (1U << bits) - 1;
-+
-+ /* update state and return */
-+ strm->next_in = in + OFF;
-+ strm->next_out = out + OFF;
-+ strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-+ strm->avail_out = (unsigned)(out < end ?
-+ 257 + (end - out) : 257 - (out - end));
-+ state->hold = hold;
-+ state->bits = bits;
-+ return;
-+}
-+
-+/*
-+ inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-+ - Using bit fields for code structure
-+ - Different op definition to avoid & for extra bits (do & for table bits)
-+ - Three separate decoding do-loops for direct, window, and wnext == 0
-+ - Special case for distance > 1 copies to do overlapped load and store copy
-+ - Explicit branch predictions (based on measured branch probabilities)
-+ - Deferring match copy and interspersed it with decoding subsequent codes
-+ - Swapping literal/length else
-+ - Swapping window/direct else
-+ - Larger unrolled copy loops (three is about right)
-+ - Moving len -= 3 statement into middle of loop
-+ */
-+
-+#endif /* !ASMINF */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inffast.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,35 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* inffast.h -- header to use inffast.c
-+ * Copyright (C) 1995-2003, 2010 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* WARNING: this file should *not* be used by applications. It is
-+ part of the implementation of the compression library and is
-+ subject to change. Applications should only use zlib.h.
-+ */
-+
-+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inffixed.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,118 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+ /* inffixed.h -- table for decoding fixed codes
-+ * Generated automatically by makefixed().
-+ */
-+
-+ /* WARNING: this file should *not* be used by applications.
-+ It is part of the implementation of this library and is
-+ subject to change. Applications should only use zlib.h.
-+ */
-+
-+ static const code lenfix[512] = {
-+ {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-+ {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-+ {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-+ {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-+ {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-+ {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-+ {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-+ {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-+ {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-+ {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-+ {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-+ {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-+ {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-+ {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-+ {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-+ {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-+ {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-+ {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-+ {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-+ {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-+ {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-+ {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-+ {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-+ {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-+ {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-+ {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-+ {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-+ {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-+ {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-+ {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-+ {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-+ {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-+ {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-+ {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-+ {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-+ {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-+ {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-+ {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-+ {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-+ {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-+ {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-+ {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-+ {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-+ {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-+ {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-+ {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-+ {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-+ {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-+ {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-+ {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-+ {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-+ {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-+ {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-+ {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-+ {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-+ {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-+ {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-+ {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-+ {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-+ {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-+ {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-+ {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-+ {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-+ {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-+ {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-+ {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-+ {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-+ {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-+ {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-+ {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-+ {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-+ {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-+ {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-+ {0,9,255}
-+ };
-+
-+ static const code distfix[32] = {
-+ {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-+ {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-+ {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-+ {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-+ {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-+ {22,5,193},{64,5,0}
-+ };
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inflate.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,1536 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* inflate.c -- zlib decompression
-+ * Copyright (C) 1995-2012 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/*
-+ * Change history:
-+ *
-+ * 1.2.beta0 24 Nov 2002
-+ * - First version -- complete rewrite of inflate to simplify code, avoid
-+ * creation of window when not needed, minimize use of window when it is
-+ * needed, make inffast.c even faster, implement gzip decoding, and to
-+ * improve code readability and style over the previous zlib inflate code
-+ *
-+ * 1.2.beta1 25 Nov 2002
-+ * - Use pointers for available input and output checking in inffast.c
-+ * - Remove input and output counters in inffast.c
-+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
-+ * - Remove unnecessary second byte pull from length extra in inffast.c
-+ * - Unroll direct copy to three copies per loop in inffast.c
-+ *
-+ * 1.2.beta2 4 Dec 2002
-+ * - Change external routine names to reduce potential conflicts
-+ * - Correct filename to inffixed.h for fixed tables in inflate.c
-+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
-+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
-+ * to avoid negation problem on Alphas (64 bit) in inflate.c
-+ *
-+ * 1.2.beta3 22 Dec 2002
-+ * - Add comments on state->bits assertion in inffast.c
-+ * - Add comments on op field in inftrees.h
-+ * - Fix bug in reuse of allocated window after inflateReset()
-+ * - Remove bit fields--back to byte structure for speed
-+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
-+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
-+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
-+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
-+ * - Use local copies of stream next and avail values, as well as local bit
-+ * buffer and bit count in inflate()--for speed when inflate_fast() not used
-+ *
-+ * 1.2.beta4 1 Jan 2003
-+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
-+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
-+ * - Add comments in inffast.c to introduce the inflate_fast() routine
-+ * - Rearrange window copies in inflate_fast() for speed and simplification
-+ * - Unroll last copy for window match in inflate_fast()
-+ * - Use local copies of window variables in inflate_fast() for speed
-+ * - Pull out common wnext == 0 case for speed in inflate_fast()
-+ * - Make op and len in inflate_fast() unsigned for consistency
-+ * - Add FAR to lcode and dcode declarations in inflate_fast()
-+ * - Simplified bad distance check in inflate_fast()
-+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
-+ * source file infback.c to provide a call-back interface to inflate for
-+ * programs like gzip and unzip -- uses window as output buffer to avoid
-+ * window copying
-+ *
-+ * 1.2.beta5 1 Jan 2003
-+ * - Improved inflateBack() interface to allow the caller to provide initial
-+ * input in strm.
-+ * - Fixed stored blocks bug in inflateBack()
-+ *
-+ * 1.2.beta6 4 Jan 2003
-+ * - Added comments in inffast.c on effectiveness of POSTINC
-+ * - Typecasting all around to reduce compiler warnings
-+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
-+ * make compilers happy
-+ * - Changed type of window in inflateBackInit() to unsigned char *
-+ *
-+ * 1.2.beta7 27 Jan 2003
-+ * - Changed many types to unsigned or unsigned short to avoid warnings
-+ * - Added inflateCopy() function
-+ *
-+ * 1.2.0 9 Mar 2003
-+ * - Changed inflateBack() interface to provide separate opaque descriptors
-+ * for the in() and out() functions
-+ * - Changed inflateBack() argument and in_func typedef to swap the length
-+ * and buffer address return values for the input function
-+ * - Check next_in and next_out for Z_NULL on entry to inflate()
-+ *
-+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
-+ */
-+
-+#include "zutil.h"
-+#include "inftrees.h"
-+#include "inflate.h"
-+#include "inffast.h"
-+
-+#ifdef MAKEFIXED
-+# ifndef BUILDFIXED
-+# define BUILDFIXED
-+# endif
-+#endif
-+
-+/* function prototypes */
-+local void fixedtables OF((struct inflate_state FAR *state));
-+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-+ unsigned copy));
-+#ifdef BUILDFIXED
-+ void makefixed OF((void));
-+#endif
-+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-+ unsigned len));
-+
-+int ZEXPORT inflateResetKeep(strm)
-+z_streamp strm;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ strm->total_in = strm->total_out = state->total = 0;
-+ strm->msg = Z_NULL;
-+ if (state->wrap) /* to support ill-conceived Java test suite */
-+ strm->adler = state->wrap & 1;
-+ state->mode = HEAD;
-+ state->last = 0;
-+ state->havedict = 0;
-+ state->dmax = 32768U;
-+ state->head = Z_NULL;
-+ state->hold = 0;
-+ state->bits = 0;
-+ state->lencode = state->distcode = state->next = state->codes;
-+ state->sane = 1;
-+ state->back = -1;
-+ Tracev((stderr, "inflate: reset\n"));
-+ return Z_OK;
-+}
-+
-+int ZEXPORT inflateReset(strm)
-+z_streamp strm;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ state->wsize = 0;
-+ state->whave = 0;
-+ state->wnext = 0;
-+ return inflateResetKeep(strm);
-+}
-+
-+int ZEXPORT inflateReset2(strm, windowBits)
-+z_streamp strm;
-+int windowBits;
-+{
-+ int wrap;
-+ struct inflate_state FAR *state;
-+
-+ /* get the state */
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+
-+ /* extract wrap request from windowBits parameter */
-+ if (windowBits < 0) {
-+ wrap = 0;
-+ windowBits = -windowBits;
-+ }
-+ else {
-+ wrap = (windowBits >> 4) + 1;
-+#ifdef GUNZIP
-+ if (windowBits < 48)
-+ windowBits &= 15;
-+#endif
-+ }
-+
-+ /* set number of window bits, free window if different */
-+ if (windowBits && (windowBits < 8 || windowBits > 15))
-+ return Z_STREAM_ERROR;
-+ if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
-+ ZFREE(strm, state->window);
-+ state->window = Z_NULL;
-+ }
-+
-+ /* update state and reset the rest of it */
-+ state->wrap = wrap;
-+ state->wbits = (unsigned)windowBits;
-+ return inflateReset(strm);
-+}
-+
-+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-+z_streamp strm;
-+int windowBits;
-+const char *version;
-+int stream_size;
-+{
-+ int ret;
-+ struct inflate_state FAR *state;
-+
-+ if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-+ stream_size != (int)(sizeof(z_stream)))
-+ return Z_VERSION_ERROR;
-+ if (strm == Z_NULL) return Z_STREAM_ERROR;
-+ strm->msg = Z_NULL; /* in case we return an error */
-+ if (strm->zalloc == (alloc_func)0) {
-+#ifdef Z_SOLO
-+ return Z_STREAM_ERROR;
-+#else
-+ strm->zalloc = zcalloc;
-+ strm->opaque = (voidpf)0;
-+#endif
-+ }
-+ if (strm->zfree == (free_func)0)
-+#ifdef Z_SOLO
-+ return Z_STREAM_ERROR;
-+#else
-+ strm->zfree = zcfree;
-+#endif
-+ state = (struct inflate_state FAR *)
-+ ZALLOC(strm, 1, sizeof(struct inflate_state));
-+ if (state == Z_NULL) return Z_MEM_ERROR;
-+ Tracev((stderr, "inflate: allocated\n"));
-+ strm->state = (struct internal_state FAR *)state;
-+ state->window = Z_NULL;
-+ ret = inflateReset2(strm, windowBits);
-+ if (ret != Z_OK) {
-+ ZFREE(strm, state);
-+ strm->state = Z_NULL;
-+ }
-+ return ret;
-+}
-+
-+int ZEXPORT inflateInit_(strm, version, stream_size)
-+z_streamp strm;
-+const char *version;
-+int stream_size;
-+{
-+ return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-+}
-+
-+int ZEXPORT inflatePrime(strm, bits, value)
-+z_streamp strm;
-+int bits;
-+int value;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ if (bits < 0) {
-+ state->hold = 0;
-+ state->bits = 0;
-+ return Z_OK;
-+ }
-+ if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-+ value &= (1L << bits) - 1;
-+ state->hold += value << state->bits;
-+ state->bits += bits;
-+ return Z_OK;
-+}
-+
-+/*
-+ Return state with length and distance decoding tables and index sizes set to
-+ fixed code decoding. Normally this returns fixed tables from inffixed.h.
-+ If BUILDFIXED is defined, then instead this routine builds the tables the
-+ first time it's called, and returns those tables the first time and
-+ thereafter. This reduces the size of the code by about 2K bytes, in
-+ exchange for a little execution time. However, BUILDFIXED should not be
-+ used for threaded applications, since the rewriting of the tables and virgin
-+ may not be thread-safe.
-+ */
-+local void fixedtables(state)
-+struct inflate_state FAR *state;
-+{
-+#ifdef BUILDFIXED
-+ static int virgin = 1;
-+ static code *lenfix, *distfix;
-+ static code fixed[544];
-+
-+ /* build fixed huffman tables if first call (may not be thread safe) */
-+ if (virgin) {
-+ unsigned sym, bits;
-+ static code *next;
-+
-+ /* literal/length table */
-+ sym = 0;
-+ while (sym < 144) state->lens[sym++] = 8;
-+ while (sym < 256) state->lens[sym++] = 9;
-+ while (sym < 280) state->lens[sym++] = 7;
-+ while (sym < 288) state->lens[sym++] = 8;
-+ next = fixed;
-+ lenfix = next;
-+ bits = 9;
-+ inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-+
-+ /* distance table */
-+ sym = 0;
-+ while (sym < 32) state->lens[sym++] = 5;
-+ distfix = next;
-+ bits = 5;
-+ inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-+
-+ /* do this just once */
-+ virgin = 0;
-+ }
-+#else /* !BUILDFIXED */
-+# include "inffixed.h"
-+#endif /* BUILDFIXED */
-+ state->lencode = lenfix;
-+ state->lenbits = 9;
-+ state->distcode = distfix;
-+ state->distbits = 5;
-+}
-+
-+#ifdef MAKEFIXED
-+#include <stdio.h>
-+
-+/*
-+ Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also
-+ defines BUILDFIXED, so the tables are built on the fly. makefixed() writes
-+ those tables to stdout, which would be piped to inffixed.h. A small program
-+ can simply call makefixed to do this:
-+
-+ void makefixed(void);
-+
-+ int main(void)
-+ {
-+ makefixed();
-+ return 0;
-+ }
-+
-+ Then that can be linked with zlib built with MAKEFIXED defined and run:
-+
-+ a.out > inffixed.h
-+ */
-+void makefixed()
-+{
-+ unsigned low, size;
-+ struct inflate_state state;
-+
-+ fixedtables(&state);
-+ puts(" /* inffixed.h -- table for decoding fixed codes");
-+ puts(" * Generated automatically by makefixed().");
-+ puts(" */");
-+ puts("");
-+ puts(" /* WARNING: this file should *not* be used by applications.");
-+ puts(" It is part of the implementation of this library and is");
-+ puts(" subject to change. Applications should only use zlib.h.");
-+ puts(" */");
-+ puts("");
-+ size = 1U << 9;
-+ printf(" static const code lenfix[%u] = {", size);
-+ low = 0;
-+ for (;;) {
-+ if ((low % 7) == 0) printf("\n ");
-+ printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-+ state.lencode[low].bits, state.lencode[low].val);
-+ if (++low == size) break;
-+ putchar(',');
-+ }
-+ puts("\n };");
-+ size = 1U << 5;
-+ printf("\n static const code distfix[%u] = {", size);
-+ low = 0;
-+ for (;;) {
-+ if ((low % 6) == 0) printf("\n ");
-+ printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-+ state.distcode[low].val);
-+ if (++low == size) break;
-+ putchar(',');
-+ }
-+ puts("\n };");
-+}
-+#endif /* MAKEFIXED */
-+
-+/*
-+ Update the window with the last wsize (normally 32K) bytes written before
-+ returning. If window does not exist yet, create it. This is only called
-+ when a window is already in use, or when output has been written during this
-+ inflate call, but the end of the deflate stream has not been reached yet.
-+ It is also called to create a window for dictionary data when a dictionary
-+ is loaded.
-+
-+ Providing output buffers larger than 32K to inflate() should provide a speed
-+ advantage, since only the last 32K of output is copied to the sliding window
-+ upon return from inflate(), and since all distances after the first 32K of
-+ output will fall in the output data, making match copies simpler and faster.
-+ The advantage may be dependent on the size of the processor's data caches.
-+ */
-+local int updatewindow(strm, end, copy)
-+z_streamp strm;
-+const Bytef *end;
-+unsigned copy;
-+{
-+ struct inflate_state FAR *state;
-+ unsigned dist;
-+
-+ state = (struct inflate_state FAR *)strm->state;
-+
-+ /* if it hasn't been done already, allocate space for the window */
-+ if (state->window == Z_NULL) {
-+ state->window = (unsigned char FAR *)
-+ ZALLOC(strm, 1U << state->wbits,
-+ sizeof(unsigned char));
-+ if (state->window == Z_NULL) return 1;
-+ }
-+
-+ /* if window not in use yet, initialize */
-+ if (state->wsize == 0) {
-+ state->wsize = 1U << state->wbits;
-+ state->wnext = 0;
-+ state->whave = 0;
-+ }
-+
-+ /* copy state->wsize or less output bytes into the circular window */
-+ if (copy >= state->wsize) {
-+ zmemcpy(state->window, end - state->wsize, state->wsize);
-+ state->wnext = 0;
-+ state->whave = state->wsize;
-+ }
-+ else {
-+ dist = state->wsize - state->wnext;
-+ if (dist > copy) dist = copy;
-+ zmemcpy(state->window + state->wnext, end - copy, dist);
-+ copy -= dist;
-+ if (copy) {
-+ zmemcpy(state->window, end - copy, copy);
-+ state->wnext = copy;
-+ state->whave = state->wsize;
-+ }
-+ else {
-+ state->wnext += dist;
-+ if (state->wnext == state->wsize) state->wnext = 0;
-+ if (state->whave < state->wsize) state->whave += dist;
-+ }
-+ }
-+ return 0;
-+}
-+
-+/* Macros for inflate(): */
-+
-+/* check function to use adler32() for zlib or crc32() for gzip */
-+#ifdef GUNZIP
-+# define UPDATE(check, buf, len) \
-+ (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-+#else
-+# define UPDATE(check, buf, len) adler32(check, buf, len)
-+#endif
-+
-+/* check macros for header crc */
-+#ifdef GUNZIP
-+# define CRC2(check, word) \
-+ do { \
-+ hbuf[0] = (unsigned char)(word); \
-+ hbuf[1] = (unsigned char)((word) >> 8); \
-+ check = crc32(check, hbuf, 2); \
-+ } while (0)
-+
-+# define CRC4(check, word) \
-+ do { \
-+ hbuf[0] = (unsigned char)(word); \
-+ hbuf[1] = (unsigned char)((word) >> 8); \
-+ hbuf[2] = (unsigned char)((word) >> 16); \
-+ hbuf[3] = (unsigned char)((word) >> 24); \
-+ check = crc32(check, hbuf, 4); \
-+ } while (0)
-+#endif
-+
-+/* Load registers with state in inflate() for speed */
-+#define LOAD() \
-+ do { \
-+ put = strm->next_out; \
-+ left = strm->avail_out; \
-+ next = strm->next_in; \
-+ have = strm->avail_in; \
-+ hold = state->hold; \
-+ bits = state->bits; \
-+ } while (0)
-+
-+/* Restore state from registers in inflate() */
-+#define RESTORE() \
-+ do { \
-+ strm->next_out = put; \
-+ strm->avail_out = left; \
-+ strm->next_in = next; \
-+ strm->avail_in = have; \
-+ state->hold = hold; \
-+ state->bits = bits; \
-+ } while (0)
-+
-+/* Clear the input bit accumulator */
-+#define INITBITS() \
-+ do { \
-+ hold = 0; \
-+ bits = 0; \
-+ } while (0)
-+
-+/* Get a byte of input into the bit accumulator, or return from inflate()
-+ if there is no input available. */
-+#define PULLBYTE() \
-+ do { \
-+ if (have == 0) goto inf_leave; \
-+ have--; \
-+ hold += (unsigned long)(*next++) << bits; \
-+ bits += 8; \
-+ } while (0)
-+
-+/* Assure that there are at least n bits in the bit accumulator. If there is
-+ not enough available input to do that, then return from inflate(). */
-+#define NEEDBITS(n) \
-+ do { \
-+ while (bits < (unsigned)(n)) \
-+ PULLBYTE(); \
-+ } while (0)
-+
-+/* Return the low n bits of the bit accumulator (n < 16) */
-+#define BITS(n) \
-+ ((unsigned)hold & ((1U << (n)) - 1))
-+
-+/* Remove n bits from the bit accumulator */
-+#define DROPBITS(n) \
-+ do { \
-+ hold >>= (n); \
-+ bits -= (unsigned)(n); \
-+ } while (0)
-+
-+/* Remove zero to seven bits as needed to go to a byte boundary */
-+#define BYTEBITS() \
-+ do { \
-+ hold >>= bits & 7; \
-+ bits -= bits & 7; \
-+ } while (0)
-+
-+/*
-+ inflate() uses a state machine to process as much input data and generate as
-+ much output data as possible before returning. The state machine is
-+ structured roughly as follows:
-+
-+ for (;;) switch (state) {
-+ ...
-+ case STATEn:
-+ if (not enough input data or output space to make progress)
-+ return;
-+ ... make progress ...
-+ state = STATEm;
-+ break;
-+ ...
-+ }
-+
-+ so when inflate() is called again, the same case is attempted again, and
-+ if the appropriate resources are provided, the machine proceeds to the
-+ next state. The NEEDBITS() macro is usually the way the state evaluates
-+ whether it can proceed or should return. NEEDBITS() does the return if
-+ the requested bits are not available. The typical use of the BITS macros
-+ is:
-+
-+ NEEDBITS(n);
-+ ... do something with BITS(n) ...
-+ DROPBITS(n);
-+
-+ where NEEDBITS(n) either returns from inflate() if there isn't enough
-+ input left to load n bits into the accumulator, or it continues. BITS(n)
-+ gives the low n bits in the accumulator. When done, DROPBITS(n) drops
-+ the low n bits off the accumulator. INITBITS() clears the accumulator
-+ and sets the number of available bits to zero. BYTEBITS() discards just
-+ enough bits to put the accumulator on a byte boundary. After BYTEBITS()
-+ and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-+
-+ NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-+ if there is no input available. The decoding of variable length codes uses
-+ PULLBYTE() directly in order to pull just enough bytes to decode the next
-+ code, and no more.
-+
-+ Some states loop until they get enough input, making sure that enough
-+ state information is maintained to continue the loop where it left off
-+ if NEEDBITS() returns in the loop. For example, want, need, and keep
-+ would all have to actually be part of the saved state in case NEEDBITS()
-+ returns:
-+
-+ case STATEw:
-+ while (want < need) {
-+ NEEDBITS(n);
-+ keep[want++] = BITS(n);
-+ DROPBITS(n);
-+ }
-+ state = STATEx;
-+ case STATEx:
-+
-+ As shown above, if the next state is also the next case, then the break
-+ is omitted.
-+
-+ A state may also return if there is not enough output space available to
-+ complete that state. Those states are copying stored data, writing a
-+ literal byte, and copying a matching string.
-+
-+ When returning, a "goto inf_leave" is used to update the total counters,
-+ update the check value, and determine whether any progress has been made
-+ during that inflate() call in order to return the proper return code.
-+ Progress is defined as a change in either strm->avail_in or strm->avail_out.
-+ When there is a window, goto inf_leave will update the window with the last
-+ output written. If a goto inf_leave occurs in the middle of decompression
-+ and there is no window currently, goto inf_leave will create one and copy
-+ output to the window for the next call of inflate().
-+
-+ In this implementation, the flush parameter of inflate() only affects the
-+ return code (per zlib.h). inflate() always writes as much as possible to
-+ strm->next_out, given the space available and the provided input--the effect
-+ documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers
-+ the allocation of and copying into a sliding window until necessary, which
-+ provides the effect documented in zlib.h for Z_FINISH when the entire input
-+ stream available. So the only thing the flush parameter actually does is:
-+ when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it
-+ will return Z_BUF_ERROR if it has not reached the end of the stream.
-+ */
-+
-+int ZEXPORT inflate(strm, flush)
-+z_streamp strm;
-+int flush;
-+{
-+ struct inflate_state FAR *state;
-+ z_const unsigned char FAR *next; /* next input */
-+ unsigned char FAR *put; /* next output */
-+ unsigned have, left; /* available input and output */
-+ unsigned long hold; /* bit buffer */
-+ unsigned bits; /* bits in bit buffer */
-+ unsigned in, out; /* save starting available input and output */
-+ unsigned copy; /* number of stored or match bytes to copy */
-+ unsigned char FAR *from; /* where to copy match bytes from */
-+ code here; /* current decoding table entry */
-+ code last; /* parent table entry */
-+ unsigned len; /* length to copy for repeats, bits to drop */
-+ int ret; /* return code */
-+#ifdef GUNZIP
-+ unsigned char hbuf[4]; /* buffer for gzip header crc calculation */
-+#endif
-+ static const unsigned short order[19] = /* permutation of code lengths */
-+ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-+ (strm->next_in == Z_NULL && strm->avail_in != 0))
-+ return Z_STREAM_ERROR;
-+
-+ state = (struct inflate_state FAR *)strm->state;
-+ if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */
-+ LOAD();
-+ in = have;
-+ out = left;
-+ ret = Z_OK;
-+ for (;;)
-+ switch (state->mode) {
-+ case HEAD:
-+ if (state->wrap == 0) {
-+ state->mode = TYPEDO;
-+ break;
-+ }
-+ NEEDBITS(16);
-+#ifdef GUNZIP
-+ if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */
-+ state->check = crc32(0L, Z_NULL, 0);
-+ CRC2(state->check, hold);
-+ INITBITS();
-+ state->mode = FLAGS;
-+ break;
-+ }
-+ state->flags = 0; /* expect zlib header */
-+ if (state->head != Z_NULL)
-+ state->head->done = -1;
-+ if (!(state->wrap & 1) || /* check if zlib header allowed */
-+#else
-+ if (
-+#endif
-+ ((BITS(8) << 8) + (hold >> 8)) % 31) {
-+ strm->msg = (char *)"incorrect header check";
-+ state->mode = BAD;
-+ break;
-+ }
-+ if (BITS(4) != Z_DEFLATED) {
-+ strm->msg = (char *)"unknown compression method";
-+ state->mode = BAD;
-+ break;
-+ }
-+ DROPBITS(4);
-+ len = BITS(4) + 8;
-+ if (state->wbits == 0)
-+ state->wbits = len;
-+ else if (len > state->wbits) {
-+ strm->msg = (char *)"invalid window size";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->dmax = 1U << len;
-+ Tracev((stderr, "inflate: zlib header ok\n"));
-+ strm->adler = state->check = adler32(0L, Z_NULL, 0);
-+ state->mode = hold & 0x200 ? DICTID : TYPE;
-+ INITBITS();
-+ break;
-+#ifdef GUNZIP
-+ case FLAGS:
-+ NEEDBITS(16);
-+ state->flags = (int)(hold);
-+ if ((state->flags & 0xff) != Z_DEFLATED) {
-+ strm->msg = (char *)"unknown compression method";
-+ state->mode = BAD;
-+ break;
-+ }
-+ if (state->flags & 0xe000) {
-+ strm->msg = (char *)"unknown header flags set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ if (state->head != Z_NULL)
-+ state->head->text = (int)((hold >> 8) & 1);
-+ if (state->flags & 0x0200) CRC2(state->check, hold);
-+ INITBITS();
-+ state->mode = TIME;
-+ case TIME:
-+ NEEDBITS(32);
-+ if (state->head != Z_NULL)
-+ state->head->time = hold;
-+ if (state->flags & 0x0200) CRC4(state->check, hold);
-+ INITBITS();
-+ state->mode = OS;
-+ case OS:
-+ NEEDBITS(16);
-+ if (state->head != Z_NULL) {
-+ state->head->xflags = (int)(hold & 0xff);
-+ state->head->os = (int)(hold >> 8);
-+ }
-+ if (state->flags & 0x0200) CRC2(state->check, hold);
-+ INITBITS();
-+ state->mode = EXLEN;
-+ case EXLEN:
-+ if (state->flags & 0x0400) {
-+ NEEDBITS(16);
-+ state->length = (unsigned)(hold);
-+ if (state->head != Z_NULL)
-+ state->head->extra_len = (unsigned)hold;
-+ if (state->flags & 0x0200) CRC2(state->check, hold);
-+ INITBITS();
-+ }
-+ else if (state->head != Z_NULL)
-+ state->head->extra = Z_NULL;
-+ state->mode = EXTRA;
-+ case EXTRA:
-+ if (state->flags & 0x0400) {
-+ copy = state->length;
-+ if (copy > have) copy = have;
-+ if (copy) {
-+ if (state->head != Z_NULL &&
-+ state->head->extra != Z_NULL) {
-+ len = state->head->extra_len - state->length;
-+ zmemcpy(state->head->extra + len, next,
-+ len + copy > state->head->extra_max ?
-+ state->head->extra_max - len : copy);
-+ }
-+ if (state->flags & 0x0200)
-+ state->check = crc32(state->check, next, copy);
-+ have -= copy;
-+ next += copy;
-+ state->length -= copy;
-+ }
-+ if (state->length) goto inf_leave;
-+ }
-+ state->length = 0;
-+ state->mode = NAME;
-+ case NAME:
-+ if (state->flags & 0x0800) {
-+ if (have == 0) goto inf_leave;
-+ copy = 0;
-+ do {
-+ len = (unsigned)(next[copy++]);
-+ if (state->head != Z_NULL &&
-+ state->head->name != Z_NULL &&
-+ state->length < state->head->name_max)
-+ state->head->name[state->length++] = len;
-+ } while (len && copy < have);
-+ if (state->flags & 0x0200)
-+ state->check = crc32(state->check, next, copy);
-+ have -= copy;
-+ next += copy;
-+ if (len) goto inf_leave;
-+ }
-+ else if (state->head != Z_NULL)
-+ state->head->name = Z_NULL;
-+ state->length = 0;
-+ state->mode = COMMENT;
-+ case COMMENT:
-+ if (state->flags & 0x1000) {
-+ if (have == 0) goto inf_leave;
-+ copy = 0;
-+ do {
-+ len = (unsigned)(next[copy++]);
-+ if (state->head != Z_NULL &&
-+ state->head->comment != Z_NULL &&
-+ state->length < state->head->comm_max)
-+ state->head->comment[state->length++] = len;
-+ } while (len && copy < have);
-+ if (state->flags & 0x0200)
-+ state->check = crc32(state->check, next, copy);
-+ have -= copy;
-+ next += copy;
-+ if (len) goto inf_leave;
-+ }
-+ else if (state->head != Z_NULL)
-+ state->head->comment = Z_NULL;
-+ state->mode = HCRC;
-+ case HCRC:
-+ if (state->flags & 0x0200) {
-+ NEEDBITS(16);
-+ if (hold != (state->check & 0xffff)) {
-+ strm->msg = (char *)"header crc mismatch";
-+ state->mode = BAD;
-+ break;
-+ }
-+ INITBITS();
-+ }
-+ if (state->head != Z_NULL) {
-+ state->head->hcrc = (int)((state->flags >> 9) & 1);
-+ state->head->done = 1;
-+ }
-+ strm->adler = state->check = crc32(0L, Z_NULL, 0);
-+ state->mode = TYPE;
-+ break;
-+#endif
-+ case DICTID:
-+ NEEDBITS(32);
-+ strm->adler = state->check = ZSWAP32(hold);
-+ INITBITS();
-+ state->mode = DICT;
-+ case DICT:
-+ if (state->havedict == 0) {
-+ RESTORE();
-+ return Z_NEED_DICT;
-+ }
-+ strm->adler = state->check = adler32(0L, Z_NULL, 0);
-+ state->mode = TYPE;
-+ case TYPE:
-+ if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-+ case TYPEDO:
-+ if (state->last) {
-+ BYTEBITS();
-+ state->mode = CHECK;
-+ break;
-+ }
-+ NEEDBITS(3);
-+ state->last = BITS(1);
-+ DROPBITS(1);
-+ switch (BITS(2)) {
-+ case 0: /* stored block */
-+ Tracev((stderr, "inflate: stored block%s\n",
-+ state->last ? " (last)" : ""));
-+ state->mode = STORED;
-+ break;
-+ case 1: /* fixed block */
-+ fixedtables(state);
-+ Tracev((stderr, "inflate: fixed codes block%s\n",
-+ state->last ? " (last)" : ""));
-+ state->mode = LEN_; /* decode codes */
-+ if (flush == Z_TREES) {
-+ DROPBITS(2);
-+ goto inf_leave;
-+ }
-+ break;
-+ case 2: /* dynamic block */
-+ Tracev((stderr, "inflate: dynamic codes block%s\n",
-+ state->last ? " (last)" : ""));
-+ state->mode = TABLE;
-+ break;
-+ case 3:
-+ strm->msg = (char *)"invalid block type";
-+ state->mode = BAD;
-+ }
-+ DROPBITS(2);
-+ break;
-+ case STORED:
-+ BYTEBITS(); /* go to byte boundary */
-+ NEEDBITS(32);
-+ if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-+ strm->msg = (char *)"invalid stored block lengths";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->length = (unsigned)hold & 0xffff;
-+ Tracev((stderr, "inflate: stored length %u\n",
-+ state->length));
-+ INITBITS();
-+ state->mode = COPY_;
-+ if (flush == Z_TREES) goto inf_leave;
-+ case COPY_:
-+ state->mode = COPY;
-+ case COPY:
-+ copy = state->length;
-+ if (copy) {
-+ if (copy > have) copy = have;
-+ if (copy > left) copy = left;
-+ if (copy == 0) goto inf_leave;
-+ zmemcpy(put, next, copy);
-+ have -= copy;
-+ next += copy;
-+ left -= copy;
-+ put += copy;
-+ state->length -= copy;
-+ break;
-+ }
-+ Tracev((stderr, "inflate: stored end\n"));
-+ state->mode = TYPE;
-+ break;
-+ case TABLE:
-+ NEEDBITS(14);
-+ state->nlen = BITS(5) + 257;
-+ DROPBITS(5);
-+ state->ndist = BITS(5) + 1;
-+ DROPBITS(5);
-+ state->ncode = BITS(4) + 4;
-+ DROPBITS(4);
-+#ifndef PKZIP_BUG_WORKAROUND
-+ if (state->nlen > 286 || state->ndist > 30) {
-+ strm->msg = (char *)"too many length or distance symbols";
-+ state->mode = BAD;
-+ break;
-+ }
-+#endif
-+ Tracev((stderr, "inflate: table sizes ok\n"));
-+ state->have = 0;
-+ state->mode = LENLENS;
-+ case LENLENS:
-+ while (state->have < state->ncode) {
-+ NEEDBITS(3);
-+ state->lens[order[state->have++]] = (unsigned short)BITS(3);
-+ DROPBITS(3);
-+ }
-+ while (state->have < 19)
-+ state->lens[order[state->have++]] = 0;
-+ state->next = state->codes;
-+ state->lencode = (const code FAR *)(state->next);
-+ state->lenbits = 7;
-+ ret = inflate_table(CODES, state->lens, 19, &(state->next),
-+ &(state->lenbits), state->work);
-+ if (ret) {
-+ strm->msg = (char *)"invalid code lengths set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ Tracev((stderr, "inflate: code lengths ok\n"));
-+ state->have = 0;
-+ state->mode = CODELENS;
-+ case CODELENS:
-+ while (state->have < state->nlen + state->ndist) {
-+ for (;;) {
-+ here = state->lencode[BITS(state->lenbits)];
-+ if ((unsigned)(here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ if (here.val < 16) {
-+ DROPBITS(here.bits);
-+ state->lens[state->have++] = here.val;
-+ }
-+ else {
-+ if (here.val == 16) {
-+ NEEDBITS(here.bits + 2);
-+ DROPBITS(here.bits);
-+ if (state->have == 0) {
-+ strm->msg = (char *)"invalid bit length repeat";
-+ state->mode = BAD;
-+ break;
-+ }
-+ len = state->lens[state->have - 1];
-+ copy = 3 + BITS(2);
-+ DROPBITS(2);
-+ }
-+ else if (here.val == 17) {
-+ NEEDBITS(here.bits + 3);
-+ DROPBITS(here.bits);
-+ len = 0;
-+ copy = 3 + BITS(3);
-+ DROPBITS(3);
-+ }
-+ else {
-+ NEEDBITS(here.bits + 7);
-+ DROPBITS(here.bits);
-+ len = 0;
-+ copy = 11 + BITS(7);
-+ DROPBITS(7);
-+ }
-+ if (state->have + copy > state->nlen + state->ndist) {
-+ strm->msg = (char *)"invalid bit length repeat";
-+ state->mode = BAD;
-+ break;
-+ }
-+ while (copy--)
-+ state->lens[state->have++] = (unsigned short)len;
-+ }
-+ }
-+
-+ /* handle error breaks in while */
-+ if (state->mode == BAD) break;
-+
-+ /* check for end-of-block code (better have one) */
-+ if (state->lens[256] == 0) {
-+ strm->msg = (char *)"invalid code -- missing end-of-block";
-+ state->mode = BAD;
-+ break;
-+ }
-+
-+ /* build code tables -- note: do not change the lenbits or distbits
-+ values here (9 and 6) without reading the comments in inftrees.h
-+ concerning the ENOUGH constants, which depend on those values */
-+ state->next = state->codes;
-+ state->lencode = (const code FAR *)(state->next);
-+ state->lenbits = 9;
-+ ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-+ &(state->lenbits), state->work);
-+ if (ret) {
-+ strm->msg = (char *)"invalid literal/lengths set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->distcode = (const code FAR *)(state->next);
-+ state->distbits = 6;
-+ ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-+ &(state->next), &(state->distbits), state->work);
-+ if (ret) {
-+ strm->msg = (char *)"invalid distances set";
-+ state->mode = BAD;
-+ break;
-+ }
-+ Tracev((stderr, "inflate: codes ok\n"));
-+ state->mode = LEN_;
-+ if (flush == Z_TREES) goto inf_leave;
-+ case LEN_:
-+ state->mode = LEN;
-+ case LEN:
-+ if (have >= 6 && left >= 258) {
-+ RESTORE();
-+ inflate_fast(strm, out);
-+ LOAD();
-+ if (state->mode == TYPE)
-+ state->back = -1;
-+ break;
-+ }
-+ state->back = 0;
-+ for (;;) {
-+ here = state->lencode[BITS(state->lenbits)];
-+ if ((unsigned)(here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ if (here.op && (here.op & 0xf0) == 0) {
-+ last = here;
-+ for (;;) {
-+ here = state->lencode[last.val +
-+ (BITS(last.bits + last.op) >> last.bits)];
-+ if ((unsigned)(last.bits + here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ DROPBITS(last.bits);
-+ state->back += last.bits;
-+ }
-+ DROPBITS(here.bits);
-+ state->back += here.bits;
-+ state->length = (unsigned)here.val;
-+ if ((int)(here.op) == 0) {
-+ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-+ "inflate: literal '%c'\n" :
-+ "inflate: literal 0x%02x\n", here.val));
-+ state->mode = LIT;
-+ break;
-+ }
-+ if (here.op & 32) {
-+ Tracevv((stderr, "inflate: end of block\n"));
-+ state->back = -1;
-+ state->mode = TYPE;
-+ break;
-+ }
-+ if (here.op & 64) {
-+ strm->msg = (char *)"invalid literal/length code";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->extra = (unsigned)(here.op) & 15;
-+ state->mode = LENEXT;
-+ case LENEXT:
-+ if (state->extra) {
-+ NEEDBITS(state->extra);
-+ state->length += BITS(state->extra);
-+ DROPBITS(state->extra);
-+ state->back += state->extra;
-+ }
-+ Tracevv((stderr, "inflate: length %u\n", state->length));
-+ state->was = state->length;
-+ state->mode = DIST;
-+ case DIST:
-+ for (;;) {
-+ here = state->distcode[BITS(state->distbits)];
-+ if ((unsigned)(here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ if ((here.op & 0xf0) == 0) {
-+ last = here;
-+ for (;;) {
-+ here = state->distcode[last.val +
-+ (BITS(last.bits + last.op) >> last.bits)];
-+ if ((unsigned)(last.bits + here.bits) <= bits) break;
-+ PULLBYTE();
-+ }
-+ DROPBITS(last.bits);
-+ state->back += last.bits;
-+ }
-+ DROPBITS(here.bits);
-+ state->back += here.bits;
-+ if (here.op & 64) {
-+ strm->msg = (char *)"invalid distance code";
-+ state->mode = BAD;
-+ break;
-+ }
-+ state->offset = (unsigned)here.val;
-+ state->extra = (unsigned)(here.op) & 15;
-+ state->mode = DISTEXT;
-+ case DISTEXT:
-+ if (state->extra) {
-+ NEEDBITS(state->extra);
-+ state->offset += BITS(state->extra);
-+ DROPBITS(state->extra);
-+ state->back += state->extra;
-+ }
-+#ifdef INFLATE_STRICT
-+ if (state->offset > state->dmax) {
-+ strm->msg = (char *)"invalid distance too far back";
-+ state->mode = BAD;
-+ break;
-+ }
-+#endif
-+ Tracevv((stderr, "inflate: distance %u\n", state->offset));
-+ state->mode = MATCH;
-+ case MATCH:
-+ if (left == 0) goto inf_leave;
-+ copy = out - left;
-+ if (state->offset > copy) { /* copy from window */
-+ copy = state->offset - copy;
-+ if (copy > state->whave) {
-+ if (state->sane) {
-+ strm->msg = (char *)"invalid distance too far back";
-+ state->mode = BAD;
-+ break;
-+ }
-+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-+ Trace((stderr, "inflate.c too far\n"));
-+ copy -= state->whave;
-+ if (copy > state->length) copy = state->length;
-+ if (copy > left) copy = left;
-+ left -= copy;
-+ state->length -= copy;
-+ do {
-+ *put++ = 0;
-+ } while (--copy);
-+ if (state->length == 0) state->mode = LEN;
-+ break;
-+#endif
-+ }
-+ if (copy > state->wnext) {
-+ copy -= state->wnext;
-+ from = state->window + (state->wsize - copy);
-+ }
-+ else
-+ from = state->window + (state->wnext - copy);
-+ if (copy > state->length) copy = state->length;
-+ }
-+ else { /* copy from output */
-+ from = put - state->offset;
-+ copy = state->length;
-+ }
-+ if (copy > left) copy = left;
-+ left -= copy;
-+ state->length -= copy;
-+ do {
-+ *put++ = *from++;
-+ } while (--copy);
-+ if (state->length == 0) state->mode = LEN;
-+ break;
-+ case LIT:
-+ if (left == 0) goto inf_leave;
-+ *put++ = (unsigned char)(state->length);
-+ left--;
-+ state->mode = LEN;
-+ break;
-+ case CHECK:
-+ if (state->wrap) {
-+ NEEDBITS(32);
-+ out -= left;
-+ strm->total_out += out;
-+ state->total += out;
-+ if (out)
-+ strm->adler = state->check =
-+ UPDATE(state->check, put - out, out);
-+ out = left;
-+ if ((
-+#ifdef GUNZIP
-+ state->flags ? hold :
-+#endif
-+ ZSWAP32(hold)) != state->check) {
-+ strm->msg = (char *)"incorrect data check";
-+ state->mode = BAD;
-+ break;
-+ }
-+ INITBITS();
-+ Tracev((stderr, "inflate: check matches trailer\n"));
-+ }
-+#ifdef GUNZIP
-+ state->mode = LENGTH;
-+ case LENGTH:
-+ if (state->wrap && state->flags) {
-+ NEEDBITS(32);
-+ if (hold != (state->total & 0xffffffffUL)) {
-+ strm->msg = (char *)"incorrect length check";
-+ state->mode = BAD;
-+ break;
-+ }
-+ INITBITS();
-+ Tracev((stderr, "inflate: length matches trailer\n"));
-+ }
-+#endif
-+ state->mode = DONE;
-+ case DONE:
-+ ret = Z_STREAM_END;
-+ goto inf_leave;
-+ case BAD:
-+ ret = Z_DATA_ERROR;
-+ goto inf_leave;
-+ case MEM:
-+ return Z_MEM_ERROR;
-+ case SYNC:
-+ default:
-+ return Z_STREAM_ERROR;
-+ }
-+
-+ /*
-+ Return from inflate(), updating the total counts and the check value.
-+ If there was no progress during the inflate() call, return a buffer
-+ error. Call updatewindow() to create and/or update the window state.
-+ Note: a memory error from inflate() is non-recoverable.
-+ */
-+ inf_leave:
-+ RESTORE();
-+ if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-+ (state->mode < CHECK || flush != Z_FINISH)))
-+ if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
-+ state->mode = MEM;
-+ return Z_MEM_ERROR;
-+ }
-+ in -= strm->avail_in;
-+ out -= strm->avail_out;
-+ strm->total_in += in;
-+ strm->total_out += out;
-+ state->total += out;
-+ if (state->wrap && out)
-+ strm->adler = state->check =
-+ UPDATE(state->check, strm->next_out - out, out);
-+ strm->data_type = state->bits + (state->last ? 64 : 0) +
-+ (state->mode == TYPE ? 128 : 0) +
-+ (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
-+ if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-+ ret = Z_BUF_ERROR;
-+ return ret;
-+}
-+
-+int ZEXPORT inflateEnd(strm)
-+z_streamp strm;
-+{
-+ struct inflate_state FAR *state;
-+ if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-+ return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ if (state->window != Z_NULL) ZFREE(strm, state->window);
-+ ZFREE(strm, strm->state);
-+ strm->state = Z_NULL;
-+ Tracev((stderr, "inflate: end\n"));
-+ return Z_OK;
-+}
-+
-+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-+z_streamp strm;
-+Bytef *dictionary;
-+uInt *dictLength;
-+{
-+ struct inflate_state FAR *state;
-+
-+ /* check state */
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+
-+ /* copy dictionary */
-+ if (state->whave && dictionary != Z_NULL) {
-+ zmemcpy(dictionary, state->window + state->wnext,
-+ state->whave - state->wnext);
-+ zmemcpy(dictionary + state->whave - state->wnext,
-+ state->window, state->wnext);
-+ }
-+ if (dictLength != Z_NULL)
-+ *dictLength = state->whave;
-+ return Z_OK;
-+}
-+
-+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-+z_streamp strm;
-+const Bytef *dictionary;
-+uInt dictLength;
-+{
-+ struct inflate_state FAR *state;
-+ unsigned long dictid;
-+ int ret;
-+
-+ /* check state */
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ if (state->wrap != 0 && state->mode != DICT)
-+ return Z_STREAM_ERROR;
-+
-+ /* check for correct dictionary identifier */
-+ if (state->mode == DICT) {
-+ dictid = adler32(0L, Z_NULL, 0);
-+ dictid = adler32(dictid, dictionary, dictLength);
-+ if (dictid != state->check)
-+ return Z_DATA_ERROR;
-+ }
-+
-+ /* copy dictionary to window using updatewindow(), which will amend the
-+ existing dictionary if appropriate */
-+ ret = updatewindow(strm, dictionary + dictLength, dictLength);
-+ if (ret) {
-+ state->mode = MEM;
-+ return Z_MEM_ERROR;
-+ }
-+ state->havedict = 1;
-+ Tracev((stderr, "inflate: dictionary set\n"));
-+ return Z_OK;
-+}
-+
-+int ZEXPORT inflateGetHeader(strm, head)
-+z_streamp strm;
-+gz_headerp head;
-+{
-+ struct inflate_state FAR *state;
-+
-+ /* check state */
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-+
-+ /* save header structure */
-+ state->head = head;
-+ head->done = 0;
-+ return Z_OK;
-+}
-+
-+/*
-+ Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found
-+ or when out of input. When called, *have is the number of pattern bytes
-+ found in order so far, in 0..3. On return *have is updated to the new
-+ state. If on return *have equals four, then the pattern was found and the
-+ return value is how many bytes were read including the last byte of the
-+ pattern. If *have is less than four, then the pattern has not been found
-+ yet and the return value is len. In the latter case, syncsearch() can be
-+ called again with more data and the *have state. *have is initialized to
-+ zero for the first call.
-+ */
-+local unsigned syncsearch(have, buf, len)
-+unsigned FAR *have;
-+const unsigned char FAR *buf;
-+unsigned len;
-+{
-+ unsigned got;
-+ unsigned next;
-+
-+ got = *have;
-+ next = 0;
-+ while (next < len && got < 4) {
-+ if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-+ got++;
-+ else if (buf[next])
-+ got = 0;
-+ else
-+ got = 4 - got;
-+ next++;
-+ }
-+ *have = got;
-+ return next;
-+}
-+
-+int ZEXPORT inflateSync(strm)
-+z_streamp strm;
-+{
-+ unsigned len; /* number of bytes to look at or looked at */
-+ unsigned long in, out; /* temporary to save total_in and total_out */
-+ unsigned char buf[4]; /* to restore bit buffer to byte string */
-+ struct inflate_state FAR *state;
-+
-+ /* check parameters */
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-+
-+ /* if first time, start search in bit buffer */
-+ if (state->mode != SYNC) {
-+ state->mode = SYNC;
-+ state->hold <<= state->bits & 7;
-+ state->bits -= state->bits & 7;
-+ len = 0;
-+ while (state->bits >= 8) {
-+ buf[len++] = (unsigned char)(state->hold);
-+ state->hold >>= 8;
-+ state->bits -= 8;
-+ }
-+ state->have = 0;
-+ syncsearch(&(state->have), buf, len);
-+ }
-+
-+ /* search available input */
-+ len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-+ strm->avail_in -= len;
-+ strm->next_in += len;
-+ strm->total_in += len;
-+
-+ /* return no joy or set up to restart inflate() on a new block */
-+ if (state->have != 4) return Z_DATA_ERROR;
-+ in = strm->total_in; out = strm->total_out;
-+ inflateReset(strm);
-+ strm->total_in = in; strm->total_out = out;
-+ state->mode = TYPE;
-+ return Z_OK;
-+}
-+
-+/*
-+ Returns true if inflate is currently at the end of a block generated by
-+ Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-+ implementation to provide an additional safety check. PPP uses
-+ Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-+ block. When decompressing, PPP checks that at the end of input packet,
-+ inflate is waiting for these length bytes.
-+ */
-+int ZEXPORT inflateSyncPoint(strm)
-+z_streamp strm;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ return state->mode == STORED && state->bits == 0;
-+}
-+
-+int ZEXPORT inflateCopy(dest, source)
-+z_streamp dest;
-+z_streamp source;
-+{
-+ struct inflate_state FAR *state;
-+ struct inflate_state FAR *copy;
-+ unsigned char FAR *window;
-+ unsigned wsize;
-+
-+ /* check input */
-+ if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-+ source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-+ return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)source->state;
-+
-+ /* allocate space */
-+ copy = (struct inflate_state FAR *)
-+ ZALLOC(source, 1, sizeof(struct inflate_state));
-+ if (copy == Z_NULL) return Z_MEM_ERROR;
-+ window = Z_NULL;
-+ if (state->window != Z_NULL) {
-+ window = (unsigned char FAR *)
-+ ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-+ if (window == Z_NULL) {
-+ ZFREE(source, copy);
-+ return Z_MEM_ERROR;
-+ }
-+ }
-+
-+ /* copy state */
-+ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-+ zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
-+ if (state->lencode >= state->codes &&
-+ state->lencode <= state->codes + ENOUGH - 1) {
-+ copy->lencode = copy->codes + (state->lencode - state->codes);
-+ copy->distcode = copy->codes + (state->distcode - state->codes);
-+ }
-+ copy->next = copy->codes + (state->next - state->codes);
-+ if (window != Z_NULL) {
-+ wsize = 1U << state->wbits;
-+ zmemcpy(window, state->window, wsize);
-+ }
-+ copy->window = window;
-+ dest->state = (struct internal_state FAR *)copy;
-+ return Z_OK;
-+}
-+
-+int ZEXPORT inflateUndermine(strm, subvert)
-+z_streamp strm;
-+int subvert;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-+ state = (struct inflate_state FAR *)strm->state;
-+ state->sane = !subvert;
-+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-+ return Z_OK;
-+#else
-+ state->sane = 1;
-+ return Z_DATA_ERROR;
-+#endif
-+}
-+
-+long ZEXPORT inflateMark(strm)
-+z_streamp strm;
-+{
-+ struct inflate_state FAR *state;
-+
-+ if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
-+ state = (struct inflate_state FAR *)strm->state;
-+ return ((long)(state->back) << 16) +
-+ (state->mode == COPY ? state->length :
-+ (state->mode == MATCH ? state->was - state->length : 0));
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inflate.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,146 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* inflate.h -- internal inflate state definition
-+ * Copyright (C) 1995-2009 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* WARNING: this file should *not* be used by applications. It is
-+ part of the implementation of the compression library and is
-+ subject to change. Applications should only use zlib.h.
-+ */
-+
-+/* define NO_GZIP when compiling if you want to disable gzip header and
-+ trailer decoding by inflate(). NO_GZIP would be used to avoid linking in
-+ the crc code when it is not needed. For shared libraries, gzip decoding
-+ should be left enabled. */
-+#ifndef NO_GZIP
-+# define GUNZIP
-+#endif
-+
-+/* Possible inflate modes between inflate() calls */
-+typedef enum {
-+ HEAD, /* i: waiting for magic header */
-+ FLAGS, /* i: waiting for method and flags (gzip) */
-+ TIME, /* i: waiting for modification time (gzip) */
-+ OS, /* i: waiting for extra flags and operating system (gzip) */
-+ EXLEN, /* i: waiting for extra length (gzip) */
-+ EXTRA, /* i: waiting for extra bytes (gzip) */
-+ NAME, /* i: waiting for end of file name (gzip) */
-+ COMMENT, /* i: waiting for end of comment (gzip) */
-+ HCRC, /* i: waiting for header crc (gzip) */
-+ DICTID, /* i: waiting for dictionary check value */
-+ DICT, /* waiting for inflateSetDictionary() call */
-+ TYPE, /* i: waiting for type bits, including last-flag bit */
-+ TYPEDO, /* i: same, but skip check to exit inflate on new block */
-+ STORED, /* i: waiting for stored size (length and complement) */
-+ COPY_, /* i/o: same as COPY below, but only first time in */
-+ COPY, /* i/o: waiting for input or output to copy stored block */
-+ TABLE, /* i: waiting for dynamic block table lengths */
-+ LENLENS, /* i: waiting for code length code lengths */
-+ CODELENS, /* i: waiting for length/lit and distance code lengths */
-+ LEN_, /* i: same as LEN below, but only first time in */
-+ LEN, /* i: waiting for length/lit/eob code */
-+ LENEXT, /* i: waiting for length extra bits */
-+ DIST, /* i: waiting for distance code */
-+ DISTEXT, /* i: waiting for distance extra bits */
-+ MATCH, /* o: waiting for output space to copy string */
-+ LIT, /* o: waiting for output space to write literal */
-+ CHECK, /* i: waiting for 32-bit check value */
-+ LENGTH, /* i: waiting for 32-bit length (gzip) */
-+ DONE, /* finished check, done -- remain here until reset */
-+ BAD, /* got a data error -- remain here until reset */
-+ MEM, /* got an inflate() memory error -- remain here until reset */
-+ SYNC /* looking for synchronization bytes to restart inflate() */
-+} inflate_mode;
-+
-+/*
-+ State transitions between above modes -
-+
-+ (most modes can go to BAD or MEM on error -- not shown for clarity)
-+
-+ Process header:
-+ HEAD -> (gzip) or (zlib) or (raw)
-+ (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-+ HCRC -> TYPE
-+ (zlib) -> DICTID or TYPE
-+ DICTID -> DICT -> TYPE
-+ (raw) -> TYPEDO
-+ Read deflate blocks:
-+ TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-+ STORED -> COPY_ -> COPY -> TYPE
-+ TABLE -> LENLENS -> CODELENS -> LEN_
-+ LEN_ -> LEN
-+ Read deflate codes in fixed or dynamic block:
-+ LEN -> LENEXT or LIT or TYPE
-+ LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-+ LIT -> LEN
-+ Process trailer:
-+ CHECK -> LENGTH -> DONE
-+ */
-+
-+/* state maintained between inflate() calls. Approximately 10K bytes. */
-+struct inflate_state {
-+ inflate_mode mode; /* current inflate mode */
-+ int last; /* true if processing last block */
-+ int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
-+ int havedict; /* true if dictionary provided */
-+ int flags; /* gzip header method and flags (0 if zlib) */
-+ unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
-+ unsigned long check; /* protected copy of check value */
-+ unsigned long total; /* protected copy of output count */
-+ gz_headerp head; /* where to save gzip header information */
-+ /* sliding window */
-+ unsigned wbits; /* log base 2 of requested window size */
-+ unsigned wsize; /* window size or zero if not using window */
-+ unsigned whave; /* valid bytes in the window */
-+ unsigned wnext; /* window write index */
-+ unsigned char FAR *window; /* allocated sliding window, if needed */
-+ /* bit accumulator */
-+ unsigned long hold; /* input bit accumulator */
-+ unsigned bits; /* number of bits in "in" */
-+ /* for string and stored block copying */
-+ unsigned length; /* literal or length of data to copy */
-+ unsigned offset; /* distance back to copy string from */
-+ /* for table and code decoding */
-+ unsigned extra; /* extra bits needed */
-+ /* fixed and dynamic code tables */
-+ code const FAR *lencode; /* starting table for length/literal codes */
-+ code const FAR *distcode; /* starting table for distance codes */
-+ unsigned lenbits; /* index bits for lencode */
-+ unsigned distbits; /* index bits for distcode */
-+ /* dynamic table building */
-+ unsigned ncode; /* number of code length code lengths */
-+ unsigned nlen; /* number of length code lengths */
-+ unsigned ndist; /* number of distance code lengths */
-+ unsigned have; /* number of code lengths in lens[] */
-+ code FAR *next; /* next available space in codes[] */
-+ unsigned short lens[320]; /* temporary storage for code lengths */
-+ unsigned short work[288]; /* work area for code table building */
-+ code codes[ENOUGH]; /* space for code tables */
-+ int sane; /* if false, allow invalid distance too far */
-+ int back; /* bits back of last unprocessed length/lit */
-+ unsigned was; /* initial length of match */
-+};
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inftrees.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,330 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* inftrees.c -- generate Huffman trees for efficient decoding
-+ * Copyright (C) 1995-2013 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "zutil.h"
-+#include "inftrees.h"
-+
-+#define MAXBITS 15
-+
-+const char inflate_copyright[] =
-+ " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
-+/*
-+ If you use the zlib library in a product, an acknowledgment is welcome
-+ in the documentation of your product. If for some reason you cannot
-+ include such an acknowledgment, I would appreciate that you keep this
-+ copyright string in the executable of your product.
-+ */
-+
-+/*
-+ Build a set of tables to decode the provided canonical Huffman code.
-+ The code lengths are lens[0..codes-1]. The result starts at *table,
-+ whose indices are 0..2^bits-1. work is a writable array of at least
-+ lens shorts, which is used as a work area. type is the type of code
-+ to be generated, CODES, LENS, or DISTS. On return, zero is success,
-+ -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
-+ on return points to the next available entry's address. bits is the
-+ requested root table index bits, and on return it is the actual root
-+ table index bits. It will differ if the request is greater than the
-+ longest code or if it is less than the shortest code.
-+ */
-+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-+codetype type;
-+unsigned short FAR *lens;
-+unsigned codes;
-+code FAR * FAR *table;
-+unsigned FAR *bits;
-+unsigned short FAR *work;
-+{
-+ unsigned len; /* a code's length in bits */
-+ unsigned sym; /* index of code symbols */
-+ unsigned min, max; /* minimum and maximum code lengths */
-+ unsigned root; /* number of index bits for root table */
-+ unsigned curr; /* number of index bits for current table */
-+ unsigned drop; /* code bits to drop for sub-table */
-+ int left; /* number of prefix codes available */
-+ unsigned used; /* code entries in table used */
-+ unsigned huff; /* Huffman code */
-+ unsigned incr; /* for incrementing code, index */
-+ unsigned fill; /* index for replicating entries */
-+ unsigned low; /* low bits for current root entry */
-+ unsigned mask; /* mask for low root bits */
-+ code here; /* table entry for duplication */
-+ code FAR *next; /* next available space in table */
-+ const unsigned short FAR *base; /* base value table to use */
-+ const unsigned short FAR *extra; /* extra bits table to use */
-+ int end; /* use base and extra for symbol > end */
-+ unsigned short count[MAXBITS+1]; /* number of codes of each length */
-+ unsigned short offs[MAXBITS+1]; /* offsets in table for each length */
-+ static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-+ 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-+ static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-+ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
-+ static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-+ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-+ 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-+ 8193, 12289, 16385, 24577, 0, 0};
-+ static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-+ 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-+ 23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-+ 28, 28, 29, 29, 64, 64};
-+
-+ /*
-+ Process a set of code lengths to create a canonical Huffman code. The
-+ code lengths are lens[0..codes-1]. Each length corresponds to the
-+ symbols 0..codes-1. The Huffman code is generated by first sorting the
-+ symbols by length from short to long, and retaining the symbol order
-+ for codes with equal lengths. Then the code starts with all zero bits
-+ for the first code of the shortest length, and the codes are integer
-+ increments for the same length, and zeros are appended as the length
-+ increases. For the deflate format, these bits are stored backwards
-+ from their more natural integer increment ordering, and so when the
-+ decoding tables are built in the large loop below, the integer codes
-+ are incremented backwards.
-+
-+ This routine assumes, but does not check, that all of the entries in
-+ lens[] are in the range 0..MAXBITS. The caller must assure this.
-+ 1..MAXBITS is interpreted as that code length. zero means that that
-+ symbol does not occur in this code.
-+
-+ The codes are sorted by computing a count of codes for each length,
-+ creating from that a table of starting indices for each length in the
-+ sorted table, and then entering the symbols in order in the sorted
-+ table. The sorted table is work[], with that space being provided by
-+ the caller.
-+
-+ The length counts are used for other purposes as well, i.e. finding
-+ the minimum and maximum length codes, determining if there are any
-+ codes at all, checking for a valid set of lengths, and looking ahead
-+ at length counts to determine sub-table sizes when building the
-+ decoding tables.
-+ */
-+
-+ /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-+ for (len = 0; len <= MAXBITS; len++)
-+ count[len] = 0;
-+ for (sym = 0; sym < codes; sym++)
-+ count[lens[sym]]++;
-+
-+ /* bound code lengths, force root to be within code lengths */
-+ root = *bits;
-+ for (max = MAXBITS; max >= 1; max--)
-+ if (count[max] != 0) break;
-+ if (root > max) root = max;
-+ if (max == 0) { /* no symbols to code at all */
-+ here.op = (unsigned char)64; /* invalid code marker */
-+ here.bits = (unsigned char)1;
-+ here.val = (unsigned short)0;
-+ *(*table)++ = here; /* make a table to force an error */
-+ *(*table)++ = here;
-+ *bits = 1;
-+ return 0; /* no symbols, but wait for decoding to report error */
-+ }
-+ for (min = 1; min < max; min++)
-+ if (count[min] != 0) break;
-+ if (root < min) root = min;
-+
-+ /* check for an over-subscribed or incomplete set of lengths */
-+ left = 1;
-+ for (len = 1; len <= MAXBITS; len++) {
-+ left <<= 1;
-+ left -= count[len];
-+ if (left < 0) return -1; /* over-subscribed */
-+ }
-+ if (left > 0 && (type == CODES || max != 1))
-+ return -1; /* incomplete set */
-+
-+ /* generate offsets into symbol table for each length for sorting */
-+ offs[1] = 0;
-+ for (len = 1; len < MAXBITS; len++)
-+ offs[len + 1] = offs[len] + count[len];
-+
-+ /* sort symbols by length, by symbol order within each length */
-+ for (sym = 0; sym < codes; sym++)
-+ if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-+
-+ /*
-+ Create and fill in decoding tables. In this loop, the table being
-+ filled is at next and has curr index bits. The code being used is huff
-+ with length len. That code is converted to an index by dropping drop
-+ bits off of the bottom. For codes where len is less than drop + curr,
-+ those top drop + curr - len bits are incremented through all values to
-+ fill the table with replicated entries.
-+
-+ root is the number of index bits for the root table. When len exceeds
-+ root, sub-tables are created pointed to by the root entry with an index
-+ of the low root bits of huff. This is saved in low to check for when a
-+ new sub-table should be started. drop is zero when the root table is
-+ being filled, and drop is root when sub-tables are being filled.
-+
-+ When a new sub-table is needed, it is necessary to look ahead in the
-+ code lengths to determine what size sub-table is needed. The length
-+ counts are used for this, and so count[] is decremented as codes are
-+ entered in the tables.
-+
-+ used keeps track of how many table entries have been allocated from the
-+ provided *table space. It is checked for LENS and DIST tables against
-+ the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-+ the initial root table size constants. See the comments in inftrees.h
-+ for more information.
-+
-+ sym increments through all symbols, and the loop terminates when
-+ all codes of length max, i.e. all codes, have been processed. This
-+ routine permits incomplete codes, so another loop after this one fills
-+ in the rest of the decoding tables with invalid code markers.
-+ */
-+
-+ /* set up for code type */
-+ switch (type) {
-+ case CODES:
-+ base = extra = work; /* dummy value--not used */
-+ end = 19;
-+ break;
-+ case LENS:
-+ base = lbase;
-+ base -= 257;
-+ extra = lext;
-+ extra -= 257;
-+ end = 256;
-+ break;
-+ default: /* DISTS */
-+ base = dbase;
-+ extra = dext;
-+ end = -1;
-+ }
-+
-+ /* initialize state for loop */
-+ huff = 0; /* starting code */
-+ sym = 0; /* starting code symbol */
-+ len = min; /* starting code length */
-+ next = *table; /* current table to fill in */
-+ curr = root; /* current table index bits */
-+ drop = 0; /* current bits to drop from code for index */
-+ low = (unsigned)(-1); /* trigger new sub-table when len > root */
-+ used = 1U << root; /* use root table entries */
-+ mask = used - 1; /* mask for comparing low */
-+
-+ /* check available table space */
-+ if ((type == LENS && used > ENOUGH_LENS) ||
-+ (type == DISTS && used > ENOUGH_DISTS))
-+ return 1;
-+
-+ /* process all codes and make table entries */
-+ for (;;) {
-+ /* create table entry */
-+ here.bits = (unsigned char)(len - drop);
-+ if ((int)(work[sym]) < end) {
-+ here.op = (unsigned char)0;
-+ here.val = work[sym];
-+ }
-+ else if ((int)(work[sym]) > end) {
-+ here.op = (unsigned char)(extra[work[sym]]);
-+ here.val = base[work[sym]];
-+ }
-+ else {
-+ here.op = (unsigned char)(32 + 64); /* end of block */
-+ here.val = 0;
-+ }
-+
-+ /* replicate for those indices with low len bits equal to huff */
-+ incr = 1U << (len - drop);
-+ fill = 1U << curr;
-+ min = fill; /* save offset to next table */
-+ do {
-+ fill -= incr;
-+ next[(huff >> drop) + fill] = here;
-+ } while (fill != 0);
-+
-+ /* backwards increment the len-bit code huff */
-+ incr = 1U << (len - 1);
-+ while (huff & incr)
-+ incr >>= 1;
-+ if (incr != 0) {
-+ huff &= incr - 1;
-+ huff += incr;
-+ }
-+ else
-+ huff = 0;
-+
-+ /* go to next symbol, update count, len */
-+ sym++;
-+ if (--(count[len]) == 0) {
-+ if (len == max) break;
-+ len = lens[work[sym]];
-+ }
-+
-+ /* create new sub-table if needed */
-+ if (len > root && (huff & mask) != low) {
-+ /* if first time, transition to sub-tables */
-+ if (drop == 0)
-+ drop = root;
-+
-+ /* increment past last table */
-+ next += min; /* here min is 1 << curr */
-+
-+ /* determine length of next table */
-+ curr = len - drop;
-+ left = (int)(1 << curr);
-+ while (curr + drop < max) {
-+ left -= count[curr + drop];
-+ if (left <= 0) break;
-+ curr++;
-+ left <<= 1;
-+ }
-+
-+ /* check for enough space */
-+ used += 1U << curr;
-+ if ((type == LENS && used > ENOUGH_LENS) ||
-+ (type == DISTS && used > ENOUGH_DISTS))
-+ return 1;
-+
-+ /* point entry in root table to sub-table */
-+ low = huff & mask;
-+ (*table)[low].op = (unsigned char)curr;
-+ (*table)[low].bits = (unsigned char)root;
-+ (*table)[low].val = (unsigned short)(next - *table);
-+ }
-+ }
-+
-+ /* fill in remaining table entry if code is incomplete (guaranteed to have
-+ at most one remaining entry, since if the code is incomplete, the
-+ maximum code length that was allowed to get this far is one bit) */
-+ if (huff != 0) {
-+ here.op = (unsigned char)64; /* invalid code marker */
-+ here.bits = (unsigned char)(len - drop);
-+ here.val = (unsigned short)0;
-+ next[huff] = here;
-+ }
-+
-+ /* set return parameters */
-+ *table += used;
-+ *bits = root;
-+ return 0;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/inftrees.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,86 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* inftrees.h -- header to use inftrees.c
-+ * Copyright (C) 1995-2005, 2010 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* WARNING: this file should *not* be used by applications. It is
-+ part of the implementation of the compression library and is
-+ subject to change. Applications should only use zlib.h.
-+ */
-+
-+/* Structure for decoding tables. Each entry provides either the
-+ information needed to do the operation requested by the code that
-+ indexed that table entry, or it provides a pointer to another
-+ table that indexes more bits of the code. op indicates whether
-+ the entry is a pointer to another table, a literal, a length or
-+ distance, an end-of-block, or an invalid code. For a table
-+ pointer, the low four bits of op is the number of index bits of
-+ that table. For a length or distance, the low four bits of op
-+ is the number of extra bits to get after the code. bits is
-+ the number of bits in this code or part of the code to drop off
-+ of the bit buffer. val is the actual byte to output in the case
-+ of a literal, the base length or distance, or the offset from
-+ the current table to the next table. Each entry is four bytes. */
-+typedef struct {
-+ unsigned char op; /* operation, extra bits, table bits */
-+ unsigned char bits; /* bits in this part of the code */
-+ unsigned short val; /* offset in table or code value */
-+} code;
-+
-+/* op values as set by inflate_table():
-+ 00000000 - literal
-+ 0000tttt - table link, tttt != 0 is the number of table index bits
-+ 0001eeee - length or distance, eeee is the number of extra bits
-+ 01100000 - end of block
-+ 01000000 - invalid code
-+ */
-+
-+/* Maximum size of the dynamic table. The maximum number of code structures is
-+ 1444, which is the sum of 852 for literal/length codes and 592 for distance
-+ codes. These values were found by exhaustive searches using the program
-+ examples/enough.c found in the zlib distribtution. The arguments to that
-+ program are the number of symbols, the initial root table size, and the
-+ maximum bit length of a code. "enough 286 9 15" for literal/length codes
-+ returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-+ The initial root table size (9 or 6) is found in the fifth argument of the
-+ inflate_table() calls in inflate.c and infback.c. If the root table size is
-+ changed, then these maximum sizes would be need to be recalculated and
-+ updated. */
-+#define ENOUGH_LENS 852
-+#define ENOUGH_DISTS 592
-+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-+
-+/* Type of code to build for inflate_table() */
-+typedef enum {
-+ CODES,
-+ LENS,
-+ DISTS
-+} codetype;
-+
-+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-+ unsigned codes, code FAR * FAR *table,
-+ unsigned FAR *bits, unsigned short FAR *work));
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/patches/ChangeLog_java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,10 @@
-+(1)renamed
-+ adler32.c -> zadler32.c
-+ zcrc32c -> zcrc32.c
-+
-+(2)added _LP64 to make uLong a 32-bit int on 64-bit platform
-+ zconf.h:
-+ uLong -> 32-bit int
-+
-+(3)updated crc32.c/crc32()
-+ unsigned long -> uLong
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/trees.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,1250 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* trees.c -- output deflated data using Huffman coding
-+ * Copyright (C) 1995-2012 Jean-loup Gailly
-+ * detect_data_type() function provided freely by Cosmin Truta, 2006
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/*
-+ * ALGORITHM
-+ *
-+ * The "deflation" process uses several Huffman trees. The more
-+ * common source values are represented by shorter bit sequences.
-+ *
-+ * Each code tree is stored in a compressed form which is itself
-+ * a Huffman encoding of the lengths of all the code strings (in
-+ * ascending order by source values). The actual code strings are
-+ * reconstructed from the lengths in the inflate process, as described
-+ * in the deflate specification.
-+ *
-+ * REFERENCES
-+ *
-+ * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
-+ * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
-+ *
-+ * Storer, James A.
-+ * Data Compression: Methods and Theory, pp. 49-50.
-+ * Computer Science Press, 1988. ISBN 0-7167-8156-5.
-+ *
-+ * Sedgewick, R.
-+ * Algorithms, p290.
-+ * Addison-Wesley, 1983. ISBN 0-201-06672-6.
-+ */
-+
-+/* @(#) $Id$ */
-+
-+/* #define GEN_TREES_H */
-+
-+#include "deflate.h"
-+
-+#ifdef DEBUG
-+# include <ctype.h>
-+#endif
-+
-+/* ===========================================================================
-+ * Constants
-+ */
-+
-+#define MAX_BL_BITS 7
-+/* Bit length codes must not exceed MAX_BL_BITS bits */
-+
-+#define END_BLOCK 256
-+/* end of block literal code */
-+
-+#define REP_3_6 16
-+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-+
-+#define REPZ_3_10 17
-+/* repeat a zero length 3-10 times (3 bits of repeat count) */
-+
-+#define REPZ_11_138 18
-+/* repeat a zero length 11-138 times (7 bits of repeat count) */
-+
-+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-+ = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-+
-+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-+ = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-+
-+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-+ = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-+
-+local const uch bl_order[BL_CODES]
-+ = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-+/* The lengths of the bit length codes are sent in order of decreasing
-+ * probability, to avoid transmitting the lengths for unused bit length codes.
-+ */
-+
-+/* ===========================================================================
-+ * Local data. These are initialized only once.
-+ */
-+
-+#define DIST_CODE_LEN 512 /* see definition of array dist_code below */
-+
-+#if defined(GEN_TREES_H) || !defined(STDC)
-+/* non ANSI compilers may not accept trees.h */
-+
-+local ct_data static_ltree[L_CODES+2];
-+/* The static literal tree. Since the bit lengths are imposed, there is no
-+ * need for the L_CODES extra codes used during heap construction. However
-+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
-+ * below).
-+ */
-+
-+local ct_data static_dtree[D_CODES];
-+/* The static distance tree. (Actually a trivial tree since all codes use
-+ * 5 bits.)
-+ */
-+
-+uch _dist_code[DIST_CODE_LEN];
-+/* Distance codes. The first 256 values correspond to the distances
-+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
-+ * the 15 bit distances.
-+ */
-+
-+uch _length_code[MAX_MATCH-MIN_MATCH+1];
-+/* length code for each normalized match length (0 == MIN_MATCH) */
-+
-+local int base_length[LENGTH_CODES];
-+/* First normalized length for each code (0 = MIN_MATCH) */
-+
-+local int base_dist[D_CODES];
-+/* First normalized distance for each code (0 = distance of 1) */
-+
-+#else
-+# include "trees.h"
-+#endif /* GEN_TREES_H */
-+
-+struct static_tree_desc_s {
-+ const ct_data *static_tree; /* static tree or NULL */
-+ const intf *extra_bits; /* extra bits for each code or NULL */
-+ int extra_base; /* base index for extra_bits */
-+ int elems; /* max number of elements in the tree */
-+ int max_length; /* max bit length for the codes */
-+};
-+
-+local static_tree_desc static_l_desc =
-+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-+
-+local static_tree_desc static_d_desc =
-+{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS};
-+
-+local static_tree_desc static_bl_desc =
-+{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS};
-+
-+/* ===========================================================================
-+ * Local (static) routines in this file.
-+ */
-+
-+local void tr_static_init OF((void));
-+local void init_block OF((deflate_state *s));
-+local void pqdownheap OF((deflate_state *s, ct_data *tree, int k));
-+local void gen_bitlen OF((deflate_state *s, tree_desc *desc));
-+local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count));
-+local void build_tree OF((deflate_state *s, tree_desc *desc));
-+local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code));
-+local void send_tree OF((deflate_state *s, ct_data *tree, int max_code));
-+local int build_bl_tree OF((deflate_state *s));
-+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-+ int blcodes));
-+local void compress_block OF((deflate_state *s, const ct_data *ltree,
-+ const ct_data *dtree));
-+local int detect_data_type OF((deflate_state *s));
-+local unsigned bi_reverse OF((unsigned value, int length));
-+local void bi_windup OF((deflate_state *s));
-+local void bi_flush OF((deflate_state *s));
-+local void copy_block OF((deflate_state *s, charf *buf, unsigned len,
-+ int header));
-+
-+#ifdef GEN_TREES_H
-+local void gen_trees_header OF((void));
-+#endif
-+
-+#ifndef DEBUG
-+# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-+ /* Send a code of the given tree. c and tree must not have side effects */
-+
-+#else /* DEBUG */
-+# define send_code(s, c, tree) \
-+ { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-+ send_bits(s, tree[c].Code, tree[c].Len); }
-+#endif
-+
-+/* ===========================================================================
-+ * Output a short LSB first on the stream.
-+ * IN assertion: there is enough room in pendingBuf.
-+ */
-+#define put_short(s, w) { \
-+ put_byte(s, (uch)((w) & 0xff)); \
-+ put_byte(s, (uch)((ush)(w) >> 8)); \
-+}
-+
-+/* ===========================================================================
-+ * Send a value on a given number of bits.
-+ * IN assertion: length <= 16 and value fits in length bits.
-+ */
-+#ifdef DEBUG
-+local void send_bits OF((deflate_state *s, int value, int length));
-+
-+local void send_bits(s, value, length)
-+ deflate_state *s;
-+ int value; /* value to send */
-+ int length; /* number of bits */
-+{
-+ Tracevv((stderr," l %2d v %4x ", length, value));
-+ Assert(length > 0 && length <= 15, "invalid length");
-+ s->bits_sent += (ulg)length;
-+
-+ /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-+ * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-+ * unused bits in value.
-+ */
-+ if (s->bi_valid > (int)Buf_size - length) {
-+ s->bi_buf |= (ush)value << s->bi_valid;
-+ put_short(s, s->bi_buf);
-+ s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-+ s->bi_valid += length - Buf_size;
-+ } else {
-+ s->bi_buf |= (ush)value << s->bi_valid;
-+ s->bi_valid += length;
-+ }
-+}
-+#else /* !DEBUG */
-+
-+#define send_bits(s, value, length) \
-+{ int len = length;\
-+ if (s->bi_valid > (int)Buf_size - len) {\
-+ int val = value;\
-+ s->bi_buf |= (ush)val << s->bi_valid;\
-+ put_short(s, s->bi_buf);\
-+ s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-+ s->bi_valid += len - Buf_size;\
-+ } else {\
-+ s->bi_buf |= (ush)(value) << s->bi_valid;\
-+ s->bi_valid += len;\
-+ }\
-+}
-+#endif /* DEBUG */
-+
-+
-+/* the arguments must not have side effects */
-+
-+/* ===========================================================================
-+ * Initialize the various 'constant' tables.
-+ */
-+local void tr_static_init()
-+{
-+#if defined(GEN_TREES_H) || !defined(STDC)
-+ static int static_init_done = 0;
-+ int n; /* iterates over tree elements */
-+ int bits; /* bit counter */
-+ int length; /* length value */
-+ int code; /* code value */
-+ int dist; /* distance index */
-+ ush bl_count[MAX_BITS+1];
-+ /* number of codes at each bit length for an optimal tree */
-+
-+ if (static_init_done) return;
-+
-+ /* For some embedded targets, global variables are not initialized: */
-+#ifdef NO_INIT_GLOBAL_POINTERS
-+ static_l_desc.static_tree = static_ltree;
-+ static_l_desc.extra_bits = extra_lbits;
-+ static_d_desc.static_tree = static_dtree;
-+ static_d_desc.extra_bits = extra_dbits;
-+ static_bl_desc.extra_bits = extra_blbits;
-+#endif
-+
-+ /* Initialize the mapping length (0..255) -> length code (0..28) */
-+ length = 0;
-+ for (code = 0; code < LENGTH_CODES-1; code++) {
-+ base_length[code] = length;
-+ for (n = 0; n < (1<<extra_lbits[code]); n++) {
-+ _length_code[length++] = (uch)code;
-+ }
-+ }
-+ Assert (length == 256, "tr_static_init: length != 256");
-+ /* Note that the length 255 (match length 258) can be represented
-+ * in two different ways: code 284 + 5 bits or code 285, so we
-+ * overwrite length_code[255] to use the best encoding:
-+ */
-+ _length_code[length-1] = (uch)code;
-+
-+ /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-+ dist = 0;
-+ for (code = 0 ; code < 16; code++) {
-+ base_dist[code] = dist;
-+ for (n = 0; n < (1<<extra_dbits[code]); n++) {
-+ _dist_code[dist++] = (uch)code;
-+ }
-+ }
-+ Assert (dist == 256, "tr_static_init: dist != 256");
-+ dist >>= 7; /* from now on, all distances are divided by 128 */
-+ for ( ; code < D_CODES; code++) {
-+ base_dist[code] = dist << 7;
-+ for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-+ _dist_code[256 + dist++] = (uch)code;
-+ }
-+ }
-+ Assert (dist == 256, "tr_static_init: 256+dist != 512");
-+
-+ /* Construct the codes of the static literal tree */
-+ for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-+ n = 0;
-+ while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-+ while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-+ while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-+ while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-+ /* Codes 286 and 287 do not exist, but we must include them in the
-+ * tree construction to get a canonical Huffman tree (longest code
-+ * all ones)
-+ */
-+ gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-+
-+ /* The static distance tree is trivial: */
-+ for (n = 0; n < D_CODES; n++) {
-+ static_dtree[n].Len = 5;
-+ static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-+ }
-+ static_init_done = 1;
-+
-+# ifdef GEN_TREES_H
-+ gen_trees_header();
-+# endif
-+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-+}
-+
-+/* ===========================================================================
-+ * Genererate the file trees.h describing the static trees.
-+ */
-+#ifdef GEN_TREES_H
-+# ifndef DEBUG
-+# include <stdio.h>
-+# endif
-+
-+# define SEPARATOR(i, last, width) \
-+ ((i) == (last)? "\n};\n\n" : \
-+ ((i) % (width) == (width)-1 ? ",\n" : ", "))
-+
-+void gen_trees_header()
-+{
-+ FILE *header = fopen("trees.h", "w");
-+ int i;
-+
-+ Assert (header != NULL, "Can't open trees.h");
-+ fprintf(header,
-+ "/* header created automatically with -DGEN_TREES_H */\n\n");
-+
-+ fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-+ for (i = 0; i < L_CODES+2; i++) {
-+ fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-+ static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-+ }
-+
-+ fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-+ for (i = 0; i < D_CODES; i++) {
-+ fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-+ static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-+ }
-+
-+ fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
-+ for (i = 0; i < DIST_CODE_LEN; i++) {
-+ fprintf(header, "%2u%s", _dist_code[i],
-+ SEPARATOR(i, DIST_CODE_LEN-1, 20));
-+ }
-+
-+ fprintf(header,
-+ "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-+ for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-+ fprintf(header, "%2u%s", _length_code[i],
-+ SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-+ }
-+
-+ fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-+ for (i = 0; i < LENGTH_CODES; i++) {
-+ fprintf(header, "%1u%s", base_length[i],
-+ SEPARATOR(i, LENGTH_CODES-1, 20));
-+ }
-+
-+ fprintf(header, "local const int base_dist[D_CODES] = {\n");
-+ for (i = 0; i < D_CODES; i++) {
-+ fprintf(header, "%5u%s", base_dist[i],
-+ SEPARATOR(i, D_CODES-1, 10));
-+ }
-+
-+ fclose(header);
-+}
-+#endif /* GEN_TREES_H */
-+
-+/* ===========================================================================
-+ * Initialize the tree data structures for a new zlib stream.
-+ */
-+void ZLIB_INTERNAL _tr_init(s)
-+ deflate_state *s;
-+{
-+ tr_static_init();
-+
-+ s->l_desc.dyn_tree = s->dyn_ltree;
-+ s->l_desc.stat_desc = &static_l_desc;
-+
-+ s->d_desc.dyn_tree = s->dyn_dtree;
-+ s->d_desc.stat_desc = &static_d_desc;
-+
-+ s->bl_desc.dyn_tree = s->bl_tree;
-+ s->bl_desc.stat_desc = &static_bl_desc;
-+
-+ s->bi_buf = 0;
-+ s->bi_valid = 0;
-+#ifdef DEBUG
-+ s->compressed_len = 0L;
-+ s->bits_sent = 0L;
-+#endif
-+
-+ /* Initialize the first block of the first file: */
-+ init_block(s);
-+}
-+
-+/* ===========================================================================
-+ * Initialize a new block.
-+ */
-+local void init_block(s)
-+ deflate_state *s;
-+{
-+ int n; /* iterates over tree elements */
-+
-+ /* Initialize the trees. */
-+ for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0;
-+ for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0;
-+ for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-+
-+ s->dyn_ltree[END_BLOCK].Freq = 1;
-+ s->opt_len = s->static_len = 0L;
-+ s->last_lit = s->matches = 0;
-+}
-+
-+#define SMALLEST 1
-+/* Index within the heap array of least frequent node in the Huffman tree */
-+
-+
-+/* ===========================================================================
-+ * Remove the smallest element from the heap and recreate the heap with
-+ * one less element. Updates heap and heap_len.
-+ */
-+#define pqremove(s, tree, top) \
-+{\
-+ top = s->heap[SMALLEST]; \
-+ s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-+ pqdownheap(s, tree, SMALLEST); \
-+}
-+
-+/* ===========================================================================
-+ * Compares to subtrees, using the tree depth as tie breaker when
-+ * the subtrees have equal frequency. This minimizes the worst case length.
-+ */
-+#define smaller(tree, n, m, depth) \
-+ (tree[n].Freq < tree[m].Freq || \
-+ (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-+
-+/* ===========================================================================
-+ * Restore the heap property by moving down the tree starting at node k,
-+ * exchanging a node with the smallest of its two sons if necessary, stopping
-+ * when the heap property is re-established (each father smaller than its
-+ * two sons).
-+ */
-+local void pqdownheap(s, tree, k)
-+ deflate_state *s;
-+ ct_data *tree; /* the tree to restore */
-+ int k; /* node to move down */
-+{
-+ int v = s->heap[k];
-+ int j = k << 1; /* left son of k */
-+ while (j <= s->heap_len) {
-+ /* Set j to the smallest of the two sons: */
-+ if (j < s->heap_len &&
-+ smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-+ j++;
-+ }
-+ /* Exit if v is smaller than both sons */
-+ if (smaller(tree, v, s->heap[j], s->depth)) break;
-+
-+ /* Exchange v with the smallest son */
-+ s->heap[k] = s->heap[j]; k = j;
-+
-+ /* And continue down the tree, setting j to the left son of k */
-+ j <<= 1;
-+ }
-+ s->heap[k] = v;
-+}
-+
-+/* ===========================================================================
-+ * Compute the optimal bit lengths for a tree and update the total bit length
-+ * for the current block.
-+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
-+ * above are the tree nodes sorted by increasing frequency.
-+ * OUT assertions: the field len is set to the optimal bit length, the
-+ * array bl_count contains the frequencies for each bit length.
-+ * The length opt_len is updated; static_len is also updated if stree is
-+ * not null.
-+ */
-+local void gen_bitlen(s, desc)
-+ deflate_state *s;
-+ tree_desc *desc; /* the tree descriptor */
-+{
-+ ct_data *tree = desc->dyn_tree;
-+ int max_code = desc->max_code;
-+ const ct_data *stree = desc->stat_desc->static_tree;
-+ const intf *extra = desc->stat_desc->extra_bits;
-+ int base = desc->stat_desc->extra_base;
-+ int max_length = desc->stat_desc->max_length;
-+ int h; /* heap index */
-+ int n, m; /* iterate over the tree elements */
-+ int bits; /* bit length */
-+ int xbits; /* extra bits */
-+ ush f; /* frequency */
-+ int overflow = 0; /* number of elements with bit length too large */
-+
-+ for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-+
-+ /* In a first pass, compute the optimal bit lengths (which may
-+ * overflow in the case of the bit length tree).
-+ */
-+ tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-+
-+ for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-+ n = s->heap[h];
-+ bits = tree[tree[n].Dad].Len + 1;
-+ if (bits > max_length) bits = max_length, overflow++;
-+ tree[n].Len = (ush)bits;
-+ /* We overwrite tree[n].Dad which is no longer needed */
-+
-+ if (n > max_code) continue; /* not a leaf node */
-+
-+ s->bl_count[bits]++;
-+ xbits = 0;
-+ if (n >= base) xbits = extra[n-base];
-+ f = tree[n].Freq;
-+ s->opt_len += (ulg)f * (bits + xbits);
-+ if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-+ }
-+ if (overflow == 0) return;
-+
-+ Trace((stderr,"\nbit length overflow\n"));
-+ /* This happens for example on obj2 and pic of the Calgary corpus */
-+
-+ /* Find the first bit length which could increase: */
-+ do {
-+ bits = max_length-1;
-+ while (s->bl_count[bits] == 0) bits--;
-+ s->bl_count[bits]--; /* move one leaf down the tree */
-+ s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-+ s->bl_count[max_length]--;
-+ /* The brother of the overflow item also moves one step up,
-+ * but this does not affect bl_count[max_length]
-+ */
-+ overflow -= 2;
-+ } while (overflow > 0);
-+
-+ /* Now recompute all bit lengths, scanning in increasing frequency.
-+ * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-+ * lengths instead of fixing only the wrong ones. This idea is taken
-+ * from 'ar' written by Haruhiko Okumura.)
-+ */
-+ for (bits = max_length; bits != 0; bits--) {
-+ n = s->bl_count[bits];
-+ while (n != 0) {
-+ m = s->heap[--h];
-+ if (m > max_code) continue;
-+ if ((unsigned) tree[m].Len != (unsigned) bits) {
-+ Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-+ s->opt_len += ((long)bits - (long)tree[m].Len)
-+ *(long)tree[m].Freq;
-+ tree[m].Len = (ush)bits;
-+ }
-+ n--;
-+ }
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Generate the codes for a given tree and bit counts (which need not be
-+ * optimal).
-+ * IN assertion: the array bl_count contains the bit length statistics for
-+ * the given tree and the field len is set for all tree elements.
-+ * OUT assertion: the field code is set for all tree elements of non
-+ * zero code length.
-+ */
-+local void gen_codes (tree, max_code, bl_count)
-+ ct_data *tree; /* the tree to decorate */
-+ int max_code; /* largest code with non zero frequency */
-+ ushf *bl_count; /* number of codes at each bit length */
-+{
-+ ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-+ ush code = 0; /* running code value */
-+ int bits; /* bit index */
-+ int n; /* code index */
-+
-+ /* The distribution counts are first used to generate the code values
-+ * without bit reversal.
-+ */
-+ for (bits = 1; bits <= MAX_BITS; bits++) {
-+ next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-+ }
-+ /* Check that the bit counts in bl_count are consistent. The last code
-+ * must be all ones.
-+ */
-+ Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-+ "inconsistent bit counts");
-+ Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-+
-+ for (n = 0; n <= max_code; n++) {
-+ int len = tree[n].Len;
-+ if (len == 0) continue;
-+ /* Now reverse the bits */
-+ tree[n].Code = bi_reverse(next_code[len]++, len);
-+
-+ Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-+ n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Construct one Huffman tree and assigns the code bit strings and lengths.
-+ * Update the total bit length for the current block.
-+ * IN assertion: the field freq is set for all tree elements.
-+ * OUT assertions: the fields len and code are set to the optimal bit length
-+ * and corresponding code. The length opt_len is updated; static_len is
-+ * also updated if stree is not null. The field max_code is set.
-+ */
-+local void build_tree(s, desc)
-+ deflate_state *s;
-+ tree_desc *desc; /* the tree descriptor */
-+{
-+ ct_data *tree = desc->dyn_tree;
-+ const ct_data *stree = desc->stat_desc->static_tree;
-+ int elems = desc->stat_desc->elems;
-+ int n, m; /* iterate over heap elements */
-+ int max_code = -1; /* largest code with non zero frequency */
-+ int node; /* new node being created */
-+
-+ /* Construct the initial heap, with least frequent element in
-+ * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-+ * heap[0] is not used.
-+ */
-+ s->heap_len = 0, s->heap_max = HEAP_SIZE;
-+
-+ for (n = 0; n < elems; n++) {
-+ if (tree[n].Freq != 0) {
-+ s->heap[++(s->heap_len)] = max_code = n;
-+ s->depth[n] = 0;
-+ } else {
-+ tree[n].Len = 0;
-+ }
-+ }
-+
-+ /* The pkzip format requires that at least one distance code exists,
-+ * and that at least one bit should be sent even if there is only one
-+ * possible code. So to avoid special checks later on we force at least
-+ * two codes of non zero frequency.
-+ */
-+ while (s->heap_len < 2) {
-+ node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-+ tree[node].Freq = 1;
-+ s->depth[node] = 0;
-+ s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-+ /* node is 0 or 1 so it does not have extra bits */
-+ }
-+ desc->max_code = max_code;
-+
-+ /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-+ * establish sub-heaps of increasing lengths:
-+ */
-+ for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-+
-+ /* Construct the Huffman tree by repeatedly combining the least two
-+ * frequent nodes.
-+ */
-+ node = elems; /* next internal node of the tree */
-+ do {
-+ pqremove(s, tree, n); /* n = node of least frequency */
-+ m = s->heap[SMALLEST]; /* m = node of next least frequency */
-+
-+ s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-+ s->heap[--(s->heap_max)] = m;
-+
-+ /* Create a new node father of n and m */
-+ tree[node].Freq = tree[n].Freq + tree[m].Freq;
-+ s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-+ s->depth[n] : s->depth[m]) + 1);
-+ tree[n].Dad = tree[m].Dad = (ush)node;
-+#ifdef DUMP_BL_TREE
-+ if (tree == s->bl_tree) {
-+ fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-+ node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-+ }
-+#endif
-+ /* and insert the new node in the heap */
-+ s->heap[SMALLEST] = node++;
-+ pqdownheap(s, tree, SMALLEST);
-+
-+ } while (s->heap_len >= 2);
-+
-+ s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-+
-+ /* At this point, the fields freq and dad are set. We can now
-+ * generate the bit lengths.
-+ */
-+ gen_bitlen(s, (tree_desc *)desc);
-+
-+ /* The field len is now set, we can generate the bit codes */
-+ gen_codes ((ct_data *)tree, max_code, s->bl_count);
-+}
-+
-+/* ===========================================================================
-+ * Scan a literal or distance tree to determine the frequencies of the codes
-+ * in the bit length tree.
-+ */
-+local void scan_tree (s, tree, max_code)
-+ deflate_state *s;
-+ ct_data *tree; /* the tree to be scanned */
-+ int max_code; /* and its largest code of non zero frequency */
-+{
-+ int n; /* iterates over all tree elements */
-+ int prevlen = -1; /* last emitted length */
-+ int curlen; /* length of current code */
-+ int nextlen = tree[0].Len; /* length of next code */
-+ int count = 0; /* repeat count of the current code */
-+ int max_count = 7; /* max repeat count */
-+ int min_count = 4; /* min repeat count */
-+
-+ if (nextlen == 0) max_count = 138, min_count = 3;
-+ tree[max_code+1].Len = (ush)0xffff; /* guard */
-+
-+ for (n = 0; n <= max_code; n++) {
-+ curlen = nextlen; nextlen = tree[n+1].Len;
-+ if (++count < max_count && curlen == nextlen) {
-+ continue;
-+ } else if (count < min_count) {
-+ s->bl_tree[curlen].Freq += count;
-+ } else if (curlen != 0) {
-+ if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-+ s->bl_tree[REP_3_6].Freq++;
-+ } else if (count <= 10) {
-+ s->bl_tree[REPZ_3_10].Freq++;
-+ } else {
-+ s->bl_tree[REPZ_11_138].Freq++;
-+ }
-+ count = 0; prevlen = curlen;
-+ if (nextlen == 0) {
-+ max_count = 138, min_count = 3;
-+ } else if (curlen == nextlen) {
-+ max_count = 6, min_count = 3;
-+ } else {
-+ max_count = 7, min_count = 4;
-+ }
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Send a literal or distance tree in compressed form, using the codes in
-+ * bl_tree.
-+ */
-+local void send_tree (s, tree, max_code)
-+ deflate_state *s;
-+ ct_data *tree; /* the tree to be scanned */
-+ int max_code; /* and its largest code of non zero frequency */
-+{
-+ int n; /* iterates over all tree elements */
-+ int prevlen = -1; /* last emitted length */
-+ int curlen; /* length of current code */
-+ int nextlen = tree[0].Len; /* length of next code */
-+ int count = 0; /* repeat count of the current code */
-+ int max_count = 7; /* max repeat count */
-+ int min_count = 4; /* min repeat count */
-+
-+ /* tree[max_code+1].Len = -1; */ /* guard already set */
-+ if (nextlen == 0) max_count = 138, min_count = 3;
-+
-+ for (n = 0; n <= max_code; n++) {
-+ curlen = nextlen; nextlen = tree[n+1].Len;
-+ if (++count < max_count && curlen == nextlen) {
-+ continue;
-+ } else if (count < min_count) {
-+ do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-+
-+ } else if (curlen != 0) {
-+ if (curlen != prevlen) {
-+ send_code(s, curlen, s->bl_tree); count--;
-+ }
-+ Assert(count >= 3 && count <= 6, " 3_6?");
-+ send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-+
-+ } else if (count <= 10) {
-+ send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-+
-+ } else {
-+ send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-+ }
-+ count = 0; prevlen = curlen;
-+ if (nextlen == 0) {
-+ max_count = 138, min_count = 3;
-+ } else if (curlen == nextlen) {
-+ max_count = 6, min_count = 3;
-+ } else {
-+ max_count = 7, min_count = 4;
-+ }
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Construct the Huffman tree for the bit lengths and return the index in
-+ * bl_order of the last bit length code to send.
-+ */
-+local int build_bl_tree(s)
-+ deflate_state *s;
-+{
-+ int max_blindex; /* index of last bit length code of non zero freq */
-+
-+ /* Determine the bit length frequencies for literal and distance trees */
-+ scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-+ scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-+
-+ /* Build the bit length tree: */
-+ build_tree(s, (tree_desc *)(&(s->bl_desc)));
-+ /* opt_len now includes the length of the tree representations, except
-+ * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-+ */
-+
-+ /* Determine the number of bit length codes to send. The pkzip format
-+ * requires that at least 4 bit length codes be sent. (appnote.txt says
-+ * 3 but the actual value used is 4.)
-+ */
-+ for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-+ if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-+ }
-+ /* Update opt_len to include the bit length tree and counts */
-+ s->opt_len += 3*(max_blindex+1) + 5+5+4;
-+ Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-+ s->opt_len, s->static_len));
-+
-+ return max_blindex;
-+}
-+
-+/* ===========================================================================
-+ * Send the header for a block using dynamic Huffman trees: the counts, the
-+ * lengths of the bit length codes, the literal tree and the distance tree.
-+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
-+ */
-+local void send_all_trees(s, lcodes, dcodes, blcodes)
-+ deflate_state *s;
-+ int lcodes, dcodes, blcodes; /* number of codes for each tree */
-+{
-+ int rank; /* index in bl_order */
-+
-+ Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-+ Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-+ "too many codes");
-+ Tracev((stderr, "\nbl counts: "));
-+ send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-+ send_bits(s, dcodes-1, 5);
-+ send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */
-+ for (rank = 0; rank < blcodes; rank++) {
-+ Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-+ send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-+ }
-+ Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-+
-+ send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-+ Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-+
-+ send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-+ Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-+}
-+
-+/* ===========================================================================
-+ * Send a stored block
-+ */
-+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-+ deflate_state *s;
-+ charf *buf; /* input block */
-+ ulg stored_len; /* length of input block */
-+ int last; /* one if this is the last block for a file */
-+{
-+ send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */
-+#ifdef DEBUG
-+ s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-+ s->compressed_len += (stored_len + 4) << 3;
-+#endif
-+ copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
-+}
-+
-+/* ===========================================================================
-+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
-+ */
-+void ZLIB_INTERNAL _tr_flush_bits(s)
-+ deflate_state *s;
-+{
-+ bi_flush(s);
-+}
-+
-+/* ===========================================================================
-+ * Send one empty static block to give enough lookahead for inflate.
-+ * This takes 10 bits, of which 7 may remain in the bit buffer.
-+ */
-+void ZLIB_INTERNAL _tr_align(s)
-+ deflate_state *s;
-+{
-+ send_bits(s, STATIC_TREES<<1, 3);
-+ send_code(s, END_BLOCK, static_ltree);
-+#ifdef DEBUG
-+ s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-+#endif
-+ bi_flush(s);
-+}
-+
-+/* ===========================================================================
-+ * Determine the best encoding for the current block: dynamic trees, static
-+ * trees or store, and output the encoded block to the zip file.
-+ */
-+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-+ deflate_state *s;
-+ charf *buf; /* input block, or NULL if too old */
-+ ulg stored_len; /* length of input block */
-+ int last; /* one if this is the last block for a file */
-+{
-+ ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-+ int max_blindex = 0; /* index of last bit length code of non zero freq */
-+
-+ /* Build the Huffman trees unless a stored block is forced */
-+ if (s->level > 0) {
-+
-+ /* Check if the file is binary or text */
-+ if (s->strm->data_type == Z_UNKNOWN)
-+ s->strm->data_type = detect_data_type(s);
-+
-+ /* Construct the literal and distance trees */
-+ build_tree(s, (tree_desc *)(&(s->l_desc)));
-+ Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-+ s->static_len));
-+
-+ build_tree(s, (tree_desc *)(&(s->d_desc)));
-+ Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-+ s->static_len));
-+ /* At this point, opt_len and static_len are the total bit lengths of
-+ * the compressed block data, excluding the tree representations.
-+ */
-+
-+ /* Build the bit length tree for the above two trees, and get the index
-+ * in bl_order of the last bit length code to send.
-+ */
-+ max_blindex = build_bl_tree(s);
-+
-+ /* Determine the best encoding. Compute the block lengths in bytes. */
-+ opt_lenb = (s->opt_len+3+7)>>3;
-+ static_lenb = (s->static_len+3+7)>>3;
-+
-+ Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-+ opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-+ s->last_lit));
-+
-+ if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-+
-+ } else {
-+ Assert(buf != (char*)0, "lost buf");
-+ opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-+ }
-+
-+#ifdef FORCE_STORED
-+ if (buf != (char*)0) { /* force stored block */
-+#else
-+ if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-+ /* 4: two words for the lengths */
-+#endif
-+ /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-+ * Otherwise we can't have processed more than WSIZE input bytes since
-+ * the last block flush, because compression would have been
-+ * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-+ * transform a block into a stored block.
-+ */
-+ _tr_stored_block(s, buf, stored_len, last);
-+
-+#ifdef FORCE_STATIC
-+ } else if (static_lenb >= 0) { /* force static trees */
-+#else
-+ } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-+#endif
-+ send_bits(s, (STATIC_TREES<<1)+last, 3);
-+ compress_block(s, (const ct_data *)static_ltree,
-+ (const ct_data *)static_dtree);
-+#ifdef DEBUG
-+ s->compressed_len += 3 + s->static_len;
-+#endif
-+ } else {
-+ send_bits(s, (DYN_TREES<<1)+last, 3);
-+ send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-+ max_blindex+1);
-+ compress_block(s, (const ct_data *)s->dyn_ltree,
-+ (const ct_data *)s->dyn_dtree);
-+#ifdef DEBUG
-+ s->compressed_len += 3 + s->opt_len;
-+#endif
-+ }
-+ Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-+ /* The above check is made mod 2^32, for files larger than 512 MB
-+ * and uLong implemented on 32 bits.
-+ */
-+ init_block(s);
-+
-+ if (last) {
-+ bi_windup(s);
-+#ifdef DEBUG
-+ s->compressed_len += 7; /* align on byte boundary */
-+#endif
-+ }
-+ Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-+ s->compressed_len-7*last));
-+}
-+
-+/* ===========================================================================
-+ * Save the match info and tally the frequency counts. Return true if
-+ * the current block must be flushed.
-+ */
-+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-+ deflate_state *s;
-+ unsigned dist; /* distance of matched string */
-+ unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
-+{
-+ s->d_buf[s->last_lit] = (ush)dist;
-+ s->l_buf[s->last_lit++] = (uch)lc;
-+ if (dist == 0) {
-+ /* lc is the unmatched char */
-+ s->dyn_ltree[lc].Freq++;
-+ } else {
-+ s->matches++;
-+ /* Here, lc is the match length - MIN_MATCH */
-+ dist--; /* dist = match distance - 1 */
-+ Assert((ush)dist < (ush)MAX_DIST(s) &&
-+ (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-+ (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match");
-+
-+ s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-+ s->dyn_dtree[d_code(dist)].Freq++;
-+ }
-+
-+#ifdef TRUNCATE_BLOCK
-+ /* Try to guess if it is profitable to stop the current block here */
-+ if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-+ /* Compute an upper bound for the compressed length */
-+ ulg out_length = (ulg)s->last_lit*8L;
-+ ulg in_length = (ulg)((long)s->strstart - s->block_start);
-+ int dcode;
-+ for (dcode = 0; dcode < D_CODES; dcode++) {
-+ out_length += (ulg)s->dyn_dtree[dcode].Freq *
-+ (5L+extra_dbits[dcode]);
-+ }
-+ out_length >>= 3;
-+ Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-+ s->last_lit, in_length, out_length,
-+ 100L - out_length*100L/in_length));
-+ if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-+ }
-+#endif
-+ return (s->last_lit == s->lit_bufsize-1);
-+ /* We avoid equality with lit_bufsize because of wraparound at 64K
-+ * on 16 bit machines and because stored blocks are restricted to
-+ * 64K-1 bytes.
-+ */
-+}
-+
-+/* ===========================================================================
-+ * Send the block data compressed using the given Huffman trees
-+ */
-+local void compress_block(s, ltree, dtree)
-+ deflate_state *s;
-+ const ct_data *ltree; /* literal tree */
-+ const ct_data *dtree; /* distance tree */
-+{
-+ unsigned dist; /* distance of matched string */
-+ int lc; /* match length or unmatched char (if dist == 0) */
-+ unsigned lx = 0; /* running index in l_buf */
-+ unsigned code; /* the code to send */
-+ int extra; /* number of extra bits to send */
-+
-+ if (s->last_lit != 0) do {
-+ dist = s->d_buf[lx];
-+ lc = s->l_buf[lx++];
-+ if (dist == 0) {
-+ send_code(s, lc, ltree); /* send a literal byte */
-+ Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-+ } else {
-+ /* Here, lc is the match length - MIN_MATCH */
-+ code = _length_code[lc];
-+ send_code(s, code+LITERALS+1, ltree); /* send the length code */
-+ extra = extra_lbits[code];
-+ if (extra != 0) {
-+ lc -= base_length[code];
-+ send_bits(s, lc, extra); /* send the extra length bits */
-+ }
-+ dist--; /* dist is now the match distance - 1 */
-+ code = d_code(dist);
-+ Assert (code < D_CODES, "bad d_code");
-+
-+ send_code(s, code, dtree); /* send the distance code */
-+ extra = extra_dbits[code];
-+ if (extra != 0) {
-+ dist -= base_dist[code];
-+ send_bits(s, dist, extra); /* send the extra distance bits */
-+ }
-+ } /* literal or match pair ? */
-+
-+ /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-+ Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-+ "pendingBuf overflow");
-+
-+ } while (lx < s->last_lit);
-+
-+ send_code(s, END_BLOCK, ltree);
-+}
-+
-+/* ===========================================================================
-+ * Check if the data type is TEXT or BINARY, using the following algorithm:
-+ * - TEXT if the two conditions below are satisfied:
-+ * a) There are no non-portable control characters belonging to the
-+ * "black list" (0..6, 14..25, 28..31).
-+ * b) There is at least one printable character belonging to the
-+ * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
-+ * - BINARY otherwise.
-+ * - The following partially-portable control characters form a
-+ * "gray list" that is ignored in this detection algorithm:
-+ * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
-+ * IN assertion: the fields Freq of dyn_ltree are set.
-+ */
-+local int detect_data_type(s)
-+ deflate_state *s;
-+{
-+ /* black_mask is the bit mask of black-listed bytes
-+ * set bits 0..6, 14..25, and 28..31
-+ * 0xf3ffc07f = binary 11110011111111111100000001111111
-+ */
-+ unsigned long black_mask = 0xf3ffc07fUL;
-+ int n;
-+
-+ /* Check for non-textual ("black-listed") bytes. */
-+ for (n = 0; n <= 31; n++, black_mask >>= 1)
-+ if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-+ return Z_BINARY;
-+
-+ /* Check for textual ("white-listed") bytes. */
-+ if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-+ || s->dyn_ltree[13].Freq != 0)
-+ return Z_TEXT;
-+ for (n = 32; n < LITERALS; n++)
-+ if (s->dyn_ltree[n].Freq != 0)
-+ return Z_TEXT;
-+
-+ /* There are no "black-listed" or "white-listed" bytes:
-+ * this stream either is empty or has tolerated ("gray-listed") bytes only.
-+ */
-+ return Z_BINARY;
-+}
-+
-+/* ===========================================================================
-+ * Reverse the first len bits of a code, using straightforward code (a faster
-+ * method would use a table)
-+ * IN assertion: 1 <= len <= 15
-+ */
-+local unsigned bi_reverse(code, len)
-+ unsigned code; /* the value to invert */
-+ int len; /* its bit length */
-+{
-+ register unsigned res = 0;
-+ do {
-+ res |= code & 1;
-+ code >>= 1, res <<= 1;
-+ } while (--len > 0);
-+ return res >> 1;
-+}
-+
-+/* ===========================================================================
-+ * Flush the bit buffer, keeping at most 7 bits in it.
-+ */
-+local void bi_flush(s)
-+ deflate_state *s;
-+{
-+ if (s->bi_valid == 16) {
-+ put_short(s, s->bi_buf);
-+ s->bi_buf = 0;
-+ s->bi_valid = 0;
-+ } else if (s->bi_valid >= 8) {
-+ put_byte(s, (Byte)s->bi_buf);
-+ s->bi_buf >>= 8;
-+ s->bi_valid -= 8;
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Flush the bit buffer and align the output on a byte boundary
-+ */
-+local void bi_windup(s)
-+ deflate_state *s;
-+{
-+ if (s->bi_valid > 8) {
-+ put_short(s, s->bi_buf);
-+ } else if (s->bi_valid > 0) {
-+ put_byte(s, (Byte)s->bi_buf);
-+ }
-+ s->bi_buf = 0;
-+ s->bi_valid = 0;
-+#ifdef DEBUG
-+ s->bits_sent = (s->bits_sent+7) & ~7;
-+#endif
-+}
-+
-+/* ===========================================================================
-+ * Copy a stored block, storing first the length and its
-+ * one's complement if requested.
-+ */
-+local void copy_block(s, buf, len, header)
-+ deflate_state *s;
-+ charf *buf; /* the input data */
-+ unsigned len; /* its length */
-+ int header; /* true if block header must be written */
-+{
-+ bi_windup(s); /* align on byte boundary */
-+
-+ if (header) {
-+ put_short(s, (ush)len);
-+ put_short(s, (ush)~len);
-+#ifdef DEBUG
-+ s->bits_sent += 2*16;
-+#endif
-+ }
-+#ifdef DEBUG
-+ s->bits_sent += (ulg)len<<3;
-+#endif
-+ while (len--) {
-+ put_byte(s, *buf++);
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/trees.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,152 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* header created automatically with -DGEN_TREES_H */
-+
-+local const ct_data static_ltree[L_CODES+2] = {
-+{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}},
-+{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}},
-+{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}},
-+{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}},
-+{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}},
-+{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}},
-+{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}},
-+{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}},
-+{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}},
-+{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}},
-+{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}},
-+{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}},
-+{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}},
-+{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}},
-+{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}},
-+{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}},
-+{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}},
-+{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}},
-+{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}},
-+{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}},
-+{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}},
-+{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}},
-+{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}},
-+{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}},
-+{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}},
-+{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}},
-+{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}},
-+{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}},
-+{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}},
-+{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}},
-+{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}},
-+{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}},
-+{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}},
-+{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}},
-+{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}},
-+{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}},
-+{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}},
-+{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}},
-+{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}},
-+{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}},
-+{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}},
-+{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}},
-+{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}},
-+{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}},
-+{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}},
-+{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}},
-+{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}},
-+{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}},
-+{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}},
-+{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}},
-+{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}},
-+{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}},
-+{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}},
-+{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}},
-+{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}},
-+{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}},
-+{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}},
-+{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}}
-+};
-+
-+local const ct_data static_dtree[D_CODES] = {
-+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-+};
-+
-+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
-+ 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
-+ 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
-+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17,
-+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-+};
-+
-+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
-+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
-+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-+};
-+
-+local const int base_length[LENGTH_CODES] = {
-+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-+64, 80, 96, 112, 128, 160, 192, 224, 0
-+};
-+
-+local const int base_dist[D_CODES] = {
-+ 0, 1, 2, 3, 4, 6, 8, 12, 16, 24,
-+ 32, 48, 64, 96, 128, 192, 256, 384, 512, 768,
-+ 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576
-+};
-+
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/uncompr.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,83 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* uncompr.c -- decompress a memory buffer
-+ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#define ZLIB_INTERNAL
-+#include "zlib.h"
-+
-+/* ===========================================================================
-+ Decompresses the source buffer into the destination buffer. sourceLen is
-+ the byte length of the source buffer. Upon entry, destLen is the total
-+ size of the destination buffer, which must be large enough to hold the
-+ entire uncompressed data. (The size of the uncompressed data must have
-+ been saved previously by the compressor and transmitted to the decompressor
-+ by some mechanism outside the scope of this compression library.)
-+ Upon exit, destLen is the actual size of the compressed buffer.
-+
-+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-+ enough memory, Z_BUF_ERROR if there was not enough room in the output
-+ buffer, or Z_DATA_ERROR if the input data was corrupted.
-+*/
-+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-+ Bytef *dest;
-+ uLongf *destLen;
-+ const Bytef *source;
-+ uLong sourceLen;
-+{
-+ z_stream stream;
-+ int err;
-+
-+ stream.next_in = (z_const Bytef *)source;
-+ stream.avail_in = (uInt)sourceLen;
-+ /* Check for source > 64K on 16-bit machine: */
-+ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-+
-+ stream.next_out = dest;
-+ stream.avail_out = (uInt)*destLen;
-+ if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-+
-+ stream.zalloc = (alloc_func)0;
-+ stream.zfree = (free_func)0;
-+
-+ err = inflateInit(&stream);
-+ if (err != Z_OK) return err;
-+
-+ err = inflate(&stream, Z_FINISH);
-+ if (err != Z_STREAM_END) {
-+ inflateEnd(&stream);
-+ if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-+ return Z_DATA_ERROR;
-+ return err;
-+ }
-+ *destLen = stream.total_out;
-+
-+ err = inflateEnd(&stream);
-+ return err;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/zadler32.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,203 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* adler32.c -- compute the Adler-32 checksum of a data stream
-+ * Copyright (C) 1995-2011 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#include "zutil.h"
-+
-+#define local static
-+
-+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-+
-+#define BASE 65521 /* largest prime smaller than 65536 */
-+#define NMAX 5552
-+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-+
-+#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;}
-+#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1);
-+#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2);
-+#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4);
-+#define DO16(buf) DO8(buf,0); DO8(buf,8);
-+
-+/* use NO_DIVIDE if your processor does not do division in hardware --
-+ try it both ways to see which is faster */
-+#ifdef NO_DIVIDE
-+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-+ (thank you to John Reiser for pointing this out) */
-+# define CHOP(a) \
-+ do { \
-+ unsigned long tmp = a >> 16; \
-+ a &= 0xffffUL; \
-+ a += (tmp << 4) - tmp; \
-+ } while (0)
-+# define MOD28(a) \
-+ do { \
-+ CHOP(a); \
-+ if (a >= BASE) a -= BASE; \
-+ } while (0)
-+# define MOD(a) \
-+ do { \
-+ CHOP(a); \
-+ MOD28(a); \
-+ } while (0)
-+# define MOD63(a) \
-+ do { /* this assumes a is not negative */ \
-+ z_off64_t tmp = a >> 32; \
-+ a &= 0xffffffffL; \
-+ a += (tmp << 8) - (tmp << 5) + tmp; \
-+ tmp = a >> 16; \
-+ a &= 0xffffL; \
-+ a += (tmp << 4) - tmp; \
-+ tmp = a >> 16; \
-+ a &= 0xffffL; \
-+ a += (tmp << 4) - tmp; \
-+ if (a >= BASE) a -= BASE; \
-+ } while (0)
-+#else
-+# define MOD(a) a %= BASE
-+# define MOD28(a) a %= BASE
-+# define MOD63(a) a %= BASE
-+#endif
-+
-+/* ========================================================================= */
-+uLong ZEXPORT adler32(adler, buf, len)
-+ uLong adler;
-+ const Bytef *buf;
-+ uInt len;
-+{
-+ unsigned long sum2;
-+ unsigned n;
-+
-+ /* split Adler-32 into component sums */
-+ sum2 = (adler >> 16) & 0xffff;
-+ adler &= 0xffff;
-+
-+ /* in case user likes doing a byte at a time, keep it fast */
-+ if (len == 1) {
-+ adler += buf[0];
-+ if (adler >= BASE)
-+ adler -= BASE;
-+ sum2 += adler;
-+ if (sum2 >= BASE)
-+ sum2 -= BASE;
-+ return adler | (sum2 << 16);
-+ }
-+
-+ /* initial Adler-32 value (deferred check for len == 1 speed) */
-+ if (buf == Z_NULL)
-+ return 1L;
-+
-+ /* in case short lengths are provided, keep it somewhat fast */
-+ if (len < 16) {
-+ while (len--) {
-+ adler += *buf++;
-+ sum2 += adler;
-+ }
-+ if (adler >= BASE)
-+ adler -= BASE;
-+ MOD28(sum2); /* only added so many BASE's */
-+ return adler | (sum2 << 16);
-+ }
-+
-+ /* do length NMAX blocks -- requires just one modulo operation */
-+ while (len >= NMAX) {
-+ len -= NMAX;
-+ n = NMAX / 16; /* NMAX is divisible by 16 */
-+ do {
-+ DO16(buf); /* 16 sums unrolled */
-+ buf += 16;
-+ } while (--n);
-+ MOD(adler);
-+ MOD(sum2);
-+ }
-+
-+ /* do remaining bytes (less than NMAX, still just one modulo) */
-+ if (len) { /* avoid modulos if none remaining */
-+ while (len >= 16) {
-+ len -= 16;
-+ DO16(buf);
-+ buf += 16;
-+ }
-+ while (len--) {
-+ adler += *buf++;
-+ sum2 += adler;
-+ }
-+ MOD(adler);
-+ MOD(sum2);
-+ }
-+
-+ /* return recombined sums */
-+ return adler | (sum2 << 16);
-+}
-+
-+/* ========================================================================= */
-+local uLong adler32_combine_(adler1, adler2, len2)
-+ uLong adler1;
-+ uLong adler2;
-+ z_off64_t len2;
-+{
-+ unsigned long sum1;
-+ unsigned long sum2;
-+ unsigned rem;
-+
-+ /* for negative len, return invalid adler32 as a clue for debugging */
-+ if (len2 < 0)
-+ return 0xffffffffUL;
-+
-+ /* the derivation of this formula is left as an exercise for the reader */
-+ MOD63(len2); /* assumes len2 >= 0 */
-+ rem = (unsigned)len2;
-+ sum1 = adler1 & 0xffff;
-+ sum2 = rem * sum1;
-+ MOD(sum2);
-+ sum1 += (adler2 & 0xffff) + BASE - 1;
-+ sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-+ if (sum1 >= BASE) sum1 -= BASE;
-+ if (sum1 >= BASE) sum1 -= BASE;
-+ if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
-+ if (sum2 >= BASE) sum2 -= BASE;
-+ return sum1 | (sum2 << 16);
-+}
-+
-+/* ========================================================================= */
-+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-+ uLong adler1;
-+ uLong adler2;
-+ z_off_t len2;
-+{
-+ return adler32_combine_(adler1, adler2, len2);
-+}
-+
-+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-+ uLong adler1;
-+ uLong adler2;
-+ z_off64_t len2;
-+{
-+ return adler32_combine_(adler1, adler2, len2);
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/zconf.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,543 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* zconf.h -- configuration of the zlib compression library
-+ * Copyright (C) 1995-2013 Jean-loup Gailly.
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#ifndef ZCONF_H
-+#define ZCONF_H
-+
-+/* for _LP64 */
-+#include <sys/types.h>
-+
-+/*
-+ * If you *really* need a unique prefix for all types and library functions,
-+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
-+ * this permanently in zconf.h using "./configure --zprefix".
-+ */
-+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
-+# define Z_PREFIX_SET
-+
-+/* all linked symbols */
-+# define _dist_code z__dist_code
-+# define _length_code z__length_code
-+# define _tr_align z__tr_align
-+# define _tr_flush_bits z__tr_flush_bits
-+# define _tr_flush_block z__tr_flush_block
-+# define _tr_init z__tr_init
-+# define _tr_stored_block z__tr_stored_block
-+# define _tr_tally z__tr_tally
-+# define adler32 z_adler32
-+# define adler32_combine z_adler32_combine
-+# define adler32_combine64 z_adler32_combine64
-+# ifndef Z_SOLO
-+# define compress z_compress
-+# define compress2 z_compress2
-+# define compressBound z_compressBound
-+# endif
-+# define crc32 z_crc32
-+# define crc32_combine z_crc32_combine
-+# define crc32_combine64 z_crc32_combine64
-+# define deflate z_deflate
-+# define deflateBound z_deflateBound
-+# define deflateCopy z_deflateCopy
-+# define deflateEnd z_deflateEnd
-+# define deflateInit2_ z_deflateInit2_
-+# define deflateInit_ z_deflateInit_
-+# define deflateParams z_deflateParams
-+# define deflatePending z_deflatePending
-+# define deflatePrime z_deflatePrime
-+# define deflateReset z_deflateReset
-+# define deflateResetKeep z_deflateResetKeep
-+# define deflateSetDictionary z_deflateSetDictionary
-+# define deflateSetHeader z_deflateSetHeader
-+# define deflateTune z_deflateTune
-+# define deflate_copyright z_deflate_copyright
-+# define get_crc_table z_get_crc_table
-+# ifndef Z_SOLO
-+# define gz_error z_gz_error
-+# define gz_intmax z_gz_intmax
-+# define gz_strwinerror z_gz_strwinerror
-+# define gzbuffer z_gzbuffer
-+# define gzclearerr z_gzclearerr
-+# define gzclose z_gzclose
-+# define gzclose_r z_gzclose_r
-+# define gzclose_w z_gzclose_w
-+# define gzdirect z_gzdirect
-+# define gzdopen z_gzdopen
-+# define gzeof z_gzeof
-+# define gzerror z_gzerror
-+# define gzflush z_gzflush
-+# define gzgetc z_gzgetc
-+# define gzgetc_ z_gzgetc_
-+# define gzgets z_gzgets
-+# define gzoffset z_gzoffset
-+# define gzoffset64 z_gzoffset64
-+# define gzopen z_gzopen
-+# define gzopen64 z_gzopen64
-+# ifdef _WIN32
-+# define gzopen_w z_gzopen_w
-+# endif
-+# define gzprintf z_gzprintf
-+# define gzvprintf z_gzvprintf
-+# define gzputc z_gzputc
-+# define gzputs z_gzputs
-+# define gzread z_gzread
-+# define gzrewind z_gzrewind
-+# define gzseek z_gzseek
-+# define gzseek64 z_gzseek64
-+# define gzsetparams z_gzsetparams
-+# define gztell z_gztell
-+# define gztell64 z_gztell64
-+# define gzungetc z_gzungetc
-+# define gzwrite z_gzwrite
-+# endif
-+# define inflate z_inflate
-+# define inflateBack z_inflateBack
-+# define inflateBackEnd z_inflateBackEnd
-+# define inflateBackInit_ z_inflateBackInit_
-+# define inflateCopy z_inflateCopy
-+# define inflateEnd z_inflateEnd
-+# define inflateGetHeader z_inflateGetHeader
-+# define inflateInit2_ z_inflateInit2_
-+# define inflateInit_ z_inflateInit_
-+# define inflateMark z_inflateMark
-+# define inflatePrime z_inflatePrime
-+# define inflateReset z_inflateReset
-+# define inflateReset2 z_inflateReset2
-+# define inflateSetDictionary z_inflateSetDictionary
-+# define inflateGetDictionary z_inflateGetDictionary
-+# define inflateSync z_inflateSync
-+# define inflateSyncPoint z_inflateSyncPoint
-+# define inflateUndermine z_inflateUndermine
-+# define inflateResetKeep z_inflateResetKeep
-+# define inflate_copyright z_inflate_copyright
-+# define inflate_fast z_inflate_fast
-+# define inflate_table z_inflate_table
-+# ifndef Z_SOLO
-+# define uncompress z_uncompress
-+# endif
-+# define zError z_zError
-+# ifndef Z_SOLO
-+# define zcalloc z_zcalloc
-+# define zcfree z_zcfree
-+# endif
-+# define zlibCompileFlags z_zlibCompileFlags
-+# define zlibVersion z_zlibVersion
-+
-+/* all zlib typedefs in zlib.h and zconf.h */
-+# define Byte z_Byte
-+# define Bytef z_Bytef
-+# define alloc_func z_alloc_func
-+# define charf z_charf
-+# define free_func z_free_func
-+# ifndef Z_SOLO
-+# define gzFile z_gzFile
-+# endif
-+# define gz_header z_gz_header
-+# define gz_headerp z_gz_headerp
-+# define in_func z_in_func
-+# define intf z_intf
-+# define out_func z_out_func
-+# define uInt z_uInt
-+# define uIntf z_uIntf
-+# define uLong z_uLong
-+# define uLongf z_uLongf
-+# define voidp z_voidp
-+# define voidpc z_voidpc
-+# define voidpf z_voidpf
-+
-+/* all zlib structs in zlib.h and zconf.h */
-+# define gz_header_s z_gz_header_s
-+# define internal_state z_internal_state
-+
-+#endif
-+
-+#if defined(__MSDOS__) && !defined(MSDOS)
-+# define MSDOS
-+#endif
-+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-+# define OS2
-+#endif
-+#if defined(_WINDOWS) && !defined(WINDOWS)
-+# define WINDOWS
-+#endif
-+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-+# ifndef WIN32
-+# define WIN32
-+# endif
-+#endif
-+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-+# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-+# ifndef SYS16BIT
-+# define SYS16BIT
-+# endif
-+# endif
-+#endif
-+
-+/*
-+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
-+ * than 64k bytes at a time (needed on systems with 16-bit int).
-+ */
-+#ifdef SYS16BIT
-+# define MAXSEG_64K
-+#endif
-+#ifdef MSDOS
-+# define UNALIGNED_OK
-+#endif
-+
-+#ifdef __STDC_VERSION__
-+# ifndef STDC
-+# define STDC
-+# endif
-+# if __STDC_VERSION__ >= 199901L
-+# ifndef STDC99
-+# define STDC99
-+# endif
-+# endif
-+#endif
-+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-+# define STDC
-+#endif
-+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-+# define STDC
-+#endif
-+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-+# define STDC
-+#endif
-+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-+# define STDC
-+#endif
-+
-+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
-+# define STDC
-+#endif
-+
-+#ifndef STDC
-+# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-+# define const /* note: need a more gentle solution here */
-+# endif
-+#endif
-+
-+#if defined(ZLIB_CONST) && !defined(z_const)
-+# define z_const const
-+#else
-+# define z_const
-+#endif
-+
-+/* Some Mac compilers merge all .h files incorrectly: */
-+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-+# define NO_DUMMY_DECL
-+#endif
-+
-+/* Maximum value for memLevel in deflateInit2 */
-+#ifndef MAX_MEM_LEVEL
-+# ifdef MAXSEG_64K
-+# define MAX_MEM_LEVEL 8
-+# else
-+# define MAX_MEM_LEVEL 9
-+# endif
-+#endif
-+
-+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
-+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
-+ * created by gzip. (Files created by minigzip can still be extracted by
-+ * gzip.)
-+ */
-+#ifndef MAX_WBITS
-+# define MAX_WBITS 15 /* 32K LZ77 window */
-+#endif
-+
-+/* The memory requirements for deflate are (in bytes):
-+ (1 << (windowBits+2)) + (1 << (memLevel+9))
-+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
-+ plus a few kilobytes for small objects. For example, if you want to reduce
-+ the default memory requirements from 256K to 128K, compile with
-+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
-+ Of course this will generally degrade compression (there's no free lunch).
-+
-+ The memory requirements for inflate are (in bytes) 1 << windowBits
-+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
-+ for small objects.
-+*/
-+
-+ /* Type declarations */
-+
-+#ifndef OF /* function prototypes */
-+# ifdef STDC
-+# define OF(args) args
-+# else
-+# define OF(args) ()
-+# endif
-+#endif
-+
-+#ifndef Z_ARG /* function prototypes for stdarg */
-+# if defined(STDC) || defined(Z_HAVE_STDARG_H)
-+# define Z_ARG(args) args
-+# else
-+# define Z_ARG(args) ()
-+# endif
-+#endif
-+
-+/* The following definitions for FAR are needed only for MSDOS mixed
-+ * model programming (small or medium model with some far allocations).
-+ * This was tested only with MSC; for other MSDOS compilers you may have
-+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
-+ * just define FAR to be empty.
-+ */
-+#ifdef SYS16BIT
-+# if defined(M_I86SM) || defined(M_I86MM)
-+ /* MSC small or medium model */
-+# define SMALL_MEDIUM
-+# ifdef _MSC_VER
-+# define FAR _far
-+# else
-+# define FAR far
-+# endif
-+# endif
-+# if (defined(__SMALL__) || defined(__MEDIUM__))
-+ /* Turbo C small or medium model */
-+# define SMALL_MEDIUM
-+# ifdef __BORLANDC__
-+# define FAR _far
-+# else
-+# define FAR far
-+# endif
-+# endif
-+#endif
-+
-+#if defined(WINDOWS) || defined(WIN32)
-+ /* If building or using zlib as a DLL, define ZLIB_DLL.
-+ * This is not mandatory, but it offers a little performance increase.
-+ */
-+# ifdef ZLIB_DLL
-+# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-+# ifdef ZLIB_INTERNAL
-+# define ZEXTERN extern __declspec(dllexport)
-+# else
-+# define ZEXTERN extern __declspec(dllimport)
-+# endif
-+# endif
-+# endif /* ZLIB_DLL */
-+ /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-+ * define ZLIB_WINAPI.
-+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-+ */
-+# ifdef ZLIB_WINAPI
-+# ifdef FAR
-+# undef FAR
-+# endif
-+# include <windows.h>
-+ /* No need for _export, use ZLIB.DEF instead. */
-+ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-+# define ZEXPORT WINAPI
-+# ifdef WIN32
-+# define ZEXPORTVA WINAPIV
-+# else
-+# define ZEXPORTVA FAR CDECL
-+# endif
-+# endif
-+#endif
-+
-+#if defined (__BEOS__)
-+# ifdef ZLIB_DLL
-+# ifdef ZLIB_INTERNAL
-+# define ZEXPORT __declspec(dllexport)
-+# define ZEXPORTVA __declspec(dllexport)
-+# else
-+# define ZEXPORT __declspec(dllimport)
-+# define ZEXPORTVA __declspec(dllimport)
-+# endif
-+# endif
-+#endif
-+
-+#ifndef ZEXTERN
-+# define ZEXTERN extern
-+#endif
-+#ifndef ZEXPORT
-+# define ZEXPORT
-+#endif
-+#ifndef ZEXPORTVA
-+# define ZEXPORTVA
-+#endif
-+
-+#ifndef FAR
-+# define FAR
-+#endif
-+
-+#if !defined(__MACTYPES__)
-+typedef unsigned char Byte; /* 8 bits */
-+#endif
-+typedef unsigned int uInt; /* 16 bits or more */
-+
-+#ifdef _LP64
-+typedef unsigned int uLong; /* 32 bits or more */
-+#else
-+typedef unsigned long uLong; /* 32 bits or more */
-+#endif
-+
-+#ifdef SMALL_MEDIUM
-+ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-+# define Bytef Byte FAR
-+#else
-+ typedef Byte FAR Bytef;
-+#endif
-+typedef char FAR charf;
-+typedef int FAR intf;
-+typedef uInt FAR uIntf;
-+typedef uLong FAR uLongf;
-+
-+#ifdef STDC
-+ typedef void const *voidpc;
-+ typedef void FAR *voidpf;
-+ typedef void *voidp;
-+#else
-+ typedef Byte const *voidpc;
-+ typedef Byte FAR *voidpf;
-+ typedef Byte *voidp;
-+#endif
-+
-+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-+# include <limits.h>
-+# if (UINT_MAX == 0xffffffffUL)
-+# define Z_U4 unsigned
-+# elif (ULONG_MAX == 0xffffffffUL)
-+# define Z_U4 unsigned long
-+# elif (USHRT_MAX == 0xffffffffUL)
-+# define Z_U4 unsigned short
-+# endif
-+#endif
-+
-+#ifdef Z_U4
-+ typedef Z_U4 z_crc_t;
-+#else
-+ typedef unsigned long z_crc_t;
-+#endif
-+
-+#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
-+# define Z_HAVE_UNISTD_H
-+#endif
-+
-+#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
-+# define Z_HAVE_STDARG_H
-+#endif
-+
-+#ifdef STDC
-+# ifndef Z_SOLO
-+# include <sys/types.h> /* for off_t */
-+# endif
-+#endif
-+
-+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-+# ifndef Z_SOLO
-+# include <stdarg.h> /* for va_list */
-+# endif
-+#endif
-+
-+#ifdef _WIN32
-+# ifndef Z_SOLO
-+# include <stddef.h> /* for wchar_t */
-+# endif
-+#endif
-+
-+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
-+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
-+ * though the former does not conform to the LFS document), but considering
-+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
-+ * equivalently requesting no 64-bit operations
-+ */
-+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-+# undef _LARGEFILE64_SOURCE
-+#endif
-+
-+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-+# define Z_HAVE_UNISTD_H
-+#endif
-+#ifndef Z_SOLO
-+# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-+# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-+# ifdef VMS
-+# include <unixio.h> /* for off_t */
-+# endif
-+# ifndef z_off_t
-+# define z_off_t off_t
-+# endif
-+# endif
-+#endif
-+
-+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-+# define Z_LFS64
-+#endif
-+
-+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-+# define Z_LARGE64
-+#endif
-+
-+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-+# define Z_WANT64
-+#endif
-+
-+#if !defined(SEEK_SET) && !defined(Z_SOLO)
-+# define SEEK_SET 0 /* Seek from beginning of file. */
-+# define SEEK_CUR 1 /* Seek from current position. */
-+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
-+#endif
-+
-+#ifndef z_off_t
-+# define z_off_t long
-+#endif
-+
-+#if !defined(_WIN32) && defined(Z_LARGE64)
-+# define z_off64_t off64_t
-+#else
-+# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-+# define z_off64_t __int64
-+# else
-+# define z_off64_t z_off_t
-+# endif
-+#endif
-+
-+/* MVS linker does not support external names larger than 8 bytes */
-+#if defined(__MVS__)
-+ #pragma map(deflateInit_,"DEIN")
-+ #pragma map(deflateInit2_,"DEIN2")
-+ #pragma map(deflateEnd,"DEEND")
-+ #pragma map(deflateBound,"DEBND")
-+ #pragma map(inflateInit_,"ININ")
-+ #pragma map(inflateInit2_,"ININ2")
-+ #pragma map(inflateEnd,"INEND")
-+ #pragma map(inflateSync,"INSY")
-+ #pragma map(inflateSetDictionary,"INSEDI")
-+ #pragma map(compressBound,"CMBND")
-+ #pragma map(inflate_table,"INTABL")
-+ #pragma map(inflate_fast,"INFA")
-+ #pragma map(inflate_copyright,"INCOPY")
-+#endif
-+
-+#endif /* ZCONF_H */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/zcrc32.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,449 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* crc32.c -- compute the CRC-32 of a data stream
-+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ *
-+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
-+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
-+ * tables for updating the shift register in one step with three exclusive-ors
-+ * instead of four steps with four exclusive-ors. This results in about a
-+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
-+ */
-+
-+/* @(#) $Id$ */
-+
-+/*
-+ Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-+ protection on the static variables used to control the first-use generation
-+ of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-+ first call get_crc_table() to initialize the tables before allowing more than
-+ one thread to use crc32().
-+
-+ DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
-+ */
-+
-+#ifdef MAKECRCH
-+# include <stdio.h>
-+# ifndef DYNAMIC_CRC_TABLE
-+# define DYNAMIC_CRC_TABLE
-+# endif /* !DYNAMIC_CRC_TABLE */
-+#endif /* MAKECRCH */
-+
-+#include "zutil.h" /* for STDC and FAR definitions */
-+
-+#define local static
-+
-+/* Definitions for doing the crc four data bytes at a time. */
-+#if !defined(NOBYFOUR) && defined(Z_U4)
-+# define BYFOUR
-+#endif
-+#ifdef BYFOUR
-+ local unsigned long crc32_little OF((unsigned long,
-+ const unsigned char FAR *, unsigned));
-+ local unsigned long crc32_big OF((unsigned long,
-+ const unsigned char FAR *, unsigned));
-+# define TBLS 8
-+#else
-+# define TBLS 1
-+#endif /* BYFOUR */
-+
-+/* Local functions for crc concatenation */
-+local unsigned long gf2_matrix_times OF((unsigned long *mat,
-+ unsigned long vec));
-+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
-+
-+
-+#ifdef DYNAMIC_CRC_TABLE
-+
-+local volatile int crc_table_empty = 1;
-+local z_crc_t FAR crc_table[TBLS][256];
-+local void make_crc_table OF((void));
-+#ifdef MAKECRCH
-+ local void write_table OF((FILE *, const z_crc_t FAR *));
-+#endif /* MAKECRCH */
-+/*
-+ Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-+ x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-+
-+ Polynomials over GF(2) are represented in binary, one bit per coefficient,
-+ with the lowest powers in the most significant bit. Then adding polynomials
-+ is just exclusive-or, and multiplying a polynomial by x is a right shift by
-+ one. If we call the above polynomial p, and represent a byte as the
-+ polynomial q, also with the lowest power in the most significant bit (so the
-+ byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-+ where a mod b means the remainder after dividing a by b.
-+
-+ This calculation is done using the shift-register method of multiplying and
-+ taking the remainder. The register is initialized to zero, and for each
-+ incoming bit, x^32 is added mod p to the register if the bit is a one (where
-+ x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-+ x (which is shifting right by one and adding x^32 mod p if the bit shifted
-+ out is a one). We start with the highest power (least significant bit) of
-+ q and repeat for all eight bits of q.
-+
-+ The first table is simply the CRC of all possible eight bit values. This is
-+ all the information needed to generate CRCs on data a byte at a time for all
-+ combinations of CRC register values and incoming bytes. The remaining tables
-+ allow for word-at-a-time CRC calculation for both big-endian and little-
-+ endian machines, where a word is four bytes.
-+*/
-+local void make_crc_table()
-+{
-+ z_crc_t c;
-+ int n, k;
-+ z_crc_t poly; /* polynomial exclusive-or pattern */
-+ /* terms of polynomial defining this crc (except x^32): */
-+ static volatile int first = 1; /* flag to limit concurrent making */
-+ static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-+
-+ /* See if another task is already doing this (not thread-safe, but better
-+ than nothing -- significantly reduces duration of vulnerability in
-+ case the advice about DYNAMIC_CRC_TABLE is ignored) */
-+ if (first) {
-+ first = 0;
-+
-+ /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-+ poly = 0;
-+ for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-+ poly |= (z_crc_t)1 << (31 - p[n]);
-+
-+ /* generate a crc for every 8-bit value */
-+ for (n = 0; n < 256; n++) {
-+ c = (z_crc_t)n;
-+ for (k = 0; k < 8; k++)
-+ c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-+ crc_table[0][n] = c;
-+ }
-+
-+#ifdef BYFOUR
-+ /* generate crc for each value followed by one, two, and three zeros,
-+ and then the byte reversal of those as well as the first table */
-+ for (n = 0; n < 256; n++) {
-+ c = crc_table[0][n];
-+ crc_table[4][n] = ZSWAP32(c);
-+ for (k = 1; k < 4; k++) {
-+ c = crc_table[0][c & 0xff] ^ (c >> 8);
-+ crc_table[k][n] = c;
-+ crc_table[k + 4][n] = ZSWAP32(c);
-+ }
-+ }
-+#endif /* BYFOUR */
-+
-+ crc_table_empty = 0;
-+ }
-+ else { /* not first */
-+ /* wait for the other guy to finish (not efficient, but rare) */
-+ while (crc_table_empty)
-+ ;
-+ }
-+
-+#ifdef MAKECRCH
-+ /* write out CRC tables to crc32.h */
-+ {
-+ FILE *out;
-+
-+ out = fopen("crc32.h", "w");
-+ if (out == NULL) return;
-+ fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-+ fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-+ fprintf(out, "local const z_crc_t FAR ");
-+ fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");
-+ write_table(out, crc_table[0]);
-+# ifdef BYFOUR
-+ fprintf(out, "#ifdef BYFOUR\n");
-+ for (k = 1; k < 8; k++) {
-+ fprintf(out, " },\n {\n");
-+ write_table(out, crc_table[k]);
-+ }
-+ fprintf(out, "#endif\n");
-+# endif /* BYFOUR */
-+ fprintf(out, " }\n};\n");
-+ fclose(out);
-+ }
-+#endif /* MAKECRCH */
-+}
-+
-+#ifdef MAKECRCH
-+local void write_table(out, table)
-+ FILE *out;
-+ const z_crc_t FAR *table;
-+{
-+ int n;
-+
-+ for (n = 0; n < 256; n++)
-+ fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ",
-+ (unsigned long)(table[n]),
-+ n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-+}
-+#endif /* MAKECRCH */
-+
-+#else /* !DYNAMIC_CRC_TABLE */
-+/* ========================================================================
-+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
-+ */
-+#include "crc32.h"
-+#endif /* DYNAMIC_CRC_TABLE */
-+
-+/* =========================================================================
-+ * This function can be used by asm versions of crc32()
-+ */
-+const z_crc_t FAR * ZEXPORT get_crc_table()
-+{
-+#ifdef DYNAMIC_CRC_TABLE
-+ if (crc_table_empty)
-+ make_crc_table();
-+#endif /* DYNAMIC_CRC_TABLE */
-+ return (const z_crc_t FAR *)crc_table;
-+}
-+
-+/* ========================================================================= */
-+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-+
-+/* ========================================================================= */
-+uLong ZEXPORT crc32(crc, buf, len)
-+ uLong crc;
-+ const unsigned char FAR *buf;
-+ uInt len;
-+{
-+ if (buf == Z_NULL) return 0UL;
-+
-+#ifdef DYNAMIC_CRC_TABLE
-+ if (crc_table_empty)
-+ make_crc_table();
-+#endif /* DYNAMIC_CRC_TABLE */
-+
-+#ifdef BYFOUR
-+ if (sizeof(void *) == sizeof(ptrdiff_t)) {
-+ z_crc_t endian;
-+
-+ endian = 1;
-+ if (*((unsigned char *)(&endian)))
-+ return (uLong)crc32_little(crc, buf, len);
-+ else
-+ return (uLong)crc32_big(crc, buf, len);
-+ }
-+#endif /* BYFOUR */
-+ crc = crc ^ 0xffffffffUL;
-+ while (len >= 8) {
-+ DO8;
-+ len -= 8;
-+ }
-+ if (len) do {
-+ DO1;
-+ } while (--len);
-+ return crc ^ 0xffffffffUL;
-+}
-+
-+#ifdef BYFOUR
-+
-+/* ========================================================================= */
-+#define DOLIT4 c ^= *buf4++; \
-+ c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-+ crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-+
-+/* ========================================================================= */
-+local unsigned long crc32_little(crc, buf, len)
-+ unsigned long crc;
-+ const unsigned char FAR *buf;
-+ unsigned len;
-+{
-+ register z_crc_t c;
-+ register const z_crc_t FAR *buf4;
-+
-+ c = (z_crc_t)crc;
-+ c = ~c;
-+ while (len && ((ptrdiff_t)buf & 3)) {
-+ c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-+ len--;
-+ }
-+
-+ buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-+ while (len >= 32) {
-+ DOLIT32;
-+ len -= 32;
-+ }
-+ while (len >= 4) {
-+ DOLIT4;
-+ len -= 4;
-+ }
-+ buf = (const unsigned char FAR *)buf4;
-+
-+ if (len) do {
-+ c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-+ } while (--len);
-+ c = ~c;
-+ return (unsigned long)c;
-+}
-+
-+/* ========================================================================= */
-+#define DOBIG4 c ^= *++buf4; \
-+ c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-+ crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-+
-+/* ========================================================================= */
-+local unsigned long crc32_big(crc, buf, len)
-+ unsigned long crc;
-+ const unsigned char FAR *buf;
-+ unsigned len;
-+{
-+ register z_crc_t c;
-+ register const z_crc_t FAR *buf4;
-+
-+ c = ZSWAP32((z_crc_t)crc);
-+ c = ~c;
-+ while (len && ((ptrdiff_t)buf & 3)) {
-+ c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-+ len--;
-+ }
-+
-+ buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-+ buf4--;
-+ while (len >= 32) {
-+ DOBIG32;
-+ len -= 32;
-+ }
-+ while (len >= 4) {
-+ DOBIG4;
-+ len -= 4;
-+ }
-+ buf4++;
-+ buf = (const unsigned char FAR *)buf4;
-+
-+ if (len) do {
-+ c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-+ } while (--len);
-+ c = ~c;
-+ return (unsigned long)(ZSWAP32(c));
-+}
-+
-+#endif /* BYFOUR */
-+
-+#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
-+
-+/* ========================================================================= */
-+local unsigned long gf2_matrix_times(mat, vec)
-+ unsigned long *mat;
-+ unsigned long vec;
-+{
-+ unsigned long sum;
-+
-+ sum = 0;
-+ while (vec) {
-+ if (vec & 1)
-+ sum ^= *mat;
-+ vec >>= 1;
-+ mat++;
-+ }
-+ return sum;
-+}
-+
-+/* ========================================================================= */
-+local void gf2_matrix_square(square, mat)
-+ unsigned long *square;
-+ unsigned long *mat;
-+{
-+ int n;
-+
-+ for (n = 0; n < GF2_DIM; n++)
-+ square[n] = gf2_matrix_times(mat, mat[n]);
-+}
-+
-+/* ========================================================================= */
-+local uLong crc32_combine_(crc1, crc2, len2)
-+ uLong crc1;
-+ uLong crc2;
-+ z_off64_t len2;
-+{
-+ int n;
-+ unsigned long row;
-+ unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */
-+ unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */
-+
-+ /* degenerate case (also disallow negative lengths) */
-+ if (len2 <= 0)
-+ return crc1;
-+
-+ /* put operator for one zero bit in odd */
-+ odd[0] = 0xedb88320UL; /* CRC-32 polynomial */
-+ row = 1;
-+ for (n = 1; n < GF2_DIM; n++) {
-+ odd[n] = row;
-+ row <<= 1;
-+ }
-+
-+ /* put operator for two zero bits in even */
-+ gf2_matrix_square(even, odd);
-+
-+ /* put operator for four zero bits in odd */
-+ gf2_matrix_square(odd, even);
-+
-+ /* apply len2 zeros to crc1 (first square will put the operator for one
-+ zero byte, eight zero bits, in even) */
-+ do {
-+ /* apply zeros operator for this bit of len2 */
-+ gf2_matrix_square(even, odd);
-+ if (len2 & 1)
-+ crc1 = gf2_matrix_times(even, crc1);
-+ len2 >>= 1;
-+
-+ /* if no more bits set, then done */
-+ if (len2 == 0)
-+ break;
-+
-+ /* another iteration of the loop with odd and even swapped */
-+ gf2_matrix_square(odd, even);
-+ if (len2 & 1)
-+ crc1 = gf2_matrix_times(odd, crc1);
-+ len2 >>= 1;
-+
-+ /* if no more bits set, then done */
-+ } while (len2 != 0);
-+
-+ /* return combined crc */
-+ crc1 ^= crc2;
-+ return crc1;
-+}
-+
-+/* ========================================================================= */
-+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-+ uLong crc1;
-+ uLong crc2;
-+ z_off_t len2;
-+{
-+ return crc32_combine_(crc1, crc2, len2);
-+}
-+
-+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-+ uLong crc1;
-+ uLong crc2;
-+ z_off64_t len2;
-+{
-+ return crc32_combine_(crc1, crc2, len2);
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/zlib.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,1792 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* zlib.h -- interface of the 'zlib' general purpose compression library
-+ version 1.2.8, April 28th, 2013
-+
-+ Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-+
-+ This software is provided 'as-is', without any express or implied
-+ warranty. In no event will the authors be held liable for any damages
-+ arising from the use of this software.
-+
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+
-+ 1. The origin of this software must not be misrepresented; you must not
-+ claim that you wrote the original software. If you use this software
-+ in a product, an acknowledgment in the product documentation would be
-+ appreciated but is not required.
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+ misrepresented as being the original software.
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+ Jean-loup Gailly Mark Adler
-+ jloup@gzip.org madler@alumni.caltech.edu
-+
-+
-+ The data format used by the zlib library is described by RFCs (Request for
-+ Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-+ (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-+*/
-+
-+#ifndef ZLIB_H
-+#define ZLIB_H
-+
-+#include "zconf.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define ZLIB_VERSION "1.2.8"
-+#define ZLIB_VERNUM 0x1280
-+#define ZLIB_VER_MAJOR 1
-+#define ZLIB_VER_MINOR 2
-+#define ZLIB_VER_REVISION 8
-+#define ZLIB_VER_SUBREVISION 0
-+
-+/*
-+ The 'zlib' compression library provides in-memory compression and
-+ decompression functions, including integrity checks of the uncompressed data.
-+ This version of the library supports only one compression method (deflation)
-+ but other algorithms will be added later and will have the same stream
-+ interface.
-+
-+ Compression can be done in a single step if the buffers are large enough,
-+ or can be done by repeated calls of the compression function. In the latter
-+ case, the application must provide more input and/or consume the output
-+ (providing more output space) before each call.
-+
-+ The compressed data format used by default by the in-memory functions is
-+ the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-+ around a deflate stream, which is itself documented in RFC 1951.
-+
-+ The library also supports reading and writing files in gzip (.gz) format
-+ with an interface similar to that of stdio using the functions that start
-+ with "gz". The gzip format is different from the zlib format. gzip is a
-+ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-+
-+ This library can optionally read and write gzip streams in memory as well.
-+
-+ The zlib format was designed to be compact and fast for use in memory
-+ and on communications channels. The gzip format was designed for single-
-+ file compression on file systems, has a larger header than zlib to maintain
-+ directory information, and uses a different, slower check method than zlib.
-+
-+ The library does not install any signal handler. The decoder checks
-+ the consistency of the compressed data, so the library should never crash
-+ even in case of corrupted input.
-+*/
-+
-+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-+typedef void (*free_func) OF((voidpf opaque, voidpf address));
-+
-+struct internal_state;
-+
-+typedef struct z_stream_s {
-+ z_const Bytef *next_in; /* next input byte */
-+ uInt avail_in; /* number of bytes available at next_in */
-+ uLong total_in; /* total number of input bytes read so far */
-+
-+ Bytef *next_out; /* next output byte should be put there */
-+ uInt avail_out; /* remaining free space at next_out */
-+ uLong total_out; /* total number of bytes output so far */
-+
-+ z_const char *msg; /* last error message, NULL if no error */
-+ struct internal_state FAR *state; /* not visible by applications */
-+
-+ alloc_func zalloc; /* used to allocate the internal state */
-+ free_func zfree; /* used to free the internal state */
-+ voidpf opaque; /* private data object passed to zalloc and zfree */
-+
-+ int data_type; /* best guess about the data type: binary or text */
-+ uLong adler; /* adler32 value of the uncompressed data */
-+ uLong reserved; /* reserved for future use */
-+} z_stream;
-+
-+typedef z_stream FAR *z_streamp;
-+
-+/*
-+ gzip header information passed to and from zlib routines. See RFC 1952
-+ for more details on the meanings of these fields.
-+*/
-+typedef struct gz_header_s {
-+ int text; /* true if compressed data believed to be text */
-+ uLong time; /* modification time */
-+ int xflags; /* extra flags (not used when writing a gzip file) */
-+ int os; /* operating system */
-+ Bytef *extra; /* pointer to extra field or Z_NULL if none */
-+ uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
-+ uInt extra_max; /* space at extra (only when reading header) */
-+ Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
-+ uInt name_max; /* space at name (only when reading header) */
-+ Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
-+ uInt comm_max; /* space at comment (only when reading header) */
-+ int hcrc; /* true if there was or will be a header crc */
-+ int done; /* true when done reading gzip header (not used
-+ when writing a gzip file) */
-+} gz_header;
-+
-+typedef gz_header FAR *gz_headerp;
-+
-+/*
-+ The application must update next_in and avail_in when avail_in has dropped
-+ to zero. It must update next_out and avail_out when avail_out has dropped
-+ to zero. The application must initialize zalloc, zfree and opaque before
-+ calling the init function. All other fields are set by the compression
-+ library and must not be updated by the application.
-+
-+ The opaque value provided by the application will be passed as the first
-+ parameter for calls of zalloc and zfree. This can be useful for custom
-+ memory management. The compression library attaches no meaning to the
-+ opaque value.
-+
-+ zalloc must return Z_NULL if there is not enough memory for the object.
-+ If zlib is used in a multi-threaded application, zalloc and zfree must be
-+ thread safe.
-+
-+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
-+ exactly 65536 bytes, but will not be required to allocate more than this if
-+ the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers
-+ returned by zalloc for objects of exactly 65536 bytes *must* have their
-+ offset normalized to zero. The default allocation function provided by this
-+ library ensures this (see zutil.c). To reduce memory requirements and avoid
-+ any allocation of 64K objects, at the expense of compression ratio, compile
-+ the library with -DMAX_WBITS=14 (see zconf.h).
-+
-+ The fields total_in and total_out can be used for statistics or progress
-+ reports. After compression, total_in holds the total size of the
-+ uncompressed data and may be saved for use in the decompressor (particularly
-+ if the decompressor wants to decompress everything in a single step).
-+*/
-+
-+ /* constants */
-+
-+#define Z_NO_FLUSH 0
-+#define Z_PARTIAL_FLUSH 1
-+#define Z_SYNC_FLUSH 2
-+#define Z_FULL_FLUSH 3
-+#define Z_FINISH 4
-+#define Z_BLOCK 5
-+#define Z_TREES 6
-+/* Allowed flush values; see deflate() and inflate() below for details */
-+
-+#define Z_OK 0
-+#define Z_STREAM_END 1
-+#define Z_NEED_DICT 2
-+#define Z_ERRNO (-1)
-+#define Z_STREAM_ERROR (-2)
-+#define Z_DATA_ERROR (-3)
-+#define Z_MEM_ERROR (-4)
-+#define Z_BUF_ERROR (-5)
-+#define Z_VERSION_ERROR (-6)
-+/* Return codes for the compression/decompression functions. Negative values
-+ * are errors, positive values are used for special but normal events.
-+ */
-+
-+#define Z_NO_COMPRESSION 0
-+#define Z_BEST_SPEED 1
-+#define Z_BEST_COMPRESSION 9
-+#define Z_DEFAULT_COMPRESSION (-1)
-+/* compression levels */
-+
-+#define Z_FILTERED 1
-+#define Z_HUFFMAN_ONLY 2
-+#define Z_RLE 3
-+#define Z_FIXED 4
-+#define Z_DEFAULT_STRATEGY 0
-+/* compression strategy; see deflateInit2() below for details */
-+
-+#define Z_BINARY 0
-+#define Z_TEXT 1
-+#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
-+#define Z_UNKNOWN 2
-+/* Possible values of the data_type field (though see inflate()) */
-+
-+#define Z_DEFLATED 8
-+/* The deflate compression method (the only one supported in this version) */
-+
-+#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
-+
-+#define zlib_version zlibVersion()
-+/* for compatibility with versions < 1.0.2 */
-+
-+
-+ /* basic functions */
-+
-+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-+ If the first character differs, the library code actually used is not
-+ compatible with the zlib.h header file used by the application. This check
-+ is automatically made by deflateInit and inflateInit.
-+ */
-+
-+/*
-+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-+
-+ Initializes the internal stream state for compression. The fields
-+ zalloc, zfree and opaque must be initialized before by the caller. If
-+ zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-+ allocation functions.
-+
-+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-+ 1 gives best speed, 9 gives best compression, 0 gives no compression at all
-+ (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION
-+ requests a default compromise between speed and compression (currently
-+ equivalent to level 6).
-+
-+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-+ memory, Z_STREAM_ERROR if level is not a valid compression level, or
-+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-+ with the version assumed by the caller (ZLIB_VERSION). msg is set to null
-+ if there is no error message. deflateInit does not perform any compression:
-+ this will be done by deflate().
-+*/
-+
-+
-+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-+/*
-+ deflate compresses as much data as possible, and stops when the input
-+ buffer becomes empty or the output buffer becomes full. It may introduce
-+ some output latency (reading input without producing any output) except when
-+ forced to flush.
-+
-+ The detailed semantics are as follows. deflate performs one or both of the
-+ following actions:
-+
-+ - Compress more input starting at next_in and update next_in and avail_in
-+ accordingly. If not all input can be processed (because there is not
-+ enough room in the output buffer), next_in and avail_in are updated and
-+ processing will resume at this point for the next call of deflate().
-+
-+ - Provide more output starting at next_out and update next_out and avail_out
-+ accordingly. This action is forced if the parameter flush is non zero.
-+ Forcing flush frequently degrades the compression ratio, so this parameter
-+ should be set only when necessary (in interactive applications). Some
-+ output may be provided even if flush is not set.
-+
-+ Before the call of deflate(), the application should ensure that at least
-+ one of the actions is possible, by providing more input and/or consuming more
-+ output, and updating avail_in or avail_out accordingly; avail_out should
-+ never be zero before the call. The application can consume the compressed
-+ output when it wants, for example when the output buffer is full (avail_out
-+ == 0), or after each call of deflate(). If deflate returns Z_OK and with
-+ zero avail_out, it must be called again after making room in the output
-+ buffer because there might be more output pending.
-+
-+ Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-+ decide how much data to accumulate before producing output, in order to
-+ maximize compression.
-+
-+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-+ flushed to the output buffer and the output is aligned on a byte boundary, so
-+ that the decompressor can get all input data available so far. (In
-+ particular avail_in is zero after the call if enough output space has been
-+ provided before the call.) Flushing may degrade compression for some
-+ compression algorithms and so it should be used only when necessary. This
-+ completes the current deflate block and follows it with an empty stored block
-+ that is three bits plus filler bits to the next byte, followed by four bytes
-+ (00 00 ff ff).
-+
-+ If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-+ output buffer, but the output is not aligned to a byte boundary. All of the
-+ input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-+ This completes the current deflate block and follows it with an empty fixed
-+ codes block that is 10 bits long. This assures that enough bytes are output
-+ in order for the decompressor to finish the block before the empty fixed code
-+ block.
-+
-+ If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-+ for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-+ seven bits of the current block are held to be written as the next byte after
-+ the next deflate block is completed. In this case, the decompressor may not
-+ be provided enough bits at this point in order to complete decompression of
-+ the data provided so far to the compressor. It may need to wait for the next
-+ block to be emitted. This is for advanced applications that need to control
-+ the emission of deflate blocks.
-+
-+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
-+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-+ restart from this point if previous compressed data has been damaged or if
-+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-+ compression.
-+
-+ If deflate returns with avail_out == 0, this function must be called again
-+ with the same value of the flush parameter and more output space (updated
-+ avail_out), until the flush is complete (deflate returns with non-zero
-+ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-+ avail_out is greater than six to avoid repeated flush markers due to
-+ avail_out == 0 on return.
-+
-+ If the parameter flush is set to Z_FINISH, pending input is processed,
-+ pending output is flushed and deflate returns with Z_STREAM_END if there was
-+ enough output space; if deflate returns with Z_OK, this function must be
-+ called again with Z_FINISH and more output space (updated avail_out) but no
-+ more input data, until it returns with Z_STREAM_END or an error. After
-+ deflate has returned Z_STREAM_END, the only possible operations on the stream
-+ are deflateReset or deflateEnd.
-+
-+ Z_FINISH can be used immediately after deflateInit if all the compression
-+ is to be done in a single step. In this case, avail_out must be at least the
-+ value returned by deflateBound (see below). Then deflate is guaranteed to
-+ return Z_STREAM_END. If not enough output space is provided, deflate will
-+ not return Z_STREAM_END, and it must be called again as described above.
-+
-+ deflate() sets strm->adler to the adler32 checksum of all input read
-+ so far (that is, total_in bytes).
-+
-+ deflate() may update strm->data_type if it can make a good guess about
-+ the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-+ binary. This field is only for information purposes and does not affect the
-+ compression algorithm in any manner.
-+
-+ deflate() returns Z_OK if some progress has been made (more input
-+ processed or more output produced), Z_STREAM_END if all input has been
-+ consumed and all output has been produced (only when flush is set to
-+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-+ if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-+ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-+ fatal, and deflate() can be called again with more input and more output
-+ space to continue compressing.
-+*/
-+
-+
-+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-+/*
-+ All dynamically allocated data structures for this stream are freed.
-+ This function discards any unprocessed input and does not flush any pending
-+ output.
-+
-+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-+ prematurely (some input or output was discarded). In the error case, msg
-+ may be set but then points to a static string (which must not be
-+ deallocated).
-+*/
-+
-+
-+/*
-+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-+
-+ Initializes the internal stream state for decompression. The fields
-+ next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-+ the caller. If next_in is not Z_NULL and avail_in is large enough (the
-+ exact value depends on the compression method), inflateInit determines the
-+ compression method from the zlib header and allocates all data structures
-+ accordingly; otherwise the allocation will be deferred to the first call of
-+ inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-+ use default allocation functions.
-+
-+ inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-+ version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-+ invalid, such as a null pointer to the structure. msg is set to null if
-+ there is no error message. inflateInit does not perform any decompression
-+ apart from possibly reading the zlib header if present: actual decompression
-+ will be done by inflate(). (So next_in and avail_in may be modified, but
-+ next_out and avail_out are unused and unchanged.) The current implementation
-+ of inflateInit() does not process any header information -- that is deferred
-+ until inflate() is called.
-+*/
-+
-+
-+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-+/*
-+ inflate decompresses as much data as possible, and stops when the input
-+ buffer becomes empty or the output buffer becomes full. It may introduce
-+ some output latency (reading input without producing any output) except when
-+ forced to flush.
-+
-+ The detailed semantics are as follows. inflate performs one or both of the
-+ following actions:
-+
-+ - Decompress more input starting at next_in and update next_in and avail_in
-+ accordingly. If not all input can be processed (because there is not
-+ enough room in the output buffer), next_in is updated and processing will
-+ resume at this point for the next call of inflate().
-+
-+ - Provide more output starting at next_out and update next_out and avail_out
-+ accordingly. inflate() provides as much output as possible, until there is
-+ no more input data or no more space in the output buffer (see below about
-+ the flush parameter).
-+
-+ Before the call of inflate(), the application should ensure that at least
-+ one of the actions is possible, by providing more input and/or consuming more
-+ output, and updating the next_* and avail_* values accordingly. The
-+ application can consume the uncompressed output when it wants, for example
-+ when the output buffer is full (avail_out == 0), or after each call of
-+ inflate(). If inflate returns Z_OK and with zero avail_out, it must be
-+ called again after making room in the output buffer because there might be
-+ more output pending.
-+
-+ The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-+ Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much
-+ output as possible to the output buffer. Z_BLOCK requests that inflate()
-+ stop if and when it gets to the next deflate block boundary. When decoding
-+ the zlib or gzip format, this will cause inflate() to return immediately
-+ after the header and before the first block. When doing a raw inflate,
-+ inflate() will go ahead and process the first block, and will return when it
-+ gets to the end of that block, or when it runs out of data.
-+
-+ The Z_BLOCK option assists in appending to or combining deflate streams.
-+ Also to assist in this, on return inflate() will set strm->data_type to the
-+ number of unused bits in the last byte taken from strm->next_in, plus 64 if
-+ inflate() is currently decoding the last block in the deflate stream, plus
-+ 128 if inflate() returned immediately after decoding an end-of-block code or
-+ decoding the complete header up to just before the first byte of the deflate
-+ stream. The end-of-block will not be indicated until all of the uncompressed
-+ data from that block has been written to strm->next_out. The number of
-+ unused bits may in general be greater than seven, except when bit 7 of
-+ data_type is set, in which case the number of unused bits will be less than
-+ eight. data_type is set as noted here every time inflate() returns for all
-+ flush options, and so can be used to determine the amount of currently
-+ consumed input in bits.
-+
-+ The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-+ end of each deflate block header is reached, before any actual data in that
-+ block is decoded. This allows the caller to determine the length of the
-+ deflate block header for later use in random access within a deflate block.
-+ 256 is added to the value of strm->data_type when inflate() returns
-+ immediately after reaching the end of the deflate block header.
-+
-+ inflate() should normally be called until it returns Z_STREAM_END or an
-+ error. However if all decompression is to be performed in a single step (a
-+ single call of inflate), the parameter flush should be set to Z_FINISH. In
-+ this case all pending input is processed and all pending output is flushed;
-+ avail_out must be large enough to hold all of the uncompressed data for the
-+ operation to complete. (The size of the uncompressed data may have been
-+ saved by the compressor for this purpose.) The use of Z_FINISH is not
-+ required to perform an inflation in one step. However it may be used to
-+ inform inflate that a faster approach can be used for the single inflate()
-+ call. Z_FINISH also informs inflate to not maintain a sliding window if the
-+ stream completes, which reduces inflate's memory footprint. If the stream
-+ does not complete, either because not all of the stream is provided or not
-+ enough output space is provided, then a sliding window will be allocated and
-+ inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-+ been used.
-+
-+ In this implementation, inflate() always flushes as much output as
-+ possible to the output buffer, and always uses the faster approach on the
-+ first call. So the effects of the flush parameter in this implementation are
-+ on the return value of inflate() as noted below, when inflate() returns early
-+ when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-+ memory for a sliding window when Z_FINISH is used.
-+
-+ If a preset dictionary is needed after this call (see inflateSetDictionary
-+ below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-+ chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-+ strm->adler to the Adler-32 checksum of all output produced so far (that is,
-+ total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-+ below. At the end of the stream, inflate() checks that its computed adler32
-+ checksum is equal to that saved by the compressor and returns Z_STREAM_END
-+ only if the checksum is correct.
-+
-+ inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-+ deflate data. The header type is detected automatically, if requested when
-+ initializing with inflateInit2(). Any information contained in the gzip
-+ header is not retained, so applications that need that information should
-+ instead use raw inflate, see inflateInit2() below, or inflateBack() and
-+ perform their own processing of the gzip header and trailer. When processing
-+ gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-+ producted so far. The CRC-32 is checked against the gzip trailer.
-+
-+ inflate() returns Z_OK if some progress has been made (more input processed
-+ or more output produced), Z_STREAM_END if the end of the compressed data has
-+ been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-+ preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-+ corrupted (input stream not conforming to the zlib format or incorrect check
-+ value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-+ next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-+ Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-+ output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-+ inflate() can be called again with more input and more output space to
-+ continue decompressing. If Z_DATA_ERROR is returned, the application may
-+ then call inflateSync() to look for a good compression block if a partial
-+ recovery of the data is desired.
-+*/
-+
-+
-+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-+/*
-+ All dynamically allocated data structures for this stream are freed.
-+ This function discards any unprocessed input and does not flush any pending
-+ output.
-+
-+ inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-+ was inconsistent. In the error case, msg may be set but then points to a
-+ static string (which must not be deallocated).
-+*/
-+
-+
-+ /* Advanced functions */
-+
-+/*
-+ The following functions are needed only in some special applications.
-+*/
-+
-+/*
-+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-+ int level,
-+ int method,
-+ int windowBits,
-+ int memLevel,
-+ int strategy));
-+
-+ This is another version of deflateInit with more compression options. The
-+ fields next_in, zalloc, zfree and opaque must be initialized before by the
-+ caller.
-+
-+ The method parameter is the compression method. It must be Z_DEFLATED in
-+ this version of the library.
-+
-+ The windowBits parameter is the base two logarithm of the window size
-+ (the size of the history buffer). It should be in the range 8..15 for this
-+ version of the library. Larger values of this parameter result in better
-+ compression at the expense of memory usage. The default value is 15 if
-+ deflateInit is used instead.
-+
-+ windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-+ determines the window size. deflate() will then generate raw deflate data
-+ with no zlib header or trailer, and will not compute an adler32 check value.
-+
-+ windowBits can also be greater than 15 for optional gzip encoding. Add
-+ 16 to windowBits to write a simple gzip header and trailer around the
-+ compressed data instead of a zlib wrapper. The gzip header will have no
-+ file name, no extra data, no comment, no modification time (set to zero), no
-+ header crc, and the operating system will be set to 255 (unknown). If a
-+ gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-+
-+ The memLevel parameter specifies how much memory should be allocated
-+ for the internal compression state. memLevel=1 uses minimum memory but is
-+ slow and reduces compression ratio; memLevel=9 uses maximum memory for
-+ optimal speed. The default value is 8. See zconf.h for total memory usage
-+ as a function of windowBits and memLevel.
-+
-+ The strategy parameter is used to tune the compression algorithm. Use the
-+ value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-+ filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-+ string match), or Z_RLE to limit match distances to one (run-length
-+ encoding). Filtered data consists mostly of small values with a somewhat
-+ random distribution. In this case, the compression algorithm is tuned to
-+ compress them better. The effect of Z_FILTERED is to force more Huffman
-+ coding and less string matching; it is somewhat intermediate between
-+ Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as
-+ fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The
-+ strategy parameter only affects the compression ratio but not the
-+ correctness of the compressed output even if it is not set appropriately.
-+ Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-+ decoder for special applications.
-+
-+ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-+ memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-+ method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-+ incompatible with the version assumed by the caller (ZLIB_VERSION). msg is
-+ set to null if there is no error message. deflateInit2 does not perform any
-+ compression: this will be done by deflate().
-+*/
-+
-+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-+ const Bytef *dictionary,
-+ uInt dictLength));
-+/*
-+ Initializes the compression dictionary from the given byte sequence
-+ without producing any compressed output. When using the zlib format, this
-+ function must be called immediately after deflateInit, deflateInit2 or
-+ deflateReset, and before any call of deflate. When doing raw deflate, this
-+ function must be called either before any call of deflate, or immediately
-+ after the completion of a deflate block, i.e. after all input has been
-+ consumed and all output has been delivered when using any of the flush
-+ options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The
-+ compressor and decompressor must use exactly the same dictionary (see
-+ inflateSetDictionary).
-+
-+ The dictionary should consist of strings (byte sequences) that are likely
-+ to be encountered later in the data to be compressed, with the most commonly
-+ used strings preferably put towards the end of the dictionary. Using a
-+ dictionary is most useful when the data to be compressed is short and can be
-+ predicted with good accuracy; the data can then be compressed better than
-+ with the default empty dictionary.
-+
-+ Depending on the size of the compression data structures selected by
-+ deflateInit or deflateInit2, a part of the dictionary may in effect be
-+ discarded, for example if the dictionary is larger than the window size
-+ provided in deflateInit or deflateInit2. Thus the strings most likely to be
-+ useful should be put at the end of the dictionary, not at the front. In
-+ addition, the current implementation of deflate will use at most the window
-+ size minus 262 bytes of the provided dictionary.
-+
-+ Upon return of this function, strm->adler is set to the adler32 value
-+ of the dictionary; the decompressor may later use this value to determine
-+ which dictionary has been used by the compressor. (The adler32 value
-+ applies to the whole dictionary even if only a subset of the dictionary is
-+ actually used by the compressor.) If a raw deflate was requested, then the
-+ adler32 value is not computed and strm->adler is not set.
-+
-+ deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-+ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
-+ inconsistent (for example if deflate has already been called for this stream
-+ or if not at a block boundary for raw deflate). deflateSetDictionary does
-+ not perform any compression: this will be done by deflate().
-+*/
-+
-+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-+ z_streamp source));
-+/*
-+ Sets the destination stream as a complete copy of the source stream.
-+
-+ This function can be useful when several compression strategies will be
-+ tried, for example when there are several ways of pre-processing the input
-+ data with a filter. The streams that will be discarded should then be freed
-+ by calling deflateEnd. Note that deflateCopy duplicates the internal
-+ compression state which can be quite large, so this strategy is slow and can
-+ consume lots of memory.
-+
-+ deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-+ (such as zalloc being Z_NULL). msg is left unchanged in both source and
-+ destination.
-+*/
-+
-+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-+/*
-+ This function is equivalent to deflateEnd followed by deflateInit,
-+ but does not free and reallocate all the internal compression state. The
-+ stream will keep the same compression level and any other attributes that
-+ may have been set by deflateInit2.
-+
-+ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent (such as zalloc or state being Z_NULL).
-+*/
-+
-+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-+ int level,
-+ int strategy));
-+/*
-+ Dynamically update the compression level and compression strategy. The
-+ interpretation of level and strategy is as in deflateInit2. This can be
-+ used to switch between compression and straight copy of the input data, or
-+ to switch to a different kind of input data requiring a different strategy.
-+ If the compression level is changed, the input available so far is
-+ compressed with the old level (and may be flushed); the new level will take
-+ effect only at the next call of deflate().
-+
-+ Before the call of deflateParams, the stream state must be set as for
-+ a call of deflate(), since the currently available input may have to be
-+ compressed and flushed. In particular, strm->avail_out must be non-zero.
-+
-+ deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-+ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-+ strm->avail_out was zero.
-+*/
-+
-+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-+ int good_length,
-+ int max_lazy,
-+ int nice_length,
-+ int max_chain));
-+/*
-+ Fine tune deflate's internal compression parameters. This should only be
-+ used by someone who understands the algorithm used by zlib's deflate for
-+ searching for the best matching string, and even then only by the most
-+ fanatic optimizer trying to squeeze out the last compressed bit for their
-+ specific input data. Read the deflate.c source code for the meaning of the
-+ max_lazy, good_length, nice_length, and max_chain parameters.
-+
-+ deflateTune() can be called after deflateInit() or deflateInit2(), and
-+ returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
-+ */
-+
-+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-+ uLong sourceLen));
-+/*
-+ deflateBound() returns an upper bound on the compressed size after
-+ deflation of sourceLen bytes. It must be called after deflateInit() or
-+ deflateInit2(), and after deflateSetHeader(), if used. This would be used
-+ to allocate an output buffer for deflation in a single pass, and so would be
-+ called before deflate(). If that first deflate() call is provided the
-+ sourceLen input bytes, an output buffer allocated to the size returned by
-+ deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-+ to return Z_STREAM_END. Note that it is possible for the compressed size to
-+ be larger than the value returned by deflateBound() if flush options other
-+ than Z_FINISH or Z_NO_FLUSH are used.
-+*/
-+
-+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-+ unsigned *pending,
-+ int *bits));
-+/*
-+ deflatePending() returns the number of bytes and bits of output that have
-+ been generated, but not yet provided in the available output. The bytes not
-+ provided would be due to the available output space having being consumed.
-+ The number of bits of output not provided are between 0 and 7, where they
-+ await more bits to join them in order to fill out a full byte. If pending
-+ or bits are Z_NULL, then those values are not set.
-+
-+ deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent.
-+ */
-+
-+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-+ int bits,
-+ int value));
-+/*
-+ deflatePrime() inserts bits in the deflate output stream. The intent
-+ is that this function is used to start off the deflate output with the bits
-+ leftover from a previous deflate stream when appending to it. As such, this
-+ function can only be used for raw deflate, and must be used before the first
-+ deflate() call after a deflateInit2() or deflateReset(). bits must be less
-+ than or equal to 16, and that many of the least significant bits of value
-+ will be inserted in the output.
-+
-+ deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-+ room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-+ source stream state was inconsistent.
-+*/
-+
-+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-+ gz_headerp head));
-+/*
-+ deflateSetHeader() provides gzip header information for when a gzip
-+ stream is requested by deflateInit2(). deflateSetHeader() may be called
-+ after deflateInit2() or deflateReset() and before the first call of
-+ deflate(). The text, time, os, extra field, name, and comment information
-+ in the provided gz_header structure are written to the gzip header (xflag is
-+ ignored -- the extra flags are set according to the compression level). The
-+ caller must assure that, if not Z_NULL, name and comment are terminated with
-+ a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-+ available there. If hcrc is true, a gzip header crc is included. Note that
-+ the current versions of the command-line version of gzip (up through version
-+ 1.3.x) do not support header crc's, and will report that it is a "multi-part
-+ gzip file" and give up.
-+
-+ If deflateSetHeader is not used, the default gzip header has text false,
-+ the time set to zero, and os set to 255, with no extra, name, or comment
-+ fields. The gzip header is returned to the default state by deflateReset().
-+
-+ deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent.
-+*/
-+
-+/*
-+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-+ int windowBits));
-+
-+ This is another version of inflateInit with an extra parameter. The
-+ fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-+ before by the caller.
-+
-+ The windowBits parameter is the base two logarithm of the maximum window
-+ size (the size of the history buffer). It should be in the range 8..15 for
-+ this version of the library. The default value is 15 if inflateInit is used
-+ instead. windowBits must be greater than or equal to the windowBits value
-+ provided to deflateInit2() while compressing, or it must be equal to 15 if
-+ deflateInit2() was not used. If a compressed stream with a larger window
-+ size is given as input, inflate() will return with the error code
-+ Z_DATA_ERROR instead of trying to allocate a larger window.
-+
-+ windowBits can also be zero to request that inflate use the window size in
-+ the zlib header of the compressed stream.
-+
-+ windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-+ determines the window size. inflate() will then process raw deflate data,
-+ not looking for a zlib or gzip header, not generating a check value, and not
-+ looking for any check values for comparison at the end of the stream. This
-+ is for use with other formats that use the deflate compressed data format
-+ such as zip. Those formats provide their own check values. If a custom
-+ format is developed using the raw deflate format for compressed data, it is
-+ recommended that a check value such as an adler32 or a crc32 be applied to
-+ the uncompressed data as is done in the zlib, gzip, and zip formats. For
-+ most applications, the zlib format should be used as is. Note that comments
-+ above on the use in deflateInit2() applies to the magnitude of windowBits.
-+
-+ windowBits can also be greater than 15 for optional gzip decoding. Add
-+ 32 to windowBits to enable zlib and gzip decoding with automatic header
-+ detection, or add 16 to decode only the gzip format (the zlib format will
-+ return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a
-+ crc32 instead of an adler32.
-+
-+ inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-+ version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-+ invalid, such as a null pointer to the structure. msg is set to null if
-+ there is no error message. inflateInit2 does not perform any decompression
-+ apart from possibly reading the zlib header if present: actual decompression
-+ will be done by inflate(). (So next_in and avail_in may be modified, but
-+ next_out and avail_out are unused and unchanged.) The current implementation
-+ of inflateInit2() does not process any header information -- that is
-+ deferred until inflate() is called.
-+*/
-+
-+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-+ const Bytef *dictionary,
-+ uInt dictLength));
-+/*
-+ Initializes the decompression dictionary from the given uncompressed byte
-+ sequence. This function must be called immediately after a call of inflate,
-+ if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-+ can be determined from the adler32 value returned by that call of inflate.
-+ The compressor and decompressor must use exactly the same dictionary (see
-+ deflateSetDictionary). For raw inflate, this function can be called at any
-+ time to set the dictionary. If the provided dictionary is smaller than the
-+ window and there is already data in the window, then the provided dictionary
-+ will amend what's there. The application must insure that the dictionary
-+ that was used for compression is provided.
-+
-+ inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-+ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
-+ inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-+ expected one (incorrect adler32 value). inflateSetDictionary does not
-+ perform any decompression: this will be done by subsequent calls of
-+ inflate().
-+*/
-+
-+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-+ Bytef *dictionary,
-+ uInt *dictLength));
-+/*
-+ Returns the sliding dictionary being maintained by inflate. dictLength is
-+ set to the number of bytes in the dictionary, and that many bytes are copied
-+ to dictionary. dictionary must have enough space, where 32768 bytes is
-+ always enough. If inflateGetDictionary() is called with dictionary equal to
-+ Z_NULL, then only the dictionary length is returned, and nothing is copied.
-+ Similary, if dictLength is Z_NULL, then it is not set.
-+
-+ inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-+ stream state is inconsistent.
-+*/
-+
-+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-+/*
-+ Skips invalid compressed data until a possible full flush point (see above
-+ for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-+ available input is skipped. No output is provided.
-+
-+ inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-+ All full flush points have this pattern, but not all occurrences of this
-+ pattern are full flush points.
-+
-+ inflateSync returns Z_OK if a possible full flush point has been found,
-+ Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-+ has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-+ In the success case, the application may save the current current value of
-+ total_in which indicates where valid compressed data was found. In the
-+ error case, the application may repeatedly call inflateSync, providing more
-+ input each time, until success or end of the input data.
-+*/
-+
-+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-+ z_streamp source));
-+/*
-+ Sets the destination stream as a complete copy of the source stream.
-+
-+ This function can be useful when randomly accessing a large stream. The
-+ first pass through the stream can periodically record the inflate state,
-+ allowing restarting inflate at those points when randomly accessing the
-+ stream.
-+
-+ inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-+ (such as zalloc being Z_NULL). msg is left unchanged in both source and
-+ destination.
-+*/
-+
-+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-+/*
-+ This function is equivalent to inflateEnd followed by inflateInit,
-+ but does not free and reallocate all the internal decompression state. The
-+ stream will keep attributes that may have been set by inflateInit2.
-+
-+ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent (such as zalloc or state being Z_NULL).
-+*/
-+
-+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-+ int windowBits));
-+/*
-+ This function is the same as inflateReset, but it also permits changing
-+ the wrap and window size requests. The windowBits parameter is interpreted
-+ the same as it is for inflateInit2.
-+
-+ inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-+ the windowBits parameter is invalid.
-+*/
-+
-+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-+ int bits,
-+ int value));
-+/*
-+ This function inserts bits in the inflate input stream. The intent is
-+ that this function is used to start inflating at a bit position in the
-+ middle of a byte. The provided bits will be used before any bytes are used
-+ from next_in. This function should only be used with raw inflate, and
-+ should be used before the first inflate() call after inflateInit2() or
-+ inflateReset(). bits must be less than or equal to 16, and that many of the
-+ least significant bits of value will be inserted in the input.
-+
-+ If bits is negative, then the input stream bit buffer is emptied. Then
-+ inflatePrime() can be called again to put bits in the buffer. This is used
-+ to clear out bits leftover after feeding inflate a block description prior
-+ to feeding inflate codes.
-+
-+ inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent.
-+*/
-+
-+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-+/*
-+ This function returns two values, one in the lower 16 bits of the return
-+ value, and the other in the remaining upper bits, obtained by shifting the
-+ return value down 16 bits. If the upper value is -1 and the lower value is
-+ zero, then inflate() is currently decoding information outside of a block.
-+ If the upper value is -1 and the lower value is non-zero, then inflate is in
-+ the middle of a stored block, with the lower value equaling the number of
-+ bytes from the input remaining to copy. If the upper value is not -1, then
-+ it is the number of bits back from the current bit position in the input of
-+ the code (literal or length/distance pair) currently being processed. In
-+ that case the lower value is the number of bytes already emitted for that
-+ code.
-+
-+ A code is being processed if inflate is waiting for more input to complete
-+ decoding of the code, or if it has completed decoding but is waiting for
-+ more output space to write the literal or match data.
-+
-+ inflateMark() is used to mark locations in the input data for random
-+ access, which may be at bit positions, and to note those cases where the
-+ output of a code may span boundaries of random access blocks. The current
-+ location in the input stream can be determined from avail_in and data_type
-+ as noted in the description for the Z_BLOCK flush parameter for inflate.
-+
-+ inflateMark returns the value noted above or -1 << 16 if the provided
-+ source stream state was inconsistent.
-+*/
-+
-+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-+ gz_headerp head));
-+/*
-+ inflateGetHeader() requests that gzip header information be stored in the
-+ provided gz_header structure. inflateGetHeader() may be called after
-+ inflateInit2() or inflateReset(), and before the first call of inflate().
-+ As inflate() processes the gzip stream, head->done is zero until the header
-+ is completed, at which time head->done is set to one. If a zlib stream is
-+ being decoded, then head->done is set to -1 to indicate that there will be
-+ no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be
-+ used to force inflate() to return immediately after header processing is
-+ complete and before any actual data is decompressed.
-+
-+ The text, time, xflags, and os fields are filled in with the gzip header
-+ contents. hcrc is set to true if there is a header CRC. (The header CRC
-+ was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-+ contains the maximum number of bytes to write to extra. Once done is true,
-+ extra_len contains the actual extra field length, and extra contains the
-+ extra field, or that field truncated if extra_max is less than extra_len.
-+ If name is not Z_NULL, then up to name_max characters are written there,
-+ terminated with a zero unless the length is greater than name_max. If
-+ comment is not Z_NULL, then up to comm_max characters are written there,
-+ terminated with a zero unless the length is greater than comm_max. When any
-+ of extra, name, or comment are not Z_NULL and the respective field is not
-+ present in the header, then that field is set to Z_NULL to signal its
-+ absence. This allows the use of deflateSetHeader() with the returned
-+ structure to duplicate the header. However if those fields are set to
-+ allocated memory, then the application will need to save those pointers
-+ elsewhere so that they can be eventually freed.
-+
-+ If inflateGetHeader is not used, then the header information is simply
-+ discarded. The header is always checked for validity, including the header
-+ CRC if present. inflateReset() will reset the process to discard the header
-+ information. The application would need to call inflateGetHeader() again to
-+ retrieve the header from the next gzip stream.
-+
-+ inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-+ stream state was inconsistent.
-+*/
-+
-+/*
-+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-+ unsigned char FAR *window));
-+
-+ Initialize the internal stream state for decompression using inflateBack()
-+ calls. The fields zalloc, zfree and opaque in strm must be initialized
-+ before the call. If zalloc and zfree are Z_NULL, then the default library-
-+ derived memory allocation routines are used. windowBits is the base two
-+ logarithm of the window size, in the range 8..15. window is a caller
-+ supplied buffer of that size. Except for special applications where it is
-+ assured that deflate was used with small window sizes, windowBits must be 15
-+ and a 32K byte window must be supplied to be able to decompress general
-+ deflate streams.
-+
-+ See inflateBack() for the usage of these routines.
-+
-+ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-+ the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-+ allocated, or Z_VERSION_ERROR if the version of the library does not match
-+ the version of the header file.
-+*/
-+
-+typedef unsigned (*in_func) OF((void FAR *,
-+ z_const unsigned char FAR * FAR *));
-+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-+
-+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-+ in_func in, void FAR *in_desc,
-+ out_func out, void FAR *out_desc));
-+/*
-+ inflateBack() does a raw inflate with a single call using a call-back
-+ interface for input and output. This is potentially more efficient than
-+ inflate() for file i/o applications, in that it avoids copying between the
-+ output and the sliding window by simply making the window itself the output
-+ buffer. inflate() can be faster on modern CPUs when used with large
-+ buffers. inflateBack() trusts the application to not change the output
-+ buffer passed by the output function, at least until inflateBack() returns.
-+
-+ inflateBackInit() must be called first to allocate the internal state
-+ and to initialize the state with the user-provided window buffer.
-+ inflateBack() may then be used multiple times to inflate a complete, raw
-+ deflate stream with each call. inflateBackEnd() is then called to free the
-+ allocated state.
-+
-+ A raw deflate stream is one with no zlib or gzip header or trailer.
-+ This routine would normally be used in a utility that reads zip or gzip
-+ files and writes out uncompressed files. The utility would decode the
-+ header and process the trailer on its own, hence this routine expects only
-+ the raw deflate stream to decompress. This is different from the normal
-+ behavior of inflate(), which expects either a zlib or gzip header and
-+ trailer around the deflate stream.
-+
-+ inflateBack() uses two subroutines supplied by the caller that are then
-+ called by inflateBack() for input and output. inflateBack() calls those
-+ routines until it reads a complete deflate stream and writes out all of the
-+ uncompressed data, or until it encounters an error. The function's
-+ parameters and return types are defined above in the in_func and out_func
-+ typedefs. inflateBack() will call in(in_desc, &buf) which should return the
-+ number of bytes of provided input, and a pointer to that input in buf. If
-+ there is no input available, in() must return zero--buf is ignored in that
-+ case--and inflateBack() will return a buffer error. inflateBack() will call
-+ out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out()
-+ should return zero on success, or non-zero on failure. If out() returns
-+ non-zero, inflateBack() will return with an error. Neither in() nor out()
-+ are permitted to change the contents of the window provided to
-+ inflateBackInit(), which is also the buffer that out() uses to write from.
-+ The length written by out() will be at most the window size. Any non-zero
-+ amount of input may be provided by in().
-+
-+ For convenience, inflateBack() can be provided input on the first call by
-+ setting strm->next_in and strm->avail_in. If that input is exhausted, then
-+ in() will be called. Therefore strm->next_in must be initialized before
-+ calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
-+ immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
-+ must also be initialized, and then if strm->avail_in is not zero, input will
-+ initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-+
-+ The in_desc and out_desc parameters of inflateBack() is passed as the
-+ first parameter of in() and out() respectively when they are called. These
-+ descriptors can be optionally used to pass any information that the caller-
-+ supplied in() and out() functions need to do their job.
-+
-+ On return, inflateBack() will set strm->next_in and strm->avail_in to
-+ pass back any unused input that was provided by the last in() call. The
-+ return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-+ if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-+ in the deflate stream (in which case strm->msg is set to indicate the nature
-+ of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-+ In the case of Z_BUF_ERROR, an input or output error can be distinguished
-+ using strm->next_in which will be Z_NULL only if in() returned an error. If
-+ strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-+ non-zero. (in() will always be called before out(), so strm->next_in is
-+ assured to be defined if out() returns non-zero.) Note that inflateBack()
-+ cannot return Z_OK.
-+*/
-+
-+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-+/*
-+ All memory allocated by inflateBackInit() is freed.
-+
-+ inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-+ state was inconsistent.
-+*/
-+
-+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-+/* Return flags indicating compile-time options.
-+
-+ Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-+ 1.0: size of uInt
-+ 3.2: size of uLong
-+ 5.4: size of voidpf (pointer)
-+ 7.6: size of z_off_t
-+
-+ Compiler, assembler, and debug options:
-+ 8: DEBUG
-+ 9: ASMV or ASMINF -- use ASM code
-+ 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-+ 11: 0 (reserved)
-+
-+ One-time table building (smaller code, but not thread-safe if true):
-+ 12: BUILDFIXED -- build static block decoding tables when needed
-+ 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-+ 14,15: 0 (reserved)
-+
-+ Library content (indicates missing functionality):
-+ 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-+ deflate code when not needed)
-+ 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-+ and decode gzip streams (to avoid linking crc code)
-+ 18-19: 0 (reserved)
-+
-+ Operation variations (changes in library functionality):
-+ 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-+ 21: FASTEST -- deflate algorithm with only one, lowest compression level
-+ 22,23: 0 (reserved)
-+
-+ The sprintf variant used by gzprintf (zero is best):
-+ 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-+ 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-+ 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-+
-+ Remainder:
-+ 27-31: 0 (reserved)
-+ */
-+
-+#ifndef Z_SOLO
-+
-+ /* utility functions */
-+
-+/*
-+ The following utility functions are implemented on top of the basic
-+ stream-oriented functions. To simplify the interface, some default options
-+ are assumed (compression level and memory usage, standard memory allocation
-+ functions). The source code of these utility functions can be modified if
-+ you need special options.
-+*/
-+
-+ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
-+ const Bytef *source, uLong sourceLen));
-+/*
-+ Compresses the source buffer into the destination buffer. sourceLen is
-+ the byte length of the source buffer. Upon entry, destLen is the total size
-+ of the destination buffer, which must be at least the value returned by
-+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
-+ compressed buffer.
-+
-+ compress returns Z_OK if success, Z_MEM_ERROR if there was not
-+ enough memory, Z_BUF_ERROR if there was not enough room in the output
-+ buffer.
-+*/
-+
-+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
-+ const Bytef *source, uLong sourceLen,
-+ int level));
-+/*
-+ Compresses the source buffer into the destination buffer. The level
-+ parameter has the same meaning as in deflateInit. sourceLen is the byte
-+ length of the source buffer. Upon entry, destLen is the total size of the
-+ destination buffer, which must be at least the value returned by
-+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
-+ compressed buffer.
-+
-+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-+ Z_STREAM_ERROR if the level parameter is invalid.
-+*/
-+
-+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-+/*
-+ compressBound() returns an upper bound on the compressed size after
-+ compress() or compress2() on sourceLen bytes. It would be used before a
-+ compress() or compress2() call to allocate the destination buffer.
-+*/
-+
-+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
-+ const Bytef *source, uLong sourceLen));
-+/*
-+ Decompresses the source buffer into the destination buffer. sourceLen is
-+ the byte length of the source buffer. Upon entry, destLen is the total size
-+ of the destination buffer, which must be large enough to hold the entire
-+ uncompressed data. (The size of the uncompressed data must have been saved
-+ previously by the compressor and transmitted to the decompressor by some
-+ mechanism outside the scope of this compression library.) Upon exit, destLen
-+ is the actual size of the uncompressed buffer.
-+
-+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-+ enough memory, Z_BUF_ERROR if there was not enough room in the output
-+ buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In
-+ the case where there is not enough room, uncompress() will fill the output
-+ buffer with the uncompressed data up to that point.
-+*/
-+
-+ /* gzip file access functions */
-+
-+/*
-+ This library supports reading and writing files in gzip (.gz) format with
-+ an interface similar to that of stdio, using the functions that start with
-+ "gz". The gzip format is different from the zlib format. gzip is a gzip
-+ wrapper, documented in RFC 1952, wrapped around a deflate stream.
-+*/
-+
-+typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */
-+
-+/*
-+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-+
-+ Opens a gzip (.gz) file for reading or writing. The mode parameter is as
-+ in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-+ a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-+ compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-+ for fixed code compression as in "wb9F". (See the description of
-+ deflateInit2 for more information about the strategy parameter.) 'T' will
-+ request transparent writing or appending with no compression and not using
-+ the gzip format.
-+
-+ "a" can be used instead of "w" to request that the gzip stream that will
-+ be written be appended to the file. "+" will result in an error, since
-+ reading and writing to the same gzip file is not supported. The addition of
-+ "x" when writing will create the file exclusively, which fails if the file
-+ already exists. On systems that support it, the addition of "e" when
-+ reading or writing will set the flag to close the file on an execve() call.
-+
-+ These functions, as well as gzip, will read and decode a sequence of gzip
-+ streams in a file. The append function of gzopen() can be used to create
-+ such a file. (Also see gzflush() for another way to do this.) When
-+ appending, gzopen does not test whether the file begins with a gzip stream,
-+ nor does it look for the end of the gzip streams to begin appending. gzopen
-+ will simply append a gzip stream to the existing file.
-+
-+ gzopen can be used to read a file which is not in gzip format; in this
-+ case gzread will directly read from the file without decompression. When
-+ reading, this will be detected automatically by looking for the magic two-
-+ byte gzip header.
-+
-+ gzopen returns NULL if the file could not be opened, if there was
-+ insufficient memory to allocate the gzFile state, or if an invalid mode was
-+ specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-+ errno can be checked to determine if the reason gzopen failed was that the
-+ file could not be opened.
-+*/
-+
-+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-+/*
-+ gzdopen associates a gzFile with the file descriptor fd. File descriptors
-+ are obtained from calls like open, dup, creat, pipe or fileno (if the file
-+ has been previously opened with fopen). The mode parameter is as in gzopen.
-+
-+ The next call of gzclose on the returned gzFile will also close the file
-+ descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-+ fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-+ mode);. The duplicated descriptor should be saved to avoid a leak, since
-+ gzdopen does not close fd if it fails. If you are using fileno() to get the
-+ file descriptor from a FILE *, then you will have to use dup() to avoid
-+ double-close()ing the file descriptor. Both gzclose() and fclose() will
-+ close the associated file descriptor, so they need to have different file
-+ descriptors.
-+
-+ gzdopen returns NULL if there was insufficient memory to allocate the
-+ gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-+ provided, or '+' was provided), or if fd is -1. The file descriptor is not
-+ used until the next gz* read, write, seek, or close operation, so gzdopen
-+ will not detect if fd is invalid (unless fd is -1).
-+*/
-+
-+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-+/*
-+ Set the internal buffer size used by this library's functions. The
-+ default buffer size is 8192 bytes. This function must be called after
-+ gzopen() or gzdopen(), and before any other calls that read or write the
-+ file. The buffer memory allocation is always deferred to the first read or
-+ write. Two buffers are allocated, either both of the specified size when
-+ writing, or one of the specified size and the other twice that size when
-+ reading. A larger buffer size of, for example, 64K or 128K bytes will
-+ noticeably increase the speed of decompression (reading).
-+
-+ The new buffer size also affects the maximum length for gzprintf().
-+
-+ gzbuffer() returns 0 on success, or -1 on failure, such as being called
-+ too late.
-+*/
-+
-+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-+/*
-+ Dynamically update the compression level or strategy. See the description
-+ of deflateInit2 for the meaning of these parameters.
-+
-+ gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-+ opened for writing.
-+*/
-+
-+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-+/*
-+ Reads the given number of uncompressed bytes from the compressed file. If
-+ the input file is not in gzip format, gzread copies the given number of
-+ bytes into the buffer directly from the file.
-+
-+ After reaching the end of a gzip stream in the input, gzread will continue
-+ to read, looking for another gzip stream. Any number of gzip streams may be
-+ concatenated in the input file, and will all be decompressed by gzread().
-+ If something other than a gzip stream is encountered after a gzip stream,
-+ that remaining trailing garbage is ignored (and no error is returned).
-+
-+ gzread can be used to read a gzip file that is being concurrently written.
-+ Upon reaching the end of the input, gzread will return with the available
-+ data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-+ gzclearerr can be used to clear the end of file indicator in order to permit
-+ gzread to be tried again. Z_OK indicates that a gzip stream was completed
-+ on the last gzread. Z_BUF_ERROR indicates that the input file ended in the
-+ middle of a gzip stream. Note that gzread does not return -1 in the event
-+ of an incomplete gzip stream. This error is deferred until gzclose(), which
-+ will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-+ stream. Alternatively, gzerror can be used before gzclose to detect this
-+ case.
-+
-+ gzread returns the number of uncompressed bytes actually read, less than
-+ len for end of file, or -1 for error.
-+*/
-+
-+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-+ voidpc buf, unsigned len));
-+/*
-+ Writes the given number of uncompressed bytes into the compressed file.
-+ gzwrite returns the number of uncompressed bytes written or 0 in case of
-+ error.
-+*/
-+
-+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-+/*
-+ Converts, formats, and writes the arguments to the compressed file under
-+ control of the format string, as in fprintf. gzprintf returns the number of
-+ uncompressed bytes actually written, or 0 in case of error. The number of
-+ uncompressed bytes written is limited to 8191, or one less than the buffer
-+ size given to gzbuffer(). The caller should assure that this limit is not
-+ exceeded. If it is exceeded, then gzprintf() will return an error (0) with
-+ nothing written. In this case, there may also be a buffer overflow with
-+ unpredictable consequences, which is possible only if zlib was compiled with
-+ the insecure functions sprintf() or vsprintf() because the secure snprintf()
-+ or vsnprintf() functions were not available. This can be determined using
-+ zlibCompileFlags().
-+*/
-+
-+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-+/*
-+ Writes the given null-terminated string to the compressed file, excluding
-+ the terminating null character.
-+
-+ gzputs returns the number of characters written, or -1 in case of error.
-+*/
-+
-+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-+/*
-+ Reads bytes from the compressed file until len-1 characters are read, or a
-+ newline character is read and transferred to buf, or an end-of-file
-+ condition is encountered. If any characters are read or if len == 1, the
-+ string is terminated with a null character. If no characters are read due
-+ to an end-of-file or len < 1, then the buffer is left untouched.
-+
-+ gzgets returns buf which is a null-terminated string, or it returns NULL
-+ for end-of-file or in case of error. If there was an error, the contents at
-+ buf are indeterminate.
-+*/
-+
-+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-+/*
-+ Writes c, converted to an unsigned char, into the compressed file. gzputc
-+ returns the value that was written, or -1 in case of error.
-+*/
-+
-+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-+/*
-+ Reads one byte from the compressed file. gzgetc returns this byte or -1
-+ in case of end of file or error. This is implemented as a macro for speed.
-+ As such, it does not do all of the checking the other functions do. I.e.
-+ it does not check to see if file is NULL, nor whether the structure file
-+ points to has been clobbered or not.
-+*/
-+
-+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-+/*
-+ Push one character back onto the stream to be read as the first character
-+ on the next read. At least one character of push-back is allowed.
-+ gzungetc() returns the character pushed, or -1 on failure. gzungetc() will
-+ fail if c is -1, and may fail if a character has been pushed but not read
-+ yet. If gzungetc is used immediately after gzopen or gzdopen, at least the
-+ output buffer size of pushed characters is allowed. (See gzbuffer above.)
-+ The pushed character will be discarded if the stream is repositioned with
-+ gzseek() or gzrewind().
-+*/
-+
-+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-+/*
-+ Flushes all pending output into the compressed file. The parameter flush
-+ is as in the deflate() function. The return value is the zlib error number
-+ (see function gzerror below). gzflush is only permitted when writing.
-+
-+ If the flush parameter is Z_FINISH, the remaining data is written and the
-+ gzip stream is completed in the output. If gzwrite() is called again, a new
-+ gzip stream will be started in the output. gzread() is able to read such
-+ concatented gzip streams.
-+
-+ gzflush should be called only when strictly necessary because it will
-+ degrade compression if called too often.
-+*/
-+
-+/*
-+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-+ z_off_t offset, int whence));
-+
-+ Sets the starting position for the next gzread or gzwrite on the given
-+ compressed file. The offset represents a number of bytes in the
-+ uncompressed data stream. The whence parameter is defined as in lseek(2);
-+ the value SEEK_END is not supported.
-+
-+ If the file is opened for reading, this function is emulated but can be
-+ extremely slow. If the file is opened for writing, only forward seeks are
-+ supported; gzseek then compresses a sequence of zeroes up to the new
-+ starting position.
-+
-+ gzseek returns the resulting offset location as measured in bytes from
-+ the beginning of the uncompressed stream, or -1 in case of error, in
-+ particular if the file is opened for writing and the new starting position
-+ would be before the current position.
-+*/
-+
-+ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
-+/*
-+ Rewinds the given file. This function is supported only for reading.
-+
-+ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-+*/
-+
-+/*
-+ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
-+
-+ Returns the starting position for the next gzread or gzwrite on the given
-+ compressed file. This position represents a number of bytes in the
-+ uncompressed data stream, and is zero when starting, even if appending or
-+ reading a gzip stream from the middle of a file using gzdopen().
-+
-+ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-+*/
-+
-+/*
-+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-+
-+ Returns the current offset in the file being read or written. This offset
-+ includes the count of bytes that precede the gzip stream, for example when
-+ appending or when using gzdopen() for reading. When reading, the offset
-+ does not include as yet unused buffered input. This information can be used
-+ for a progress indicator. On error, gzoffset() returns -1.
-+*/
-+
-+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-+/*
-+ Returns true (1) if the end-of-file indicator has been set while reading,
-+ false (0) otherwise. Note that the end-of-file indicator is set only if the
-+ read tried to go past the end of the input, but came up short. Therefore,
-+ just like feof(), gzeof() may return false even if there is no more data to
-+ read, in the event that the last read request was for the exact number of
-+ bytes remaining in the input file. This will happen if the input file size
-+ is an exact multiple of the buffer size.
-+
-+ If gzeof() returns true, then the read functions will return no more data,
-+ unless the end-of-file indicator is reset by gzclearerr() and the input file
-+ has grown since the previous end of file was detected.
-+*/
-+
-+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-+/*
-+ Returns true (1) if file is being copied directly while reading, or false
-+ (0) if file is a gzip stream being decompressed.
-+
-+ If the input file is empty, gzdirect() will return true, since the input
-+ does not contain a gzip stream.
-+
-+ If gzdirect() is used immediately after gzopen() or gzdopen() it will
-+ cause buffers to be allocated to allow reading the file to determine if it
-+ is a gzip file. Therefore if gzbuffer() is used, it should be called before
-+ gzdirect().
-+
-+ When writing, gzdirect() returns true (1) if transparent writing was
-+ requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note:
-+ gzdirect() is not needed when writing. Transparent writing must be
-+ explicitly requested, so the application already knows the answer. When
-+ linking statically, using gzdirect() will include all of the zlib code for
-+ gzip file reading and decompression, which may not be desired.)
-+*/
-+
-+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
-+/*
-+ Flushes all pending output if necessary, closes the compressed file and
-+ deallocates the (de)compression state. Note that once file is closed, you
-+ cannot call gzerror with file, since its structures have been deallocated.
-+ gzclose must not be called more than once on the same file, just as free
-+ must not be called more than once on the same allocation.
-+
-+ gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-+ file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-+ last read ended in the middle of a gzip stream, or Z_OK on success.
-+*/
-+
-+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-+/*
-+ Same as gzclose(), but gzclose_r() is only for use when reading, and
-+ gzclose_w() is only for use when writing or appending. The advantage to
-+ using these instead of gzclose() is that they avoid linking in zlib
-+ compression or decompression code that is not used when only reading or only
-+ writing respectively. If gzclose() is used, then both compression and
-+ decompression code will be included the application when linking to a static
-+ zlib library.
-+*/
-+
-+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-+/*
-+ Returns the error message for the last error which occurred on the given
-+ compressed file. errnum is set to zlib error number. If an error occurred
-+ in the file system and not in the compression library, errnum is set to
-+ Z_ERRNO and the application may consult errno to get the exact error code.
-+
-+ The application must not modify the returned string. Future calls to
-+ this function may invalidate the previously returned string. If file is
-+ closed, then the string previously returned by gzerror will no longer be
-+ available.
-+
-+ gzerror() should be used to distinguish errors from end-of-file for those
-+ functions above that do not distinguish those cases in their return values.
-+*/
-+
-+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-+/*
-+ Clears the error and end-of-file flags for file. This is analogous to the
-+ clearerr() function in stdio. This is useful for continuing to read a gzip
-+ file that is being written concurrently.
-+*/
-+
-+#endif /* !Z_SOLO */
-+
-+ /* checksum functions */
-+
-+/*
-+ These functions are not related to compression but are exported
-+ anyway because they might be useful in applications using the compression
-+ library.
-+*/
-+
-+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-+/*
-+ Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-+ return the updated checksum. If buf is Z_NULL, this function returns the
-+ required initial value for the checksum.
-+
-+ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-+ much faster.
-+
-+ Usage example:
-+
-+ uLong adler = adler32(0L, Z_NULL, 0);
-+
-+ while (read_buffer(buffer, length) != EOF) {
-+ adler = adler32(adler, buffer, length);
-+ }
-+ if (adler != original_adler) error();
-+*/
-+
-+/*
-+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-+ z_off_t len2));
-+
-+ Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
-+ and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-+ each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
-+ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note
-+ that the z_off_t type (like off_t) is a signed integer. If len2 is
-+ negative, the result has no meaning or utility.
-+*/
-+
-+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
-+/*
-+ Update a running CRC-32 with the bytes buf[0..len-1] and return the
-+ updated CRC-32. If buf is Z_NULL, this function returns the required
-+ initial value for the crc. Pre- and post-conditioning (one's complement) is
-+ performed within this function so it shouldn't be done by the application.
-+
-+ Usage example:
-+
-+ uLong crc = crc32(0L, Z_NULL, 0);
-+
-+ while (read_buffer(buffer, length) != EOF) {
-+ crc = crc32(crc, buffer, length);
-+ }
-+ if (crc != original_crc) error();
-+*/
-+
-+/*
-+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-+
-+ Combine two CRC-32 check values into one. For two sequences of bytes,
-+ seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-+ calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
-+ check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-+ len2.
-+*/
-+
-+
-+ /* various hacks, don't look :) */
-+
-+/* deflateInit and inflateInit are macros to allow checking the zlib version
-+ * and the compiler's view of z_stream:
-+ */
-+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-+ const char *version, int stream_size));
-+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-+ const char *version, int stream_size));
-+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
-+ int windowBits, int memLevel,
-+ int strategy, const char *version,
-+ int stream_size));
-+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
-+ const char *version, int stream_size));
-+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-+ unsigned char FAR *window,
-+ const char *version,
-+ int stream_size));
-+#define deflateInit(strm, level) \
-+ deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-+#define inflateInit(strm) \
-+ inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-+ (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-+#define inflateInit2(strm, windowBits) \
-+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-+ (int)sizeof(z_stream))
-+#define inflateBackInit(strm, windowBits, window) \
-+ inflateBackInit_((strm), (windowBits), (window), \
-+ ZLIB_VERSION, (int)sizeof(z_stream))
-+
-+#ifndef Z_SOLO
-+
-+/* gzgetc() macro and its supporting function and exposed data structure. Note
-+ * that the real internal state is much larger than the exposed structure.
-+ * This abbreviated structure exposes just enough for the gzgetc() macro. The
-+ * user should not mess with these exposed elements, since their names or
-+ * behavior could change in the future, perhaps even capriciously. They can
-+ * only be used by the gzgetc() macro. You have been warned.
-+ */
-+struct gzFile_s {
-+ unsigned have;
-+ unsigned char *next;
-+ z_off64_t pos;
-+};
-+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */
-+#ifdef Z_PREFIX_SET
-+# undef z_gzgetc
-+# define z_gzgetc(g) \
-+ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-+#else
-+# define gzgetc(g) \
-+ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-+#endif
-+
-+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
-+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
-+ * both are true, the application gets the *64 functions, and the regular
-+ * functions are changed to 64 bits) -- in case these are set on systems
-+ * without large file support, _LFS64_LARGEFILE must also be true
-+ */
-+#ifdef Z_LARGE64
-+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-+ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-+ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-+ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-+#endif
-+
-+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-+# ifdef Z_PREFIX_SET
-+# define z_gzopen z_gzopen64
-+# define z_gzseek z_gzseek64
-+# define z_gztell z_gztell64
-+# define z_gzoffset z_gzoffset64
-+# define z_adler32_combine z_adler32_combine64
-+# define z_crc32_combine z_crc32_combine64
-+# else
-+# define gzopen gzopen64
-+# define gzseek gzseek64
-+# define gztell gztell64
-+# define gzoffset gzoffset64
-+# define adler32_combine adler32_combine64
-+# define crc32_combine crc32_combine64
-+# endif
-+# ifndef Z_LARGE64
-+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-+ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-+# endif
-+#else
-+ ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-+ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-+ ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-+ ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-+ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-+ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-+#endif
-+
-+#else /* Z_SOLO */
-+
-+ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-+ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-+
-+#endif /* !Z_SOLO */
-+
-+/* hack for buggy compilers */
-+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-+ struct internal_state {int dummy;};
-+#endif
-+
-+/* undocumented functions */
-+ZEXTERN const char * ZEXPORT zError OF((int));
-+ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp));
-+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void));
-+ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
-+ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
-+ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
-+#if defined(_WIN32) && !defined(Z_SOLO)
-+ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path,
-+ const char *mode));
-+#endif
-+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-+# ifndef Z_SOLO
-+ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-+ const char *format,
-+ va_list va));
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* ZLIB_H */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/zutil.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,348 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* zutil.c -- target dependent utility functions for the compression library
-+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#include "zutil.h"
-+#ifndef Z_SOLO
-+# include "gzguts.h"
-+#endif
-+
-+#ifndef NO_DUMMY_DECL
-+struct internal_state {int dummy;}; /* for buggy compilers */
-+#endif
-+
-+z_const char * const z_errmsg[10] = {
-+"need dictionary", /* Z_NEED_DICT 2 */
-+"stream end", /* Z_STREAM_END 1 */
-+"", /* Z_OK 0 */
-+"file error", /* Z_ERRNO (-1) */
-+"stream error", /* Z_STREAM_ERROR (-2) */
-+"data error", /* Z_DATA_ERROR (-3) */
-+"insufficient memory", /* Z_MEM_ERROR (-4) */
-+"buffer error", /* Z_BUF_ERROR (-5) */
-+"incompatible version",/* Z_VERSION_ERROR (-6) */
-+""};
-+
-+
-+const char * ZEXPORT zlibVersion()
-+{
-+ return ZLIB_VERSION;
-+}
-+
-+uLong ZEXPORT zlibCompileFlags()
-+{
-+ uLong flags;
-+
-+ flags = 0;
-+ switch ((int)(sizeof(uInt))) {
-+ case 2: break;
-+ case 4: flags += 1; break;
-+ case 8: flags += 2; break;
-+ default: flags += 3;
-+ }
-+ switch ((int)(sizeof(uLong))) {
-+ case 2: break;
-+ case 4: flags += 1 << 2; break;
-+ case 8: flags += 2 << 2; break;
-+ default: flags += 3 << 2;
-+ }
-+ switch ((int)(sizeof(voidpf))) {
-+ case 2: break;
-+ case 4: flags += 1 << 4; break;
-+ case 8: flags += 2 << 4; break;
-+ default: flags += 3 << 4;
-+ }
-+ switch ((int)(sizeof(z_off_t))) {
-+ case 2: break;
-+ case 4: flags += 1 << 6; break;
-+ case 8: flags += 2 << 6; break;
-+ default: flags += 3 << 6;
-+ }
-+#ifdef DEBUG
-+ flags += 1 << 8;
-+#endif
-+#if defined(ASMV) || defined(ASMINF)
-+ flags += 1 << 9;
-+#endif
-+#ifdef ZLIB_WINAPI
-+ flags += 1 << 10;
-+#endif
-+#ifdef BUILDFIXED
-+ flags += 1 << 12;
-+#endif
-+#ifdef DYNAMIC_CRC_TABLE
-+ flags += 1 << 13;
-+#endif
-+#ifdef NO_GZCOMPRESS
-+ flags += 1L << 16;
-+#endif
-+#ifdef NO_GZIP
-+ flags += 1L << 17;
-+#endif
-+#ifdef PKZIP_BUG_WORKAROUND
-+ flags += 1L << 20;
-+#endif
-+#ifdef FASTEST
-+ flags += 1L << 21;
-+#endif
-+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-+# ifdef NO_vsnprintf
-+ flags += 1L << 25;
-+# ifdef HAS_vsprintf_void
-+ flags += 1L << 26;
-+# endif
-+# else
-+# ifdef HAS_vsnprintf_void
-+ flags += 1L << 26;
-+# endif
-+# endif
-+#else
-+ flags += 1L << 24;
-+# ifdef NO_snprintf
-+ flags += 1L << 25;
-+# ifdef HAS_sprintf_void
-+ flags += 1L << 26;
-+# endif
-+# else
-+# ifdef HAS_snprintf_void
-+ flags += 1L << 26;
-+# endif
-+# endif
-+#endif
-+ return flags;
-+}
-+
-+#ifdef DEBUG
-+
-+# ifndef verbose
-+# define verbose 0
-+# endif
-+int ZLIB_INTERNAL z_verbose = verbose;
-+
-+void ZLIB_INTERNAL z_error (m)
-+ char *m;
-+{
-+ fprintf(stderr, "%s\n", m);
-+ exit(1);
-+}
-+#endif
-+
-+/* exported to allow conversion of error code to string for compress() and
-+ * uncompress()
-+ */
-+const char * ZEXPORT zError(err)
-+ int err;
-+{
-+ return ERR_MSG(err);
-+}
-+
-+#if defined(_WIN32_WCE)
-+ /* The Microsoft C Run-Time Library for Windows CE doesn't have
-+ * errno. We define it as a global variable to simplify porting.
-+ * Its value is always 0 and should not be used.
-+ */
-+ int errno = 0;
-+#endif
-+
-+#ifndef HAVE_MEMCPY
-+
-+void ZLIB_INTERNAL zmemcpy(dest, source, len)
-+ Bytef* dest;
-+ const Bytef* source;
-+ uInt len;
-+{
-+ if (len == 0) return;
-+ do {
-+ *dest++ = *source++; /* ??? to be unrolled */
-+ } while (--len != 0);
-+}
-+
-+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-+ const Bytef* s1;
-+ const Bytef* s2;
-+ uInt len;
-+{
-+ uInt j;
-+
-+ for (j = 0; j < len; j++) {
-+ if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-+ }
-+ return 0;
-+}
-+
-+void ZLIB_INTERNAL zmemzero(dest, len)
-+ Bytef* dest;
-+ uInt len;
-+{
-+ if (len == 0) return;
-+ do {
-+ *dest++ = 0; /* ??? to be unrolled */
-+ } while (--len != 0);
-+}
-+#endif
-+
-+#ifndef Z_SOLO
-+
-+#ifdef SYS16BIT
-+
-+#ifdef __TURBOC__
-+/* Turbo C in 16-bit mode */
-+
-+# define MY_ZCALLOC
-+
-+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
-+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
-+ * must fix the pointer. Warning: the pointer must be put back to its
-+ * original form in order to free it, use zcfree().
-+ */
-+
-+#define MAX_PTR 10
-+/* 10*64K = 640K */
-+
-+local int next_ptr = 0;
-+
-+typedef struct ptr_table_s {
-+ voidpf org_ptr;
-+ voidpf new_ptr;
-+} ptr_table;
-+
-+local ptr_table table[MAX_PTR];
-+/* This table is used to remember the original form of pointers
-+ * to large buffers (64K). Such pointers are normalized with a zero offset.
-+ * Since MSDOS is not a preemptive multitasking OS, this table is not
-+ * protected from concurrent access. This hack doesn't work anyway on
-+ * a protected system like OS/2. Use Microsoft C instead.
-+ */
-+
-+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-+{
-+ voidpf buf = opaque; /* just to make some compilers happy */
-+ ulg bsize = (ulg)items*size;
-+
-+ /* If we allocate less than 65520 bytes, we assume that farmalloc
-+ * will return a usable pointer which doesn't have to be normalized.
-+ */
-+ if (bsize < 65520L) {
-+ buf = farmalloc(bsize);
-+ if (*(ush*)&buf != 0) return buf;
-+ } else {
-+ buf = farmalloc(bsize + 16L);
-+ }
-+ if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-+ table[next_ptr].org_ptr = buf;
-+
-+ /* Normalize the pointer to seg:0 */
-+ *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-+ *(ush*)&buf = 0;
-+ table[next_ptr++].new_ptr = buf;
-+ return buf;
-+}
-+
-+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-+{
-+ int n;
-+ if (*(ush*)&ptr != 0) { /* object < 64K */
-+ farfree(ptr);
-+ return;
-+ }
-+ /* Find the original pointer */
-+ for (n = 0; n < next_ptr; n++) {
-+ if (ptr != table[n].new_ptr) continue;
-+
-+ farfree(table[n].org_ptr);
-+ while (++n < next_ptr) {
-+ table[n-1] = table[n];
-+ }
-+ next_ptr--;
-+ return;
-+ }
-+ ptr = opaque; /* just to make some compilers happy */
-+ Assert(0, "zcfree: ptr not found");
-+}
-+
-+#endif /* __TURBOC__ */
-+
-+
-+#ifdef M_I86
-+/* Microsoft C in 16-bit mode */
-+
-+# define MY_ZCALLOC
-+
-+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-+# define _halloc halloc
-+# define _hfree hfree
-+#endif
-+
-+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-+{
-+ if (opaque) opaque = 0; /* to make compiler happy */
-+ return _halloc((long)items, size);
-+}
-+
-+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-+{
-+ if (opaque) opaque = 0; /* to make compiler happy */
-+ _hfree(ptr);
-+}
-+
-+#endif /* M_I86 */
-+
-+#endif /* SYS16BIT */
-+
-+
-+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-+
-+#ifndef STDC
-+extern voidp malloc OF((uInt size));
-+extern voidp calloc OF((uInt items, uInt size));
-+extern void free OF((voidpf ptr));
-+#endif
-+
-+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-+ voidpf opaque;
-+ unsigned items;
-+ unsigned size;
-+{
-+ if (opaque) items += size - size; /* make compiler happy */
-+ return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-+ (voidpf)calloc(items, size);
-+}
-+
-+void ZLIB_INTERNAL zcfree (opaque, ptr)
-+ voidpf opaque;
-+ voidpf ptr;
-+{
-+ free(ptr);
-+ if (opaque) return; /* make compiler happy */
-+}
-+
-+#endif /* MY_ZCALLOC */
-+
-+#endif /* !Z_SOLO */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.2.8/zutil.h Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,277 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* zutil.h -- internal interface and configuration of the compression library
-+ * Copyright (C) 1995-2013 Jean-loup Gailly.
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+/* WARNING: this file should *not* be used by applications. It is
-+ part of the implementation of the compression library and is
-+ subject to change. Applications should only use zlib.h.
-+ */
-+
-+/* @(#) $Id$ */
-+
-+#ifndef ZUTIL_H
-+#define ZUTIL_H
-+
-+#ifdef HAVE_HIDDEN
-+# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-+#else
-+# define ZLIB_INTERNAL
-+#endif
-+
-+#include "zlib.h"
-+
-+#if defined(STDC) && !defined(Z_SOLO)
-+# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-+# include <stddef.h>
-+# endif
-+# include <string.h>
-+# include <stdlib.h>
-+#endif
-+
-+#ifdef Z_SOLO
-+ typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
-+#endif
-+
-+#ifndef local
-+# define local static
-+#endif
-+/* compile with -Dlocal if your debugger can't find static symbols */
-+
-+typedef unsigned char uch;
-+typedef uch FAR uchf;
-+typedef unsigned short ush;
-+typedef ush FAR ushf;
-+typedef unsigned long ulg;
-+
-+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-+/* (size given to avoid silly warnings with Visual C++) */
-+
-+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-+
-+#define ERR_RETURN(strm,err) \
-+ return (strm->msg = ERR_MSG(err), (err))
-+/* To be used only when the state is known to be valid */
-+
-+ /* common constants */
-+
-+#ifndef DEF_WBITS
-+# define DEF_WBITS MAX_WBITS
-+#endif
-+/* default windowBits for decompression. MAX_WBITS is for compression only */
-+
-+#if MAX_MEM_LEVEL >= 8
-+# define DEF_MEM_LEVEL 8
-+#else
-+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-+#endif
-+/* default memLevel */
-+
-+#define STORED_BLOCK 0
-+#define STATIC_TREES 1
-+#define DYN_TREES 2
-+/* The three kinds of block type */
-+
-+#define MIN_MATCH 3
-+#define MAX_MATCH 258
-+/* The minimum and maximum match lengths */
-+
-+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-+
-+ /* target dependencies */
-+
-+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-+# define OS_CODE 0x00
-+# ifndef Z_SOLO
-+# if defined(__TURBOC__) || defined(__BORLANDC__)
-+# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-+ /* Allow compilation with ANSI keywords only enabled */
-+ void _Cdecl farfree( void *block );
-+ void *_Cdecl farmalloc( unsigned long nbytes );
-+# else
-+# include <alloc.h>
-+# endif
-+# else /* MSC or DJGPP */
-+# include <malloc.h>
-+# endif
-+# endif
-+#endif
-+
-+#ifdef AMIGA
-+# define OS_CODE 0x01
-+#endif
-+
-+#if defined(VAXC) || defined(VMS)
-+# define OS_CODE 0x02
-+# define F_OPEN(name, mode) \
-+ fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-+#endif
-+
-+#if defined(ATARI) || defined(atarist)
-+# define OS_CODE 0x05
-+#endif
-+
-+#ifdef OS2
-+# define OS_CODE 0x06
-+# if defined(M_I86) && !defined(Z_SOLO)
-+# include <malloc.h>
-+# endif
-+#endif
-+
-+#if defined(MACOS) || defined(TARGET_OS_MAC)
-+# define OS_CODE 0x07
-+# ifndef Z_SOLO
-+# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-+# include <unix.h> /* for fdopen */
-+# else
-+# ifndef fdopen
-+# define fdopen(fd,mode) NULL /* No fdopen() */
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef TOPS20
-+# define OS_CODE 0x0a
-+#endif
-+
-+#ifdef WIN32
-+# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
-+# define OS_CODE 0x0b
-+# endif
-+#endif
-+
-+#ifdef __50SERIES /* Prime/PRIMOS */
-+# define OS_CODE 0x0f
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS)
-+# define fdopen(fd,mode) NULL /* No fdopen() */
-+#endif
-+
-+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-+# if defined(_WIN32_WCE)
-+# define fdopen(fd,mode) NULL /* No fdopen() */
-+# ifndef _PTRDIFF_T_DEFINED
-+ typedef int ptrdiff_t;
-+# define _PTRDIFF_T_DEFINED
-+# endif
-+# else
-+# define fdopen(fd,type) _fdopen(fd,type)
-+# endif
-+#endif
-+
-+#if defined(__BORLANDC__) && !defined(MSDOS)
-+ #pragma warn -8004
-+ #pragma warn -8008
-+ #pragma warn -8066
-+#endif
-+
-+/* provide prototypes for these when building zlib without LFS */
-+#if !defined(_WIN32) && \
-+ (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-+#endif
-+
-+ /* common defaults */
-+
-+#ifndef OS_CODE
-+# define OS_CODE 0x03 /* assume Unix */
-+#endif
-+
-+#ifndef F_OPEN
-+# define F_OPEN(name, mode) fopen((name), (mode))
-+#endif
-+
-+ /* functions */
-+
-+#if defined(pyr) || defined(Z_SOLO)
-+# define NO_MEMCPY
-+#endif
-+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
-+ /* Use our own functions for small and medium model with MSC <= 5.0.
-+ * You may have to use the same strategy for Borland C (untested).
-+ * The __SC__ check is for Symantec.
-+ */
-+# define NO_MEMCPY
-+#endif
-+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-+# define HAVE_MEMCPY
-+#endif
-+#ifdef HAVE_MEMCPY
-+# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-+# define zmemcpy _fmemcpy
-+# define zmemcmp _fmemcmp
-+# define zmemzero(dest, len) _fmemset(dest, 0, len)
-+# else
-+# define zmemcpy memcpy
-+# define zmemcmp memcmp
-+# define zmemzero(dest, len) memset(dest, 0, len)
-+# endif
-+#else
-+ void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-+ int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-+ void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-+#endif
-+
-+/* Diagnostic functions */
-+#ifdef DEBUG
-+# include <stdio.h>
-+ extern int ZLIB_INTERNAL z_verbose;
-+ extern void ZLIB_INTERNAL z_error OF((char *m));
-+# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-+# define Trace(x) {if (z_verbose>=0) fprintf x ;}
-+# define Tracev(x) {if (z_verbose>0) fprintf x ;}
-+# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-+# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-+# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-+#else
-+# define Assert(cond,msg)
-+# define Trace(x)
-+# define Tracev(x)
-+# define Tracevv(x)
-+# define Tracec(c,x)
-+# define Tracecv(c,x)
-+#endif
-+
-+#ifndef Z_SOLO
-+ voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-+ unsigned size));
-+ void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
-+#endif
-+
-+#define ZALLOC(strm, items, size) \
-+ (*((strm)->zalloc))((strm)->opaque, (items), (size))
-+#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-+
-+/* Reverse the bytes in a 32-bit value */
-+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-+ (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-+
-+#endif /* ZUTIL_H */
---- ./jdk/src/share/native/sun/awt/libpng/CHANGES Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/CHANGES Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,8 +23,6 @@
- * questions.
- */
-
--#if 0
--libpng_changes(){ /*
- CHANGES - changes for libpng
-
- Version 0.2
-@@ -205,7 +203,7 @@
- Fixed serious bug with < 8bpp images introduced in 0.95
- Fixed 256-color transparency bug (Greg Roelofs)
- Fixed up documentation (Greg Roelofs, Laszlo Nyul)
-- Fixed "error" in pngconf.h for Linux setjmp() behaviour
-+ Fixed "error" in pngconf.h for Linux setjmp() behavior
- Fixed DOS medium model support (Tim Wegner)
- Fixed png_check_keyword() for case with error in static string text
- Added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)
-@@ -222,18 +220,20 @@
- Added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)
- Minor corrections in libpng.txt
- Added simple sRGB support (Glenn R-P)
-- Easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
-+ Easier conditional compiling, e.g.,
-+ define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
- all configurable options can be selected from command-line instead
- of having to edit pngconf.h (Glenn R-P)
- Fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)
- Added more conditions for png_do_background, to avoid changing
- black pixels to background when a background is supplied and
- no pixels are transparent
-- Repaired PNG_NO_STDIO behaviour
-- Tested NODIV support and made it default behaviour (Greg Roelofs)
-+ Repaired PNG_NO_STDIO behavior
-+ Tested NODIV support and made it default behavior (Greg Roelofs)
- Added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)
- Regularized version numbering scheme and bumped shared-library major
-- version number to 2 to avoid problems with libpng 0.89 apps (Greg Roelofs)
-+ version number to 2 to avoid problems with libpng 0.89 apps
-+ (Greg Roelofs)
-
- Version 0.98 [January, 1998]
- Cleaned up some typos in libpng.txt and in code documentation
-@@ -1803,7 +1803,7 @@
- Removed AC_FUNC_MALLOC from configure.ac
- Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
- Change "logical" to "bitwise" throughout documentation.
-- Detect and fix attempt to write wrong iCCP profile length.
-+ Detect and fix attempt to write wrong iCCP profile length (CVE-2006-7244)
-
- Version 1.0.21, 1.2.13 [November 14, 2006]
- Fix potential buffer overflow in sPLT chunk handler.
-@@ -2386,7 +2386,7 @@
-
- Version 1.4.0beta73 [August 1, 2009]
- Reject attempt to write iCCP chunk with negative embedded profile length
-- (JD Chen)
-+ (JD Chen) (CVE-2009-5063).
-
- Version 1.4.0beta74 [August 8, 2009]
- Changed png_ptr and info_ptr member "trans" to "trans_alpha".
-@@ -3174,8 +3174,8 @@
- in version 1.5.0beta36 but is not noted in the CHANGES. Similarly,
- it was changed from png_charpp to png_const_bytepp in png_set_iCCP().
- Ensure that png_rgb_to_gray ignores palette mapped images, if libpng
-- internally happens to call it with one.
-- Fixed a failure to handle palette mapped images correctly.
-+ internally happens to call it with one, and fixed a failure to handle
-+ palette mapped images correctly. This fixes CVE-2690.
-
- Version 1.5.1beta02 [January 14, 2011]
- Fixed a bug in handling of interlaced images (bero at arklinux.org).
-@@ -3314,8 +3314,8 @@
-
- Version 1.5.3beta01 [April 1, 2011]
- Re-initialize the zlib compressor before compressing non-IDAT chunks.
-- Added API functions to set parameters for zlib compression of non-IDAT
-- chunks.
-+ Added API functions (png_set_text_compression_level() and four others) to
-+ set parameters for zlib compression of non-IDAT chunks.
-
- Version 1.5.3beta02 [April 3, 2011]
- Updated scripts/symbols.def with new API functions.
-@@ -3372,7 +3372,7 @@
- dependency of the tIME-supporting RFC1132 code on stdio is removed and
- PNG_NO_WARNINGS does actually work now.
- Pass "" instead of '\0' to png_default_error() in png_err(). This mistake
-- was introduced in libpng-1.2.20beta01.
-+ was introduced in libpng-1.2.20beta01. This fixes CVE-2011-2691.
- Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte
- optimization configureable.
- IDAT compression failed if preceded by a compressed text chunk (bug
-@@ -3403,7 +3403,8 @@
- Documented png_set_alpha_mode(), other changes in libpng.3/libpng-manual.txt
- The cHRM chunk now sets the defaults for png_set_rgb_to_gray() (when negative
- parameters are supplied by the caller), while in the absence of cHRM
-- sRGB/Rec 709 values are still used.
-+ sRGB/Rec 709 values are still used. This introduced a divide-by-zero
-+ bug in png_handle_cHRM().
- The bKGD chunk no longer overwrites the background value set by
- png_set_background(), allowing the latter to be used before the file
- header is read. It never performed any useful function to override
-@@ -3443,7 +3444,8 @@
- Frank Busse, CVE-2011-2501, related to CVE-2004-0421).
-
- Version 1.5.3beta11 [June 11, 2011]
-- Fixed png_handle_sCAL which is broken in 1.5; added sCAL to pngtest.png
-+ Fixed png_handle_sCAL which is broken in 1.5. This fixes CVE 2011-2692.
-+ Added sCAL to pngtest.png
- Revised documentation about png_set_user_limits() to say that it also affects
- png writing.
- Revised handling of png_set_user_limits() so that it can increase the
-@@ -3468,7 +3470,7 @@
- Removed string/memory macros that are no longer used and are not
- necessarily fully supportable, particularly png_strncpy and png_snprintf.
- Added log option to pngvalid.c and attempted to improve gamma messages.
--
-+
- Version 1.5.3 [omitted]
- People found the presence of a beta release following an rc release
- to be confusing; therefore we bump the version to libpng-1.5.4beta01
-@@ -3532,6 +3534,1620 @@
- Define PNG_ALLOCATED to "restrict" only if MSC_VER >= 1400.
-
- Version 1.5.4 [July 7, 2011]
-+ No changes.
-+
-+Version 1.5.5beta01 [July 13, 2011]
-+ Fixed some typos and made other minor changes in the manual.
-+ Updated contrib/pngminus/makefile.std (Samuli Souminen)
-+
-+Version 1.5.5beta02 [July 14, 2011]
-+ Revised Makefile.am and Makefile.in to look in the right directory for
-+ pnglibconf.h.prebuilt
-+
-+Version 1.5.5beta03 [July 27, 2011]
-+ Enabled compilation with g++ compiler. This compiler does not recognize
-+ the file extension, so it always compiles with C++ rules. Made minor
-+ changes to pngrutil.c to cast results where C++ expects it but C does not.
-+ Minor editing of libpng.3 and libpng-manual.txt.
-+
-+Version 1.5.5beta04 [July 29, 2011]
-+ Revised CMakeLists.txt (Clifford Yapp)
-+ Updated commentary about the png_rgb_to_gray() default coefficients
-+ in the manual and in pngrtran.c
-+
-+Version 1.5.5beta05 [August 17, 2011]
-+ Prevent unexpected API exports from non-libpng DLLs on Windows. The "_DLL"
-+ is removed from the test of whether a DLL is being built (this erroneously
-+ caused the libpng APIs to be marked as DLL exports in static builds under
-+ Microsoft Visual Studio). Almost all of the libpng building configuration
-+ is moved from pngconf.h to pngpriv.h, but PNG_DLL_EXPORT remains in
-+ pngconf.h, though, so that it is colocated with the import definition (it
-+ is no longer used anywhere in the installed headers). The VStudio project
-+ definitions have been cleaned up: "_USRDLL" has been removed from the
-+ static library builds (this was incorrect), and PNG_USE_DLL has been added
-+ to pngvalid to test the functionality (pngtest does not supply it,
-+ deliberately). The spurious "_EXPORTS" has been removed from the
-+ libpng build (all these errors were a result of copy/paste between project
-+ configurations.)
-+ Added new types and internal functions for CIE RGB end point handling to
-+ pngpriv.h (functions yet to be implemented).
-+
-+Version 1.5.5beta06 [August 26, 2011]
-+ Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set in CMakeLists.txt
-+ (Clifford Yap)
-+ Fixes to rgb_to_gray and cHRM XYZ APIs (John Bowler):
-+ The rgb_to_gray code had errors when combined with gamma correction.
-+ Some pixels were treated as true grey when they weren't and such pixels
-+ and true grey ones were not gamma corrected (the original value of the
-+ red component was used instead). APIs to get and set cHRM using color
-+ space end points have been added and the rgb_to_gray code that defaults
-+ based on cHRM, and the divide-by-zero bug in png_handle_cHRM (CERT
-+ VU#477046, CVE-2011-3328, introduced in 1.5.4) have been corrected.
-+ A considerable number of tests has been added to pngvalid for the
-+ rgb_to_gray transform.
-+ Arithmetic errors in rgb_to_gray whereby the calculated gray value was
-+ truncated to the bit depth rather than rounded have been fixed except in
-+ the 8-bit non-gamma-corrected case (where consistency seems more important
-+ than correctness.) The code still has considerable inaccuracies in the
-+ 8-bit case because 8-bit linear arithmetic is used.
-+
-+Version 1.5.5beta07 [September 7, 2011]
-+ Added "$(ARCH)" option to makefile.darwin
-+ Added SunOS support to configure.ac and Makefile.am
-+ Changed png_chunk_benign_error() to png_warning() in png.c, in
-+ png_XYZ_from_xy_checked().
-+
-+Version 1.5.5beta08 [September 10, 2011]
-+ Fixed 64-bit compilation errors (gcc). The errors fixed relate
-+ to conditions where types that are 32 bits in the GCC 32-bit
-+ world (uLong and png_size_t) become 64 bits in the 64-bit
-+ world. This produces potential truncation errors which the
-+ compiler correctly flags.
-+ Relocated new HAVE_SOLARIS_LD definition in configure.ac
-+ Constant changes for 64-bit compatibility (removal of L suffixes). The
-+ 16-bit cases still use "L" as we don't have a 16-bit test system.
-+
-+Version 1.5.5rc01 [September 15, 2011]
-+ Removed "L" suffixes in pngpriv.h
-+
-+Version 1.5.5 [September 22, 2011]
-+ No changes.
-+
-+Version 1.5.6beta01 [September 22, 2011]
-+ Fixed some 64-bit type conversion warnings in pngrtran.c
-+ Moved row_info from png_struct to a local variable.
-+ The various interlace mask arrays have been made into arrays of
-+ bytes and made PNG_CONST and static (previously some arrays were
-+ marked PNG_CONST and some weren't).
-+ Additional checks have been added to the transform code to validate the
-+ pixel depths after the transforms on both read and write.
-+ Removed some redundant code from pngwrite.c, in png_destroy_write_struct().
-+ Changed chunk reading/writing code to use png_uint_32 instead of png_byte[4].
-+ This removes the need to allocate temporary strings for chunk names on
-+ the stack in the read/write code. Unknown chunk handling still uses the
-+ string form because this is exposed in the API.
-+
-+Version 1.5.6beta02 [September 26, 2011]
-+ Added a note in the manual the png_read_update_info() must be called only
-+ once with a particular info_ptr.
-+ Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro.
-+
-+Version 1.5.6beta03 [September 28, 2011]
-+ Revised test-pngtest.sh to report FAIL when pngtest fails.
-+ Added "--strict" option to pngtest, to report FAIL when the failure is
-+ only because the resulting valid files are different.
-+ Revised CMakeLists.txt to work with mingw and removed some material from
-+ CMakeLists.txt that is no longer useful in libpng-1.5.
-+
-+Version 1.5.6beta04 [October 5, 2011]
-+ Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")."
-+
-+Version 1.5.6beta05 [October 12, 2011]
-+ Speed up png_combine_row() for interlaced images. This reduces the generality
-+ of the code, allowing it to be optimized for Adam7 interlace. The masks
-+ passed to png_combine_row() are now generated internally, avoiding
-+ some code duplication and localizing the interlace handling somewhat.
-+ Align png_struct::row_buf - previously it was always unaligned, caused by
-+ a bug in the code that attempted to align it; the code needs to subtract
-+ one from the pointer to take account of the filter byte prepended to
-+ each row.
-+ Optimized png_combine_row() when rows are aligned. This gains a small
-+ percentage for 16-bit and 32-bit pixels in the typical case where the
-+ output row buffers are appropriately aligned. The optimization was not
-+ previously possible because the png_struct buffer was always misaligned.
-+ Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.
-+
-+Version 1.5.6beta06 [October 17, 2011]
-+ Removed two redundant tests for unitialized row.
-+ Fixed a relatively harmless memory overwrite in compressed text writing
-+ with a 1 byte zlib buffer.
-+ Add ability to call png_read_update_info multiple times to pngvalid.c.
-+ Fixes for multiple calls to png_read_update_info. These fixes attend to
-+ most of the errors revealed in pngvalid, however doing the gamma work
-+ twice results in inaccuracies that can't be easily fixed. There is now
-+ a warning in the code if this is going to happen.
-+ Turned on multiple png_read_update_info in pngvalid transform tests.
-+ Prevent libpng from overwriting unused bits at the end of the image when
-+ it is not byte aligned, while reading. Prior to libpng-1.5.6 libpng would
-+ overwrite the partial byte at the end of each row if the row width was not
-+ an exact multiple of 8 bits and the image is not interlaced.
-+
-+Version 1.5.6beta07 [October 21, 2011]
-+ Made png_ptr->prev_row an aligned pointer into png_ptr->big_prev_row
-+ (Mans Rullgard).
-+
-+Version 1.5.6rc01 [October 26, 2011]
-+ Changed misleading "Missing PLTE before cHRM" warning to "Out of place cHRM"
-+
-+Version 1.5.6rc02 [October 27, 2011]
-+ Added LSR() macro to defend against buggy compilers that evaluate non-taken
-+ code branches and complain about out-of-range shifts.
-+
-+Version 1.5.6rc03 [October 28, 2011]
-+ Renamed the LSR() macro to PNG_LSR() and added PNG_LSL() macro.
-+ Fixed compiler warnings with Intel and MSYS compilers. The logical shift
-+ fix for Microsoft Visual C is required by other compilers, so this
-+ enables that fix for all compilers when using compile-time constants.
-+ Under MSYS 'byte' is a name declared in a system header file, so we
-+ changed the name of a local variable to avoid the warnings that result.
-+ Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h
-+
-+Version 1.5.6 [November 3, 2011]
-+ No changes.
-+
-+Version 1.5.7beta01 [November 4, 2011]
-+ Added support for ARM processor, when decoding all PNG up-filtered rows
-+ and any other-filtered rows with 3 or 4 bytes per pixel (Mans Rullgard).
-+ Fixed bug in pngvalid on early allocation failure; fixed type cast in
-+ pngmem.c; pngvalid would attempt to call png_error() if the allocation
-+ of a png_struct or png_info failed. This would probably have led to a
-+ crash. The pngmem.c implementation of png_malloc() included a cast
-+ to png_size_t which would fail on large allocations on 16-bit systems.
-+ Fix for the preprocessor of the Intel C compiler. The preprocessor
-+ splits adjacent @ signs with a space; this changes the concatentation
-+ token from @-@-@ to PNG_JOIN; that should work with all compiler
-+ preprocessors.
-+ Paeth filter speed improvements from work by Siarhei Siamashka. This
-+ changes the 'Paeth' reconstruction function to improve the GCC code
-+ generation on x86. The changes are only part of the suggested ones;
-+ just the changes that definitely improve speed and remain simple.
-+ The changes also slightly increase the clarity of the code.
-+
-+Version 1.5.7beta02 [November 11, 2011]
-+ Check compression_type parameter in png_get_iCCP and remove spurious
-+ casts. The compression_type parameter is always assigned to, so must
-+ be non-NULL. The cast of the profile length potentially truncated the
-+ value unnecessarily on a 16-bit int system, so the cast of the (byte)
-+ compression type to (int) is specified by ANSI-C anyway.
-+ Fixed FP division by zero in pngvalid.c; the 'test_pixel' code left
-+ the sBIT fields in the test pixel as 0, which resulted in a floating
-+ point division by zero which was irrelevant but causes systems where
-+ FP exceptions cause a crash. Added code to pngvalid to turn on FP
-+ exceptions if the appropriate glibc support is there to ensure this is
-+ tested in the future.
-+ Updated scripts/pnglibconf.mak and scripts/makefile.std to handle the
-+ new PNG_JOIN macro.
-+ Added versioning to pnglibconf.h comments.
-+ Simplified read/write API initial version; basic read/write tested on
-+ a variety of images, limited documentation (in the header file.)
-+ Installed more accurate linear to sRGB conversion tables. The slightly
-+ modified tables reduce the number of 16-bit values that
-+ convert to an off-by-one 8-bit value. The "makesRGB.c" code that was used
-+ to generate the tables is now in a contrib/sRGBtables sub-directory.
-+
-+Version 1.5.7beta03 [November 17, 2011]
-+ Removed PNG_CONST from the sRGB table declarations in pngpriv.h and png.c
-+ Added run-time detection of NEON support.
-+ Added contrib/libtests; includes simplified API test and timing test and
-+ a color conversion utility for rapid checking of failed 'pngstest' results.
-+ Multiple transform bug fixes plus a work-round for double gamma correction.
-+ libpng does not support more than one transform that requires linear data
-+ at once - if this is tried typically the results is double gamma
-+ correction. Since the simplified APIs can need rgb to gray combined with
-+ a compose operation it is necessary to do one of these outside the main
-+ libpng transform code. This check-in also contains fixes to various bugs
-+ in the simplified APIs themselves and to some bugs in compose and rgb to
-+ gray (on palette) itself.
-+ Fixes for C++ compilation using g++ When libpng source is compiled
-+ using g++. The compiler imposes C++ rules on the C source; thus it
-+ is desireable to make the source work with either C or C++ rules
-+ without throwing away useful error information. This change adds
-+ png_voidcast to allow C semantic (void*) cases or the corresponding
-+ C++ static_cast operation, as appropriate.
-+ Added --noexecstack to assembler file compilation. GCC does not set
-+ this on assembler compilation, even though it does on C compilation.
-+ This creates security issues if assembler code is enabled; the
-+ work-around is to set it by default in the flags for $(CCAS)
-+ Work around compilers that don't support declaration of const data. Some
-+ compilers fault 'extern const' data declarations (because the data is
-+ not initialized); this turns on const-ness only for compilers where
-+ this is known to work.
-+
-+Version 1.5.7beta04 [November 17, 2011]
-+ Since the gcc driver does not recognize the --noexecstack flag, we must
-+ use the -Wa prefix to have it passed through to the assembler.
-+ Also removed a duplicate setting of this flag.
-+ Added files that were omitted from the libpng-1.5.7beta03 zip distribution.
-+
-+Version 1.5.7beta05 [November 25, 2011]
-+ Removed "zTXt" from warning in generic chunk decompression function.
-+ Validate time settings passed to pngset() and png_convert_to_rfc1123()
-+ (Frank Busse).
-+ Added MINGW support to CMakeLists.txt
-+ Reject invalid compression flag or method when reading the iTXt chunk.
-+ Backed out 'simplified' API changes. The API seems too complex and there
-+ is a lack of consensus or enthusiasm for the proposals. The API also
-+ reveals significant bugs inside libpng (double gamma correction and the
-+ known bug of being unable to retrieve a corrected palette). It seems
-+ better to wait until the bugs, at least, are corrected.
-+ Moved pngvalid.c into contrib/libtests
-+ Rebuilt Makefile.in, configure, etc., with autoconf-2.68
-+
-+Version 1.5.7rc01 [December 1, 2011]
-+ Replaced an "#if" with "#ifdef" in pngrtran.c
-+ Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
-+
-+Version 1.5.7rc02 [December 5, 2011]
-+ Revised project files and contrib/pngvalid/pngvalid.c to account for
-+ the relocation of pngvalid into contrib/libtests.
-+ Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
-+ as in libpng-1.5.4.
-+ Put CRLF line endings in the owatcom project files.
-+
-+Version 1.5.7rc03 [December 7, 2011]
-+ Updated CMakeLists.txt to account for the relocation of pngvalid.c
-+
-+Version 1.5.7 [December 15, 2011]
-+ Minor fixes to pngvalid.c for gcc 4.6.2 compatibility to remove warnings
-+ reported by earlier versions.
-+ Fixed minor memset/sizeof errors in pngvalid.c.
-+
-+Version 1.6.0beta01 [December 15, 2011]
-+ Removed machine-generated configure files from the GIT repository (they will
-+ continue to appear in the tarball distributions and in the libpng15 and
-+ earlier GIT branches).
-+ Restored the new 'simplified' API, which was started in libpng-1.5.7beta02
-+ but later deleted from libpng-1.5.7beta05.
-+ Added example programs for the new 'simplified' API.
-+ Added ANSI-C (C90) headers and require them, and take advantage of the
-+ change. Also fixed some of the projects/* and contrib/* files that needed
-+ updates for libpng16 and the move of pngvalid.c.
-+ With this change the required ANSI-C header files are assumed to exist: the
-+ implementation must provide float.h, limits.h, stdarg.h and stddef.h and
-+ libpng relies on limits.h and stddef.h existing and behaving as defined
-+ (the other two required headers aren't used). Non-ANSI systems that don't
-+ have stddef.h or limits.h will have to provide an appropriate fake
-+ containing the relevant types and #defines.
-+ The use of FAR/far has been eliminated and the definition of png_alloc_size_t
-+ is now controlled by a flag so that 'small size_t' systems can select it
-+ if necessary. Libpng 1.6 may not currently work on such systems -- it
-+ seems likely that it will ask 'malloc' for more than 65535 bytes with any
-+ image that has a sufficiently large row size (rather than simply failing
-+ to read such images).
-+ New tools directory containing tools used to generate libpng code.
-+ Fixed race conditions in parallel make builds. With higher degrees of
-+ parallelism during 'make' the use of the same temporary file names such
-+ as 'dfn*' can result in a race where a temporary file from one arm of the
-+ build is deleted or overwritten in another arm. This changes the
-+ temporary files for suffix rules to always use $* and ensures that the
-+ non-suffix rules use unique file names.
-+
-+Version 1.6.0beta02 [December 21, 2011]
-+ Correct configure builds where build and source directories are separate.
-+ The include path of 'config.h' was erroneously made relative in pngvalid.c
-+ in libpng 1.5.7.
-+
-+Version 1.6.0beta03 [December 22, 2011]
-+ Start-up code size improvements, error handler flexibility. These changes
-+ alter how the tricky allocation of the initial png_struct and png_info
-+ structures are handled. png_info is now handled in pretty much the same
-+ way as everything else, except that the allocations handle NULL return
-+ silently. png_struct is changed in a similar way on allocation and on
-+ deallocation a 'safety' error handler is put in place (which should never
-+ be required). The error handler itself is changed to permit mismatches
-+ in the application and libpng error buffer size; however, this means a
-+ silent change to the API to return the jmp_buf if the size doesn't match
-+ the size from the libpng compilation; libpng now allocates the memory and
-+ this may fail. Overall these changes result in slight code size
-+ reductions; however, this is a reduction in code that is always executed
-+ so is particularly valuable. Overall on a 64-bit system the libpng DLL
-+ decreases in code size by 1733 bytes. pngerror.o increases in size by
-+ about 465 bytes because of the new functionality.
-+ Added png_convert_to_rfc1123_buffer() and deprecated png_convert_to_rfc1123()
-+ to avoid including a spurious buffer in the png_struct.
-+
-+Version 1.6.0beta04 [December 30, 2011]
-+ Regenerated configure scripts with automake-1.11.2
-+ Eliminated png_info_destroy(). It is now used only in png.c and only calls
-+ one other internal function and memset().
-+ Enabled png_get_sCAL_fixed() if floating point APIs are enabled. Previously
-+ it was disabled whenever internal fixed point arithmetic was selected,
-+ which meant it didn't exist even on systems where FP was available but not
-+ preferred.
-+ Added pngvalid.c compile time checks for const APIs.
-+ Implemented 'restrict' for png_info and png_struct. Because of the way
-+ libpng works both png_info and png_struct are always accessed via a
-+ single pointer. This means adding C99 'restrict' to the pointer gives
-+ the compiler some opportunity to optimize the code. This change allows
-+ that.
-+ Moved AC_MSG_CHECKING([if libraries can be versioned]) later to the proper
-+ location in configure.ac (Gilles Espinasse).
-+ Changed png_memcpy to C assignment where appropriate. Changed all those
-+ uses of png_memcpy that were doing a simple assignment to assignments
-+ (all those cases where the thing being copied is a non-array C L-value).
-+ Added some error checking to png_set_*() routines.
-+ Removed the reference to the non-exported function png_memcpy() from
-+ example.c.
-+ Fixed the Visual C 64-bit build - it requires jmp_buf to be aligned, but
-+ it had become misaligned.
-+ Revised contrib/pngminus/pnm2png.c to avoid warnings when png_uint_32
-+ and unsigned long are of different sizes.
-+
-+Version 1.6.0beta05 [January 15, 2012]
-+ Updated manual with description of the simplified API (copied from png.h)
-+ Fix bug in pngerror.c: some long warnings were being improperly truncated
-+ (CVE-2011-3464, bug introduced in libpng-1.5.3beta05).
-+
-+Version 1.6.0beta06 [January 24, 2012]
-+ Added palette support to the simplified APIs. This commit
-+ changes some of the macro definitions in png.h, app code
-+ may need corresponding changes.
-+ Increased the formatted warning buffer to 192 bytes.
-+ Added color-map support to simplified API. This is an initial version for
-+ review; the documentation has not yet been updated.
-+ Fixed Min/GW uninstall to remove libpng.dll.a
-+
-+Version 1.6.0beta07 [January 28, 2012]
-+ Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived)
-+ compiler issues slightly different warnings from those issued by the
-+ current vesions of GCC. This eliminates those warnings by
-+ adding/removing casts and small code rewrites.
-+ Updated configure.ac from autoupdate: added --enable-werror option.
-+ Also some layout regularization and removal of introduced tab characters
-+ (replaced with 3-character indentation). Obsolete macros identified by
-+ autoupdate have been removed; the replacements are all in 2.59 so
-+ the pre-req hasn't been changed. --enable-werror checks for support
-+ for -Werror (or the given argument) in the compiler. This mimics the
-+ gcc configure option by allowing -Werror to be turned on safely; without
-+ the option the tests written in configure itself fail compilation because
-+ they cause compiler warnings.
-+ Rewrote autogen.sh to run autoreconf instead of running tools one-by-one.
-+ Conditionalize the install rules for MINGW and CYGWIN in CMakeLists.txt and
-+ set CMAKE_LIBRARY_OUTPUT_DIRECTORY to "lib" on all platforms (C. Yapp).
-+ Freeze libtool files in the 'scripts' directory. This version of autogen.sh
-+ attempts to dissuade people from running it when it is not, or should not,
-+ be necessary. In fact, autogen.sh does not work when run in a libpng
-+ directory extracted from a tar distribution anymore. You must run it in
-+ a GIT clone instead.
-+ Added two images to contrib/pngsuite (1-bit and 2-bit transparent grayscale),
-+ and renamed three whose names were inconsistent with those in
-+ pngsuite/README.txt.
-+
-+Version 1.6.0beta08 [February 1, 2012]
-+ Fixed Image::colormap misalignment in pngstest.c
-+ Check libtool/libtoolize version number (2.4.2) in configure.ac
-+ Divide test-pngstest.sh into separate pngstest runs for basic and
-+ transparent images.
-+ Moved automake options to AM_INIT_AUTOMAKE in configure.ac
-+ Added color-tests, silent-rules (Not yet implemented in Makefile.am) and
-+ version checking to configure.ac
-+ Improved pngstest speed by not doing redundant tests and add const to
-+ the background parameter of png_image_finish_read. The --background
-+ option is now done automagically only when required, so that commandline
-+ option no longer exists.
-+ Cleaned up pngpriv.h to consistently declare all functions and data.
-+ Also eliminated PNG_CONST_DATA, which is apparently not needed but we
-+ can't be sure until it is gone.
-+ Added symbol prefixing that allows all the libpng external symbols
-+ to be prefixed (suggested by Reuben Hawkins).
-+ Updated "ftbb*.png" list in the owatcom and vstudio projects.
-+ Fixed 'prefix' builds on clean systems. The generation of pngprefix.h
-+ should not require itself.
-+ Updated INSTALL to explain that autogen.sh must be run in a GIT clone,
-+ not in a libpng directory extracted from a tar distribution.
-+
-+Version 1.6.0beta09 [February 1, 2012]
-+ Reverted the prebuilt configure files to libpng-1.6.0beta05 condition.
-+
-+Version 1.6.0beta10 [February 3, 2012]
-+ Added Z_SOLO for zlib-1.2.6+ and correct pngstest tests
-+ Updated list of test images in CMakeLists.txt
-+ Updated the prebuilt configure files to current condition.
-+ Revised INSTALL information about autogen.sh; it works in tar distributions.
-+
-+Version 1.6.0beta11 [February 16, 2012]
-+ Fix character count in pngstest command in projects/owatcom/pngstest.tgt
-+ Revised test-pngstest.sh to report PASS/FAIL for each image.
-+ Updated documentation about the simplified API.
-+ Corrected estimate of error in libpng png_set_rgb_to_gray API. The API is
-+ extremely inaccurate for sRGB conversions because it uses an 8-bit
-+ intermediate linear value and it does not use the sRGB transform, so it
-+ suffers from the known instability in gamma transforms for values close
-+ to 0 (see Poynton). The net result is that the calculation has a maximum
-+ error of 14.99/255; 0.5/255^(1/2.2). pngstest now uses 15 for the
-+ permitted 8-bit error. This may still not be enough because of arithmetic
-+ error.
-+ Removed some unused arrays (with #ifdef) from png_read_push_finish_row().
-+ Fixed a memory overwrite bug in simplified read of RGB PNG with
-+ non-linear gamma Also bugs in the error checking in pngread.c and changed
-+ quite a lot of the checks in pngstest.c to be correct; either correctly
-+ written or not over-optimistic. The pngstest changes are insufficient to
-+ allow all possible RGB transforms to be passed; pngstest cmppixel needs
-+ to be rewritten to make it clearer which errors it allows and then changed
-+ to permit known inaccuracies.
-+ Removed tests for no-longer-used *_EMPTY_PLTE_SUPPORTED from pngstruct.h
-+ Fixed fixed/float API export conditionals. 1) If FIXED_POINT or
-+ FLOATING_POINT options were switched off, png.h ended up with lone ';'
-+ characters. This is not valid ANSI-C outside a function. The ';'
-+ characters have been moved inside the definition of PNG_FP_EXPORT and
-+ PNG_FIXED_EXPORT. 2) If either option was switched off, the declaration
-+ of the corresponding functions were completely omitted, even though some
-+ of them are still used internally. The result is still valid, but
-+ produces warnings from gcc with some warning options (including -Wall). The
-+ fix is to cause png.h to declare the functions with PNG_INTERNAL_FUNCTION
-+ when png.h is included from pngpriv.h.
-+ Check for invalid palette index while reading paletted PNG. When one is
-+ found, issue a warning and increase png_ptr->num_palette accordingly.
-+ Apps are responsible for checking to see if that happened.
-+
-+Version 1.6.0beta12 [February 18, 2012]
-+ Do not increase num_palette on invalid_index.
-+ Relocated check for invalid palette index to pngrtran.c, after unpacking
-+ the sub-8-bit pixels.
-+ Fixed CVE-2011-3026 buffer overrun bug. This bug was introduced when
-+ iCCP chunk support was added at libpng-1.0.6. Deal more correctly with the
-+ test on iCCP chunk length. Also removed spurious casts that may hide
-+ problems on 16-bit systems.
-+
-+Version 1.6.0beta13 [February 24, 2012]
-+ Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from
-+ pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;
-+ now that png_ptr->buffer is inaccessible to applications, the special
-+ handling is no longer useful.
-+ Added PNG_SAFE_LIMITS feature to pnglibconf.dfa, pngpriv.h, and new
-+ pngusr.dfa to reset the user limits to safe ones if PNG_SAFE_LIMITS is
-+ defined. To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED=1" on the
-+ configure command or put #define PNG_SAFE_LIMITS_SUPPORTED in
-+ pnglibconf.h.prebuilt and pnglibconf.h.
-+
-+Version 1.6.0beta14 [February 27, 2012]
-+ Added information about the new limits in the manual.
-+ Updated Makefile.in
-+
-+Version 1.6.0beta15 [March 2, 2012]
-+ Removed unused "current_text" members of png_struct and the png_free()
-+ of png_ptr->current_text from pngread.c
-+ Rewrote pngstest.c for substantial speed improvement.
-+ Fixed transparent pixel and 16-bit rgb tests in pngstest and removed a
-+ spurious check in pngwrite.c
-+ Added PNG_IMAGE_FLAG_FAST for the benefit of applications that store
-+ intermediate files, or intermediate in-memory data, while processing
-+ image data with the simplified API. The option makes the files larger
-+ but faster to write and read. pngstest now uses this by default; this
-+ can be disabled with the --slow option.
-+ Improved pngstest fine tuning of error numbers, new test file generator.
-+ The generator generates images that test the full range of sample values,
-+ allow the error numbers in pngstest to be tuned and checked. makepng
-+ also allows generation of images with extra chunks, although this is
-+ still work-in-progress.
-+ Added check for invalid palette index while reading.
-+ Fixed some bugs in ICC profile writing. The code should now accept
-+ all potentially valid ICC profiles and reject obviously invalid ones.
-+ It now uses png_error() to do so rather than casually writing a PNG
-+ without the necessary color data.
-+ Removed whitespace from the end of lines in all source files and scripts.
-+
-+Version 1.6.0beta16 [March 6, 2012]
-+ Relocated palette-index checking function from pngrutil.c to pngtrans.c
-+ Added palette-index checking while writing.
-+ Changed png_inflate() and calling routines to avoid overflow problems.
-+ This is an intermediate check-in that solves the immediate problems and
-+ introduces one performance improvement (avoiding a copy via png_ptr->zbuf.)
-+ Further changes will be made to make ICC profile handling more secure.
-+ Fixed build warnings (MSVC, GCC, GCC v3). Cygwin GCC with default options
-+ declares 'index' as a global, causing a warning if it is used as a local
-+ variable. GCC 64-bit warns about assigning a (size_t) (unsigned 64-bit)
-+ to an (int) (signed 32-bit). MSVC, however, warns about using the
-+ unary '-' operator on an unsigned value (even though it is well defined
-+ by ANSI-C to be ~x+1). The padding calculation was changed to use a
-+ different method. Removed the tests on png_ptr->pass.
-+ Added contrib/libtests/tarith.c to test internal arithmetic functions from
-+ png.c. This is a libpng maintainer program used to validate changes to the
-+ internal arithmetic functions.
-+ Made read 'inflate' handling like write 'deflate' handling. The read
-+ code now claims and releases png_ptr->zstream, like the write code.
-+ The bug whereby the progressive reader failed to release the zstream
-+ is now fixed, all initialization is delayed, and the code checks for
-+ changed parameters on deflate rather than always calling
-+ deflatedEnd/deflateInit.
-+ Validate the zTXt strings in pngvalid.
-+ Added code to validate the windowBits value passed to deflateInit2().
-+ If the call to deflateInit2() is wrong a png_warning will be issued
-+ (in fact this is harmless, but the PNG data produced may be sub-optimal).
-+
-+Version 1.6.0beta17 [March 10, 2012]
-+ Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
-+ Reject all iCCP chunks after the first, even if the first one is invalid.
-+ Deflate/inflate was reworked to move common zlib calls into single
-+ functions [rw]util.c. A new shared keyword check routine was also added
-+ and the 'zbuf' is no longer allocated on progressive read. It is now
-+ possible to call png_inflate() incrementally. A warning is no longer
-+ issued if the language tag or translated keyword in the iTXt chunk
-+ has zero length.
-+ If benign errors are disabled use maximum window on ancilliary inflate.
-+ This works round a bug introduced in 1.5.4 where compressed ancillary
-+ chunks could end up with a too-small windowBits value in the deflate
-+ header.
-+
-+Version 1.6.0beta18 [March 16, 2012]
-+ Issue a png_benign_error() instead of png_warning() about bad palette index.
-+ In pngtest, treat benign errors as errors if "-strict" is present.
-+ Fixed an off-by-one error in the palette index checking function.
-+ Fixed a compiler warning under Cygwin (Windows-7, 32-bit system)
-+ Revised example.c to put text strings in a temporary character array
-+ instead of directly assigning string constants to png_textp members.
-+ This avoids compiler warnings when -Wwrite-strings is enabled.
-+ Added output flushing to aid debugging under Visual Studio. Unfortunately
-+ this is necessary because the VS2010 output window otherwise simply loses
-+ the error messages on error (they weren't flushed to the window before
-+ the process exited, apparently!)
-+ Added configuration support for benign errors and changed the read
-+ default. Also changed some warnings in the iCCP and sRGB handling
-+ from to benign errors. Configuration now makes read benign
-+ errors warnings and write benign errors to errors by default (thus
-+ changing the behavior on read). The simplified API always forces
-+ read benign errors to warnings (regardless of the system default, unless
-+ this is disabled in which case the simplified API can't be built.)
-+
-+Version 1.6.0beta19 [March 18, 2012]
-+ Work around for duplicate row start calls; added warning messages.
-+ This turns on PNG_FLAG_DETECT_UNINITIALIZED to detect app code that
-+ fails to call one of the 'start' routines (not enabled in libpng-1.5
-+ because it is technically an API change, since it did normally work
-+ before.) It also makes duplicate calls to png_read_start_row (an
-+ internal function called at the start of the image read) benign, as
-+ they were before changes to use png_inflate_claim. Somehow webkit is
-+ causing this to happen; this is probably a mis-feature in the zlib
-+ changes so this commit is only a work-round.
-+ Removed erroneous setting of DETECT_UNINITIALIZED and added more
-+ checks. The code now does a png_error if an attempt is made to do the
-+ row initialization twice; this is an application error and it has
-+ serious consequences because the transform data in png_struct is
-+ changed by each call.
-+ Added application error reporting and added chunk names to read
-+ benign errors; also added --strict to pngstest - not enabled
-+ yet because a warning is produced.
-+ Avoid the double gamma correction warning in the simplified API.
-+ This allows the --strict option to pass in the pngstest checks
-+
-+Version 1.6.0beta20 [March 29, 2012]
-+ Changed chunk handler warnings into benign errors, incrementally load iCCP
-+ Added checksum-icc.c to contrib/tools
-+ Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.
-+ Recognize known sRGB ICC profiles while reading; prefer writing the
-+ iCCP profile over writing the sRGB chunk, controlled by the
-+ PNG_sRGB_PROFILE_CHECKS option.
-+ Revised png_set_text_2() to avoid potential memory corruption (fixes
-+ CVE-2011-3048, also known as CVE-2012-3425).
-+
-+Version 1.6.0beta21 [April 27, 2012]
-+ Revised scripts/makefile.darwin: use system zlib; remove quotes around
-+ architecture list; add missing ppc architecture; add architecture options
-+ to shared library link; don't try to create a shared lib based on missing
-+ RELEASE variable.
-+ Enable png_set_check_for_invalid_index() for both read and write.
-+ Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
-+ declaration of png_handle_unknown().
-+ Added -lssp_nonshared in a comment in scripts/makefile.freebsd
-+ and changed deprecated NOOBJ and NOPROFILE to NO_OBJ and NO_PROFILE.
-+
-+Version 1.6.0beta22 [May 23, 2012]
-+ Removed need for -Wno-cast-align with clang. clang correctly warns on
-+ alignment increasing pointer casts when -Wcast-align is passed. This
-+ fixes the cases that clang warns about either by eliminating the
-+ casts from png_bytep to png_uint_16p (pngread.c), or, for pngrutil.c
-+ where the cast is previously verified or pngstest.c where it is OK, by
-+ introducing new png_aligncast macros to do the cast in a way that clang
-+ accepts.
-+
-+Version 1.6.0beta23 [June 6, 2012]
-+ Revised CMakeLists.txt to not attempt to make a symlink under mingw.
-+ Made fixes for new optimization warnings from gcc 4.7.0. The compiler
-+ performs an optimization which is safe; however it then warns about it.
-+ Changing the type of 'palette_number' in pngvalid.c removes the warning.
-+ Do not depend upon a GCC feature macro being available for use in generating
-+ the linker mapfile symbol prefix.
-+ Improved performance of new do_check_palette_indexes() function (only
-+ update the value when it actually increases, move test for whether
-+ the check is wanted out of the function.
-+
-+Version 1.6.0beta24 [June 7, 2012]
-+ Don't check palette indexes if num_palette is 0 (as it can be in MNG files).
-+
-+Version 1.6.0beta25 [June 16, 2012]
-+ Revised png_set_keep_unknown_chunks() so num_chunks < 0 means ignore all
-+ unknown chunks and all known chunks except for IHDR, PLTE, tRNS, IDAT,
-+ and IEND. Previously it only meant ignore all unknown chunks, the
-+ same as num_chunks == 0. Revised png_image_skip_unused_chunks() to
-+ provide a list of chunks to be processed instead of a list of chunks to
-+ ignore. Revised contrib/gregbook/readpng2.c accordingly.
-+
-+Version 1.6.0beta26 [July 10, 2012]
-+ Removed scripts/makefile.cegcc from the *.zip and *.7z distributions; it
-+ depends on configure, which is not included in those archives.
-+ Moved scripts/chkfmt to contrib/tools.
-+ Changed "a+w" to "u+w" in Makefile.in to fix CVE-2012-3386.
-+
-+Version 1.6.0beta27 [August 11, 2012]
-+ Do not compile PNG_DEPRECATED, PNG_ALLOC and PNG_PRIVATE when __GNUC__ < 3.
-+ Do not use __restrict when GNUC is <= 3.1
-+ Removed references to png_zalloc() and png_zfree() from the manual.
-+ Fixed configurations where floating point is completely disabled. Because
-+ of the changes to support symbol prefixing PNG_INTERNAL_FUNCTION declares
-+ floating point APIs during libpng builds even if they are completely
-+ disabled. This requires the png floating point types (png_double*) to be
-+ declared even though the functions are never actually defined. This
-+ change provides a dummy definition so that the declarations work, yet any
-+ implementation will fail to compile because of an incomplete type.
-+ Re-eliminated the use of strcpy() in pngtest.c. An unncessary use of
-+ strcpy() was accidentally re-introduced in libpng16; this change replaces
-+ it with strncpy().
-+ Eliminated use of png_sizeof(); use sizeof() instead.
-+ Use a consistent style for (sizeof type) and (sizeof (array))
-+ Cleanup of png_set_filler(). This function does very different things on
-+ read and write. In libpng 1.6 the two cases can be distinguished and
-+ considerable code cleanup, and extra error checking, is possible. This
-+ makes calls on the write side that have no effect be ignored with a
-+ png_app_error(), which can be disabled in the app using
-+ png_set_benign_errors(), and removes the spurious use of usr_channels
-+ on the read side.
-+ Insist on autotools 1.12.1 for git builds because there are security issues
-+ with 1.12 and insisting on anything less would allow 1.12 to be used.
-+ Removed info_ptr->signature[8] from WRITE-only builds.
-+ Add some conditions for compiling png_fixed(). This is a small function
-+ but it requires "-lm" on some platforms.
-+ Cause pngtest --strict to fail on any warning from libpng (not just errors)
-+ and cause it not to fail at the comparison step if libpng lacks support
-+ for writing chunks that it reads from the input (currently only implemented
-+ for compressed text chunks).
-+ Make all three "make check" test programs work without READ or WRITE support.
-+ Now "make check" will succeed even if libpng is compiled with -DPNG_NO_READ
-+ or -DPNG_NO_WRITE. The tests performed are reduced, but the basic reading
-+ and writing of a PNG file is always tested by one or more of the tests.
-+ Consistently use strlen(), memset(), memcpy(), and memcmp() instead of the
-+ png_strlen(), png_memset(), png_memcpy(), and png_memcmp() macros.
-+ Removed the png_sizeof(), png_strlen(), png_memset(), png_memcpy(), and
-+ png_memcmp() macros.
-+ Work around gcc 3.x and Microsoft Visual Studio 2010 complaints. Both object
-+ to the split initialization of num_chunks.
-+
-+Version 1.6.0beta28 [August 29, 2012]
-+ Unknown handling fixes and clean up. This adds more correct option
-+ control of the unknown handling, corrects the pre-existing bug where
-+ the per-chunk 'keep' setting is ignored and makes it possible to skip
-+ IDAT chunks in the sequential reader (broken in earlier 1.6 versions).
-+ There is a new test program, test-unknown.c, which is a work in progress
-+ (not currently part of the test suite). Comments in the header files now
-+ explain how the unknown handling works.
-+ Allow fine grain control of unknown chunk APIs. This change allows
-+ png_set_keep_unknown_chunks() to be turned off if not required and causes
-+ both read and write to behave appropriately (on read this is only possible
-+ if the user callback is used to handle unknown chunks). The change
-+ also removes the support for storing unknown chunks in the info_struct
-+ if the only unknown handling enabled is via the callback, allowing libpng
-+ to be configured with callback reading and none of the unnecessary code.
-+ Corrected fix for unknown handling in pngtest. This reinstates the
-+ libpng handling of unknown chunks other than vpAg and sTER (including
-+ unsafe-to-copy chunks which were dropped before) and eliminates the
-+ repositioning of vpAg and sTER in pngtest.png by changing pngtest.png
-+ (so the chunks are where libpng would put them).
-+ Added "tunknown" test and corrected a logic error in png_handle_unknown()
-+ when SAVE support is absent. Moved the shell test scripts for
-+ contrib/libtests from the libpng top directory to contrib/libtests.
-+ png_handle_unknown() must always read or skip the chunk, if
-+ SAVE_UNKNOWN_CHUNKS is turned off *and* the application does not set
-+ a user callback an unknown chunk will not be read, leading to a read
-+ error, which was revealed by the "tunknown" test.
-+ Cleaned up and corrected ICC profile handling.
-+ contrib/libtests/makepng: corrected 'rgb' and 'gray' cases. profile_error
-+ messages could be truncated; made a correct buffer size calculation and
-+ adjusted pngerror.c appropriately. png_icc_check_* checking improved;
-+ changed the functions to receive the correct color type of the PNG on read
-+ or write and check that it matches the color space of the profile (despite
-+ what the comments said before, there is danger in assuming the app will
-+ cope correctly with an RGB profile on a grayscale image and, since it
-+ violates the PNG spec, allowing it is certain to produce inconsistent
-+ app behavior and might even cause app crashes.) Check that profiles
-+ contain the tags needed to process the PNG (tags all required by the ICC
-+ spec). Removed unused PNG_STATIC from pngpriv.h.
-+
-+Version 1.6.0beta29 [September 4, 2012]
-+ Fixed the simplified API example programs to add the *colormap parameter
-+ to several of he API and improved the error message if the version field
-+ is not set.
-+ Added contrib/examples/* to the *.zip and *.7z distributions.
-+ Updated simplified API synopses and description of the png_image structure
-+ in the manual.
-+ Made makepng and pngtest produce identical PNGs, add "--relaxed" option
-+ to pngtest. The "--relaxed" option turns off the benign errors that are
-+ enabled by default in pre-RC builds. makepng can now write ICC profiles
-+ where the length has not been extended to a multiple of 4, and pngtest
-+ now intercepts all libpng errors, allowing the previously-introduced
-+ "--strict test" on no warnings to actually work.
-+ Improved ICC profile handling including cHRM chunk generation and fixed
-+ Cygwin+MSVC build errors. The ICC profile handling now includes more
-+ checking. Several errors that caused rejection of the profile are now
-+ handled with a warning in such a way that the invalid profiles will be
-+ read by default in release (but not pre-RC) builds but will not be
-+ written by default. The easy part of handling the cHRM chunk is written,
-+ where the ICC profile contains the required data. The more difficult
-+ part plus guessing a gAMA value requires code to pass selected RGB values
-+ through the profile.
-+
-+Version 1.6.0beta30 [October 24, 2012]
-+ Changed ICC profile matrix/vector types to not depend on array type rules.
-+ By the ANSI-C standard the new types should be identical to the previous
-+ versions, and all known versions of gcc tested with the previous versions
-+ except for GCC-4.2.1 work with this version. The change makes the ANSI-C
-+ rule that const applied to an array of elements applies instead to the
-+ elements in the array moot by explicitly applying const to the base
-+ elements of the png_icc_matrix and png_icc_vector types. The accidental
-+ (harmless) 'const' previously applied to the parameters of two of the
-+ functions have also been removed.
-+ Added a work around for GCC 4.2 optimization bug.
-+ Marked the broken (bad white point) original HP sRGB profiles correctly and
-+ correct comments.
-+ Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7
-+ Use /MDd for vstudio debug builds. Also added pngunkown to the vstudio
-+ builds, fixed build errors and corrected a minor exit code error in
-+ pngvalid if the 'touch' file name is invalid.
-+ Add updated WARNING file to projects/vstudio from libpng 1.5/vstudio
-+ Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
-+ pngrtran.c (Domani Hannes).
-+
-+Version 1.6.0beta31 [November 1, 2012]
-+ Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30.
-+ Made pngvalid so that it will build outside the libpng source tree.
-+ Made builds -DPNG_NO_READ_GAMMA compile (the unit tests still fail).
-+ Made PNG_NO_READ_GAMMA switch off interfaces that depend on READ_GAMMA.
-+ Prior to 1.6.0 switching off READ_GAMMA did unpredictable things to the
-+ interfaces that use it (specifically, png_do_background in 1.4 would
-+ simply display composite for grayscale images but do composition
-+ with the incorrect arithmetic for color ones). In 1.6 the semantic
-+ of -DPNG_NO_READ_GAMMA is changed to simply disable any interface that
-+ depends on it; this obliges people who set it to consider whether they
-+ really want it off if they happen to use any of the interfaces in
-+ question (typically most users who disable it won't).
-+ Fixed GUIDs in projects/vstudio. Some were duplicated or missing,
-+ resulting in VS2010 having to update the files.
-+ Removed non-working ICC profile support code that was mostly added to
-+ libpng-1.6.0beta29 and beta30. There was too much code for too little
-+ gain; implementing full ICC color correction may be desireable but is left
-+ up to applications.
-+
-+Version 1.6.0beta32 [November 25, 2012]
-+ Fixed an intermittent SEGV in pngstest due to an uninitialized array element.
-+ Added the ability for contrib/libtests/makepng.c to make a PNG with just one
-+ color. This is useful for debugging pngstest color inaccuracy reports.
-+ Fixed error checking in the simplified write API (Olaf van der Spek)
-+ Made png_user_version_check() ok to use with libpng version 1.10.x and later.
-+
-+Version 1.6.0beta33 [December 15, 2012]
-+ Fixed typo in png.c (PNG_SET_CHUNK_MALLOC_MAX should be PNG_CHUNK_MALLOC_MAX)
-+ that causes the MALLOC_MAX limit not to work (John Bowler)
-+ Change png_warning() to png_app_error() in pngwrite.c and comment the
-+ fall-through condition.
-+ Change png_warning() to png_app_warning() in png_write_tRNS().
-+ Rearranged the ARM-NEON optimizations: Isolated the machine specific code
-+ to the hardware subdirectory and added comments to pngrutil.c so that
-+ implementors of other optimizations know what to do.
-+ Fixed cases of unquoted DESTDIR in Makefile.am
-+ Rebuilt Makefile.in, etc., with autoconf-2.69 and automake-1.12.5.
-+
-+Version 1.6.0beta34 [December 19, 2012]
-+ Cleaned up whitespace in the synopsis portion of the manpage "libpng.3"
-+ Disassembled the version number in scripts/options.awk (necessary for
-+ building on SunOs).
-+
-+Version 1.6.0beta35 [December 23, 2012]
-+ Made default Zlib compression settings be configurable. This adds #defines to
-+ pnglibconf.h to control the defaults.
-+ Fixed Windows build issues, enabled ARM compilation. Various warnings issued
-+ by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old
-+ GCCs.) ARM support is enabled by default in zlib.props (unsupported by
-+ Microsoft) and ARM compilation is made possible by deleting the check for
-+ x86. The test programs cannot be run because they are not signed.
-+
-+Version 1.6.0beta36 [January 2, 2013]
-+ Discontinued distributing libpng-1.x.x.tar.bz2.
-+ Discontinued distributing libpng-1.7.0-1.6.0-diff.txt and similar.
-+ Rebuilt configure with autoconf-2.69 (inadvertently not done in beta33)
-+ Fixed 'make distcheck' on SUN OS - libpng.so was not being removed
-+
-+Version 1.6.0beta37 [January 10, 2013]
-+ Fixed conceivable but difficult to repro overflow. Also added two test
-+ programs to generate and test a PNG which should have the problem.
-+
-+Version 1.6.0beta39 [January 19, 2013]
-+ Again corrected attempt at overflow detection in png_set_unknown_chunks()
-+ (CVE-2013-7353). Added overflow detection in png_set_sPLT() and
-+ png_set_text_2() (CVE-2013-7354).
-+
-+Version 1.6.0beta40 [January 20, 2013]
-+ Use consistent handling of overflows in text, sPLT and unknown png_set_* APIs
-+
-+Version 1.6.0rc01 [January 26, 2013]
-+ No changes.
-+
-+Version 1.6.0rc02 [February 4, 2013]
-+ Added png_get_palette_max() function.
-+
-+Version 1.6.0rc03 [February 5, 2013]
-+ Fixed the png_get_palette_max API.
-+
-+Version 1.6.0rc04 [February 7, 2013]
-+ Turn serial tests back on (recently turned off by autotools upgrade).
-+
-+Version 1.6.0rc05 [February 8, 2013]
-+ Update manual about png_get_palette_max().
-+
-+Version 1.6.0rc06 [February 9, 2013]
-+ Fixed missing dependency in --prefix builds The intermediate
-+ internal 'prefix.h' file can only be generated correctly after
-+ pnglibconf.h, however the dependency was not in Makefile.am. The
-+ symptoms are unpredictable depending on the order make chooses to
-+ build pngprefix.h and pnglibconf.h, often the error goes unnoticed
-+ because there is a system pnglibconf.h to use instead.
-+
-+Version 1.6.0rc07 [February 10, 2013]
-+ Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-+ block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly.
-+
-+Version 1.6.0rc08 [February 10, 2013]
-+ Fix typo in png.h #ifdef
-+
-+Version 1.6.0 [February 14, 2013]
-+ No changes.
-+
-+Version 1.6.1beta01 [February 16, 2013]
-+ Made symbol prefixing work with the ARM neon optimizations. Also allow
-+ pngpriv.h to be included for preprocessor definitions only, so it can
-+ be used in non-C/C++ files. Back ported from libpng 1.7.
-+ Made sRGB check numbers consistent.
-+ Ported libpng 1.5 options.awk/dfn file handling to 1.6, fixed one bug.
-+ Removed cc -E workround, corrected png_get_palette_max API Tested on
-+ SUN OS cc 5.9, which demonstrates the tokenization problem previously
-+ avoided by using /lib/cpp. Since all .dfn output is now protected in
-+ double quotes unless it is to be macro substituted the fix should
-+ work everywhere.
-+ Enabled parallel tests - back ported from libpng-1.7.
-+ scripts/pnglibconf.dfa formatting improvements back ported from libpng17.
-+ Fixed a race condition in the creation of the build 'scripts' directory
-+ while building with a parallel make.
-+ Use approved/supported Android method to check for NEON, use Linux/POSIX
-+ 1003.1 API to check /proc/self/auxv avoiding buffer allocation and other
-+ library calls (ported from libpng15).
-+
-+Version 1.6.1beta02 [February 19, 2013]
-+ Use parentheses more consistently in "#if defined(MACRO)" tests.
-+ Folded long lines.
-+ Reenabled code to allow zero length PLTE chunks for MNG.
-+
-+Version 1.6.1beta03 [February 22, 2013]
-+ Fixed ALIGNED_MEMORY support.
-+ Allow run-time ARM NEON checking to be disabled. A new configure option:
-+ --enable-arm-neon=always will stop the run-time checks. New checks
-+ within arm/arm_init.c will cause the code not to be compiled unless
-+ __ARM_NEON__ is set. This should make it fail safe (if someone asks
-+ for it on then the build will fail if it can't be done.)
-+ Updated the INSTALL document.
-+
-+Version 1.6.1beta04 [February 27, 2013]
-+ Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
-+ Revised scripts/makefile.freebsd to respect ZLIBLIB and ZLIBINC.
-+ Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble
-+ with CRLF line endings.
-+
-+Version 1.6.1beta05 [March 1, 2013]
-+ Avoid a possible memory leak in contrib/gregbook/readpng.c
-+
-+Version 1.6.1beta06 [March 4, 2013]
-+ Better documentation of unknown handling API interactions.
-+ Corrected Android builds and corrected libpng.vers with symbol
-+ prefixing. This adds an API to set optimization options externally,
-+ providing an alternative and general solution for the non-portable
-+ run-time tests used by the ARM Neon code. It also makes those tests
-+ compile and link on Android.
-+ The order of settings vs options in pnglibconf.h is reversed to allow
-+ settings to depend on options and options can now set (or override) the
-+ defaults for settings.
-+
-+Version 1.6.1beta07 [March 7, 2013]
-+ Corrected simplified API default gamma for color-mapped output, added
-+ a flag to change default. In 1.6.0 when the simplified API was used
-+ to produce color-mapped output from an input image with no gamma
-+ information the gamma assumed for the input could be different from
-+ that assumed for non-color-mapped output. In particular 16-bit depth
-+ input files were assumed to be sRGB encoded, whereas in the 'direct'
-+ case they were assumed to have linear data. This was an error. The
-+ fix makes the simplified API treat all input files the same way and
-+ adds a new flag to the png_image::flags member to allow the
-+ application/user to specify that 16-bit files contain sRGB data
-+ rather than the default linear.
-+ Fixed bugs in the pngpixel and makepng test programs.
-+
-+Version 1.6.1beta08 [March 7, 2013]
-+ Fixed CMakelists.txt to allow building a single variant of the library
-+ (Claudio Bley):
-+ Introduced a PNG_LIB_TARGETS variable that lists all activated library
-+ targets. It is an error if this variable ends up empty, ie. you have
-+ to build at least one library variant.
-+ Made the *_COPY targets only depend on library targets actually being build.
-+ Use PNG_LIB_TARGETS to unify a code path.
-+ Changed the CREATE_SYMLINK macro to expect the full path to a file as the
-+ first argument. When symlinking the filename component of that path is
-+ determined and used as the link target.
-+ Use copy_if_different in the CREATE_SYMLINK macro.
-+
-+Version 1.6.1beta09 [March 13, 2013]
-+ Eliminated two warnings from the Intel C compiler. The warnings are
-+ technically valid, although a reasonable treatment of division would
-+ show it to be incorrect.
-+
-+Version 1.6.1rc01 [March 21, 2013]
-+ No changes.
-+
-+Version 1.6.1 [March 28, 2013]
-+ No changes.
-+
-+Version 1.6.2beta01 [April 14, 2013]
-+ Updated documentation of 1.5.x to 1.6.x changes in iCCP chunk handling.
-+ Fixed incorrect warning of excess deflate data. End condition - the
-+ warning would be produced if the end of the deflate stream wasn't read
-+ in the last row. The warning is harmless.
-+ Corrected the test on user transform changes on read. It was in the
-+ png_set of the transform function, but that doesn't matter unless the
-+ transform function changes the rowbuf size, and that is only valid if
-+ transform_info is called.
-+ Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c
-+ (Flavio Medeiros).
-+ Corrected length written to uncompressed iTXt chunks (Samuli Suominen).
-+ Bug was introduced in libpng-1.6.0.
-+
-+Version 1.6.2rc01 [April 18, 2013]
-+ Added contrib/tools/fixitxt.c, to repair the erroneous iTXt chunk length
-+ written by libpng-1.6.0 and 1.6.1.
-+ Disallow storing sRGB information when the sRGB is not supported.
-+
-+Version 1.6.2rc02 [April 18, 2013]
-+ Merge pngtest.c with libpng-1.7.0
-+
-+Version 1.6.2rc03 [April 22, 2013]
-+ Trivial spelling cleanup.
-+
-+Version 1.6.2rc04 and 1.6.2rc05 [omitted]
-+
-+Version 1.6.2rc06 [April 24, 2013]
-+ Reverted to version 1.6.2rc03. Recent changes to arm/neon support
-+ have been ported to libpng-1.7.0beta09 and will reappear in version
-+ 1.6.3beta01.
-+
-+Version 1.6.2 [April 25, 2013]
-+ No changes.
-+
-+Version 1.6.3beta01 [April 25, 2013]
-+ Revised stack marking in arm/filter_neon.S and configure.ac.
-+ Ensure that NEON filter stuff is completely disabled when switched 'off'.
-+ Previously the ARM NEON specific files were still built if the option
-+ was switched 'off' as opposed to being explicitly disabled.
-+
-+Version 1.6.3beta02 [April 26, 2013]
-+ Test for 'arm*' not just 'arm' in the host_cpu configure variable.
-+ Rebuilt the configure scripts.
-+
-+Version 1.6.3beta03 [April 30, 2013]
-+ Expanded manual paragraph about writing private chunks, particularly
-+ the need to call png_set_keep_unknown_chunks() when writing them.
-+ Avoid dereferencing NULL pointer possibly returned from
-+ png_create_write_struct() (Andrew Church).
-+
-+Version 1.6.3beta05 [May 9, 2013]
-+ Calculate our own zlib windowBits when decoding rather than trusting the
-+ CMF bytes in the PNG datastream.
-+ Added an option to force maximum window size for inflating, which was
-+ the behavior of libpng15 and earlier.
-+ Added png-fix-itxt and png-fix-too-far-back to the built programs and
-+ removed warnings from the source code and timepng that are revealed as
-+ a result.
-+ Detect wrong libpng versions linked to png-fix-too-far-back, which currently
-+ only works with libpng versions that can be made to reliably fail when
-+ the deflate data contains an out-of-window reference. This means only
-+ 1.6 and later.
-+ Fixed gnu issues: g++ needs a static_cast, gcc 4.4.7 has a broken warning
-+ message which it is easier to work round than ignore.
-+ Updated contrib/pngminus/pnm2png.c (Paul Stewart):
-+ Check for EOF
-+ Ignore "#" delimited comments in input file to pnm2png.c.
-+ Fixed whitespace handling
-+ Added a call to png_set_packing()
-+ Initialize dimension values so if sscanf fails at least we have known
-+ invalid values.
-+ Attempt to detect configuration issues with png-fix-too-far-back, which
-+ requires both the correct libpng and the correct zlib to function
-+ correctly.
-+ Check ZLIB_VERNUM for mismatches, enclose #error in quotes
-+ Added information in the documentation about problems with and fixes for
-+ the bad CRC and bad iTXt chunk situations.
-+
-+Version 1.6.3beta06 [May 12, 2013]
-+ Allow contrib/pngminus/pnm2png.c to compile without WRITE_INVERT and
-+ WRITE_PACK supported (writes error message that it can't read P1 or
-+ P4 PBM files).
-+ Improved png-fix-too-far-back usage message, added --suffix option.
-+ Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the
-+ right zlib header files.
-+ Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile
-+
-+Version 1.6.3beta07 [June 8, 2013]
-+ Removed a redundant test in png_set_IHDR().
-+ Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt)
-+ Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt
-+ Enclose the prototypes for the simplified write API in
-+ #ifdef PNG_STDIO_SUPPORTED/#endif
-+ Make ARM NEON support work at compile time (not just configure time).
-+ This moves the test on __ARM_NEON__ into pngconf.h to avoid issues when
-+ using a compiler that compiles for multiple architectures at one time.
-+ Removed PNG_FILTER_OPTIMIZATIONS and PNG_ARM_NEON_SUPPORTED from
-+ pnglibconf.h, allowing more of the decisions to be made internally
-+ (pngpriv.h) during the compile. Without this, symbol prefixing is broken
-+ under certain circumstances on ARM platforms. Now only the API parts of
-+ the optimizations ('check' vs 'api') are exposed in the public header files
-+ except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the
-+ decision about whether or not to use the optimizations.
-+ Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.
-+ Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test
-+ on __ARM_NEON__ from configure time to compile time. This breaks symbol
-+ prefixing because the definition of the special png_init_filter_functions
-+ call was hidden at configure time if the relevant compiler arguments are
-+ passed in CFLAGS as opposed to CC. This change attempts to avoid all
-+ the confusion that would result by declaring the init function even when
-+ it is not used, so that it will always get prefixed.
-+
-+Version 1.6.3beta08 [June 18, 2013]
-+ Revised libpng.3 so that "doclifter" can process it.
-+
-+Version 1.6.3beta09 [June 27, 2013]
-+ Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
-+ as parameters for png_set_gamma(). These have been available since
-+ libpng-1.5.4.
-+ Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it
-+ to check all compressed chunks known to libpng.
-+
-+Version 1.6.3beta10 [July 5, 2013]
-+ Updated documentation to show default behavior of benign errors correctly.
-+ Only compile ARM code when PNG_READ_SUPPORTED is defined.
-+ Fixed undefined behavior in contrib/tools/pngfix.c and added new strip
-+ option. pngfix relied on undefined behavior and even a simple change from
-+ gcc to g++ caused it to fail. The new strip option 'unsafe' has been
-+ implemented and is the default if --max is given. Option names have
-+ been clarified, with --strip=transform now stripping the bKGD chunk,
-+ which was stripped previously with --strip=unused.
-+ Added all documented chunk types to pngpriv.h
-+ Unified pngfix.c source with libpng17.
-+
-+Version 1.6.3rc01 [July 11, 2013]
-+ No changes.
-+
-+Version 1.6.3 [July 18, 2013]
-+ Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.
-+ Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings
-+ may be erroneously issued by code-checking applications.
-+
-+Version 1.6.4beta01 [August 21, 2013]
-+ Added information about png_set_options() to the manual.
-+ Delay calling png_init_filter_functions() until a row with nonzero filter
-+ is found.
-+
-+Version 1.6.4beta02 [August 30, 2013]
-+ Fixed inconsistent conditional compilation of png_chunk_unknown_handling()
-+ prototype, definition, and usage. Made it depend on
-+ PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere.
-+
-+Version 1.6.4rc01 [September 5, 2013]
-+ No changes.
-+
-+Version 1.6.4 [September 12, 2013]
-+ No changes.
-+
-+Version 1.6.5 [September 14, 2013]
-+ Removed two stray lines of code from arm/arm_init.c.
-+
-+Version 1.6.6 [September 16, 2013]
-+ Removed two stray lines of code from arm/arm_init.c, again.
-+
-+Version 1.6.7beta01 [September 30, 2013]
-+ Revised unknown chunk code to correct several bugs in the NO_SAVE_/NO_WRITE
-+ combination
-+ Allow HANDLE_AS_UNKNOWN to work when other options are configured off. Also
-+ fixed the pngminim makefiles to work when $(MAKEFLAGS) contains stuff
-+ which terminates the make options (as by default in recent versions of
-+ Gentoo).
-+ Avoid up-cast warnings in pngvalid.c. On ARM the alignment requirements of
-+ png_modifier are greater than that of png_store and as a consequence
-+ compilation of pngvalid.c results in a warning about increased alignment
-+ requirements because of the bare cast to (png_modifier*). The code is safe,
-+ because the pointer is known to point to a stack allocated png_modifier,
-+ but this change avoids the warning.
-+ Fixed default behavior of ARM_NEON_API. If the ARM NEON API option was
-+ compiled without the CHECK option it defaulted to on, not off.
-+ Check user callback behavior in pngunknown.c. Previous versions compiled
-+ if SAVE_UNKNOWN was not available but did nothing since the callback
-+ was never implemented.
-+ Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes
-+
-+Version 1.6.7beta02 [October 12, 2013]
-+ Made changes for compatibility with automake 1.14:
-+ 1) Added the 'compile' program to the list of programs that must be cleaned
-+ in autogen.sh
-+ 2) Added 'subdir-objects' which causes .c files in sub-directories to be
-+ compiled such that the corresponding .o files are also in the
-+ sub-directory. This is because automake 1.14 warns that the
-+ current behavior of compiling to the top level directory may be removed
-+ in the future.
-+ 3) Updated dependencies on pnglibconf.h to match the new .o locations and
-+ added all the files in contrib/libtests and contrib/tools that depend
-+ on pnglibconf.h
-+ 4) Added 'BUILD_SOURCES = pnglibconf.h'; this is the automake recommended
-+ way of handling the dependencies of sources that are machine generated;
-+ unfortunately it only works if the user does 'make all' or 'make check',
-+ so the dependencies (3) are still required.
-+ Cleaned up (char*) casts of zlib messages. The latest version of the Intel C
-+ compiler complains about casting a string literal as (char*), so copied the
-+ treatment of z_const from the library code into pngfix.c
-+ Simplified error message code in pngunknown. The simplification has the
-+ useful side effect of avoiding a bogus warning generated by the latest
-+ version of the Intel C compiler (it objects to
-+ condition ? string-literal : string-literal).
-+ Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always
-+ removing the 1.14 'compile' script but never checking for it.
-+
-+Version 1.6.7beta03 [October 19, 2013]
-+ Added ARMv8 support (James Yu <james.yu at linaro.org>). Added file
-+ arm/filter_neon_intrinsics.c; enable with -mfpu=neon.
-+ Revised pngvalid to generate size images with as many filters as it can
-+ manage, limited by the number of rows.
-+ Cleaned up ARM NEON compilation handling. The tests are now in pngpriv.h
-+ and detect the broken GCC compilers.
-+
-+Version 1.6.7beta04 [October 26, 2013]
-+ Allow clang derived from older GCC versions to use ARM intrinsics. This
-+ causes all clang builds that use -mfpu=neon to use the intrinsics code,
-+ not the assembler code. This has only been tested on iOS 7. It may be
-+ necessary to exclude some earlier clang versions but this seems unlikely.
-+ Changed NEON implementation selection mechanism. This allows assembler
-+ or intrinsics to be turned on at compile time during the build by defining
-+ PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro
-+ is undefined by default and the build type is selected in pngpriv.h.
-+
-+Version 1.6.7rc01 [November 2, 2013]
-+ No changes.
-+
-+Version 1.6.7rc02 [November 7, 2013]
-+ Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char
-+ checking macros take an unsigned char argument, not a signed char.
-+
-+Version 1.6.7 [November 14, 2013]
-+ No changes.
-+
-+Version 1.6.8beta01 [November 24, 2013]
-+ Moved prototype for png_handle_unknown() in pngpriv.h outside of
-+ the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block.
-+ Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile
-+ Conditionally compile some unused functions reported by -Wall in
-+ pngminim.
-+ Fixed 'minimal' builds. Various obviously useful minimal configurations
-+ don't build because of missing contrib/libtests test programs and
-+ overly complex dependencies in scripts/pnglibconf.dfa. This change
-+ adds contrib/conftest/*.dfa files that can be used in automatic build
-+ scripts to ensure that these configurations continue to build.
-+ Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder.
-+ Fixed pngvalid 'fail' function declaration on the Intel C Compiler.
-+ This reverts to the previous 'static' implementation and works round
-+ the 'unused static function' warning by using PNG_UNUSED().
-+
-+Version 1.6.8beta02 [November 30, 2013]
-+ Removed or marked PNG_UNUSED some harmless "dead assignments" reported
-+ by clang scan-build.
-+ Changed tabs to 3 spaces in png_debug macros and changed '"%s"m'
-+ to '"%s" m' to improve portability among compilers.
-+ Changed png_free_default() to free() in pngtest.c
-+
-+Version 1.6.8rc01 [December 12, 2013]
-+ Tidied up pngfix inits and fixed pngtest no-write builds.
-+
-+Version 1.6.8rc02 [December 14, 2013]
-+ Handle zero-length PLTE chunk or NULL palette with png_error()
-+ instead of png_chunk_report(), which by default issues a warning
-+ rather than an error, leading to later reading from a NULL pointer
-+ (png_ptr->palette) in png_do_expand_palette(). This is CVE-2013-6954
-+ and VU#650142. Libpng-1.6.1 through 1.6.7 are vulnerable.
-+ Libpng-1.6.0 and earlier do not have this bug.
-+
-+Version 1.6.8 [December 19, 2013]
-+ No changes.
-+
-+Version 1.6.9beta01 [December 26, 2013]
-+ Bookkeeping: Moved functions around (no changes). Moved transform
-+ function definitions before the place where they are called so that
-+ they can be made static. Move the intrapixel functions and the
-+ grayscale palette builder out of the png?tran.c files. The latter
-+ isn't a transform function and is no longer used internally, and the
-+ former MNG specific functions are better placed in pngread/pngwrite.c
-+ Made transform implementation functions static. This makes the internal
-+ functions called by png_do_{read|write}_transformations static. On an
-+ x86-64 DLL build (Gentoo Linux) this reduces the size of the text
-+ segment of the DLL by 1208 bytes, about 0.6%. It also simplifies
-+ maintenance by removing the declarations from pngpriv.h and allowing
-+ easier changes to the internal interfaces.
-+ Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69
-+ in the tar distributions.
-+
-+Version 1.6.9beta02 [January 1, 2014]
-+ Added checks for libpng 1.5 to pngvalid.c. This supports the use of
-+ this version of pngvalid in libpng 1.5
-+ Merged with pngvalid.c from libpng-1.7 changes to create a single
-+ pngvalid.c
-+ Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner).
-+ Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0
-+ Merged libpng-1.7.0 changes to make no-interlace configurations work
-+ with test programs.
-+ Revised pngvalid.c to support libpng 1.5, which does not support the
-+ PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in
-+ pngvalid.c
-+ Allow unversioned links created on install to be disabled in configure.
-+ In configure builds 'make install' changes/adds links like png.h
-+ and libpng.a to point to the newly installed, versioned, files (e.g.
-+ libpng17/png.h and libpng17.a). Three new configure options and some
-+ rearrangement of Makefile.am allow creation of these links to be disabled.
-+
-+Version 1.6.9beta03 [January 10, 2014]
-+ Removed potentially misleading warning from png_check_IHDR().
-+
-+Version 1.6.9beta04 [January 20, 2014]
-+ Updated scripts/makefile.* to use CPPFLAGS (Cosmin).
-+ Added clang attribute support (Cosmin).
-+
-+Version 1.6.9rc01 [January 28, 2014]
-+ No changes.
-+
-+Version 1.6.9rc02 [January 30, 2014]
-+ Quiet an uninitialized memory warning from VC2013 in png_get_png().
-+
-+Version 1.6.9 [February 6, 2014]
-+
-+Version 1.6.10beta01 [February 9, 2014]
-+ Backported changes from libpng-1.7.0beta30 and beta31:
-+ Fixed a large number of instances where PNGCBAPI was omitted from
-+ function definitions.
-+ Added pngimage test program for png_read_png() and png_write_png()
-+ with two new test scripts.
-+ Removed dependence on !PNG_READ_EXPAND_SUPPORTED for calling
-+ png_set_packing() in png_read_png().
-+ Fixed combination of ~alpha with shift. On read invert alpha, processing
-+ occurred after shift processing, which causes the final values to be
-+ outside the range that should be produced by the shift. Reversing the
-+ order on read makes the two transforms work together correctly and mirrors
-+ the order used on write.
-+ Do not read invalid sBIT chunks. Previously libpng only checked sBIT
-+ values on write, so a malicious PNG writer could therefore cause
-+ the read code to return an invalid sBIT chunk, which might lead to
-+ application errors or crashes. Such chunks are now skipped (with
-+ chunk_benign_error).
-+ Make png_read_png() and png_write_png() prototypes in png.h depend
-+ upon PNG_READ_SUPPORTED and PNG_WRITE_SUPPORTED.
-+ Support builds with unsupported PNG_TRANSFORM_* values. All of the
-+ PNG_TRANSFORM_* values are always defined in png.h and, because they
-+ are used for both read and write in some cases, it is not reliable
-+ to #if out ones that are totally unsupported. This change adds error
-+ detection in png_read_image() and png_write_image() to do a
-+ png_app_error() if the app requests something that cannot be done
-+ and it adds corresponding code to pngimage.c to handle such options
-+ by not attempting to test them.
-+
-+Version 1.6.10beta02 [February 23, 2014]
-+ Moved redefines of png_error(), png_warning(), png_chunk_error(),
-+ and png_chunk_warning() from pngpriv.h to png.h to make them visible
-+ to libpng-calling applications.
-+ Moved OS dependent code from arm/arm_init.c, to allow the included
-+ implementation of the ARM NEON discovery function to be set at
-+ build-time and provide sample implementations from the current code in the
-+ contrib/arm-neon subdirectory. The __linux__ code has also been changed to
-+ compile and link on Android by using /proc/cpuinfo, and the old linux code
-+ is in contrib/arm-neon/linux-auxv.c. The new code avoids POSIX and Linux
-+ dependencies apart from opening /proc/cpuinfo and is C90 compliant.
-+ Check for info_ptr == NULL early in png_read_end() so we don't need to
-+ run all the png_handle_*() and depend on them to return if info_ptr == NULL.
-+ This improves the performance of png_read_end(png_ptr, NULL) and makes
-+ it more robust against future programming errors.
-+ Check for __has_extension before using it in pngconf.h, to
-+ support older Clang versions (Jeremy Sequoia).
-+ Treat CRC error handling with png_set_crc_action(), instead of with
-+ png_set_benign_errors(), which has been the case since libpng-1.6.0beta18.
-+ Use a user warning handler in contrib/gregbook/readpng2.c instead of default,
-+ so warnings will be put on stderr even if libpng has CONSOLE_IO disabled.
-+ Added png_ptr->process_mode = PNG_READ_IDAT_MODE in png_push_read_chunk
-+ after recognizing the IDAT chunk, which avoids an infinite loop while
-+ reading a datastream whose first IDAT chunk is of zero-length.
-+ This fixes CERT VU#684412 and CVE-2014-0333.
-+ Don't recognize known sRGB profiles as sRGB if they have been hacked,
-+ but don't reject them and don't issue a copyright violation warning.
-+
-+Version 1.6.10beta03 [February 25, 2014]
-+ Moved some documentation from png.h to libpng.3 and libpng-manual.txt
-+ Minor editing of contrib/arm-neon/README and contrib/examples/*.c
-+
-+Version 1.6.10rc01 [February 27, 2014]
-+ Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS
-+ and PNG_USR_CONFIG -> PNG_USER_CONFIG).
-+
-+Version 1.6.10rc02 [February 28, 2014]
-+ Removed unreachable return statement after png_chunk_error()
-+ in pngrutil.c
-+
-+Version 1.6.10rc03 [March 4, 2014]
-+ Un-deprecated png_data_freer().
-+
-+Version 1.6.10 [March 6, 2014]
-+ No changes.
-+
-+Version 1.6.11beta01 [March 17, 2014]
-+ Use "if (value != 0)" instead of "if (value)" consistently.
-+ Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio.
-+ Moved configuration information from the manual to the INSTALL file.
-+
-+Version 1.6.11beta02 [April 6, 2014]
-+ Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because
-+ they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
-+ when using its "__builtin_pow()" function.
-+ Silence 'unused parameter' build warnings (Cosmin Truta).
-+ $(CP) is now used alongside $(RM_F). Also, use 'copy' instead of 'cp'
-+ where applicable, and applied other minor makefile changes (Cosmin).
-+ Don't warn about invalid dimensions exceeding user limits (Cosmin).
-+ Allow an easy replacement of the default pre-built configuration
-+ header with a custom header, via the make PNGLIBCONF_H_PREBUILT
-+ macro (Cosmin).
-+
-+Version 1.6.11beta03 [April 6, 2014]
-+ Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes
-+ with "blocky" expansion of sub-8-bit interlaced PNG files (Eric Huss).
-+ Optionally use __builtin_bswap16() in png_do_swap().
-+
-+Version 1.6.11beta04 [April 19, 2014]
-+ Made progressive reading of interlaced images consistent with the
-+ behavior of the sequential reader and consistent with the manual, by
-+ moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. The
-+ row_callback now receives the proper pass number and unexpanded rows, when
-+ png_combine_row() isn't built or used, and png_set_interlace_handling()
-+ is not called.
-+ Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking.
-+
-+Version 1.6.11beta05 [April 26, 2014]
-+ Do not reject ICC V2 profiles that lack padding (Kai-Uwe Behrmann).
-+ Relocated closing bracket of the sRGB profile test loop to avoid getting
-+ "Not recognizing known sRGB profile that has been edited" warning for
-+ ICC V2 profiles that lack the MD5 signature in the profile header.
-+
-+Version 1.6.11beta06 [May 19, 2014]
-+ Added PNG_SKIP_sRGB_CHECK_PROFILE choice for png_set_option().
-+
-+Version 1.6.11rc01 [May 27, 2014]
-+ No changes.
-+
-+Version 1.6.11rc02 [June 3, 2014]
-+ Test ZLIB_VERNUM instead of PNG_ZLIB_VERNUM in contrib/tools/pngfix.c
-+
-+Version 1.6.11 [June 5, 2014]
-+ No changes.
-+
-+Version 1.6.12rc01 [June 6, 2014]
-+ Relocated new code from 1.6.11beta06 in png.c to a point after the
-+ declarations (Max Stepin).
-+
-+Version 1.6.12rc02 [June 7, 2014]
-+ Changed file permissions of contrib/tools/intgamma.sh,
-+ test-driver, and compile from 0644 to 0755 (Cosmin).
-+
-+Version 1.6.12rc03 [June 8, 2014]
-+ Ensure "__has_attribute()" macro exists before trying to use it with
-+ old clang compilers (MacPorts Ticket #43939).
-+
-+Version 1.6.12 [June 12, 2014]
-+ No changes.
-+
-+Version 1.6.13beta01 [July 4, 2014]
-+ Quieted -Wsign-compare and -Wclobber compiler warnings in
-+ contrib/pngminus/*.c
-+ Added "(void) png_ptr;" where needed in contrib/gregbook to quiet
-+ compiler complaints about unused pointers.
-+ Split a long output string in contrib/gregbook/rpng2-x.c.
-+ Added "PNG_SET_OPTION" requirement for sRGB chunk support to pnglibconf.dfa,
-+ Needed for write-only support (John Bowler).
-+ Changed "if defined(__ARM_NEON__)" to
-+ "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu).
-+ Fixed clang no-warning builds: png_digit was defined but never used.
-+
-+Version 1.6.13beta02 [July 21, 2014]
-+ Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32
-+ (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11.
-+ Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and
-+ makefile.tc3 similarly.
-+
-+Version 1.6.13beta03 [August 3, 2014]
-+ Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14
-+ due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT
-+ definitions from pngconf.h.
-+ Ensure that CMakeLists.txt makes the target "lib" directory before making
-+ symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
-+
-+Version 1.6.13beta04 [August 8, 2014]
-+ Added opinion that the ECCN (Export Control Classification Number) for
-+ libpng is EAR99 to the README file.
-+ Eliminated use of "$<" in makefile explicit rules, when copying
-+ $PNGLIBCONF_H_PREBUILT. This does not work on some versions of make;
-+ bug introduced in libpng version 1.6.11.
-+
-+Version 1.6.13rc01 [August 14, 2014]
-+ Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu
-+
-+Version 1.6.13 [August 21, 2014]
-+ No changes.
-+
-+Version 1.6.14beta01 [September 14, 2014]
-+ Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
-+ Do not build contrib/tools/pngfix.c when PNG_SETJMP_NOT_SUPPORTED,
-+ to allow "make" to complete without setjmp support (bug report by
-+ Claudio Fontana)
-+ Add "#include <setjmp.h>" to contrib/tools/pngfix.c (John Bowler)
-+
-+Version 1.6.14beta02 [September 18, 2014]
-+ Use nanosleep() instead of usleep() in contrib/gregbook/rpng2-x.c
-+ because usleep() is deprecated.
-+ Define usleep() in contrib/gregbook/rpng2-x.c if not already defined
-+ in unistd.h and nanosleep() is not available; fixes error introduced
-+ in libpng-1.6.13.
-+ Disable floating point exception handling in pngvalid.c when
-+ PNG_FLOATING_ARITHMETIC is not supported (bug report by "zootus
-+ at users.sourceforge.net").
-+
-+Version 1.6.14beta03 [September 19, 2014]
-+ Define FE_DIVBYZERO, FE_INVALID, and FE_OVERFLOW in pngvalid.c if not
-+ already defined. Revert floating point exception handling in pngvalid.c
-+ to version 1.6.14beta01 behavior.
-+
-+Version 1.6.14beta04 [September 27, 2014]
-+ Fixed incorrect handling of the iTXt compression flag in pngrutil.c
-+ (bug report by Shunsaku Hirata). Bug was introduced in libpng-1.6.0.
-+
-+Version 1.6.14beta05 [October 1, 2014]
-+ Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa
-+
-+Version 1.6.14beta06 [October 5, 2014]
-+ Removed unused "text_len" parameter from private function png_write_zTXt().
-+ Conditionally compile some code in png_deflate_claim(), when
-+ PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled.
-+ Replaced repeated code in pngpread.c with PNG_PUSH_SAVE_BUFFER_IF_FULL.
-+ Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT"
-+ to pnglibconf.dfa.
-+ Removed "option READ_COMPRESSED_TEXT enables READ_TEXT" from pnglibconf.dfa,
-+ to make it possible to configure a libpng that supports iCCP but not TEXT.
-+
-+Version 1.6.14beta07 [October 7, 2014]
-+ Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa
-+ Only mark text chunks as written after successfully writing them.
-+
-+Version 1.6.14rc01 [October 15, 2014]
-+ Fixed some typos in comments.
-+
-+Version 1.6.14rc02 [October 17, 2014]
-+ Changed png_convert_to_rfc_1123() to png_convert_to_rfc_1123_buffer()
-+ in the manual, to reflect the change made in libpng-1.6.0.
-+ Updated README file to explain that direct access to the png_struct
-+ and info_struct members has not been permitted since libpng-1.5.0.
-+
-+Version 1.6.14 [October 23, 2014]
-+ No changes.
-+
-+Version 1.6.15beta01 [October 29, 2014]
-+ Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"
-+ Simplified png_free_data().
-+ Added missing "ptr = NULL" after some instances of png_free().
-+
-+Version 1.6.15beta02 [November 1, 2014]
-+ Changed remaining "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"
-+
-+Version 1.6.15beta03 [November 3, 2014]
-+ Added PNG_USE_ARM_NEON configuration flag (Marcin Juszkiewicz).
-+
-+Version 1.6.15beta04 [November 4, 2014]
-+ Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
-+ revision to configure.ac to support ARM on aarch64 instead (John Bowler).
-+
-+Version 1.6.15beta05 [November 5, 2014]
-+ Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
-+ example.c, pngtest.c, and applications in the contrib directory.
-+ Avoid out-of-bounds memory access in png_user_version_check().
-+ Simplified and future-proofed png_user_version_check().
-+ Fixed GCC unsigned int->float warnings. Various versions of GCC
-+ seem to generate warnings when an unsigned value is implicitly
-+ converted to double. This is probably a GCC bug but this change
-+ avoids the issue by explicitly converting to (int) where safe.
-+ Free all allocated memory in pngimage. The file buffer cache was left
-+ allocated at the end of the program, harmless but it causes memory
-+ leak reports from clang.
-+ Fixed array size calculations to avoid warnings. At various points
-+ in the code the number of elements in an array is calculated using
-+ sizeof. This generates a compile time constant of type (size_t) which
-+ is then typically assigned to an (unsigned int) or (int). Some versions
-+ of GCC on 64-bit systems warn about the apparent narrowing, even though
-+ the same compiler does apparently generate the correct, in-range,
-+ numeric constant. This adds appropriate, safe, casts to make the
-+ warnings go away.
-+
-+Version 1.6.15beta06 [November 6, 2014]
-+ Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING
-+ in the manual, example.c, pngtest.c, and applications in the contrib
-+ directory. It was incorrect advice.
-+
-+Version 1.6.15beta07 [November 7, 2014]
-+ Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is
-+ needed by png_reciprocal2().
-+ Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
-+ png_do_swap().
-+ Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
-+
-+Version 1.6.15beta08 [November 8, 2014]
-+ More housecleaning in *.h
-+
-+Version 1.6.15rc01 [November 13, 2014]
-+
-+Version 1.6.15rc02 [November 14, 2014]
-+ The macros passed in the command line to Borland make were ignored if
-+ similarly-named macros were already defined in makefiles. This behavior
-+ is different from POSIX make and other make programs. Surround the
-+ macro definitions with ifndef guards (Cosmin).
-+
-+Version 1.6.15rc03 [November 16, 2014]
-+ Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.
-+ Removed the obsolete $ARCH variable from scripts/makefile.darwin.
-+
-+Version 1.6.15 [November 20, 2014]
-+ No changes.
-+
-+Version 1.6.16beta01 [December 14, 2014]
-+ Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that
-+ don't do alignment correctly.
-+ Revised Makefile.am and scripts/symbols.dfn to work with MinGW/MSYS
-+ (Bob Friesenhahn).
-+
-+Version 1.6.16beta02 [December 15, 2014]
-+ Revised Makefile.am and scripts/*.dfn again to work with MinGW/MSYS;
-+ renamed scripts/*.dfn to scripts/*.c (John Bowler).
-+
-+Version 1.6.16beta03 [December 21, 2014]
-+ Quiet a "comparison always true" warning in pngstest.c (John Bowler).
-+
-+Version 1.6.16rc01 [December 21, 2014]
-+ Restored a test on width that was removed from png.c at libpng-1.6.9
-+ (Bug report by Alex Eubanks).
-+
-+Version 1.6.16rc02 [December 21, 2014]
-+ Undid the update to pngrutil.c in 1.6.16rc01.
-+
-+Version 1.6.16rc03 [December 21, 2014]
-+ Fixed an overflow in png_combine_row with very wide interlaced images.
-+
-+Version 1.6.16 [December 22, 2014]
-+ No changes.
-
- Send comments/corrections/commendations to png-mng-implement at lists.sf.net
- (subscription required; visit
-@@ -3540,5 +5156,3 @@
- or to glennrp at users.sourceforge.net
-
- Glenn R-P
--*/ }
--#endif
---- ./jdk/src/share/native/sun/awt/libpng/LICENSE Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/LICENSE Fri Apr 10 09:21:28 2015 -0700
-@@ -10,8 +10,8 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
--Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
-+Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-
-@@ -108,4 +108,4 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
---- ./jdk/src/share/native/sun/awt/libpng/README Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/README Fri Apr 10 09:21:28 2015 -0700
-@@ -1,11 +1,11 @@
--README for libpng version 1.5.4 - July 7, 2011 (shared library 15.0)
-+README for libpng version 1.6.16 - December 22, 2014 (shared library 16.0)
- See the note about version numbers near the top of png.h
-
- See INSTALL for instructions on how to install libpng.
-
--Libpng comes in several distribution formats. Get libpng-*.tar.gz,
--libpng-*.tar.xz or libpng-*.tar.bz2 if you want UNIX-style line endings
--in the text files, or lpng*.zip if you want DOS-style line endings.
-+Libpng comes in several distribution formats. Get libpng-*.tar.gz or
-+libpng-*.tar.xz or if you want UNIX-style line endings in the text files,
-+or lpng*.7z or lpng*.zip if you want DOS-style line endings.
-
- Version 0.89 was the first official release of libpng. Don't let the
- fact that it's the first release fool you. The libpng library has been in
-@@ -23,18 +23,25 @@
- png_uint_32, which will affect shared-library applications that use
- this function.
-
--To avoid problems with changes to the internals of png_info_struct,
-+To avoid problems with changes to the internals of png info_struct,
- new APIs have been made available in 0.95 to avoid direct application
- access to info_ptr. These functions are the png_set_<chunk> and
- png_get_<chunk> functions. These functions should be used when
- accessing/storing the info_struct data, rather than manipulating it
- directly, to avoid such problems in the future.
-
--It is important to note that the APIs do not make current programs
-+It is important to note that the APIs did not make current programs
- that access the info struct directly incompatible with the new
--library. However, it is strongly suggested that new programs use
--the new APIs (as shown in example.c and pngtest.c), and older programs
--be converted to the new format, to facilitate upgrades in the future.
-+library, through libpng-1.2.x. In libpng-1.4.x, which was meant to
-+be a transitional release, members of the png_struct and the
-+info_struct can still be accessed, but the compiler will issue a
-+warning about deprecated usage. Since libpng-1.5.0, direct access
-+to these structs is not allowed, and the definitions of the structs
-+reside in private pngstruct.h and pnginfo.h header files that are not
-+accessible to applications. It is strongly suggested that new
-+programs use the new APIs (as shown in example.c and pngtest.c), and
-+older programs be converted to the new format, to facilitate upgrades
-+in the future.
- ****
-
- Additions since 0.90 include the ability to compile libpng as a
-@@ -77,17 +84,21 @@
- You can use zlib as a drop-in replacement for fread() and fwrite() if
- you are so inclined.
-
--zlib should be available at the same place that libpng is, or at.
--ftp://ftp.info-zip.org/pub/infozip/zlib
-+zlib should be available at the same place that libpng is, or at zlib.net.
-
- You may also want a copy of the PNG specification. It is available
- as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find
- these at http://www.libpng.org/pub/png/documents/
-
- This code is currently being archived at libpng.sf.net in the
--[DOWNLOAD] area, and on CompuServe, Lib 20 (PNG SUPPORT)
--at GO GRAPHSUP. If you can't find it in any of those places,
--e-mail me, and I'll help you find it.
-+[DOWNLOAD] area, and at ftp://ftp.simplesystems.org. If you can't find it
-+in any of those places, e-mail me, and I'll help you find it.
-+
-+I am not a lawyer, but I believe that the Export Control Classification
-+Number (ECCN) for libpng is EAR99, which means not subject to export
-+controls or International Traffic in Arms Regulations (ITAR) because it
-+is open source, publicly available software, that does not contain any
-+encryption software. See the EAR, paragraphs 734.3(b)(3) and 734.7(b).
-
- If you have any code changes, requests, problems, etc., please e-mail
- them to me. Also, I'd appreciate any make files or project files,
-@@ -105,7 +116,7 @@
- development group.
-
- Send comments/corrections/commendations to png-mng-implement at
--lists.sourceforge.net (subscription required; visit
-+lists.sourceforge.net (subscription required; visit
- https://lists.sourceforge.net/lists/listinfo/png-mng-implement
- to subscribe) or to glennrp at users.sourceforge.net
-
-@@ -123,7 +134,7 @@
- to others, if necessary.
-
- Please do not send suggestions on how to change PNG. We have
--been discussing PNG for sixteen years now, and it is official and
-+been discussing PNG for nineteen years now, and it is official and
- finished. If you have suggestions for libpng, however, I'll
- gladly listen. Even if your suggestion is not used immediately,
- it may be used later.
-@@ -167,23 +178,25 @@
- pngwrite.c => High-level write functions
- pngwtran.c => Write data transformations
- pngwutil.c => Write utility functions
-+ arm => Contains optimized code for the ARM platform
- contrib => Contributions
-+ examples => Example programs
- gregbook => source code for PNG reading and writing, from
- Greg Roelofs' "PNG: The Definitive Guide",
- O'Reilly, 1999
-- msvctest => Builds and runs pngtest using a MSVC workspace
-- pngminus => Simple pnm2png and png2pnm programs
-- pngsuite => Test images
-- visupng => Contains a MSVC workspace for VisualPng
-+ libtests => Test programs
-+ pngminim => Minimal decoder, encoder, and progressive decoder
-+ programs demonstrating use of pngusr.dfa
-+ pngminus => Simple pnm2png and png2pnm programs
-+ pngsuite => Test images
-+ tools => Various tools
-+ visupng => Contains a MSVC workspace for VisualPng
- projects => Contains project files and workspaces for
- building a DLL
-- cbuilder5 => Contains a Borland workspace for building
-- libpng and zlib
-- visualc6 => Contains a Microsoft Visual C++ (MSVC)
-- workspace for building libpng and zlib
-+ owatcom => Contains a WATCOM project for building libpng
- visualc71 => Contains a Microsoft Visual C++ (MSVC)
- workspace for building libpng and zlib
-- xcode => Contains an Apple xcode
-+ vstudio => Contains a Microsoft Visual C++ (MSVC)
- workspace for building libpng and zlib
- scripts => Directory containing scripts for building libpng:
- (see scripts/README.txt for the list of scripts)
---- ./jdk/src/share/native/sun/awt/libpng/png.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/png.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.16 [December 22, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -42,7 +42,7 @@
- #include "pngpriv.h"
-
- /* Generate a compiler error if there is an old png.h in the search path. */
--typedef png_libpng_version_1_5_4 Your_png_h_is_not_version_1_5_4;
-+typedef png_libpng_version_1_6_16 Your_png_h_is_not_version_1_6_16;
-
- /* Tells libpng that we have already handled the first "num_bytes" bytes
- * of the PNG file signature. If the PNG data is embedded into another
-@@ -52,7 +52,7 @@
-
- #ifdef PNG_READ_SUPPORTED
- void PNGAPI
--png_set_sig_bytes(png_structp png_ptr, int num_bytes)
-+png_set_sig_bytes(png_structrp png_ptr, int num_bytes)
- {
- png_debug(1, "in png_set_sig_bytes");
-
-@@ -71,7 +71,7 @@
- * can simply check the remaining bytes for extra assurance. Returns
- * an integer less than, equal to, or greater than zero if sig is found,
- * respectively, to be less than, to match, or be greater than the correct
-- * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
-+ * PNG signature (this is the same behavior as strcmp, memcmp, etc).
- */
- int PNGAPI
- png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
-@@ -90,52 +90,47 @@
- if (start + num_to_check > 8)
- num_to_check = 8 - start;
-
-- return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
-+ return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
- }
-
--#endif /* PNG_READ_SUPPORTED */
-+#endif /* READ */
-
- #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
- /* Function to allocate memory for zlib */
- PNG_FUNCTION(voidpf /* PRIVATE */,
- png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
- {
-- png_voidp ptr;
-- png_structp p=(png_structp)png_ptr;
-- png_uint_32 save_flags=p->flags;
-- png_alloc_size_t num_bytes;
-+ png_alloc_size_t num_bytes = size;
-
- if (png_ptr == NULL)
-- return (NULL);
--
-- if (items > PNG_UINT_32_MAX/size)
-+ return NULL;
-+
-+ if (items >= (~(png_alloc_size_t)0)/size)
- {
-- png_warning (p, "Potential overflow in png_zalloc()");
-- return (NULL);
-+ png_warning (png_voidcast(png_structrp, png_ptr),
-+ "Potential overflow in png_zalloc()");
-+ return NULL;
- }
-- num_bytes = (png_alloc_size_t)items * size;
--
-- p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-- ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
-- p->flags=save_flags;
--
-- return ((voidpf)ptr);
-+
-+ num_bytes *= items;
-+ return png_malloc_warn(png_voidcast(png_structrp, png_ptr), num_bytes);
- }
-
- /* Function to free memory for zlib */
- void /* PRIVATE */
- png_zfree(voidpf png_ptr, voidpf ptr)
- {
-- png_free((png_structp)png_ptr, (png_voidp)ptr);
-+ png_free(png_voidcast(png_const_structrp,png_ptr), ptr);
- }
-
- /* Reset the CRC variable to 32 bits of 1's. Care must be taken
- * in case CRC is > 32 bits to leave the top bits 0.
- */
- void /* PRIVATE */
--png_reset_crc(png_structp png_ptr)
-+png_reset_crc(png_structrp png_ptr)
- {
-- png_ptr->crc = crc32(0, Z_NULL, 0);
-+ /* The cast is safe because the crc is a 32 bit value. */
-+ png_ptr->crc = (png_uint_32)crc32(0, Z_NULL, 0);
- }
-
- /* Calculate the CRC over a section of data. We can only pass as
-@@ -144,119 +139,254 @@
- * trouble of calculating it.
- */
- void /* PRIVATE */
--png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)
-+png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
- {
- int need_crc = 1;
-
-- if (png_ptr->chunk_name[0] & 0x20) /* ancillary */
-+ if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
- {
- if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
- (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
- need_crc = 0;
- }
-
-- else /* critical */
-+ else /* critical */
- {
-- if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
-+ if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
- need_crc = 0;
- }
-
-- if (need_crc)
-- png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
-+ /* 'uLong' is defined in zlib.h as unsigned long; this means that on some
-+ * systems it is a 64 bit value. crc32, however, returns 32 bits so the
-+ * following cast is safe. 'uInt' may be no more than 16 bits, so it is
-+ * necessary to perform a loop here.
-+ */
-+ if (need_crc != 0 && length > 0)
-+ {
-+ uLong crc = png_ptr->crc; /* Should never issue a warning */
-+
-+ do
-+ {
-+ uInt safe_length = (uInt)length;
-+ if (safe_length == 0)
-+ safe_length = (uInt)-1; /* evil, but safe */
-+
-+ crc = crc32(crc, ptr, safe_length);
-+
-+ /* The following should never issue compiler warnings; if they do the
-+ * target system has characteristics that will probably violate other
-+ * assumptions within the libpng code.
-+ */
-+ ptr += safe_length;
-+ length -= safe_length;
-+ }
-+ while (length > 0);
-+
-+ /* And the following is always safe because the crc is only 32 bits. */
-+ png_ptr->crc = (png_uint_32)crc;
-+ }
- }
-
- /* Check a user supplied version number, called from both read and write
-- * functions that create a png_struct
-+ * functions that create a png_struct.
- */
- int
--png_user_version_check(png_structp png_ptr, png_const_charp user_png_ver)
-+png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
- {
-- if (user_png_ver)
-+ /* Libpng versions 1.0.0 and later are binary compatible if the version
-+ * string matches through the second '.'; we must recompile any
-+ * applications that use any older library version.
-+ */
-+
-+ if (user_png_ver != NULL)
- {
-- int i = 0;
-+ int i = -1;
-+ int found_dots = 0;
-
- do
- {
-- if (user_png_ver[i] != png_libpng_ver[i])
-+ i++;
-+ if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])
- png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-- } while (png_libpng_ver[i++]);
-+ if (user_png_ver[i] == '.')
-+ found_dots++;
-+ } while (found_dots < 2 && user_png_ver[i] != 0 &&
-+ PNG_LIBPNG_VER_STRING[i] != 0);
- }
-
- else
- png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-
-- if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
-+ if ((png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) != 0)
- {
-- /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
-- * we must recompile any applications that use any older library version.
-- * For versions after libpng 1.0, we will be compatible, so we need
-- * only check the first digit.
-- */
-- if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
-- (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
-- (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
-- {
- #ifdef PNG_WARNINGS_SUPPORTED
-- size_t pos = 0;
-- char m[128];
--
-- pos = png_safecat(m, sizeof m, pos, "Application built with libpng-");
-- pos = png_safecat(m, sizeof m, pos, user_png_ver);
-- pos = png_safecat(m, sizeof m, pos, " but running with ");
-- pos = png_safecat(m, sizeof m, pos, png_libpng_ver);
--
-- png_warning(png_ptr, m);
-+ size_t pos = 0;
-+ char m[128];
-+
-+ pos = png_safecat(m, (sizeof m), pos,
-+ "Application built with libpng-");
-+ pos = png_safecat(m, (sizeof m), pos, user_png_ver);
-+ pos = png_safecat(m, (sizeof m), pos, " but running with ");
-+ pos = png_safecat(m, (sizeof m), pos, PNG_LIBPNG_VER_STRING);
-+ PNG_UNUSED(pos)
-+
-+ png_warning(png_ptr, m);
- #endif
-
- #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-- png_ptr->flags = 0;
-+ png_ptr->flags = 0;
- #endif
-
-- return 0;
-- }
-+ return 0;
- }
-
- /* Success return. */
- return 1;
- }
-
--/* Allocate the memory for an info_struct for the application. We don't
-- * really need the png_ptr, but it could potentially be useful in the
-- * future. This should be used in favour of malloc(png_sizeof(png_info))
-- * and png_info_init() so that applications that want to use a shared
-- * libpng don't have to be recompiled if png_info changes size.
-+/* Generic function to create a png_struct for either read or write - this
-+ * contains the common initialization.
- */
-+PNG_FUNCTION(png_structp /* PRIVATE */,
-+png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-+ png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-+ png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-+{
-+ png_struct create_struct;
-+# ifdef PNG_SETJMP_SUPPORTED
-+ jmp_buf create_jmp_buf;
-+# endif
-+
-+ /* This temporary stack-allocated structure is used to provide a place to
-+ * build enough context to allow the user provided memory allocator (if any)
-+ * to be called.
-+ */
-+ memset(&create_struct, 0, (sizeof create_struct));
-+
-+ /* Added at libpng-1.2.6 */
-+# ifdef PNG_USER_LIMITS_SUPPORTED
-+ create_struct.user_width_max = PNG_USER_WIDTH_MAX;
-+ create_struct.user_height_max = PNG_USER_HEIGHT_MAX;
-+
-+# ifdef PNG_USER_CHUNK_CACHE_MAX
-+ /* Added at libpng-1.2.43 and 1.4.0 */
-+ create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
-+# endif
-+
-+# ifdef PNG_USER_CHUNK_MALLOC_MAX
-+ /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
-+ * in png_struct regardless.
-+ */
-+ create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
-+# endif
-+# endif
-+
-+ /* The following two API calls simply set fields in png_struct, so it is safe
-+ * to do them now even though error handling is not yet set up.
-+ */
-+# ifdef PNG_USER_MEM_SUPPORTED
-+ png_set_mem_fn(&create_struct, mem_ptr, malloc_fn, free_fn);
-+# else
-+ PNG_UNUSED(mem_ptr)
-+ PNG_UNUSED(malloc_fn)
-+ PNG_UNUSED(free_fn)
-+# endif
-+
-+ /* (*error_fn) can return control to the caller after the error_ptr is set,
-+ * this will result in a memory leak unless the error_fn does something
-+ * extremely sophisticated. The design lacks merit but is implicit in the
-+ * API.
-+ */
-+ png_set_error_fn(&create_struct, error_ptr, error_fn, warn_fn);
-+
-+# ifdef PNG_SETJMP_SUPPORTED
-+ if (!setjmp(create_jmp_buf))
-+ {
-+ /* Temporarily fake out the longjmp information until we have
-+ * successfully completed this function. This only works if we have
-+ * setjmp() support compiled in, but it is safe - this stuff should
-+ * never happen.
-+ */
-+ create_struct.jmp_buf_ptr = &create_jmp_buf;
-+ create_struct.jmp_buf_size = 0; /*stack allocation*/
-+ create_struct.longjmp_fn = longjmp;
-+# else
-+ {
-+# endif
-+ /* Call the general version checker (shared with read and write code):
-+ */
-+ if (png_user_version_check(&create_struct, user_png_ver) != 0)
-+ {
-+ png_structrp png_ptr = png_voidcast(png_structrp,
-+ png_malloc_warn(&create_struct, (sizeof *png_ptr)));
-+
-+ if (png_ptr != NULL)
-+ {
-+ /* png_ptr->zstream holds a back-pointer to the png_struct, so
-+ * this can only be done now:
-+ */
-+ create_struct.zstream.zalloc = png_zalloc;
-+ create_struct.zstream.zfree = png_zfree;
-+ create_struct.zstream.opaque = png_ptr;
-+
-+# ifdef PNG_SETJMP_SUPPORTED
-+ /* Eliminate the local error handling: */
-+ create_struct.jmp_buf_ptr = NULL;
-+ create_struct.jmp_buf_size = 0;
-+ create_struct.longjmp_fn = 0;
-+# endif
-+
-+ *png_ptr = create_struct;
-+
-+ /* This is the successful return point */
-+ return png_ptr;
-+ }
-+ }
-+ }
-+
-+ /* A longjmp because of a bug in the application storage allocator or a
-+ * simple failure to allocate the png_struct.
-+ */
-+ return NULL;
-+}
-+
-+/* Allocate the memory for an info_struct for the application. */
- PNG_FUNCTION(png_infop,PNGAPI
--png_create_info_struct,(png_structp png_ptr),PNG_ALLOCATED)
-+png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED)
- {
-- png_infop info_ptr;
-+ png_inforp info_ptr;
-
- png_debug(1, "in png_create_info_struct");
-
- if (png_ptr == NULL)
-- return (NULL);
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
-- png_ptr->malloc_fn, png_ptr->mem_ptr);
--#else
-- info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
--#endif
-+ return NULL;
-+
-+ /* Use the internal API that does not (or at least should not) error out, so
-+ * that this call always returns ok. The application typically sets up the
-+ * error handling *after* creating the info_struct because this is the way it
-+ * has always been done in 'example.c'.
-+ */
-+ info_ptr = png_voidcast(png_inforp, png_malloc_base(png_ptr,
-+ (sizeof *info_ptr)));
-+
- if (info_ptr != NULL)
-- png_info_init_3(&info_ptr, png_sizeof(png_info));
--
-- return (info_ptr);
-+ memset(info_ptr, 0, (sizeof *info_ptr));
-+
-+ return info_ptr;
- }
-
- /* This function frees the memory associated with a single info struct.
- * Normally, one would use either png_destroy_read_struct() or
- * png_destroy_write_struct() to free an info struct, but this may be
-- * useful for some applications.
-+ * useful for some applications. From libpng 1.6.0 this function is also used
-+ * internally to implement the png_info release part of the 'struct' destroy
-+ * APIs. This ensures that all possible approaches free the same data (all of
-+ * it).
- */
- void PNGAPI
--png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
-+png_destroy_info_struct(png_const_structrp png_ptr, png_infopp info_ptr_ptr)
- {
-- png_infop info_ptr = NULL;
-+ png_inforp info_ptr = NULL;
-
- png_debug(1, "in png_destroy_info_struct");
-
-@@ -268,46 +398,57 @@
-
- if (info_ptr != NULL)
- {
-- png_info_destroy(png_ptr, info_ptr);
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
-- png_ptr->mem_ptr);
--#else
-- png_destroy_struct((png_voidp)info_ptr);
--#endif
-+ /* Do this first in case of an error below; if the app implements its own
-+ * memory management this can lead to png_free calling png_error, which
-+ * will abort this routine and return control to the app error handler.
-+ * An infinite loop may result if it then tries to free the same info
-+ * ptr.
-+ */
- *info_ptr_ptr = NULL;
-+
-+ png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-+ memset(info_ptr, 0, (sizeof *info_ptr));
-+ png_free(png_ptr, info_ptr);
- }
- }
-
- /* Initialize the info structure. This is now an internal function (0.89)
- * and applications using it are urged to use png_create_info_struct()
-- * instead.
-+ * instead. Use deprecated in 1.6.0, internal use removed (used internally it
-+ * is just a memset).
-+ *
-+ * NOTE: it is almost inconceivable that this API is used because it bypasses
-+ * the user-memory mechanism and the user error handling/warning mechanisms in
-+ * those cases where it does anything other than a memset.
- */
--
--void PNGAPI
--png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
-+PNG_FUNCTION(void,PNGAPI
-+png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size),
-+ PNG_DEPRECATED)
- {
-- png_infop info_ptr = *ptr_ptr;
-+ png_inforp info_ptr = *ptr_ptr;
-
- png_debug(1, "in png_info_init_3");
-
- if (info_ptr == NULL)
- return;
-
-- if (png_sizeof(png_info) > png_info_struct_size)
-+ if ((sizeof (png_info)) > png_info_struct_size)
- {
-- png_destroy_struct(info_ptr);
-- info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-+ *ptr_ptr = NULL;
-+ /* The following line is why this API should not be used: */
-+ free(info_ptr);
-+ info_ptr = png_voidcast(png_inforp, png_malloc_base(NULL,
-+ (sizeof *info_ptr)));
- *ptr_ptr = info_ptr;
- }
-
- /* Set everything to 0 */
-- png_memset(info_ptr, 0, png_sizeof(png_info));
-+ memset(info_ptr, 0, (sizeof *info_ptr));
- }
-
-+/* The following API is not called internally */
- void PNGAPI
--png_data_freer(png_structp png_ptr, png_infop info_ptr,
-+png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
- int freer, png_uint_32 mask)
- {
- png_debug(1, "in png_data_freer");
-@@ -322,12 +463,11 @@
- info_ptr->free_me &= ~mask;
-
- else
-- png_warning(png_ptr,
-- "Unknown freer parameter in png_data_freer");
-+ png_error(png_ptr, "Unknown freer parameter in png_data_freer");
- }
-
- void PNGAPI
--png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
-+png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
- int num)
- {
- png_debug(1, "in png_free_data");
-@@ -337,32 +477,32 @@
-
- #ifdef PNG_TEXT_SUPPORTED
- /* Free text item num or (if num == -1) all text items */
-- if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
-+ if (info_ptr->text != 0 &&
-+ ((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0)
- {
- if (num != -1)
- {
-- if (info_ptr->text && info_ptr->text[num].key)
-- {
-- png_free(png_ptr, info_ptr->text[num].key);
-- info_ptr->text[num].key = NULL;
-- }
-+ png_free(png_ptr, info_ptr->text[num].key);
-+ info_ptr->text[num].key = NULL;
- }
-
- else
- {
- int i;
-+
- for (i = 0; i < info_ptr->num_text; i++)
-- png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
-+ png_free(png_ptr, info_ptr->text[i].key);
-+
- png_free(png_ptr, info_ptr->text);
- info_ptr->text = NULL;
-- info_ptr->num_text=0;
-+ info_ptr->num_text = 0;
- }
- }
- #endif
-
- #ifdef PNG_tRNS_SUPPORTED
- /* Free any tRNS entry */
-- if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
-+ if (((mask & PNG_FREE_TRNS) & info_ptr->free_me) != 0)
- {
- png_free(png_ptr, info_ptr->trans_alpha);
- info_ptr->trans_alpha = NULL;
-@@ -372,7 +512,7 @@
-
- #ifdef PNG_sCAL_SUPPORTED
- /* Free any sCAL entry */
-- if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
-+ if (((mask & PNG_FREE_SCAL) & info_ptr->free_me) != 0)
- {
- png_free(png_ptr, info_ptr->scal_s_width);
- png_free(png_ptr, info_ptr->scal_s_height);
-@@ -384,20 +524,20 @@
-
- #ifdef PNG_pCAL_SUPPORTED
- /* Free any pCAL entry */
-- if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
-+ if (((mask & PNG_FREE_PCAL) & info_ptr->free_me) != 0)
- {
- png_free(png_ptr, info_ptr->pcal_purpose);
- png_free(png_ptr, info_ptr->pcal_units);
- info_ptr->pcal_purpose = NULL;
- info_ptr->pcal_units = NULL;
-+
- if (info_ptr->pcal_params != NULL)
- {
- int i;
-- for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
-- {
-+
-+ for (i = 0; i < info_ptr->pcal_nparams; i++)
- png_free(png_ptr, info_ptr->pcal_params[i]);
-- info_ptr->pcal_params[i] = NULL;
-- }
-+
- png_free(png_ptr, info_ptr->pcal_params);
- info_ptr->pcal_params = NULL;
- }
-@@ -406,8 +546,8 @@
- #endif
-
- #ifdef PNG_iCCP_SUPPORTED
-- /* Free any iCCP entry */
-- if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
-+ /* Free any profile entry */
-+ if (((mask & PNG_FREE_ICCP) & info_ptr->free_me) != 0)
- {
- png_free(png_ptr, info_ptr->iccp_name);
- png_free(png_ptr, info_ptr->iccp_profile);
-@@ -419,26 +559,28 @@
-
- #ifdef PNG_sPLT_SUPPORTED
- /* Free a given sPLT entry, or (if num == -1) all sPLT entries */
-- if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
-+ if (info_ptr->splt_palettes != 0 &&
-+ ((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0)
- {
- if (num != -1)
- {
-- if (info_ptr->splt_palettes)
-- {
-- png_free(png_ptr, info_ptr->splt_palettes[num].name);
-- png_free(png_ptr, info_ptr->splt_palettes[num].entries);
-- info_ptr->splt_palettes[num].name = NULL;
-- info_ptr->splt_palettes[num].entries = NULL;
-- }
-+ png_free(png_ptr, info_ptr->splt_palettes[num].name);
-+ png_free(png_ptr, info_ptr->splt_palettes[num].entries);
-+ info_ptr->splt_palettes[num].name = NULL;
-+ info_ptr->splt_palettes[num].entries = NULL;
- }
-
- else
- {
-- if (info_ptr->splt_palettes_num)
-+ if (info_ptr->splt_palettes_num != 0)
- {
- int i;
-- for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
-- png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
-+
-+ for (i = 0; i < info_ptr->splt_palettes_num; i++)
-+ {
-+ png_free(png_ptr, info_ptr->splt_palettes[i].name);
-+ png_free(png_ptr, info_ptr->splt_palettes[i].entries);
-+ }
-
- png_free(png_ptr, info_ptr->splt_palettes);
- info_ptr->splt_palettes = NULL;
-@@ -449,32 +591,24 @@
- }
- #endif
-
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-- if (png_ptr->unknown_chunk.data)
-- {
-- png_free(png_ptr, png_ptr->unknown_chunk.data);
-- png_ptr->unknown_chunk.data = NULL;
-- }
--
-- if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-+ if (info_ptr->unknown_chunks != 0 &&
-+ ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)
- {
- if (num != -1)
- {
-- if (info_ptr->unknown_chunks)
-- {
-- png_free(png_ptr, info_ptr->unknown_chunks[num].data);
-- info_ptr->unknown_chunks[num].data = NULL;
-- }
-+ png_free(png_ptr, info_ptr->unknown_chunks[num].data);
-+ info_ptr->unknown_chunks[num].data = NULL;
- }
-
- else
- {
- int i;
-
-- if (info_ptr->unknown_chunks_num)
-+ if (info_ptr->unknown_chunks_num != 0)
- {
- for (i = 0; i < info_ptr->unknown_chunks_num; i++)
-- png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
-+ png_free(png_ptr, info_ptr->unknown_chunks[i].data);
-
- png_free(png_ptr, info_ptr->unknown_chunks);
- info_ptr->unknown_chunks = NULL;
-@@ -486,7 +620,7 @@
-
- #ifdef PNG_hIST_SUPPORTED
- /* Free any hIST entry */
-- if ((mask & PNG_FREE_HIST) & info_ptr->free_me)
-+ if (((mask & PNG_FREE_HIST) & info_ptr->free_me) != 0)
- {
- png_free(png_ptr, info_ptr->hist);
- info_ptr->hist = NULL;
-@@ -495,9 +629,9 @@
- #endif
-
- /* Free any PLTE entry that was internally allocated */
-- if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
-+ if (((mask & PNG_FREE_PLTE) & info_ptr->free_me) != 0)
- {
-- png_zfree(png_ptr, info_ptr->palette);
-+ png_free(png_ptr, info_ptr->palette);
- info_ptr->palette = NULL;
- info_ptr->valid &= ~PNG_INFO_PLTE;
- info_ptr->num_palette = 0;
-@@ -505,16 +639,14 @@
-
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- /* Free any image bits attached to the info structure */
-- if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
-+ if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0)
- {
-- if (info_ptr->row_pointers)
-+ if (info_ptr->row_pointers != 0)
- {
-- int row;
-- for (row = 0; row < (int)info_ptr->height; row++)
-- {
-+ png_uint_32 row;
-+ for (row = 0; row < info_ptr->height; row++)
- png_free(png_ptr, info_ptr->row_pointers[row]);
-- info_ptr->row_pointers[row] = NULL;
-- }
-+
- png_free(png_ptr, info_ptr->row_pointers);
- info_ptr->row_pointers = NULL;
- }
-@@ -527,37 +659,14 @@
-
- info_ptr->free_me &= ~mask;
- }
--
--/* This is an internal routine to free any memory that the info struct is
-- * pointing to before re-using it or freeing the struct itself. Recall
-- * that png_free() checks for NULL pointers for us.
-- */
--void /* PRIVATE */
--png_info_destroy(png_structp png_ptr, png_infop info_ptr)
--{
-- png_debug(1, "in png_info_destroy");
--
-- png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
--
--#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- if (png_ptr->num_chunk_list)
-- {
-- png_free(png_ptr, png_ptr->chunk_list);
-- png_ptr->chunk_list = NULL;
-- png_ptr->num_chunk_list = 0;
-- }
--#endif
--
-- png_info_init_3(&info_ptr, png_sizeof(png_info));
--}
--#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-+#endif /* READ || WRITE */
-
- /* This function returns a pointer to the io_ptr associated with the user
- * functions. The application should free any memory associated with this
- * pointer before png_write_destroy() or png_read_destroy() are called.
- */
- png_voidp PNGAPI
--png_get_io_ptr(png_structp png_ptr)
-+png_get_io_ptr(png_const_structrp png_ptr)
- {
- if (png_ptr == NULL)
- return (NULL);
-@@ -570,11 +679,11 @@
- /* Initialize the default input/output functions for the PNG file. If you
- * use your own read or write routines, you can call either png_set_read_fn()
- * or png_set_write_fn() instead of png_init_io(). If you have defined
-- * PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
-- * necessarily available.
-+ * PNG_NO_STDIO or otherwise disabled PNG_STDIO_SUPPORTED, you must use a
-+ * function of your own because "FILE *" isn't necessarily available.
- */
- void PNGAPI
--png_init_io(png_structp png_ptr, png_FILE_p fp)
-+png_init_io(png_structrp png_ptr, png_FILE_p fp)
- {
- png_debug(1, "in png_init_io");
-
-@@ -585,44 +694,64 @@
- }
- # endif
-
-+#ifdef PNG_SAVE_INT_32_SUPPORTED
-+/* The png_save_int_32 function assumes integers are stored in two's
-+ * complement format. If this isn't the case, then this routine needs to
-+ * be modified to write data in two's complement format. Note that,
-+ * the following works correctly even if png_int_32 has more than 32 bits
-+ * (compare the more complex code required on read for sign extension.)
-+ */
-+void PNGAPI
-+png_save_int_32(png_bytep buf, png_int_32 i)
-+{
-+ buf[0] = (png_byte)((i >> 24) & 0xff);
-+ buf[1] = (png_byte)((i >> 16) & 0xff);
-+ buf[2] = (png_byte)((i >> 8) & 0xff);
-+ buf[3] = (png_byte)(i & 0xff);
-+}
-+#endif
-+
- # ifdef PNG_TIME_RFC1123_SUPPORTED
- /* Convert the supplied time into an RFC 1123 string suitable for use in
- * a "Creation Time" or other text-based time string.
- */
--png_const_charp PNGAPI
--png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
-+int PNGAPI
-+png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
- {
- static PNG_CONST char short_months[12][4] =
- {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-- if (png_ptr == NULL)
-- return (NULL);
-+ if (out == NULL)
-+ return 0;
-+
-+ if (ptime->year > 9999 /* RFC1123 limitation */ ||
-+ ptime->month == 0 || ptime->month > 12 ||
-+ ptime->day == 0 || ptime->day > 31 ||
-+ ptime->hour > 23 || ptime->minute > 59 ||
-+ ptime->second > 60)
-+ return 0;
-
- {
- size_t pos = 0;
-- char number_buf[5]; /* enough for a four digit year */
--
--# define APPEND_STRING(string)\
-- pos = png_safecat(png_ptr->time_buffer, sizeof png_ptr->time_buffer,\
-- pos, (string))
-+ char number_buf[5]; /* enough for a four-digit year */
-+
-+# define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))
- # define APPEND_NUMBER(format, value)\
- APPEND_STRING(PNG_FORMAT_NUMBER(number_buf, format, (value)))
--# define APPEND(ch)\
-- if (pos < (sizeof png_ptr->time_buffer)-1)\
-- png_ptr->time_buffer[pos++] = (ch)
--
-- APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day % 32);
-+# define APPEND(ch) if (pos < 28) out[pos++] = (ch)
-+
-+ APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day);
- APPEND(' ');
-- APPEND_STRING(short_months[(ptime->month - 1) % 12]);
-+ APPEND_STRING(short_months[(ptime->month - 1)]);
- APPEND(' ');
- APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->year);
- APPEND(' ');
-- APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->hour % 24);
-+ APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->hour);
- APPEND(':');
-- APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->minute % 60);
-+ APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->minute);
- APPEND(':');
-- APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second % 61);
-+ APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second);
- APPEND_STRING(" +0000"); /* This reliably terminates the buffer */
-
- # undef APPEND
-@@ -630,14 +759,37 @@
- # undef APPEND_STRING
- }
-
-- return png_ptr->time_buffer;
-+ return 1;
- }
--# endif /* PNG_TIME_RFC1123_SUPPORTED */
--
--#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
--
-+
-+# if PNG_LIBPNG_VER < 10700
-+/* To do: remove the following from libpng-1.7 */
-+/* Original API that uses a private buffer in png_struct.
-+ * Deprecated because it causes png_struct to carry a spurious temporary
-+ * buffer (png_struct::time_buffer), better to have the caller pass this in.
-+ */
- png_const_charp PNGAPI
--png_get_copyright(png_const_structp png_ptr)
-+png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)
-+{
-+ if (png_ptr != NULL)
-+ {
-+ /* The only failure above if png_ptr != NULL is from an invalid ptime */
-+ if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0)
-+ png_warning(png_ptr, "Ignoring invalid time value");
-+
-+ else
-+ return png_ptr->time_buffer;
-+ }
-+
-+ return NULL;
-+}
-+# endif
-+# endif /* TIME_RFC1123 */
-+
-+#endif /* READ || WRITE */
-+
-+png_const_charp PNGAPI
-+png_get_copyright(png_const_structrp png_ptr)
- {
- PNG_UNUSED(png_ptr) /* Silence compiler warning about unused png_ptr */
- #ifdef PNG_STRING_COPYRIGHT
-@@ -645,14 +797,14 @@
- #else
- # ifdef __STDC__
- return PNG_STRING_NEWLINE \
-- "libpng version 1.5.4 - July 7, 2011" PNG_STRING_NEWLINE \
-- "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
-+ "libpng version 1.6.16 - December 22, 2014" PNG_STRING_NEWLINE \
-+ "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
- "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
- "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
- PNG_STRING_NEWLINE;
- # else
-- return "libpng version 1.5.4 - July 7, 2011\
-- Copyright (c) 1998-2011 Glenn Randers-Pehrson\
-+ return "libpng version 1.6.16 - December 22, 2014\
-+ Copyright (c) 1998-2014 Glenn Randers-Pehrson\
- Copyright (c) 1996-1997 Andreas Dilger\
- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
- # endif
-@@ -668,14 +820,14 @@
- * it is guaranteed that png.c uses the correct version of png.h.
- */
- png_const_charp PNGAPI
--png_get_libpng_ver(png_const_structp png_ptr)
-+png_get_libpng_ver(png_const_structrp png_ptr)
- {
- /* Version of *.c files used when building libpng */
- return png_get_header_ver(png_ptr);
- }
-
- png_const_charp PNGAPI
--png_get_header_ver(png_const_structp png_ptr)
-+png_get_header_ver(png_const_structrp png_ptr)
- {
- /* Version of *.h files used when building libpng */
- PNG_UNUSED(png_ptr) /* Silence compiler warning about unused png_ptr */
-@@ -683,7 +835,7 @@
- }
-
- png_const_charp PNGAPI
--png_get_header_version(png_const_structp png_ptr)
-+png_get_header_version(png_const_structrp png_ptr)
- {
- /* Returns longer string containing both version and date */
- PNG_UNUSED(png_ptr) /* Silence compiler warning about unused png_ptr */
-@@ -698,37 +850,122 @@
- #endif
- }
-
--#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
--# ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-+/* NOTE: this routine is not used internally! */
-+/* Build a grayscale palette. Palette is assumed to be 1 << bit_depth
-+ * large of png_color. This lets grayscale images be treated as
-+ * paletted. Most useful for gamma correction and simplification
-+ * of code. This API is not used internally.
-+ */
-+void PNGAPI
-+png_build_grayscale_palette(int bit_depth, png_colorp palette)
-+{
-+ int num_palette;
-+ int color_inc;
-+ int i;
-+ int v;
-+
-+ png_debug(1, "in png_do_build_grayscale_palette");
-+
-+ if (palette == NULL)
-+ return;
-+
-+ switch (bit_depth)
-+ {
-+ case 1:
-+ num_palette = 2;
-+ color_inc = 0xff;
-+ break;
-+
-+ case 2:
-+ num_palette = 4;
-+ color_inc = 0x55;
-+ break;
-+
-+ case 4:
-+ num_palette = 16;
-+ color_inc = 0x11;
-+ break;
-+
-+ case 8:
-+ num_palette = 256;
-+ color_inc = 1;
-+ break;
-+
-+ default:
-+ num_palette = 0;
-+ color_inc = 0;
-+ break;
-+ }
-+
-+ for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
-+ {
-+ palette[i].red = (png_byte)v;
-+ palette[i].green = (png_byte)v;
-+ palette[i].blue = (png_byte)v;
-+ }
-+}
-+#endif
-+
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
- int PNGAPI
--png_handle_as_unknown(png_structp png_ptr, png_const_bytep chunk_name)
-+png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)
- {
- /* Check chunk_name and return "keep" value if it's on the list, else 0 */
-- int i;
-- png_bytep p;
-- if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list<=0)
-- return 0;
--
-- p = png_ptr->chunk_list + png_ptr->num_chunk_list*5 - 5;
-- for (i = png_ptr->num_chunk_list; i; i--, p -= 5)
-- if (!png_memcmp(chunk_name, p, 4))
-- return ((int)*(p + 4));
-- return 0;
-+ png_const_bytep p, p_end;
-+
-+ if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list == 0)
-+ return PNG_HANDLE_CHUNK_AS_DEFAULT;
-+
-+ p_end = png_ptr->chunk_list;
-+ p = p_end + png_ptr->num_chunk_list*5; /* beyond end */
-+
-+ /* The code is the fifth byte after each four byte string. Historically this
-+ * code was always searched from the end of the list, this is no longer
-+ * necessary because the 'set' routine handles duplicate entries correcty.
-+ */
-+ do /* num_chunk_list > 0, so at least one */
-+ {
-+ p -= 5;
-+
-+ if (memcmp(chunk_name, p, 4) == 0)
-+ return p[4];
-+ }
-+ while (p > p_end);
-+
-+ /* This means that known chunks should be processed and unknown chunks should
-+ * be handled according to the value of png_ptr->unknown_default; this can be
-+ * confusing because, as a result, there are two levels of defaulting for
-+ * unknown chunks.
-+ */
-+ return PNG_HANDLE_CHUNK_AS_DEFAULT;
- }
--# endif
--#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-+
-+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
-+ defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-+int /* PRIVATE */
-+png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name)
-+{
-+ png_byte chunk_string[5];
-+
-+ PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name);
-+ return png_handle_as_unknown(png_ptr, chunk_string);
-+}
-+#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
-+#endif /* SET_UNKNOWN_CHUNKS */
-
- #ifdef PNG_READ_SUPPORTED
- /* This function, added to libpng-1.0.6g, is untested. */
- int PNGAPI
--png_reset_zstream(png_structp png_ptr)
-+png_reset_zstream(png_structrp png_ptr)
- {
- if (png_ptr == NULL)
- return Z_STREAM_ERROR;
-
-+ /* WARNING: this resets the window bits to the maximum! */
- return (inflateReset(&png_ptr->zstream));
- }
--#endif /* PNG_READ_SUPPORTED */
-+#endif /* READ */
-
- /* This function was added to libpng-1.0.7 */
- png_uint_32 PNGAPI
-@@ -741,93 +978,1530 @@
-
-
- #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
--# ifdef PNG_SIZE_T
--/* Added at libpng version 1.2.6 */
-- PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
--png_size_t PNGAPI
--png_convert_size(size_t size)
-+/* Ensure that png_ptr->zstream.msg holds some appropriate error message string.
-+ * If it doesn't 'ret' is used to set it to something appropriate, even in cases
-+ * like Z_OK or Z_STREAM_END where the error code is apparently a success code.
-+ */
-+void /* PRIVATE */
-+png_zstream_error(png_structrp png_ptr, int ret)
- {
-- if (size > (png_size_t)-1)
-- PNG_ABORT(); /* We haven't got access to png_ptr, so no png_error() */
--
-- return ((png_size_t)size);
-+ /* Translate 'ret' into an appropriate error string, priority is given to the
-+ * one in zstream if set. This always returns a string, even in cases like
-+ * Z_OK or Z_STREAM_END where the error code is a success code.
-+ */
-+ if (png_ptr->zstream.msg == NULL) switch (ret)
-+ {
-+ default:
-+ case Z_OK:
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return code");
-+ break;
-+
-+ case Z_STREAM_END:
-+ /* Normal exit */
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected end of LZ stream");
-+ break;
-+
-+ case Z_NEED_DICT:
-+ /* This means the deflate stream did not have a dictionary; this
-+ * indicates a bogus PNG.
-+ */
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("missing LZ dictionary");
-+ break;
-+
-+ case Z_ERRNO:
-+ /* gz APIs only: should not happen */
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("zlib IO error");
-+ break;
-+
-+ case Z_STREAM_ERROR:
-+ /* internal libpng error */
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("bad parameters to zlib");
-+ break;
-+
-+ case Z_DATA_ERROR:
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("damaged LZ stream");
-+ break;
-+
-+ case Z_MEM_ERROR:
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("insufficient memory");
-+ break;
-+
-+ case Z_BUF_ERROR:
-+ /* End of input or output; not a problem if the caller is doing
-+ * incremental read or write.
-+ */
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("truncated");
-+ break;
-+
-+ case Z_VERSION_ERROR:
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("unsupported zlib version");
-+ break;
-+
-+ case PNG_UNEXPECTED_ZLIB_RETURN:
-+ /* Compile errors here mean that zlib now uses the value co-opted in
-+ * pngpriv.h for PNG_UNEXPECTED_ZLIB_RETURN; update the switch above
-+ * and change pngpriv.h. Note that this message is "... return",
-+ * whereas the default/Z_OK one is "... return code".
-+ */
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return");
-+ break;
-+ }
- }
--# endif /* PNG_SIZE_T */
-+
-+/* png_convert_size: a PNGAPI but no longer in png.h, so deleted
-+ * at libpng 1.5.5!
-+ */
-
- /* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
--# ifdef PNG_CHECK_cHRM_SUPPORTED
-+#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
-+static int
-+png_colorspace_check_gamma(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_fixed_point gAMA, int from)
-+ /* This is called to check a new gamma value against an existing one. The
-+ * routine returns false if the new gamma value should not be written.
-+ *
-+ * 'from' says where the new gamma value comes from:
-+ *
-+ * 0: the new gamma value is the libpng estimate for an ICC profile
-+ * 1: the new gamma value comes from a gAMA chunk
-+ * 2: the new gamma value comes from an sRGB chunk
-+ */
-+{
-+ png_fixed_point gtest;
-+
-+ if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-+ (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0 ||
-+ png_gamma_significant(gtest) != 0))
-+ {
-+ /* Either this is an sRGB image, in which case the calculated gamma
-+ * approximation should match, or this is an image with a profile and the
-+ * value libpng calculates for the gamma of the profile does not match the
-+ * value recorded in the file. The former, sRGB, case is an error, the
-+ * latter is just a warning.
-+ */
-+ if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
-+ {
-+ png_chunk_report(png_ptr, "gamma value does not match sRGB",
-+ PNG_CHUNK_ERROR);
-+ /* Do not overwrite an sRGB value */
-+ return from == 2;
-+ }
-+
-+ else /* sRGB tag not involved */
-+ {
-+ png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
-+ PNG_CHUNK_WARNING);
-+ return from == 1;
-+ }
-+ }
-+
-+ return 1;
-+}
-+
-+void /* PRIVATE */
-+png_colorspace_set_gamma(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_fixed_point gAMA)
-+{
-+ /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-+ * occur. Since the fixed point representation is asymetrical it is
-+ * possible for 1/gamma to overflow the limit of 21474 and this means the
-+ * gamma value must be at least 5/100000 and hence at most 20000.0. For
-+ * safety the limits here are a little narrower. The values are 0.00016 to
-+ * 6250.0, which are truly ridiculous gamma values (and will produce
-+ * displays that are all black or all white.)
-+ *
-+ * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk
-+ * handling code, which only required the value to be >0.
-+ */
-+ png_const_charp errmsg;
-+
-+ if (gAMA < 16 || gAMA > 625000000)
-+ errmsg = "gamma value out of range";
-+
-+# ifdef PNG_READ_gAMA_SUPPORTED
-+ /* Allow the application to set the gamma value more than once */
-+ else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-+ (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)
-+ errmsg = "duplicate";
-+# endif
-+
-+ /* Do nothing if the colorspace is already invalid */
-+ else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-+ return;
-+
-+ else
-+ {
-+ if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
-+ 1/*from gAMA*/) != 0)
-+ {
-+ /* Store this gamma value. */
-+ colorspace->gamma = gAMA;
-+ colorspace->flags |=
-+ (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);
-+ }
-+
-+ /* At present if the check_gamma test fails the gamma of the colorspace is
-+ * not updated however the colorspace is not invalidated. This
-+ * corresponds to the case where the existing gamma comes from an sRGB
-+ * chunk or profile. An error message has already been output.
-+ */
-+ return;
-+ }
-+
-+ /* Error exit - errmsg has been set. */
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+ png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);
-+}
-+
-+void /* PRIVATE */
-+png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
-+{
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-+ {
-+ /* Everything is invalid */
-+ info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
-+ PNG_INFO_iCCP);
-+
-+# ifdef PNG_COLORSPACE_SUPPORTED
-+ /* Clean up the iCCP profile now if it won't be used. */
-+ png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);
-+# else
-+ PNG_UNUSED(png_ptr)
-+# endif
-+ }
-+
-+ else
-+ {
-+# ifdef PNG_COLORSPACE_SUPPORTED
-+ /* Leave the INFO_iCCP flag set if the pngset.c code has already set
-+ * it; this allows a PNG to contain a profile which matches sRGB and
-+ * yet still have that profile retrievable by the application.
-+ */
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
-+ info_ptr->valid |= PNG_INFO_sRGB;
-+
-+ else
-+ info_ptr->valid &= ~PNG_INFO_sRGB;
-+
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-+ info_ptr->valid |= PNG_INFO_cHRM;
-+
-+ else
-+ info_ptr->valid &= ~PNG_INFO_cHRM;
-+# endif
-+
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
-+ info_ptr->valid |= PNG_INFO_gAMA;
-+
-+ else
-+ info_ptr->valid &= ~PNG_INFO_gAMA;
-+ }
-+}
-+
-+#ifdef PNG_READ_SUPPORTED
-+void /* PRIVATE */
-+png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
-+{
-+ if (info_ptr == NULL) /* reduce code size; check here not in the caller */
-+ return;
-+
-+ info_ptr->colorspace = png_ptr->colorspace;
-+ png_colorspace_sync_info(png_ptr, info_ptr);
-+}
-+#endif
-+#endif
-+
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+/* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
-+ * cHRM, as opposed to using chromaticities. These internal APIs return
-+ * non-zero on a parameter error. The X, Y and Z values are required to be
-+ * positive and less than 1.0.
-+ */
-+static int
-+png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
-+{
-+ png_int_32 d, dwhite, whiteX, whiteY;
-+
-+ d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
-+ if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
-+ return 1;
-+ if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
-+ return 1;
-+ dwhite = d;
-+ whiteX = XYZ->red_X;
-+ whiteY = XYZ->red_Y;
-+
-+ d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
-+ if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
-+ return 1;
-+ if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
-+ return 1;
-+ dwhite += d;
-+ whiteX += XYZ->green_X;
-+ whiteY += XYZ->green_Y;
-+
-+ d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
-+ if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
-+ return 1;
-+ if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
-+ return 1;
-+ dwhite += d;
-+ whiteX += XYZ->blue_X;
-+ whiteY += XYZ->blue_Y;
-+
-+ /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
-+ * thus:
-+ */
-+ if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
-+ return 1;
-+ if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)
-+ return 1;
-+
-+ return 0;
-+}
-+
-+static int
-+png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
-+{
-+ png_fixed_point red_inverse, green_inverse, blue_scale;
-+ png_fixed_point left, right, denominator;
-+
-+ /* Check xy and, implicitly, z. Note that wide gamut color spaces typically
-+ * have end points with 0 tristimulus values (these are impossible end
-+ * points, but they are used to cover the possible colors.)
-+ */
-+ if (xy->redx < 0 || xy->redx > PNG_FP_1) return 1;
-+ if (xy->redy < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;
-+ if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;
-+ if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;
-+ if (xy->bluex < 0 || xy->bluex > PNG_FP_1) return 1;
-+ if (xy->bluey < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;
-+ if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;
-+ if (xy->whitey < 0 || xy->whitey > PNG_FP_1-xy->whitex) return 1;
-+
-+ /* The reverse calculation is more difficult because the original tristimulus
-+ * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8
-+ * derived values were recorded in the cHRM chunk;
-+ * (red,green,blue,white)x(x,y). This loses one degree of freedom and
-+ * therefore an arbitrary ninth value has to be introduced to undo the
-+ * original transformations.
-+ *
-+ * Think of the original end-points as points in (X,Y,Z) space. The
-+ * chromaticity values (c) have the property:
-+ *
-+ * C
-+ * c = ---------
-+ * X + Y + Z
-+ *
-+ * For each c (x,y,z) from the corresponding original C (X,Y,Z). Thus the
-+ * three chromaticity values (x,y,z) for each end-point obey the
-+ * relationship:
-+ *
-+ * x + y + z = 1
-+ *
-+ * This describes the plane in (X,Y,Z) space that intersects each axis at the
-+ * value 1.0; call this the chromaticity plane. Thus the chromaticity
-+ * calculation has scaled each end-point so that it is on the x+y+z=1 plane
-+ * and chromaticity is the intersection of the vector from the origin to the
-+ * (X,Y,Z) value with the chromaticity plane.
-+ *
-+ * To fully invert the chromaticity calculation we would need the three
-+ * end-point scale factors, (red-scale, green-scale, blue-scale), but these
-+ * were not recorded. Instead we calculated the reference white (X,Y,Z) and
-+ * recorded the chromaticity of this. The reference white (X,Y,Z) would have
-+ * given all three of the scale factors since:
-+ *
-+ * color-C = color-c * color-scale
-+ * white-C = red-C + green-C + blue-C
-+ * = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
-+ *
-+ * But cHRM records only white-x and white-y, so we have lost the white scale
-+ * factor:
-+ *
-+ * white-C = white-c*white-scale
-+ *
-+ * To handle this the inverse transformation makes an arbitrary assumption
-+ * about white-scale:
-+ *
-+ * Assume: white-Y = 1.0
-+ * Hence: white-scale = 1/white-y
-+ * Or: red-Y + green-Y + blue-Y = 1.0
-+ *
-+ * Notice the last statement of the assumption gives an equation in three of
-+ * the nine values we want to calculate. 8 more equations come from the
-+ * above routine as summarised at the top above (the chromaticity
-+ * calculation):
-+ *
-+ * Given: color-x = color-X / (color-X + color-Y + color-Z)
-+ * Hence: (color-x - 1)*color-X + color.x*color-Y + color.x*color-Z = 0
-+ *
-+ * This is 9 simultaneous equations in the 9 variables "color-C" and can be
-+ * solved by Cramer's rule. Cramer's rule requires calculating 10 9x9 matrix
-+ * determinants, however this is not as bad as it seems because only 28 of
-+ * the total of 90 terms in the various matrices are non-zero. Nevertheless
-+ * Cramer's rule is notoriously numerically unstable because the determinant
-+ * calculation involves the difference of large, but similar, numbers. It is
-+ * difficult to be sure that the calculation is stable for real world values
-+ * and it is certain that it becomes unstable where the end points are close
-+ * together.
-+ *
-+ * So this code uses the perhaps slightly less optimal but more
-+ * understandable and totally obvious approach of calculating color-scale.
-+ *
-+ * This algorithm depends on the precision in white-scale and that is
-+ * (1/white-y), so we can immediately see that as white-y approaches 0 the
-+ * accuracy inherent in the cHRM chunk drops off substantially.
-+ *
-+ * libpng arithmetic: a simple inversion of the above equations
-+ * ------------------------------------------------------------
-+ *
-+ * white_scale = 1/white-y
-+ * white-X = white-x * white-scale
-+ * white-Y = 1.0
-+ * white-Z = (1 - white-x - white-y) * white_scale
-+ *
-+ * white-C = red-C + green-C + blue-C
-+ * = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
-+ *
-+ * This gives us three equations in (red-scale,green-scale,blue-scale) where
-+ * all the coefficients are now known:
-+ *
-+ * red-x*red-scale + green-x*green-scale + blue-x*blue-scale
-+ * = white-x/white-y
-+ * red-y*red-scale + green-y*green-scale + blue-y*blue-scale = 1
-+ * red-z*red-scale + green-z*green-scale + blue-z*blue-scale
-+ * = (1 - white-x - white-y)/white-y
-+ *
-+ * In the last equation color-z is (1 - color-x - color-y) so we can add all
-+ * three equations together to get an alternative third:
-+ *
-+ * red-scale + green-scale + blue-scale = 1/white-y = white-scale
-+ *
-+ * So now we have a Cramer's rule solution where the determinants are just
-+ * 3x3 - far more tractible. Unfortunately 3x3 determinants still involve
-+ * multiplication of three coefficients so we can't guarantee to avoid
-+ * overflow in the libpng fixed point representation. Using Cramer's rule in
-+ * floating point is probably a good choice here, but it's not an option for
-+ * fixed point. Instead proceed to simplify the first two equations by
-+ * eliminating what is likely to be the largest value, blue-scale:
-+ *
-+ * blue-scale = white-scale - red-scale - green-scale
-+ *
-+ * Hence:
-+ *
-+ * (red-x - blue-x)*red-scale + (green-x - blue-x)*green-scale =
-+ * (white-x - blue-x)*white-scale
-+ *
-+ * (red-y - blue-y)*red-scale + (green-y - blue-y)*green-scale =
-+ * 1 - blue-y*white-scale
-+ *
-+ * And now we can trivially solve for (red-scale,green-scale):
-+ *
-+ * green-scale =
-+ * (white-x - blue-x)*white-scale - (red-x - blue-x)*red-scale
-+ * -----------------------------------------------------------
-+ * green-x - blue-x
-+ *
-+ * red-scale =
-+ * 1 - blue-y*white-scale - (green-y - blue-y) * green-scale
-+ * ---------------------------------------------------------
-+ * red-y - blue-y
-+ *
-+ * Hence:
-+ *
-+ * red-scale =
-+ * ( (green-x - blue-x) * (white-y - blue-y) -
-+ * (green-y - blue-y) * (white-x - blue-x) ) / white-y
-+ * -------------------------------------------------------------------------
-+ * (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
-+ *
-+ * green-scale =
-+ * ( (red-y - blue-y) * (white-x - blue-x) -
-+ * (red-x - blue-x) * (white-y - blue-y) ) / white-y
-+ * -------------------------------------------------------------------------
-+ * (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
-+ *
-+ * Accuracy:
-+ * The input values have 5 decimal digits of accuracy. The values are all in
-+ * the range 0 < value < 1, so simple products are in the same range but may
-+ * need up to 10 decimal digits to preserve the original precision and avoid
-+ * underflow. Because we are using a 32-bit signed representation we cannot
-+ * match this; the best is a little over 9 decimal digits, less than 10.
-+ *
-+ * The approach used here is to preserve the maximum precision within the
-+ * signed representation. Because the red-scale calculation above uses the
-+ * difference between two products of values that must be in the range -1..+1
-+ * it is sufficient to divide the product by 7; ceil(100,000/32767*2). The
-+ * factor is irrelevant in the calculation because it is applied to both
-+ * numerator and denominator.
-+ *
-+ * Note that the values of the differences of the products of the
-+ * chromaticities in the above equations tend to be small, for example for
-+ * the sRGB chromaticities they are:
-+ *
-+ * red numerator: -0.04751
-+ * green numerator: -0.08788
-+ * denominator: -0.2241 (without white-y multiplication)
-+ *
-+ * The resultant Y coefficients from the chromaticities of some widely used
-+ * color space definitions are (to 15 decimal places):
-+ *
-+ * sRGB
-+ * 0.212639005871510 0.715168678767756 0.072192315360734
-+ * Kodak ProPhoto
-+ * 0.288071128229293 0.711843217810102 0.000085653960605
-+ * Adobe RGB
-+ * 0.297344975250536 0.627363566255466 0.075291458493998
-+ * Adobe Wide Gamut RGB
-+ * 0.258728243040113 0.724682314948566 0.016589442011321
-+ */
-+ /* By the argument, above overflow should be impossible here. The return
-+ * value of 2 indicates an internal error to the caller.
-+ */
-+ if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
-+ return 2;
-+ if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
-+ return 2;
-+ denominator = left - right;
-+
-+ /* Now find the red numerator. */
-+ if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
-+ return 2;
-+ if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
-+ return 2;
-+
-+ /* Overflow is possible here and it indicates an extreme set of PNG cHRM
-+ * chunk values. This calculation actually returns the reciprocal of the
-+ * scale value because this allows us to delay the multiplication of white-y
-+ * into the denominator, which tends to produce a small number.
-+ */
-+ if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
-+ red_inverse <= xy->whitey /* r+g+b scales = white scale */)
-+ return 1;
-+
-+ /* Similarly for green_inverse: */
-+ if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
-+ return 2;
-+ if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
-+ return 2;
-+ if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
-+ green_inverse <= xy->whitey)
-+ return 1;
-+
-+ /* And the blue scale, the checks above guarantee this can't overflow but it
-+ * can still produce 0 for extreme cHRM values.
-+ */
-+ blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
-+ png_reciprocal(green_inverse);
-+ if (blue_scale <= 0)
-+ return 1;
-+
-+
-+ /* And fill in the png_XYZ: */
-+ if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,
-+ red_inverse) == 0)
-+ return 1;
-+
-+ if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,
-+ green_inverse) == 0)
-+ return 1;
-+
-+ if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,
-+ PNG_FP_1) == 0)
-+ return 1;
-+
-+ return 0; /*success*/
-+}
-+
-+static int
-+png_XYZ_normalize(png_XYZ *XYZ)
-+{
-+ png_int_32 Y;
-+
-+ if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||
-+ XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||
-+ XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)
-+ return 1;
-+
-+ /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.
-+ * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
-+ * relying on addition of two positive values producing a negative one is not
-+ * safe.
-+ */
-+ Y = XYZ->red_Y;
-+ if (0x7fffffff - Y < XYZ->green_X)
-+ return 1;
-+ Y += XYZ->green_Y;
-+ if (0x7fffffff - Y < XYZ->blue_X)
-+ return 1;
-+ Y += XYZ->blue_Y;
-+
-+ if (Y != PNG_FP_1)
-+ {
-+ if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
-+ return 1;
-+
-+ if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
-+ return 1;
-+
-+ if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
-+ return 1;
-+ if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+static int
-+png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
-+{
-+ /* Allow an error of +/-0.01 (absolute value) on each chromaticity */
-+ if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
-+ PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
-+ PNG_OUT_OF_RANGE(xy1->redx, xy2->redx, delta) ||
-+ PNG_OUT_OF_RANGE(xy1->redy, xy2->redy, delta) ||
-+ PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
-+ PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
-+ PNG_OUT_OF_RANGE(xy1->bluex, xy2->bluex, delta) ||
-+ PNG_OUT_OF_RANGE(xy1->bluey, xy2->bluey, delta))
-+ return 0;
-+ return 1;
-+}
-+
-+/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
-+ * chunk chromaticities. Earlier checks used to simply look for the overflow
-+ * condition (where the determinant of the matrix to solve for XYZ ends up zero
-+ * because the chromaticity values are not all distinct.) Despite this it is
-+ * theoretically possible to produce chromaticities that are apparently valid
-+ * but that rapidly degrade to invalid, potentially crashing, sets because of
-+ * arithmetic inaccuracies when calculations are performed on them. The new
-+ * check is to round-trip xy -> XYZ -> xy and then check that the result is
-+ * within a small percentage of the original.
-+ */
-+static int
-+png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
-+{
-+ int result;
-+ png_xy xy_test;
-+
-+ /* As a side-effect this routine also returns the XYZ endpoints. */
-+ result = png_XYZ_from_xy(XYZ, xy);
-+ if (result != 0)
-+ return result;
-+
-+ result = png_xy_from_XYZ(&xy_test, XYZ);
-+ if (result != 0)
-+ return result;
-+
-+ if (png_colorspace_endpoints_match(xy, &xy_test,
-+ 5/*actually, the math is pretty accurate*/) != 0)
-+ return 0;
-+
-+ /* Too much slip */
-+ return 1;
-+}
-+
-+/* This is the check going the other way. The XYZ is modified to normalize it
-+ * (another side-effect) and the xy chromaticities are returned.
-+ */
-+static int
-+png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
-+{
-+ int result;
-+ png_XYZ XYZtemp;
-+
-+ result = png_XYZ_normalize(XYZ);
-+ if (result != 0)
-+ return result;
-+
-+ result = png_xy_from_XYZ(xy, XYZ);
-+ if (result != 0)
-+ return result;
-+
-+ XYZtemp = *XYZ;
-+ return png_colorspace_check_xy(&XYZtemp, xy);
-+}
-+
-+/* Used to check for an endpoint match against sRGB */
-+static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
-+{
-+ /* color x y */
-+ /* red */ 64000, 33000,
-+ /* green */ 30000, 60000,
-+ /* blue */ 15000, 6000,
-+ /* white */ 31270, 32900
-+};
-+
-+static int
-+png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
-+ int preferred)
-+{
-+ if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-+ return 0;
-+
-+ /* The consistency check is performed on the chromaticities; this factors out
-+ * variations because of the normalization (or not) of the end point Y
-+ * values.
-+ */
-+ if (preferred < 2 &&
-+ (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-+ {
-+ /* The end points must be reasonably close to any we already have. The
-+ * following allows an error of up to +/-.001
-+ */
-+ if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
-+ 100) == 0)
-+ {
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+ png_benign_error(png_ptr, "inconsistent chromaticities");
-+ return 0; /* failed */
-+ }
-+
-+ /* Only overwrite with preferred values */
-+ if (preferred == 0)
-+ return 1; /* ok, but no change */
-+ }
-+
-+ colorspace->end_points_xy = *xy;
-+ colorspace->end_points_XYZ = *XYZ;
-+ colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;
-+
-+ /* The end points are normally quoted to two decimal digits, so allow +/-0.01
-+ * on this test.
-+ */
-+ if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
-+ colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
-+
-+ else
-+ colorspace->flags &= PNG_COLORSPACE_CANCEL(
-+ PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-+
-+ return 2; /* ok and changed */
-+}
-
- int /* PRIVATE */
--png_check_cHRM_fixed(png_structp png_ptr,
-- png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-- png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-- png_fixed_point blue_x, png_fixed_point blue_y)
-+png_colorspace_set_chromaticities(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, const png_xy *xy, int preferred)
- {
-- int ret = 1;
-- unsigned long xy_hi,xy_lo,yx_hi,yx_lo;
--
-- png_debug(1, "in function png_check_cHRM_fixed");
--
-- if (png_ptr == NULL)
-+ /* We must check the end points to ensure they are reasonable - in the past
-+ * color management systems have crashed as a result of getting bogus
-+ * colorant values, while this isn't the fault of libpng it is the
-+ * responsibility of libpng because PNG carries the bomb and libpng is in a
-+ * position to protect against it.
-+ */
-+ png_XYZ XYZ;
-+
-+ switch (png_colorspace_check_xy(&XYZ, xy))
-+ {
-+ case 0: /* success */
-+ return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
-+ preferred);
-+
-+ case 1:
-+ /* We can't invert the chromaticities so we can't produce value XYZ
-+ * values. Likely as not a color management system will fail too.
-+ */
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+ png_benign_error(png_ptr, "invalid chromaticities");
-+ break;
-+
-+ default:
-+ /* libpng is broken; this should be a warning but if it happens we
-+ * want error reports so for the moment it is an error.
-+ */
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+ png_error(png_ptr, "internal error checking chromaticities");
-+ break;
-+ }
-+
-+ return 0; /* failed */
-+}
-+
-+int /* PRIVATE */
-+png_colorspace_set_endpoints(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
-+{
-+ png_XYZ XYZ = *XYZ_in;
-+ png_xy xy;
-+
-+ switch (png_colorspace_check_XYZ(&xy, &XYZ))
-+ {
-+ case 0:
-+ return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
-+ preferred);
-+
-+ case 1:
-+ /* End points are invalid. */
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+ png_benign_error(png_ptr, "invalid end points");
-+ break;
-+
-+ default:
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+ png_error(png_ptr, "internal error checking chromaticities");
-+ break;
-+ }
-+
-+ return 0; /* failed */
-+}
-+
-+#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)
-+/* Error message generation */
-+static char
-+png_icc_tag_char(png_uint_32 byte)
-+{
-+ byte &= 0xff;
-+ if (byte >= 32 && byte <= 126)
-+ return (char)byte;
-+ else
-+ return '?';
-+}
-+
-+static void
-+png_icc_tag_name(char *name, png_uint_32 tag)
-+{
-+ name[0] = '\'';
-+ name[1] = png_icc_tag_char(tag >> 24);
-+ name[2] = png_icc_tag_char(tag >> 16);
-+ name[3] = png_icc_tag_char(tag >> 8);
-+ name[4] = png_icc_tag_char(tag );
-+ name[5] = '\'';
-+}
-+
-+static int
-+is_ICC_signature_char(png_alloc_size_t it)
-+{
-+ return it == 32 || (it >= 48 && it <= 57) || (it >= 65 && it <= 90) ||
-+ (it >= 97 && it <= 122);
-+}
-+
-+static int
-+is_ICC_signature(png_alloc_size_t it)
-+{
-+ return is_ICC_signature_char(it >> 24) /* checks all the top bits */ &&
-+ is_ICC_signature_char((it >> 16) & 0xff) &&
-+ is_ICC_signature_char((it >> 8) & 0xff) &&
-+ is_ICC_signature_char(it & 0xff);
-+}
-+
-+static int
-+png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ png_const_charp name, png_alloc_size_t value, png_const_charp reason)
-+{
-+ size_t pos;
-+ char message[196]; /* see below for calculation */
-+
-+ if (colorspace != NULL)
-+ colorspace->flags |= PNG_COLORSPACE_INVALID;
-+
-+ pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
-+ pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
-+ pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
-+ if (is_ICC_signature(value) != 0)
-+ {
-+ /* So 'value' is at most 4 bytes and the following cast is safe */
-+ png_icc_tag_name(message+pos, (png_uint_32)value);
-+ pos += 6; /* total +8; less than the else clause */
-+ message[pos++] = ':';
-+ message[pos++] = ' ';
-+ }
-+# ifdef PNG_WARNINGS_SUPPORTED
-+ else
-+ {
-+ char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
-+
-+ pos = png_safecat(message, (sizeof message), pos,
-+ png_format_number(number, number+(sizeof number),
-+ PNG_NUMBER_FORMAT_x, value));
-+ pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
-+ }
-+# endif
-+ /* The 'reason' is an arbitrary message, allow +79 maximum 195 */
-+ pos = png_safecat(message, (sizeof message), pos, reason);
-+ PNG_UNUSED(pos)
-+
-+ /* This is recoverable, but make it unconditionally an app_error on write to
-+ * avoid writing invalid ICC profiles into PNG files (i.e., we handle them
-+ * on read, with a warning, but on write unless the app turns off
-+ * application errors the PNG won't be written.)
-+ */
-+ png_chunk_report(png_ptr, message,
-+ (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
-+
-+ return 0;
-+}
-+#endif /* sRGB || iCCP */
-+
-+#ifdef PNG_sRGB_SUPPORTED
-+int /* PRIVATE */
-+png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ int intent)
-+{
-+ /* sRGB sets known gamma, end points and (from the chunk) intent. */
-+ /* IMPORTANT: these are not necessarily the values found in an ICC profile
-+ * because ICC profiles store values adapted to a D50 environment; it is
-+ * expected that the ICC profile mediaWhitePointTag will be D50; see the
-+ * checks and code elsewhere to understand this better.
-+ *
-+ * These XYZ values, which are accurate to 5dp, produce rgb to gray
-+ * coefficients of (6968,23435,2366), which are reduced (because they add up
-+ * to 32769 not 32768) to (6968,23434,2366). These are the values that
-+ * libpng has traditionally used (and are the best values given the 15bit
-+ * algorithm used by the rgb to gray code.)
-+ */
-+ static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */
-+ {
-+ /* color X Y Z */
-+ /* red */ 41239, 21264, 1933,
-+ /* green */ 35758, 71517, 11919,
-+ /* blue */ 18048, 7219, 95053
-+ };
-+
-+ /* Do nothing if the colorspace is already invalidated. */
-+ if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
- return 0;
-
-- /* (x,y,z) values are first limited to 0..100000 (PNG_FP_1), the white
-- * y must also be greater than 0. To test for the upper limit calculate
-- * (PNG_FP_1-y) - x must be <= to this for z to be >= 0 (and the expression
-- * cannot overflow.) At this point we know x and y are >= 0 and (x+y) is
-- * <= PNG_FP_1. The previous test on PNG_MAX_UINT_31 is removed because it
-- * pointless (and it produces compiler warnings!)
-+ /* Check the intent, then check for existing settings. It is valid for the
-+ * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must
-+ * be consistent with the correct values. If, however, this function is
-+ * called below because an iCCP chunk matches sRGB then it is quite
-+ * conceivable that an older app recorded incorrect gAMA and cHRM because of
-+ * an incorrect calculation based on the values in the profile - this does
-+ * *not* invalidate the profile (though it still produces an error, which can
-+ * be ignored.)
- */
-- if (white_x < 0 || white_y <= 0 ||
-- red_x < 0 || red_y < 0 ||
-- green_x < 0 || green_y < 0 ||
-- blue_x < 0 || blue_y < 0)
-+ if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
-+ return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-+ (unsigned)intent, "invalid sRGB rendering intent");
-+
-+ if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
-+ colorspace->rendering_intent != intent)
-+ return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-+ (unsigned)intent, "inconsistent rendering intents");
-+
-+ if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)
- {
-- png_warning(png_ptr,
-- "Ignoring attempt to set negative chromaticity value");
-- ret = 0;
-+ png_benign_error(png_ptr, "duplicate sRGB information ignored");
-+ return 0;
- }
-- /* And (x+y) must be <= PNG_FP_1 (so z is >= 0) */
-- if (white_x > PNG_FP_1 - white_y)
-+
-+ /* If the standard sRGB cHRM chunk does not match the one from the PNG file
-+ * warn but overwrite the value with the correct one.
-+ */
-+ if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
-+ !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
-+ 100))
-+ png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
-+ PNG_CHUNK_ERROR);
-+
-+ /* This check is just done for the error reporting - the routine always
-+ * returns true when the 'from' argument corresponds to sRGB (2).
-+ */
-+ (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
-+ 2/*from sRGB*/);
-+
-+ /* intent: bugs in GCC force 'int' to be used as the parameter type. */
-+ colorspace->rendering_intent = (png_uint_16)intent;
-+ colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;
-+
-+ /* endpoints */
-+ colorspace->end_points_xy = sRGB_xy;
-+ colorspace->end_points_XYZ = sRGB_XYZ;
-+ colorspace->flags |=
-+ (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-+
-+ /* gamma */
-+ colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;
-+ colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;
-+
-+ /* Finally record that we have an sRGB profile */
-+ colorspace->flags |=
-+ (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);
-+
-+ return 1; /* set */
-+}
-+#endif /* sRGB */
-+
-+#ifdef PNG_iCCP_SUPPORTED
-+/* Encoded value of D50 as an ICC XYZNumber. From the ICC 2010 spec the value
-+ * is XYZ(0.9642,1.0,0.8249), which scales to:
-+ *
-+ * (63189.8112, 65536, 54060.6464)
-+ */
-+static const png_byte D50_nCIEXYZ[12] =
-+ { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
-+
-+int /* PRIVATE */
-+png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ png_const_charp name, png_uint_32 profile_length)
-+{
-+ if (profile_length < 132)
-+ return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-+ "too short");
-+
-+ return 1;
-+}
-+
-+int /* PRIVATE */
-+png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ png_const_charp name, png_uint_32 profile_length,
-+ png_const_bytep profile/* first 132 bytes only */, int color_type)
-+{
-+ png_uint_32 temp;
-+
-+ /* Length check; this cannot be ignored in this code because profile_length
-+ * is used later to check the tag table, so even if the profile seems over
-+ * long profile_length from the caller must be correct. The caller can fix
-+ * this up on read or write by just passing in the profile header length.
-+ */
-+ temp = png_get_uint_32(profile);
-+ if (temp != profile_length)
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "length does not match profile");
-+
-+ temp = (png_uint_32) (*(profile+8));
-+ if (temp > 3 && (profile_length & 3))
-+ return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-+ "invalid length");
-+
-+ temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
-+ if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
-+ profile_length < 132+12*temp) /* truncated tag table */
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "tag count too large");
-+
-+ /* The 'intent' must be valid or we can't store it, ICC limits the intent to
-+ * 16 bits.
-+ */
-+ temp = png_get_uint_32(profile+64);
-+ if (temp >= 0xffff) /* The ICC limit */
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "invalid rendering intent");
-+
-+ /* This is just a warning because the profile may be valid in future
-+ * versions.
-+ */
-+ if (temp >= PNG_sRGB_INTENT_LAST)
-+ (void)png_icc_profile_error(png_ptr, NULL, name, temp,
-+ "intent outside defined range");
-+
-+ /* At this point the tag table can't be checked because it hasn't necessarily
-+ * been loaded; however, various header fields can be checked. These checks
-+ * are for values permitted by the PNG spec in an ICC profile; the PNG spec
-+ * restricts the profiles that can be passed in an iCCP chunk (they must be
-+ * appropriate to processing PNG data!)
-+ */
-+
-+ /* Data checks (could be skipped). These checks must be independent of the
-+ * version number; however, the version number doesn't accomodate changes in
-+ * the header fields (just the known tags and the interpretation of the
-+ * data.)
-+ */
-+ temp = png_get_uint_32(profile+36); /* signature 'ascp' */
-+ if (temp != 0x61637370)
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "invalid signature");
-+
-+ /* Currently the PCS illuminant/adopted white point (the computational
-+ * white point) are required to be D50,
-+ * however the profile contains a record of the illuminant so perhaps ICC
-+ * expects to be able to change this in the future (despite the rationale in
-+ * the introduction for using a fixed PCS adopted white.) Consequently the
-+ * following is just a warning.
-+ */
-+ if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
-+ (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
-+ "PCS illuminant is not D50");
-+
-+ /* The PNG spec requires this:
-+ * "If the iCCP chunk is present, the image samples conform to the colour
-+ * space represented by the embedded ICC profile as defined by the
-+ * International Color Consortium [ICC]. The colour space of the ICC profile
-+ * shall be an RGB colour space for colour images (PNG colour types 2, 3, and
-+ * 6), or a greyscale colour space for greyscale images (PNG colour types 0
-+ * and 4)."
-+ *
-+ * This checking code ensures the embedded profile (on either read or write)
-+ * conforms to the specification requirements. Notice that an ICC 'gray'
-+ * color-space profile contains the information to transform the monochrome
-+ * data to XYZ or L*a*b (according to which PCS the profile uses) and this
-+ * should be used in preference to the standard libpng K channel replication
-+ * into R, G and B channels.
-+ *
-+ * Previously it was suggested that an RGB profile on grayscale data could be
-+ * handled. However it it is clear that using an RGB profile in this context
-+ * must be an error - there is no specification of what it means. Thus it is
-+ * almost certainly more correct to ignore the profile.
-+ */
-+ temp = png_get_uint_32(profile+16); /* data colour space field */
-+ switch (temp)
- {
-- png_warning(png_ptr, "Invalid cHRM white point");
-- ret = 0;
-+ case 0x52474220: /* 'RGB ' */
-+ if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "RGB color space not permitted on grayscale PNG");
-+ break;
-+
-+ case 0x47524159: /* 'GRAY' */
-+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "Gray color space not permitted on RGB PNG");
-+ break;
-+
-+ default:
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "invalid ICC profile color space");
- }
-
-- if (red_x > PNG_FP_1 - red_y)
-+ /* It is up to the application to check that the profile class matches the
-+ * application requirements; the spec provides no guidance, but it's pretty
-+ * weird if the profile is not scanner ('scnr'), monitor ('mntr'), printer
-+ * ('prtr') or 'spac' (for generic color spaces). Issue a warning in these
-+ * cases. Issue an error for device link or abstract profiles - these don't
-+ * contain the records necessary to transform the color-space to anything
-+ * other than the target device (and not even that for an abstract profile).
-+ * Profiles of these classes may not be embedded in images.
-+ */
-+ temp = png_get_uint_32(profile+12); /* profile/device class */
-+ switch (temp)
- {
-- png_warning(png_ptr, "Invalid cHRM red point");
-- ret = 0;
-+ case 0x73636E72: /* 'scnr' */
-+ case 0x6D6E7472: /* 'mntr' */
-+ case 0x70727472: /* 'prtr' */
-+ case 0x73706163: /* 'spac' */
-+ /* All supported */
-+ break;
-+
-+ case 0x61627374: /* 'abst' */
-+ /* May not be embedded in an image */
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "invalid embedded Abstract ICC profile");
-+
-+ case 0x6C696E6B: /* 'link' */
-+ /* DeviceLink profiles cannot be interpreted in a non-device specific
-+ * fashion, if an app uses the AToB0Tag in the profile the results are
-+ * undefined unless the result is sent to the intended device,
-+ * therefore a DeviceLink profile should not be found embedded in a
-+ * PNG.
-+ */
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "unexpected DeviceLink ICC profile class");
-+
-+ case 0x6E6D636C: /* 'nmcl' */
-+ /* A NamedColor profile is also device specific, however it doesn't
-+ * contain an AToB0 tag that is open to misinterpretation. Almost
-+ * certainly it will fail the tests below.
-+ */
-+ (void)png_icc_profile_error(png_ptr, NULL, name, temp,
-+ "unexpected NamedColor ICC profile class");
-+ break;
-+
-+ default:
-+ /* To allow for future enhancements to the profile accept unrecognized
-+ * profile classes with a warning, these then hit the test below on the
-+ * tag content to ensure they are backward compatible with one of the
-+ * understood profiles.
-+ */
-+ (void)png_icc_profile_error(png_ptr, NULL, name, temp,
-+ "unrecognized ICC profile class");
-+ break;
- }
-
-- if (green_x > PNG_FP_1 - green_y)
-+ /* For any profile other than a device link one the PCS must be encoded
-+ * either in XYZ or Lab.
-+ */
-+ temp = png_get_uint_32(profile+20);
-+ switch (temp)
- {
-- png_warning(png_ptr, "Invalid cHRM green point");
-- ret = 0;
-+ case 0x58595A20: /* 'XYZ ' */
-+ case 0x4C616220: /* 'Lab ' */
-+ break;
-+
-+ default:
-+ return png_icc_profile_error(png_ptr, colorspace, name, temp,
-+ "unexpected ICC PCS encoding");
- }
-
-- if (blue_x > PNG_FP_1 - blue_y)
-+ return 1;
-+}
-+
-+int /* PRIVATE */
-+png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ png_const_charp name, png_uint_32 profile_length,
-+ png_const_bytep profile /* header plus whole tag table */)
-+{
-+ png_uint_32 tag_count = png_get_uint_32(profile+128);
-+ png_uint_32 itag;
-+ png_const_bytep tag = profile+132; /* The first tag */
-+
-+ /* First scan all the tags in the table and add bits to the icc_info value
-+ * (temporarily in 'tags').
-+ */
-+ for (itag=0; itag < tag_count; ++itag, tag += 12)
- {
-- png_warning(png_ptr, "Invalid cHRM blue point");
-- ret = 0;
-+ png_uint_32 tag_id = png_get_uint_32(tag+0);
-+ png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */
-+ png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */
-+
-+ /* The ICC specification does not exclude zero length tags, therefore the
-+ * start might actually be anywhere if there is no data, but this would be
-+ * a clear abuse of the intent of the standard so the start is checked for
-+ * being in range. All defined tag types have an 8 byte header - a 4 byte
-+ * type signature then 0.
-+ */
-+ if ((tag_start & 3) != 0)
-+ {
-+ /* CNHP730S.icc shipped with Microsoft Windows 64 violates this, it is
-+ * only a warning here because libpng does not care about the
-+ * alignment.
-+ */
-+ (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
-+ "ICC profile tag start not a multiple of 4");
-+ }
-+
-+ /* This is a hard error; potentially it can cause read outside the
-+ * profile.
-+ */
-+ if (tag_start > profile_length || tag_length > profile_length - tag_start)
-+ return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
-+ "ICC profile tag outside profile");
- }
-
-- png_64bit_product(green_x - red_x, blue_y - red_y, &xy_hi, &xy_lo);
-- png_64bit_product(green_y - red_y, blue_x - red_x, &yx_hi, &yx_lo);
--
-- if (xy_hi == yx_hi && xy_lo == yx_lo)
-+ return 1; /* success, maybe with warnings */
-+}
-+
-+#if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-+/* Information about the known ICC sRGB profiles */
-+static const struct
-+{
-+ png_uint_32 adler, crc, length;
-+ png_uint_32 md5[4];
-+ png_byte have_md5;
-+ png_byte is_broken;
-+ png_uint_16 intent;
-+
-+# define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)
-+# define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\
-+ { adler, crc, length, md5, broke, intent },
-+
-+} png_sRGB_checks[] =
-+{
-+ /* This data comes from contrib/tools/checksum-icc run on downloads of
-+ * all four ICC sRGB profiles from www.color.org.
-+ */
-+ /* adler32, crc32, MD5[4], intent, date, length, file-name */
-+ PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
-+ PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
-+ "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
-+
-+ /* ICC sRGB v2 perceptual no black-compensation: */
-+ PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
-+ PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
-+ "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
-+
-+ PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
-+ PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
-+ "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
-+
-+ /* ICC sRGB v4 perceptual */
-+ PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
-+ PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
-+ "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
-+
-+ /* The following profiles have no known MD5 checksum. If there is a match
-+ * on the (empty) MD5 the other fields are used to attempt a match and
-+ * a warning is produced. The first two of these profiles have a 'cprt' tag
-+ * which suggests that they were also made by Hewlett Packard.
-+ */
-+ PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
-+ PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
-+ "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
-+
-+ /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
-+ * match the D50 PCS illuminant in the header (it is in fact the D65 values,
-+ * so the white point is recorded as the un-adapted value.) The profiles
-+ * below only differ in one byte - the intent - and are basically the same as
-+ * the previous profile except for the mediaWhitePointTag error and a missing
-+ * chromaticAdaptationTag.
-+ */
-+ PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
-+ PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
-+ "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
-+
-+ PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
-+ PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
-+ "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
-+};
-+
-+static int
-+png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
-+ png_const_bytep profile, uLong adler)
-+{
-+ /* The quick check is to verify just the MD5 signature and trust the
-+ * rest of the data. Because the profile has already been verified for
-+ * correctness this is safe. png_colorspace_set_sRGB will check the 'intent'
-+ * field too, so if the profile has been edited with an intent not defined
-+ * by sRGB (but maybe defined by a later ICC specification) the read of
-+ * the profile will fail at that point.
-+ */
-+
-+ png_uint_32 length = 0;
-+ png_uint_32 intent = 0x10000; /* invalid */
-+#if PNG_sRGB_PROFILE_CHECKS > 1
-+ uLong crc = 0; /* the value for 0 length data */
-+#endif
-+ unsigned int i;
-+
-+#ifdef PNG_SET_OPTION_SUPPORTED
-+ /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */
-+ if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==
-+ PNG_OPTION_ON)
-+ return 0;
-+#endif
-+
-+ for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)
- {
-- png_warning(png_ptr,
-- "Ignoring attempt to set cHRM RGB triangle with zero area");
-- ret = 0;
-+ if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&
-+ png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&
-+ png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&
-+ png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])
-+ {
-+ /* This may be one of the old HP profiles without an MD5, in that
-+ * case we can only use the length and Adler32 (note that these
-+ * are not used by default if there is an MD5!)
-+ */
-+# if PNG_sRGB_PROFILE_CHECKS == 0
-+ if (png_sRGB_checks[i].have_md5 != 0)
-+ return 1+png_sRGB_checks[i].is_broken;
-+# endif
-+
-+ /* Profile is unsigned or more checks have been configured in. */
-+ if (length == 0)
-+ {
-+ length = png_get_uint_32(profile);
-+ intent = png_get_uint_32(profile+64);
-+ }
-+
-+ /* Length *and* intent must match */
-+ if (length == png_sRGB_checks[i].length &&
-+ intent == png_sRGB_checks[i].intent)
-+ {
-+ /* Now calculate the adler32 if not done already. */
-+ if (adler == 0)
-+ {
-+ adler = adler32(0, NULL, 0);
-+ adler = adler32(adler, profile, length);
-+ }
-+
-+ if (adler == png_sRGB_checks[i].adler)
-+ {
-+ /* These basic checks suggest that the data has not been
-+ * modified, but if the check level is more than 1 perform
-+ * our own crc32 checksum on the data.
-+ */
-+# if PNG_sRGB_PROFILE_CHECKS > 1
-+ if (crc == 0)
-+ {
-+ crc = crc32(0, NULL, 0);
-+ crc = crc32(crc, profile, length);
-+ }
-+
-+ /* So this check must pass for the 'return' below to happen.
-+ */
-+ if (crc == png_sRGB_checks[i].crc)
-+# endif
-+ {
-+ if (png_sRGB_checks[i].is_broken != 0)
-+ {
-+ /* These profiles are known to have bad data that may cause
-+ * problems if they are used, therefore attempt to
-+ * discourage their use, skip the 'have_md5' warning below,
-+ * which is made irrelevant by this error.
-+ */
-+ png_chunk_report(png_ptr, "known incorrect sRGB profile",
-+ PNG_CHUNK_ERROR);
-+ }
-+
-+ /* Warn that this being done; this isn't even an error since
-+ * the profile is perfectly valid, but it would be nice if
-+ * people used the up-to-date ones.
-+ */
-+ else if (png_sRGB_checks[i].have_md5 == 0)
-+ {
-+ png_chunk_report(png_ptr, "out-of-date sRGB profile with"
-+ " no signature",
-+ PNG_CHUNK_WARNING);
-+ }
-+
-+ return 1+png_sRGB_checks[i].is_broken;
-+ }
-+ }
-+
-+# if PNG_sRGB_PROFILE_CHECKS > 0
-+ /* The signature matched, but the profile had been changed in some
-+ * way. This probably indicates a data error or uninformed hacking.
-+ * Fall through to "no match".
-+ */
-+ png_chunk_report(png_ptr, "Not recognizing known sRGB profile that"
-+ " has been edited",
-+ PNG_CHUNK_WARNING);
-+ break;
-+# endif
-+ }
-+ }
- }
-
-- return ret;
-+ return 0; /* no match */
- }
--# endif /* PNG_CHECK_cHRM_SUPPORTED */
--
-+#endif
-+
-+#ifdef PNG_sRGB_SUPPORTED
- void /* PRIVATE */
--png_check_IHDR(png_structp png_ptr,
-+png_icc_set_sRGB(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
-+{
-+ /* Is this profile one of the known ICC sRGB profiles? If it is, just set
-+ * the sRGB information.
-+ */
-+#if PNG_sRGB_PROFILE_CHECKS >= 0
-+ if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
-+#endif
-+ (void)png_colorspace_set_sRGB(png_ptr, colorspace,
-+ (int)/*already checked*/png_get_uint_32(profile+64));
-+}
-+#endif /* READ_sRGB */
-+
-+int /* PRIVATE */
-+png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
-+ int color_type)
-+{
-+ if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-+ return 0;
-+
-+ if (png_icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
-+ png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
-+ color_type) != 0 &&
-+ png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
-+ profile) != 0)
-+ {
-+# ifdef PNG_sRGB_SUPPORTED
-+ /* If no sRGB support, don't try storing sRGB information */
-+ png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
-+# endif
-+ return 1;
-+ }
-+
-+ /* Failure case */
-+ return 0;
-+}
-+#endif /* iCCP */
-+
-+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-+void /* PRIVATE */
-+png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
-+{
-+ /* Set the rgb_to_gray coefficients from the colorspace. */
-+ if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
-+ (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-+ {
-+ /* png_set_background has not been called, get the coefficients from the Y
-+ * values of the colorspace colorants.
-+ */
-+ png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;
-+ png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;
-+ png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;
-+ png_fixed_point total = r+g+b;
-+
-+ if (total > 0 &&
-+ r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
-+ g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
-+ b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
-+ r+g+b <= 32769)
-+ {
-+ /* We allow 0 coefficients here. r+g+b may be 32769 if two or
-+ * all of the coefficients were rounded up. Handle this by
-+ * reducing the *largest* coefficient by 1; this matches the
-+ * approach used for the default coefficients in pngrtran.c
-+ */
-+ int add = 0;
-+
-+ if (r+g+b > 32768)
-+ add = -1;
-+ else if (r+g+b < 32768)
-+ add = 1;
-+
-+ if (add != 0)
-+ {
-+ if (g >= r && g >= b)
-+ g += add;
-+ else if (r >= g && r >= b)
-+ r += add;
-+ else
-+ b += add;
-+ }
-+
-+ /* Check for an internal error. */
-+ if (r+g+b != 32768)
-+ png_error(png_ptr,
-+ "internal error handling cHRM coefficients");
-+
-+ else
-+ {
-+ png_ptr->rgb_to_gray_red_coeff = (png_uint_16)r;
-+ png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
-+ }
-+ }
-+
-+ /* This is a png_error at present even though it could be ignored -
-+ * it should never happen, but it is important that if it does, the
-+ * bug is fixed.
-+ */
-+ else
-+ png_error(png_ptr, "internal error handling cHRM->XYZ");
-+ }
-+}
-+#endif
-+
-+#endif /* COLORSPACE */
-+
-+#ifdef __GNUC__
-+/* This exists solely to work round a warning from GNU C. */
-+static int /* PRIVATE */
-+png_gt(size_t a, size_t b)
-+{
-+ return a > b;
-+}
-+#else
-+# define png_gt(a,b) ((a) > (b))
-+#endif
-+
-+void /* PRIVATE */
-+png_check_IHDR(png_const_structrp png_ptr,
- png_uint_32 width, png_uint_32 height, int bit_depth,
- int color_type, int interlace_type, int compression_type,
- int filter_type)
-@@ -840,53 +2514,68 @@
- png_warning(png_ptr, "Image width is zero in IHDR");
- error = 1;
- }
-+ else if (width > PNG_UINT_31_MAX)
-+ {
-+ png_warning(png_ptr, "Invalid image width in IHDR");
-+ error = 1;
-+ }
-+
-+ else if (png_gt(width,
-+ (PNG_SIZE_MAX >> 3) /* 8-byte RGBA pixels */
-+ - 48 /* big_row_buf hack */
-+ - 1 /* filter byte */
-+ - 7*8 /* rounding width to multiple of 8 pix */
-+ - 8)) /* extra max_pixel_depth pad */
-+ {
-+ /* The size of the row must be within the limits of this architecture.
-+ * Because the read code can perform arbitrary transformations the
-+ * maximum size is checked here. Because the code in png_read_start_row
-+ * adds extra space "for safety's sake" in several places a conservative
-+ * limit is used here.
-+ *
-+ * NOTE: it would be far better to check the size that is actually used,
-+ * but the effect in the real world is minor and the changes are more
-+ * extensive, therefore much more dangerous and much more difficult to
-+ * write in a way that avoids compiler warnings.
-+ */
-+ png_warning(png_ptr, "Image width is too large for this architecture");
-+ error = 1;
-+ }
-+ else
-+ {
-+# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-+ if (width > png_ptr->user_width_max)
-+# else
-+ if (width > PNG_USER_WIDTH_MAX)
-+# endif
-+ {
-+ png_warning(png_ptr, "Image width exceeds user limit in IHDR");
-+ error = 1;
-+ }
-+ }
-
- if (height == 0)
- {
- png_warning(png_ptr, "Image height is zero in IHDR");
- error = 1;
- }
--
--# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-- if (width > png_ptr->user_width_max)
--
--# else
-- if (width > PNG_USER_WIDTH_MAX)
--# endif
-- {
-- png_warning(png_ptr, "Image width exceeds user limit in IHDR");
-- error = 1;
-- }
--
--# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-- if (height > png_ptr->user_height_max)
--# else
-- if (height > PNG_USER_HEIGHT_MAX)
--# endif
-- {
-- png_warning(png_ptr, "Image height exceeds user limit in IHDR");
-- error = 1;
-- }
--
-- if (width > PNG_UINT_31_MAX)
-- {
-- png_warning(png_ptr, "Invalid image width in IHDR");
-- error = 1;
-- }
--
-- if (height > PNG_UINT_31_MAX)
-+ else if (height > PNG_UINT_31_MAX)
- {
- png_warning(png_ptr, "Invalid image height in IHDR");
- error = 1;
- }
--
-- if (width > (PNG_UINT_32_MAX
-- >> 3) /* 8-byte RGBA pixels */
-- - 48 /* bigrowbuf hack */
-- - 1 /* filter byte */
-- - 7*8 /* rounding of width to multiple of 8 pixels */
-- - 8) /* extra max_pixel_depth pad */
-- png_warning(png_ptr, "Width is too large for libpng to process pixels");
-+ else
-+ {
-+# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-+ if (height > png_ptr->user_height_max)
-+# else
-+ if (height > PNG_USER_HEIGHT_MAX)
-+# endif
-+ {
-+ png_warning(png_ptr, "Image height exceeds user limit in IHDR");
-+ error = 1;
-+ }
-+ }
-
- /* Check other values */
- if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
-@@ -934,13 +2623,13 @@
- * 4. The filter_method is 64 and
- * 5. The color_type is RGB or RGBA
- */
-- if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) &&
-- png_ptr->mng_features_permitted)
-+ if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 &&
-+ png_ptr->mng_features_permitted != 0)
- png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
-
- if (filter_type != PNG_FILTER_TYPE_BASE)
- {
-- if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-+ if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
- (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
- ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
- (color_type == PNG_COLOR_TYPE_RGB ||
-@@ -950,7 +2639,7 @@
- error = 1;
- }
-
-- if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE)
-+ if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0)
- {
- png_warning(png_ptr, "Invalid filter method in IHDR");
- error = 1;
-@@ -1010,7 +2699,7 @@
- switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))
- {
- case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:
-- if (state & PNG_FP_SAW_ANY)
-+ if ((state & PNG_FP_SAW_ANY) != 0)
- goto PNG_FP_End; /* not a part of the number */
-
- png_fp_add(state, type);
-@@ -1018,10 +2707,10 @@
-
- case PNG_FP_INTEGER + PNG_FP_SAW_DOT:
- /* Ok as trailer, ok as lead of fraction. */
-- if (state & PNG_FP_SAW_DOT) /* two dots */
-+ if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */
- goto PNG_FP_End;
-
-- else if (state & PNG_FP_SAW_DIGIT) /* trailing dot? */
-+ else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */
- png_fp_add(state, type);
-
- else
-@@ -1030,7 +2719,7 @@
- break;
-
- case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:
-- if (state & PNG_FP_SAW_DOT) /* delayed fraction */
-+ if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */
- png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
-
- png_fp_add(state, type | PNG_FP_WAS_VALID);
-@@ -1068,7 +2757,7 @@
- break;
-
- case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:
-- if (state & PNG_FP_SAW_ANY)
-+ if ((state & PNG_FP_SAW_ANY) != 0)
- goto PNG_FP_End; /* not a part of the number */
-
- png_fp_add(state, PNG_FP_SAW_SIGN);
-@@ -1111,15 +2800,15 @@
- int state=0;
- png_size_t char_index=0;
-
-- if (png_check_fp_number(string, size, &state, &char_index) &&
-+ if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
- (char_index == size || string[char_index] == 0))
- return state /* must be non-zero - see above */;
-
- return 0; /* i.e. fail */
- }
--#endif /* pCAL or sCAL */
--
--#ifdef PNG_READ_sCAL_SUPPORTED
-+#endif /* pCAL || sCAL */
-+
-+#ifdef PNG_sCAL_SUPPORTED
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- /* Utility used below - a simple accurate power of ten from an integral
- * exponent.
-@@ -1151,7 +2840,7 @@
- }
- while (power > 0);
-
-- if (recip) d = 1/d;
-+ if (recip != 0) d = 1/d;
- }
- /* else power is 0 and d is 1 */
-
-@@ -1162,7 +2851,7 @@
- * precision.
- */
- void /* PRIVATE */
--png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
-+png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size,
- double fp, unsigned int precision)
- {
- /* We use standard functions from math.h, but not printf because
-@@ -1365,8 +3054,9 @@
-
- if (exp_b10 != (-1))
- {
-- if (exp_b10 == 0) *ascii++ = 46, --size; /* counted
-- above */
-+ if (exp_b10 == 0)
-+ *ascii++ = 46, --size; /* counted above */
-+
- --exp_b10;
- }
- *ascii++ = (char)(48 + (int)d), ++cdigits;
-@@ -1411,18 +3101,30 @@
- size -= cdigits;
-
- *ascii++ = 69, --size; /* 'E': PLUS 1 TOTAL 2+precision */
-- if (exp_b10 < 0)
-+
-+ /* The following use of an unsigned temporary avoids ambiguities in
-+ * the signed arithmetic on exp_b10 and permits GCC at least to do
-+ * better optimization.
-+ */
- {
-- *ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */
-- exp_b10 = -exp_b10;
-- }
--
-- cdigits = 0;
--
-- while (exp_b10 > 0)
-- {
-- exponent[cdigits++] = (char)(48 + exp_b10 % 10);
-- exp_b10 /= 10;
-+ unsigned int uexp_b10;
-+
-+ if (exp_b10 < 0)
-+ {
-+ *ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */
-+ uexp_b10 = -exp_b10;
-+ }
-+
-+ else
-+ uexp_b10 = exp_b10;
-+
-+ cdigits = 0;
-+
-+ while (uexp_b10 > 0)
-+ {
-+ exponent[cdigits++] = (char)(48 + uexp_b10 % 10);
-+ uexp_b10 /= 10;
-+ }
- }
-
- /* Need another size check here for the exponent digits, so
-@@ -1464,8 +3166,8 @@
- /* Function to format a fixed point value in ASCII.
- */
- void /* PRIVATE */
--png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,
-- png_fixed_point fp)
-+png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
-+ png_size_t size, png_fixed_point fp)
- {
- /* Require space for 10 decimal digits, a decimal point, a minus sign and a
- * trailing \0, 13 characters:
-@@ -1480,7 +3182,7 @@
- else
- num = fp;
-
-- if (num <= 0x80000000U) /* else overflowed */
-+ if (num <= 0x80000000) /* else overflowed */
- {
- unsigned int ndigits = 0, first = 16 /* flag value */;
- char digits[10];
-@@ -1535,21 +3237,30 @@
- #endif /* READ_SCAL */
-
- #if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-- !defined(PNG_FIXED_POINT_MACRO_SUPPORTED)
-+ !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
-+ (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
-+ defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-+ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
-+ (defined(PNG_sCAL_SUPPORTED) && \
-+ defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
- png_fixed_point
--png_fixed(png_structp png_ptr, double fp, png_const_charp text)
-+png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
- {
- double r = floor(100000 * fp + .5);
-
- if (r > 2147483647. || r < -2147483648.)
- png_fixed_error(png_ptr, text);
-
-+# ifndef PNG_ERROR_TEXT_SUPPORTED
-+ PNG_UNUSED(text)
-+# endif
-+
- return (png_fixed_point)r;
- }
- #endif
-
--#if defined(PNG_READ_GAMMA_SUPPORTED) || \
-- defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG__READ_pHYs_SUPPORTED)
-+#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
-+ defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
- /* muldiv functions */
- /* This API takes signed arguments and rounds the result to the nearest
- * integer (or, for a fixed point number - the standard argument - to
-@@ -1653,11 +3364,12 @@
- if (s00 >= (D >> 1))
- ++result;
-
-- if (negative)
-+ if (negative != 0)
- result = -result;
-
- /* Check for overflow. */
-- if ((negative && result <= 0) || (!negative && result >= 0))
-+ if ((negative != 0 && result <= 0) ||
-+ (negative == 0 && result >= 0))
- {
- *res = result;
- return 1;
-@@ -1676,12 +3388,12 @@
- * result.
- */
- png_fixed_point
--png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
-+png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
- png_int_32 divisor)
- {
- png_fixed_point result;
-
-- if (png_muldiv(&result, a, times, divisor))
-+ if (png_muldiv(&result, a, times, divisor) != 0)
- return result;
-
- png_warning(png_ptr, "fixed point overflow ignored");
-@@ -1689,7 +3401,7 @@
- }
- #endif
-
--#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */
-+#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */
- /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
- png_fixed_point
- png_reciprocal(png_fixed_point a)
-@@ -1702,34 +3414,48 @@
- #else
- png_fixed_point res;
-
-- if (png_muldiv(&res, 100000, 100000, a))
-+ if (png_muldiv(&res, 100000, 100000, a) != 0)
- return res;
- #endif
-
- return 0; /* error/overflow */
- }
-
-+/* This is the shared test on whether a gamma value is 'significant' - whether
-+ * it is worth doing gamma correction.
-+ */
-+int /* PRIVATE */
-+png_gamma_significant(png_fixed_point gamma_val)
-+{
-+ return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-+ gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
-+}
-+#endif
-+
-+#ifdef PNG_READ_GAMMA_SUPPORTED
-+#if defined(PNG_16BIT_SUPPORTED) || !defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
- /* A local convenience routine. */
- static png_fixed_point
- png_product2(png_fixed_point a, png_fixed_point b)
- {
- /* The required result is 1/a * 1/b; the following preserves accuracy. */
--#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-+# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
- double r = a * 1E-5;
- r *= b;
- r = floor(r+.5);
-
- if (r <= 2147483647. && r >= -2147483648.)
- return (png_fixed_point)r;
--#else
-+# else
- png_fixed_point res;
-
-- if (png_muldiv(&res, a, b, 100000))
-+ if (png_muldiv(&res, a, b, 100000) != 0)
- return res;
--#endif
-+# endif
-
- return 0; /* overflow */
- }
-+#endif /* 16BIT || !FLOATING_ARITHMETIC */
-
- /* The inverse of the above. */
- png_fixed_point
-@@ -1759,73 +3485,28 @@
- }
- #endif /* READ_GAMMA */
-
--#ifdef PNG_CHECK_cHRM_SUPPORTED
--/* Added at libpng version 1.2.34 (Dec 8, 2008) and 1.4.0 (Jan 2,
-- * 2010: moved from pngset.c) */
--/*
-- * Multiply two 32-bit numbers, V1 and V2, using 32-bit
-- * arithmetic, to produce a 64-bit result in the HI/LO words.
-- *
-- * A B
-- * x C D
-- * ------
-- * AD || BD
-- * AC || CB || 0
-- *
-- * where A and B are the high and low 16-bit words of V1,
-- * C and D are the 16-bit words of V2, AD is the product of
-- * A and D, and X || Y is (X << 16) + Y.
--*/
--
--void /* PRIVATE */
--png_64bit_product (long v1, long v2, unsigned long *hi_product,
-- unsigned long *lo_product)
--{
-- int a, b, c, d;
-- long lo, hi, x, y;
--
-- a = (v1 >> 16) & 0xffff;
-- b = v1 & 0xffff;
-- c = (v2 >> 16) & 0xffff;
-- d = v2 & 0xffff;
--
-- lo = b * d; /* BD */
-- x = a * d + c * b; /* AD + CB */
-- y = ((lo >> 16) & 0xffff) + x;
--
-- lo = (lo & 0xffff) | ((y & 0xffff) << 16);
-- hi = (y >> 16) & 0xffff;
--
-- hi += a * c; /* AC */
--
-- *hi_product = (unsigned long)hi;
-- *lo_product = (unsigned long)lo;
--}
--#endif /* CHECK_cHRM */
--
- #ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */
- #ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
- /* Fixed point gamma.
- *
-+ * The code to calculate the tables used below can be found in the shell script
-+ * contrib/tools/intgamma.sh
-+ *
- * To calculate gamma this code implements fast log() and exp() calls using only
- * fixed point arithmetic. This code has sufficient precision for either 8-bit
- * or 16-bit sample values.
- *
- * The tables used here were calculated using simple 'bc' programs, but C double
-- * precision floating point arithmetic would work fine. The programs are given
-- * at the head of each table.
-+ * precision floating point arithmetic would work fine.
- *
- * 8-bit log table
- * This is a table of -log(value/255)/log(2) for 'value' in the range 128 to
- * 255, so it's the base 2 logarithm of a normalized 8-bit floating point
- * mantissa. The numbers are 32-bit fractions.
- */
--static png_uint_32
-+static const png_uint_32
- png_8bit_l2[128] =
- {
--# if PNG_DO_BC
-- for (i=128;i<256;++i) { .5 - l(i/255)/l(2)*65536*65536; }
--# endif
- 4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,
- 3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,
- 3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,
-@@ -1848,6 +3529,7 @@
- 324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,
- 172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,
- 24347096U, 0U
-+
- #if 0
- /* The following are the values for 16-bit tables - these work fine for the
- * 8-bit conversions but produce very slightly larger errors in the 16-bit
-@@ -1869,18 +3551,18 @@
- #endif
- };
-
--PNG_STATIC png_int_32
-+static png_int_32
- png_log8bit(unsigned int x)
- {
- unsigned int lg2 = 0;
- /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
- * because the log is actually negate that means adding 1. The final
- * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
-- * input), return 7.99998 for the overflow (log 0) case - so the result is
-+ * input), return -1 for the overflow (log 0) case, - so the result is
- * always at most 19 bits.
- */
- if ((x &= 0xff) == 0)
-- return 0xffffffff;
-+ return -1;
-
- if ((x & 0xf0) == 0)
- lg2 = 4, x <<= 4;
-@@ -1925,14 +3607,15 @@
- * Zero (257): 0
- * End (258): 23499
- */
--PNG_STATIC png_int_32
-+#ifdef PNG_16BIT_SUPPORTED
-+static png_int_32
- png_log16bit(png_uint_32 x)
- {
- unsigned int lg2 = 0;
-
- /* As above, but now the input has 16 bits. */
- if ((x &= 0xffff) == 0)
-- return 0xffffffff;
-+ return -1;
-
- if ((x & 0xff00) == 0)
- lg2 = 8, x <<= 8;
-@@ -1975,14 +3658,15 @@
- /* Safe, because the result can't have more than 20 bits: */
- return (png_int_32)((lg2 + 2048) >> 12);
- }
-+#endif /* 16BIT */
-
- /* The 'exp()' case must invert the above, taking a 20-bit fixed point
- * logarithmic value and returning a 16 or 8-bit number as appropriate. In
- * each case only the low 16 bits are relevant - the fraction - since the
- * integer bits (the top 4) simply determine a shift.
- *
-- * The worst case is the 16-bit distinction between 65535 and 65534, this
-- * requires perhaps spurious accuracty in the decoding of the logarithm to
-+ * The worst case is the 16-bit distinction between 65535 and 65534. This
-+ * requires perhaps spurious accuracy in the decoding of the logarithm to
- * distinguish log2(65535/65534.5) - 10^-5 or 17 bits. There is little chance
- * of getting this accuracy in practice.
- *
-@@ -1990,12 +3674,9 @@
- * frational part of the logarithm by using an accurate 32-bit value from the
- * top four fractional bits then multiplying in the remaining bits.
- */
--static png_uint_32
-+static const png_uint_32
- png_32bit_exp[16] =
- {
--# if PNG_DO_BC
-- for (i=0;i<16;++i) { .5 + e(-i/16*l(2))*2^32; }
--# endif
- /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */
- 4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,
- 3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,
-@@ -2003,7 +3684,7 @@
- };
-
- /* Adjustment table; provided to explain the numbers in the code below. */
--#if PNG_DO_BC
-+#if 0
- for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
- 11 44937.64284865548751208448
- 10 45180.98734845585101160448
-@@ -2019,7 +3700,7 @@
- 0 45425.85339951654943850496
- #endif
-
--PNG_STATIC png_uint_32
-+static png_uint_32
- png_exp(png_fixed_point x)
- {
- if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */
-@@ -2067,13 +3748,13 @@
- return 0;
- }
-
--PNG_STATIC png_byte
-+static png_byte
- png_exp8bit(png_fixed_point lg2)
- {
- /* Get a 32-bit value: */
- png_uint_32 x = png_exp(lg2);
-
-- /* Convert the 32-bit value to 0..255 by multiplying by 256-1, note that the
-+ /* Convert the 32-bit value to 0..255 by multiplying by 256-1. Note that the
- * second, rounding, step can't overflow because of the first, subtraction,
- * step.
- */
-@@ -2081,7 +3762,8 @@
- return (png_byte)((x + 0x7fffffU) >> 24);
- }
-
--PNG_STATIC png_uint_16
-+#ifdef PNG_16BIT_SUPPORTED
-+static png_uint_16
- png_exp16bit(png_fixed_point lg2)
- {
- /* Get a 32-bit value: */
-@@ -2091,6 +3773,7 @@
- x -= x >> 16;
- return (png_uint_16)((x + 32767U) >> 16);
- }
-+#endif /* 16BIT */
- #endif /* FLOATING_ARITHMETIC */
-
- png_byte
-@@ -2099,13 +3782,37 @@
- if (value > 0 && value < 255)
- {
- # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-- double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);
-+ /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly
-+ * convert this to a floating point value. This includes values that
-+ * would overflow if 'value' were to be converted to 'int'.
-+ *
-+ * Apparently GCC, however, does an intermediate conversion to (int)
-+ * on some (ARM) but not all (x86) platforms, possibly because of
-+ * hardware FP limitations. (E.g. if the hardware conversion always
-+ * assumes the integer register contains a signed value.) This results
-+ * in ANSI-C undefined behavior for large values.
-+ *
-+ * Other implementations on the same machine might actually be ANSI-C90
-+ * conformant and therefore compile spurious extra code for the large
-+ * values.
-+ *
-+ * We can be reasonably sure that an unsigned to float conversion
-+ * won't be faster than an int to float one. Therefore this code
-+ * assumes responsibility for the undefined behavior, which it knows
-+ * can't happen because of the check above.
-+ *
-+ * Note the argument to this routine is an (unsigned int) because, on
-+ * 16-bit platforms, it is assigned a value which might be out of
-+ * range for an (int); that would result in undefined behavior in the
-+ * caller if the *argument* ('value') were to be declared (int).
-+ */
-+ double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5);
- return (png_byte)r;
- # else
- png_int_32 lg2 = png_log8bit(value);
- png_fixed_point res;
-
-- if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
-+ if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
- return png_exp8bit(res);
-
- /* Overflow. */
-@@ -2116,19 +3823,26 @@
- return (png_byte)value;
- }
-
-+#ifdef PNG_16BIT_SUPPORTED
- png_uint_16
- png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
- {
- if (value > 0 && value < 65535)
- {
- # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-- double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);
-+ /* The same (unsigned int)->(double) constraints apply here as above,
-+ * however in this case the (unsigned int) to (int) conversion can
-+ * overflow on an ANSI-C90 compliant system so the cast needs to ensure
-+ * that this is not possible.
-+ */
-+ double r = floor(65535*pow((png_int_32)value/65535.,
-+ gamma_val*.00001)+.5);
- return (png_uint_16)r;
- # else
- png_int_32 lg2 = png_log16bit(value);
- png_fixed_point res;
-
-- if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
-+ if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
- return png_exp16bit(res);
-
- /* Overflow. */
-@@ -2138,6 +3852,7 @@
-
- return (png_uint_16)value;
- }
-+#endif /* 16BIT */
-
- /* This does the right thing based on the bit_depth field of the
- * png_struct, interpreting values as 8-bit or 16-bit. While the result
-@@ -2145,26 +3860,22 @@
- * 8-bit (as are the arguments.)
- */
- png_uint_16 /* PRIVATE */
--png_gamma_correct(png_structp png_ptr, unsigned int value,
-+png_gamma_correct(png_structrp png_ptr, unsigned int value,
- png_fixed_point gamma_val)
- {
- if (png_ptr->bit_depth == 8)
- return png_gamma_8bit_correct(value, gamma_val);
-
-+#ifdef PNG_16BIT_SUPPORTED
- else
- return png_gamma_16bit_correct(value, gamma_val);
-+#else
-+ /* should not reach this */
-+ return 0;
-+#endif /* 16BIT */
- }
-
--/* This is the shared test on whether a gamma value is 'significant' - whether
-- * it is worth doing gamma correction.
-- */
--int /* PRIVATE */
--png_gamma_significant(png_fixed_point gamma_val)
--{
-- return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-- gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
--}
--
-+#ifdef PNG_16BIT_SUPPORTED
- /* Internal function to build a single 16-bit table - the table consists of
- * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount
- * to shift the input values right (or 16-number_of_signifiant_bits).
-@@ -2174,27 +3885,33 @@
- * should be somewhere that will be cleaned.
- */
- static void
--png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
-+png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
- PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
- {
- /* Various values derived from 'shift': */
- PNG_CONST unsigned int num = 1U << (8U - shift);
-+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-+ /* CSE the division and work round wacky GCC warnings (see the comments
-+ * in png_gamma_8bit_correct for where these come from.)
-+ */
-+ PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1);
-+#endif
- PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
- PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
- unsigned int i;
-
- png_uint_16pp table = *ptable =
-- (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
-+ (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
-
- for (i = 0; i < num; i++)
- {
- png_uint_16p sub_table = table[i] =
-- (png_uint_16p)png_malloc(png_ptr, 256 * png_sizeof(png_uint_16));
-+ (png_uint_16p)png_malloc(png_ptr, 256 * (sizeof (png_uint_16)));
-
- /* The 'threshold' test is repeated here because it can arise for one of
- * the 16-bit tables even if the others don't hit it.
- */
-- if (png_gamma_significant(gamma_val))
-+ if (png_gamma_significant(gamma_val) != 0)
- {
- /* The old code would overflow at the end and this would cause the
- * 'pow' function to return a result >1, resulting in an
-@@ -2210,10 +3927,13 @@
- png_uint_32 ig = (j << (8-shift)) + i;
- # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
- /* Inline the 'max' scaling operation: */
-- double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);
-+ /* See png_gamma_8bit_correct for why the cast to (int) is
-+ * required here.
-+ */
-+ double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5);
- sub_table[j] = (png_uint_16)d;
- # else
-- if (shift)
-+ if (shift != 0)
- ig = (ig * 65535U + max_by_2)/max;
-
- sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);
-@@ -2229,7 +3949,7 @@
- {
- png_uint_32 ig = (j << (8-shift)) + i;
-
-- if (shift)
-+ if (shift != 0)
- ig = (ig * 65535U + max_by_2)/max;
-
- sub_table[j] = (png_uint_16)ig;
-@@ -2242,7 +3962,7 @@
- * required.
- */
- static void
--png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
-+png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,
- PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
- {
- PNG_CONST unsigned int num = 1U << (8U - shift);
-@@ -2251,15 +3971,15 @@
- png_uint_32 last;
-
- png_uint_16pp table = *ptable =
-- (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
-+ (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
-
- /* 'num' is the number of tables and also the number of low bits of low
- * bits of the input 16-bit value used to select a table. Each table is
-- * itself index by the high 8 bits of the value.
-+ * itself indexed by the high 8 bits of the value.
- */
- for (i = 0; i < num; i++)
- table[i] = (png_uint_16p)png_malloc(png_ptr,
-- 256 * png_sizeof(png_uint_16));
-+ 256 * (sizeof (png_uint_16)));
-
- /* 'gamma_val' is set to the reciprocal of the value calculated above, so
- * pow(out,g) is an *input* value. 'last' is the last input value set.
-@@ -2303,23 +4023,84 @@
- last++;
- }
- }
-+#endif /* 16BIT */
-
- /* Build a single 8-bit table: same as the 16-bit case but much simpler (and
- * typically much faster). Note that libpng currently does no sBIT processing
-- * (apparently contrary to the spec) so a 256 entry table is always generated.
-+ * (apparently contrary to the spec) so a 256-entry table is always generated.
- */
- static void
--png_build_8bit_table(png_structp png_ptr, png_bytepp ptable,
-+png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
- PNG_CONST png_fixed_point gamma_val)
- {
- unsigned int i;
- png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
-
-- if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++)
-- table[i] = png_gamma_8bit_correct(i, gamma_val);
--
-- else for (i=0; i<256; ++i)
-- table[i] = (png_byte)i;
-+ if (png_gamma_significant(gamma_val) != 0)
-+ for (i=0; i<256; i++)
-+ table[i] = png_gamma_8bit_correct(i, gamma_val);
-+
-+ else
-+ for (i=0; i<256; ++i)
-+ table[i] = (png_byte)i;
-+}
-+
-+/* Used from png_read_destroy and below to release the memory used by the gamma
-+ * tables.
-+ */
-+void /* PRIVATE */
-+png_destroy_gamma_table(png_structrp png_ptr)
-+{
-+ png_free(png_ptr, png_ptr->gamma_table);
-+ png_ptr->gamma_table = NULL;
-+
-+#ifdef PNG_16BIT_SUPPORTED
-+ if (png_ptr->gamma_16_table != NULL)
-+ {
-+ int i;
-+ int istop = (1 << (8 - png_ptr->gamma_shift));
-+ for (i = 0; i < istop; i++)
-+ {
-+ png_free(png_ptr, png_ptr->gamma_16_table[i]);
-+ }
-+ png_free(png_ptr, png_ptr->gamma_16_table);
-+ png_ptr->gamma_16_table = NULL;
-+ }
-+#endif /* 16BIT */
-+
-+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-+ defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-+ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-+ png_free(png_ptr, png_ptr->gamma_from_1);
-+ png_ptr->gamma_from_1 = NULL;
-+ png_free(png_ptr, png_ptr->gamma_to_1);
-+ png_ptr->gamma_to_1 = NULL;
-+
-+#ifdef PNG_16BIT_SUPPORTED
-+ if (png_ptr->gamma_16_from_1 != NULL)
-+ {
-+ int i;
-+ int istop = (1 << (8 - png_ptr->gamma_shift));
-+ for (i = 0; i < istop; i++)
-+ {
-+ png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
-+ }
-+ png_free(png_ptr, png_ptr->gamma_16_from_1);
-+ png_ptr->gamma_16_from_1 = NULL;
-+ }
-+ if (png_ptr->gamma_16_to_1 != NULL)
-+ {
-+ int i;
-+ int istop = (1 << (8 - png_ptr->gamma_shift));
-+ for (i = 0; i < istop; i++)
-+ {
-+ png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
-+ }
-+ png_free(png_ptr, png_ptr->gamma_16_to_1);
-+ png_ptr->gamma_16_to_1 = NULL;
-+ }
-+#endif /* 16BIT */
-+#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
- }
-
- /* We build the 8- or 16-bit gamma tables here. Note that for 16-bit
-@@ -2328,35 +4109,48 @@
- * we don't need to allocate > 64K chunks for a full 16-bit table.
- */
- void /* PRIVATE */
--png_build_gamma_table(png_structp png_ptr, int bit_depth)
-+png_build_gamma_table(png_structrp png_ptr, int bit_depth)
- {
- png_debug(1, "in png_build_gamma_table");
-
-+ /* Remove any existing table; this copes with multiple calls to
-+ * png_read_update_info. The warning is because building the gamma tables
-+ * multiple times is a performance hit - it's harmless but the ability to call
-+ * png_read_update_info() multiple times is new in 1.5.6 so it seems sensible
-+ * to warn if the app introduces such a hit.
-+ */
-+ if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)
-+ {
-+ png_warning(png_ptr, "gamma table being rebuilt");
-+ png_destroy_gamma_table(png_ptr);
-+ }
-+
- if (bit_depth <= 8)
- {
- png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-- png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->gamma,
-+ png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma) : PNG_FP_1);
-
- #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
- defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
- defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-- if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
-+ if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
- {
- png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-- png_reciprocal(png_ptr->gamma));
-+ png_reciprocal(png_ptr->colorspace.gamma));
-
- png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
- png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-- png_ptr->gamma/* Probably doing rgb_to_gray */);
-+ png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
- }
- #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
- }
-+#ifdef PNG_16BIT_SUPPORTED
- else
- {
- png_byte shift, sig_bit;
-
-- if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- sig_bit = png_ptr->sig_bit.red;
-
-@@ -2376,7 +4170,7 @@
- * Where 'iv' is the input color value and 'ov' is the output value -
- * pow(iv, gamma).
- *
-- * Thus the gamma table consists of up to 256 256 entry tables. The table
-+ * Thus the gamma table consists of up to 256 256-entry tables. The table
- * is selected by the (8-gamma_shift) most significant of the low 8 bits of
- * the color value then indexed by the upper 8 bits:
- *
-@@ -2393,7 +4187,7 @@
- else
- shift = 0; /* keep all 16 bits */
-
-- if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
-+ if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
- {
- /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
- * the significant bits in the *input* when the output will
-@@ -2408,32 +4202,28 @@
-
- png_ptr->gamma_shift = shift;
-
--#ifdef PNG_16BIT_SUPPORTED
- /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
- * PNG_COMPOSE). This effectively smashed the background calculation for
- * 16-bit output because the 8-bit table assumes the result will be reduced
- * to 8 bits.
- */
-- if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
--#endif
-+ if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
- png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-- png_ptr->screen_gamma > 0 ? png_product2(png_ptr->gamma,
-+ png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma) : PNG_FP_1);
-
--#ifdef PNG_16BIT_SUPPORTED
- else
- png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-- png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->gamma,
-+ png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma) : PNG_FP_1);
--#endif
-
- #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
- defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
- defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-- if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
-+ if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
- {
- png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-- png_reciprocal(png_ptr->gamma));
-+ png_reciprocal(png_ptr->colorspace.gamma));
-
- /* Notice that the '16 from 1' table should be full precision, however
- * the lookup on this table still uses gamma_shift, so it can't be.
-@@ -2441,10 +4231,291 @@
- */
- png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
- png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-- png_ptr->gamma/* Probably doing rgb_to_gray */);
-+ png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
- }
- #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
- }
-+#endif /* 16BIT */
- }
- #endif /* READ_GAMMA */
--#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-+
-+/* HARDWARE OR SOFTWARE OPTION SUPPORT */
-+#ifdef PNG_SET_OPTION_SUPPORTED
-+int PNGAPI
-+png_set_option(png_structrp png_ptr, int option, int onoff)
-+{
-+ if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&
-+ (option & 1) == 0)
-+ {
-+ int mask = 3 << option;
-+ int setting = (2 + (onoff != 0)) << option;
-+ int current = png_ptr->options;
-+
-+ png_ptr->options = (png_byte)((current & ~mask) | setting);
-+
-+ return (current & mask) >> option;
-+ }
-+
-+ return PNG_OPTION_INVALID;
-+}
-+#endif
-+
-+/* sRGB support */
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-+/* sRGB conversion tables; these are machine generated with the code in
-+ * contrib/tools/makesRGB.c. The actual sRGB transfer curve defined in the
-+ * specification (see the article at http://en.wikipedia.org/wiki/SRGB)
-+ * is used, not the gamma=1/2.2 approximation use elsewhere in libpng.
-+ * The sRGB to linear table is exact (to the nearest 16 bit linear fraction).
-+ * The inverse (linear to sRGB) table has accuracies as follows:
-+ *
-+ * For all possible (255*65535+1) input values:
-+ *
-+ * error: -0.515566 - 0.625971, 79441 (0.475369%) of readings inexact
-+ *
-+ * For the input values corresponding to the 65536 16-bit values:
-+ *
-+ * error: -0.513727 - 0.607759, 308 (0.469978%) of readings inexact
-+ *
-+ * In all cases the inexact readings are only off by one.
-+ */
-+
-+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-+/* The convert-to-sRGB table is only currently required for read. */
-+const png_uint_16 png_sRGB_table[256] =
-+{
-+ 0,20,40,60,80,99,119,139,
-+ 159,179,199,219,241,264,288,313,
-+ 340,367,396,427,458,491,526,562,
-+ 599,637,677,718,761,805,851,898,
-+ 947,997,1048,1101,1156,1212,1270,1330,
-+ 1391,1453,1517,1583,1651,1720,1790,1863,
-+ 1937,2013,2090,2170,2250,2333,2418,2504,
-+ 2592,2681,2773,2866,2961,3058,3157,3258,
-+ 3360,3464,3570,3678,3788,3900,4014,4129,
-+ 4247,4366,4488,4611,4736,4864,4993,5124,
-+ 5257,5392,5530,5669,5810,5953,6099,6246,
-+ 6395,6547,6700,6856,7014,7174,7335,7500,
-+ 7666,7834,8004,8177,8352,8528,8708,8889,
-+ 9072,9258,9445,9635,9828,10022,10219,10417,
-+ 10619,10822,11028,11235,11446,11658,11873,12090,
-+ 12309,12530,12754,12980,13209,13440,13673,13909,
-+ 14146,14387,14629,14874,15122,15371,15623,15878,
-+ 16135,16394,16656,16920,17187,17456,17727,18001,
-+ 18277,18556,18837,19121,19407,19696,19987,20281,
-+ 20577,20876,21177,21481,21787,22096,22407,22721,
-+ 23038,23357,23678,24002,24329,24658,24990,25325,
-+ 25662,26001,26344,26688,27036,27386,27739,28094,
-+ 28452,28813,29176,29542,29911,30282,30656,31033,
-+ 31412,31794,32179,32567,32957,33350,33745,34143,
-+ 34544,34948,35355,35764,36176,36591,37008,37429,
-+ 37852,38278,38706,39138,39572,40009,40449,40891,
-+ 41337,41785,42236,42690,43147,43606,44069,44534,
-+ 45002,45473,45947,46423,46903,47385,47871,48359,
-+ 48850,49344,49841,50341,50844,51349,51858,52369,
-+ 52884,53401,53921,54445,54971,55500,56032,56567,
-+ 57105,57646,58190,58737,59287,59840,60396,60955,
-+ 61517,62082,62650,63221,63795,64372,64952,65535
-+};
-+#endif /* SIMPLIFIED_READ */
-+
-+/* The base/delta tables are required for both read and write (but currently
-+ * only the simplified versions.)
-+ */
-+const png_uint_16 png_sRGB_base[512] =
-+{
-+ 128,1782,3383,4644,5675,6564,7357,8074,
-+ 8732,9346,9921,10463,10977,11466,11935,12384,
-+ 12816,13233,13634,14024,14402,14769,15125,15473,
-+ 15812,16142,16466,16781,17090,17393,17690,17981,
-+ 18266,18546,18822,19093,19359,19621,19879,20133,
-+ 20383,20630,20873,21113,21349,21583,21813,22041,
-+ 22265,22487,22707,22923,23138,23350,23559,23767,
-+ 23972,24175,24376,24575,24772,24967,25160,25352,
-+ 25542,25730,25916,26101,26284,26465,26645,26823,
-+ 27000,27176,27350,27523,27695,27865,28034,28201,
-+ 28368,28533,28697,28860,29021,29182,29341,29500,
-+ 29657,29813,29969,30123,30276,30429,30580,30730,
-+ 30880,31028,31176,31323,31469,31614,31758,31902,
-+ 32045,32186,32327,32468,32607,32746,32884,33021,
-+ 33158,33294,33429,33564,33697,33831,33963,34095,
-+ 34226,34357,34486,34616,34744,34873,35000,35127,
-+ 35253,35379,35504,35629,35753,35876,35999,36122,
-+ 36244,36365,36486,36606,36726,36845,36964,37083,
-+ 37201,37318,37435,37551,37668,37783,37898,38013,
-+ 38127,38241,38354,38467,38580,38692,38803,38915,
-+ 39026,39136,39246,39356,39465,39574,39682,39790,
-+ 39898,40005,40112,40219,40325,40431,40537,40642,
-+ 40747,40851,40955,41059,41163,41266,41369,41471,
-+ 41573,41675,41777,41878,41979,42079,42179,42279,
-+ 42379,42478,42577,42676,42775,42873,42971,43068,
-+ 43165,43262,43359,43456,43552,43648,43743,43839,
-+ 43934,44028,44123,44217,44311,44405,44499,44592,
-+ 44685,44778,44870,44962,45054,45146,45238,45329,
-+ 45420,45511,45601,45692,45782,45872,45961,46051,
-+ 46140,46229,46318,46406,46494,46583,46670,46758,
-+ 46846,46933,47020,47107,47193,47280,47366,47452,
-+ 47538,47623,47709,47794,47879,47964,48048,48133,
-+ 48217,48301,48385,48468,48552,48635,48718,48801,
-+ 48884,48966,49048,49131,49213,49294,49376,49458,
-+ 49539,49620,49701,49782,49862,49943,50023,50103,
-+ 50183,50263,50342,50422,50501,50580,50659,50738,
-+ 50816,50895,50973,51051,51129,51207,51285,51362,
-+ 51439,51517,51594,51671,51747,51824,51900,51977,
-+ 52053,52129,52205,52280,52356,52432,52507,52582,
-+ 52657,52732,52807,52881,52956,53030,53104,53178,
-+ 53252,53326,53400,53473,53546,53620,53693,53766,
-+ 53839,53911,53984,54056,54129,54201,54273,54345,
-+ 54417,54489,54560,54632,54703,54774,54845,54916,
-+ 54987,55058,55129,55199,55269,55340,55410,55480,
-+ 55550,55620,55689,55759,55828,55898,55967,56036,
-+ 56105,56174,56243,56311,56380,56448,56517,56585,
-+ 56653,56721,56789,56857,56924,56992,57059,57127,
-+ 57194,57261,57328,57395,57462,57529,57595,57662,
-+ 57728,57795,57861,57927,57993,58059,58125,58191,
-+ 58256,58322,58387,58453,58518,58583,58648,58713,
-+ 58778,58843,58908,58972,59037,59101,59165,59230,
-+ 59294,59358,59422,59486,59549,59613,59677,59740,
-+ 59804,59867,59930,59993,60056,60119,60182,60245,
-+ 60308,60370,60433,60495,60558,60620,60682,60744,
-+ 60806,60868,60930,60992,61054,61115,61177,61238,
-+ 61300,61361,61422,61483,61544,61605,61666,61727,
-+ 61788,61848,61909,61969,62030,62090,62150,62211,
-+ 62271,62331,62391,62450,62510,62570,62630,62689,
-+ 62749,62808,62867,62927,62986,63045,63104,63163,
-+ 63222,63281,63340,63398,63457,63515,63574,63632,
-+ 63691,63749,63807,63865,63923,63981,64039,64097,
-+ 64155,64212,64270,64328,64385,64443,64500,64557,
-+ 64614,64672,64729,64786,64843,64900,64956,65013,
-+ 65070,65126,65183,65239,65296,65352,65409,65465
-+};
-+
-+const png_byte png_sRGB_delta[512] =
-+{
-+ 207,201,158,129,113,100,90,82,77,72,68,64,61,59,56,54,
-+ 52,50,49,47,46,45,43,42,41,40,39,39,38,37,36,36,
-+ 35,34,34,33,33,32,32,31,31,30,30,30,29,29,28,28,
-+ 28,27,27,27,27,26,26,26,25,25,25,25,24,24,24,24,
-+ 23,23,23,23,23,22,22,22,22,22,22,21,21,21,21,21,
-+ 21,20,20,20,20,20,20,20,20,19,19,19,19,19,19,19,
-+ 19,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,
-+ 17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,
-+ 16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,15,
-+ 15,15,15,15,14,14,14,14,14,14,14,14,14,14,14,14,
-+ 14,14,14,14,14,14,14,13,13,13,13,13,13,13,13,13,
-+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,
-+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-+ 12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,
-+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-+ 11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-+ 10,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-+ 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-+ 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-+ 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-+ 9,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-+ 8,8,8,8,8,8,8,8,8,7,7,7,7,7,7,7,
-+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-+};
-+#endif /* SIMPLIFIED READ/WRITE sRGB support */
-+
-+/* SIMPLIFIED READ/WRITE SUPPORT */
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-+static int
-+png_image_free_function(png_voidp argument)
-+{
-+ png_imagep image = png_voidcast(png_imagep, argument);
-+ png_controlp cp = image->opaque;
-+ png_control c;
-+
-+ /* Double check that we have a png_ptr - it should be impossible to get here
-+ * without one.
-+ */
-+ if (cp->png_ptr == NULL)
-+ return 0;
-+
-+ /* First free any data held in the control structure. */
-+# ifdef PNG_STDIO_SUPPORTED
-+ if (cp->owned_file != 0)
-+ {
-+ FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
-+ cp->owned_file = 0;
-+
-+ /* Ignore errors here. */
-+ if (fp != NULL)
-+ {
-+ cp->png_ptr->io_ptr = NULL;
-+ (void)fclose(fp);
-+ }
-+ }
-+# endif
-+
-+ /* Copy the control structure so that the original, allocated, version can be
-+ * safely freed. Notice that a png_error here stops the remainder of the
-+ * cleanup, but this is probably fine because that would indicate bad memory
-+ * problems anyway.
-+ */
-+ c = *cp;
-+ image->opaque = &c;
-+ png_free(c.png_ptr, cp);
-+
-+ /* Then the structures, calling the correct API. */
-+ if (c.for_write != 0)
-+ {
-+# ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-+ png_destroy_write_struct(&c.png_ptr, &c.info_ptr);
-+# else
-+ png_error(c.png_ptr, "simplified write not supported");
-+# endif
-+ }
-+ else
-+ {
-+# ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-+ png_destroy_read_struct(&c.png_ptr, &c.info_ptr, NULL);
-+# else
-+ png_error(c.png_ptr, "simplified read not supported");
-+# endif
-+ }
-+
-+ /* Success. */
-+ return 1;
-+}
-+
-+void PNGAPI
-+png_image_free(png_imagep image)
-+{
-+ /* Safely call the real function, but only if doing so is safe at this point
-+ * (if not inside an error handling context). Otherwise assume
-+ * png_safe_execute will call this API after the return.
-+ */
-+ if (image != NULL && image->opaque != NULL &&
-+ image->opaque->error_buf == NULL)
-+ {
-+ /* Ignore errors here: */
-+ (void)png_safe_execute(image, png_image_free_function, image);
-+ image->opaque = NULL;
-+ }
-+}
-+
-+int /* PRIVATE */
-+png_image_error(png_imagep image, png_const_charp error_message)
-+{
-+ /* Utility to log an error. */
-+ png_safecat(image->message, (sizeof image->message), 0, error_message);
-+ image->warning_or_error |= PNG_IMAGE_ERROR;
-+ png_image_free(image);
-+ return 0;
-+}
-+
-+#endif /* SIMPLIFIED READ/WRITE */
-+#endif /* READ || WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/png.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/png.h Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * libpng version 1.5.4 - July 7, 2011
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * libpng version 1.6.16, December 22, 2014
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -39,7 +39,7 @@
- * Authors and maintainers:
- * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
-- * libpng versions 0.97, January 1998, through 1.5.4 - July 7, 2011: Glenn
-+ * libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn
- * See also "Contributing Authors", below.
- *
- * Note about libpng version numbers:
-@@ -185,6 +185,61 @@
- * 1.5.4beta01-08 15 10504 15.so.15.4[.0]
- * 1.5.4rc01 15 10504 15.so.15.4[.0]
- * 1.5.4 15 10504 15.so.15.4[.0]
-+ * 1.5.5beta01-08 15 10505 15.so.15.5[.0]
-+ * 1.5.5rc01 15 10505 15.so.15.5[.0]
-+ * 1.5.5 15 10505 15.so.15.5[.0]
-+ * 1.5.6beta01-07 15 10506 15.so.15.6[.0]
-+ * 1.5.6rc01-03 15 10506 15.so.15.6[.0]
-+ * 1.5.6 15 10506 15.so.15.6[.0]
-+ * 1.5.7beta01-05 15 10507 15.so.15.7[.0]
-+ * 1.5.7rc01-03 15 10507 15.so.15.7[.0]
-+ * 1.5.7 15 10507 15.so.15.7[.0]
-+ * 1.6.0beta01-40 16 10600 16.so.16.0[.0]
-+ * 1.6.0rc01-08 16 10600 16.so.16.0[.0]
-+ * 1.6.0 16 10600 16.so.16.0[.0]
-+ * 1.6.1beta01-09 16 10601 16.so.16.1[.0]
-+ * 1.6.1rc01 16 10601 16.so.16.1[.0]
-+ * 1.6.1 16 10601 16.so.16.1[.0]
-+ * 1.6.2beta01 16 10602 16.so.16.2[.0]
-+ * 1.6.2rc01-06 16 10602 16.so.16.2[.0]
-+ * 1.6.2 16 10602 16.so.16.2[.0]
-+ * 1.6.3beta01-11 16 10603 16.so.16.3[.0]
-+ * 1.6.3rc01 16 10603 16.so.16.3[.0]
-+ * 1.6.3 16 10603 16.so.16.3[.0]
-+ * 1.6.4beta01-02 16 10604 16.so.16.4[.0]
-+ * 1.6.4rc01 16 10604 16.so.16.4[.0]
-+ * 1.6.4 16 10604 16.so.16.4[.0]
-+ * 1.6.5 16 10605 16.so.16.5[.0]
-+ * 1.6.6 16 10606 16.so.16.6[.0]
-+ * 1.6.7beta01-04 16 10607 16.so.16.7[.0]
-+ * 1.6.7rc01-03 16 10607 16.so.16.7[.0]
-+ * 1.6.7 16 10607 16.so.16.7[.0]
-+ * 1.6.8beta01-02 16 10608 16.so.16.8[.0]
-+ * 1.6.8rc01-02 16 10608 16.so.16.8[.0]
-+ * 1.6.8 16 10608 16.so.16.8[.0]
-+ * 1.6.9beta01-04 16 10609 16.so.16.9[.0]
-+ * 1.6.9rc01-02 16 10609 16.so.16.9[.0]
-+ * 1.6.9 16 10609 16.so.16.9[.0]
-+ * 1.6.10beta01-03 16 10610 16.so.16.10[.0]
-+ * 1.6.10rc01-03 16 10610 16.so.16.10[.0]
-+ * 1.6.10 16 10610 16.so.16.10[.0]
-+ * 1.6.11beta01-06 16 10611 16.so.16.11[.0]
-+ * 1.6.11rc01-02 16 10611 16.so.16.11[.0]
-+ * 1.6.11 16 10611 16.so.16.11[.0]
-+ * 1.6.12rc01-03 16 10612 16.so.16.12[.0]
-+ * 1.6.12 16 10612 16.so.16.12[.0]
-+ * 1.6.13beta01-04 16 10613 16.so.16.13[.0]
-+ * 1.6.13rc01-02 16 10613 16.so.16.13[.0]
-+ * 1.6.13 16 10613 16.so.16.13[.0]
-+ * 1.6.14beta01-07 16 10614 16.so.16.14[.0]
-+ * 1.6.14rc01-02 16 10614 16.so.16.14[.0]
-+ * 1.6.14 16 10614 16.so.16.14[.0]
-+ * 1.6.15beta01-08 16 10615 16.so.16.15[.0]
-+ * 1.6.15rc01-03 16 10615 16.so.16.15[.0]
-+ * 1.6.15 16 10615 16.so.16.15[.0]
-+ * 1.6.16beta01-03 16 10616 16.so.16.16[.0]
-+ * 1.6.16rc01-02 16 10616 16.so.16.16[.0]
-+ * 1.6.16 16 10616 16.so.16.16[.0]
- *
- * Henceforth the source version will match the shared-library major
- * and minor numbers; the shared-library major version number will be
-@@ -194,7 +249,7 @@
- * to the source version x.y.z (leading zeros in y and z). Beta versions
- * were given the previous public release number plus a letter, until
- * version 1.0.6j; from then on they were given the upcoming public
-- * release number plus "betaNN" or "rcN".
-+ * release number plus "betaNN" or "rcNN".
- *
- * Binary incompatibility exists only when applications make direct access
- * to the info_ptr or png_ptr members through png.h, and the compiled
-@@ -216,8 +271,8 @@
- *
- * This code is released under the libpng license.
- *
-- * libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-- * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
-+ * libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
-+ * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.2.5
- * with the following individual added to the list of Contributing Authors:
- *
-@@ -328,28 +383,30 @@
- * Y2K compliance in libpng:
- * =========================
- *
-- * July 7, 2011
-+ * December 22, 2014
- *
- * Since the PNG Development group is an ad-hoc body, we can't make
- * an official declaration.
- *
- * This is your unofficial assurance that libpng from version 0.71 and
-- * upward through 1.5.4 are Y2K compliant. It is my belief that
-+ * upward through 1.6.16 are Y2K compliant. It is my belief that
- * earlier versions were also Y2K compliant.
- *
- * Libpng only has two year fields. One is a 2-byte unsigned integer
-- * that will hold years up to 65535. The other holds the date in text
-- * format, and will hold years up to 9999.
-+ * that will hold years up to 65535. The other, which is deprecated,
-+ * holds the date in text format, and will hold years up to 9999.
- *
- * The integer is
- * "png_uint_16 year" in png_time_struct.
- *
- * The string is
-- * "png_char time_buffer" in png_struct
-+ * "char time_buffer[29]" in png_struct. This is no longer used
-+ * in libpng-1.6.x and will be removed from libpng-1.7.0.
- *
- * There are seven time-related functions:
-- * png.c: png_convert_to_rfc_1123() in png.c
-- * (formerly png_convert_to_rfc_1152() in error)
-+ * png.c: png_convert_to_rfc_1123_buffer() in png.c
-+ * (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and
-+ * png_convert_to_rfc_1152() in error prior to libpng-0.98)
- * png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- * png_convert_from_time_t() in pngwrite.c
- * png_get_tIME() in pngget.c
-@@ -360,8 +417,8 @@
- * All handle dates properly in a Y2K environment. The
- * png_convert_from_time_t() function calls gmtime() to convert from system
- * clock time, which returns (year - 1900), which we properly convert to
-- * the full 4-digit year. There is a possibility that applications using
-- * libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
-+ * the full 4-digit year. There is a possibility that libpng applications
-+ * are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()
- * function, or that they are incorrectly passing only a 2-digit year
- * instead of "year - 1900" into the png_convert_from_struct_tm() function,
- * but this is not under our control. The libpng documentation has always
-@@ -385,21 +442,27 @@
- /* This is not the place to learn how to use libpng. The file libpng-manual.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build. This file is useful for looking
-- * at the actual function definitions and structure components.
-+ * at the actual function definitions and structure components. If that
-+ * file has been stripped from your copy of libpng, you can find it at
-+ * <http://www.libpng.org/pub/png/libpng-manual.txt>
-+ *
-+ * If you just need to read a PNG file and don't want to read the documentation
-+ * skip to the end of this file and read the section entitled 'simplified API'.
- */
-
- /* Version information for png.h - this should match the version in png.c */
--#define PNG_LIBPNG_VER_STRING "1.5.4"
-+#define PNG_LIBPNG_VER_STRING "1.6.16"
- #define PNG_HEADER_VERSION_STRING \
-- " libpng version 1.5.4 - July 7, 2011\n"
--
--#define PNG_LIBPNG_VER_SONUM 15
--#define PNG_LIBPNG_VER_DLLNUM 15
-+ " libpng version 1.6.16 - December 22, 2014\n"
-+
-+#define PNG_LIBPNG_VER_SONUM 16
-+#define PNG_LIBPNG_VER_DLLNUM 16
-
- /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
- #define PNG_LIBPNG_VER_MAJOR 1
--#define PNG_LIBPNG_VER_MINOR 5
--#define PNG_LIBPNG_VER_RELEASE 4
-+#define PNG_LIBPNG_VER_MINOR 6
-+#define PNG_LIBPNG_VER_RELEASE 16
-+
- /* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
- */
-@@ -421,7 +484,7 @@
- #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
- PNG_LIBPNG_BUILD_PRIVATE */
-
--#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
-+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
-
- /* Careful here. At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
-@@ -429,7 +492,7 @@
- * version 1.0.0 was mis-numbered 100 instead of 10000). From
- * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
- */
--#define PNG_LIBPNG_VER 10504 /* 1.5.4 */
-+#define PNG_LIBPNG_VER 10616 /* 1.6.16 */
-
- /* Library configuration: these options cannot be changed after
- * the library has been built.
-@@ -442,25 +505,7 @@
- #endif
-
- #ifndef PNG_VERSION_INFO_ONLY
--# ifndef PNG_BUILDING_SYMBOL_TABLE
-- /*
-- * Standard header files (not needed for the version info or while
-- * building symbol table -- see scripts/pnglibconf.dfa)
-- */
--# ifdef PNG_SETJMP_SUPPORTED
--# include <setjmp.h>
--# endif
--
-- /* Need the time information for converting tIME chunks, it
-- * defines struct tm:
-- */
--# ifdef PNG_CONVERT_tIME_SUPPORTED
-- /* "time.h" functions are not supported on all operating systems */
--# include <time.h>
--# endif
--# endif
--
--/* Machine specific configuration. */
-+ /* Machine specific configuration. */
- # include "pngconf.h"
- #endif
-
-@@ -509,6 +554,7 @@
- * 2. Type definitions (base types are defined in pngconf.h), structure
- * definitions.
- * 3. Exported library functions.
-+ * 4. Simplified API.
- *
- * The library source code has additional files (principally pngpriv.h) that
- * allow configuration of the library.
-@@ -551,7 +597,48 @@
- /* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
--typedef char* png_libpng_version_1_5_4;
-+typedef char* png_libpng_version_1_6_16;
-+
-+/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
-+ *
-+ * png_struct is the cache of information used while reading or writing a single
-+ * PNG file. One of these is always required, although the simplified API
-+ * (below) hides the creation and destruction of it.
-+ */
-+typedef struct png_struct_def png_struct;
-+typedef const png_struct * png_const_structp;
-+typedef png_struct * png_structp;
-+typedef png_struct * * png_structpp;
-+
-+/* png_info contains information read from or to be written to a PNG file. One
-+ * or more of these must exist while reading or creating a PNG file. The
-+ * information is not used by libpng during read but is used to control what
-+ * gets written when a PNG file is created. "png_get_" function calls read
-+ * information during read and "png_set_" functions calls write information
-+ * when creating a PNG.
-+ * been moved into a separate header file that is not accessible to
-+ * applications. Read libpng-manual.txt or libpng.3 for more info.
-+ */
-+typedef struct png_info_def png_info;
-+typedef png_info * png_infop;
-+typedef const png_info * png_const_infop;
-+typedef png_info * * png_infopp;
-+
-+/* Types with names ending 'p' are pointer types. The corresponding types with
-+ * names ending 'rp' are identical pointer types except that the pointer is
-+ * marked 'restrict', which means that it is the only pointer to the object
-+ * passed to the function. Applications should not use the 'restrict' types;
-+ * it is always valid to pass 'p' to a pointer with a function argument of the
-+ * corresponding 'rp' type. Different compilers have different rules with
-+ * regard to type matching in the presence of 'restrict'. For backward
-+ * compatibility libpng callbacks never have 'restrict' in their parameters and,
-+ * consequentially, writing portable application code is extremely difficult if
-+ * an attempt is made to use 'restrict'.
-+ */
-+typedef png_struct * PNG_RESTRICT png_structrp;
-+typedef const png_struct * PNG_RESTRICT png_const_structrp;
-+typedef png_info * PNG_RESTRICT png_inforp;
-+typedef const png_info * PNG_RESTRICT png_const_inforp;
-
- /* Three color definitions. The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
-@@ -563,9 +650,9 @@
- png_byte green;
- png_byte blue;
- } png_color;
--typedef png_color FAR * png_colorp;
--typedef PNG_CONST png_color FAR * png_const_colorp;
--typedef png_color FAR * FAR * png_colorpp;
-+typedef png_color * png_colorp;
-+typedef const png_color * png_const_colorp;
-+typedef png_color * * png_colorpp;
-
- typedef struct png_color_16_struct
- {
-@@ -575,9 +662,9 @@
- png_uint_16 blue;
- png_uint_16 gray; /* for use in grayscale files */
- } png_color_16;
--typedef png_color_16 FAR * png_color_16p;
--typedef PNG_CONST png_color_16 FAR * png_const_color_16p;
--typedef png_color_16 FAR * FAR * png_color_16pp;
-+typedef png_color_16 * png_color_16p;
-+typedef const png_color_16 * png_const_color_16p;
-+typedef png_color_16 * * png_color_16pp;
-
- typedef struct png_color_8_struct
- {
-@@ -587,9 +674,9 @@
- png_byte gray; /* for use in grayscale files */
- png_byte alpha; /* for alpha channel files */
- } png_color_8;
--typedef png_color_8 FAR * png_color_8p;
--typedef PNG_CONST png_color_8 FAR * png_const_color_8p;
--typedef png_color_8 FAR * FAR * png_color_8pp;
-+typedef png_color_8 * png_color_8p;
-+typedef const png_color_8 * png_const_color_8p;
-+typedef png_color_8 * * png_color_8pp;
-
- /*
- * The following two structures are used for the in-core representation
-@@ -603,9 +690,9 @@
- png_uint_16 alpha;
- png_uint_16 frequency;
- } png_sPLT_entry;
--typedef png_sPLT_entry FAR * png_sPLT_entryp;
--typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;
--typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
-+typedef png_sPLT_entry * png_sPLT_entryp;
-+typedef const png_sPLT_entry * png_const_sPLT_entryp;
-+typedef png_sPLT_entry * * png_sPLT_entrypp;
-
- /* When the depth of the sPLT palette is 8 bits, the color and alpha samples
- * occupy the LSB of their respective members, and the MSB of each member
-@@ -619,18 +706,27 @@
- png_sPLT_entryp entries; /* palette entries */
- png_int_32 nentries; /* number of palette entries */
- } png_sPLT_t;
--typedef png_sPLT_t FAR * png_sPLT_tp;
--typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;
--typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
-+typedef png_sPLT_t * png_sPLT_tp;
-+typedef const png_sPLT_t * png_const_sPLT_tp;
-+typedef png_sPLT_t * * png_sPLT_tpp;
-
- #ifdef PNG_TEXT_SUPPORTED
- /* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
- * and whether that contents is compressed or not. The "key" field
-- * points to a regular zero-terminated C string. The "text", "lang", and
-- * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
-+ * points to a regular zero-terminated C string. The "text" fields can be a
-+ * regular C string, an empty string, or a NULL pointer.
- * However, the structure returned by png_get_text() will always contain
-- * regular zero-terminated C strings (possibly empty), never NULL pointers,
-- * so they can be safely used in printf() and other string-handling functions.
-+ * the "text" field as a regular zero-terminated C string (possibly
-+ * empty), never a NULL pointer, so it can be safely used in printf() and
-+ * other string-handling functions. Note that the "itxt_length", "lang", and
-+ * "lang_key" members of the structure only exist when the library is built
-+ * with iTXt chunk support. Prior to libpng-1.4.0 the library was built by
-+ * default without iTXt support. Also note that when iTXt *is* supported,
-+ * the "lang" and "lang_key" fields contain NULL pointers when the
-+ * "compression" field contains * PNG_TEXT_COMPRESSION_NONE or
-+ * PNG_TEXT_COMPRESSION_zTXt. Note that the "compression value" is not the
-+ * same as what appears in the PNG tEXt/zTXt/iTXt chunk's "compression flag"
-+ * which is always 0 or 1, or its "compression method" which is always 0.
- */
- typedef struct png_text_struct
- {
-@@ -649,9 +745,9 @@
- png_charp lang_key; /* keyword translated UTF-8 string, 0 or more
- chars or a NULL pointer */
- } png_text;
--typedef png_text FAR * png_textp;
--typedef PNG_CONST png_text FAR * png_const_textp;
--typedef png_text FAR * FAR * png_textpp;
-+typedef png_text * png_textp;
-+typedef const png_text * png_const_textp;
-+typedef png_text * * png_textpp;
- #endif
-
- /* Supported compression types for text in PNG files (tEXt, and zTXt).
-@@ -679,49 +775,45 @@
- png_byte minute; /* minute of hour, 0 - 59 */
- png_byte second; /* second of minute, 0 - 60 (for leap seconds) */
- } png_time;
--typedef png_time FAR * png_timep;
--typedef PNG_CONST png_time FAR * png_const_timep;
--typedef png_time FAR * FAR * png_timepp;
--
--#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-- defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-+typedef png_time * png_timep;
-+typedef const png_time * png_const_timep;
-+typedef png_time * * png_timepp;
-+
-+#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\
-+ defined(PNG_USER_CHUNKS_SUPPORTED)
- /* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support. The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
-+ *
-+ * The data in the structure is set by libpng on read and used on write.
- */
- typedef struct png_unknown_chunk_t
- {
-- png_byte name[5];
-- png_byte *data;
-+ png_byte name[5]; /* Textual chunk name with '\0' terminator */
-+ png_byte *data; /* Data, should not be modified on read! */
- png_size_t size;
-
-- /* libpng-using applications should NOT directly modify this byte. */
-+ /* On write 'location' must be set using the flag values listed below.
-+ * Notice that on read it is set by libpng however the values stored have
-+ * more bits set than are listed below. Always treat the value as a
-+ * bitmask. On write set only one bit - setting multiple bits may cause the
-+ * chunk to be written in multiple places.
-+ */
- png_byte location; /* mode of operation at read time */
- }
--
--
- png_unknown_chunk;
--typedef png_unknown_chunk FAR * png_unknown_chunkp;
--typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;
--typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-+
-+typedef png_unknown_chunk * png_unknown_chunkp;
-+typedef const png_unknown_chunk * png_const_unknown_chunkp;
-+typedef png_unknown_chunk * * png_unknown_chunkpp;
- #endif
-
--/* Values for the unknown chunk location byte */
--
-+/* Flag values for the unknown chunk location byte. */
- #define PNG_HAVE_IHDR 0x01
- #define PNG_HAVE_PLTE 0x02
- #define PNG_AFTER_IDAT 0x08
-
--/* The complete definition of png_info has, as of libpng-1.5.0,
-- * been moved into a separate header file that is not accessible to
-- * applications. Read libpng-manual.txt or libpng.3 for more info.
-- */
--typedef struct png_info_def png_info;
--typedef png_info FAR * png_infop;
--typedef PNG_CONST png_info FAR * png_const_infop;
--typedef png_info FAR * FAR * png_infopp;
--
- /* Maximum positive integer used in PNG is (2^31)-1 */
- #define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
- #define PNG_UINT_32_MAX ((png_uint_32)(-1))
-@@ -821,7 +913,7 @@
- #define PNG_INFO_iCCP 0x1000 /* ESR, 1.0.6 */
- #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
- #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
--#define PNG_INFO_IDAT 0x8000L /* ESR, 1.0.6 */
-+#define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */
-
- /* This is used for the transformation routines, as some of them
- * change these values for the row. It also should enable using
-@@ -837,16 +929,8 @@
- png_byte pixel_depth; /* bits per pixel (depth * channels) */
- } png_row_info;
-
--typedef png_row_info FAR * png_row_infop;
--typedef png_row_info FAR * FAR * png_row_infopp;
--
--/* The complete definition of png_struct has, as of libpng-1.5.0,
-- * been moved into a separate header file that is not accessible to
-- * applications. Read libpng-manual.txt or libpng.3 for more info.
-- */
--typedef struct png_struct_def png_struct;
--typedef PNG_CONST png_struct FAR * png_const_structp;
--typedef png_struct FAR * png_structp;
-+typedef png_row_info * png_row_infop;
-+typedef png_row_info * * png_row_infopp;
-
- /* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
-@@ -893,7 +977,8 @@
- png_unknown_chunkp));
- #endif
- #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
--typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp));
-+/* not used anywhere */
-+/* typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp)); */
- #endif
-
- #ifdef PNG_SETJMP_SUPPORTED
-@@ -949,8 +1034,6 @@
- png_alloc_size_t));
- typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
-
--typedef png_struct FAR * FAR * png_structpp;
--
- /* Section 3: exported functions
- * Here are the function definitions most commonly used. This is not
- * the place to find out how to use libpng. See libpng-manual.txt for the
-@@ -986,7 +1069,7 @@
- /* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
--PNG_EXPORT(2, void, png_set_sig_bytes, (png_structp png_ptr, int num_bytes));
-+PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
-
- /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
- * PNG file. Returns zero if the supplied bytes match the 8-byte PNG
-@@ -1014,9 +1097,9 @@
- PNG_ALLOCATED);
-
- PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-- (png_const_structp png_ptr));
--
--PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr,
-+ (png_const_structrp png_ptr));
-+
-+PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
- png_size_t size));
-
- /* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
-@@ -1030,10 +1113,10 @@
- * allocated by the library - the call will return NULL on a mismatch
- * indicating an ABI mismatch.
- */
--PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr,
-+PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
- png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
- # define png_jmpbuf(png_ptr) \
-- (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))
-+ (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))
- #else
- # define png_jmpbuf(png_ptr) \
- (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
-@@ -1043,12 +1126,12 @@
- * will use it; otherwise it will call PNG_ABORT(). This function was
- * added in libpng-1.5.0.
- */
--PNG_EXPORTA(9, void, png_longjmp, (png_structp png_ptr, int val),
-+PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),
- PNG_NORETURN);
-
- #ifdef PNG_READ_SUPPORTED
- /* Reset the compression stream */
--PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));
-+PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);
- #endif
-
- /* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-@@ -1066,91 +1149,107 @@
- #endif
-
- /* Write the PNG file signature. */
--PNG_EXPORT(13, void, png_write_sig, (png_structp png_ptr));
-+PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
-
- /* Write a PNG chunk - size, type, (optional) data, CRC. */
--PNG_EXPORT(14, void, png_write_chunk, (png_structp png_ptr, png_const_bytep
-+PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
- chunk_name, png_const_bytep data, png_size_t length));
-
- /* Write the start of a PNG chunk - length and chunk name. */
--PNG_EXPORT(15, void, png_write_chunk_start, (png_structp png_ptr,
-+PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
- png_const_bytep chunk_name, png_uint_32 length));
-
- /* Write the data of a PNG chunk started with png_write_chunk_start(). */
--PNG_EXPORT(16, void, png_write_chunk_data, (png_structp png_ptr,
-+PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
- png_const_bytep data, png_size_t length));
-
- /* Finish a chunk started with png_write_chunk_start() (includes CRC). */
--PNG_EXPORT(17, void, png_write_chunk_end, (png_structp png_ptr));
-+PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
-
- /* Allocate and initialize the info structure */
--PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr),
-+PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
- PNG_ALLOCATED);
-
--PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr,
-- png_size_t png_info_struct_size));
-+/* DEPRECATED: this function allowed init structures to be created using the
-+ * default allocation method (typically malloc). Use is deprecated in 1.6.0 and
-+ * the API will be removed in the future.
-+ */
-+PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
-+ png_size_t png_info_struct_size), PNG_DEPRECATED);
-
- /* Writes all the PNG information before the image. */
- PNG_EXPORT(20, void, png_write_info_before_PLTE,
-- (png_structp png_ptr, png_infop info_ptr));
-+ (png_structrp png_ptr, png_const_inforp info_ptr));
- PNG_EXPORT(21, void, png_write_info,
-- (png_structp png_ptr, png_infop info_ptr));
-+ (png_structrp png_ptr, png_const_inforp info_ptr));
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read the information before the actual image data. */
- PNG_EXPORT(22, void, png_read_info,
-- (png_structp png_ptr, png_infop info_ptr));
-+ (png_structrp png_ptr, png_inforp info_ptr));
- #endif
-
- #ifdef PNG_TIME_RFC1123_SUPPORTED
--PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,
-- (png_structp png_ptr,
-+ /* Convert to a US string format: there is no localization support in this
-+ * routine. The original implementation used a 29 character buffer in
-+ * png_struct, this will be removed in future versions.
-+ */
-+#if PNG_LIBPNG_VER < 10700
-+/* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */
-+PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
-+ png_const_timep ptime),PNG_DEPRECATED);
-+#endif
-+PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],
- png_const_timep ptime));
- #endif
-
- #ifdef PNG_CONVERT_tIME_SUPPORTED
- /* Convert from a struct tm to png_time */
- PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-- PNG_CONST struct tm FAR * ttime));
-+ const struct tm * ttime));
-
- /* Convert from time_t to png_time. Uses gmtime() */
--PNG_EXPORT(25, void, png_convert_from_time_t,
-- (png_timep ptime, time_t ttime));
--#endif /* PNG_CONVERT_tIME_SUPPORTED */
-+PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
-+#endif /* CONVERT_tIME */
-
- #ifdef PNG_READ_EXPAND_SUPPORTED
- /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
--PNG_EXPORT(26, void, png_set_expand, (png_structp png_ptr));
--PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));
--PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));
--PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp png_ptr));
-+PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));
-+PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));
-+PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));
-+PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
- /* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
- * of a tRNS chunk if present.
- */
--PNG_EXPORT(221, void, png_set_expand_16, (png_structp png_ptr));
-+PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
- /* Use blue, green, red order for pixels. */
--PNG_EXPORT(30, void, png_set_bgr, (png_structp png_ptr));
-+PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
- /* Expand the grayscale to 24-bit RGB if necessary. */
--PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));
-+PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- /* Reduce RGB to grayscale. */
--PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
-- int error_action, double red, double green));
--PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp png_ptr,
-- int error_action, png_fixed_point red, png_fixed_point green));
--
--PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structp
-+#define PNG_ERROR_ACTION_NONE 1
-+#define PNG_ERROR_ACTION_WARN 2
-+#define PNG_ERROR_ACTION_ERROR 3
-+#define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
-+
-+PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,
-+ int error_action, double red, double green))
-+PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,
-+ int error_action, png_fixed_point red, png_fixed_point green))
-+
-+PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp
- png_ptr));
- #endif
-
-@@ -1160,9 +1259,9 @@
- #endif
-
- #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
--/* How the alpha channel is interpreted - this affects how the color channels of
-- * a PNG file are returned when an alpha channel, or tRNS chunk in a palette
-- * file, is present.
-+/* How the alpha channel is interpreted - this affects how the color channels
-+ * of a PNG file are returned to the calling application when an alpha channel,
-+ * or a tRNS chunk in a palette file, is present.
- *
- * This has no effect on the way pixels are written into a PNG output
- * datastream. The color samples in a PNG datastream are never premultiplied
-@@ -1170,33 +1269,19 @@
- *
- * The default is to return data according to the PNG specification: the alpha
- * channel is a linear measure of the contribution of the pixel to the
-- * corresponding composited pixel. The gamma encoded color channels must be
-- * scaled according to the contribution and to do this it is necessary to undo
-+ * corresponding composited pixel, and the color channels are unassociated
-+ * (not premultiplied). The gamma encoded color channels must be scaled
-+ * according to the contribution and to do this it is necessary to undo
- * the encoding, scale the color values, perform the composition and reencode
- * the values. This is the 'PNG' mode.
- *
- * The alternative is to 'associate' the alpha with the color information by
-- * storing color channel values that have been scaled by the alpha. The
-- * advantage is that the color channels can be resampled (the image can be
-- * scaled) in this form. The disadvantage is that normal practice is to store
-- * linear, not (gamma) encoded, values and this requires 16-bit channels for
-- * still images rather than the 8-bit channels that are just about sufficient if
-- * gamma encoding is used. In addition all non-transparent pixel values,
-- * including completely opaque ones, must be gamma encoded to produce the final
-- * image. This is the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' mode (the
-- * latter being the two common names for associated alpha color channels.)
-+ * storing color channel values that have been scaled by the alpha.
-+ * image. These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes
-+ * (the latter being the two common names for associated alpha color channels).
- *
-- * Since it is not necessary to perform arithmetic on opaque color values so
-- * long as they are not to be resampled and are in the final color space it is
-- * possible to optimize the handling of alpha by storing the opaque pixels in
-- * the PNG format (adjusted for the output color space) while storing partially
-- * opaque pixels in the standard, linear, format. The accuracy required for
-- * standard alpha composition is relatively low, because the pixels are
-- * isolated, therefore typically the accuracy loss in storing 8-bit linear
-- * values is acceptable. (This is not true if the alpha channel is used to
-- * simulate transparency over large areas - use 16 bits or the PNG mode in
-- * this case!) This is the 'OPTIMIZED' mode. For this mode a pixel is
-- * treated as opaque only if the alpha value is equal to the maximum value.
-+ * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha
-+ * value is equal to the maximum value.
- *
- * The final choice is to gamma encode the alpha channel as well. This is
- * broken because, in practice, no implementation that uses this choice
-@@ -1215,76 +1300,15 @@
- #define PNG_ALPHA_OPTIMIZED 2 /* 'PNG' for opaque pixels, else 'STANDARD' */
- #define PNG_ALPHA_BROKEN 3 /* the alpha channel is gamma encoded */
-
--PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structp png_ptr, int mode,
-- double output_gamma));
--PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structp png_ptr,
-- int mode, png_fixed_point output_gamma));
-+PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,
-+ double output_gamma))
-+PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
-+ int mode, png_fixed_point output_gamma))
- #endif
-
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-+#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
- /* The output_gamma value is a screen gamma in libpng terminology: it expresses
-- * how to decode the output values, not how they are encoded. The values used
-- * correspond to the normal numbers used to describe the overall gamma of a
-- * computer display system; for example 2.2 for an sRGB conformant system. The
-- * values are scaled by 100000 in the _fixed version of the API (so 220000 for
-- * sRGB.)
-- *
-- * The inverse of the value is always used to provide a default for the PNG file
-- * encoding if it has no gAMA chunk and if png_set_gamma() has not been called
-- * to override the PNG gamma information.
-- *
-- * When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode
-- * opaque pixels however pixels with lower alpha values are not encoded,
-- * regardless of the output gamma setting.
-- *
-- * When the standard Porter Duff handling is requested with mode 1 the output
-- * encoding is set to be linear and the output_gamma value is only relevant
-- * as a default for input data that has no gamma information. The linear output
-- * encoding will be overridden if png_set_gamma() is called - the results may be
-- * highly unexpected!
-- *
-- * The following numbers are derived from the sRGB standard and the research
-- * behind it. sRGB is defined to be approximated by a PNG gAMA chunk value of
-- * 0.45455 (1/2.2) for PNG. The value implicitly includes any viewing
-- * correction required to take account of any differences in the color
-- * environment of the original scene and the intended display environment; the
-- * value expresses how to *decode* the image for display, not how the original
-- * data was *encoded*.
-- *
-- * sRGB provides a peg for the PNG standard by defining a viewing environment.
-- * sRGB itself, and earlier TV standards, actually use a more complex transform
-- * (a linear portion then a gamma 2.4 power law) than PNG can express. (PNG is
-- * limited to simple power laws.) By saying that an image for direct display on
-- * an sRGB conformant system should be stored with a gAMA chunk value of 45455
-- * (11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification
-- * makes it possible to derive values for other display systems and
-- * environments.
-- *
-- * The Mac value is deduced from the sRGB based on an assumption that the actual
-- * extra viewing correction used in early Mac display systems was implemented as
-- * a power 1.45 lookup table.
-- *
-- * Any system where a programmable lookup table is used or where the behavior of
-- * the final display device characteristics can be changed requires system
-- * specific code to obtain the current characteristic. However this can be
-- * difficult and most PNG gamma correction only requires an approximate value.
-- *
-- * By default, if png_set_alpha_mode() is not called, libpng assumes that all
-- * values are unencoded, linear, values and that the output device also has a
-- * linear characteristic. This is only very rarely correct - it is invariably
-- * better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the
-- * default if you don't know what the right answer is!
-- *
-- * The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS
-- * 10.6) which used a correction table to implement a somewhat lower gamma on an
-- * otherwise sRGB system.
-- *
-- * Both these values are reserved (not simple gamma values) in order to allow
-- * more precise correction internally in the future.
-- *
-- * NOTE: the following values can be passed to either the fixed or floating
-- * point APIs, but the floating point API will also accept floating point
-- * values.
-+ * how to decode the output values, not how they are encoded.
- */
- #define PNG_DEFAULT_sRGB -1 /* sRGB gamma and color space */
- #define PNG_GAMMA_MAC_18 -2 /* Old Mac '1.8' gamma and color space */
-@@ -1369,51 +1393,50 @@
- */
-
- #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
--PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp png_ptr));
-+PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
- defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
--PNG_EXPORT(37, void, png_set_swap_alpha, (png_structp png_ptr));
-+PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
- defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
--PNG_EXPORT(38, void, png_set_invert_alpha, (png_structp png_ptr));
-+PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
- /* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
--PNG_EXPORT(39, void, png_set_filler, (png_structp png_ptr, png_uint_32 filler,
-+PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
- int flags));
- /* The values of the PNG_FILLER_ defines should NOT be changed */
- # define PNG_FILLER_BEFORE 0
- # define PNG_FILLER_AFTER 1
- /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
--PNG_EXPORT(40, void, png_set_add_alpha,
-- (png_structp png_ptr, png_uint_32 filler,
-- int flags));
--#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
-+PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
-+ png_uint_32 filler, int flags));
-+#endif /* READ_FILLER || WRITE_FILLER */
-
- #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
- /* Swap bytes in 16-bit depth files. */
--PNG_EXPORT(41, void, png_set_swap, (png_structp png_ptr));
-+PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
- /* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
--PNG_EXPORT(42, void, png_set_packing, (png_structp png_ptr));
-+PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
- defined(PNG_WRITE_PACKSWAP_SUPPORTED)
- /* Swap packing order of pixels in bytes. */
--PNG_EXPORT(43, void, png_set_packswap, (png_structp png_ptr));
-+PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
- /* Converts files to legal bit depths. */
--PNG_EXPORT(44, void, png_set_shift, (png_structp png_ptr, png_const_color_8p
-+PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
- true_bits));
- #endif
-
-@@ -1425,12 +1448,12 @@
- * necessary to call png_read_row or png_read_rows png_get_image_height
- * times for each pass.
- */
--PNG_EXPORT(45, int, png_set_interlace_handling, (png_structp png_ptr));
-+PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));
- #endif
-
- #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
- /* Invert monochrome files */
--PNG_EXPORT(46, void, png_set_invert_mono, (png_structp png_ptr));
-+PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_BACKGROUND_SUPPORTED
-@@ -1439,12 +1462,12 @@
- * read. Doing so will result in unexpected behavior and possible warnings or
- * errors if the PNG file contains a bKGD chunk.
- */
--PNG_FP_EXPORT(47, void, png_set_background, (png_structp png_ptr,
-+PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,
- png_const_color_16p background_color, int background_gamma_code,
-- int need_expand, double background_gamma));
--PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
-+ int need_expand, double background_gamma))
-+PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
- png_const_color_16p background_color, int background_gamma_code,
-- int need_expand, png_fixed_point background_gamma));
-+ int need_expand, png_fixed_point background_gamma))
- #endif
- #ifdef PNG_READ_BACKGROUND_SUPPORTED
- # define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-@@ -1455,23 +1478,22 @@
-
- #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- /* Scale a 16-bit depth file down to 8-bit, accurately. */
--PNG_EXPORT(229, void, png_set_scale_16, (png_structp png_ptr));
-+PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
- #define PNG_READ_16_TO_8 SUPPORTED /* Name prior to 1.5.4 */
- /* Strip the second byte of information from a 16-bit depth file. */
--PNG_EXPORT(48, void, png_set_strip_16, (png_structp png_ptr));
-+PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_QUANTIZE_SUPPORTED
- /* Turn on quantizing, and reduce the palette to the number of colors
- * available.
- */
--PNG_EXPORT(49, void, png_set_quantize,
-- (png_structp png_ptr, png_colorp palette,
-- int num_palette, int maximum_colors, png_const_uint_16p histogram,
-- int full_quantize));
-+PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
-+ png_colorp palette, int num_palette, int maximum_colors,
-+ png_const_uint_16p histogram, int full_quantize));
- #endif
-
- #ifdef PNG_READ_GAMMA_SUPPORTED
-@@ -1491,71 +1513,69 @@
- * API (floating point or fixed.) Notice, however, that the 'file_gamma' value
- * is the inverse of a 'screen gamma' value.
- */
--PNG_FP_EXPORT(50, void, png_set_gamma,
-- (png_structp png_ptr, double screen_gamma,
-- double override_file_gamma));
--PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr,
-- png_fixed_point screen_gamma, png_fixed_point override_file_gamma));
-+PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,
-+ double screen_gamma, double override_file_gamma))
-+PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,
-+ png_fixed_point screen_gamma, png_fixed_point override_file_gamma))
- #endif
-
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- /* Set how many lines between output flushes - 0 for no flushing */
--PNG_EXPORT(51, void, png_set_flush, (png_structp png_ptr, int nrows));
-+PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));
- /* Flush the current PNG output buffer */
--PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));
-+PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));
- #endif
-
- /* Optional update palette with requested transformations */
--PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));
-+PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));
-
- /* Optional call to update the users info structure */
--PNG_EXPORT(54, void, png_read_update_info,
-- (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,
-+ png_inforp info_ptr));
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read one or more rows of image data. */
--PNG_EXPORT(55, void, png_read_rows, (png_structp png_ptr, png_bytepp row,
-+PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,
- png_bytepp display_row, png_uint_32 num_rows));
- #endif
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read a row of data. */
--PNG_EXPORT(56, void, png_read_row, (png_structp png_ptr, png_bytep row,
-+PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,
- png_bytep display_row));
- #endif
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read the whole image into memory at once. */
--PNG_EXPORT(57, void, png_read_image, (png_structp png_ptr, png_bytepp image));
-+PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));
- #endif
-
- /* Write a row of image data */
--PNG_EXPORT(58, void, png_write_row,
-- (png_structp png_ptr, png_const_bytep row));
-+PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
-+ png_const_bytep row));
-
- /* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writeable to maintain compatibility with previous versions
- * of libpng and to allow the 'display_row' array from read_rows to be passed
- * unchanged to write_rows.
- */
--PNG_EXPORT(59, void, png_write_rows, (png_structp png_ptr, png_bytepp row,
-+PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,
- png_uint_32 num_rows));
-
- /* Write the image data */
--PNG_EXPORT(60, void, png_write_image,
-- (png_structp png_ptr, png_bytepp image));
-+PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));
-
- /* Write the end of the PNG file. */
--PNG_EXPORT(61, void, png_write_end,
-- (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,
-+ png_inforp info_ptr));
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read the end of the PNG file. */
--PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));
- #endif
-
- /* Free any memory associated with the png_info_struct */
--PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp png_ptr,
-+PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,
- png_infopp info_ptr_ptr));
-
- /* Free any memory associated with the png_struct and the png_info_structs */
-@@ -1567,8 +1587,8 @@
- png_infopp info_ptr_ptr));
-
- /* Set the libpng method of handling chunk CRC errors */
--PNG_EXPORT(66, void, png_set_crc_action,
-- (png_structp png_ptr, int crit_action, int ancil_action));
-+PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
-+ int ancil_action));
-
- /* Values for png_set_crc_action() say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
-@@ -1597,8 +1617,8 @@
- /* Set the filtering method(s) used by libpng. Currently, the only valid
- * value for "method" is 0.
- */
--PNG_EXPORT(67, void, png_set_filter,
-- (png_structp png_ptr, int method, int filters));
-+PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
-+ int filters));
-
- /* Flags for png_set_filter() to say which filters to use. The flags
- * are chosen so that they don't conflict with real filter types
-@@ -1653,14 +1673,14 @@
- * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
- * to the UNWEIGHTED method, but with added encoding time/computation.
- */
--PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structp png_ptr,
-+PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,
- int heuristic_method, int num_weights, png_const_doublep filter_weights,
-- png_const_doublep filter_costs));
-+ png_const_doublep filter_costs))
- PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-- (png_structp png_ptr,
-- int heuristic_method, int num_weights, png_const_fixed_point_p
-- filter_weights, png_const_fixed_point_p filter_costs));
--#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-+ (png_structrp png_ptr, int heuristic_method, int num_weights,
-+ png_const_fixed_point_p filter_weights,
-+ png_const_fixed_point_p filter_costs))
-+#endif /* WRITE_WEIGHTED_FILTER */
-
- /* Heuristic used for row filter selection. These defines should NOT be
- * changed.
-@@ -1678,45 +1698,45 @@
- * for PNG images, and do considerably fewer caclulations. In the future,
- * these values may not correspond directly to the zlib compression levels.
- */
--PNG_EXPORT(69, void, png_set_compression_level,
-- (png_structp png_ptr, int level));
--
--PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr,
-+PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,
-+ int level));
-+
-+PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,
- int mem_level));
-
--PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr,
-+PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,
- int strategy));
-
- /* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
--PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr,
-+PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,
- int window_bits));
-
--PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,
-+PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,
- int method));
- #endif
-
- #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
- /* Also set zlib parameters for compressing non-IDAT chunks */
--PNG_EXPORT(222, void, png_set_text_compression_level,
-- (png_structp png_ptr, int level));
--
--PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structp png_ptr,
-+PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,
-+ int level));
-+
-+PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,
- int mem_level));
-
--PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structp png_ptr,
-+PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,
- int strategy));
-
- /* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
--PNG_EXPORT(225, void, png_set_text_compression_window_bits, (png_structp
-- png_ptr, int window_bits));
--
--PNG_EXPORT(226, void, png_set_text_compression_method, (png_structp png_ptr,
-+PNG_EXPORT(225, void, png_set_text_compression_window_bits,
-+ (png_structrp png_ptr, int window_bits));
-+
-+PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
- int method));
--#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
-+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
-
- /* These next functions are called for input/output, memory, and error
- * handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
-@@ -1729,7 +1749,7 @@
-
- #ifdef PNG_STDIO_SUPPORTED
- /* Initialize the input/output for the PNG file to the default functions. */
--PNG_EXPORT(74, void, png_init_io, (png_structp png_ptr, png_FILE_p fp));
-+PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
- #endif
-
- /* Replace the (error and abort), and warning functions with user
-@@ -1740,12 +1760,11 @@
- * default function will be used.
- */
-
--PNG_EXPORT(75, void, png_set_error_fn,
-- (png_structp png_ptr, png_voidp error_ptr,
-- png_error_ptr error_fn, png_error_ptr warning_fn));
-+PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,
-+ png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
-
- /* Return the user pointer associated with the error functions */
--PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));
-+PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
-
- /* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
-@@ -1757,47 +1776,47 @@
- * default flush function, which uses the standard *FILE structure, will
- * be used.
- */
--PNG_EXPORT(77, void, png_set_write_fn, (png_structp png_ptr, png_voidp io_ptr,
-+PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,
- png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
- /* Replace the default data input function with a user supplied one. */
--PNG_EXPORT(78, void, png_set_read_fn, (png_structp png_ptr, png_voidp io_ptr,
-+PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,
- png_rw_ptr read_data_fn));
-
- /* Return the user pointer associated with the I/O functions */
--PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_structp png_ptr));
--
--PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr,
-+PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));
-+
-+PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,
- png_read_status_ptr read_row_fn));
-
--PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp png_ptr,
-+PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,
- png_write_status_ptr write_row_fn));
-
- #ifdef PNG_USER_MEM_SUPPORTED
- /* Replace the default memory allocation functions with user supplied one(s). */
--PNG_EXPORT(82, void, png_set_mem_fn, (png_structp png_ptr, png_voidp mem_ptr,
-+PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,
- png_malloc_ptr malloc_fn, png_free_ptr free_fn));
- /* Return the user pointer associated with the memory functions */
--PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structp png_ptr));
-+PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));
- #endif
-
- #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
--PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp png_ptr,
-+PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,
- png_user_transform_ptr read_user_transform_fn));
- #endif
-
- #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
--PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structp png_ptr,
-+PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,
- png_user_transform_ptr write_user_transform_fn));
- #endif
-
- #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
--PNG_EXPORT(86, void, png_set_user_transform_info, (png_structp png_ptr,
-+PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,
- png_voidp user_transform_ptr, int user_transform_depth,
- int user_transform_channels));
- /* Return the user pointer associated with the user transform functions */
- PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- #endif
-
- #ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-@@ -1812,31 +1831,53 @@
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass). (See below for these macros.)
- */
--PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structp));
--PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
-+PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));
-+PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
- #endif
-
-+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-+/* This callback is called only for *unknown* chunks. If
-+ * PNG_HANDLE_AS_UNKNOWN_SUPPORTED is set then it is possible to set known
-+ * chunks to be treated as unknown, however in this case the callback must do
-+ * any processing required by the chunk (e.g. by calling the appropriate
-+ * png_set_ APIs.)
-+ *
-+ * There is no write support - on write, by default, all the chunks in the
-+ * 'unknown' list are written in the specified position.
-+ *
-+ * The integer return from the callback function is interpreted thus:
-+ *
-+ * negative: An error occured, png_chunk_error will be called.
-+ * zero: The chunk was not handled, the chunk will be saved. A critical
-+ * chunk will cause an error at this point unless it is to be saved.
-+ * positive: The chunk was handled, libpng will ignore/discard it.
-+ *
-+ * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about
-+ * how this behavior will change in libpng 1.7
-+ */
-+PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
-+ png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-+#endif
-+
- #ifdef PNG_USER_CHUNKS_SUPPORTED
--PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr,
-- png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
--PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp png_ptr));
-+PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));
- #endif
-
- #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- /* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
--PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr,
-+PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,
- png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
- png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
-
- /* Returns the user pointer associated with the push read functions */
--PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr));
-+PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
-+ (png_const_structrp png_ptr));
-
- /* Function to be called when data becomes available */
--PNG_EXPORT(92, void, png_process_data,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_bytep buffer, png_size_t buffer_size));
-+PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
-+ png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));
-
- /* A function which may be called *only* within png_process_data to stop the
- * processing of any more data. The function returns the number of bytes
-@@ -1845,7 +1886,7 @@
- * 'save' is set to true the routine will first save all the pending data and
- * will always return 0.
- */
--PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));
-+PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
-
- /* A function which may be called *only* outside (after) a call to
- * png_process_data. It returns the number of bytes of data to skip in the
-@@ -1853,40 +1894,43 @@
- * application must skip than number of bytes of input data and pass the
- * following data to the next call to png_process_data.
- */
--PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structp));
-+PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
-
- /* Function that combines rows. 'new_row' is a flag that should come from
- * the callback and be non-NULL if anything needs to be done; the library
- * stores its own version of the new data internally and ignores the passed
- * in value.
- */
--PNG_EXPORT(93, void, png_progressive_combine_row, (png_structp png_ptr,
-+PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
- png_bytep old_row, png_const_bytep new_row));
--#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
--
--PNG_EXPORTA(94, png_voidp, png_malloc,
-- (png_structp png_ptr, png_alloc_size_t size),
-- PNG_ALLOCATED);
-+#endif /* PROGRESSIVE_READ */
-+
-+PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
-+ png_alloc_size_t size), PNG_ALLOCATED);
- /* Added at libpng version 1.4.0 */
--PNG_EXPORTA(95, png_voidp, png_calloc,
-- (png_structp png_ptr, png_alloc_size_t size),
-- PNG_ALLOCATED);
-+PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,
-+ png_alloc_size_t size), PNG_ALLOCATED);
-
- /* Added at libpng version 1.2.4 */
--PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_structp png_ptr,
-+PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,
- png_alloc_size_t size), PNG_ALLOCATED);
-
- /* Frees a pointer allocated by png_malloc() */
--PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));
-+PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
-
- /* Free data that was allocated internally */
--PNG_EXPORT(98, void, png_free_data,
-- (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));
-+PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 free_me, int num));
-
- /* Reassign responsibility for freeing existing data, whether allocated
-- * by libpng or by the application */
--PNG_EXPORT(99, void, png_data_freer,
-- (png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask));
-+ * by libpng or by the application; this works on the png_info structure passed
-+ * in, it does not change the state for other png_info structures.
-+ *
-+ * It is unlikely that this function works correctly as of 1.6.0 and using it
-+ * may result either in memory leaks or double free of allocated data.
-+ */
-+PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int freer, png_uint_32 mask));
-
- /* Assignments for png_data_freer */
- #define PNG_DESTROY_WILL_FREE_DATA 1
-@@ -1899,8 +1943,10 @@
- #define PNG_FREE_ROWS 0x0040
- #define PNG_FREE_PCAL 0x0080
- #define PNG_FREE_SCAL 0x0100
--#define PNG_FREE_UNKN 0x0200
--#define PNG_FREE_LIST 0x0400
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-+# define PNG_FREE_UNKN 0x0200
-+#endif
-+/* PNG_FREE_LIST 0x0400 removed in 1.6.0 because it is ignored */
- #define PNG_FREE_PLTE 0x1000
- #define PNG_FREE_TRNS 0x2000
- #define PNG_FREE_TEXT 0x4000
-@@ -1908,50 +1954,55 @@
- #define PNG_FREE_MUL 0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
- #ifdef PNG_USER_MEM_SUPPORTED
--PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_structp png_ptr,
-- png_alloc_size_t size), PNG_ALLOCATED);
--PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));
-+PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
-+ png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);
-+PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,
-+ png_voidp ptr), PNG_DEPRECATED);
- #endif
-
- #ifdef PNG_ERROR_TEXT_SUPPORTED
- /* Fatal error in PNG image of libpng - can't continue */
--PNG_EXPORTA(102, void, png_error,
-- (png_structp png_ptr, png_const_charp error_message),
-- PNG_NORETURN);
-+PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,
-+ png_const_charp error_message), PNG_NORETURN);
-
- /* The same, but the chunk name is prepended to the error string. */
--PNG_EXPORTA(103, void, png_chunk_error, (png_structp png_ptr,
-+PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,
- png_const_charp error_message), PNG_NORETURN);
-
- #else
- /* Fatal error in PNG image of libpng - can't continue */
--PNG_EXPORTA(104, void, png_err, (png_structp png_ptr), PNG_NORETURN);
-+PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);
-+# define png_error(s1,s2) png_err(s1)
-+# define png_chunk_error(s1,s2) png_err(s1)
- #endif
-
- #ifdef PNG_WARNINGS_SUPPORTED
- /* Non-fatal error in libpng. Can continue, but may have a problem. */
--PNG_EXPORT(105, void, png_warning, (png_structp png_ptr,
-+PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,
- png_const_charp warning_message));
-
- /* Non-fatal error in libpng, chunk name is prepended to message. */
--PNG_EXPORT(106, void, png_chunk_warning, (png_structp png_ptr,
-+PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
- png_const_charp warning_message));
-+#else
-+# define png_warning(s1,s2) ((void)(s1))
-+# define png_chunk_warning(s1,s2) ((void)(s1))
- #endif
-
- #ifdef PNG_BENIGN_ERRORS_SUPPORTED
- /* Benign error in libpng. Can continue, but may have a problem.
- * User can choose whether to handle as a fatal error or as a warning. */
--# undef png_benign_error
--PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr,
-+PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,
- png_const_charp warning_message));
-
--/* Same, chunk name is prepended to message. */
--# undef png_chunk_benign_error
--PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr,
-+#ifdef PNG_READ_SUPPORTED
-+/* Same, chunk name is prepended to message (only during read) */
-+PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,
- png_const_charp warning_message));
-+#endif
-
- PNG_EXPORT(109, void, png_set_benign_errors,
-- (png_structp png_ptr, int allowed));
-+ (png_structrp png_ptr, int allowed));
- #else
- # ifdef PNG_ALLOW_BENIGN_ERRORS
- # define png_benign_error png_warning
-@@ -1975,268 +2026,274 @@
- * png_info_struct.
- */
- /* Returns "flag" if chunk data is valid in info_ptr. */
--PNG_EXPORT(110, png_uint_32, png_get_valid,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_uint_32 flag));
-+PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, png_uint_32 flag));
-
- /* Returns number of bytes needed to hold a transformed row. */
--PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- /* Returns row_pointers, which is an array of pointers to scanlines that was
- * returned from png_read_png().
- */
--PNG_EXPORT(112, png_bytepp, png_get_rows,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-+
- /* Set row_pointers, which is an array of pointers to scanlines for use
- * by png_write_png().
- */
--PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr,
-- png_infop info_ptr, png_bytepp row_pointers));
-+PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_bytepp row_pointers));
- #endif
-
- /* Returns number of color channels in image. */
--PNG_EXPORT(114, png_byte, png_get_channels,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- #ifdef PNG_EASY_ACCESS_SUPPORTED
- /* Returns image width in pixels. */
--PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image height in pixels. */
--PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image bit_depth. */
--PNG_EXPORT(117, png_byte, png_get_bit_depth,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image color_type. */
--PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image filter_type. */
--PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image interlace_type. */
--PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image compression_type. */
--PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-
- /* Returns image resolution in pixels per meter, from pHYs chunk data. */
- PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
- PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
- PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
- /* Returns pixel aspect ratio, computed from pHYs chunk data. */
- PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr))
- PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr))
-
- /* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
- PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
- PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
- PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
- PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
--
--#endif /* PNG_EASY_ACCESS_SUPPORTED */
--
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
-+
-+#endif /* EASY_ACCESS */
-+
-+#ifdef PNG_READ_SUPPORTED
- /* Returns pointer to signature string read from PNG header */
--PNG_EXPORT(130, png_const_bytep, png_get_signature,
-- (png_const_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr));
-+#endif
-
- #ifdef PNG_bKGD_SUPPORTED
--PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-- (png_const_structp png_ptr, png_infop info_ptr,
-- png_color_16p *background));
-+PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_color_16p *background));
- #endif
-
- #ifdef PNG_bKGD_SUPPORTED
--PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr,
-- png_const_color_16p background));
-+PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_color_16p background));
- #endif
-
- #ifdef PNG_cHRM_SUPPORTED
--PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr,
-- png_const_infop info_ptr, double *white_x, double *white_y, double *red_x,
-+PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,
- double *red_y, double *green_x, double *green_y, double *blue_x,
-- double *blue_y));
--#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
-+ double *blue_y))
-+PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,
-+ double *green_X, double *green_Y, double *green_Z, double *blue_X,
-+ double *blue_Y, double *blue_Z))
- PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-- (png_const_structp png_ptr,
-- png_const_infop info_ptr, png_fixed_point *int_white_x,
-- png_fixed_point *int_white_y, png_fixed_point *int_red_x,
-- png_fixed_point *int_red_y, png_fixed_point *int_green_x,
-- png_fixed_point *int_green_y, png_fixed_point *int_blue_x,
-- png_fixed_point *int_blue_y));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr,
-+ png_fixed_point *int_white_x, png_fixed_point *int_white_y,
-+ png_fixed_point *int_red_x, png_fixed_point *int_red_y,
-+ png_fixed_point *int_green_x, png_fixed_point *int_green_y,
-+ png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))
-+PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr,
-+ png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-+ png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-+ png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-+ png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-+ png_fixed_point *int_blue_Z))
- #endif
--#endif
-
- #ifdef PNG_cHRM_SUPPORTED
--PNG_FP_EXPORT(135, void, png_set_cHRM,
-- (png_structp png_ptr, png_infop info_ptr,
-+PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,
-+ png_inforp info_ptr,
- double white_x, double white_y, double red_x, double red_y, double green_x,
-- double green_y, double blue_x, double blue_y));
--PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr,
-- png_infop info_ptr, png_fixed_point int_white_x,
-+ double green_y, double blue_x, double blue_y))
-+PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, double red_X, double red_Y, double red_Z,
-+ double green_X, double green_Y, double green_Z, double blue_X,
-+ double blue_Y, double blue_Z))
-+PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_fixed_point int_white_x,
- png_fixed_point int_white_y, png_fixed_point int_red_x,
- png_fixed_point int_red_y, png_fixed_point int_green_x,
- png_fixed_point int_green_y, png_fixed_point int_blue_x,
-- png_fixed_point int_blue_y));
-+ png_fixed_point int_blue_y))
-+PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-+ png_fixed_point int_red_Z, png_fixed_point int_green_X,
-+ png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-+ png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-+ png_fixed_point int_blue_Z))
- #endif
-
- #ifdef PNG_gAMA_SUPPORTED
--PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- double *file_gamma));
-+PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, double *file_gamma))
- PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_fixed_point *int_file_gamma));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr,
-+ png_fixed_point *int_file_gamma))
- #endif
-
- #ifdef PNG_gAMA_SUPPORTED
--PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
-- png_infop info_ptr, double file_gamma));
--PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr,
-- png_infop info_ptr, png_fixed_point int_file_gamma));
-+PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, double file_gamma))
-+PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_fixed_point int_file_gamma))
- #endif
-
- #ifdef PNG_hIST_SUPPORTED
--PNG_EXPORT(141, png_uint_32, png_get_hIST,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_uint_16p *hist));
-+PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_16p *hist));
- #endif
-
- #ifdef PNG_hIST_SUPPORTED
--PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
-- png_infop info_ptr, png_const_uint_16p hist));
-+PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_uint_16p hist));
- #endif
-
--PNG_EXPORT(143, png_uint_32, png_get_IHDR,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type,
-- int *interlace_method, int *compression_method, int *filter_method));
--
--PNG_EXPORT(144, void, png_set_IHDR,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
-- int interlace_method, int compression_method, int filter_method));
-+PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,
-+ int *bit_depth, int *color_type, int *interlace_method,
-+ int *compression_method, int *filter_method));
-+
-+PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
-+ int color_type, int interlace_method, int compression_method,
-+ int filter_method));
-
- #ifdef PNG_oFFs_SUPPORTED
--PNG_EXPORT(145, png_uint_32, png_get_oFFs,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));
-+PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
-+ int *unit_type));
- #endif
-
- #ifdef PNG_oFFs_SUPPORTED
--PNG_EXPORT(146, void, png_set_oFFs,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_int_32 offset_x, png_int_32 offset_y, int unit_type));
-+PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,
-+ int unit_type));
- #endif
-
- #ifdef PNG_pCAL_SUPPORTED
--PNG_EXPORT(147, png_uint_32, png_get_pCAL,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type,
-- int *nparams,
-- png_charp *units, png_charpp *params));
-+PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,
-+ png_int_32 *X1, int *type, int *nparams, png_charp *units,
-+ png_charpp *params));
- #endif
-
- #ifdef PNG_pCAL_SUPPORTED
--PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr,
-- png_infop info_ptr,
-- png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
-- int nparams, png_const_charp units, png_charpp params));
-+PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,
-+ int type, int nparams, png_const_charp units, png_charpp params));
- #endif
-
- #ifdef PNG_pHYs_SUPPORTED
--PNG_EXPORT(149, png_uint_32, png_get_pHYs,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
-+PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-+ int *unit_type));
- #endif
-
- #ifdef PNG_pHYs_SUPPORTED
--PNG_EXPORT(150, void, png_set_pHYs,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-+PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
- #endif
-
--PNG_EXPORT(151, png_uint_32, png_get_PLTE,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_colorp *palette, int *num_palette));
--
--PNG_EXPORT(152, void, png_set_PLTE,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_const_colorp palette, int num_palette));
-+PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_colorp *palette, int *num_palette));
-+
-+PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,
-+ png_inforp info_ptr, png_const_colorp palette, int num_palette));
-
- #ifdef PNG_sBIT_SUPPORTED
--PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-- (png_const_structp png_ptr, png_infop info_ptr,
-- png_color_8p *sig_bit));
-+PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_color_8p *sig_bit));
- #endif
-
- #ifdef PNG_sBIT_SUPPORTED
--PNG_EXPORT(154, void, png_set_sBIT,
-- (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));
-+PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_color_8p sig_bit));
- #endif
-
- #ifdef PNG_sRGB_SUPPORTED
--PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
-- png_const_infop info_ptr, int *file_srgb_intent));
-+PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, int *file_srgb_intent));
- #endif
-
- #ifdef PNG_sRGB_SUPPORTED
--PNG_EXPORT(156, void, png_set_sRGB,
-- (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
--PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr,
-- png_infop info_ptr, int srgb_intent));
-+PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int srgb_intent));
-+PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int srgb_intent));
- #endif
-
- #ifdef PNG_iCCP_SUPPORTED
--PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_charpp name, int *compression_type, png_bytepp profile,
-- png_uint_32 *proflen));
-+PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_charpp name, int *compression_type,
-+ png_bytepp profile, png_uint_32 *proflen));
- #endif
-
- #ifdef PNG_iCCP_SUPPORTED
--PNG_EXPORT(159, void, png_set_iCCP,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_const_charp name, int compression_type, png_const_bytep profile,
-- png_uint_32 proflen));
-+PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_charp name, int compression_type,
-+ png_const_bytep profile, png_uint_32 proflen));
- #endif
-
- #ifdef PNG_sPLT_SUPPORTED
--PNG_EXPORT(160, png_uint_32, png_get_sPLT,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_sPLT_tpp entries));
-+PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_sPLT_tpp entries));
- #endif
-
- #ifdef PNG_sPLT_SUPPORTED
--PNG_EXPORT(161, void, png_set_sPLT,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_const_sPLT_tp entries, int nentries));
-+PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));
- #endif
-
- #ifdef PNG_TEXT_SUPPORTED
- /* png_get_text also returns the number of text chunks in *num_text */
--PNG_EXPORT(162, png_uint_32, png_get_text,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- png_textp *text_ptr, int *num_text));
-+PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_textp *text_ptr, int *num_text));
- #endif
-
- /* Note while png_set_text() will accept a structure whose text,
-@@ -2247,116 +2304,220 @@
- */
-
- #ifdef PNG_TEXT_SUPPORTED
--PNG_EXPORT(163, void, png_set_text,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_const_textp text_ptr, int num_text));
-+PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_textp text_ptr, int num_text));
- #endif
-
- #ifdef PNG_tIME_SUPPORTED
--PNG_EXPORT(164, png_uint_32, png_get_tIME,
-- (png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
-+PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_timep *mod_time));
- #endif
-
- #ifdef PNG_tIME_SUPPORTED
--PNG_EXPORT(165, void, png_set_tIME,
-- (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));
-+PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_timep mod_time));
- #endif
-
- #ifdef PNG_tRNS_SUPPORTED
--PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-- (png_const_structp png_ptr, png_infop info_ptr,
-- png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color));
-+PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,
-+ png_color_16p *trans_color));
- #endif
-
- #ifdef PNG_tRNS_SUPPORTED
--PNG_EXPORT(167, void, png_set_tRNS,
-- (png_structp png_ptr, png_infop info_ptr,
-- png_const_bytep trans_alpha, int num_trans,
-+PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,
-+ png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,
- png_const_color_16p trans_color));
- #endif
-
- #ifdef PNG_sCAL_SUPPORTED
--PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- int *unit, double *width, double *height));
--#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-+PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, int *unit, double *width, double *height))
-+#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
-+ defined(PNG_FLOATING_POINT_SUPPORTED)
- /* NOTE: this API is currently implemented using floating point arithmetic,
- * consequently it can only be used on systems with floating point support.
- * In any case the range of values supported by png_fixed_point is small and it
- * is highly recommended that png_get_sCAL_s be used instead.
- */
- PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-- (png_structp png_ptr, png_const_infop info_ptr, int *unit,
-- png_fixed_point *width,
-- png_fixed_point *height));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-+ png_fixed_point *width, png_fixed_point *height))
- #endif
- PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-- (png_const_structp png_ptr, png_const_infop info_ptr,
-- int *unit, png_charpp swidth, png_charpp sheight));
--
--PNG_FP_EXPORT(170, void, png_set_sCAL,
-- (png_structp png_ptr, png_infop info_ptr,
-- int unit, double width, double height));
--PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr,
-- png_infop info_ptr, int unit, png_fixed_point width,
-- png_fixed_point height));
--PNG_EXPORT(171, void, png_set_sCAL_s,
-- (png_structp png_ptr, png_infop info_ptr,
-- int unit, png_const_charp swidth, png_const_charp sheight));
--#endif /* PNG_sCAL_SUPPORTED */
--
--#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
--/* Provide a list of chunks and how they are to be handled, if the built-in
-- handling or default unknown chunk handling is not desired. Any chunks not
-- listed will be handled in the default manner. The IHDR and IEND chunks
-- must not be listed.
-- keep = 0: follow default behaviour
-- = 1: do not keep
-- = 2: keep only if safe-to-copy
-- = 3: keep even if unsafe-to-copy
--*/
--PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
-- (png_structp png_ptr, int keep,
-- png_const_bytep chunk_list, int num_chunks));
--PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr,
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-+ png_charpp swidth, png_charpp sheight));
-+
-+PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int unit, double width, double height))
-+PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int unit, png_fixed_point width,
-+ png_fixed_point height))
-+PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int unit,
-+ png_const_charp swidth, png_const_charp sheight));
-+#endif /* sCAL */
-+
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+/* Provide the default handling for all unknown chunks or, optionally, for
-+ * specific unknown chunks.
-+ *
-+ * NOTE: prior to 1.6.0 the handling specified for particular chunks on read was
-+ * ignored and the default was used, the per-chunk setting only had an effect on
-+ * write. If you wish to have chunk-specific handling on read in code that must
-+ * work on earlier versions you must use a user chunk callback to specify the
-+ * desired handling (keep or discard.)
-+ *
-+ * The 'keep' parameter is a PNG_HANDLE_CHUNK_ value as listed below. The
-+ * parameter is interpreted as follows:
-+ *
-+ * READ:
-+ * PNG_HANDLE_CHUNK_AS_DEFAULT:
-+ * Known chunks: do normal libpng processing, do not keep the chunk (but
-+ * see the comments below about PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-+ * Unknown chunks: for a specific chunk use the global default, when used
-+ * as the default discard the chunk data.
-+ * PNG_HANDLE_CHUNK_NEVER:
-+ * Discard the chunk data.
-+ * PNG_HANDLE_CHUNK_IF_SAFE:
-+ * Keep the chunk data if the chunk is not critical else raise a chunk
-+ * error.
-+ * PNG_HANDLE_CHUNK_ALWAYS:
-+ * Keep the chunk data.
-+ *
-+ * If the chunk data is saved it can be retrieved using png_get_unknown_chunks,
-+ * below. Notice that specifying "AS_DEFAULT" as a global default is equivalent
-+ * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
-+ * it simply resets the behavior to the libpng default.
-+ *
-+ * INTERACTION WTIH USER CHUNK CALLBACKS:
-+ * The per-chunk handling is always used when there is a png_user_chunk_ptr
-+ * callback and the callback returns 0; the chunk is then always stored *unless*
-+ * it is critical and the per-chunk setting is other than ALWAYS. Notice that
-+ * the global default is *not* used in this case. (In effect the per-chunk
-+ * value is incremented to at least IF_SAFE.)
-+ *
-+ * IMPORTANT NOTE: this behavior will change in libpng 1.7 - the global and
-+ * per-chunk defaults will be honored. If you want to preserve the current
-+ * behavior when your callback returns 0 you must set PNG_HANDLE_CHUNK_IF_SAFE
-+ * as the default - if you don't do this libpng 1.6 will issue a warning.
-+ *
-+ * If you want unhandled unknown chunks to be discarded in libpng 1.6 and
-+ * earlier simply return '1' (handled).
-+ *
-+ * PNG_HANDLE_AS_UNKNOWN_SUPPORTED:
-+ * If this is *not* set known chunks will always be handled by libpng and
-+ * will never be stored in the unknown chunk list. Known chunks listed to
-+ * png_set_keep_unknown_chunks will have no effect. If it is set then known
-+ * chunks listed with a keep other than AS_DEFAULT will *never* be processed
-+ * by libpng, in addition critical chunks must either be processed by the
-+ * callback or saved.
-+ *
-+ * The IHDR and IEND chunks must not be listed. Because this turns off the
-+ * default handling for chunks that would otherwise be recognized the
-+ * behavior of libpng transformations may well become incorrect!
-+ *
-+ * WRITE:
-+ * When writing chunks the options only apply to the chunks specified by
-+ * png_set_unknown_chunks (below), libpng will *always* write known chunks
-+ * required by png_set_ calls and will always write the core critical chunks
-+ * (as required for PLTE).
-+ *
-+ * Each chunk in the png_set_unknown_chunks list is looked up in the
-+ * png_set_keep_unknown_chunks list to find the keep setting, this is then
-+ * interpreted as follows:
-+ *
-+ * PNG_HANDLE_CHUNK_AS_DEFAULT:
-+ * Write safe-to-copy chunks and write other chunks if the global
-+ * default is set to _ALWAYS, otherwise don't write this chunk.
-+ * PNG_HANDLE_CHUNK_NEVER:
-+ * Do not write the chunk.
-+ * PNG_HANDLE_CHUNK_IF_SAFE:
-+ * Write the chunk if it is safe-to-copy, otherwise do not write it.
-+ * PNG_HANDLE_CHUNK_ALWAYS:
-+ * Write the chunk.
-+ *
-+ * Note that the default behavior is effectively the opposite of the read case -
-+ * in read unknown chunks are not stored by default, in write they are written
-+ * by default. Also the behavior of PNG_HANDLE_CHUNK_IF_SAFE is very different
-+ * - on write the safe-to-copy bit is checked, on read the critical bit is
-+ * checked and on read if the chunk is critical an error will be raised.
-+ *
-+ * num_chunks:
-+ * ===========
-+ * If num_chunks is positive, then the "keep" parameter specifies the manner
-+ * for handling only those chunks appearing in the chunk_list array,
-+ * otherwise the chunk list array is ignored.
-+ *
-+ * If num_chunks is 0 the "keep" parameter specifies the default behavior for
-+ * unknown chunks, as described above.
-+ *
-+ * If num_chunks is negative, then the "keep" parameter specifies the manner
-+ * for handling all unknown chunks plus all chunks recognized by libpng
-+ * except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
-+ * be processed by libpng.
-+ */
-+PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
-+ int keep, png_const_bytep chunk_list, int num_chunks));
-+
-+/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
-+ * the result is therefore true (non-zero) if special handling is required,
-+ * false for the default handling.
-+ */
-+PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
- png_const_bytep chunk_name));
- #endif
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
--PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr,
-- png_infop info_ptr, png_const_unknown_chunkp unknowns,
-+
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-+PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_unknown_chunkp unknowns,
- int num_unknowns));
-+ /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added
-+ * unknowns to the location currently stored in the png_struct. This is
-+ * invariably the wrong value on write. To fix this call the following API
-+ * for each chunk in the list with the correct location. If you know your
-+ * code won't be compiled on earlier versions you can rely on
-+ * png_set_unknown_chunks(write-ptr, png_get_unknown_chunks(read-ptr)) doing
-+ * the correct thing.
-+ */
-+
- PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-- (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
--PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr,
-- png_const_infop info_ptr, png_unknown_chunkpp entries));
-+ (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));
-+
-+PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_unknown_chunkpp entries));
- #endif
-
- /* Png_free_data() will turn off the "valid" flag for anything it frees.
- * If you need to turn it off for a chunk that your application has freed,
- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
- */
--PNG_EXPORT(177, void, png_set_invalid,
-- (png_structp png_ptr, png_infop info_ptr, int mask));
-+PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,
-+ png_inforp info_ptr, int mask));
-
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- /* The "params" pointer is currently not used and is for future expansion. */
--PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr,
-- int transforms, png_voidp params));
--PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr,
-+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,
- int transforms, png_voidp params));
- #endif
-+#ifdef PNG_WRITE_SUPPORTED
-+PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,
-+ int transforms, png_voidp params));
-+#endif
-+#endif
-
- PNG_EXPORT(180, png_const_charp, png_get_copyright,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- PNG_EXPORT(182, png_const_charp, png_get_header_version,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
-
- #ifdef PNG_MNG_FEATURES_SUPPORTED
--PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr,
-+PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
- png_uint_32 mng_features_permitted));
- #endif
-
-@@ -2365,75 +2526,77 @@
- #define PNG_HANDLE_CHUNK_NEVER 1
- #define PNG_HANDLE_CHUNK_IF_SAFE 2
- #define PNG_HANDLE_CHUNK_ALWAYS 3
-+#define PNG_HANDLE_CHUNK_LAST 4
-
- /* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler.
- */
- #ifdef PNG_ERROR_NUMBERS_SUPPORTED
--PNG_EXPORT(185, void, png_set_strip_error_numbers,
-- (png_structp png_ptr,
-+PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,
- png_uint_32 strip_mode));
- #endif
-
- /* Added in libpng-1.2.6 */
- #ifdef PNG_SET_USER_LIMITS_SUPPORTED
--PNG_EXPORT(186, void, png_set_user_limits, (png_structp png_ptr,
-+PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,
- png_uint_32 user_width_max, png_uint_32 user_height_max));
- PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- /* Added in libpng-1.4.0 */
--PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr,
-+PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,
- png_uint_32 user_chunk_cache_max));
- PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- /* Added in libpng-1.4.1 */
--PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr,
-+PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,
- png_alloc_size_t user_chunk_cache_max));
- PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
- #endif
-
- #if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
- PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
- PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
- PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
- PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-- (png_const_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr))
- #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
- PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-- (png_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr))
- #endif
-
--PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr,
-- png_const_infop info_ptr));
-+PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr))
- #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
- PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-- (png_structp png_ptr, png_const_infop info_ptr));
-+ (png_const_structrp png_ptr, png_const_inforp info_ptr))
- #endif
-
- # ifdef PNG_pHYs_SUPPORTED
--PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr,
-- png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-+PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
-+ png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
- int *unit_type));
--# endif /* PNG_pHYs_SUPPORTED */
--#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
-+# endif /* pHYs */
-+#endif /* INCH_CONVERSIONS */
-
- /* Added in libpng-1.4.0 */
- #ifdef PNG_IO_STATE_SUPPORTED
--PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
--
--PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
-- (png_structp png_ptr), PNG_DEPRECATED);
-+PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));
-+
-+/* Removed from libpng 1.6; use png_get_io_chunk_type. */
-+PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),
-+ PNG_DEPRECATED)
-+
- PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-- (png_const_structp png_ptr));
-+ (png_const_structrp png_ptr));
-
- /* The flags returned by png_get_io_state() are the following: */
- # define PNG_IO_NONE 0x0000 /* no I/O at this moment */
-@@ -2445,7 +2608,7 @@
- # define PNG_IO_CHUNK_CRC 0x0080 /* currently at the chunk crc */
- # define PNG_IO_MASK_OP 0x000f /* current operation: reading/writing */
- # define PNG_IO_MASK_LOC 0x00f0 /* current location: sig/hdr/data/crc */
--#endif /* ?PNG_IO_STATE_SUPPORTED */
-+#endif /* IO_STATE */
-
- /* Interlace support. The following macros are always defined so that if
- * libpng interlace handling is turned off the macros may be used to handle
-@@ -2457,8 +2620,16 @@
- * full, image which appears in a given pass. 'pass' is in the range 0
- * to 6 and the result is in the range 0 to 7.
- */
--#define PNG_PASS_START_ROW(pass) (((1U&~(pass))<<(3-((pass)>>1)))&7)
--#define PNG_PASS_START_COL(pass) (((1U& (pass))<<(3-(((pass)+1)>>1)))&7)
-+#define PNG_PASS_START_ROW(pass) (((1&~(pass))<<(3-((pass)>>1)))&7)
-+#define PNG_PASS_START_COL(pass) (((1& (pass))<<(3-(((pass)+1)>>1)))&7)
-+
-+/* A macro to return the offset between pixels in the output row for a pair of
-+ * pixels in the input - effectively the inverse of the 'COL_SHIFT' macro that
-+ * follows. Note that ROW_OFFSET is the offset from one row to the next whereas
-+ * COL_OFFSET is from one column to the next, within a row.
-+ */
-+#define PNG_PASS_ROW_OFFSET(pass) ((pass)>2?(8>>(((pass)-1)>>1)):8)
-+#define PNG_PASS_COL_OFFSET(pass) (1<<((7-(pass))>>1))
-
- /* Two macros to help evaluate the number of rows or columns in each
- * pass. This is expressed as a shift - effectively log2 of the number or
-@@ -2481,10 +2652,10 @@
- * necessary to find the row in the output image given a row in an interlaced
- * image, so two more macros:
- */
--#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \
-- (((yIn)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
--#define PNG_COL_FROM_PASS_COL(xIn, pass) \
-- (((xIn)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-+#define PNG_ROW_FROM_PASS_ROW(y_in, pass) \
-+ (((y_in)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-+#define PNG_COL_FROM_PASS_COL(x_in, pass) \
-+ (((x_in)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-
- /* Two macros which return a boolean (0 or 1) saying whether the given row
- * or column is in a particular pass. These use a common utility macro that
-@@ -2493,8 +2664,8 @@
- * the tile.
- */
- #define PNG_PASS_MASK(pass,off) ( \
-- ((0x110145AFU>>(((7-(off))-(pass))<<2)) & 0xFU) | \
-- ((0x01145AF0U>>(((7-(off))-(pass))<<2)) & 0xF0U))
-+ ((0x110145AF>>(((7-(off))-(pass))<<2)) & 0xF) | \
-+ ((0x01145AF0>>(((7-(off))-(pass))<<2)) & 0xF0))
-
- #define PNG_ROW_IN_INTERLACE_PASS(y, pass) \
- ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)
-@@ -2520,14 +2691,14 @@
- { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
- * (png_uint_16)(alpha) \
- + (png_uint_16)(bg)*(png_uint_16)(255 \
-- - (png_uint_16)(alpha)) + (png_uint_16)128); \
-+ - (png_uint_16)(alpha)) + 128); \
- (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
-
- # define png_composite_16(composite, fg, alpha, bg) \
- { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \
- * (png_uint_32)(alpha) \
-- + (png_uint_32)(bg)*(png_uint_32)(65535L \
-- - (png_uint_32)(alpha)) + (png_uint_32)32768L); \
-+ + (png_uint_32)(bg)*(65535 \
-+ - (png_uint_32)(alpha)) + 32768); \
- (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
-
- #else /* Standard method using integer division */
-@@ -2535,13 +2706,13 @@
- # define png_composite(composite, fg, alpha, bg) \
- (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) + \
- (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
-- (png_uint_16)127) / 255)
-+ 127) / 255)
-
- # define png_composite_16(composite, fg, alpha, bg) \
- (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-- (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) + \
-- (png_uint_32)32767) / (png_uint_32)65535L)
--#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
-+ (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
-+ 32767) / 65535)
-+#endif /* READ_COMPOSITE_NODIV */
-
- #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
- PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-@@ -2549,7 +2720,7 @@
- PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
- #endif
-
--PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_structp png_ptr,
-+PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,
- png_const_bytep buf));
- /* No png_get_int_16 -- may be added if there's a real need for it. */
-
-@@ -2575,7 +2746,7 @@
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
--# define png_get_uint_32(buf) \
-+# define PNG_get_uint_32(buf) \
- (((png_uint_32)(*(buf)) << 24) + \
- ((png_uint_32)(*((buf) + 1)) << 16) + \
- ((png_uint_32)(*((buf) + 2)) << 8) + \
-@@ -2584,27 +2755,550 @@
- /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
- * function) incorrectly returned a value of type png_uint_32.
- */
--# define png_get_uint_16(buf) \
-+# define PNG_get_uint_16(buf) \
- ((png_uint_16) \
- (((unsigned int)(*(buf)) << 8) + \
- ((unsigned int)(*((buf) + 1)))))
-
--# define png_get_int_32(buf) \
-+# define PNG_get_int_32(buf) \
- ((png_int_32)((*(buf) & 0x80) \
- ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
- : (png_int_32)png_get_uint_32(buf)))
-+
-+ /* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
-+ * but defining a macro name prefixed with PNG_PREFIX.
-+ */
-+# ifndef PNG_PREFIX
-+# define png_get_uint_32(buf) PNG_get_uint_32(buf)
-+# define png_get_uint_16(buf) PNG_get_uint_16(buf)
-+# define png_get_int_32(buf) PNG_get_int_32(buf)
-+# endif
-+#else
-+# ifdef PNG_PREFIX
-+ /* No macros; revert to the (redefined) function */
-+# define PNG_get_uint_32 (png_get_uint_32)
-+# define PNG_get_uint_16 (png_get_uint_16)
-+# define PNG_get_int_32 (png_get_int_32)
-+# endif
- #endif
-
--/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
-- * defs
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
-+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-+/*******************************************************************************
-+ * SIMPLIFIED API
-+ *******************************************************************************
-+ *
-+ * Please read the documentation in libpng-manual.txt (TODO: write said
-+ * documentation) if you don't understand what follows.
-+ *
-+ * The simplified API hides the details of both libpng and the PNG file format
-+ * itself. It allows PNG files to be read into a very limited number of
-+ * in-memory bitmap formats or to be written from the same formats. If these
-+ * formats do not accomodate your needs then you can, and should, use the more
-+ * sophisticated APIs above - these support a wide variety of in-memory formats
-+ * and a wide variety of sophisticated transformations to those formats as well
-+ * as a wide variety of APIs to manipulate ancillary information.
-+ *
-+ * To read a PNG file using the simplified API:
-+ *
-+ * 1) Declare a 'png_image' structure (see below) on the stack and set the
-+ * version field to PNG_IMAGE_VERSION.
-+ * 2) Call the appropriate png_image_begin_read... function.
-+ * 3) Set the png_image 'format' member to the required sample format.
-+ * 4) Allocate a buffer for the image and, if required, the color-map.
-+ * 5) Call png_image_finish_read to read the image and, if required, the
-+ * color-map into your buffers.
-+ *
-+ * There are no restrictions on the format of the PNG input itself; all valid
-+ * color types, bit depths, and interlace methods are acceptable, and the
-+ * input image is transformed as necessary to the requested in-memory format
-+ * during the png_image_finish_read() step. The only caveat is that if you
-+ * request a color-mapped image from a PNG that is full-color or makes
-+ * complex use of an alpha channel the transformation is extremely lossy and the
-+ * result may look terrible.
-+ *
-+ * To write a PNG file using the simplified API:
-+ *
-+ * 1) Declare a 'png_image' structure on the stack and memset() it to all zero.
-+ * 2) Initialize the members of the structure that describe the image, setting
-+ * the 'format' member to the format of the image samples.
-+ * 3) Call the appropriate png_image_write... function with a pointer to the
-+ * image and, if necessary, the color-map to write the PNG data.
-+ *
-+ * png_image is a structure that describes the in-memory format of an image
-+ * when it is being read or defines the in-memory format of an image that you
-+ * need to write:
- */
-+#define PNG_IMAGE_VERSION 1
-+
-+typedef struct png_control *png_controlp;
-+typedef struct
-+{
-+ png_controlp opaque; /* Initialize to NULL, free with png_image_free */
-+ png_uint_32 version; /* Set to PNG_IMAGE_VERSION */
-+ png_uint_32 width; /* Image width in pixels (columns) */
-+ png_uint_32 height; /* Image height in pixels (rows) */
-+ png_uint_32 format; /* Image format as defined below */
-+ png_uint_32 flags; /* A bit mask containing informational flags */
-+ png_uint_32 colormap_entries;
-+ /* Number of entries in the color-map */
-+
-+ /* In the event of an error or warning the following field will be set to a
-+ * non-zero value and the 'message' field will contain a '\0' terminated
-+ * string with the libpng error or warning message. If both warnings and
-+ * an error were encountered, only the error is recorded. If there
-+ * are multiple warnings, only the first one is recorded.
-+ *
-+ * The upper 30 bits of this value are reserved, the low two bits contain
-+ * a value as follows:
-+ */
-+# define PNG_IMAGE_WARNING 1
-+# define PNG_IMAGE_ERROR 2
-+ /*
-+ * The result is a two-bit code such that a value more than 1 indicates
-+ * a failure in the API just called:
-+ *
-+ * 0 - no warning or error
-+ * 1 - warning
-+ * 2 - error
-+ * 3 - error preceded by warning
-+ */
-+# define PNG_IMAGE_FAILED(png_cntrl) ((((png_cntrl).warning_or_error)&0x03)>1)
-+
-+ png_uint_32 warning_or_error;
-+
-+ char message[64];
-+} png_image, *png_imagep;
-+
-+/* The samples of the image have one to four channels whose components have
-+ * original values in the range 0 to 1.0:
-+ *
-+ * 1: A single gray or luminance channel (G).
-+ * 2: A gray/luminance channel and an alpha channel (GA).
-+ * 3: Three red, green, blue color channels (RGB).
-+ * 4: Three color channels and an alpha channel (RGBA).
-+ *
-+ * The components are encoded in one of two ways:
-+ *
-+ * a) As a small integer, value 0..255, contained in a single byte. For the
-+ * alpha channel the original value is simply value/255. For the color or
-+ * luminance channels the value is encoded according to the sRGB specification
-+ * and matches the 8-bit format expected by typical display devices.
-+ *
-+ * The color/gray channels are not scaled (pre-multiplied) by the alpha
-+ * channel and are suitable for passing to color management software.
-+ *
-+ * b) As a value in the range 0..65535, contained in a 2-byte integer. All
-+ * channels can be converted to the original value by dividing by 65535; all
-+ * channels are linear. Color channels use the RGB encoding (RGB end-points) of
-+ * the sRGB specification. This encoding is identified by the
-+ * PNG_FORMAT_FLAG_LINEAR flag below.
-+ *
-+ * When the simplified API needs to convert between sRGB and linear colorspaces,
-+ * the actual sRGB transfer curve defined in the sRGB specification (see the
-+ * article at http://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2
-+ * approximation used elsewhere in libpng.
-+ *
-+ * When an alpha channel is present it is expected to denote pixel coverage
-+ * of the color or luminance channels and is returned as an associated alpha
-+ * channel: the color/gray channels are scaled (pre-multiplied) by the alpha
-+ * value.
-+ *
-+ * The samples are either contained directly in the image data, between 1 and 8
-+ * bytes per pixel according to the encoding, or are held in a color-map indexed
-+ * by bytes in the image data. In the case of a color-map the color-map entries
-+ * are individual samples, encoded as above, and the image data has one byte per
-+ * pixel to select the relevant sample from the color-map.
-+ */
-+
-+/* PNG_FORMAT_*
-+ *
-+ * #defines to be used in png_image::format. Each #define identifies a
-+ * particular layout of sample data and, if present, alpha values. There are
-+ * separate defines for each of the two component encodings.
-+ *
-+ * A format is built up using single bit flag values. All combinations are
-+ * valid. Formats can be built up from the flag values or you can use one of
-+ * the predefined values below. When testing formats always use the FORMAT_FLAG
-+ * macros to test for individual features - future versions of the library may
-+ * add new flags.
-+ *
-+ * When reading or writing color-mapped images the format should be set to the
-+ * format of the entries in the color-map then png_image_{read,write}_colormap
-+ * called to read or write the color-map and set the format correctly for the
-+ * image data. Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!
-+ *
-+ * NOTE: libpng can be built with particular features disabled, if you see
-+ * compiler errors because the definition of one of the following flags has been
-+ * compiled out it is because libpng does not have the required support. It is
-+ * possible, however, for the libpng configuration to enable the format on just
-+ * read or just write; in that case you may see an error at run time. You can
-+ * guard against this by checking for the definition of the appropriate
-+ * "_SUPPORTED" macro, one of:
-+ *
-+ * PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED
-+ */
-+#define PNG_FORMAT_FLAG_ALPHA 0x01U /* format with an alpha channel */
-+#define PNG_FORMAT_FLAG_COLOR 0x02U /* color format: otherwise grayscale */
-+#define PNG_FORMAT_FLAG_LINEAR 0x04U /* 2 byte channels else 1 byte */
-+#define PNG_FORMAT_FLAG_COLORMAP 0x08U /* image data is color-mapped */
-+
-+#ifdef PNG_FORMAT_BGR_SUPPORTED
-+# define PNG_FORMAT_FLAG_BGR 0x10U /* BGR colors, else order is RGB */
-+#endif
-+
-+#ifdef PNG_FORMAT_AFIRST_SUPPORTED
-+# define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */
-+#endif
-+
-+/* Commonly used formats have predefined macros.
-+ *
-+ * First the single byte (sRGB) formats:
-+ */
-+#define PNG_FORMAT_GRAY 0
-+#define PNG_FORMAT_GA PNG_FORMAT_FLAG_ALPHA
-+#define PNG_FORMAT_AG (PNG_FORMAT_GA|PNG_FORMAT_FLAG_AFIRST)
-+#define PNG_FORMAT_RGB PNG_FORMAT_FLAG_COLOR
-+#define PNG_FORMAT_BGR (PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_BGR)
-+#define PNG_FORMAT_RGBA (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_ALPHA)
-+#define PNG_FORMAT_ARGB (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_AFIRST)
-+#define PNG_FORMAT_BGRA (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_ALPHA)
-+#define PNG_FORMAT_ABGR (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_AFIRST)
-+
-+/* Then the linear 2-byte formats. When naming these "Y" is used to
-+ * indicate a luminance (gray) channel.
-+ */
-+#define PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR
-+#define PNG_FORMAT_LINEAR_Y_ALPHA (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_ALPHA)
-+#define PNG_FORMAT_LINEAR_RGB (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR)
-+#define PNG_FORMAT_LINEAR_RGB_ALPHA \
-+ (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA)
-+
-+/* With color-mapped formats the image data is one byte for each pixel, the byte
-+ * is an index into the color-map which is formatted as above. To obtain a
-+ * color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP
-+ * to one of the above definitions, or you can use one of the definitions below.
-+ */
-+#define PNG_FORMAT_RGB_COLORMAP (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_COLORMAP)
-+#define PNG_FORMAT_BGR_COLORMAP (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_COLORMAP)
-+#define PNG_FORMAT_RGBA_COLORMAP (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_COLORMAP)
-+#define PNG_FORMAT_ARGB_COLORMAP (PNG_FORMAT_ARGB|PNG_FORMAT_FLAG_COLORMAP)
-+#define PNG_FORMAT_BGRA_COLORMAP (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_COLORMAP)
-+#define PNG_FORMAT_ABGR_COLORMAP (PNG_FORMAT_ABGR|PNG_FORMAT_FLAG_COLORMAP)
-+
-+/* PNG_IMAGE macros
-+ *
-+ * These are convenience macros to derive information from a png_image
-+ * structure. The PNG_IMAGE_SAMPLE_ macros return values appropriate to the
-+ * actual image sample values - either the entries in the color-map or the
-+ * pixels in the image. The PNG_IMAGE_PIXEL_ macros return corresponding values
-+ * for the pixels and will always return 1 for color-mapped formats. The
-+ * remaining macros return information about the rows in the image and the
-+ * complete image.
-+ *
-+ * NOTE: All the macros that take a png_image::format parameter are compile time
-+ * constants if the format parameter is, itself, a constant. Therefore these
-+ * macros can be used in array declarations and case labels where required.
-+ * Similarly the macros are also pre-processor constants (sizeof is not used) so
-+ * they can be used in #if tests.
-+ *
-+ * First the information about the samples.
-+ */
-+#define PNG_IMAGE_SAMPLE_CHANNELS(fmt)\
-+ (((fmt)&(PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA))+1)
-+ /* Return the total number of channels in a given format: 1..4 */
-+
-+#define PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)\
-+ ((((fmt) & PNG_FORMAT_FLAG_LINEAR) >> 2)+1)
-+ /* Return the size in bytes of a single component of a pixel or color-map
-+ * entry (as appropriate) in the image: 1 or 2.
-+ */
-+
-+#define PNG_IMAGE_SAMPLE_SIZE(fmt)\
-+ (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt))
-+ /* This is the size of the sample data for one sample. If the image is
-+ * color-mapped it is the size of one color-map entry (and image pixels are
-+ * one byte in size), otherwise it is the size of one image pixel.
-+ */
-+
-+#define PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)\
-+ (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * 256)
-+ /* The maximum size of the color-map required by the format expressed in a
-+ * count of components. This can be used to compile-time allocate a
-+ * color-map:
-+ *
-+ * png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];
-+ *
-+ * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];
-+ *
-+ * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the
-+ * information from one of the png_image_begin_read_ APIs and dynamically
-+ * allocate the required memory.
-+ */
-+
-+/* Corresponding information about the pixels */
-+#define PNG_IMAGE_PIXEL_(test,fmt)\
-+ (((fmt)&PNG_FORMAT_FLAG_COLORMAP)?1:test(fmt))
-+
-+#define PNG_IMAGE_PIXEL_CHANNELS(fmt)\
-+ PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_CHANNELS,fmt)
-+ /* The number of separate channels (components) in a pixel; 1 for a
-+ * color-mapped image.
-+ */
-+
-+#define PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\
-+ PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_COMPONENT_SIZE,fmt)
-+ /* The size, in bytes, of each component in a pixel; 1 for a color-mapped
-+ * image.
-+ */
-+
-+#define PNG_IMAGE_PIXEL_SIZE(fmt) PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_SIZE,fmt)
-+ /* The size, in bytes, of a complete pixel; 1 for a color-mapped image. */
-+
-+/* Information about the whole row, or whole image */
-+#define PNG_IMAGE_ROW_STRIDE(image)\
-+ (PNG_IMAGE_PIXEL_CHANNELS((image).format) * (image).width)
-+ /* Return the total number of components in a single row of the image; this
-+ * is the minimum 'row stride', the minimum count of components between each
-+ * row. For a color-mapped image this is the minimum number of bytes in a
-+ * row.
-+ */
-+
-+#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\
-+ (PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))
-+ /* Return the size, in bytes, of an image buffer given a png_image and a row
-+ * stride - the number of components to leave space for in each row.
-+ */
-+
-+#define PNG_IMAGE_SIZE(image)\
-+ PNG_IMAGE_BUFFER_SIZE(image, PNG_IMAGE_ROW_STRIDE(image))
-+ /* Return the size, in bytes, of the image in memory given just a png_image;
-+ * the row stride is the minimum stride required for the image.
-+ */
-+
-+#define PNG_IMAGE_COLORMAP_SIZE(image)\
-+ (PNG_IMAGE_SAMPLE_SIZE((image).format) * (image).colormap_entries)
-+ /* Return the size, in bytes, of the color-map of this image. If the image
-+ * format is not a color-map format this will return a size sufficient for
-+ * 256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if
-+ * you don't want to allocate a color-map in this case.
-+ */
-+
-+/* PNG_IMAGE_FLAG_*
-+ *
-+ * Flags containing additional information about the image are held in the
-+ * 'flags' field of png_image.
-+ */
-+#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01
-+ /* This indicates the the RGB values of the in-memory bitmap do not
-+ * correspond to the red, green and blue end-points defined by sRGB.
-+ */
-+
-+#define PNG_IMAGE_FLAG_FAST 0x02
-+ /* On write emphasise speed over compression; the resultant PNG file will be
-+ * larger but will be produced significantly faster, particular for large
-+ * images. Do not use this option for images which will be distributed, only
-+ * used it when producing intermediate files that will be read back in
-+ * repeatedly. For a typical 24-bit image the option will double the read
-+ * speed at the cost of increasing the image size by 25%, however for many
-+ * more compressible images the PNG file can be 10 times larger with only a
-+ * slight speed gain.
-+ */
-+
-+#define PNG_IMAGE_FLAG_16BIT_sRGB 0x04
-+ /* On read if the image is a 16-bit per component image and there is no gAMA
-+ * or sRGB chunk assume that the components are sRGB encoded. Notice that
-+ * images output by the simplified API always have gamma information; setting
-+ * this flag only affects the interpretation of 16-bit images from an
-+ * external source. It is recommended that the application expose this flag
-+ * to the user; the user can normally easily recognize the difference between
-+ * linear and sRGB encoding. This flag has no effect on write - the data
-+ * passed to the write APIs must have the correct encoding (as defined
-+ * above.)
-+ *
-+ * If the flag is not set (the default) input 16-bit per component data is
-+ * assumed to be linear.
-+ *
-+ * NOTE: the flag can only be set after the png_image_begin_read_ call,
-+ * because that call initializes the 'flags' field.
-+ */
-+
-+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-+/* READ APIs
-+ * ---------
-+ *
-+ * The png_image passed to the read APIs must have been initialized by setting
-+ * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)
-+ */
-+#ifdef PNG_STDIO_SUPPORTED
-+PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
-+ const char *file_name));
-+ /* The named file is opened for read and the image header is filled in
-+ * from the PNG header in the file.
-+ */
-+
-+PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-+ FILE* file));
-+ /* The PNG header is read from the stdio FILE object. */
-+#endif /* STDIO */
-+
-+PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
-+ png_const_voidp memory, png_size_t size));
-+ /* The PNG header is read from the given memory buffer. */
-+
-+PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
-+ png_const_colorp background, void *buffer, png_int_32 row_stride,
-+ void *colormap));
-+ /* Finish reading the image into the supplied buffer and clean up the
-+ * png_image structure.
-+ *
-+ * row_stride is the step, in byte or 2-byte units as appropriate,
-+ * between adjacent rows. A positive stride indicates that the top-most row
-+ * is first in the buffer - the normal top-down arrangement. A negative
-+ * stride indicates that the bottom-most row is first in the buffer.
-+ *
-+ * background need only be supplied if an alpha channel must be removed from
-+ * a png_byte format and the removal is to be done by compositing on a solid
-+ * color; otherwise it may be NULL and any composition will be done directly
-+ * onto the buffer. The value is an sRGB color to use for the background,
-+ * for grayscale output the green channel is used.
-+ *
-+ * background must be supplied when an alpha channel must be removed from a
-+ * single byte color-mapped output format, in other words if:
-+ *
-+ * 1) The original format from png_image_begin_read_from_* had
-+ * PNG_FORMAT_FLAG_ALPHA set.
-+ * 2) The format set by the application does not.
-+ * 3) The format set by the application has PNG_FORMAT_FLAG_COLORMAP set and
-+ * PNG_FORMAT_FLAG_LINEAR *not* set.
-+ *
-+ * For linear output removing the alpha channel is always done by compositing
-+ * on black and background is ignored.
-+ *
-+ * colormap must be supplied when PNG_FORMAT_FLAG_COLORMAP is set. It must
-+ * be at least the size (in bytes) returned by PNG_IMAGE_COLORMAP_SIZE.
-+ * image->colormap_entries will be updated to the actual number of entries
-+ * written to the colormap; this may be less than the original value.
-+ */
-+
-+PNG_EXPORT(238, void, png_image_free, (png_imagep image));
-+ /* Free any data allocated by libpng in image->opaque, setting the pointer to
-+ * NULL. May be called at any time after the structure is initialized.
-+ */
-+#endif /* SIMPLIFIED_READ */
-+
-+#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-+#ifdef PNG_STDIO_SUPPORTED
-+/* WRITE APIS
-+ * ----------
-+ * For write you must initialize a png_image structure to describe the image to
-+ * be written. To do this use memset to set the whole structure to 0 then
-+ * initialize fields describing your image.
-+ *
-+ * version: must be set to PNG_IMAGE_VERSION
-+ * opaque: must be initialized to NULL
-+ * width: image width in pixels
-+ * height: image height in rows
-+ * format: the format of the data (image and color-map) you wish to write
-+ * flags: set to 0 unless one of the defined flags applies; set
-+ * PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images where the RGB
-+ * values do not correspond to the colors in sRGB.
-+ * colormap_entries: set to the number of entries in the color-map (0 to 256)
-+ */
-+PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
-+ const char *file, int convert_to_8bit, const void *buffer,
-+ png_int_32 row_stride, const void *colormap));
-+ /* Write the image to the named file. */
-+
-+PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
-+ int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
-+ const void *colormap));
-+ /* Write the image to the given (FILE*). */
-+
-+/* With both write APIs if image is in one of the linear formats with 16-bit
-+ * data then setting convert_to_8_bit will cause the output to be an 8-bit PNG
-+ * gamma encoded according to the sRGB specification, otherwise a 16-bit linear
-+ * encoded PNG file is written.
-+ *
-+ * With color-mapped data formats the colormap parameter point to a color-map
-+ * with at least image->colormap_entries encoded in the specified format. If
-+ * the format is linear the written PNG color-map will be converted to sRGB
-+ * regardless of the convert_to_8_bit flag.
-+ *
-+ * With all APIs row_stride is handled as in the read APIs - it is the spacing
-+ * from one row to the next in component sized units (1 or 2 bytes) and if
-+ * negative indicates a bottom-up row layout in the buffer.
-+ *
-+ * Note that the write API does not support interlacing or sub-8-bit pixels.
-+ */
-+#endif /* STDIO */
-+#endif /* SIMPLIFIED_WRITE */
-+/*******************************************************************************
-+ * END OF SIMPLIFIED API
-+ ******************************************************************************/
-+#endif /* SIMPLIFIED_{READ|WRITE} */
-+
-+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+PNG_EXPORT(242, void, png_set_check_for_invalid_index,
-+ (png_structrp png_ptr, int allowed));
-+# ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-+PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
-+ png_const_infop info_ptr));
-+# endif
-+#endif /* CHECK_FOR_INVALID_INDEX */
-+
-+/*******************************************************************************
-+ * IMPLEMENTATION OPTIONS
-+ *******************************************************************************
-+ *
-+ * Support for arbitrary implementation-specific optimizations. The API allows
-+ * particular options to be turned on or off. 'Option' is the number of the
-+ * option and 'onoff' is 0 (off) or non-0 (on). The value returned is given
-+ * by the PNG_OPTION_ defines below.
-+ *
-+ * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
-+ * are detected at run time, however sometimes it may be impossible
-+ * to do this in user mode, in which case it is necessary to discover
-+ * the capabilities in an OS specific way. Such capabilities are
-+ * listed here when libpng has support for them and must be turned
-+ * ON by the application if present.
-+ *
-+ * SOFTWARE: sometimes software optimizations actually result in performance
-+ * decrease on some architectures or systems, or with some sets of
-+ * PNG images. 'Software' options allow such optimizations to be
-+ * selected at run time.
-+ */
-+#ifdef PNG_SET_OPTION_SUPPORTED
-+#ifdef PNG_ARM_NEON_API_SUPPORTED
-+# define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */
-+#endif
-+#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
-+#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-+#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */
-+
-+/* Return values: NOTE: there are four values and 'off' is *not* zero */
-+#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
-+#define PNG_OPTION_INVALID 1 /* Option number out of range */
-+#define PNG_OPTION_OFF 2
-+#define PNG_OPTION_ON 3
-+
-+PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
-+ int onoff));
-+#endif /* SET_OPTION */
-+
-+/*******************************************************************************
-+ * END OF HARDWARE AND SOFTWARE OPTIONS
-+ ******************************************************************************/
-+
-+/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
-+ * defs, and in scripts/symbols.def.
-+ */
-
- /* The last ordinal number (this is the *last* one already used; the next
-- * one to use is one more than this.) Maintainer, remember to add an entry to
-- * scripts/symbols.def as well.
-+ * one to use is one more than this.)
- */
- #ifdef PNG_EXPORT_LAST_ORDINAL
-- PNG_EXPORT_LAST_ORDINAL(229);
-+ PNG_EXPORT_LAST_ORDINAL(244);
- #endif
-
- #ifdef __cplusplus
---- ./jdk/src/share/native/sun/awt/libpng/pngconf.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngconf.h Fri Apr 10 09:21:28 2015 -0700
-@@ -29,9 +29,9 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * libpng version 1.5.4 - July 7, 2011
-+ * libpng version 1.6.16,December 22, 2014
- *
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -50,37 +50,73 @@
- #ifndef PNGCONF_H
- #define PNGCONF_H
-
--#ifndef PNG_BUILDING_SYMBOL_TABLE
--/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
-- * definition file for machine specific limits, this may impact the
-- * correctness of the definitons below (see uses of INT_MAX).
-- */
--# ifndef PNG_NO_LIMITS_H
--# include <limits.h>
-+/* To do: Do all of this in scripts/pnglibconf.dfa */
-+#ifdef PNG_SAFE_LIMITS_SUPPORTED
-+# ifdef PNG_USER_WIDTH_MAX
-+# undef PNG_USER_WIDTH_MAX
-+# define PNG_USER_WIDTH_MAX 1000000L
- # endif
--
--/* For the memory copy APIs (i.e. the standard definitions of these),
-- * because this file defines png_memcpy and so on the base APIs must
-- * be defined here.
-- */
--# ifdef BSD
--# include <strings.h>
--# else
--# include <string.h>
-+# ifdef PNG_USER_HEIGHT_MAX
-+# undef PNG_USER_HEIGHT_MAX
-+# define PNG_USER_HEIGHT_MAX 1000000L
- # endif
--
--/* For png_FILE_p - this provides the standard definition of a
-- * FILE
-- */
--# ifdef PNG_STDIO_SUPPORTED
--# include <stdio.h>
-+# ifdef PNG_USER_CHUNK_MALLOC_MAX
-+# undef PNG_USER_CHUNK_MALLOC_MAX
-+# define PNG_USER_CHUNK_MALLOC_MAX 4000000L
-+# endif
-+# ifdef PNG_USER_CHUNK_CACHE_MAX
-+# undef PNG_USER_CHUNK_CACHE_MAX
-+# define PNG_USER_CHUNK_CACHE_MAX 128
- # endif
- #endif
-
-+#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
-+
-+/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C
-+ * compiler for correct compilation. The following header files are required by
-+ * the standard. If your compiler doesn't provide these header files, or they
-+ * do not match the standard, you will need to provide/improve them.
-+ */
-+#include <limits.h>
-+#include <stddef.h>
-+
-+/* Library header files. These header files are all defined by ISOC90; libpng
-+ * expects conformant implementations, however, an ISOC90 conformant system need
-+ * not provide these header files if the functionality cannot be implemented.
-+ * In this case it will be necessary to disable the relevant parts of libpng in
-+ * the build of pnglibconf.h.
-+ *
-+ * Prior to 1.6.0 string.h was included here; the API changes in 1.6.0 to not
-+ * include this unnecessary header file.
-+ */
-+
-+#ifdef PNG_STDIO_SUPPORTED
-+ /* Required for the definition of FILE: */
-+# include <stdio.h>
-+#endif
-+
-+#ifdef PNG_SETJMP_SUPPORTED
-+ /* Required for the definition of jmp_buf and the declaration of longjmp: */
-+# include <setjmp.h>
-+#endif
-+
-+#ifdef PNG_CONVERT_tIME_SUPPORTED
-+ /* Required for struct tm: */
-+# include <time.h>
-+#endif
-+
-+#endif /* PNG_BUILDING_SYMBOL_TABLE */
-+
-+/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
-+ * PNG_NO_CONST; this is no longer supported except for data declarations which
-+ * apparently still cause problems in 2011 on some compilers.
-+ */
-+#define PNG_CONST const /* backward compatibility only */
-+
- /* This controls optimization of the reading of 16 and 32 bit values
- * from PNG files. It can be set on a per-app-file basis - it
-- * just changes whether a macro is used to the function is called.
-- * The library builder sets the default, if read functions are not
-+ * just changes whether a macro is used when the function is called.
-+ * The library builder sets the default; if read functions are not
- * built into the library the macro implementation is forced on.
- */
- #ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-@@ -100,28 +136,13 @@
- * may be changed on a per-file basis when compiling against libpng.
- */
-
--/* The PNGARG macro protects us against machines that don't have function
-- * prototypes (ie K&R style headers). If your compiler does not handle
-- * function prototypes, define this macro and use the included ansi2knr.
-- * I've always been able to use _NO_PROTO as the indicator, but you may
-- * need to drag the empty declaration out in front of here, or change the
-- * ifdef to suit your own needs.
-+/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
-+ * against legacy (pre ISOC90) compilers that did not understand function
-+ * prototypes. It is not required for modern C compilers.
- */
- #ifndef PNGARG
--
--# ifdef OF /* zlib prototype munger */
--# define PNGARG(arglist) OF(arglist)
--# else
--
--# ifdef _NO_PROTO
--# define PNGARG(arglist) ()
--# else
--# define PNGARG(arglist) arglist
--# endif /* _NO_PROTO */
--
--# endif /* OF */
--
--#endif /* PNGARG */
-+# define PNGARG(arglist) arglist
-+#endif
-
- /* Function calling conventions.
- * =============================
-@@ -192,7 +213,9 @@
- * 'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
-- * make a symbol exported from the DLL.
-+ * make a symbol exported from the DLL. Not used in the
-+ * public header files; see pngpriv.h for how it is used
-+ * in the libpng build.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- * from a DLL - used to define PNG_IMPEXP when
-@@ -203,18 +226,16 @@
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
-- * import processing is possible. On Windows/x86 systems it also sets
-+ * import processing is possible. On Windows systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
--#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-- defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ) &&\
-- ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\
-- defined(_M_X64) || defined(_M_IA64) )
-- /* Windows system (DOS doesn't support DLLs) running on x86/x64. Includes
-- * builds under Cygwin or MinGW. Also includes Watcom builds but these need
-- * special treatment because they are not compatible with GCC or Visual C
-- * because of different calling conventions.
-+#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-+ defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-+ /* Windows system (DOS doesn't support DLLs). Includes builds under Cygwin or
-+ * MinGW on any architecture currently supported by Windows. Also includes
-+ * Watcom builds but these need special treatment because they are not
-+ * compatible with GCC or Visual C because of different calling conventions.
- */
- # if PNG_API_RULE == 2
- /* If this line results in an error, either because __watcall is not
-@@ -225,9 +246,12 @@
- # define PNGCAPI __watcall
- # endif
-
--# if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
-+# if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
- # define PNGCAPI __cdecl
- # if PNG_API_RULE == 1
-+ /* If this line results in an error __stdcall is not understood and
-+ * PNG_API_RULE should not have been set to '1'.
-+ */
- # define PNGAPI __stdcall
- # endif
- # else
-@@ -242,10 +266,11 @@
- # define PNGAPI _stdcall
- # endif
- # endif /* compiler/api */
-+
- /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
- # if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-- ERROR: PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
-+# error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
- # endif
-
- # if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-@@ -265,7 +290,7 @@
- # endif
- # endif /* compiler */
-
--#else /* !Windows/x86 */
-+#else /* !Windows */
- # if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
- # define PNGAPI _System
- # else /* !Windows/x86 && !OS/2 */
-@@ -286,25 +311,14 @@
- # define PNGAPI PNGCAPI
- #endif
-
--/* The default for PNG_IMPEXP depends on whether the library is
-- * being built or used.
-+/* PNG_IMPEXP may be set on the compilation system command line or (if not set)
-+ * then in an internal header file when building the library, otherwise (when
-+ * using the library) it is set here.
- */
- #ifndef PNG_IMPEXP
--# ifdef PNGLIB_BUILD
-- /* Building the library */
--# if (defined(DLL_EXPORT)/*from libtool*/ ||\
-- defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
-- defined(_USRDLL) ||\
-- defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
-- /* Building a DLL. */
--# define PNG_IMPEXP PNG_DLL_EXPORT
--# endif /* DLL */
--# else
-- /* Using the library */
--# if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-- /* This forces use of a DLL, disallowing static linking */
--# define PNG_IMPEXP PNG_DLL_IMPORT
--# endif
-+# if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-+ /* This forces use of a DLL, disallowing static linking */
-+# define PNG_IMPEXP PNG_DLL_IMPORT
- # endif
-
- # ifndef PNG_IMPEXP
-@@ -370,26 +384,48 @@
-
- #ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
- /* Support for compiler specific function attributes. These are used
-- * so that where compiler support is available incorrect use of API
-+ * so that where compiler support is available, incorrect use of API
- * functions in png.h will generate compiler warnings. Added at libpng
-- * version 1.2.41.
-+ * version 1.2.41. Disabling these removes the warnings but may also produce
-+ * less efficient code.
- */
--# if defined(__GNUC__)
-+# if defined(__clang__) && defined(__has_attribute)
-+ /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
-+# if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
-+# define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-+# endif
-+# if !defined(PNG_NORETURN) && __has_attribute(__noreturn__)
-+# define PNG_NORETURN __attribute__((__noreturn__))
-+# endif
-+# if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__)
-+# define PNG_ALLOCATED __attribute__((__malloc__))
-+# endif
-+# if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__)
-+# define PNG_DEPRECATED __attribute__((__deprecated__))
-+# endif
-+# if !defined(PNG_PRIVATE)
-+# ifdef __has_extension
-+# if __has_extension(attribute_unavailable_with_message)
-+# define PNG_PRIVATE __attribute__((__unavailable__(\
-+ "This function is not exported by libpng.")))
-+# endif
-+# endif
-+# endif
-+# ifndef PNG_RESTRICT
-+# define PNG_RESTRICT __restrict
-+# endif
-+
-+# elif defined(__GNUC__)
- # ifndef PNG_USE_RESULT
- # define PNG_USE_RESULT __attribute__((__warn_unused_result__))
- # endif
- # ifndef PNG_NORETURN
- # define PNG_NORETURN __attribute__((__noreturn__))
- # endif
--# ifndef PNG_ALLOCATED
--# define PNG_ALLOCATED __attribute__((__malloc__))
--# endif
--
-- /* This specifically protects structure members that should only be
-- * accessed from within the library, therefore should be empty during
-- * a library build.
-- */
--# ifndef PNGLIB_BUILD
-+# if __GNUC__ >= 3
-+# ifndef PNG_ALLOCATED
-+# define PNG_ALLOCATED __attribute__((__malloc__))
-+# endif
- # ifndef PNG_DEPRECATED
- # define PNG_DEPRECATED __attribute__((__deprecated__))
- # endif
-@@ -402,10 +438,14 @@
- __attribute__((__deprecated__))
- # endif
- # endif
--# endif /* PNGLIB_BUILD */
--# endif /* __GNUC__ */
-+# if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
-+# ifndef PNG_RESTRICT
-+# define PNG_RESTRICT __restrict
-+# endif
-+# endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */
-+# endif /* __GNUC__ >= 3 */
-
--# if defined(_MSC_VER) && (_MSC_VER >= 1300)
-+# elif defined(_MSC_VER) && (_MSC_VER >= 1300)
- # ifndef PNG_USE_RESULT
- # define PNG_USE_RESULT /* not supported */
- # endif
-@@ -417,20 +457,23 @@
- # define PNG_ALLOCATED __declspec(restrict)
- # endif
- # endif
-+# ifndef PNG_DEPRECATED
-+# define PNG_DEPRECATED __declspec(deprecated)
-+# endif
-+# ifndef PNG_PRIVATE
-+# define PNG_PRIVATE __declspec(deprecated)
-+# endif
-+# ifndef PNG_RESTRICT
-+# if (_MSC_VER >= 1400)
-+# define PNG_RESTRICT __restrict
-+# endif
-+# endif
-
-- /* This specifically protects structure members that should only be
-- * accessed from within the library, therefore should be empty during
-- * a library build.
-- */
--# ifndef PNGLIB_BUILD
--# ifndef PNG_DEPRECATED
--# define PNG_DEPRECATED __declspec(deprecated)
--# endif
--# ifndef PNG_PRIVATE
--# define PNG_PRIVATE __declspec(deprecated)
--# endif
--# endif /* PNGLIB_BUILD */
--# endif /* _MSC_VER */
-+# elif defined(__WATCOMC__)
-+# ifndef PNG_RESTRICT
-+# define PNG_RESTRICT __restrict
-+# endif
-+# endif
- #endif /* PNG_PEDANTIC_WARNINGS */
-
- #ifndef PNG_DEPRECATED
-@@ -448,10 +491,14 @@
- #ifndef PNG_PRIVATE
- # define PNG_PRIVATE /* This is a private libpng function */
- #endif
-+#ifndef PNG_RESTRICT
-+# define PNG_RESTRICT /* The C99 "restrict" feature */
-+#endif
-+
- #ifndef PNG_FP_EXPORT /* A floating point API. */
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- # define PNG_FP_EXPORT(ordinal, type, name, args)\
-- PNG_EXPORT(ordinal, type, name, args)
-+ PNG_EXPORT(ordinal, type, name, args);
- # else /* No floating point APIs */
- # define PNG_FP_EXPORT(ordinal, type, name, args)
- # endif
-@@ -459,189 +506,167 @@
- #ifndef PNG_FIXED_EXPORT /* A fixed point API. */
- # ifdef PNG_FIXED_POINT_SUPPORTED
- # define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-- PNG_EXPORT(ordinal, type, name, args)
-+ PNG_EXPORT(ordinal, type, name, args);
- # else /* No fixed point APIs */
- # define PNG_FIXED_EXPORT(ordinal, type, name, args)
- # endif
- #endif
-
--/* The following uses const char * instead of char * for error
-- * and warning message functions, so some compilers won't complain.
-- * If you do not want to use const, define PNG_NO_CONST here.
-+#ifndef PNG_BUILDING_SYMBOL_TABLE
-+/* Some typedefs to get us started. These should be safe on most of the common
-+ * platforms.
- *
-- * This should not change how the APIs are called, so it can be done
-- * on a per-file basis in the application.
-+ * png_uint_32 and png_int_32 may, currently, be larger than required to hold a
-+ * 32-bit value however this is not normally advisable.
-+ *
-+ * png_uint_16 and png_int_16 should always be two bytes in size - this is
-+ * verified at library build time.
-+ *
-+ * png_byte must always be one byte in size.
-+ *
-+ * The checks below use constants from limits.h, as defined by the ISOC90
-+ * standard.
- */
--#ifndef PNG_CONST
--# ifndef PNG_NO_CONST
--# define PNG_CONST const
--# else
--# define PNG_CONST
-+#if CHAR_BIT == 8 && UCHAR_MAX == 255
-+ typedef unsigned char png_byte;
-+#else
-+# error "libpng requires 8 bit bytes"
-+#endif
-+
-+#if INT_MIN == -32768 && INT_MAX == 32767
-+ typedef int png_int_16;
-+#elif SHRT_MIN == -32768 && SHRT_MAX == 32767
-+ typedef short png_int_16;
-+#else
-+# error "libpng requires a signed 16 bit type"
-+#endif
-+
-+#if UINT_MAX == 65535
-+ typedef unsigned int png_uint_16;
-+#elif USHRT_MAX == 65535
-+ typedef unsigned short png_uint_16;
-+#else
-+# error "libpng requires an unsigned 16 bit type"
-+#endif
-+
-+#if INT_MIN < -2147483646 && INT_MAX > 2147483646
-+ typedef int png_int_32;
-+#elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
-+ typedef long int png_int_32;
-+#else
-+# error "libpng requires a signed 32 bit (or more) type"
-+#endif
-+
-+#if UINT_MAX > 4294967294
-+ typedef unsigned int png_uint_32;
-+#elif ULONG_MAX > 4294967294
-+ typedef unsigned long int png_uint_32;
-+#else
-+# error "libpng requires an unsigned 32 bit (or more) type"
-+#endif
-+
-+/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
-+ * requires an ISOC90 compiler and relies on consistent behavior of sizeof.
-+ */
-+typedef size_t png_size_t;
-+typedef ptrdiff_t png_ptrdiff_t;
-+
-+/* libpng needs to know the maximum value of 'size_t' and this controls the
-+ * definition of png_alloc_size_t, below. This maximum value of size_t limits
-+ * but does not control the maximum allocations the library makes - there is
-+ * direct application control of this through png_set_user_limits().
-+ */
-+#ifndef PNG_SMALL_SIZE_T
-+ /* Compiler specific tests for systems where size_t is known to be less than
-+ * 32 bits (some of these systems may no longer work because of the lack of
-+ * 'far' support; see above.)
-+ */
-+# if (defined(__TURBOC__) && !defined(__FLAT__)) ||\
-+ (defined(_MSC_VER) && defined(MAXSEG_64K))
-+# define PNG_SMALL_SIZE_T
- # endif
- #endif
-
--/* Some typedefs to get us started. These should be safe on most of the
-- * common platforms. The typedefs should be at least as large as the
-- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
-- * don't have to be exactly that size. Some compilers dislike passing
-- * unsigned shorts as function parameters, so you may be better off using
-- * unsigned int for png_uint_16.
-+/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
-+ * smaller than png_uint_32. Casts from png_size_t or png_uint_32 to
-+ * png_alloc_size_t are not necessary; in fact, it is recommended not to use
-+ * them at all so that the compiler can complain when something turns out to be
-+ * problematic.
-+ *
-+ * Casts in the other direction (from png_alloc_size_t to png_size_t or
-+ * png_uint_32) should be explicitly applied; however, we do not expect to
-+ * encounter practical situations that require such conversions.
-+ *
-+ * PNG_SMALL_SIZE_T must be defined if the maximum value of size_t is less than
-+ * 4294967295 - i.e. less than the maximum value of png_uint_32.
-+ */
-+#ifdef PNG_SMALL_SIZE_T
-+ typedef png_uint_32 png_alloc_size_t;
-+#else
-+ typedef png_size_t png_alloc_size_t;
-+#endif
-+
-+/* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
-+ * implementations of Intel CPU specific support of user-mode segmented address
-+ * spaces, where 16-bit pointers address more than 65536 bytes of memory using
-+ * separate 'segment' registers. The implementation requires two different
-+ * types of pointer (only one of which includes the segment value.)
-+ *
-+ * If required this support is available in version 1.2 of libpng and may be
-+ * available in versions through 1.5, although the correctness of the code has
-+ * not been verified recently.
- */
-
--#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
--typedef unsigned int png_uint_32;
--typedef int png_int_32;
--#else
--typedef unsigned long png_uint_32;
--typedef long png_int_32;
--#endif
--typedef unsigned short png_uint_16;
--typedef short png_int_16;
--typedef unsigned char png_byte;
--
--#ifdef PNG_NO_SIZE_T
--typedef unsigned int png_size_t;
--#else
--typedef size_t png_size_t;
--#endif
--#define png_sizeof(x) (sizeof (x))
--
--/* The following is needed for medium model support. It cannot be in the
-- * pngpriv.h header. Needs modification for other compilers besides
-- * MSC. Model independent support declares all arrays and pointers to be
-- * large using the far keyword. The zlib version used must also support
-- * model independent data. As of version zlib 1.0.4, the necessary changes
-- * have been made in zlib. The USE_FAR_KEYWORD define triggers other
-- * changes that are needed. (Tim Wegner)
-- */
--
--/* Separate compiler dependencies (problem here is that zlib.h always
-- * defines FAR. (SJT)
-- */
--#ifdef __BORLANDC__
--# if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
--# define LDATA 1
--# else
--# define LDATA 0
--# endif
-- /* GRR: why is Cygwin in here? Cygwin is not Borland C... */
--# if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
--# define PNG_MAX_MALLOC_64K /* only used in build */
--# if (LDATA != 1)
--# ifndef FAR
--# define FAR __far
--# endif
--# define USE_FAR_KEYWORD
--# endif /* LDATA != 1 */
-- /* Possibly useful for moving data out of default segment.
-- * Uncomment it if you want. Could also define FARDATA as
-- * const if your compiler supports it. (SJT)
--# define FARDATA FAR
-- */
--# endif /* __WIN32__, __FLAT__, __CYGWIN__ */
--#endif /* __BORLANDC__ */
--
--
--/* Suggest testing for specific compiler first before testing for
-- * FAR. The Watcom compiler defines both __MEDIUM__ and M_I86MM,
-- * making reliance oncertain keywords suspect. (SJT)
-- */
--
--/* MSC Medium model */
--#ifdef FAR
--# ifdef M_I86MM
--# define USE_FAR_KEYWORD
--# define FARDATA FAR
--# include <dos.h>
--# endif
--#endif
--
--/* SJT: default case */
--#ifndef FAR
--# define FAR
--#endif
--
--/* At this point FAR is always defined */
--#ifndef FARDATA
--# define FARDATA
--#endif
--
--/* Typedef for floating-point numbers that are converted
-- * to fixed-point with a multiple of 100,000, e.g., gamma
-+/* Typedef for floating-point numbers that are converted to fixed-point with a
-+ * multiple of 100,000, e.g., gamma
- */
- typedef png_int_32 png_fixed_point;
-
- /* Add typedefs for pointers */
--typedef void FAR * png_voidp;
--typedef PNG_CONST void FAR * png_const_voidp;
--typedef png_byte FAR * png_bytep;
--typedef PNG_CONST png_byte FAR * png_const_bytep;
--typedef png_uint_32 FAR * png_uint_32p;
--typedef PNG_CONST png_uint_32 FAR * png_const_uint_32p;
--typedef png_int_32 FAR * png_int_32p;
--typedef PNG_CONST png_int_32 FAR * png_const_int_32p;
--typedef png_uint_16 FAR * png_uint_16p;
--typedef PNG_CONST png_uint_16 FAR * png_const_uint_16p;
--typedef png_int_16 FAR * png_int_16p;
--typedef PNG_CONST png_int_16 FAR * png_const_int_16p;
--typedef char FAR * png_charp;
--typedef PNG_CONST char FAR * png_const_charp;
--typedef png_fixed_point FAR * png_fixed_point_p;
--typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
--typedef png_size_t FAR * png_size_tp;
--typedef PNG_CONST png_size_t FAR * png_const_size_tp;
-+typedef void * png_voidp;
-+typedef const void * png_const_voidp;
-+typedef png_byte * png_bytep;
-+typedef const png_byte * png_const_bytep;
-+typedef png_uint_32 * png_uint_32p;
-+typedef const png_uint_32 * png_const_uint_32p;
-+typedef png_int_32 * png_int_32p;
-+typedef const png_int_32 * png_const_int_32p;
-+typedef png_uint_16 * png_uint_16p;
-+typedef const png_uint_16 * png_const_uint_16p;
-+typedef png_int_16 * png_int_16p;
-+typedef const png_int_16 * png_const_int_16p;
-+typedef char * png_charp;
-+typedef const char * png_const_charp;
-+typedef png_fixed_point * png_fixed_point_p;
-+typedef const png_fixed_point * png_const_fixed_point_p;
-+typedef png_size_t * png_size_tp;
-+typedef const png_size_t * png_const_size_tp;
-
- #ifdef PNG_STDIO_SUPPORTED
- typedef FILE * png_FILE_p;
- #endif
-
- #ifdef PNG_FLOATING_POINT_SUPPORTED
--typedef double FAR * png_doublep;
--typedef PNG_CONST double FAR * png_const_doublep;
-+typedef double * png_doublep;
-+typedef const double * png_const_doublep;
- #endif
-
- /* Pointers to pointers; i.e. arrays */
--typedef png_byte FAR * FAR * png_bytepp;
--typedef png_uint_32 FAR * FAR * png_uint_32pp;
--typedef png_int_32 FAR * FAR * png_int_32pp;
--typedef png_uint_16 FAR * FAR * png_uint_16pp;
--typedef png_int_16 FAR * FAR * png_int_16pp;
--typedef PNG_CONST char FAR * FAR * png_const_charpp;
--typedef char FAR * FAR * png_charpp;
--typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-+typedef png_byte * * png_bytepp;
-+typedef png_uint_32 * * png_uint_32pp;
-+typedef png_int_32 * * png_int_32pp;
-+typedef png_uint_16 * * png_uint_16pp;
-+typedef png_int_16 * * png_int_16pp;
-+typedef const char * * png_const_charpp;
-+typedef char * * png_charpp;
-+typedef png_fixed_point * * png_fixed_point_pp;
- #ifdef PNG_FLOATING_POINT_SUPPORTED
--typedef double FAR * FAR * png_doublepp;
-+typedef double * * png_doublepp;
- #endif
-
- /* Pointers to pointers to pointers; i.e., pointer to array */
--typedef char FAR * FAR * FAR * png_charppp;
-+typedef char * * * png_charppp;
-
--/* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
-- * and no smaller than png_uint_32. Casts from png_size_t or png_uint_32
-- * to png_alloc_size_t are not necessary; in fact, it is recommended
-- * not to use them at all so that the compiler can complain when something
-- * turns out to be problematic.
-- * Casts in the other direction (from png_alloc_size_t to png_size_t or
-- * png_uint_32) should be explicitly applied; however, we do not expect
-- * to encounter practical situations that require such conversions.
-- */
--#if defined(__TURBOC__) && !defined(__FLAT__)
-- typedef unsigned long png_alloc_size_t;
--#else
--# if defined(_MSC_VER) && defined(MAXSEG_64K)
-- typedef unsigned long png_alloc_size_t;
--# else
-- /* This is an attempt to detect an old Windows system where (int) is
-- * actually 16 bits, in that case png_malloc must have an argument with a
-- * bigger size to accomodate the requirements of the library.
-- */
--# if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-- (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-- typedef DWORD png_alloc_size_t;
--# else
-- typedef png_size_t png_alloc_size_t;
--# endif
--# endif
--#endif
-+#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
- #endif /* PNGCONF_H */
---- ./jdk/src/share/native/sun/awt/libpng/pngdebug.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngdebug.h Fri Apr 10 09:21:28 2015 -0700
-@@ -29,11 +29,11 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Copyright (c) 1998-2013 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-- * Last changed in libpng 1.5.0 [January 6, 2011]
-+ * Last changed in libpng 1.6.8 [December 19, 2013]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
-@@ -53,7 +53,7 @@
- * (actually ((void)0)).
- *
- * level: level of detail of message, starting at 0. A level 'n'
-- * message is preceded by 'n' tab characters (not implemented
-+ * message is preceded by 'n' 3-space indentations (not implemented
- * on Microsoft compilers unless PNG_DEBUG_FILE is also
- * defined, to allow debug DLL compilation with no standard IO).
- * message: a printf(3) style text string. A trailing '\n' is added
-@@ -105,32 +105,29 @@
- # endif /* PNG_DEBUG_FILE */
-
- # if (PNG_DEBUG > 1)
--/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on
-- * non-ISO compilers
-- */
- # ifdef __STDC__
- # ifndef png_debug
- # define png_debug(l,m) \
- do { \
- int num_tabs=l; \
-- fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
-- (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
-+ fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \
-+ (num_tabs==2 ? " " : (num_tabs>2 ? " " : "")))); \
- } while (0)
- # endif
- # ifndef png_debug1
- # define png_debug1(l,m,p1) \
- do { \
- int num_tabs=l; \
-- fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
-- (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
-+ fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \
-+ (num_tabs==2 ? " " : (num_tabs>2 ? " " : ""))),p1); \
- } while (0)
- # endif
- # ifndef png_debug2
- # define png_debug2(l,m,p1,p2) \
- do { \
- int num_tabs=l; \
-- fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
-- (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
-+ fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \
-+ (num_tabs==2 ? " " : (num_tabs>2 ? " " : ""))),p1,p2);\
- } while (0)
- # endif
- # else /* __STDC __ */
---- ./jdk/src/share/native/sun/awt/libpng/pngerror.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngerror.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -48,14 +48,14 @@
-
- #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
--static PNG_FUNCTION(void, png_default_error,PNGARG((png_structp png_ptr,
-+static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
- png_const_charp error_message)),PNG_NORETURN);
-
- #ifdef PNG_WARNINGS_SUPPORTED
- static void /* PRIVATE */
--png_default_warning PNGARG((png_structp png_ptr,
-+png_default_warning PNGARG((png_const_structrp png_ptr,
- png_const_charp warning_message));
--#endif /* PNG_WARNINGS_SUPPORTED */
-+#endif /* WARNINGS */
-
- /* This function is called whenever there is a fatal error. This function
- * should not be changed. If there is a need to handle errors differently,
-@@ -64,14 +64,15 @@
- */
- #ifdef PNG_ERROR_TEXT_SUPPORTED
- PNG_FUNCTION(void,PNGAPI
--png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
-+png_error,(png_const_structrp png_ptr, png_const_charp error_message),
-+ PNG_NORETURN)
- {
- #ifdef PNG_ERROR_NUMBERS_SUPPORTED
- char msg[16];
- if (png_ptr != NULL)
- {
-- if (png_ptr->flags&
-- (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-+ if ((png_ptr->flags &
-+ (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0
- {
- if (*error_message == PNG_LITERAL_SHARP)
- {
-@@ -81,7 +82,7 @@
- if (error_message[offset] == ' ')
- break;
-
-- if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-+ if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
- {
- int i;
- for (i = 0; i < offset - 1; i++)
-@@ -96,7 +97,7 @@
-
- else
- {
-- if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-+ if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
- {
- msg[0] = '0';
- msg[1] = '\0';
-@@ -107,7 +108,8 @@
- }
- #endif
- if (png_ptr != NULL && png_ptr->error_fn != NULL)
-- (*(png_ptr->error_fn))(png_ptr, error_message);
-+ (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),
-+ error_message);
-
- /* If the custom handler doesn't exist, or if it returns,
- use the default handler, which will not return. */
-@@ -115,7 +117,7 @@
- }
- #else
- PNG_FUNCTION(void,PNGAPI
--png_err,(png_structp png_ptr),PNG_NORETURN)
-+png_err,(png_const_structrp png_ptr),PNG_NORETURN)
- {
- /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
- * erroneously as '\0', instead of the empty string "". This was
-@@ -123,13 +125,13 @@
- * will crash in this case.
- */
- if (png_ptr != NULL && png_ptr->error_fn != NULL)
-- (*(png_ptr->error_fn))(png_ptr, "");
-+ (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr), "");
-
- /* If the custom handler doesn't exist, or if it returns,
- use the default handler, which will not return. */
- png_default_error(png_ptr, "");
- }
--#endif /* PNG_ERROR_TEXT_SUPPORTED */
-+#endif /* ERROR_TEXT */
-
- /* Utility to safely appends strings to a buffer. This never errors out so
- * error checking is not required in the caller.
-@@ -178,7 +180,7 @@
- case PNG_NUMBER_FORMAT_fixed:
- /* Needs five digits (the fraction) */
- mincount = 5;
-- if (output || number % 10 != 0)
-+ if (output != 0 || number % 10 != 0)
- {
- *--end = digits[number % 10];
- output = 1;
-@@ -189,7 +191,7 @@
- case PNG_NUMBER_FORMAT_02u:
- /* Expects at least 2 digits. */
- mincount = 2;
-- /* fall through */
-+ /* FALL THROUGH */
-
- case PNG_NUMBER_FORMAT_u:
- *--end = digits[number % 10];
-@@ -199,7 +201,7 @@
- case PNG_NUMBER_FORMAT_02x:
- /* This format expects at least two digits */
- mincount = 2;
-- /* fall through */
-+ /* FALL THROUGH */
-
- case PNG_NUMBER_FORMAT_x:
- *--end = digits[number & 0xf];
-@@ -215,13 +217,13 @@
- ++count;
-
- /* Float a fixed number here: */
-- if (format == PNG_NUMBER_FORMAT_fixed) if (count == 5) if (end > start)
-+ if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start))
- {
- /* End of the fraction, but maybe nothing was output? In that case
- * drop the decimal point. If the number is a true zero handle that
- * here.
- */
-- if (output)
-+ if (output != 0)
- *--end = '.';
- else if (number == 0) /* and !output */
- *--end = '0';
-@@ -239,14 +241,14 @@
- * png_set_error_fn() to replace the warning function at run-time.
- */
- void PNGAPI
--png_warning(png_structp png_ptr, png_const_charp warning_message)
-+png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
- {
- int offset = 0;
- if (png_ptr != NULL)
- {
- #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-- if (png_ptr->flags&
-- (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-+ if ((png_ptr->flags &
-+ (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
- #endif
- {
- if (*warning_message == PNG_LITERAL_SHARP)
-@@ -258,7 +260,8 @@
- }
- }
- if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-- (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
-+ (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
-+ warning_message + offset);
- else
- png_default_warning(png_ptr, warning_message + offset);
- }
-@@ -306,38 +309,43 @@
- }
-
- void
--png_formatted_warning(png_structp png_ptr, png_warning_parameters p,
-+png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
- png_const_charp message)
- {
-- /* The internal buffer is just 128 bytes - enough for all our messages,
-- * overflow doesn't happen because this code checks!
-+ /* The internal buffer is just 192 bytes - enough for all our messages,
-+ * overflow doesn't happen because this code checks! If someone figures
-+ * out how to send us a message longer than 192 bytes, all that will
-+ * happen is that the message will be truncated appropriately.
- */
-- size_t i;
-- char msg[128];
-+ size_t i = 0; /* Index in the msg[] buffer: */
-+ char msg[192];
-
-- for (i=0; i<(sizeof msg)-1 && *message != '\0'; ++i)
-+ /* Each iteration through the following loop writes at most one character
-+ * to msg[i++] then returns here to validate that there is still space for
-+ * the trailing '\0'. It may (in the case of a parameter) read more than
-+ * one character from message[]; it must check for '\0' and continue to the
-+ * test if it finds the end of string.
-+ */
-+ while (i<(sizeof msg)-1 && *message != '\0')
- {
-- if (*message == '@')
-+ /* '@' at end of string is now just printed (previously it was skipped);
-+ * it is an error in the calling code to terminate the string with @.
-+ */
-+ if (p != NULL && *message == '@' && message[1] != '\0')
- {
-- int parameter = -1;
-- switch (*++message)
-- {
-- case '1':
-- parameter = 0;
-- break;
-+ int parameter_char = *++message; /* Consume the '@' */
-+ static const char valid_parameters[] = "123456789";
-+ int parameter = 0;
-
-- case '2':
-- parameter = 1;
-- break;
-+ /* Search for the parameter digit, the index in the string is the
-+ * parameter to use.
-+ */
-+ while (valid_parameters[parameter] != parameter_char &&
-+ valid_parameters[parameter] != '\0')
-+ ++parameter;
-
-- case '\0':
-- continue; /* To break out of the for loop above. */
--
-- default:
-- break;
-- }
--
-- if (parameter >= 0 && parameter < PNG_WARNING_PARAMETER_COUNT)
-+ /* If the parameter digit is out of range it will just get printed. */
-+ if (parameter < PNG_WARNING_PARAMETER_COUNT)
- {
- /* Append this parameter */
- png_const_charp parm = p[parameter];
-@@ -347,47 +355,101 @@
- * that parm[] has been initialized, so there is no guarantee of a
- * trailing '\0':
- */
-- for (; i<(sizeof msg)-1 && parm != '\0' && parm < pend; ++i)
-- msg[i] = *parm++;
-+ while (i<(sizeof msg)-1 && *parm != '\0' && parm < pend)
-+ msg[i++] = *parm++;
-
-+ /* Consume the parameter digit too: */
- ++message;
- continue;
- }
-
- /* else not a parameter and there is a character after the @ sign; just
-- * copy that.
-+ * copy that. This is known not to be '\0' because of the test above.
- */
- }
-
- /* At this point *message can't be '\0', even in the bad parameter case
- * above where there is a lone '@' at the end of the message string.
- */
-- msg[i] = *message++;
-+ msg[i++] = *message++;
- }
-
- /* i is always less than (sizeof msg), so: */
- msg[i] = '\0';
-
-- /* And this is the formatted message: */
-+ /* And this is the formatted message. It may be larger than
-+ * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these
-+ * are not (currently) formatted.
-+ */
- png_warning(png_ptr, msg);
- }
--#endif /* PNG_WARNINGS_SUPPORTED */
-+#endif /* WARNINGS */
-
- #ifdef PNG_BENIGN_ERRORS_SUPPORTED
- void PNGAPI
--png_benign_error(png_structp png_ptr, png_const_charp error_message)
-+png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
- {
-- if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
-+ if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
-+ {
-+# ifdef PNG_READ_SUPPORTED
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-+ png_ptr->chunk_name != 0)
-+ png_chunk_warning(png_ptr, error_message);
-+ else
-+# endif
-+ png_warning(png_ptr, error_message);
-+ }
-+
-+ else
-+ {
-+# ifdef PNG_READ_SUPPORTED
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-+ png_ptr->chunk_name != 0)
-+ png_chunk_error(png_ptr, error_message);
-+ else
-+# endif
-+ png_error(png_ptr, error_message);
-+ }
-+
-+# ifndef PNG_ERROR_TEXT_SUPPORTED
-+ PNG_UNUSED(error_message)
-+# endif
-+}
-+
-+void /* PRIVATE */
-+png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
-+{
-+ if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
- png_warning(png_ptr, error_message);
- else
- png_error(png_ptr, error_message);
-+
-+# ifndef PNG_ERROR_TEXT_SUPPORTED
-+ PNG_UNUSED(error_message)
-+# endif
- }
--#endif
-
-+void /* PRIVATE */
-+png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
-+{
-+ if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
-+ png_warning(png_ptr, error_message);
-+ else
-+ png_error(png_ptr, error_message);
-+
-+# ifndef PNG_ERROR_TEXT_SUPPORTED
-+ PNG_UNUSED(error_message)
-+# endif
-+}
-+#endif /* BENIGN_ERRORS */
-+
-+#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */
-+#if defined(PNG_WARNINGS_SUPPORTED) || \
-+ (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED))
- /* These utilities are used internally to build an error message that relates
- * to the current chunk. The chunk name comes from png_ptr->chunk_name,
-- * this is used to prefix the message. The message is limited in length
-- * to 63 bytes, the name characters are output as hex digits wrapped in []
-+ * which is used to prefix the message. The message is limited in length
-+ * to 63 bytes. The name characters are output as hex digits wrapped in []
- * if the character is invalid.
- */
- #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-@@ -396,18 +458,19 @@
- 'A', 'B', 'C', 'D', 'E', 'F'
- };
-
--#define PNG_MAX_ERROR_TEXT 64
--#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
- static void /* PRIVATE */
--png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
-+png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
- error_message)
- {
-- int iout = 0, iin = 0;
-+ png_uint_32 chunk_name = png_ptr->chunk_name;
-+ int iout = 0, ishift = 24;
-
-- while (iin < 4)
-+ while (ishift >= 0)
- {
-- int c = png_ptr->chunk_name[iin++];
-- if (isnonalpha(c))
-+ int c = (int)(chunk_name >> ishift) & 0xff;
-+
-+ ishift -= 8;
-+ if (isnonalpha(c) != 0)
- {
- buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
- buffer[iout++] = png_digit[(c & 0xf0) >> 4];
-@@ -417,7 +480,7 @@
-
- else
- {
-- buffer[iout++] = (png_byte)c;
-+ buffer[iout++] = (char)c;
- }
- }
-
-@@ -426,10 +489,11 @@
-
- else
- {
-+ int iin = 0;
-+
- buffer[iout++] = ':';
- buffer[iout++] = ' ';
-
-- iin = 0;
- while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
- buffer[iout++] = error_message[iin++];
-
-@@ -437,11 +501,11 @@
- buffer[iout] = '\0';
- }
- }
--#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
-+#endif /* WARNINGS || ERROR_TEXT */
-
- #if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
- PNG_FUNCTION(void,PNGAPI
--png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
-+png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),
- PNG_NORETURN)
- {
- char msg[18+PNG_MAX_ERROR_TEXT];
-@@ -454,11 +518,11 @@
- png_error(png_ptr, msg);
- }
- }
--#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
-+#endif /* READ && ERROR_TEXT */
-
- #ifdef PNG_WARNINGS_SUPPORTED
- void PNGAPI
--png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
-+png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)
- {
- char msg[18+PNG_MAX_ERROR_TEXT];
- if (png_ptr == NULL)
-@@ -470,38 +534,83 @@
- png_warning(png_ptr, msg);
- }
- }
--#endif /* PNG_WARNINGS_SUPPORTED */
-+#endif /* WARNINGS */
-
- #ifdef PNG_READ_SUPPORTED
- #ifdef PNG_BENIGN_ERRORS_SUPPORTED
- void PNGAPI
--png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)
-+png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
-+ error_message)
- {
-- if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
-+ if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
- png_chunk_warning(png_ptr, error_message);
-
- else
- png_chunk_error(png_ptr, error_message);
-+
-+# ifndef PNG_ERROR_TEXT_SUPPORTED
-+ PNG_UNUSED(error_message)
-+# endif
- }
- #endif
--#endif /* PNG_READ_SUPPORTED */
-+#endif /* READ */
-+
-+void /* PRIVATE */
-+png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
-+{
-+# ifndef PNG_WARNINGS_SUPPORTED
-+ PNG_UNUSED(message)
-+# endif
-+
-+ /* This is always supported, but for just read or just write it
-+ * unconditionally does the right thing.
-+ */
-+# if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-+# endif
-+
-+# ifdef PNG_READ_SUPPORTED
-+ {
-+ if (error < PNG_CHUNK_ERROR)
-+ png_chunk_warning(png_ptr, message);
-+
-+ else
-+ png_chunk_benign_error(png_ptr, message);
-+ }
-+# endif
-+
-+# if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
-+ else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-+# endif
-+
-+# ifdef PNG_WRITE_SUPPORTED
-+ {
-+ if (error < PNG_CHUNK_WRITE_ERROR)
-+ png_app_warning(png_ptr, message);
-+
-+ else
-+ png_app_error(png_ptr, message);
-+ }
-+# endif
-+}
-
- #ifdef PNG_ERROR_TEXT_SUPPORTED
- #ifdef PNG_FLOATING_POINT_SUPPORTED
- PNG_FUNCTION(void,
--png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
-+png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
- {
- # define fixed_message "fixed point overflow in "
- # define fixed_message_ln ((sizeof fixed_message)-1)
- int iin;
- char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
-- png_memcpy(msg, fixed_message, fixed_message_ln);
-+ memcpy(msg, fixed_message, fixed_message_ln);
- iin = 0;
-- if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
-- {
-- msg[fixed_message_ln + iin] = name[iin];
-- ++iin;
-- }
-+ if (name != NULL)
-+ while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
-+ {
-+ msg[fixed_message_ln + iin] = name[iin];
-+ ++iin;
-+ }
- msg[fixed_message_ln + iin] = 0;
- png_error(png_ptr, msg);
- }
-@@ -513,14 +622,111 @@
- * otherwise it is necessary for png_default_error to be overridden.
- */
- jmp_buf* PNGAPI
--png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
-+png_set_longjmp_fn(png_structrp png_ptr, png_longjmp_ptr longjmp_fn,
- size_t jmp_buf_size)
- {
-- if (png_ptr == NULL || jmp_buf_size != png_sizeof(jmp_buf))
-+ /* From libpng 1.6.0 the app gets one chance to set a 'jmpbuf_size' value
-+ * and it must not change after that. Libpng doesn't care how big the
-+ * buffer is, just that it doesn't change.
-+ *
-+ * If the buffer size is no *larger* than the size of jmp_buf when libpng is
-+ * compiled a built in jmp_buf is returned; this preserves the pre-1.6.0
-+ * semantics that this call will not fail. If the size is larger, however,
-+ * the buffer is allocated and this may fail, causing the function to return
-+ * NULL.
-+ */
-+ if (png_ptr == NULL)
- return NULL;
-
-+ if (png_ptr->jmp_buf_ptr == NULL)
-+ {
-+ png_ptr->jmp_buf_size = 0; /* not allocated */
-+
-+ if (jmp_buf_size <= (sizeof png_ptr->jmp_buf_local))
-+ png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local;
-+
-+ else
-+ {
-+ png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,
-+ png_malloc_warn(png_ptr, jmp_buf_size));
-+
-+ if (png_ptr->jmp_buf_ptr == NULL)
-+ return NULL; /* new NULL return on OOM */
-+
-+ png_ptr->jmp_buf_size = jmp_buf_size;
-+ }
-+ }
-+
-+ else /* Already allocated: check the size */
-+ {
-+ size_t size = png_ptr->jmp_buf_size;
-+
-+ if (size == 0)
-+ {
-+ size = (sizeof png_ptr->jmp_buf_local);
-+ if (png_ptr->jmp_buf_ptr != &png_ptr->jmp_buf_local)
-+ {
-+ /* This is an internal error in libpng: somehow we have been left
-+ * with a stack allocated jmp_buf when the application regained
-+ * control. It's always possible to fix this up, but for the moment
-+ * this is a png_error because that makes it easy to detect.
-+ */
-+ png_error(png_ptr, "Libpng jmp_buf still allocated");
-+ /* png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local; */
-+ }
-+ }
-+
-+ if (size != jmp_buf_size)
-+ {
-+ png_warning(png_ptr, "Application jmp_buf size changed");
-+ return NULL; /* caller will probably crash: no choice here */
-+ }
-+ }
-+
-+ /* Finally fill in the function, now we have a satisfactory buffer. It is
-+ * valid to change the function on every call.
-+ */
- png_ptr->longjmp_fn = longjmp_fn;
-- return &png_ptr->longjmp_buffer;
-+ return png_ptr->jmp_buf_ptr;
-+}
-+
-+void /* PRIVATE */
-+png_free_jmpbuf(png_structrp png_ptr)
-+{
-+ if (png_ptr != NULL)
-+ {
-+ jmp_buf *jb = png_ptr->jmp_buf_ptr;
-+
-+ /* A size of 0 is used to indicate a local, stack, allocation of the
-+ * pointer; used here and in png.c
-+ */
-+ if (jb != NULL && png_ptr->jmp_buf_size > 0)
-+ {
-+
-+ /* This stuff is so that a failure to free the error control structure
-+ * does not leave libpng in a state with no valid error handling: the
-+ * free always succeeds, if there is an error it gets ignored.
-+ */
-+ if (jb != &png_ptr->jmp_buf_local)
-+ {
-+ /* Make an internal, libpng, jmp_buf to return here */
-+ jmp_buf free_jmp_buf;
-+
-+ if (!setjmp(free_jmp_buf))
-+ {
-+ png_ptr->jmp_buf_ptr = &free_jmp_buf; /* come back here */
-+ png_ptr->jmp_buf_size = 0; /* stack allocation */
-+ png_ptr->longjmp_fn = longjmp;
-+ png_free(png_ptr, jb); /* Return to setjmp on error */
-+ }
-+ }
-+ }
-+
-+ /* *Always* cancel everything out: */
-+ png_ptr->jmp_buf_size = 0;
-+ png_ptr->jmp_buf_ptr = NULL;
-+ png_ptr->longjmp_fn = 0;
-+ }
- }
- #endif
-
-@@ -530,7 +736,7 @@
- * error function pointer in png_set_error_fn().
- */
- static PNG_FUNCTION(void /* PRIVATE */,
--png_default_error,(png_structp png_ptr, png_const_charp error_message),
-+png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
- PNG_NORETURN)
- {
- #ifdef PNG_CONSOLE_IO_SUPPORTED
-@@ -577,24 +783,23 @@
- }
-
- PNG_FUNCTION(void,PNGAPI
--png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
-+png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
- {
- #ifdef PNG_SETJMP_SUPPORTED
-- if (png_ptr && png_ptr->longjmp_fn)
-- {
--# ifdef USE_FAR_KEYWORD
-- {
-- jmp_buf tmp_jmpbuf;
-- png_memcpy(tmp_jmpbuf, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
-- png_ptr->longjmp_fn(tmp_jmpbuf, val);
-- }
-+ if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&
-+ png_ptr->jmp_buf_ptr != NULL)
-+ png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val);
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(val)
-+#endif
-
--# else
-- png_ptr->longjmp_fn(png_ptr->longjmp_buffer, val);
--# endif
-- }
--#endif
-- /* Here if not setjmp support or if png_ptr is null. */
-+ /* If control reaches this point, png_longjmp() must not return. The only
-+ * choice is to terminate the whole process (or maybe the thread); to do
-+ * this the ANSI-C abort() function is used unless a different method is
-+ * implemented by overriding the default configuration setting for
-+ * PNG_ABORT().
-+ */
- PNG_ABORT();
- }
-
-@@ -605,7 +810,7 @@
- * not used, but it is passed in case it may be useful.
- */
- static void /* PRIVATE */
--png_default_warning(png_structp png_ptr, png_const_charp warning_message)
-+png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
- {
- #ifdef PNG_CONSOLE_IO_SUPPORTED
- # ifdef PNG_ERROR_NUMBERS_SUPPORTED
-@@ -647,15 +852,15 @@
- #endif
- PNG_UNUSED(png_ptr) /* Make compiler happy */
- }
--#endif /* PNG_WARNINGS_SUPPORTED */
-+#endif /* WARNINGS */
-
- /* This function is called when the application wants to use another method
- * of handling errors and warnings. Note that the error function MUST NOT
- * return to the calling routine or serious problems will occur. The return
-- * method used in the default routine calls longjmp(png_ptr->longjmp_buffer, 1)
-+ * method used in the default routine calls longjmp(png_ptr->jmp_buf_ptr, 1)
- */
- void PNGAPI
--png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
-+png_set_error_fn(png_structrp png_ptr, png_voidp error_ptr,
- png_error_ptr error_fn, png_error_ptr warning_fn)
- {
- if (png_ptr == NULL)
-@@ -676,7 +881,7 @@
- * pointer before png_write_destroy and png_read_destroy are called.
- */
- png_voidp PNGAPI
--png_get_error_ptr(png_const_structp png_ptr)
-+png_get_error_ptr(png_const_structrp png_ptr)
- {
- if (png_ptr == NULL)
- return NULL;
-@@ -687,7 +892,7 @@
-
- #ifdef PNG_ERROR_NUMBERS_SUPPORTED
- void PNGAPI
--png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
-+png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
- {
- if (png_ptr != NULL)
- {
-@@ -697,4 +902,90 @@
- }
- }
- #endif
--#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
-+
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-+ /* Currently the above both depend on SETJMP_SUPPORTED, however it would be
-+ * possible to implement without setjmp support just so long as there is some
-+ * way to handle the error return here:
-+ */
-+PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
-+png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
-+ PNG_NORETURN)
-+{
-+ const png_const_structrp png_ptr = png_nonconst_ptr;
-+ png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
-+
-+ /* An error is always logged here, overwriting anything (typically a warning)
-+ * that is already there:
-+ */
-+ if (image != NULL)
-+ {
-+ png_safecat(image->message, (sizeof image->message), 0, error_message);
-+ image->warning_or_error |= PNG_IMAGE_ERROR;
-+
-+ /* Retrieve the jmp_buf from within the png_control, making this work for
-+ * C++ compilation too is pretty tricky: C++ wants a pointer to the first
-+ * element of a jmp_buf, but C doesn't tell us the type of that.
-+ */
-+ if (image->opaque != NULL && image->opaque->error_buf != NULL)
-+ longjmp(png_control_jmp_buf(image->opaque), 1);
-+
-+ /* Missing longjmp buffer, the following is to help debugging: */
-+ {
-+ size_t pos = png_safecat(image->message, (sizeof image->message), 0,
-+ "bad longjmp: ");
-+ png_safecat(image->message, (sizeof image->message), pos,
-+ error_message);
-+ }
-+ }
-+
-+ /* Here on an internal programming error. */
-+ abort();
-+}
-+
-+#ifdef PNG_WARNINGS_SUPPORTED
-+void /* PRIVATE */ PNGCBAPI
-+png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
-+{
-+ const png_const_structrp png_ptr = png_nonconst_ptr;
-+ png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
-+
-+ /* A warning is only logged if there is no prior warning or error. */
-+ if (image->warning_or_error == 0)
-+ {
-+ png_safecat(image->message, (sizeof image->message), 0, warning_message);
-+ image->warning_or_error |= PNG_IMAGE_WARNING;
-+ }
-+}
-+#endif
-+
-+int /* PRIVATE */
-+png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
-+{
-+ volatile png_imagep image = image_in;
-+ volatile int result;
-+ volatile png_voidp saved_error_buf;
-+ jmp_buf safe_jmpbuf;
-+
-+ /* Safely execute function(arg) with png_error returning to this function. */
-+ saved_error_buf = image->opaque->error_buf;
-+ result = setjmp(safe_jmpbuf) == 0;
-+
-+ if (result != 0)
-+ {
-+
-+ image->opaque->error_buf = safe_jmpbuf;
-+ result = function(arg);
-+ }
-+
-+ image->opaque->error_buf = saved_error_buf;
-+
-+ /* And do the cleanup prior to any failure return. */
-+ if (result == 0)
-+ png_image_free(image);
-+
-+ return result;
-+}
-+#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
-+#endif /* READ || WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngget.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngget.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.1 [February 3, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -45,7 +45,7 @@
- #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
- png_uint_32 PNGAPI
--png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_uint_32 flag)
- {
- if (png_ptr != NULL && info_ptr != NULL)
-@@ -55,7 +55,7 @@
- }
-
- png_size_t PNGAPI
--png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return(info_ptr->rowbytes);
-@@ -65,7 +65,7 @@
-
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- png_bytepp PNGAPI
--png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_rows(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return(info_ptr->row_pointers);
-@@ -77,7 +77,7 @@
- #ifdef PNG_EASY_ACCESS_SUPPORTED
- /* Easy access to info, added in libpng-0.99 */
- png_uint_32 PNGAPI
--png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_image_width(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->width;
-@@ -86,7 +86,7 @@
- }
-
- png_uint_32 PNGAPI
--png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_image_height(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->height;
-@@ -95,7 +95,7 @@
- }
-
- png_byte PNGAPI
--png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_bit_depth(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->bit_depth;
-@@ -104,7 +104,7 @@
- }
-
- png_byte PNGAPI
--png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_color_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->color_type;
-@@ -113,7 +113,7 @@
- }
-
- png_byte PNGAPI
--png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_filter_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->filter_type;
-@@ -122,7 +122,7 @@
- }
-
- png_byte PNGAPI
--png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_interlace_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->interlace_type;
-@@ -131,7 +131,7 @@
- }
-
- png_byte PNGAPI
--png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return info_ptr->compression_type;
-@@ -140,10 +140,12 @@
- }
-
- png_uint_32 PNGAPI
--png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
-+ info_ptr)
- {
- #ifdef PNG_pHYs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
- png_debug1(1, "in %s retrieval function",
- "png_get_x_pixels_per_meter");
-@@ -151,16 +153,21 @@
- if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
- return (info_ptr->x_pixels_per_unit);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
- }
-
- png_uint_32 PNGAPI
--png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
-+ info_ptr)
- {
- #ifdef PNG_pHYs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
- png_debug1(1, "in %s retrieval function",
- "png_get_y_pixels_per_meter");
-@@ -168,16 +175,20 @@
- if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
- return (info_ptr->y_pixels_per_unit);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
- }
-
- png_uint_32 PNGAPI
--png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- #ifdef PNG_pHYs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
-
-@@ -185,6 +196,9 @@
- info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)
- return (info_ptr->x_pixels_per_unit);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
-@@ -192,10 +206,12 @@
-
- #ifdef PNG_FLOATING_POINT_SUPPORTED
- float PNGAPI
--png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
-+ info_ptr)
- {
- #ifdef PNG_READ_pHYs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
-
-@@ -203,6 +219,9 @@
- return ((float)((float)info_ptr->y_pixels_per_unit
- /(float)info_ptr->x_pixels_per_unit));
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return ((float)0.0);
-@@ -211,14 +230,15 @@
-
- #ifdef PNG_FIXED_POINT_SUPPORTED
- png_fixed_point PNGAPI
--png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
-- png_const_infop info_ptr)
-+png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
-+ png_const_inforp info_ptr)
- {
- #ifdef PNG_READ_pHYs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)
-- && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0
-- && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX
-- && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0 &&
-+ info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&
-+ info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX &&
-+ info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
- {
- png_fixed_point res;
-
-@@ -228,9 +248,12 @@
- * range of 0..2^31-1; otherwise the cast might overflow.
- */
- if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,
-- (png_int_32)info_ptr->x_pixels_per_unit))
-+ (png_int_32)info_ptr->x_pixels_per_unit) != 0)
- return res;
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return 0;
-@@ -238,64 +261,80 @@
- #endif
-
- png_int_32 PNGAPI
--png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- #ifdef PNG_oFFs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
-
- if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
- return (info_ptr->x_offset);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
- }
-
- png_int_32 PNGAPI
--png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- #ifdef PNG_oFFs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
-
- if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
- return (info_ptr->y_offset);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
- }
-
- png_int_32 PNGAPI
--png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- #ifdef PNG_oFFs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
-
- if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
- return (info_ptr->x_offset);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
- }
-
- png_int_32 PNGAPI
--png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- #ifdef PNG_oFFs_SUPPORTED
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
-
- if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
- return (info_ptr->y_offset);
- }
-+#else
-+ PNG_UNUSED(png_ptr)
-+ PNG_UNUSED(info_ptr)
- #endif
-
- return (0);
-@@ -326,7 +365,7 @@
- */
- png_fixed_point result;
- if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
-- 5000))
-+ 5000) != 0)
- return result;
-
- /* Overflow. */
-@@ -335,26 +374,26 @@
- }
-
- png_uint_32 PNGAPI
--png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));
- }
-
- png_uint_32 PNGAPI
--png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_x_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));
- }
-
- png_uint_32 PNGAPI
--png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_y_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));
- }
-
- #ifdef PNG_FIXED_POINT_SUPPORTED
- static png_fixed_point
--png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)
-+png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)
- {
- /* Convert from metres * 1,000,000 to inches * 100,000, meters to
- * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.
-@@ -365,8 +404,8 @@
- }
-
- png_fixed_point PNGAPI
--png_get_x_offset_inches_fixed(png_structp png_ptr,
-- png_const_infop info_ptr)
-+png_get_x_offset_inches_fixed(png_const_structrp png_ptr,
-+ png_const_inforp info_ptr)
- {
- return png_fixed_inches_from_microns(png_ptr,
- png_get_x_offset_microns(png_ptr, info_ptr));
-@@ -375,8 +414,8 @@
-
- #ifdef PNG_FIXED_POINT_SUPPORTED
- png_fixed_point PNGAPI
--png_get_y_offset_inches_fixed(png_structp png_ptr,
-- png_const_infop info_ptr)
-+png_get_y_offset_inches_fixed(png_const_structrp png_ptr,
-+ png_const_inforp info_ptr)
- {
- return png_fixed_inches_from_microns(png_ptr,
- png_get_y_offset_microns(png_ptr, info_ptr));
-@@ -385,7 +424,7 @@
-
- #ifdef PNG_FLOATING_POINT_SUPPORTED
- float PNGAPI
--png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_x_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- /* To avoid the overflow do the conversion directly in floating
- * point.
-@@ -396,7 +435,7 @@
-
- #ifdef PNG_FLOATING_POINT_SUPPORTED
- float PNGAPI
--png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_y_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- /* To avoid the overflow do the conversion directly in floating
- * point.
-@@ -407,12 +446,13 @@
-
- #ifdef PNG_pHYs_SUPPORTED
- png_uint_32 PNGAPI
--png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
- {
- png_uint_32 retval = 0;
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
- png_debug1(1, "in %s retrieval function", "pHYs");
-
-@@ -443,15 +483,16 @@
-
- return (retval);
- }
--#endif /* PNG_pHYs_SUPPORTED */
--#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
-+#endif /* pHYs */
-+#endif /* INCH_CONVERSIONS */
-
- /* png_get_channels really belongs in here, too, but it's been around longer */
-
--#endif /* PNG_EASY_ACCESS_SUPPORTED */
-+#endif /* EASY_ACCESS */
-+
-
- png_byte PNGAPI
--png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
-+png_get_channels(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return(info_ptr->channels);
-@@ -459,22 +500,25 @@
- return (0);
- }
-
-+#ifdef PNG_READ_SUPPORTED
- png_const_bytep PNGAPI
--png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
-+png_get_signature(png_const_structrp png_ptr, png_const_inforp info_ptr)
- {
- if (png_ptr != NULL && info_ptr != NULL)
- return(info_ptr->signature);
-
- return (NULL);
- }
-+#endif
-
- #ifdef PNG_bKGD_SUPPORTED
- png_uint_32 PNGAPI
--png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
-+png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
- png_color_16p *background)
- {
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
-- && background != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_bKGD) != 0 &&
-+ background != NULL)
- {
- png_debug1(1, "in %s retrieval function", "bKGD");
-
-@@ -487,32 +531,95 @@
- #endif
-
- #ifdef PNG_cHRM_SUPPORTED
-+/* The XYZ APIs were added in 1.5.5 to take advantage of the code added at the
-+ * same time to correct the rgb grayscale coefficient defaults obtained from the
-+ * cHRM chunk in 1.5.4
-+ */
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- png_uint_32 PNGAPI
--png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
- double *white_x, double *white_y, double *red_x, double *red_y,
- double *green_x, double *green_y, double *blue_x, double *blue_y)
- {
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-+ /* Quiet API change: this code used to only return the end points if a cHRM
-+ * chunk was present, but the end points can also come from iCCP or sRGB
-+ * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
-+ * the png_set_ APIs merely check that set end points are mutually
-+ * consistent.
-+ */
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
- {
- png_debug1(1, "in %s retrieval function", "cHRM");
-
- if (white_x != NULL)
-- *white_x = png_float(png_ptr, info_ptr->x_white, "cHRM white X");
-+ *white_x = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
- if (white_y != NULL)
-- *white_y = png_float(png_ptr, info_ptr->y_white, "cHRM white Y");
-+ *white_y = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
- if (red_x != NULL)
-- *red_x = png_float(png_ptr, info_ptr->x_red, "cHRM red X");
-+ *red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,
-+ "cHRM red X");
- if (red_y != NULL)
-- *red_y = png_float(png_ptr, info_ptr->y_red, "cHRM red Y");
-+ *red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,
-+ "cHRM red Y");
- if (green_x != NULL)
-- *green_x = png_float(png_ptr, info_ptr->x_green, "cHRM green X");
-+ *green_x = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
- if (green_y != NULL)
-- *green_y = png_float(png_ptr, info_ptr->y_green, "cHRM green Y");
-+ *green_y = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
- if (blue_x != NULL)
-- *blue_x = png_float(png_ptr, info_ptr->x_blue, "cHRM blue X");
-+ *blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,
-+ "cHRM blue X");
- if (blue_y != NULL)
-- *blue_y = png_float(png_ptr, info_ptr->y_blue, "cHRM blue Y");
-+ *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
-+ "cHRM blue Y");
-+ return (PNG_INFO_cHRM);
-+ }
-+
-+ return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
-+ double *red_X, double *red_Y, double *red_Z, double *green_X,
-+ double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
-+ double *blue_Z)
-+{
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-+ {
-+ png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
-+
-+ if (red_X != NULL)
-+ *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
-+ "cHRM red X");
-+ if (red_Y != NULL)
-+ *red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,
-+ "cHRM red Y");
-+ if (red_Z != NULL)
-+ *red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,
-+ "cHRM red Z");
-+ if (green_X != NULL)
-+ *green_X = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
-+ if (green_Y != NULL)
-+ *green_Y = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
-+ if (green_Z != NULL)
-+ *green_Z = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
-+ if (blue_X != NULL)
-+ *blue_X = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
-+ if (blue_Y != NULL)
-+ *blue_Y = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
-+ if (blue_Z != NULL)
-+ *blue_Z = png_float(png_ptr,
-+ info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
- return (PNG_INFO_cHRM);
- }
-
-@@ -522,31 +629,69 @@
-
- # ifdef PNG_FIXED_POINT_SUPPORTED
- png_uint_32 PNGAPI
--png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-+ png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-+ png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-+ png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-+ png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-+ png_fixed_point *int_blue_Z)
-+{
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-+ {
-+ png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
-+
-+ if (int_red_X != NULL)
-+ *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
-+ if (int_red_Y != NULL)
-+ *int_red_Y = info_ptr->colorspace.end_points_XYZ.red_Y;
-+ if (int_red_Z != NULL)
-+ *int_red_Z = info_ptr->colorspace.end_points_XYZ.red_Z;
-+ if (int_green_X != NULL)
-+ *int_green_X = info_ptr->colorspace.end_points_XYZ.green_X;
-+ if (int_green_Y != NULL)
-+ *int_green_Y = info_ptr->colorspace.end_points_XYZ.green_Y;
-+ if (int_green_Z != NULL)
-+ *int_green_Z = info_ptr->colorspace.end_points_XYZ.green_Z;
-+ if (int_blue_X != NULL)
-+ *int_blue_X = info_ptr->colorspace.end_points_XYZ.blue_X;
-+ if (int_blue_Y != NULL)
-+ *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
-+ if (int_blue_Z != NULL)
-+ *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
-+ return (PNG_INFO_cHRM);
-+ }
-+
-+ return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
- png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
- png_fixed_point *blue_x, png_fixed_point *blue_y)
- {
- png_debug1(1, "in %s retrieval function", "cHRM");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
- {
- if (white_x != NULL)
-- *white_x = info_ptr->x_white;
-+ *white_x = info_ptr->colorspace.end_points_xy.whitex;
- if (white_y != NULL)
-- *white_y = info_ptr->y_white;
-+ *white_y = info_ptr->colorspace.end_points_xy.whitey;
- if (red_x != NULL)
-- *red_x = info_ptr->x_red;
-+ *red_x = info_ptr->colorspace.end_points_xy.redx;
- if (red_y != NULL)
-- *red_y = info_ptr->y_red;
-+ *red_y = info_ptr->colorspace.end_points_xy.redy;
- if (green_x != NULL)
-- *green_x = info_ptr->x_green;
-+ *green_x = info_ptr->colorspace.end_points_xy.greenx;
- if (green_y != NULL)
-- *green_y = info_ptr->y_green;
-+ *green_y = info_ptr->colorspace.end_points_xy.greeny;
- if (blue_x != NULL)
-- *blue_x = info_ptr->x_blue;
-+ *blue_x = info_ptr->colorspace.end_points_xy.bluex;
- if (blue_y != NULL)
-- *blue_y = info_ptr->y_blue;
-+ *blue_y = info_ptr->colorspace.end_points_xy.bluey;
- return (PNG_INFO_cHRM);
- }
-
-@@ -556,49 +701,57 @@
- #endif
-
- #ifdef PNG_gAMA_SUPPORTED
--png_uint_32 PNGFAPI
--png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
-+# ifdef PNG_FIXED_POINT_SUPPORTED
-+png_uint_32 PNGAPI
-+png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_fixed_point *file_gamma)
- {
- png_debug1(1, "in %s retrieval function", "gAMA");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-- && file_gamma != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-+ file_gamma != NULL)
- {
-- *file_gamma = info_ptr->gamma;
-+ *file_gamma = info_ptr->colorspace.gamma;
- return (PNG_INFO_gAMA);
- }
-
- return (0);
- }
-+# endif
-+
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- png_uint_32 PNGAPI
--png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
- double *file_gamma)
- {
-- png_fixed_point igamma;
-- png_uint_32 ok = png_get_gAMA_fixed(png_ptr, info_ptr, &igamma);
-+ png_debug1(1, "in %s retrieval function", "gAMA(float)");
-
-- if (ok)
-- *file_gamma = png_float(png_ptr, igamma, "png_get_gAMA");
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-+ file_gamma != NULL)
-+ {
-+ *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
-+ "png_get_gAMA");
-+ return (PNG_INFO_gAMA);
-+ }
-
-- return ok;
-+ return (0);
- }
--
- # endif
- #endif
-
- #ifdef PNG_sRGB_SUPPORTED
- png_uint_32 PNGAPI
--png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
- int *file_srgb_intent)
- {
- png_debug1(1, "in %s retrieval function", "sRGB");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
-- && file_srgb_intent != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
- {
-- *file_srgb_intent = (int)info_ptr->srgb_intent;
-+ *file_srgb_intent = info_ptr->colorspace.rendering_intent;
- return (PNG_INFO_sRGB);
- }
-
-@@ -608,22 +761,24 @@
-
- #ifdef PNG_iCCP_SUPPORTED
- png_uint_32 PNGAPI
--png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
- png_charpp name, int *compression_type,
- png_bytepp profile, png_uint_32 *proflen)
- {
- png_debug1(1, "in %s retrieval function", "iCCP");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
-- && name != NULL && profile != NULL && proflen != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_iCCP) != 0 &&
-+ name != NULL && compression_type != NULL && profile != NULL &&
-+ proflen != NULL)
- {
- *name = info_ptr->iccp_name;
- *profile = info_ptr->iccp_profile;
-- /* Compression_type is a dummy so the API won't have to change
-- * if we introduce multiple compression types later.
-+ *proflen = png_get_uint_32(info_ptr->iccp_profile);
-+ /* This is somewhat irrelevant since the profile data returned has
-+ * actually been uncompressed.
- */
-- *proflen = (int)info_ptr->iccp_proflen;
-- *compression_type = (int)info_ptr->iccp_compression;
-+ *compression_type = PNG_COMPRESSION_TYPE_BASE;
- return (PNG_INFO_iCCP);
- }
-
-@@ -632,14 +787,14 @@
- #endif
-
- #ifdef PNG_sPLT_SUPPORTED
--png_uint_32 PNGAPI
--png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
-+int PNGAPI
-+png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
- png_sPLT_tpp spalettes)
- {
- if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
- {
- *spalettes = info_ptr->splt_palettes;
-- return ((png_uint_32)info_ptr->splt_palettes_num);
-+ return info_ptr->splt_palettes_num;
- }
-
- return (0);
-@@ -648,13 +803,13 @@
-
- #ifdef PNG_hIST_SUPPORTED
- png_uint_32 PNGAPI
--png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
- png_uint_16p *hist)
- {
- png_debug1(1, "in %s retrieval function", "hIST");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
-- && hist != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)
- {
- *hist = info_ptr->hist;
- return (PNG_INFO_hIST);
-@@ -665,11 +820,10 @@
- #endif
-
- png_uint_32 PNGAPI
--png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
-+png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_uint_32 *width, png_uint_32 *height, int *bit_depth,
- int *color_type, int *interlace_type, int *compression_type,
- int *filter_type)
--
- {
- png_debug1(1, "in %s retrieval function", "IHDR");
-
-@@ -696,7 +850,7 @@
- * application has ignored our advice not to mess with the members
- * of info_ptr directly.
- */
-- png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
-+ png_check_IHDR(png_ptr, info_ptr->width, info_ptr->height,
- info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
- info_ptr->compression_type, info_ptr->filter_type);
-
-@@ -705,13 +859,14 @@
-
- #ifdef PNG_oFFs_SUPPORTED
- png_uint_32 PNGAPI
--png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
- {
- png_debug1(1, "in %s retrieval function", "oFFs");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
-- && offset_x != NULL && offset_y != NULL && unit_type != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_oFFs) != 0 &&
-+ offset_x != NULL && offset_y != NULL && unit_type != NULL)
- {
- *offset_x = info_ptr->x_offset;
- *offset_y = info_ptr->y_offset;
-@@ -725,14 +880,15 @@
-
- #ifdef PNG_pCAL_SUPPORTED
- png_uint_32 PNGAPI
--png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
- png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
- png_charp *units, png_charpp *params)
- {
- png_debug1(1, "in %s retrieval function", "pCAL");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
-- && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_pCAL) != 0 &&
-+ purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
- nparams != NULL && units != NULL && params != NULL)
- {
- *purpose = info_ptr->pcal_purpose;
-@@ -751,16 +907,20 @@
-
- #ifdef PNG_sCAL_SUPPORTED
- # ifdef PNG_FIXED_POINT_SUPPORTED
--# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-+# if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
-+ defined(PNG_FLOATING_POINT_SUPPORTED)
- png_uint_32 PNGAPI
--png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,
-+png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
- int *unit, png_fixed_point *width, png_fixed_point *height)
- {
- if (png_ptr != NULL && info_ptr != NULL &&
-- (info_ptr->valid & PNG_INFO_sCAL))
-+ (info_ptr->valid & PNG_INFO_sCAL) != 0)
- {
- *unit = info_ptr->scal_unit;
-- /*TODO: make this work without FP support */
-+ /*TODO: make this work without FP support; the API is currently eliminated
-+ * if neither floating point APIs nor internal floating point arithmetic
-+ * are enabled.
-+ */
- *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
- *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
- "sCAL height");
-@@ -773,11 +933,11 @@
- # endif /* FIXED_POINT */
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- png_uint_32 PNGAPI
--png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
- int *unit, double *width, double *height)
- {
- if (png_ptr != NULL && info_ptr != NULL &&
-- (info_ptr->valid & PNG_INFO_sCAL))
-+ (info_ptr->valid & PNG_INFO_sCAL) != 0)
- {
- *unit = info_ptr->scal_unit;
- *width = atof(info_ptr->scal_s_width);
-@@ -789,11 +949,11 @@
- }
- # endif /* FLOATING POINT */
- png_uint_32 PNGAPI
--png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
- int *unit, png_charpp width, png_charpp height)
- {
- if (png_ptr != NULL && info_ptr != NULL &&
-- (info_ptr->valid & PNG_INFO_sCAL))
-+ (info_ptr->valid & PNG_INFO_sCAL) != 0)
- {
- *unit = info_ptr->scal_unit;
- *width = info_ptr->scal_s_width;
-@@ -807,7 +967,7 @@
-
- #ifdef PNG_pHYs_SUPPORTED
- png_uint_32 PNGAPI
--png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
- png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
- {
- png_uint_32 retval = 0;
-@@ -815,7 +975,7 @@
- png_debug1(1, "in %s retrieval function", "pHYs");
-
- if (png_ptr != NULL && info_ptr != NULL &&
-- (info_ptr->valid & PNG_INFO_pHYs))
-+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
- if (res_x != NULL)
- {
-@@ -841,13 +1001,13 @@
- #endif /* pHYs */
-
- png_uint_32 PNGAPI
--png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
- png_colorp *palette, int *num_palette)
- {
- png_debug1(1, "in %s retrieval function", "PLTE");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
-- && palette != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL)
- {
- *palette = info_ptr->palette;
- *num_palette = info_ptr->num_palette;
-@@ -860,13 +1020,13 @@
-
- #ifdef PNG_sBIT_SUPPORTED
- png_uint_32 PNGAPI
--png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
-+png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
- png_color_8p *sig_bit)
- {
- png_debug1(1, "in %s retrieval function", "sBIT");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
-- && sig_bit != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)
- {
- *sig_bit = &(info_ptr->sig_bit);
- return (PNG_INFO_sBIT);
-@@ -877,15 +1037,14 @@
- #endif
-
- #ifdef PNG_TEXT_SUPPORTED
--png_uint_32 PNGAPI
--png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
-+int PNGAPI
-+png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
- png_textp *text_ptr, int *num_text)
- {
- if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
- {
-- png_debug1(1, "in %s retrieval function",
-- (png_ptr->chunk_name[0] == '\0' ? "text" :
-- (png_const_charp)png_ptr->chunk_name));
-+ png_debug1(1, "in 0x%lx retrieval function",
-+ (unsigned long)png_ptr->chunk_name);
-
- if (text_ptr != NULL)
- *text_ptr = info_ptr->text;
-@@ -893,7 +1052,7 @@
- if (num_text != NULL)
- *num_text = info_ptr->num_text;
-
-- return ((png_uint_32)info_ptr->num_text);
-+ return info_ptr->num_text;
- }
-
- if (num_text != NULL)
-@@ -905,12 +1064,13 @@
-
- #ifdef PNG_tIME_SUPPORTED
- png_uint_32 PNGAPI
--png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
-+png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_timep *mod_time)
- {
- png_debug1(1, "in %s retrieval function", "tIME");
-
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
-- && mod_time != NULL)
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)
- {
- *mod_time = &(info_ptr->mod_time);
- return (PNG_INFO_tIME);
-@@ -922,11 +1082,12 @@
-
- #ifdef PNG_tRNS_SUPPORTED
- png_uint_32 PNGAPI
--png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
-+png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
- png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
- {
- png_uint_32 retval = 0;
-- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-+ if (png_ptr != NULL && info_ptr != NULL &&
-+ (info_ptr->valid & PNG_INFO_tRNS) != 0)
- {
- png_debug1(1, "in %s retrieval function", "tRNS");
-
-@@ -965,9 +1126,9 @@
- }
- #endif
-
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
- int PNGAPI
--png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
-+png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr,
- png_unknown_chunkpp unknowns)
- {
- if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
-@@ -982,7 +1143,7 @@
-
- #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- png_byte PNGAPI
--png_get_rgb_to_gray_status (png_const_structp png_ptr)
-+png_get_rgb_to_gray_status (png_const_structrp png_ptr)
- {
- return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
- }
-@@ -990,71 +1151,91 @@
-
- #ifdef PNG_USER_CHUNKS_SUPPORTED
- png_voidp PNGAPI
--png_get_user_chunk_ptr(png_const_structp png_ptr)
-+png_get_user_chunk_ptr(png_const_structrp png_ptr)
- {
- return (png_ptr ? png_ptr->user_chunk_ptr : NULL);
- }
- #endif
-
- png_size_t PNGAPI
--png_get_compression_buffer_size(png_const_structp png_ptr)
-+png_get_compression_buffer_size(png_const_structrp png_ptr)
- {
-- return (png_ptr ? png_ptr->zbuf_size : 0L);
-+ if (png_ptr == NULL)
-+ return 0;
-+
-+# ifdef PNG_WRITE_SUPPORTED
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-+# endif
-+ {
-+# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+ return png_ptr->IDAT_read_size;
-+# else
-+ return PNG_IDAT_READ_SIZE;
-+# endif
-+ }
-+
-+# ifdef PNG_WRITE_SUPPORTED
-+ else
-+ return png_ptr->zbuffer_size;
-+# endif
- }
-
--
- #ifdef PNG_SET_USER_LIMITS_SUPPORTED
- /* These functions were added to libpng 1.2.6 and were enabled
- * by default in libpng-1.4.0 */
- png_uint_32 PNGAPI
--png_get_user_width_max (png_const_structp png_ptr)
-+png_get_user_width_max (png_const_structrp png_ptr)
- {
- return (png_ptr ? png_ptr->user_width_max : 0);
- }
-
- png_uint_32 PNGAPI
--png_get_user_height_max (png_const_structp png_ptr)
-+png_get_user_height_max (png_const_structrp png_ptr)
- {
- return (png_ptr ? png_ptr->user_height_max : 0);
- }
-
- /* This function was added to libpng 1.4.0 */
- png_uint_32 PNGAPI
--png_get_chunk_cache_max (png_const_structp png_ptr)
-+png_get_chunk_cache_max (png_const_structrp png_ptr)
- {
- return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
- }
-
- /* This function was added to libpng 1.4.1 */
- png_alloc_size_t PNGAPI
--png_get_chunk_malloc_max (png_const_structp png_ptr)
-+png_get_chunk_malloc_max (png_const_structrp png_ptr)
- {
- return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
- }
--#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-+#endif /* SET_USER_LIMITS */
-
- /* These functions were added to libpng 1.4.0 */
- #ifdef PNG_IO_STATE_SUPPORTED
- png_uint_32 PNGAPI
--png_get_io_state (png_structp png_ptr)
-+png_get_io_state (png_const_structrp png_ptr)
- {
- return png_ptr->io_state;
- }
-
- png_uint_32 PNGAPI
--png_get_io_chunk_type (png_const_structp png_ptr)
--{
-- return ((png_ptr->chunk_name[0] << 24) +
-- (png_ptr->chunk_name[1] << 16) +
-- (png_ptr->chunk_name[2] << 8) +
-- (png_ptr->chunk_name[3]));
--}
--
--png_const_bytep PNGAPI
--png_get_io_chunk_name (png_structp png_ptr)
-+png_get_io_chunk_type (png_const_structrp png_ptr)
- {
- return png_ptr->chunk_name;
- }
--#endif /* ?PNG_IO_STATE_SUPPORTED */
-+#endif /* IO_STATE */
-
--#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
-+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+# ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-+int PNGAPI
-+png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
-+{
-+ if (png_ptr != NULL && info_ptr != NULL)
-+ return png_ptr->num_palette_max;
-+
-+ return (-1);
-+}
-+# endif
-+#endif
-+
-+#endif /* READ || WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pnginfo.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pnginfo.h Fri Apr 10 09:21:28 2015 -0700
-@@ -29,11 +29,11 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Copyright (c) 1998-2013 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-- * Last changed in libpng 1.5.0 [January 6, 2011]
-+ * Last changed in libpng 1.6.1 [March 28, 2013]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
-@@ -83,7 +83,7 @@
-
- struct png_info_def
- {
-- /* the following are necessary for every PNG file */
-+ /* The following are necessary for every PNG file */
- png_uint_32 width; /* width of image in pixels (from IHDR) */
- png_uint_32 height; /* height of image in pixels (from IHDR) */
- png_uint_32 valid; /* valid chunk data (see PNG_INFO_ below) */
-@@ -98,11 +98,17 @@
- png_byte filter_type; /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
- png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-
-- /* The following is informational only on read, and not used on writes. */
-+ /* The following are set by png_set_IHDR, called from the application on
-+ * write, but the are never actually used by the write code.
-+ */
- png_byte channels; /* number of data channels per pixel (1, 2, 3, 4) */
- png_byte pixel_depth; /* number of bits per pixel */
- png_byte spare_byte; /* to align the data, and for future use */
-+
-+#ifdef PNG_READ_SUPPORTED
-+ /* This is never set during write */
- png_byte signature[8]; /* magic bytes read by libpng from start of file */
-+#endif
-
- /* The rest of the data is optional. If you are reading, check the
- * valid field to see if the information in these are valid. If you
-@@ -110,18 +116,25 @@
- * and initialize the appropriate fields below.
- */
-
--#if defined(PNG_gAMA_SUPPORTED)
-- /* The gAMA chunk describes the gamma characteristics of the system
-- * on which the image was created, normally in the range [1.0, 2.5].
-- * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
-+#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-+ /* png_colorspace only contains 'flags' if neither GAMMA or COLORSPACE are
-+ * defined. When COLORSPACE is switched on all the colorspace-defining
-+ * chunks should be enabled, when GAMMA is switched on all the gamma-defining
-+ * chunks should be enabled. If this is not done it becomes possible to read
-+ * inconsistent PNG files and assign a probably incorrect interpretation to
-+ * the information. (In other words, by carefully choosing which chunks to
-+ * recognize the system configuration can select an interpretation for PNG
-+ * files containing ambiguous data and this will result in inconsistent
-+ * behavior between different libpng builds!)
- */
-- png_fixed_point gamma;
-+ png_colorspace colorspace;
- #endif
-
--#ifdef PNG_sRGB_SUPPORTED
-- /* GR-P, 0.96a */
-- /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
-- png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
-+#ifdef PNG_iCCP_SUPPORTED
-+ /* iCCP chunk data. */
-+ png_charp iccp_name; /* profile name */
-+ png_bytep iccp_profile; /* International Color Consortium profile data */
-+ png_uint_32 iccp_proflen; /* ICC profile data length */
- #endif
-
- #ifdef PNG_TEXT_SUPPORTED
-@@ -136,7 +149,7 @@
- int num_text; /* number of comments read or comments to write */
- int max_text; /* current size of text array */
- png_textp text; /* array of comments read or comments to write */
--#endif /* PNG_TEXT_SUPPORTED */
-+#endif /* TEXT */
-
- #ifdef PNG_tIME_SUPPORTED
- /* The tIME chunk holds the last time the displayed image data was
-@@ -211,23 +224,6 @@
- png_uint_16p hist;
- #endif
-
--#ifdef PNG_cHRM_SUPPORTED
-- /* The cHRM chunk describes the CIE color characteristics of the monitor
-- * on which the PNG was created. This data allows the viewer to do gamut
-- * mapping of the input image to ensure that the viewer sees the same
-- * colors in the image as the creator. Values are in the range
-- * [0.0, 0.8]. Data valid if (valid & PNG_INFO_cHRM) non-zero.
-- */
-- png_fixed_point x_white;
-- png_fixed_point y_white;
-- png_fixed_point x_red;
-- png_fixed_point y_red;
-- png_fixed_point x_green;
-- png_fixed_point y_green;
-- png_fixed_point x_blue;
-- png_fixed_point y_blue;
--#endif
--
- #ifdef PNG_pCAL_SUPPORTED
- /* The pCAL chunk describes a transformation between the stored pixel
- * values and original physical data values used to create the image.
-@@ -252,25 +248,20 @@
- /* New members added in libpng-1.0.6 */
- png_uint_32 free_me; /* flags items libpng is responsible for freeing */
-
--#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-- defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
- /* Storage for unknown chunks that the library doesn't recognize. */
- png_unknown_chunkp unknown_chunks;
-- int unknown_chunks_num;
--#endif
-
--#ifdef PNG_iCCP_SUPPORTED
-- /* iCCP chunk data. */
-- png_charp iccp_name; /* profile name */
-- png_bytep iccp_profile; /* International Color Consortium profile data */
-- png_uint_32 iccp_proflen; /* ICC profile data length */
-- png_byte iccp_compression; /* Always zero */
-+ /* The type of this field is limited by the type of
-+ * png_struct::user_chunk_cache_max, else overflow can occur.
-+ */
-+ int unknown_chunks_num;
- #endif
-
- #ifdef PNG_sPLT_SUPPORTED
- /* Data on sPLT chunks (there may be more than one). */
- png_sPLT_tp splt_palettes;
-- png_uint_32 splt_palettes_num;
-+ int splt_palettes_num; /* Match type returned by png_get API */
- #endif
-
- #ifdef PNG_sCAL_SUPPORTED
---- ./jdk/src/share/native/sun/awt/libpng/pnglibconf.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pnglibconf.h Fri Apr 10 09:21:28 2015 -0700
-@@ -34,69 +34,47 @@
- * file and, per its terms, should not be removed:
- */
-
--/* libpng version 1.5.4 - last changed on June 22, 2011 */
-+/* libpng version 1.6.16,December 22, 2014 */
-
--/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
-+/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
-
- /* This code is released under the libpng license. */
- /* For conditions of distribution and use, see the disclaimer */
- /* and license in png.h */
-
- /* pnglibconf.h */
-+/* Machine generated file: DO NOT EDIT */
- /* Derived from: scripts/pnglibconf.dfa */
--/* If you edit this file by hand you must obey the rules expressed in */
--/* pnglibconf.dfa with respect to the dependencies between the following */
--/* symbols. It is much better to generate a new file using */
--/* scripts/libpngconf.mak */
--
- #ifndef PNGLCONF_H
- #define PNGLCONF_H
--/* settings */
--#define PNG_API_RULE 0
--#define PNG_CALLOC_SUPPORTED
--#define PNG_COST_SHIFT 3
--#define PNG_DEFAULT_READ_MACROS 1
--#define PNG_GAMMA_THRESHOLD_FIXED 5000
--#define PNG_MAX_GAMMA_8 11
--#define PNG_QUANTIZE_BLUE_BITS 5
--#define PNG_QUANTIZE_GREEN_BITS 5
--#define PNG_QUANTIZE_RED_BITS 5
--#define PNG_sCAL_PRECISION 5
--#define PNG_USER_CHUNK_CACHE_MAX 0
--#define PNG_USER_CHUNK_MALLOC_MAX 0
--#define PNG_USER_HEIGHT_MAX 1000000L
--#define PNG_USER_WIDTH_MAX 1000000L
--#define PNG_WEIGHT_SHIFT 8
--#define PNG_ZBUF_SIZE 8192
--/* end of settings */
- /* options */
- #define PNG_16BIT_SUPPORTED
--#define PNG_ALIGN_MEMORY_SUPPORTED
-+#define PNG_ALIGNED_MEMORY_SUPPORTED
-+/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-+/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
- #define PNG_BENIGN_ERRORS_SUPPORTED
--#define PNG_bKGD_SUPPORTED
-+#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-+/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
- #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
--#define PNG_CHECK_cHRM_SUPPORTED
--#define PNG_cHRM_SUPPORTED
-+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+#define PNG_COLORSPACE_SUPPORTED
- #define PNG_CONSOLE_IO_SUPPORTED
--#define PNG_CONVERT_tIME_SUPPORTED
-+/*#undef PNG_CONVERT_tIME_SUPPORTED*/
- #define PNG_EASY_ACCESS_SUPPORTED
- /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
- #define PNG_ERROR_TEXT_SUPPORTED
- #define PNG_FIXED_POINT_SUPPORTED
- #define PNG_FLOATING_ARITHMETIC_SUPPORTED
- #define PNG_FLOATING_POINT_SUPPORTED
--#define PNG_gAMA_SUPPORTED
-+#define PNG_FORMAT_AFIRST_SUPPORTED
-+#define PNG_FORMAT_BGR_SUPPORTED
-+#define PNG_GAMMA_SUPPORTED
-+#define PNG_GET_PALETTE_MAX_SUPPORTED
- #define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
--#define PNG_hIST_SUPPORTED
--#define PNG_iCCP_SUPPORTED
- #define PNG_INCH_CONVERSIONS_SUPPORTED
- #define PNG_INFO_IMAGE_SUPPORTED
- #define PNG_IO_STATE_SUPPORTED
--#define PNG_iTXt_SUPPORTED
- #define PNG_MNG_FEATURES_SUPPORTED
--#define PNG_oFFs_SUPPORTED
--#define PNG_pCAL_SUPPORTED
--#define PNG_pHYs_SUPPORTED
- #define PNG_POINTER_INDEXING_SUPPORTED
- #define PNG_PROGRESSIVE_READ_SUPPORTED
- #define PNG_READ_16BIT_SUPPORTED
-@@ -104,67 +82,73 @@
- #define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
- #define PNG_READ_BACKGROUND_SUPPORTED
- #define PNG_READ_BGR_SUPPORTED
--#define PNG_READ_bKGD_SUPPORTED
--#define PNG_READ_cHRM_SUPPORTED
-+#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
- #define PNG_READ_COMPOSITE_NODIV_SUPPORTED
- #define PNG_READ_COMPRESSED_TEXT_SUPPORTED
- #define PNG_READ_EXPAND_16_SUPPORTED
- #define PNG_READ_EXPAND_SUPPORTED
- #define PNG_READ_FILLER_SUPPORTED
--#define PNG_READ_gAMA_SUPPORTED
- #define PNG_READ_GAMMA_SUPPORTED
-+#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
- #define PNG_READ_GRAY_TO_RGB_SUPPORTED
--#define PNG_READ_hIST_SUPPORTED
--#define PNG_READ_iCCP_SUPPORTED
- #define PNG_READ_INTERLACING_SUPPORTED
- #define PNG_READ_INT_FUNCTIONS_SUPPORTED
- #define PNG_READ_INVERT_ALPHA_SUPPORTED
- #define PNG_READ_INVERT_SUPPORTED
--#define PNG_READ_iTXt_SUPPORTED
--#define PNG_READ_oFFs_SUPPORTED
- #define PNG_READ_OPT_PLTE_SUPPORTED
-+#define PNG_READ_PACKSWAP_SUPPORTED
- #define PNG_READ_PACK_SUPPORTED
--#define PNG_READ_PACKSWAP_SUPPORTED
--#define PNG_READ_pCAL_SUPPORTED
--#define PNG_READ_pHYs_SUPPORTED
- #define PNG_READ_QUANTIZE_SUPPORTED
- #define PNG_READ_RGB_TO_GRAY_SUPPORTED
--#define PNG_READ_sBIT_SUPPORTED
- #define PNG_READ_SCALE_16_TO_8_SUPPORTED
--#define PNG_READ_sCAL_SUPPORTED
- #define PNG_READ_SHIFT_SUPPORTED
--#define PNG_READ_sPLT_SUPPORTED
--#define PNG_READ_sRGB_SUPPORTED
- #define PNG_READ_STRIP_16_TO_8_SUPPORTED
- #define PNG_READ_STRIP_ALPHA_SUPPORTED
- #define PNG_READ_SUPPORTED
- #define PNG_READ_SWAP_ALPHA_SUPPORTED
- #define PNG_READ_SWAP_SUPPORTED
--#define PNG_READ_tEXt_SUPPORTED
- #define PNG_READ_TEXT_SUPPORTED
--#define PNG_READ_tIME_SUPPORTED
- #define PNG_READ_TRANSFORMS_SUPPORTED
--#define PNG_READ_tRNS_SUPPORTED
- #define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
- #define PNG_READ_USER_CHUNKS_SUPPORTED
- #define PNG_READ_USER_TRANSFORM_SUPPORTED
-+#define PNG_READ_bKGD_SUPPORTED
-+#define PNG_READ_cHRM_SUPPORTED
-+#define PNG_READ_gAMA_SUPPORTED
-+#define PNG_READ_hIST_SUPPORTED
-+#define PNG_READ_iCCP_SUPPORTED
-+#define PNG_READ_iTXt_SUPPORTED
-+#define PNG_READ_oFFs_SUPPORTED
-+#define PNG_READ_pCAL_SUPPORTED
-+#define PNG_READ_pHYs_SUPPORTED
-+#define PNG_READ_sBIT_SUPPORTED
-+#define PNG_READ_sCAL_SUPPORTED
-+#define PNG_READ_sPLT_SUPPORTED
-+#define PNG_READ_sRGB_SUPPORTED
-+#define PNG_READ_tEXt_SUPPORTED
-+#define PNG_READ_tIME_SUPPORTED
-+#define PNG_READ_tRNS_SUPPORTED
- #define PNG_READ_zTXt_SUPPORTED
--#define PNG_SAVE_INT_32_SUPPORTED
--#define PNG_sBIT_SUPPORTED
--#define PNG_sCAL_SUPPORTED
-+/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
-+/*#undef PNG_SAVE_INT_32_SUPPORTED*/
-+#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
- #define PNG_SEQUENTIAL_READ_SUPPORTED
-+#define PNG_SETJMP_SUPPORTED
- #define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
- #define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
--#define PNG_SETJMP_SUPPORTED
-+#define PNG_SET_OPTION_SUPPORTED
-+#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
- #define PNG_SET_USER_LIMITS_SUPPORTED
--#define PNG_sPLT_SUPPORTED
--#define PNG_sRGB_SUPPORTED
-+#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-+#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-+#define PNG_SIMPLIFIED_READ_SUPPORTED
-+/*#undef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED*/
-+/*#undef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED*/
-+/*#undef PNG_SIMPLIFIED_WRITE_SUPPORTED*/
- #define PNG_STDIO_SUPPORTED
--#define PNG_tEXt_SUPPORTED
-+#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
- #define PNG_TEXT_SUPPORTED
- #define PNG_TIME_RFC1123_SUPPORTED
--#define PNG_tIME_SUPPORTED
--#define PNG_tRNS_SUPPORTED
- #define PNG_UNKNOWN_CHUNKS_SUPPORTED
- #define PNG_USER_CHUNKS_SUPPORTED
- #define PNG_USER_LIMITS_SUPPORTED
-@@ -172,6 +156,91 @@
- #define PNG_USER_TRANSFORM_INFO_SUPPORTED
- #define PNG_USER_TRANSFORM_PTR_SUPPORTED
- #define PNG_WARNINGS_SUPPORTED
-+/*#undef PNG_WRITE_16BIT_SUPPORTED*/
-+/*#undef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED*/
-+/*#undef PNG_WRITE_BGR_SUPPORTED*/
-+/*#undef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED*/
-+/*#undef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED*/
-+/*#undef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED*/
-+/*#undef PNG_WRITE_FILLER_SUPPORTED*/
-+/*#undef PNG_WRITE_FILTER_SUPPORTED*/
-+/*#undef PNG_WRITE_FLUSH_SUPPORTED*/
-+/*#undef PNG_WRITE_GET_PALETTE_MAX_SUPPORTED*/
-+/*#undef PNG_WRITE_INTERLACING_SUPPORTED*/
-+/*#undef PNG_WRITE_INT_FUNCTIONS_SUPPORTED*/
-+/*#undef PNG_WRITE_INVERT_ALPHA_SUPPORTED*/
-+/*#undef PNG_WRITE_INVERT_SUPPORTED*/
-+/*#undef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED*/
-+/*#undef PNG_WRITE_PACKSWAP_SUPPORTED*/
-+/*#undef PNG_WRITE_PACK_SUPPORTED*/
-+/*#undef PNG_WRITE_SHIFT_SUPPORTED*/
-+/*#undef PNG_WRITE_SUPPORTED*/
-+/*#undef PNG_WRITE_SWAP_ALPHA_SUPPORTED*/
-+/*#undef PNG_WRITE_SWAP_SUPPORTED*/
-+/*#undef PNG_WRITE_TEXT_SUPPORTED*/
-+/*#undef PNG_WRITE_TRANSFORMS_SUPPORTED*/
-+/*#undef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED*/
-+/*#undef PNG_WRITE_USER_TRANSFORM_SUPPORTED*/
-+/*#undef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED*/
-+/*#undef PNG_WRITE_bKGD_SUPPORTED*/
-+/*#undef PNG_WRITE_cHRM_SUPPORTED*/
-+/*#undef PNG_WRITE_gAMA_SUPPORTED*/
-+/*#undef PNG_WRITE_hIST_SUPPORTED*/
-+/*#undef PNG_WRITE_iCCP_SUPPORTED*/
-+/*#undef PNG_WRITE_iTXt_SUPPORTED*/
-+/*#undef PNG_WRITE_oFFs_SUPPORTED*/
-+/*#undef PNG_WRITE_pCAL_SUPPORTED*/
-+/*#undef PNG_WRITE_pHYs_SUPPORTED*/
-+/*#undef PNG_WRITE_sBIT_SUPPORTED*/
-+/*#undef PNG_WRITE_sCAL_SUPPORTED*/
-+/*#undef PNG_WRITE_sPLT_SUPPORTED*/
-+/*#undef PNG_WRITE_sRGB_SUPPORTED*/
-+/*#undef PNG_WRITE_tEXt_SUPPORTED*/
-+/*#undef PNG_WRITE_tIME_SUPPORTED*/
-+/*#undef PNG_WRITE_tRNS_SUPPORTED*/
-+/*#undef PNG_WRITE_zTXt_SUPPORTED*/
-+#define PNG_bKGD_SUPPORTED
-+#define PNG_cHRM_SUPPORTED
-+#define PNG_gAMA_SUPPORTED
-+#define PNG_hIST_SUPPORTED
-+#define PNG_iCCP_SUPPORTED
-+#define PNG_iTXt_SUPPORTED
-+#define PNG_oFFs_SUPPORTED
-+#define PNG_pCAL_SUPPORTED
-+#define PNG_pHYs_SUPPORTED
-+#define PNG_sBIT_SUPPORTED
-+#define PNG_sCAL_SUPPORTED
-+#define PNG_sPLT_SUPPORTED
-+#define PNG_sRGB_SUPPORTED
-+#define PNG_tEXt_SUPPORTED
-+#define PNG_tIME_SUPPORTED
-+#define PNG_tRNS_SUPPORTED
- #define PNG_zTXt_SUPPORTED
- /* end of options */
-+/* settings */
-+#define PNG_API_RULE 0
-+#define PNG_COST_SHIFT 3
-+#define PNG_DEFAULT_READ_MACROS 1
-+#define PNG_GAMMA_THRESHOLD_FIXED 5000
-+#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-+#define PNG_INFLATE_BUF_SIZE 1024
-+#define PNG_MAX_GAMMA_8 11
-+#define PNG_QUANTIZE_BLUE_BITS 5
-+#define PNG_QUANTIZE_GREEN_BITS 5
-+#define PNG_QUANTIZE_RED_BITS 5
-+#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-+#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-+#define PNG_USER_CHUNK_CACHE_MAX 0
-+#define PNG_USER_CHUNK_MALLOC_MAX 0
-+#define PNG_USER_HEIGHT_MAX 1000000
-+#define PNG_USER_WIDTH_MAX 1000000
-+#define PNG_WEIGHT_SHIFT 8
-+#define PNG_ZBUF_SIZE 8192
-+#define PNG_ZLIB_VERNUM 0
-+#define PNG_Z_DEFAULT_COMPRESSION (-1)
-+#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-+#define PNG_Z_DEFAULT_STRATEGY 1
-+#define PNG_sCAL_PRECISION 5
-+#define PNG_sRGB_PROFILE_CHECKS 2
-+/* end of settings */
- #endif /* PNGLCONF_H */
---- ./jdk/src/share/native/sun/awt/libpng/pngmem.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngmem.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -48,457 +48,23 @@
- #include "pngpriv.h"
-
- #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-+/* Free a png_struct */
-+void /* PRIVATE */
-+png_destroy_png_struct(png_structrp png_ptr)
-+{
-+ if (png_ptr != NULL)
-+ {
-+ /* png_free might call png_error and may certainly call
-+ * png_get_mem_ptr, so fake a temporary png_struct to support this.
-+ */
-+ png_struct dummy_struct = *png_ptr;
-+ memset(png_ptr, 0, (sizeof *png_ptr));
-+ png_free(&dummy_struct, png_ptr);
-
--/* Borland DOS special memory handler */
--#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
--/* If you change this, be sure to change the one in png.h also */
--
--/* Allocate memory for a png_struct. The malloc and memset can be replaced
-- by a single call to calloc() if this is thought to improve performance. */
--PNG_FUNCTION(png_voidp /* PRIVATE */,
--png_create_struct,(int type),PNG_ALLOCATED)
--{
--# ifdef PNG_USER_MEM_SUPPORTED
-- return (png_create_struct_2(type, NULL, NULL));
--}
--
--/* Alternate version of png_create_struct, for use with user-defined malloc. */
--PNG_FUNCTION(png_voidp /* PRIVATE */,
--png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-- PNG_ALLOCATED)
--{
--# endif /* PNG_USER_MEM_SUPPORTED */
-- png_size_t size;
-- png_voidp struct_ptr;
--
-- if (type == PNG_STRUCT_INFO)
-- size = png_sizeof(png_info);
--
-- else if (type == PNG_STRUCT_PNG)
-- size = png_sizeof(png_struct);
--
-- else
-- return (png_get_copyright(NULL));
--
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (malloc_fn != NULL)
-- {
-- png_struct dummy_struct;
-- png_structp png_ptr = &dummy_struct;
-- png_ptr->mem_ptr=mem_ptr;
-- struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
-- }
--
-- else
--# endif /* PNG_USER_MEM_SUPPORTED */
-- struct_ptr = (png_voidp)farmalloc(size);
-- if (struct_ptr != NULL)
-- png_memset(struct_ptr, 0, size);
--
-- return (struct_ptr);
--}
--
--/* Free memory allocated by a png_create_struct() call */
--void /* PRIVATE */
--png_destroy_struct(png_voidp struct_ptr)
--{
--# ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2(struct_ptr, NULL, NULL);
--}
--
--/* Free memory allocated by a png_create_struct() call */
--void /* PRIVATE */
--png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-- png_voidp mem_ptr)
--{
--# endif
-- if (struct_ptr != NULL)
-- {
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (free_fn != NULL)
-- {
-- png_struct dummy_struct;
-- png_structp png_ptr = &dummy_struct;
-- png_ptr->mem_ptr=mem_ptr;
-- (*(free_fn))(png_ptr, struct_ptr);
-- return;
-- }
--
--# endif /* PNG_USER_MEM_SUPPORTED */
-- farfree (struct_ptr);
-- }
--}
--
--/* Allocate memory. For reasonable files, size should never exceed
-- * 64K. However, zlib may allocate more then 64K if you don't tell
-- * it not to. See zconf.h and png.h for more information. zlib does
-- * need to allocate exactly 64K, so whatever you call here must
-- * have the ability to do that.
-- *
-- * Borland seems to have a problem in DOS mode for exactly 64K.
-- * It gives you a segment with an offset of 8 (perhaps to store its
-- * memory stuff). zlib doesn't like this at all, so we have to
-- * detect and deal with it. This code should not be needed in
-- * Windows or OS/2 modes, and only in 16 bit mode. This code has
-- * been updated by Alexander Lehmann for version 0.89 to waste less
-- * memory.
-- *
-- * Note that we can't use png_size_t for the "size" declaration,
-- * since on some systems a png_size_t is a 16-bit quantity, and as a
-- * result, we would be truncating potentially larger memory requests
-- * (which should cause a fatal error) and introducing major problems.
-- */
--PNG_FUNCTION(png_voidp,PNGAPI
--png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
--{
-- png_voidp ret;
--
-- ret = (png_malloc(png_ptr, size));
--
-- if (ret != NULL)
-- png_memset(ret,0,(png_size_t)size);
--
-- return (ret);
--}
--
--PNG_FUNCTION(png_voidp,PNGAPI
--png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
--{
-- png_voidp ret;
--
-- if (png_ptr == NULL || size == 0)
-- return (NULL);
--
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (png_ptr->malloc_fn != NULL)
-- ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
--
-- else
-- ret = (png_malloc_default(png_ptr, size));
--
-- if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out of memory");
--
-- return (ret);
--}
--
--PNG_FUNCTION(png_voidp,PNGAPI
--png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
--{
-- png_voidp ret;
--# endif /* PNG_USER_MEM_SUPPORTED */
--
-- if (png_ptr == NULL || size == 0)
-- return (NULL);
--
--# ifdef PNG_MAX_MALLOC_64K
-- if (size > (png_uint_32)65536L)
-- {
-- png_warning(png_ptr, "Cannot Allocate > 64K");
-- ret = NULL;
-- }
--
-- else
--# endif
--
-- if (size != (size_t)size)
-- ret = NULL;
--
-- else if (size == (png_uint_32)65536L)
-- {
-- if (png_ptr->offset_table == NULL)
-- {
-- /* Try to see if we need to do any of this fancy stuff */
-- ret = farmalloc(size);
-- if (ret == NULL || ((png_size_t)ret & 0xffff))
-- {
-- int num_blocks;
-- png_uint_32 total_size;
-- png_bytep table;
-- int i, mem_level, window_bits;
-- png_byte huge * hptr;
-- int window_bits
--
-- if (ret != NULL)
-- {
-- farfree(ret);
-- ret = NULL;
-- }
--
-- window_bits =
-- png_ptr->zlib_window_bits >= png_ptr->zlib_text_window_bits ?
-- png_ptr->zlib_window_bits : png_ptr->zlib_text_window_bits;
--
-- if (window_bits > 14)
-- num_blocks = (int)(1 << (window_bits - 14));
--
-- else
-- num_blocks = 1;
--
-- mem_level =
-- png_ptr->zlib_mem_level >= png_ptr->zlib_text_mem_level ?
-- png_ptr->zlib_mem_level : png_ptr->zlib_text_mem_level;
--
-- if (mem_level >= 7)
-- num_blocks += (int)(1 << (mem_level - 7));
--
-- else
-- num_blocks++;
--
-- total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
--
-- table = farmalloc(total_size);
--
-- if (table == NULL)
-- {
--# ifndef PNG_USER_MEM_SUPPORTED
-- if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */
--
-- else
-- png_warning(png_ptr, "Out Of Memory");
--# endif
-- return (NULL);
-- }
--
-- if ((png_size_t)table & 0xfff0)
-- {
--# ifndef PNG_USER_MEM_SUPPORTED
-- if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr,
-- "Farmalloc didn't return normalized pointer");
--
-- else
-- png_warning(png_ptr,
-- "Farmalloc didn't return normalized pointer");
--# endif
-- return (NULL);
-- }
--
-- png_ptr->offset_table = table;
-- png_ptr->offset_table_ptr = farmalloc(num_blocks *
-- png_sizeof(png_bytep));
--
-- if (png_ptr->offset_table_ptr == NULL)
-- {
--# ifndef PNG_USER_MEM_SUPPORTED
-- if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */
--
-- else
-- png_warning(png_ptr, "Out Of memory");
--# endif
-- return (NULL);
-- }
--
-- hptr = (png_byte huge *)table;
-- if ((png_size_t)hptr & 0xf)
-- {
-- hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
-- hptr = hptr + 16L; /* "hptr += 16L" fails on Turbo C++ 3.0 */
-- }
--
-- for (i = 0; i < num_blocks; i++)
-- {
-- png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
-- hptr = hptr + (png_uint_32)65536L; /* "+=" fails on TC++3.0 */
-- }
--
-- png_ptr->offset_table_number = num_blocks;
-- png_ptr->offset_table_count = 0;
-- png_ptr->offset_table_count_free = 0;
-- }
-- }
--
-- if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
-- {
--# ifndef PNG_USER_MEM_SUPPORTED
-- if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out of Memory"); /* Note "O" and "M" */
--
-- else
-- png_warning(png_ptr, "Out of Memory");
--# endif
-- return (NULL);
-- }
--
-- ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
-- }
--
-- else
-- ret = farmalloc(size);
--
--# ifndef PNG_USER_MEM_SUPPORTED
-- if (ret == NULL)
-- {
-- if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out of memory"); /* Note "o" and "m" */
--
-- else
-- png_warning(png_ptr, "Out of memory"); /* Note "o" and "m" */
-- }
--# endif
--
-- return (ret);
--}
--
--/* Free a pointer allocated by png_malloc(). In the default
-- * configuration, png_ptr is not used, but is passed in case it
-- * is needed. If ptr is NULL, return without taking any action.
-- */
--void PNGAPI
--png_free(png_structp png_ptr, png_voidp ptr)
--{
-- if (png_ptr == NULL || ptr == NULL)
-- return;
--
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (png_ptr->free_fn != NULL)
-- {
-- (*(png_ptr->free_fn))(png_ptr, ptr);
-- return;
-- }
--
-- else
-- png_free_default(png_ptr, ptr);
--}
--
--void PNGAPI
--png_free_default(png_structp png_ptr, png_voidp ptr)
--{
--# endif /* PNG_USER_MEM_SUPPORTED */
--
-- if (png_ptr == NULL || ptr == NULL)
-- return;
--
-- if (png_ptr->offset_table != NULL)
-- {
-- int i;
--
-- for (i = 0; i < png_ptr->offset_table_count; i++)
-- {
-- if (ptr == png_ptr->offset_table_ptr[i])
-- {
-- ptr = NULL;
-- png_ptr->offset_table_count_free++;
-- break;
-- }
-- }
-- if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
-- {
-- farfree(png_ptr->offset_table);
-- farfree(png_ptr->offset_table_ptr);
-- png_ptr->offset_table = NULL;
-- png_ptr->offset_table_ptr = NULL;
-- }
-- }
--
-- if (ptr != NULL)
-- farfree(ptr);
--}
--
--#else /* Not the Borland DOS special memory handler */
--
--/* Allocate memory for a png_struct or a png_info. The malloc and
-- memset can be replaced by a single call to calloc() if this is thought
-- to improve performance noticably. */
--PNG_FUNCTION(png_voidp /* PRIVATE */,
--png_create_struct,(int type),PNG_ALLOCATED)
--{
--# ifdef PNG_USER_MEM_SUPPORTED
-- return (png_create_struct_2(type, NULL, NULL));
--}
--
--/* Allocate memory for a png_struct or a png_info. The malloc and
-- memset can be replaced by a single call to calloc() if this is thought
-- to improve performance noticably. */
--PNG_FUNCTION(png_voidp /* PRIVATE */,
--png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-- PNG_ALLOCATED)
--{
--# endif /* PNG_USER_MEM_SUPPORTED */
-- png_size_t size;
-- png_voidp struct_ptr;
--
-- if (type == PNG_STRUCT_INFO)
-- size = png_sizeof(png_info);
--
-- else if (type == PNG_STRUCT_PNG)
-- size = png_sizeof(png_struct);
--
-- else
-- return (NULL);
--
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (malloc_fn != NULL)
-- {
-- png_struct dummy_struct;
-- png_structp png_ptr = &dummy_struct;
-- png_ptr->mem_ptr=mem_ptr;
-- struct_ptr = (*(malloc_fn))(png_ptr, size);
--
-- if (struct_ptr != NULL)
-- png_memset(struct_ptr, 0, size);
--
-- return (struct_ptr);
-- }
--# endif /* PNG_USER_MEM_SUPPORTED */
--
--# if defined(__TURBOC__) && !defined(__FLAT__)
-- struct_ptr = (png_voidp)farmalloc(size);
--# else
--# if defined(_MSC_VER) && defined(MAXSEG_64K)
-- struct_ptr = (png_voidp)halloc(size, 1);
--# else
-- struct_ptr = (png_voidp)malloc(size);
--# endif
--# endif
--
-- if (struct_ptr != NULL)
-- png_memset(struct_ptr, 0, size);
--
-- return (struct_ptr);
--}
--
--
--/* Free memory allocated by a png_create_struct() call */
--void /* PRIVATE */
--png_destroy_struct(png_voidp struct_ptr)
--{
--# ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2(struct_ptr, NULL, NULL);
--}
--
--/* Free memory allocated by a png_create_struct() call */
--void /* PRIVATE */
--png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-- png_voidp mem_ptr)
--{
--# endif /* PNG_USER_MEM_SUPPORTED */
-- if (struct_ptr != NULL)
-- {
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (free_fn != NULL)
-- {
-- png_struct dummy_struct;
-- png_structp png_ptr = &dummy_struct;
-- png_ptr->mem_ptr=mem_ptr;
-- (*(free_fn))(png_ptr, struct_ptr);
-- return;
-- }
--# endif /* PNG_USER_MEM_SUPPORTED */
--# if defined(__TURBOC__) && !defined(__FLAT__)
-- farfree(struct_ptr);
--
--# else
--# if defined(_MSC_VER) && defined(MAXSEG_64K)
-- hfree(struct_ptr);
--
--# else
-- free(struct_ptr);
--
--# endif
--# endif
-+# ifdef PNG_SETJMP_SUPPORTED
-+ /* We may have a jmp_buf left to deallocate. */
-+ png_free_jmpbuf(&dummy_struct);
-+# endif
- }
- }
-
-@@ -508,167 +74,215 @@
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- */
--
- PNG_FUNCTION(png_voidp,PNGAPI
--png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-+png_calloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
- {
- png_voidp ret;
-
-- ret = (png_malloc(png_ptr, size));
-+ ret = png_malloc(png_ptr, size);
-
- if (ret != NULL)
-- png_memset(ret,0,(png_size_t)size);
-+ memset(ret, 0, size);
-
-- return (ret);
-+ return ret;
- }
-
-+/* png_malloc_base, an internal function added at libpng 1.6.0, does the work of
-+ * allocating memory, taking into account limits and PNG_USER_MEM_SUPPORTED.
-+ * Checking and error handling must happen outside this routine; it returns NULL
-+ * if the allocation cannot be done (for any reason.)
-+ */
-+PNG_FUNCTION(png_voidp /* PRIVATE */,
-+png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),
-+ PNG_ALLOCATED)
-+{
-+ /* Moved to png_malloc_base from png_malloc_default in 1.6.0; the DOS
-+ * allocators have also been removed in 1.6.0, so any 16-bit system now has
-+ * to implement a user memory handler. This checks to be sure it isn't
-+ * called with big numbers.
-+ */
-+#ifndef PNG_USER_MEM_SUPPORTED
-+ PNG_UNUSED(png_ptr)
-+#endif
-+
-+ if (size > 0 && size <= PNG_SIZE_MAX
-+# ifdef PNG_MAX_MALLOC_64K
-+ && size <= 65536U
-+# endif
-+ )
-+ {
-+#ifdef PNG_USER_MEM_SUPPORTED
-+ if (png_ptr != NULL && png_ptr->malloc_fn != NULL)
-+ return png_ptr->malloc_fn(png_constcast(png_structrp,png_ptr), size);
-+
-+ else
-+#endif
-+ return malloc((size_t)size); /* checked for truncation above */
-+ }
-+
-+ else
-+ return NULL;
-+}
-+
-+#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
-+ defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
-+/* This is really here only to work round a spurious warning in GCC 4.6 and 4.7
-+ * that arises because of the checks in png_realloc_array that are repeated in
-+ * png_malloc_array.
-+ */
-+static png_voidp
-+png_malloc_array_checked(png_const_structrp png_ptr, int nelements,
-+ size_t element_size)
-+{
-+ png_alloc_size_t req = nelements; /* known to be > 0 */
-+
-+ if (req <= PNG_SIZE_MAX/element_size)
-+ return png_malloc_base(png_ptr, req * element_size);
-+
-+ /* The failure case when the request is too large */
-+ return NULL;
-+}
-+
-+PNG_FUNCTION(png_voidp /* PRIVATE */,
-+png_malloc_array,(png_const_structrp png_ptr, int nelements,
-+ size_t element_size),PNG_ALLOCATED)
-+{
-+ if (nelements <= 0 || element_size == 0)
-+ png_error(png_ptr, "internal error: array alloc");
-+
-+ return png_malloc_array_checked(png_ptr, nelements, element_size);
-+}
-+
-+PNG_FUNCTION(png_voidp /* PRIVATE */,
-+png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,
-+ int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)
-+{
-+ /* These are internal errors: */
-+ if (add_elements <= 0 || element_size == 0 || old_elements < 0 ||
-+ (old_array == NULL && old_elements > 0))
-+ png_error(png_ptr, "internal error: array realloc");
-+
-+ /* Check for overflow on the elements count (so the caller does not have to
-+ * check.)
-+ */
-+ if (add_elements <= INT_MAX - old_elements)
-+ {
-+ png_voidp new_array = png_malloc_array_checked(png_ptr,
-+ old_elements+add_elements, element_size);
-+
-+ if (new_array != NULL)
-+ {
-+ /* Because png_malloc_array worked the size calculations below cannot
-+ * overflow.
-+ */
-+ if (old_elements > 0)
-+ memcpy(new_array, old_array, element_size*(unsigned)old_elements);
-+
-+ memset((char*)new_array + element_size*(unsigned)old_elements, 0,
-+ element_size*(unsigned)add_elements);
-+
-+ return new_array;
-+ }
-+ }
-+
-+ return NULL; /* error */
-+}
-+#endif /* TEXT || sPLT || STORE_UNKNOWN_CHUNKS */
-+
-+/* Various functions that have different error handling are derived from this.
-+ * png_malloc always exists, but if PNG_USER_MEM_SUPPORTED is defined a separate
-+ * function png_malloc_default is also provided.
-+ */
- PNG_FUNCTION(png_voidp,PNGAPI
--png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-+png_malloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
- {
- png_voidp ret;
-
--# ifdef PNG_USER_MEM_SUPPORTED
-- if (png_ptr == NULL || size == 0)
-- return (NULL);
-+ if (png_ptr == NULL)
-+ return NULL;
-
-- if (png_ptr->malloc_fn != NULL)
-- ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-+ ret = png_malloc_base(png_ptr, size);
-
-- else
-- ret = (png_malloc_default(png_ptr, size));
-+ if (ret == NULL)
-+ png_error(png_ptr, "Out of memory"); /* 'm' means png_malloc */
-
-- if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out of Memory");
--
-- return (ret);
-+ return ret;
- }
-
-+#ifdef PNG_USER_MEM_SUPPORTED
- PNG_FUNCTION(png_voidp,PNGAPI
--png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-+png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size),
-+ PNG_ALLOCATED PNG_DEPRECATED)
- {
- png_voidp ret;
--# endif /* PNG_USER_MEM_SUPPORTED */
-
-- if (png_ptr == NULL || size == 0)
-- return (NULL);
-+ if (png_ptr == NULL)
-+ return NULL;
-
--# ifdef PNG_MAX_MALLOC_64K
-- if (size > (png_uint_32)65536L)
-+ /* Passing 'NULL' here bypasses the application provided memory handler. */
-+ ret = png_malloc_base(NULL/*use malloc*/, size);
-+
-+ if (ret == NULL)
-+ png_error(png_ptr, "Out of Memory"); /* 'M' means png_malloc_default */
-+
-+ return ret;
-+}
-+#endif /* USER_MEM */
-+
-+/* This function was added at libpng version 1.2.3. The png_malloc_warn()
-+ * function will issue a png_warning and return NULL instead of issuing a
-+ * png_error, if it fails to allocate the requested memory.
-+ */
-+PNG_FUNCTION(png_voidp,PNGAPI
-+png_malloc_warn,(png_const_structrp png_ptr, png_alloc_size_t size),
-+ PNG_ALLOCATED)
-+{
-+ if (png_ptr != NULL)
- {
--# ifndef PNG_USER_MEM_SUPPORTED
-- if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Cannot Allocate > 64K");
-+ png_voidp ret = png_malloc_base(png_ptr, size);
-
-- else
--# endif
-- return NULL;
-+ if (ret != NULL)
-+ return ret;
-+
-+ png_warning(png_ptr, "Out of memory");
- }
--# endif
-
-- /* Check for overflow */
--# if defined(__TURBOC__) && !defined(__FLAT__)
--
-- if (size != (unsigned long)size)
-- ret = NULL;
--
-- else
-- ret = farmalloc(size);
--
--# else
--# if defined(_MSC_VER) && defined(MAXSEG_64K)
-- if (size != (unsigned long)size)
-- ret = NULL;
--
-- else
-- ret = halloc(size, 1);
--
--# else
-- if (size != (size_t)size)
-- ret = NULL;
--
-- else
-- ret = malloc((size_t)size);
--# endif
--# endif
--
--# ifndef PNG_USER_MEM_SUPPORTED
-- if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-- png_error(png_ptr, "Out of Memory");
--# endif
--
-- return (ret);
-+ return NULL;
- }
-
- /* Free a pointer allocated by png_malloc(). If ptr is NULL, return
- * without taking any action.
- */
- void PNGAPI
--png_free(png_structp png_ptr, png_voidp ptr)
-+png_free(png_const_structrp png_ptr, png_voidp ptr)
- {
- if (png_ptr == NULL || ptr == NULL)
- return;
-
--# ifdef PNG_USER_MEM_SUPPORTED
-+#ifdef PNG_USER_MEM_SUPPORTED
- if (png_ptr->free_fn != NULL)
-- {
-- (*(png_ptr->free_fn))(png_ptr, ptr);
-- return;
-- }
-+ png_ptr->free_fn(png_constcast(png_structrp,png_ptr), ptr);
-
- else
- png_free_default(png_ptr, ptr);
- }
-
--void PNGAPI
--png_free_default(png_structp png_ptr, png_voidp ptr)
-+PNG_FUNCTION(void,PNGAPI
-+png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)
- {
- if (png_ptr == NULL || ptr == NULL)
- return;
-+#endif /* USER_MEM */
-
--# endif /* PNG_USER_MEM_SUPPORTED */
--
--# if defined(__TURBOC__) && !defined(__FLAT__)
-- farfree(ptr);
--
--# else
--# if defined(_MSC_VER) && defined(MAXSEG_64K)
-- hfree(ptr);
--
--# else
- free(ptr);
--
--# endif
--# endif
- }
--#endif /* Not Borland DOS special memory handler */
--
--/* This function was added at libpng version 1.2.3. The png_malloc_warn()
-- * function will set up png_malloc() to issue a png_warning and return NULL
-- * instead of issuing a png_error, if it fails to allocate the requested
-- * memory.
-- */
--PNG_FUNCTION(png_voidp,PNGAPI
--png_malloc_warn,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
--{
-- png_voidp ptr;
-- png_uint_32 save_flags;
-- if (png_ptr == NULL)
-- return (NULL);
--
-- save_flags = png_ptr->flags;
-- png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-- ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
-- png_ptr->flags=save_flags;
-- return(ptr);
--}
--
-
- #ifdef PNG_USER_MEM_SUPPORTED
- /* This function is called when the application wants to use another method
- * of allocating and freeing memory.
- */
- void PNGAPI
--png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
-+png_set_mem_fn(png_structrp png_ptr, png_voidp mem_ptr, png_malloc_ptr
- malloc_fn, png_free_ptr free_fn)
- {
- if (png_ptr != NULL)
-@@ -684,12 +298,12 @@
- * pointer before png_write_destroy and png_read_destroy are called.
- */
- png_voidp PNGAPI
--png_get_mem_ptr(png_const_structp png_ptr)
-+png_get_mem_ptr(png_const_structrp png_ptr)
- {
- if (png_ptr == NULL)
-- return (NULL);
-+ return NULL;
-
-- return ((png_voidp)png_ptr->mem_ptr);
-+ return png_ptr->mem_ptr;
- }
--#endif /* PNG_USER_MEM_SUPPORTED */
--#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
-+#endif /* USER_MEM */
-+#endif /* READ || WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngpread.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngpread.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.2 [March 31, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -54,8 +54,15 @@
- #define PNG_READ_iTXt_MODE 7
- #define PNG_ERROR_MODE 8
-
-+#define PNG_PUSH_SAVE_BUFFER_IF_FULL \
-+if (png_ptr->push_length + 4 > png_ptr->buffer_size) \
-+ { png_push_save_buffer(png_ptr); return; }
-+#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \
-+if (png_ptr->buffer_size < N) \
-+ { png_push_save_buffer(png_ptr); return; }
-+
- void PNGAPI
--png_process_data(png_structp png_ptr, png_infop info_ptr,
-+png_process_data(png_structrp png_ptr, png_inforp info_ptr,
- png_bytep buffer, png_size_t buffer_size)
- {
- if (png_ptr == NULL || info_ptr == NULL)
-@@ -70,14 +77,14 @@
- }
-
- png_size_t PNGAPI
--png_process_data_pause(png_structp png_ptr, int save)
-+png_process_data_pause(png_structrp png_ptr, int save)
- {
- if (png_ptr != NULL)
- {
-- /* It's easiest for the caller if we do the save, then the caller doesn't
-+ /* It's easiest for the caller if we do the save; then the caller doesn't
- * have to supply the same data again:
- */
-- if (save)
-+ if (save != 0)
- png_push_save_buffer(png_ptr);
- else
- {
-@@ -97,7 +104,7 @@
- }
-
- png_uint_32 PNGAPI
--png_process_data_skip(png_structp png_ptr)
-+png_process_data_skip(png_structrp png_ptr)
- {
- png_uint_32 remaining = 0;
-
-@@ -131,7 +138,7 @@
- * doing before we ran out of data...
- */
- void /* PRIVATE */
--png_process_some_data(png_structp png_ptr, png_infop info_ptr)
-+png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)
- {
- if (png_ptr == NULL)
- return;
-@@ -156,30 +163,6 @@
- break;
- }
-
--#ifdef PNG_READ_tEXt_SUPPORTED
-- case PNG_READ_tEXt_MODE:
-- {
-- png_push_read_tEXt(png_ptr, info_ptr);
-- break;
-- }
--
--#endif
--#ifdef PNG_READ_zTXt_SUPPORTED
-- case PNG_READ_zTXt_MODE:
-- {
-- png_push_read_zTXt(png_ptr, info_ptr);
-- break;
-- }
--
--#endif
--#ifdef PNG_READ_iTXt_SUPPORTED
-- case PNG_READ_iTXt_MODE:
-- {
-- png_push_read_iTXt(png_ptr, info_ptr);
-- break;
-- }
--
--#endif
- case PNG_SKIP_MODE:
- {
- png_push_crc_finish(png_ptr);
-@@ -201,9 +184,9 @@
- * routine.
- */
- void /* PRIVATE */
--png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
-+png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
- {
-- png_size_t num_checked = png_ptr->sig_bytes,
-+ png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */
- num_to_check = 8 - num_checked;
-
- if (png_ptr->buffer_size < num_to_check)
-@@ -234,114 +217,75 @@
- }
-
- void /* PRIVATE */
--png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
-+png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
- {
-- PNG_IHDR;
-- PNG_IDAT;
-- PNG_IEND;
-- PNG_PLTE;
--#ifdef PNG_READ_bKGD_SUPPORTED
-- PNG_bKGD;
--#endif
--#ifdef PNG_READ_cHRM_SUPPORTED
-- PNG_cHRM;
--#endif
--#ifdef PNG_READ_gAMA_SUPPORTED
-- PNG_gAMA;
--#endif
--#ifdef PNG_READ_hIST_SUPPORTED
-- PNG_hIST;
--#endif
--#ifdef PNG_READ_iCCP_SUPPORTED
-- PNG_iCCP;
--#endif
--#ifdef PNG_READ_iTXt_SUPPORTED
-- PNG_iTXt;
--#endif
--#ifdef PNG_READ_oFFs_SUPPORTED
-- PNG_oFFs;
--#endif
--#ifdef PNG_READ_pCAL_SUPPORTED
-- PNG_pCAL;
--#endif
--#ifdef PNG_READ_pHYs_SUPPORTED
-- PNG_pHYs;
--#endif
--#ifdef PNG_READ_sBIT_SUPPORTED
-- PNG_sBIT;
--#endif
--#ifdef PNG_READ_sCAL_SUPPORTED
-- PNG_sCAL;
--#endif
--#ifdef PNG_READ_sRGB_SUPPORTED
-- PNG_sRGB;
--#endif
--#ifdef PNG_READ_sPLT_SUPPORTED
-- PNG_sPLT;
--#endif
--#ifdef PNG_READ_tEXt_SUPPORTED
-- PNG_tEXt;
--#endif
--#ifdef PNG_READ_tIME_SUPPORTED
-- PNG_tIME;
--#endif
--#ifdef PNG_READ_tRNS_SUPPORTED
-- PNG_tRNS;
--#endif
--#ifdef PNG_READ_zTXt_SUPPORTED
-- PNG_zTXt;
-+ png_uint_32 chunk_name;
-+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+ int keep; /* unknown handling method */
- #endif
-
-- /* First we make sure we have enough data for the 4 byte chunk name
-- * and the 4 byte chunk length before proceeding with decoding the
-+ /* First we make sure we have enough data for the 4-byte chunk name
-+ * and the 4-byte chunk length before proceeding with decoding the
- * chunk data. To fully decode each of these chunks, we also make
-- * sure we have enough data in the buffer for the 4 byte CRC at the
-+ * sure we have enough data in the buffer for the 4-byte CRC at the
- * end of every chunk (except IDAT, which is handled separately).
- */
-- if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-+ if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
- {
- png_byte chunk_length[4];
-+ png_byte chunk_tag[4];
-
-- if (png_ptr->buffer_size < 8)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_LT(8)
- png_push_fill_buffer(png_ptr, chunk_length, 4);
- png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
- png_reset_crc(png_ptr);
-- png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-+ png_crc_read(png_ptr, chunk_tag, 4);
-+ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
- png_check_chunk_name(png_ptr, png_ptr->chunk_name);
- png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
- }
-
-- if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-- if (png_ptr->mode & PNG_AFTER_IDAT)
-+ chunk_name = png_ptr->chunk_name;
-+
-+ if (chunk_name == png_IDAT)
-+ {
-+ if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
- png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-
-- if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
-+ /* If we reach an IDAT chunk, this means we have read all of the
-+ * header chunks, and we can start reading the image (or if this
-+ * is called after the image has been read - we have an error).
-+ */
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_error(png_ptr, "Missing IHDR before IDAT");
-+
-+ else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-+ (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-+ png_error(png_ptr, "Missing PLTE before IDAT");
-+
-+ png_ptr->mode |= PNG_HAVE_IDAT;
-+ png_ptr->process_mode = PNG_READ_IDAT_MODE;
-+
-+ if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
-+ if (png_ptr->push_length == 0)
-+ return;
-+
-+ if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-+ png_benign_error(png_ptr, "Too many IDATs found");
-+ }
-+
-+ if (chunk_name == png_IHDR)
- {
- if (png_ptr->push_length != 13)
- png_error(png_ptr, "Invalid IHDR length");
-
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
- }
-
-- else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
-+ else if (chunk_name == png_IEND)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
-
- png_ptr->process_mode = PNG_READ_DONE_MODE;
-@@ -349,70 +293,25 @@
- }
-
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
-+ else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
-+ png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, keep);
-
-- if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-- png_ptr->mode |= PNG_HAVE_IDAT;
-+ if (chunk_name == png_PLTE)
-+ png_ptr->mode |= PNG_HAVE_PLTE;
-+ }
-+#endif
-
-- png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
--
-- if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
-- png_ptr->mode |= PNG_HAVE_PLTE;
--
-- else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-- {
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before IDAT");
--
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-- !(png_ptr->mode & PNG_HAVE_PLTE))
-- png_error(png_ptr, "Missing PLTE before IDAT");
-- }
-- }
--
--#endif
-- else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
-+ else if (chunk_name == png_PLTE)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
- }
-
-- else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-+ else if (chunk_name == png_IDAT)
- {
-- /* If we reach an IDAT chunk, this means we have read all of the
-- * header chunks, and we can start reading the image (or if this
-- * is called after the image has been read - we have an error).
-- */
--
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before IDAT");
--
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-- !(png_ptr->mode & PNG_HAVE_PLTE))
-- png_error(png_ptr, "Missing PLTE before IDAT");
--
-- if (png_ptr->mode & PNG_HAVE_IDAT)
-- {
-- if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-- if (png_ptr->push_length == 0)
-- return;
--
-- if (png_ptr->mode & PNG_AFTER_IDAT)
-- png_benign_error(png_ptr, "Too many IDATs found");
-- }
--
- png_ptr->idat_size = png_ptr->push_length;
-- png_ptr->mode |= PNG_HAVE_IDAT;
- png_ptr->process_mode = PNG_READ_IDAT_MODE;
- png_push_have_info(png_ptr, info_ptr);
- png_ptr->zstream.avail_out =
-@@ -423,250 +322,162 @@
- }
-
- #ifdef PNG_READ_gAMA_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
-+ else if (png_ptr->chunk_name == png_gAMA)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_sBIT_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
-+ else if (png_ptr->chunk_name == png_sBIT)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_cHRM_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
-+ else if (png_ptr->chunk_name == png_cHRM)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_sRGB_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
-+ else if (chunk_name == png_sRGB)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_iCCP_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
-+ else if (png_ptr->chunk_name == png_iCCP)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_sPLT_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
-+ else if (chunk_name == png_sPLT)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_tRNS_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
-+ else if (chunk_name == png_tRNS)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_bKGD_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
-+ else if (chunk_name == png_bKGD)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_hIST_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
-+ else if (chunk_name == png_hIST)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_pHYs_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
-+ else if (chunk_name == png_pHYs)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_oFFs_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
-+ else if (chunk_name == png_oFFs)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
- }
- #endif
-
- #ifdef PNG_READ_pCAL_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
-+ else if (chunk_name == png_pCAL)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_sCAL_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
-+ else if (chunk_name == png_sCAL)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_tIME_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
-+ else if (chunk_name == png_tIME)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
- png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_tEXt_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
-+ else if (chunk_name == png_tEXt)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-- png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
-+ png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_zTXt_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
-+ else if (chunk_name == png_zTXt)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-- png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
-+ png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
- }
-
- #endif
- #ifdef PNG_READ_iTXt_SUPPORTED
-- else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
-+ else if (chunk_name == png_iTXt)
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
-+ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-+ }
-+#endif
-
-- png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-- }
--
--#endif
- else
- {
-- if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
-- png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
-+ PNG_PUSH_SAVE_BUFFER_IF_FULL
-+ png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
-+ PNG_HANDLE_CHUNK_AS_DEFAULT);
- }
-
- png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- }
-
- void /* PRIVATE */
--png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
-+png_push_crc_skip(png_structrp png_ptr, png_uint_32 skip)
- {
- png_ptr->process_mode = PNG_SKIP_MODE;
- png_ptr->skip_length = skip;
- }
-
- void /* PRIVATE */
--png_push_crc_finish(png_structp png_ptr)
-+png_push_crc_finish(png_structrp png_ptr)
- {
-- if (png_ptr->skip_length && png_ptr->save_buffer_size)
-+ if (png_ptr->skip_length != 0 && png_ptr->save_buffer_size != 0)
- {
- png_size_t save_size = png_ptr->save_buffer_size;
- png_uint_32 skip_length = png_ptr->skip_length;
-@@ -690,7 +501,7 @@
- png_ptr->save_buffer_size -= save_size;
- png_ptr->save_buffer_ptr += save_size;
- }
-- if (png_ptr->skip_length && png_ptr->current_buffer_size)
-+ if (png_ptr->skip_length != 0 && png_ptr->current_buffer_size != 0)
- {
- png_size_t save_size = png_ptr->current_buffer_size;
- png_uint_32 skip_length = png_ptr->skip_length;
-@@ -711,14 +522,9 @@
- png_ptr->current_buffer_size -= save_size;
- png_ptr->current_buffer_ptr += save_size;
- }
-- if (!png_ptr->skip_length)
-+ if (png_ptr->skip_length == 0)
- {
-- if (png_ptr->buffer_size < 4)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_LT(4)
- png_crc_finish(png_ptr, 0);
- png_ptr->process_mode = PNG_READ_CHUNK_MODE;
- }
-@@ -733,7 +539,7 @@
- return;
-
- ptr = buffer;
-- if (png_ptr->save_buffer_size)
-+ if (png_ptr->save_buffer_size != 0)
- {
- png_size_t save_size;
-
-@@ -743,14 +549,14 @@
- else
- save_size = png_ptr->save_buffer_size;
-
-- png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
-+ memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
- length -= save_size;
- ptr += save_size;
- png_ptr->buffer_size -= save_size;
- png_ptr->save_buffer_size -= save_size;
- png_ptr->save_buffer_ptr += save_size;
- }
-- if (length && png_ptr->current_buffer_size)
-+ if (length != 0 && png_ptr->current_buffer_size != 0)
- {
- png_size_t save_size;
-
-@@ -760,7 +566,7 @@
- else
- save_size = png_ptr->current_buffer_size;
-
-- png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
-+ memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
- png_ptr->buffer_size -= save_size;
- png_ptr->current_buffer_size -= save_size;
- png_ptr->current_buffer_ptr += save_size;
-@@ -768,9 +574,9 @@
- }
-
- void /* PRIVATE */
--png_push_save_buffer(png_structp png_ptr)
-+png_push_save_buffer(png_structrp png_ptr)
- {
-- if (png_ptr->save_buffer_size)
-+ if (png_ptr->save_buffer_size != 0)
- {
- if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
- {
-@@ -806,16 +612,18 @@
- if (png_ptr->save_buffer == NULL)
- {
- png_free(png_ptr, old_buffer);
-+ old_buffer = NULL;
- png_error(png_ptr, "Insufficient memory for save_buffer");
- }
-
-- png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
-+ memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
- png_free(png_ptr, old_buffer);
-+ old_buffer = NULL;
- png_ptr->save_buffer_max = new_max;
- }
- if (png_ptr->current_buffer_size)
- {
-- png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
-+ memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
- png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
- png_ptr->save_buffer_size += png_ptr->current_buffer_size;
- png_ptr->current_buffer_size = 0;
-@@ -825,7 +633,7 @@
- }
-
- void /* PRIVATE */
--png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
-+png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
- png_size_t buffer_length)
- {
- png_ptr->current_buffer = buffer;
-@@ -835,30 +643,27 @@
- }
-
- void /* PRIVATE */
--png_push_read_IDAT(png_structp png_ptr)
-+png_push_read_IDAT(png_structrp png_ptr)
- {
-- PNG_IDAT;
-- if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-+ if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
- {
- png_byte chunk_length[4];
-+ png_byte chunk_tag[4];
-
-- if (png_ptr->buffer_size < 8)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ /* TODO: this code can be commoned up with the same code in push_read */
-+ PNG_PUSH_SAVE_BUFFER_IF_LT(8)
- png_push_fill_buffer(png_ptr, chunk_length, 4);
- png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
- png_reset_crc(png_ptr);
-- png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-+ png_crc_read(png_ptr, chunk_tag, 4);
-+ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
- png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-
-- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-+ if (png_ptr->chunk_name != png_IDAT)
- {
- png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
- png_error(png_ptr, "Not enough compressed data");
-
- return;
-@@ -866,7 +671,8 @@
-
- png_ptr->idat_size = png_ptr->push_length;
- }
-- if (png_ptr->idat_size && png_ptr->save_buffer_size)
-+
-+ if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
- {
- png_size_t save_size = png_ptr->save_buffer_size;
- png_uint_32 idat_size = png_ptr->idat_size;
-@@ -893,7 +699,7 @@
- png_ptr->save_buffer_ptr += save_size;
- }
-
-- if (png_ptr->idat_size && png_ptr->current_buffer_size)
-+ if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)
- {
- png_size_t save_size = png_ptr->current_buffer_size;
- png_uint_32 idat_size = png_ptr->idat_size;
-@@ -918,22 +724,18 @@
- png_ptr->current_buffer_size -= save_size;
- png_ptr->current_buffer_ptr += save_size;
- }
-- if (!png_ptr->idat_size)
-+ if (png_ptr->idat_size == 0)
- {
-- if (png_ptr->buffer_size < 4)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-+ PNG_PUSH_SAVE_BUFFER_IF_LT(4)
- png_crc_finish(png_ptr, 0);
- png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
- png_ptr->mode |= PNG_AFTER_IDAT;
-+ png_ptr->zowner = 0;
- }
- }
-
- void /* PRIVATE */
--png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
-+png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
- png_size_t buffer_length)
- {
- /* The caller checks for a non-zero buffer length. */
-@@ -945,13 +747,14 @@
- * handle the uncompressed results.
- */
- png_ptr->zstream.next_in = buffer;
-+ /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
- png_ptr->zstream.avail_in = (uInt)buffer_length;
-
- /* Keep going until the decompressed data is all processed
- * or the stream marked as finished.
- */
- while (png_ptr->zstream.avail_in > 0 &&
-- !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-+ !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
- {
- int ret;
-
-@@ -962,9 +765,9 @@
- */
- if (!(png_ptr->zstream.avail_out > 0))
- {
-- png_ptr->zstream.avail_out =
-- (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-- png_ptr->iwidth) + 1;
-+ /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
-+ png_ptr->zstream.avail_out = (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
-+ png_ptr->iwidth) + 1);
-
- png_ptr->zstream.next_out = png_ptr->row_buf;
- }
-@@ -982,7 +785,8 @@
- if (ret != Z_OK && ret != Z_STREAM_END)
- {
- /* Terminate the decompression. */
-- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-+ png_ptr->zowner = 0;
-
- /* This may be a truncated stream (missing or
- * damaged end code). Treat that as a warning.
-@@ -1010,7 +814,8 @@
- {
- /* Extra data. */
- png_warning(png_ptr, "Extra compressed data in IDAT");
-- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-+ png_ptr->zowner = 0;
-
- /* Do no more processing; skip the unprocessed
- * input check below.
-@@ -1025,7 +830,7 @@
-
- /* And check for the end of the stream. */
- if (ret == Z_STREAM_END)
-- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
- }
-
- /* All the data should have been processed, if anything
-@@ -1037,41 +842,62 @@
- }
-
- void /* PRIVATE */
--png_push_process_row(png_structp png_ptr)
-+png_push_process_row(png_structrp png_ptr)
- {
-- png_ptr->row_info.color_type = png_ptr->color_type;
-- png_ptr->row_info.width = png_ptr->iwidth;
-- png_ptr->row_info.channels = png_ptr->channels;
-- png_ptr->row_info.bit_depth = png_ptr->bit_depth;
-- png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
-+ /* 1.5.6: row_info moved out of png_struct to a local here. */
-+ png_row_info row_info;
-
-- png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-- png_ptr->row_info.width);
-+ row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
-+ row_info.color_type = png_ptr->color_type;
-+ row_info.bit_depth = png_ptr->bit_depth;
-+ row_info.channels = png_ptr->channels;
-+ row_info.pixel_depth = png_ptr->pixel_depth;
-+ row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-- png_read_filter_row(png_ptr, &(png_ptr->row_info),
-- png_ptr->row_buf + 1, png_ptr->prev_row + 1,
-- (int)(png_ptr->row_buf[0]));
-+ if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
-+ {
-+ if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
-+ png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
-+ png_ptr->prev_row + 1, png_ptr->row_buf[0]);
-+ else
-+ png_error(png_ptr, "bad adaptive filter value");
-+ }
-
-- png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);
-+ /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
-+ * 1.5.6, while the buffer really is this big in current versions of libpng
-+ * it may not be in the future, so this was changed just to copy the
-+ * interlaced row count:
-+ */
-+ memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
-
- #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-- if (png_ptr->transformations)
-- png_do_read_transformations(png_ptr);
-+ if (png_ptr->transformations != 0)
-+ png_do_read_transformations(png_ptr, &row_info);
- #endif
-
-+ /* The transformed pixel depth should match the depth now in row_info. */
-+ if (png_ptr->transformed_pixel_depth == 0)
-+ {
-+ png_ptr->transformed_pixel_depth = row_info.pixel_depth;
-+ if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
-+ png_error(png_ptr, "progressive row overflow");
-+ }
-+
-+ else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
-+ png_error(png_ptr, "internal progressive row size calculation error");
-+
-+
- #ifdef PNG_READ_INTERLACING_SUPPORTED
-- /* Blow up interlaced rows to full size */
-- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-+ /* Expand interlaced rows to full size */
-+ if (png_ptr->interlaced != 0 &&
-+ (png_ptr->transformations & PNG_INTERLACE) != 0)
- {
- if (png_ptr->pass < 6)
--/* old interface (pre-1.0.9):
-- png_do_read_interlace(&(png_ptr->row_info),
-- png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
-- */
-- png_do_read_interlace(png_ptr);
-+ png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
-+ png_ptr->transformations);
-
-- switch (png_ptr->pass)
-- {
-+ switch (png_ptr->pass)
-+ {
- case 0:
- {
- int i;
-@@ -1238,7 +1064,6 @@
- }
- }
- else
--#endif
- {
- png_push_have_row(png_ptr, png_ptr->row_buf + 1);
- png_read_push_finish_row(png_ptr);
-@@ -1246,36 +1071,36 @@
- }
-
- void /* PRIVATE */
--png_read_push_finish_row(png_structp png_ptr)
-+png_read_push_finish_row(png_structrp png_ptr)
- {
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
- /* Start of interlace block */
-- PNG_CONST int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-+ static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-
- /* Offset to next interlace block */
-- PNG_CONST int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-
- /* Start of interlace block in the y direction */
-- PNG_CONST int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-+ static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-
- /* Offset to next interlace block in the y direction */
-- PNG_CONST int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-+ static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-
- /* Height of interlace block. This is not currently used - if you need
- * it, uncomment it here and in png.h
-- PNG_CONST int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
- */
-+#endif
-
- png_ptr->row_number++;
- if (png_ptr->row_number < png_ptr->num_rows)
- return;
-
--#ifdef PNG_READ_INTERLACING_SUPPORTED
-- if (png_ptr->interlaced)
-+ if (png_ptr->interlaced != 0)
- {
- png_ptr->row_number = 0;
-- png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-+ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
- do
- {
-@@ -1296,7 +1121,7 @@
- png_pass_start[png_ptr->pass]) /
- png_pass_inc[png_ptr->pass];
-
-- if (png_ptr->transformations & PNG_INTERLACE)
-+ if ((png_ptr->transformations & PNG_INTERLACE) != 0)
- break;
-
- png_ptr->num_rows = (png_ptr->height +
-@@ -1306,538 +1131,24 @@
-
- } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
- }
--#endif /* PNG_READ_INTERLACING_SUPPORTED */
--}
--
--#ifdef PNG_READ_tEXt_SUPPORTED
--void /* PRIVATE */
--png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-- length)
--{
-- if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-- {
-- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-- png_error(png_ptr, "Out of place tEXt");
-- /* NOT REACHED */
-- }
--
--#ifdef PNG_MAX_MALLOC_64K
-- png_ptr->skip_length = 0; /* This may not be necessary */
--
-- if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
-- {
-- png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-- png_ptr->skip_length = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-- }
--#endif
--
-- png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-- (png_size_t)(length + 1));
-- png_ptr->current_text[length] = '\0';
-- png_ptr->current_text_ptr = png_ptr->current_text;
-- png_ptr->current_text_size = (png_size_t)length;
-- png_ptr->current_text_left = (png_size_t)length;
-- png_ptr->process_mode = PNG_READ_tEXt_MODE;
- }
-
- void /* PRIVATE */
--png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
--{
-- if (png_ptr->buffer_size && png_ptr->current_text_left)
-- {
-- png_size_t text_size;
--
-- if (png_ptr->buffer_size < png_ptr->current_text_left)
-- text_size = png_ptr->buffer_size;
--
-- else
-- text_size = png_ptr->current_text_left;
--
-- png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-- png_ptr->current_text_left -= text_size;
-- png_ptr->current_text_ptr += text_size;
-- }
-- if (!(png_ptr->current_text_left))
-- {
-- png_textp text_ptr;
-- png_charp text;
-- png_charp key;
-- int ret;
--
-- if (png_ptr->buffer_size < 4)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-- png_push_crc_finish(png_ptr);
--
--#ifdef PNG_MAX_MALLOC_64K
-- if (png_ptr->skip_length)
-- return;
--#endif
--
-- key = png_ptr->current_text;
--
-- for (text = key; *text; text++)
-- /* Empty loop */ ;
--
-- if (text < key + png_ptr->current_text_size)
-- text++;
--
-- text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));
-- text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-- text_ptr->key = key;
-- text_ptr->itxt_length = 0;
-- text_ptr->lang = NULL;
-- text_ptr->lang_key = NULL;
-- text_ptr->text = text;
--
-- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
--
-- png_free(png_ptr, key);
-- png_free(png_ptr, text_ptr);
-- png_ptr->current_text = NULL;
--
-- if (ret)
-- png_warning(png_ptr, "Insufficient memory to store text chunk");
-- }
--}
--#endif
--
--#ifdef PNG_READ_zTXt_SUPPORTED
--void /* PRIVATE */
--png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-- length)
--{
-- if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-- {
-- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-- png_error(png_ptr, "Out of place zTXt");
-- /* NOT REACHED */
-- }
--
--#ifdef PNG_MAX_MALLOC_64K
-- /* We can't handle zTXt chunks > 64K, since we don't have enough space
-- * to be able to store the uncompressed data. Actually, the threshold
-- * is probably around 32K, but it isn't as definite as 64K is.
-- */
-- if (length > (png_uint_32)65535L)
-- {
-- png_warning(png_ptr, "zTXt chunk too large to fit in memory");
-- png_push_crc_skip(png_ptr, length);
-- return;
-- }
--#endif
--
-- png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-- (png_size_t)(length + 1));
-- png_ptr->current_text[length] = '\0';
-- png_ptr->current_text_ptr = png_ptr->current_text;
-- png_ptr->current_text_size = (png_size_t)length;
-- png_ptr->current_text_left = (png_size_t)length;
-- png_ptr->process_mode = PNG_READ_zTXt_MODE;
--}
--
--void /* PRIVATE */
--png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
--{
-- if (png_ptr->buffer_size && png_ptr->current_text_left)
-- {
-- png_size_t text_size;
--
-- if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
-- text_size = png_ptr->buffer_size;
--
-- else
-- text_size = png_ptr->current_text_left;
--
-- png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-- png_ptr->current_text_left -= text_size;
-- png_ptr->current_text_ptr += text_size;
-- }
-- if (!(png_ptr->current_text_left))
-- {
-- png_textp text_ptr;
-- png_charp text;
-- png_charp key;
-- int ret;
-- png_size_t text_size, key_size;
--
-- if (png_ptr->buffer_size < 4)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-- png_push_crc_finish(png_ptr);
--
-- key = png_ptr->current_text;
--
-- for (text = key; *text; text++)
-- /* Empty loop */ ;
--
-- /* zTXt can't have zero text */
-- if (text >= key + png_ptr->current_text_size)
-- {
-- png_ptr->current_text = NULL;
-- png_free(png_ptr, key);
-- return;
-- }
--
-- text++;
--
-- if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
-- {
-- png_ptr->current_text = NULL;
-- png_free(png_ptr, key);
-- return;
-- }
--
-- text++;
--
-- png_ptr->zstream.next_in = (png_bytep)text;
-- png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
-- (text - key));
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
--
-- key_size = text - key;
-- text_size = 0;
-- text = NULL;
-- ret = Z_STREAM_END;
--
-- while (png_ptr->zstream.avail_in)
-- {
-- ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-- if (ret != Z_OK && ret != Z_STREAM_END)
-- {
-- inflateReset(&png_ptr->zstream);
-- png_ptr->zstream.avail_in = 0;
-- png_ptr->current_text = NULL;
-- png_free(png_ptr, key);
-- png_free(png_ptr, text);
-- return;
-- }
--
-- if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
-- {
-- if (text == NULL)
-- {
-- text = (png_charp)png_malloc(png_ptr,
-- (png_ptr->zbuf_size
-- - png_ptr->zstream.avail_out + key_size + 1));
--
-- png_memcpy(text + key_size, png_ptr->zbuf,
-- png_ptr->zbuf_size - png_ptr->zstream.avail_out);
--
-- png_memcpy(text, key, key_size);
--
-- text_size = key_size + png_ptr->zbuf_size -
-- png_ptr->zstream.avail_out;
--
-- *(text + text_size) = '\0';
-- }
--
-- else
-- {
-- png_charp tmp;
--
-- tmp = text;
-- text = (png_charp)png_malloc(png_ptr, text_size +
-- (png_ptr->zbuf_size
-- - png_ptr->zstream.avail_out + 1));
--
-- png_memcpy(text, tmp, text_size);
-- png_free(png_ptr, tmp);
--
-- png_memcpy(text + text_size, png_ptr->zbuf,
-- png_ptr->zbuf_size - png_ptr->zstream.avail_out);
--
-- text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
-- *(text + text_size) = '\0';
-- }
--
-- if (ret != Z_STREAM_END)
-- {
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-- }
-- }
-- else
-- {
-- break;
-- }
--
-- if (ret == Z_STREAM_END)
-- break;
-- }
--
-- inflateReset(&png_ptr->zstream);
-- png_ptr->zstream.avail_in = 0;
--
-- if (ret != Z_STREAM_END)
-- {
-- png_ptr->current_text = NULL;
-- png_free(png_ptr, key);
-- png_free(png_ptr, text);
-- return;
-- }
--
-- png_ptr->current_text = NULL;
-- png_free(png_ptr, key);
-- key = text;
-- text += key_size;
--
-- text_ptr = (png_textp)png_malloc(png_ptr,
-- png_sizeof(png_text));
-- text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
-- text_ptr->key = key;
-- text_ptr->itxt_length = 0;
-- text_ptr->lang = NULL;
-- text_ptr->lang_key = NULL;
-- text_ptr->text = text;
--
-- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
--
-- png_free(png_ptr, key);
-- png_free(png_ptr, text_ptr);
--
-- if (ret)
-- png_warning(png_ptr, "Insufficient memory to store text chunk");
-- }
--}
--#endif
--
--#ifdef PNG_READ_iTXt_SUPPORTED
--void /* PRIVATE */
--png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-- length)
--{
-- if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-- {
-- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-- png_error(png_ptr, "Out of place iTXt");
-- /* NOT REACHED */
-- }
--
--#ifdef PNG_MAX_MALLOC_64K
-- png_ptr->skip_length = 0; /* This may not be necessary */
--
-- if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
-- {
-- png_warning(png_ptr, "iTXt chunk too large to fit in memory");
-- png_ptr->skip_length = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-- }
--#endif
--
-- png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-- (png_size_t)(length + 1));
-- png_ptr->current_text[length] = '\0';
-- png_ptr->current_text_ptr = png_ptr->current_text;
-- png_ptr->current_text_size = (png_size_t)length;
-- png_ptr->current_text_left = (png_size_t)length;
-- png_ptr->process_mode = PNG_READ_iTXt_MODE;
--}
--
--void /* PRIVATE */
--png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
--{
--
-- if (png_ptr->buffer_size && png_ptr->current_text_left)
-- {
-- png_size_t text_size;
--
-- if (png_ptr->buffer_size < png_ptr->current_text_left)
-- text_size = png_ptr->buffer_size;
--
-- else
-- text_size = png_ptr->current_text_left;
--
-- png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-- png_ptr->current_text_left -= text_size;
-- png_ptr->current_text_ptr += text_size;
-- }
--
-- if (!(png_ptr->current_text_left))
-- {
-- png_textp text_ptr;
-- png_charp key;
-- int comp_flag;
-- png_charp lang;
-- png_charp lang_key;
-- png_charp text;
-- int ret;
--
-- if (png_ptr->buffer_size < 4)
-- {
-- png_push_save_buffer(png_ptr);
-- return;
-- }
--
-- png_push_crc_finish(png_ptr);
--
--#ifdef PNG_MAX_MALLOC_64K
-- if (png_ptr->skip_length)
-- return;
--#endif
--
-- key = png_ptr->current_text;
--
-- for (lang = key; *lang; lang++)
-- /* Empty loop */ ;
--
-- if (lang < key + png_ptr->current_text_size - 3)
-- lang++;
--
-- comp_flag = *lang++;
-- lang++; /* Skip comp_type, always zero */
--
-- for (lang_key = lang; *lang_key; lang_key++)
-- /* Empty loop */ ;
--
-- lang_key++; /* Skip NUL separator */
--
-- text=lang_key;
--
-- if (lang_key < key + png_ptr->current_text_size - 1)
-- {
-- for (; *text; text++)
-- /* Empty loop */ ;
-- }
--
-- if (text < key + png_ptr->current_text_size)
-- text++;
--
-- text_ptr = (png_textp)png_malloc(png_ptr,
-- png_sizeof(png_text));
--
-- text_ptr->compression = comp_flag + 2;
-- text_ptr->key = key;
-- text_ptr->lang = lang;
-- text_ptr->lang_key = lang_key;
-- text_ptr->text = text;
-- text_ptr->text_length = 0;
-- text_ptr->itxt_length = png_strlen(text);
--
-- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
--
-- png_ptr->current_text = NULL;
--
-- png_free(png_ptr, text_ptr);
-- if (ret)
-- png_warning(png_ptr, "Insufficient memory to store iTXt chunk");
-- }
--}
--#endif
--
--/* This function is called when we haven't found a handler for this
-- * chunk. If there isn't a problem with the chunk itself (ie a bad chunk
-- * name or a critical chunk), the chunk is (currently) silently ignored.
-- */
--void /* PRIVATE */
--png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
-- length)
--{
-- png_uint_32 skip = 0;
--
-- if (!(png_ptr->chunk_name[0] & 0x20))
-- {
--#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-- if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-- PNG_HANDLE_CHUNK_ALWAYS
--#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-- && png_ptr->read_user_chunk_fn == NULL
--#endif
-- )
--#endif
-- png_chunk_error(png_ptr, "unknown critical chunk");
--
-- PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-- }
--
--#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-- if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
-- {
--#ifdef PNG_MAX_MALLOC_64K
-- if (length > (png_uint_32)65535L)
-- {
-- png_warning(png_ptr, "unknown chunk too large to fit in memory");
-- skip = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-- }
--#endif
-- png_memcpy((png_charp)png_ptr->unknown_chunk.name,
-- (png_charp)png_ptr->chunk_name,
-- png_sizeof(png_ptr->unknown_chunk.name));
-- png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
-- = '\0';
--
-- png_ptr->unknown_chunk.size = (png_size_t)length;
--
-- if (length == 0)
-- png_ptr->unknown_chunk.data = NULL;
--
-- else
-- {
-- png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
-- (png_size_t)length);
-- png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
-- }
--
--#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-- if (png_ptr->read_user_chunk_fn != NULL)
-- {
-- /* Callback to user unknown chunk handler */
-- int ret;
-- ret = (*(png_ptr->read_user_chunk_fn))
-- (png_ptr, &png_ptr->unknown_chunk);
--
-- if (ret < 0)
-- png_chunk_error(png_ptr, "error in user chunk");
--
-- if (ret == 0)
-- {
-- if (!(png_ptr->chunk_name[0] & 0x20))
-- if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-- PNG_HANDLE_CHUNK_ALWAYS)
-- png_chunk_error(png_ptr, "unknown critical chunk");
-- png_set_unknown_chunks(png_ptr, info_ptr,
-- &png_ptr->unknown_chunk, 1);
-- }
-- }
--
-- else
--#endif
-- png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
-- png_free(png_ptr, png_ptr->unknown_chunk.data);
-- png_ptr->unknown_chunk.data = NULL;
-- }
--
-- else
--#endif
-- skip=length;
-- png_push_crc_skip(png_ptr, skip);
--}
--
--void /* PRIVATE */
--png_push_have_info(png_structp png_ptr, png_infop info_ptr)
-+png_push_have_info(png_structrp png_ptr, png_inforp info_ptr)
- {
- if (png_ptr->info_fn != NULL)
- (*(png_ptr->info_fn))(png_ptr, info_ptr);
- }
-
- void /* PRIVATE */
--png_push_have_end(png_structp png_ptr, png_infop info_ptr)
-+png_push_have_end(png_structrp png_ptr, png_inforp info_ptr)
- {
- if (png_ptr->end_fn != NULL)
- (*(png_ptr->end_fn))(png_ptr, info_ptr);
- }
-
- void /* PRIVATE */
--png_push_have_row(png_structp png_ptr, png_bytep row)
-+png_push_have_row(png_structrp png_ptr, png_bytep row)
- {
- if (png_ptr->row_fn != NULL)
- (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
-@@ -1845,21 +1156,22 @@
- }
-
- void PNGAPI
--png_progressive_combine_row (png_structp png_ptr, png_bytep old_row,
-+png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row,
- png_const_bytep new_row)
- {
-- PNG_CONST int FARDATA png_pass_dsp_mask[7] =
-- {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
--
- if (png_ptr == NULL)
- return;
-
-- if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */
-- png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
-+ /* new_row is a flag here - if it is NULL then the app callback was called
-+ * from an empty row (see the calls to png_struct::row_fn below), otherwise
-+ * it must be png_ptr->row_buf+1
-+ */
-+ if (new_row != NULL)
-+ png_combine_row(png_ptr, old_row, 1/*blocky display*/);
- }
-
- void PNGAPI
--png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
-+png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr,
- png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
- png_progressive_end_ptr end_fn)
- {
-@@ -1874,11 +1186,11 @@
- }
-
- png_voidp PNGAPI
--png_get_progressive_ptr(png_const_structp png_ptr)
-+png_get_progressive_ptr(png_const_structrp png_ptr)
- {
- if (png_ptr == NULL)
- return (NULL);
-
- return png_ptr->io_ptr;
- }
--#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-+#endif /* PROGRESSIVE_READ */
---- ./jdk/src/share/native/sun/awt/libpng/pngpriv.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngpriv.h Fri Apr 10 09:21:28 2015 -0700
-@@ -30,11 +30,11 @@
- * file and, per its terms, should not be removed:
- *
- * For conditions of distribution and use, see copyright notice in png.h
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-+ * Last changed in libpng 1.6.10 [March 6, 1014]]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
-@@ -42,7 +42,7 @@
- */
-
- /* The symbols declared in this file (including the functions declared
-- * as PNG_EXTERN) are PRIVATE. They are not part of the libpng public
-+ * as extern) are PRIVATE. They are not part of the libpng public
- * interface, and are not recommended for use by regular applications.
- * Some of them may become public in the future; others may stay private,
- * change in an incompatible way, or even disappear.
-@@ -67,12 +67,44 @@
- */
- #define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
-
--/* This is required for the definition of abort(), used as a last ditch
-- * error handler when all else fails.
-+#ifndef PNG_VERSION_INFO_ONLY
-+/* Standard library headers not required by png.h: */
-+# include <stdlib.h>
-+# include <string.h>
-+#endif
-+
-+#define PNGLIB_BUILD /*libpng is being built, not used*/
-+
-+/* If HAVE_CONFIG_H is defined during the build then the build system must
-+ * provide an appropriate "config.h" file on the include path. The header file
-+ * must provide definitions as required below (search for "HAVE_CONFIG_H");
-+ * see configure.ac for more details of the requirements. The macro
-+ * "PNG_NO_CONFIG_H" is provided for maintainers to test for dependencies on
-+ * 'configure'; define this macro to prevent the configure build including the
-+ * configure generated config.h. Libpng is expected to compile without *any*
-+ * special build system support on a reasonably ANSI-C compliant system.
- */
--#include <stdlib.h>
-+#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
-+# include <config.h>
-
--#define PNGLIB_BUILD
-+ /* Pick up the definition of 'restrict' from config.h if it was read: */
-+# define PNG_RESTRICT restrict
-+#endif
-+
-+/* To support symbol prefixing it is necessary to know *before* including png.h
-+ * whether the fixed point (and maybe other) APIs are exported, because if they
-+ * are not internal definitions may be required. This is handled below just
-+ * before png.h is included, but load the configuration now if it is available.
-+ */
-+#ifndef PNGLCONF_H
-+# include "pnglibconf.h"
-+#endif
-+
-+/* Local renames may change non-exported API functions from png.h */
-+#if defined(PNG_PREFIX) && !defined(PNGPREFIX_H)
-+# include "pngprefix.h"
-+#endif
-+
- #ifdef PNG_USER_CONFIG
- # include "pngusr.h"
- /* These should have been defined in pngusr.h */
-@@ -83,25 +115,253 @@
- # define PNG_USER_DLLFNAME_POSTFIX "Cb"
- # endif
- #endif
-+
-+/* Compile time options.
-+ * =====================
-+ * In a multi-arch build the compiler may compile the code several times for the
-+ * same object module, producing different binaries for different architectures.
-+ * When this happens configure-time setting of the target host options cannot be
-+ * done and this interferes with the handling of the ARM NEON optimizations, and
-+ * possibly other similar optimizations. Put additional tests here; in general
-+ * this is needed when the same option can be changed at both compile time and
-+ * run time depending on the target OS (i.e. iOS vs Android.)
-+ *
-+ * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because
-+ * this is not possible with certain compilers (Oracle SUN OS CC), as a result
-+ * it is necessary to ensure that all extern functions that *might* be used
-+ * regardless of $(CFLAGS) get declared in this file. The test on __ARM_NEON__
-+ * below is one example of this behavior because it is controlled by the
-+ * presence or not of -mfpu=neon on the GCC command line, it is possible to do
-+ * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
-+ * do this.
-+ */
-+#ifndef PNG_ARM_NEON_OPT
-+ /* ARM NEON optimizations are being controlled by the compiler settings,
-+ * typically the target FPU. If the FPU has been set to NEON (-mfpu=neon
-+ * with GCC) then the compiler will define __ARM_NEON__ and we can rely
-+ * unconditionally on NEON instructions not crashing, otherwise we must
-+ * disable use of NEON instructions.
-+ *
-+ * NOTE: at present these optimizations depend on 'ALIGNED_MEMORY', so they
-+ * can only be turned on automatically if that is supported too. If
-+ * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail
-+ * to compile with an appropriate #error if ALIGNED_MEMORY has been turned
-+ * off.
-+ *
-+ * Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we
-+ * check both variants.
-+ */
-+# if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
-+ defined(PNG_ALIGNED_MEMORY_SUPPORTED)
-+# define PNG_ARM_NEON_OPT 2
-+# else
-+# define PNG_ARM_NEON_OPT 0
-+# endif
-+#endif
-+
-+#if PNG_ARM_NEON_OPT > 0
-+ /* NEON optimizations are to be at least considered by libpng, so enable the
-+ * callbacks to do this.
-+ */
-+# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
-+
-+ /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
-+ * if possible - if __ARM_NEON__ is set and the compiler version is not known
-+ * to be broken. This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
-+ * be:
-+ *
-+ * 1 The intrinsics code (the default with __ARM_NEON__)
-+ * 2 The hand coded assembler (the default without __ARM_NEON__)
-+ *
-+ * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
-+ * this is *NOT* supported and may cease to work even after a minor revision
-+ * to libpng. It *is* valid to do this for testing purposes, e.g. speed
-+ * testing or a new compiler, but the results should be communicated to the
-+ * libpng implementation list for incorporation in the next minor release.
-+ */
-+# ifndef PNG_ARM_NEON_IMPLEMENTATION
-+# if defined(__ARM_NEON__) || defined(__ARM_NEON)
-+# if defined(__clang__)
-+ /* At present it is unknown by the libpng developers which versions
-+ * of clang support the intrinsics, however some or perhaps all
-+ * versions do not work with the assembler so this may be
-+ * irrelevant, so just use the default (do nothing here.)
-+ */
-+# elif defined(__GNUC__)
-+ /* GCC 4.5.4 NEON support is known to be broken. 4.6.3 is known to
-+ * work, so if this *is* GCC, or G++, look for a version >4.5
-+ */
-+# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
-+# define PNG_ARM_NEON_IMPLEMENTATION 2
-+# endif /* no GNUC support */
-+# endif /* __GNUC__ */
-+# else /* !defined __ARM_NEON__ */
-+ /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
-+ */
-+# define PNG_ARM_NEON_IMPLEMENTATION 2
-+# endif /* __ARM_NEON__ */
-+# endif /* !PNG_ARM_NEON_IMPLEMENTATION */
-+
-+# ifndef PNG_ARM_NEON_IMPLEMENTATION
-+ /* Use the intrinsics code by default. */
-+# define PNG_ARM_NEON_IMPLEMENTATION 1
-+# endif
-+#endif /* PNG_ARM_NEON_OPT > 0 */
-+
-+/* Is this a build of a DLL where compilation of the object modules requires
-+ * different preprocessor settings to those required for a simple library? If
-+ * so PNG_BUILD_DLL must be set.
-+ *
-+ * If libpng is used inside a DLL but that DLL does not export the libpng APIs
-+ * PNG_BUILD_DLL must not be set. To avoid the code below kicking in build a
-+ * static library of libpng then link the DLL against that.
-+ */
-+#ifndef PNG_BUILD_DLL
-+# ifdef DLL_EXPORT
-+ /* This is set by libtool when files are compiled for a DLL; libtool
-+ * always compiles twice, even on systems where it isn't necessary. Set
-+ * PNG_BUILD_DLL in case it is necessary:
-+ */
-+# define PNG_BUILD_DLL
-+# else
-+# ifdef _WINDLL
-+ /* This is set by the Microsoft Visual Studio IDE in projects that
-+ * build a DLL. It can't easily be removed from those projects (it
-+ * isn't visible in the Visual Studio UI) so it is a fairly reliable
-+ * indication that PNG_IMPEXP needs to be set to the DLL export
-+ * attributes.
-+ */
-+# define PNG_BUILD_DLL
-+# else
-+# ifdef __DLL__
-+ /* This is set by the Borland C system when compiling for a DLL
-+ * (as above.)
-+ */
-+# define PNG_BUILD_DLL
-+# else
-+ /* Add additional compiler cases here. */
-+# endif
-+# endif
-+# endif
-+#endif /* Setting PNG_BUILD_DLL if required */
-+
-+/* See pngconf.h for more details: the builder of the library may set this on
-+ * the command line to the right thing for the specific compilation system or it
-+ * may be automagically set above (at present we know of no system where it does
-+ * need to be set on the command line.)
-+ *
-+ * PNG_IMPEXP must be set here when building the library to prevent pngconf.h
-+ * setting it to the "import" setting for a DLL build.
-+ */
-+#ifndef PNG_IMPEXP
-+# ifdef PNG_BUILD_DLL
-+# define PNG_IMPEXP PNG_DLL_EXPORT
-+# else
-+ /* Not building a DLL, or the DLL doesn't require specific export
-+ * definitions.
-+ */
-+# define PNG_IMPEXP
-+# endif
-+#endif
-+
-+/* No warnings for private or deprecated functions in the build: */
-+#ifndef PNG_DEPRECATED
-+# define PNG_DEPRECATED
-+#endif
-+#ifndef PNG_PRIVATE
-+# define PNG_PRIVATE
-+#endif
-+
-+/* Symbol preprocessing support.
-+ *
-+ * To enable listing global, but internal, symbols the following macros should
-+ * always be used to declare an extern data or function object in this file.
-+ */
-+#ifndef PNG_INTERNAL_DATA
-+# define PNG_INTERNAL_DATA(type, name, array) extern type name array
-+#endif
-+
-+#ifndef PNG_INTERNAL_FUNCTION
-+# define PNG_INTERNAL_FUNCTION(type, name, args, attributes)\
-+ extern PNG_FUNCTION(type, name, args, PNG_EMPTY attributes)
-+#endif
-+
-+#ifndef PNG_INTERNAL_CALLBACK
-+# define PNG_INTERNAL_CALLBACK(type, name, args, attributes)\
-+ extern PNG_FUNCTION(type, (PNGCBAPI name), args, PNG_EMPTY attributes)
-+#endif
-+
-+/* If floating or fixed point APIs are disabled they may still be compiled
-+ * internally. To handle this make sure they are declared as the appropriate
-+ * internal extern function (otherwise the symbol prefixing stuff won't work and
-+ * the functions will be used without definitions.)
-+ *
-+ * NOTE: although all the API functions are declared here they are not all
-+ * actually built! Because the declarations are still made it is necessary to
-+ * fake out types that they depend on.
-+ */
-+#ifndef PNG_FP_EXPORT
-+# ifndef PNG_FLOATING_POINT_SUPPORTED
-+# define PNG_FP_EXPORT(ordinal, type, name, args)\
-+ PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);
-+# ifndef PNG_VERSION_INFO_ONLY
-+ typedef struct png_incomplete png_double;
-+ typedef png_double* png_doublep;
-+ typedef const png_double* png_const_doublep;
-+ typedef png_double** png_doublepp;
-+# endif
-+# endif
-+#endif
-+#ifndef PNG_FIXED_EXPORT
-+# ifndef PNG_FIXED_POINT_SUPPORTED
-+# define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-+ PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);
-+# endif
-+#endif
-+
- #include "png.h"
--#include "pnginfo.h"
--#include "pngstruct.h"
-
--/* This is used for 16 bit gamma tables - only the top level pointers are const,
-- * this could be changed:
-+/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
-+#ifndef PNG_DLL_EXPORT
-+# define PNG_DLL_EXPORT
-+#endif
-+
-+/* SECURITY and SAFETY:
-+ *
-+ * By default libpng is built without any internal limits on image size,
-+ * individual heap (png_malloc) allocations or the total amount of memory used.
-+ * If PNG_SAFE_LIMITS_SUPPORTED is defined, however, the limits below are used
-+ * (unless individually overridden). These limits are believed to be fairly
-+ * safe, but builders of secure systems should verify the values against the
-+ * real system capabilities.
- */
--typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
--
--/* Added at libpng-1.2.9 */
--/* Moved to pngpriv.h at libpng-1.5.0 */
--
--/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"
-- * script. We may need it here to get the correct configuration on things
-- * like limits.
-- */
--#ifdef PNG_CONFIGURE_LIBPNG
--# ifdef HAVE_CONFIG_H
--# include "config.h"
-+#ifdef PNG_SAFE_LIMITS_SUPPORTED
-+ /* 'safe' limits */
-+# ifndef PNG_USER_WIDTH_MAX
-+# define PNG_USER_WIDTH_MAX 1000000
-+# endif
-+# ifndef PNG_USER_HEIGHT_MAX
-+# define PNG_USER_HEIGHT_MAX 1000000
-+# endif
-+# ifndef PNG_USER_CHUNK_CACHE_MAX
-+# define PNG_USER_CHUNK_CACHE_MAX 128
-+# endif
-+# ifndef PNG_USER_CHUNK_MALLOC_MAX
-+# define PNG_USER_CHUNK_MALLOC_MAX 8000000
-+# endif
-+#else
-+ /* values for no limits */
-+# ifndef PNG_USER_WIDTH_MAX
-+# define PNG_USER_WIDTH_MAX 0x7fffffff
-+# endif
-+# ifndef PNG_USER_HEIGHT_MAX
-+# define PNG_USER_HEIGHT_MAX 0x7fffffff
-+# endif
-+# ifndef PNG_USER_CHUNK_CACHE_MAX
-+# define PNG_USER_CHUNK_CACHE_MAX 0
-+# endif
-+# ifndef PNG_USER_CHUNK_MALLOC_MAX
-+# define PNG_USER_CHUNK_MALLOC_MAX 0
- # endif
- #endif
-
-@@ -143,13 +403,6 @@
- # define PNG_ZBUF_SIZE 65536L
- #endif
-
--/* PNG_STATIC is used to mark internal file scope functions if they need to be
-- * accessed for implementation tests (see the code in tests/?*).
-- */
--#ifndef PNG_STATIC
--# define PNG_STATIC static
--#endif
--
- /* If warnings or errors are turned off the code is disabled or redirected here.
- * From 1.5.4 functions have been added to allow very limited formatting of
- * error and warning messages - this code will also be disabled here.
-@@ -157,8 +410,6 @@
- #ifdef PNG_WARNINGS_SUPPORTED
- # define PNG_WARNING_PARAMETERS(p) png_warning_parameters p;
- #else
--# define png_warning(s1,s2) ((void)(s1))
--# define png_chunk_warning(s1,s2) ((void)(s1))
- # define png_warning_parameter(p,number,string) ((void)0)
- # define png_warning_parameter_unsigned(p,number,format,value) ((void)0)
- # define png_warning_parameter_signed(p,number,format,value) ((void)0)
-@@ -166,21 +417,27 @@
- # define PNG_WARNING_PARAMETERS(p)
- #endif
- #ifndef PNG_ERROR_TEXT_SUPPORTED
--# define png_error(s1,s2) png_err(s1)
--# define png_chunk_error(s1,s2) png_err(s1)
- # define png_fixed_error(s1,s2) png_err(s1)
- #endif
-
--#ifndef PNG_EXTERN
--/* The functions exported by PNG_EXTERN are internal functions, which
-- * aren't usually used outside the library (as far as I know), so it is
-- * debatable if they should be exported at all. In the future, when it
-- * is possible to have run-time registry of chunk-handling functions,
-- * some of these might be made available again.
--# define PNG_EXTERN extern
-+/* C allows up-casts from (void*) to any pointer and (const void*) to any
-+ * pointer to a const object. C++ regards this as a type error and requires an
-+ * explicit, static, cast and provides the static_cast<> rune to ensure that
-+ * const is not cast away.
- */
--# define PNG_EXTERN
--#endif
-+#ifdef __cplusplus
-+# define png_voidcast(type, value) static_cast<type>(value)
-+# define png_constcast(type, value) const_cast<type>(value)
-+# define png_aligncast(type, value) \
-+ static_cast<type>(static_cast<void*>(value))
-+# define png_aligncastconst(type, value) \
-+ static_cast<type>(static_cast<const void*>(value))
-+#else
-+# define png_voidcast(type, value) (value)
-+# define png_constcast(type, value) ((type)(value))
-+# define png_aligncast(type, value) ((void*)(value))
-+# define png_aligncastconst(type, value) ((const void*)(value))
-+#endif /* __cplusplus */
-
- /* Some fixed point APIs are still required even if not exported because
- * they get used by the corresponding floating point APIs. This magic
-@@ -192,6 +449,7 @@
- # define PNGFAPI /* PRIVATE */
- #endif
-
-+#ifndef PNG_VERSION_INFO_ONLY
- /* Other defines specific to compilers can go here. Try to keep
- * them inside an appropriate ifdef/endif pair for portability.
- */
-@@ -236,6 +494,7 @@
- defined(_WIN32) || defined(__WIN32__)
- # include <windows.h> /* defines _WINDOWS_ macro */
- #endif
-+#endif /* PNG_VERSION_INFO_ONLY */
-
- /* Moved here around 1.5.0beta36 from pngconf.h */
- /* Users may want to use these so they are not private. Any library
-@@ -251,33 +510,51 @@
- # endif
- #endif
-
--#ifdef USE_FAR_KEYWORD
--/* Use this to make far-to-near assignments */
--# define CHECK 1
--# define NOCHECK 0
--# define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
--# define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
--# define png_strlen _fstrlen
--# define png_memcmp _fmemcmp /* SJT: added */
--# define png_memcpy _fmemcpy
--# define png_memset _fmemset
-+/* These macros may need to be architecture dependent. */
-+#define PNG_ALIGN_NONE 0 /* do not use data alignment */
-+#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
-+#ifdef offsetof
-+# define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */
- #else
--# ifdef _WINDOWS_ /* Favor Windows over C runtime fns */
--# define CVT_PTR(ptr) (ptr)
--# define CVT_PTR_NOCHECK(ptr) (ptr)
--# define png_strlen lstrlenA
--# define png_memcmp memcmp
--# define png_memcpy CopyMemory
--# define png_memset memset
-+# define PNG_ALIGN_OFFSET -1 /* prevent the use of this */
-+#endif
-+#define PNG_ALIGN_SIZE 3 /* use sizeof to determine alignment */
-+
-+#ifndef PNG_ALIGN_TYPE
-+ /* Default to using aligned access optimizations and requiring alignment to a
-+ * multiple of the data type size. Override in a compiler specific fashion
-+ * if necessary by inserting tests here:
-+ */
-+# define PNG_ALIGN_TYPE PNG_ALIGN_SIZE
-+#endif
-+
-+#if PNG_ALIGN_TYPE == PNG_ALIGN_SIZE
-+ /* This is used because in some compiler implementations non-aligned
-+ * structure members are supported, so the offsetof approach below fails.
-+ * Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access
-+ * is good for performance. Do not do this unless you have tested the result
-+ * and understand it.
-+ */
-+# define png_alignof(type) (sizeof (type))
-+#else
-+# if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET
-+# define png_alignof(type) offsetof(struct{char c; type t;}, t)
- # else
--# define CVT_PTR(ptr) (ptr)
--# define CVT_PTR_NOCHECK(ptr) (ptr)
--# define png_strlen strlen
--# define png_memcmp memcmp /* SJT: added */
--# define png_memcpy memcpy
--# define png_memset memset
-+# if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
-+# define png_alignof(type) (1)
-+# endif
-+ /* Else leave png_alignof undefined to prevent use thereof */
- # endif
- #endif
-+
-+/* This implicitly assumes alignment is always to a power of 2. */
-+#ifdef png_alignof
-+# define png_isaligned(ptr, type)\
-+ ((((const char*)ptr-(const char*)0) & (png_alignof(type)-1)) == 0)
-+#else
-+# define png_isaligned(ptr, type) 0
-+#endif
-+
- /* End of memory model/platform independent support */
- /* End of 1.5.0beta36 move from pngconf.h */
-
-@@ -295,15 +572,17 @@
- #define PNG_HAVE_IDAT 0x04
- /* #define PNG_AFTER_IDAT 0x08 (defined in png.h) */
- #define PNG_HAVE_IEND 0x10
--#define PNG_HAVE_gAMA 0x20
--#define PNG_HAVE_cHRM 0x40
--#define PNG_HAVE_sRGB 0x80
-+ /* 0x20 (unused) */
-+ /* 0x40 (unused) */
-+ /* 0x80 (unused) */
- #define PNG_HAVE_CHUNK_HEADER 0x100
- #define PNG_WROTE_tIME 0x200
- #define PNG_WROTE_INFO_BEFORE_PLTE 0x400
- #define PNG_BACKGROUND_IS_GRAY 0x800
- #define PNG_HAVE_PNG_SIGNATURE 0x1000
- #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-+ /* 0x4000 (unused) */
-+#define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */
-
- /* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR 0x0001
-@@ -321,24 +600,23 @@
- #define PNG_EXPAND 0x1000
- #define PNG_GAMMA 0x2000
- #define PNG_GRAY_TO_RGB 0x4000
--#define PNG_FILLER 0x8000L
--#define PNG_PACKSWAP 0x10000L
--#define PNG_SWAP_ALPHA 0x20000L
--#define PNG_STRIP_ALPHA 0x40000L
--#define PNG_INVERT_ALPHA 0x80000L
--#define PNG_USER_TRANSFORM 0x100000L
--#define PNG_RGB_TO_GRAY_ERR 0x200000L
--#define PNG_RGB_TO_GRAY_WARN 0x400000L
--#define PNG_RGB_TO_GRAY 0x600000L /* two bits, RGB_TO_GRAY_ERR|WARN */
--#define PNG_ENCODE_ALPHA 0x800000L /* Added to libpng-1.5.4 */
--#define PNG_ADD_ALPHA 0x1000000L /* Added to libpng-1.2.7 */
--#define PNG_EXPAND_tRNS 0x2000000L /* Added to libpng-1.2.9 */
--#define PNG_SCALE_16_TO_8 0x4000000L /* Added to libpng-1.5.4 */
-- /* 0x8000000L unused */
-- /* 0x10000000L unused */
-- /* 0x20000000L unused */
-- /* 0x40000000L unused */
--
-+#define PNG_FILLER 0x8000
-+#define PNG_PACKSWAP 0x10000
-+#define PNG_SWAP_ALPHA 0x20000
-+#define PNG_STRIP_ALPHA 0x40000
-+#define PNG_INVERT_ALPHA 0x80000
-+#define PNG_USER_TRANSFORM 0x100000
-+#define PNG_RGB_TO_GRAY_ERR 0x200000
-+#define PNG_RGB_TO_GRAY_WARN 0x400000
-+#define PNG_RGB_TO_GRAY 0x600000 /* two bits, RGB_TO_GRAY_ERR|WARN */
-+#define PNG_ENCODE_ALPHA 0x800000 /* Added to libpng-1.5.4 */
-+#define PNG_ADD_ALPHA 0x1000000 /* Added to libpng-1.2.7 */
-+#define PNG_EXPAND_tRNS 0x2000000 /* Added to libpng-1.2.9 */
-+#define PNG_SCALE_16_TO_8 0x4000000 /* Added to libpng-1.5.4 */
-+ /* 0x8000000 unused */
-+ /* 0x10000000 unused */
-+ /* 0x20000000 unused */
-+ /* 0x40000000 unused */
- /* Flags for png_create_struct */
- #define PNG_STRUCT_PNG 0x0001
- #define PNG_STRUCT_INFO 0x0002
-@@ -349,36 +627,36 @@
-
- /* Flags for the png_ptr->flags rather than declaring a byte for each one */
- #define PNG_FLAG_ZLIB_CUSTOM_STRATEGY 0x0001
--#define PNG_FLAG_ZLIB_CUSTOM_LEVEL 0x0002
--#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL 0x0004
--#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS 0x0008
--#define PNG_FLAG_ZLIB_CUSTOM_METHOD 0x0010
--#define PNG_FLAG_ZLIB_FINISHED 0x0020
-+#define PNG_FLAG_ZSTREAM_INITIALIZED 0x0002 /* Added to libpng-1.6.0 */
-+ /* 0x0004 unused */
-+#define PNG_FLAG_ZSTREAM_ENDED 0x0008 /* Added to libpng-1.6.0 */
-+ /* 0x0010 unused */
-+ /* 0x0020 unused */
- #define PNG_FLAG_ROW_INIT 0x0040
- #define PNG_FLAG_FILLER_AFTER 0x0080
- #define PNG_FLAG_CRC_ANCILLARY_USE 0x0100
- #define PNG_FLAG_CRC_ANCILLARY_NOWARN 0x0200
- #define PNG_FLAG_CRC_CRITICAL_USE 0x0400
- #define PNG_FLAG_CRC_CRITICAL_IGNORE 0x0800
--#define PNG_FLAG_ASSUME_sRGB 0x1000 /* Added to libpng-1.5.4 */
--#define PNG_FLAG_OPTIMIZE_ALPHA 0x2000 /* Added to libpng-1.5.4 */
--#define PNG_FLAG_DETECT_UNINITIALIZED 0x4000 /* Added to libpng-1.5.4 */
--#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS 0x8000L
--#define PNG_FLAG_KEEP_UNSAFE_CHUNKS 0x10000L
--#define PNG_FLAG_LIBRARY_MISMATCH 0x20000L
--#define PNG_FLAG_STRIP_ERROR_NUMBERS 0x40000L
--#define PNG_FLAG_STRIP_ERROR_TEXT 0x80000L
--#define PNG_FLAG_MALLOC_NULL_MEM_OK 0x100000L
-- /* 0x200000L unused */
-- /* 0x400000L unused */
--#define PNG_FLAG_BENIGN_ERRORS_WARN 0x800000L /* Added to libpng-1.4.0 */
--#define PNG_FLAG_ZTXT_CUSTOM_STRATEGY 0x1000000L /* 5 lines added */
--#define PNG_FLAG_ZTXT_CUSTOM_LEVEL 0x2000000L /* to libpng-1.5.4 */
--#define PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL 0x4000000L
--#define PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS 0x8000000L
--#define PNG_FLAG_ZTXT_CUSTOM_METHOD 0x10000000L
-- /* 0x20000000L unused */
-- /* 0x40000000L unused */
-+#define PNG_FLAG_ASSUME_sRGB 0x1000 /* Added to libpng-1.5.4 */
-+#define PNG_FLAG_OPTIMIZE_ALPHA 0x2000 /* Added to libpng-1.5.4 */
-+#define PNG_FLAG_DETECT_UNINITIALIZED 0x4000 /* Added to libpng-1.5.4 */
-+/* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS 0x8000 */
-+/* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS 0x10000 */
-+#define PNG_FLAG_LIBRARY_MISMATCH 0x20000
-+#define PNG_FLAG_STRIP_ERROR_NUMBERS 0x40000
-+#define PNG_FLAG_STRIP_ERROR_TEXT 0x80000
-+#define PNG_FLAG_BENIGN_ERRORS_WARN 0x100000 /* Added to libpng-1.4.0 */
-+#define PNG_FLAG_APP_WARNINGS_WARN 0x200000 /* Added to libpng-1.6.0 */
-+#define PNG_FLAG_APP_ERRORS_WARN 0x400000 /* Added to libpng-1.6.0 */
-+ /* 0x800000 unused */
-+ /* 0x1000000 unused */
-+ /* 0x2000000 unused */
-+ /* 0x4000000 unused */
-+ /* 0x8000000 unused */
-+ /* 0x10000000 unused */
-+ /* 0x20000000 unused */
-+ /* 0x40000000 unused */
-
- #define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
- PNG_FLAG_CRC_ANCILLARY_NOWARN)
-@@ -389,24 +667,23 @@
- #define PNG_FLAG_CRC_MASK (PNG_FLAG_CRC_ANCILLARY_MASK | \
- PNG_FLAG_CRC_CRITICAL_MASK)
-
--/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
-- * can handle at once. This type need be no larger than 16 bits (so maximum of
-- * 65535), this define allows us to discover how big it is, but limited by the
-- * maximuum for png_size_t. The value can be overriden in a library build
-- * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
-- * lower value (e.g. 255 works). A lower value may help memory usage (slightly)
-- * and may even improve performance on some systems (and degrade it on others.)
-- */
--#ifndef ZLIB_IO_MAX
--# define ZLIB_IO_MAX ((uInt)-1)
--#endif
--
- /* Save typing and make code easier to understand */
-
- #define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
- abs((int)((c1).green) - (int)((c2).green)) + \
- abs((int)((c1).blue) - (int)((c2).blue)))
-
-+/* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255
-+ * by dividing by 257 *with rounding*. This macro is exact for the given range.
-+ * See the discourse in pngrtran.c png_do_scale_16_to_8. The values in the
-+ * macro were established by experiment (modifying the added value). The macro
-+ * has a second variant that takes a value already scaled by 255 and divides by
-+ * 65535 - this has a maximum error of .502. Over the range 0..65535*65535 it
-+ * only gives off-by-one errors and only for 0.5% (1 in 200) of the values.
-+ */
-+#define PNG_DIV65535(v24) (((v24) + 32895) >> 16)
-+#define PNG_DIV257(v16) PNG_DIV65535((png_uint_32)(v16) * 255)
-+
- /* Added to libpng-1.2.6 JB */
- #define PNG_ROWBYTES(pixel_bits, width) \
- ((pixel_bits) >= 8 ? \
-@@ -454,151 +731,314 @@
- #ifdef PNG_FIXED_POINT_MACRO_SUPPORTED
- #define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\
- ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))
--#else
--PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,
-- png_const_charp text));
- #endif
-+/* else the corresponding function is defined below, inside the scope of the
-+ * cplusplus test.
-+ */
- #endif
-
--/* Constant strings for known chunk types. If you need to add a chunk,
-- * define the name here, and add an invocation of the macro wherever it's
-- * needed.
-+/* Constants for known chunk types. If you need to add a chunk, define the name
-+ * here. For historical reasons these constants have the form png_<name>; i.e.
-+ * the prefix is lower case. Please use decimal values as the parameters to
-+ * match the ISO PNG specification and to avoid relying on the C locale
-+ * interpretation of character values.
-+ *
-+ * Prior to 1.5.6 these constants were strings, as of 1.5.6 png_uint_32 values
-+ * are computed and a new macro (PNG_STRING_FROM_CHUNK) added to allow a string
-+ * to be generated if required.
-+ *
-+ * PNG_32b correctly produces a value shifted by up to 24 bits, even on
-+ * architectures where (int) is only 16 bits.
- */
--#define PNG_IHDR PNG_CONST png_byte png_IHDR[5] = { 73, 72, 68, 82, '\0'}
--#define PNG_IDAT PNG_CONST png_byte png_IDAT[5] = { 73, 68, 65, 84, '\0'}
--#define PNG_IEND PNG_CONST png_byte png_IEND[5] = { 73, 69, 78, 68, '\0'}
--#define PNG_PLTE PNG_CONST png_byte png_PLTE[5] = { 80, 76, 84, 69, '\0'}
--#define PNG_bKGD PNG_CONST png_byte png_bKGD[5] = { 98, 75, 71, 68, '\0'}
--#define PNG_cHRM PNG_CONST png_byte png_cHRM[5] = { 99, 72, 82, 77, '\0'}
--#define PNG_gAMA PNG_CONST png_byte png_gAMA[5] = {103, 65, 77, 65, '\0'}
--#define PNG_hIST PNG_CONST png_byte png_hIST[5] = {104, 73, 83, 84, '\0'}
--#define PNG_iCCP PNG_CONST png_byte png_iCCP[5] = {105, 67, 67, 80, '\0'}
--#define PNG_iTXt PNG_CONST png_byte png_iTXt[5] = {105, 84, 88, 116, '\0'}
--#define PNG_oFFs PNG_CONST png_byte png_oFFs[5] = {111, 70, 70, 115, '\0'}
--#define PNG_pCAL PNG_CONST png_byte png_pCAL[5] = {112, 67, 65, 76, '\0'}
--#define PNG_sCAL PNG_CONST png_byte png_sCAL[5] = {115, 67, 65, 76, '\0'}
--#define PNG_pHYs PNG_CONST png_byte png_pHYs[5] = {112, 72, 89, 115, '\0'}
--#define PNG_sBIT PNG_CONST png_byte png_sBIT[5] = {115, 66, 73, 84, '\0'}
--#define PNG_sPLT PNG_CONST png_byte png_sPLT[5] = {115, 80, 76, 84, '\0'}
--#define PNG_sRGB PNG_CONST png_byte png_sRGB[5] = {115, 82, 71, 66, '\0'}
--#define PNG_sTER PNG_CONST png_byte png_sTER[5] = {115, 84, 69, 82, '\0'}
--#define PNG_tEXt PNG_CONST png_byte png_tEXt[5] = {116, 69, 88, 116, '\0'}
--#define PNG_tIME PNG_CONST png_byte png_tIME[5] = {116, 73, 77, 69, '\0'}
--#define PNG_tRNS PNG_CONST png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'}
--#define PNG_zTXt PNG_CONST png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'}
-+#define PNG_32b(b,s) ((png_uint_32)(b) << (s))
-+#define PNG_U32(b1,b2,b3,b4) \
-+ (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))
-+
-+/* Constants for known chunk types.
-+ *
-+ * MAINTAINERS: If you need to add a chunk, define the name here.
-+ * For historical reasons these constants have the form png_<name>; i.e.
-+ * the prefix is lower case. Please use decimal values as the parameters to
-+ * match the ISO PNG specification and to avoid relying on the C locale
-+ * interpretation of character values. Please keep the list sorted.
-+ *
-+ * Notice that PNG_U32 is used to define a 32-bit value for the 4 byte chunk
-+ * type. In fact the specification does not express chunk types this way,
-+ * however using a 32-bit value means that the chunk type can be read from the
-+ * stream using exactly the same code as used for a 32-bit unsigned value and
-+ * can be examined far more efficiently (using one arithmetic compare).
-+ *
-+ * Prior to 1.5.6 the chunk type constants were expressed as C strings. The
-+ * libpng API still uses strings for 'unknown' chunks and a macro,
-+ * PNG_STRING_FROM_CHUNK, allows a string to be generated if required. Notice
-+ * that for portable code numeric values must still be used; the string "IHDR"
-+ * is not portable and neither is PNG_U32('I', 'H', 'D', 'R').
-+ *
-+ * In 1.7.0 the definitions will be made public in png.h to avoid having to
-+ * duplicate the same definitions in application code.
-+ */
-+#define png_IDAT PNG_U32( 73, 68, 65, 84)
-+#define png_IEND PNG_U32( 73, 69, 78, 68)
-+#define png_IHDR PNG_U32( 73, 72, 68, 82)
-+#define png_PLTE PNG_U32( 80, 76, 84, 69)
-+#define png_bKGD PNG_U32( 98, 75, 71, 68)
-+#define png_cHRM PNG_U32( 99, 72, 82, 77)
-+#define png_fRAc PNG_U32(102, 82, 65, 99) /* registered, not defined */
-+#define png_gAMA PNG_U32(103, 65, 77, 65)
-+#define png_gIFg PNG_U32(103, 73, 70, 103)
-+#define png_gIFt PNG_U32(103, 73, 70, 116) /* deprecated */
-+#define png_gIFx PNG_U32(103, 73, 70, 120)
-+#define png_hIST PNG_U32(104, 73, 83, 84)
-+#define png_iCCP PNG_U32(105, 67, 67, 80)
-+#define png_iTXt PNG_U32(105, 84, 88, 116)
-+#define png_oFFs PNG_U32(111, 70, 70, 115)
-+#define png_pCAL PNG_U32(112, 67, 65, 76)
-+#define png_pHYs PNG_U32(112, 72, 89, 115)
-+#define png_sBIT PNG_U32(115, 66, 73, 84)
-+#define png_sCAL PNG_U32(115, 67, 65, 76)
-+#define png_sPLT PNG_U32(115, 80, 76, 84)
-+#define png_sRGB PNG_U32(115, 82, 71, 66)
-+#define png_sTER PNG_U32(115, 84, 69, 82)
-+#define png_tEXt PNG_U32(116, 69, 88, 116)
-+#define png_tIME PNG_U32(116, 73, 77, 69)
-+#define png_tRNS PNG_U32(116, 82, 78, 83)
-+#define png_zTXt PNG_U32(122, 84, 88, 116)
-+
-+/* The following will work on (signed char*) strings, whereas the get_uint_32
-+ * macro will fail on top-bit-set values because of the sign extension.
-+ */
-+#define PNG_CHUNK_FROM_STRING(s)\
-+ PNG_U32(0xff&(s)[0], 0xff&(s)[1], 0xff&(s)[2], 0xff&(s)[3])
-+
-+/* This uses (char), not (png_byte) to avoid warnings on systems where (char) is
-+ * signed and the argument is a (char[]) This macro will fail miserably on
-+ * systems where (char) is more than 8 bits.
-+ */
-+#define PNG_STRING_FROM_CHUNK(s,c)\
-+ (void)(((char*)(s))[0]=(char)((c)>>24), ((char*)(s))[1]=(char)((c)>>16),\
-+ ((char*)(s))[2]=(char)((c)>>8), ((char*)(s))[3]=(char)((c)))
-+
-+/* Do the same but terminate with a null character. */
-+#define PNG_CSTRING_FROM_CHUNK(s,c)\
-+ (void)(PNG_STRING_FROM_CHUNK(s,c), ((char*)(s))[4] = 0)
-+
-+/* Test on flag values as defined in the spec (section 5.4): */
-+#define PNG_CHUNK_ANCILLARY(c) (1 & ((c) >> 29))
-+#define PNG_CHUNK_CRITICAL(c) (!PNG_CHUNK_ANCILLARY(c))
-+#define PNG_CHUNK_PRIVATE(c) (1 & ((c) >> 21))
-+#define PNG_CHUNK_RESERVED(c) (1 & ((c) >> 13))
-+#define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >> 5))
-
- /* Gamma values (new at libpng-1.5.4): */
- #define PNG_GAMMA_MAC_OLD 151724 /* Assume '1.8' is really 2.2/1.45! */
- #define PNG_GAMMA_MAC_INVERSE 65909
- #define PNG_GAMMA_sRGB_INVERSE 45455
-
-+/* Almost everything below is C specific; the #defines above can be used in
-+ * non-C code (so long as it is C-preprocessed) the rest of this stuff cannot.
-+ */
-+#ifndef PNG_VERSION_INFO_ONLY
-+
-+#include "pngstruct.h"
-+#include "pnginfo.h"
-+
-+/* Validate the include paths - the include path used to generate pnglibconf.h
-+ * must match that used in the build, or we must be using pnglibconf.h.prebuilt:
-+ */
-+#if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM
-+# error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
-+ "-I (include path) error: see the notes in pngpriv.h"
-+ /* This means that when pnglibconf.h was built the copy of zlib.h that it
-+ * used is not the same as the one being used here. Because the build of
-+ * libpng makes decisions to use inflateInit2 and inflateReset2 based on the
-+ * zlib version number and because this affects handling of certain broken
-+ * PNG files the -I directives must match.
-+ *
-+ * The most likely explanation is that you passed a -I in CFLAGS. This will
-+ * not work; all the preprocessor directories and in particular all the -I
-+ * directives must be in CPPFLAGS.
-+ */
-+#endif
-+
-+/* This is used for 16 bit gamma tables -- only the top level pointers are
-+ * const; this could be changed:
-+ */
-+typedef const png_uint_16p * png_const_uint_16pp;
-+
-+/* Added to libpng-1.5.7: sRGB conversion tables */
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-+PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]);
-+ /* Convert from an sRGB encoded value 0..255 to a 16-bit linear value,
-+ * 0..65535. This table gives the closest 16-bit answers (no errors).
-+ */
-+#endif
-+
-+PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_base, [512]);
-+PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
-+
-+#define PNG_sRGB_FROM_LINEAR(linear) ((png_byte)((png_sRGB_base[(linear)>>15] +\
-+ ((((linear)&0x7fff)*png_sRGB_delta[(linear)>>15])>>12)) >> 8))
-+ /* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB
-+ * encoded value with maximum error 0.646365. Note that the input is not a
-+ * 16-bit value; it has been multiplied by 255! */
-+#endif /* SIMPLIFIED_READ/WRITE */
-+
-
- /* Inhibit C++ name-mangling for libpng functions but not for system calls. */
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-
--/* These functions are used internally in the code. They generally
-- * shouldn't be used unless you are writing code to add or replace some
-- * functionality in libpng. More information about most functions can
-- * be found in the files where the functions are located.
-+/* Internal functions; these are not exported from a DLL however because they
-+ * are used within several of the C source files they have to be C extern.
-+ *
-+ * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
- */
-
-+/* Zlib support */
-+#define PNG_UNEXPECTED_ZLIB_RETURN (-7)
-+PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),
-+ PNG_EMPTY);
-+ /* Used by the zlib handling functions to ensure that z_stream::msg is always
-+ * set before they return.
-+ */
-+
-+#ifdef PNG_WRITE_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
-+ png_compression_bufferp *list),PNG_EMPTY);
-+ /* Free the buffer list used by the compressed write code. */
-+#endif
-+
-+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-+ !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
-+ (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
-+ defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-+ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
-+ (defined(PNG_sCAL_SUPPORTED) && \
-+ defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
-+PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,
-+ double fp, png_const_charp text),PNG_EMPTY);
-+#endif
-+
- /* Check the user version string for compatibility, returns false if the version
- * numbers aren't compatible.
- */
--PNG_EXTERN int png_user_version_check(png_structp png_ptr,
-- png_const_charp user_png_ver);
-+PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
-+ png_const_charp user_png_ver),PNG_EMPTY);
-
--/* Allocate memory for an internal libpng struct */
--PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct,PNGARG((int type)),
-+/* Internal base allocator - no messages, NULL on failure to allocate. This
-+ * does, however, call the application provided allocator and that could call
-+ * png_error (although that would be a bug in the application implementation.)
-+ */
-+PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_base,(png_const_structrp png_ptr,
-+ png_alloc_size_t size),PNG_ALLOCATED);
-+
-+#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
-+ defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
-+/* Internal array allocator, outputs no error or warning messages on failure,
-+ * just returns NULL.
-+ */
-+PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_array,(png_const_structrp png_ptr,
-+ int nelements, size_t element_size),PNG_ALLOCATED);
-+
-+/* The same but an existing array is extended by add_elements. This function
-+ * also memsets the new elements to 0 and copies the old elements. The old
-+ * array is not freed or altered.
-+ */
-+PNG_INTERNAL_FUNCTION(png_voidp,png_realloc_array,(png_const_structrp png_ptr,
-+ png_const_voidp array, int old_elements, int add_elements,
-+ size_t element_size),PNG_ALLOCATED);
-+#endif /* text, sPLT or unknown chunks */
-+
-+/* Magic to create a struct when there is no struct to call the user supplied
-+ * memory allocators. Because error handling has not been set up the memory
-+ * handlers can't safely call png_error, but this is an obscure and undocumented
-+ * restriction so libpng has to assume that the 'free' handler, at least, might
-+ * call png_error.
-+ */
-+PNG_INTERNAL_FUNCTION(png_structp,png_create_png_struct,
-+ (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-+ png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn,
-+ png_free_ptr free_fn),PNG_ALLOCATED);
-+
-+/* Free memory from internal libpng struct */
-+PNG_INTERNAL_FUNCTION(void,png_destroy_png_struct,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+
-+/* Free an allocated jmp_buf (always succeeds) */
-+PNG_INTERNAL_FUNCTION(void,png_free_jmpbuf,(png_structrp png_ptr),PNG_EMPTY);
-+
-+/* Function to allocate memory for zlib. PNGAPI is disallowed. */
-+PNG_INTERNAL_FUNCTION(voidpf,png_zalloc,(voidpf png_ptr, uInt items, uInt size),
- PNG_ALLOCATED);
-
--/* Free memory from internal libpng struct */
--PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
--
--PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct_2,
-- PNGARG((int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)),
-- PNG_ALLOCATED);
--PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
-- png_free_ptr free_fn, png_voidp mem_ptr));
--
--/* Free any memory that info_ptr points to and reset struct. */
--PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--
--/* Function to allocate memory for zlib. PNGAPI is disallowed. */
--PNG_EXTERN PNG_FUNCTION(voidpf,png_zalloc,PNGARG((voidpf png_ptr, uInt items,
-- uInt size)),PNG_ALLOCATED);
--
- /* Function to free memory for zlib. PNGAPI is disallowed. */
--PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
-+PNG_INTERNAL_FUNCTION(void,png_zfree,(voidpf png_ptr, voidpf ptr),PNG_EMPTY);
-
- /* Next four functions are used internally as callbacks. PNGCBAPI is required
- * but not PNG_EXPORT. PNGAPI added at libpng version 1.2.3, changed to
- * PNGCBAPI at 1.5.0
- */
-
--PNG_EXTERN void PNGCBAPI png_default_read_data PNGARG((png_structp png_ptr,
-- png_bytep data, png_size_t length));
-+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_read_data,(png_structp png_ptr,
-+ png_bytep data, png_size_t length),PNG_EMPTY);
-
- #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
--PNG_EXTERN void PNGCBAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
-- png_bytep buffer, png_size_t length));
-+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_push_fill_buffer,(png_structp png_ptr,
-+ png_bytep buffer, png_size_t length),PNG_EMPTY);
- #endif
-
--PNG_EXTERN void PNGCBAPI png_default_write_data PNGARG((png_structp png_ptr,
-- png_bytep data, png_size_t length));
-+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_write_data,(png_structp png_ptr,
-+ png_bytep data, png_size_t length),PNG_EMPTY);
-
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- # ifdef PNG_STDIO_SUPPORTED
--PNG_EXTERN void PNGCBAPI png_default_flush PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_flush,(png_structp png_ptr),
-+ PNG_EMPTY);
- # endif
- #endif
-
- /* Reset the CRC variable */
--PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_reset_crc,(png_structrp png_ptr),PNG_EMPTY);
-
- /* Write the "data" buffer to whatever output you are using */
--PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr,
-- png_const_bytep data, png_size_t length));
-+PNG_INTERNAL_FUNCTION(void,png_write_data,(png_structrp png_ptr,
-+ png_const_bytep data, png_size_t length),PNG_EMPTY);
-
- /* Read and check the PNG file signature */
--PNG_EXTERN void png_read_sig PNGARG((png_structp png_ptr, png_infop info_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_read_sig,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-
- /* Read the chunk header (length + type name) */
--PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(png_uint_32,png_read_chunk_header,(png_structrp png_ptr),
-+ PNG_EMPTY);
-
- /* Read data from whatever input you are using into the "data" buffer */
--PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
-- png_size_t length));
-+PNG_INTERNAL_FUNCTION(void,png_read_data,(png_structrp png_ptr, png_bytep data,
-+ png_size_t length),PNG_EMPTY);
-
- /* Read bytes into buf, and update png_ptr->crc */
--PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
-- png_size_t length));
--
--/* Decompress data in a chunk that uses compression */
--#if defined(PNG_READ_COMPRESSED_TEXT_SUPPORTED)
--PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
-- int comp_type, png_size_t chunklength, png_size_t prefix_length,
-- png_size_t *data_length));
--#endif
-+PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
-+ png_uint_32 length),PNG_EMPTY);
-
- /* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
--PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
-+PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,
-+ png_uint_32 skip),PNG_EMPTY);
-
- /* Read the CRC from the file and compare it to the libpng calculated CRC */
--PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(int,png_crc_error,(png_structrp png_ptr),PNG_EMPTY);
-
- /* Calculate the CRC over a section of data. Note that we are only
- * passing a maximum of 64K on systems that have this as a memory limit,
- * since this is the maximum buffer size we can specify.
- */
--PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr,
-- png_const_bytep ptr, png_size_t length));
-+PNG_INTERNAL_FUNCTION(void,png_calculate_crc,(png_structrp png_ptr,
-+ png_const_bytep ptr, png_size_t length),PNG_EMPTY);
-
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
--PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);
- #endif
-
- /* Write various chunks */
-@@ -606,317 +1046,256 @@
- /* Write the IHDR chunk, and update the png_struct with the necessary
- * information.
- */
--PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
-- png_uint_32 height,
-- int bit_depth, int color_type, int compression_method, int filter_method,
-- int interlace_method));
-+PNG_INTERNAL_FUNCTION(void,png_write_IHDR,(png_structrp png_ptr,
-+ png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
-+ int compression_method, int filter_method, int interlace_method),PNG_EMPTY);
-
--PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr,
-- png_const_colorp palette, png_uint_32 num_pal));
-+PNG_INTERNAL_FUNCTION(void,png_write_PLTE,(png_structrp png_ptr,
-+ png_const_colorp palette, png_uint_32 num_pal),PNG_EMPTY);
-
--PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
-- png_size_t length));
-+PNG_INTERNAL_FUNCTION(void,png_compress_IDAT,(png_structrp png_ptr,
-+ png_const_bytep row_data, png_alloc_size_t row_data_length, int flush),
-+ PNG_EMPTY);
-
--PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_write_IEND,(png_structrp png_ptr),PNG_EMPTY);
-
- #ifdef PNG_WRITE_gAMA_SUPPORTED
--# ifdef PNG_FLOATING_POINT_SUPPORTED
--PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
--# endif
--# ifdef PNG_FIXED_POINT_SUPPORTED
--PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr,
-- png_fixed_point file_gamma));
--# endif
-+PNG_INTERNAL_FUNCTION(void,png_write_gAMA_fixed,(png_structrp png_ptr,
-+ png_fixed_point file_gamma),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_sBIT_SUPPORTED
--PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr,
-- png_const_color_8p sbit, int color_type));
-+PNG_INTERNAL_FUNCTION(void,png_write_sBIT,(png_structrp png_ptr,
-+ png_const_color_8p sbit, int color_type),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_cHRM_SUPPORTED
--# ifdef PNG_FLOATING_POINT_SUPPORTED
--PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
-- double white_x, double white_y,
-- double red_x, double red_y, double green_x, double green_y,
-- double blue_x, double blue_y));
--# endif
--PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
-- png_fixed_point int_white_x, png_fixed_point int_white_y,
-- png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-- int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-- png_fixed_point int_blue_y));
-+PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,
-+ const png_xy *xy), PNG_EMPTY);
-+ /* The xy value must have been previously validated */
- #endif
-
- #ifdef PNG_WRITE_sRGB_SUPPORTED
--PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
-- int intent));
-+PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
-+ int intent),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_iCCP_SUPPORTED
--PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
-- png_const_charp name, int compression_type,
-- png_const_charp profile, int proflen));
-- /* Note to maintainer: profile should be png_bytep */
-+PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
-+ png_const_charp name, png_const_bytep profile), PNG_EMPTY);
-+ /* The profile must have been previously validated for correctness, the
-+ * length comes from the first four bytes. Only the base, deflate,
-+ * compression is supported.
-+ */
- #endif
-
- #ifdef PNG_WRITE_sPLT_SUPPORTED
--PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
-- png_const_sPLT_tp palette));
-+PNG_INTERNAL_FUNCTION(void,png_write_sPLT,(png_structrp png_ptr,
-+ png_const_sPLT_tp palette),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_tRNS_SUPPORTED
--PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr,
-+PNG_INTERNAL_FUNCTION(void,png_write_tRNS,(png_structrp png_ptr,
- png_const_bytep trans, png_const_color_16p values, int number,
-- int color_type));
-+ int color_type),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_bKGD_SUPPORTED
--PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
-- png_const_color_16p values, int color_type));
-+PNG_INTERNAL_FUNCTION(void,png_write_bKGD,(png_structrp png_ptr,
-+ png_const_color_16p values, int color_type),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_hIST_SUPPORTED
--PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr,
-- png_const_uint_16p hist, int num_hist));
-+PNG_INTERNAL_FUNCTION(void,png_write_hIST,(png_structrp png_ptr,
-+ png_const_uint_16p hist, int num_hist),PNG_EMPTY);
- #endif
-
- /* Chunks that have keywords */
--#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-- defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
--PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
-- png_const_charp key, png_charpp new_key));
--#endif
--
- #ifdef PNG_WRITE_tEXt_SUPPORTED
--PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_const_charp key,
-- png_const_charp text, png_size_t text_len));
-+PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr,
-+ png_const_charp key, png_const_charp text, png_size_t text_len),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_zTXt_SUPPORTED
--PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_const_charp key,
-- png_const_charp text, png_size_t text_len, int compression));
-+PNG_INTERNAL_FUNCTION(void,png_write_zTXt,(png_structrp png_ptr, png_const_charp
-+ key, png_const_charp text, int compression),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_iTXt_SUPPORTED
--PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
-+PNG_INTERNAL_FUNCTION(void,png_write_iTXt,(png_structrp png_ptr,
- int compression, png_const_charp key, png_const_charp lang,
-- png_const_charp lang_key, png_const_charp text));
-+ png_const_charp lang_key, png_const_charp text),PNG_EMPTY);
- #endif
-
- #ifdef PNG_TEXT_SUPPORTED /* Added at version 1.0.14 and 1.2.4 */
--PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_const_textp text_ptr, int num_text));
-+PNG_INTERNAL_FUNCTION(int,png_set_text_2,(png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_textp text_ptr, int num_text),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_oFFs_SUPPORTED
--PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
-- png_int_32 x_offset, png_int_32 y_offset, int unit_type));
-+PNG_INTERNAL_FUNCTION(void,png_write_oFFs,(png_structrp png_ptr,
-+ png_int_32 x_offset, png_int_32 y_offset, int unit_type),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_pCAL_SUPPORTED
--PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
-- png_int_32 X0, png_int_32 X1, int type, int nparams,
-- png_const_charp units, png_charpp params));
-+PNG_INTERNAL_FUNCTION(void,png_write_pCAL,(png_structrp png_ptr,
-+ png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
-+ png_const_charp units, png_charpp params),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_pHYs_SUPPORTED
--PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
-+PNG_INTERNAL_FUNCTION(void,png_write_pHYs,(png_structrp png_ptr,
- png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
-- int unit_type));
-+ int unit_type),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_tIME_SUPPORTED
--PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
-- png_const_timep mod_time));
-+PNG_INTERNAL_FUNCTION(void,png_write_tIME,(png_structrp png_ptr,
-+ png_const_timep mod_time),PNG_EMPTY);
- #endif
-
- #ifdef PNG_WRITE_sCAL_SUPPORTED
--PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
-- int unit, png_const_charp width, png_const_charp height));
-+PNG_INTERNAL_FUNCTION(void,png_write_sCAL_s,(png_structrp png_ptr,
-+ int unit, png_const_charp width, png_const_charp height),PNG_EMPTY);
- #endif
-
- /* Called when finished processing a row of data */
--PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_write_finish_row,(png_structrp png_ptr),
-+ PNG_EMPTY);
-
- /* Internal use only. Called before first row of data */
--PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_write_start_row,(png_structrp png_ptr),
-+ PNG_EMPTY);
-
--/* Combine a row of data, dealing with alpha, etc. if requested */
--PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
-- int mask));
-+/* Combine a row of data, dealing with alpha, etc. if requested. 'row' is an
-+ * array of png_ptr->width pixels. If the image is not interlaced or this
-+ * is the final pass this just does a memcpy, otherwise the "display" flag
-+ * is used to determine whether to copy pixels that are not in the current pass.
-+ *
-+ * Because 'png_do_read_interlace' (below) replicates pixels this allows this
-+ * function to achieve the documented 'blocky' appearance during interlaced read
-+ * if display is 1 and the 'sparkle' appearance, where existing pixels in 'row'
-+ * are not changed if they are not in the current pass, when display is 0.
-+ *
-+ * 'display' must be 0 or 1, otherwise the memcpy will be done regardless.
-+ *
-+ * The API always reads from the png_struct row buffer and always assumes that
-+ * it is full width (png_do_read_interlace has already been called.)
-+ *
-+ * This function is only ever used to write to row buffers provided by the
-+ * caller of the relevant libpng API and the row must have already been
-+ * transformed by the read transformations.
-+ *
-+ * The PNG_USE_COMPILE_TIME_MASKS option causes generation of pre-computed
-+ * bitmasks for use within the code, otherwise runtime generated masks are used.
-+ * The default is compile time masks.
-+ */
-+#ifndef PNG_USE_COMPILE_TIME_MASKS
-+# define PNG_USE_COMPILE_TIME_MASKS 1
-+#endif
-+PNG_INTERNAL_FUNCTION(void,png_combine_row,(png_const_structrp png_ptr,
-+ png_bytep row, int display),PNG_EMPTY);
-
- #ifdef PNG_READ_INTERLACING_SUPPORTED
--/* Expand an interlaced row */
--/* OLD pre-1.0.9 interface:
--PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
-- png_bytep row, int pass, png_uint_32 transformations));
-+/* Expand an interlaced row: the 'row_info' describes the pass data that has
-+ * been read in and must correspond to the pixels in 'row', the pixels are
-+ * expanded (moved apart) in 'row' to match the final layout, when doing this
-+ * the pixels are *replicated* to the intervening space. This is essential for
-+ * the correct operation of png_combine_row, above.
- */
--PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_do_read_interlace,(png_row_infop row_info,
-+ png_bytep row, int pass, png_uint_32 transformations),PNG_EMPTY);
- #endif
-
- /* GRR TO DO (2.0 or whenever): simplify other internal calling interfaces */
-
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* Grab pixels out of a row for an interlaced pass */
--PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
-- png_bytep row, int pass));
-+PNG_INTERNAL_FUNCTION(void,png_do_write_interlace,(png_row_infop row_info,
-+ png_bytep row, int pass),PNG_EMPTY);
- #endif
-
--/* Unfilter a row */
--PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
-- png_row_infop row_info, png_bytep row, png_const_bytep prev_row,
-- int filter));
-+/* Unfilter a row: check the filter value before calling this, there is no point
-+ * calling it for PNG_FILTER_VALUE_NONE.
-+ */
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row,(png_structrp pp, png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row, int filter),PNG_EMPTY);
-+
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_neon,(png_row_infop row_info,
-+ png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_neon,(png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_neon,(png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_neon,(png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
-+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-
- /* Choose the best filter to use and filter the row data */
--PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
-- png_row_infop row_info));
-+PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
-+ png_row_infop row_info),PNG_EMPTY);
-
--/* Finish a row while reading, dealing with interlacing passes, etc. */
--PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
-+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,
-+ png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);
-+ /* Read 'avail_out' bytes of data from the IDAT stream. If the output buffer
-+ * is NULL the function checks, instead, for the end of the stream. In this
-+ * case a benign error will be issued if the stream end is not found or if
-+ * extra data has to be consumed.
-+ */
-+PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+ /* This cleans up when the IDAT LZ stream does not end when the last image
-+ * byte is read; there is still some pending input.
-+ */
-+
-+PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+ /* Finish a row while reading, dealing with interlacing passes, etc. */
-+#endif /* SEQUENTIAL_READ */
-
- /* Initialize the row buffers, etc. */
--PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
-
- #ifdef PNG_READ_TRANSFORMS_SUPPORTED
- /* Optional call to update the users info structure */
--PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_read_transform_info,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
- #endif
-
--/* These are the functions that do the transformations */
--#ifdef PNG_READ_FILLER_SUPPORTED
--PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-- png_bytep row, png_uint_32 filler, png_uint_32 flags));
--#endif
--
--#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
--PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
--PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
--PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
--PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
-+/* Shared transform functions, defined in pngtran.c */
- #if defined(PNG_WRITE_FILLER_SUPPORTED) || \
- defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
--PNG_EXTERN void png_do_strip_channel PNGARG((png_row_infop row_info,
-- png_bytep row, int at_start));
-+PNG_INTERNAL_FUNCTION(void,png_do_strip_channel,(png_row_infop row_info,
-+ png_bytep row, int at_start),PNG_EMPTY);
- #endif
-
- #ifdef PNG_16BIT_SUPPORTED
- #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
--PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info,
-- png_bytep row));
-+PNG_INTERNAL_FUNCTION(void,png_do_swap,(png_row_infop row_info,
-+ png_bytep row),PNG_EMPTY);
- #endif
- #endif
-
- #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
- defined(PNG_WRITE_PACKSWAP_SUPPORTED)
--PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
--PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr,
-- png_row_infop row_info, png_bytep row));
--#endif
--
--#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
--PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_PACK_SUPPORTED
--PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_SHIFT_SUPPORTED
--PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info,
-- png_bytep row, png_const_color_8p sig_bits));
-+PNG_INTERNAL_FUNCTION(void,png_do_packswap,(png_row_infop row_info,
-+ png_bytep row),PNG_EMPTY);
- #endif
-
- #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
--PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
--PNG_EXTERN void png_do_scale_16_to_8 PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
--PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_READ_QUANTIZE_SUPPORTED
--PNG_EXTERN void png_do_quantize PNGARG((png_row_infop row_info,
-- png_bytep row, png_const_bytep palette_lookup,
-- png_const_bytep quantize_lookup));
--
--# ifdef PNG_CORRECT_PALETTE_SUPPORTED
--PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
-- png_colorp palette, int num_palette));
--# endif
-+PNG_INTERNAL_FUNCTION(void,png_do_invert,(png_row_infop row_info,
-+ png_bytep row),PNG_EMPTY);
- #endif
-
- #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
--PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info,
-- png_bytep row));
--#endif
--
--#ifdef PNG_WRITE_PACK_SUPPORTED
--PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
-- png_bytep row, png_uint_32 bit_depth));
--#endif
--
--#ifdef PNG_WRITE_SHIFT_SUPPORTED
--PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info,
-- png_bytep row, png_const_color_8p bit_depth));
--#endif
--
--#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-- defined(PNG_READ_ALPHA_MODE_SUPPORTED)
--PNG_EXTERN void png_do_compose PNGARG((png_row_infop row_info,
-- png_bytep row, png_structp png_ptr));
--#endif
--
--#ifdef PNG_READ_GAMMA_SUPPORTED
--PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info,
-- png_bytep row, png_structp png_ptr));
--#endif
--
--#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
--PNG_EXTERN void png_do_encode_alpha PNGARG((png_row_infop row_info,
-- png_bytep row, png_structp png_ptr));
--#endif
--
--#ifdef PNG_READ_EXPAND_SUPPORTED
--PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
-- png_bytep row, png_const_colorp palette, png_const_bytep trans,
-- int num_trans));
--PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
-- png_bytep row, png_const_color_16p trans_color));
--#endif
--
--#ifdef PNG_READ_EXPAND_16_SUPPORTED
--PNG_EXTERN void png_do_expand_16 PNGARG((png_row_infop row_info,
-- png_bytep row));
-+PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,
-+ png_bytep row),PNG_EMPTY);
- #endif
-
- /* The following decodes the appropriate chunks, and does error correction,
-@@ -924,208 +1303,283 @@
- */
-
- /* Decode the IHDR chunk */
--PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
--PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
--PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_IHDR,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_handle_PLTE,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_handle_IEND,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-
- #ifdef PNG_READ_bKGD_SUPPORTED
--PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_bKGD,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_cHRM_SUPPORTED
--PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_gAMA_SUPPORTED
--PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_gAMA,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_hIST_SUPPORTED
--PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_iCCP_SUPPORTED
--PNG_EXTERN void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
--#endif /* PNG_READ_iCCP_SUPPORTED */
-+PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+#endif /* READ_iCCP */
-
- #ifdef PNG_READ_iTXt_SUPPORTED
--PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_oFFs_SUPPORTED
--PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_oFFs,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_pCAL_SUPPORTED
--PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_pCAL,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_pHYs_SUPPORTED
--PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_pHYs,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_sBIT_SUPPORTED
--PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_sBIT,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_sCAL_SUPPORTED
--PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_sPLT_SUPPORTED
--PNG_EXTERN void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
--#endif /* PNG_READ_sPLT_SUPPORTED */
-+PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+#endif /* READ_sPLT */
-
- #ifdef PNG_READ_sRGB_SUPPORTED
--PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_tEXt_SUPPORTED
--PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_tEXt,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_tIME_SUPPORTED
--PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_tIME,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_tRNS_SUPPORTED
--PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_tRNS,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_zTXt_SUPPORTED
--PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-- png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
- #endif
-
--PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_uint_32 length));
-+PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_structrp png_ptr,
-+ png_uint_32 chunk_name),PNG_EMPTY);
-
--PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
-- png_const_bytep chunk_name));
-+PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
-+ /* This is the function that gets called for unknown chunks. The 'keep'
-+ * argument is either non-zero for a known chunk that has been set to be
-+ * handled as unknown or zero for an unknown chunk. By default the function
-+ * just skips the chunk or errors out if it is critical.
-+ */
-+
-+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
-+ defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-+PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
-+ (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY);
-+ /* Exactly as the API png_handle_as_unknown() except that the argument is a
-+ * 32-bit chunk name, not a string.
-+ */
-+#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
-
- /* Handle the transformations for reading and writing */
- #ifdef PNG_READ_TRANSFORMS_SUPPORTED
--PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_do_read_transformations,(png_structrp png_ptr,
-+ png_row_infop row_info),PNG_EMPTY);
- #endif
- #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
--PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_do_write_transformations,(png_structrp png_ptr,
-+ png_row_infop row_info),PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_TRANSFORMS_SUPPORTED
--PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_init_read_transformations,(png_structrp png_ptr),
-+ PNG_EMPTY);
- #endif
-
- #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
--PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
--PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
-- png_uint_32 length));
--PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
--PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
--PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
-- png_bytep buffer, png_size_t buffer_length));
--PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
--PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
-- png_bytep buffer, png_size_t buffer_length));
--PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
--PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_uint_32 length));
--PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
--PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
--PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_push_read_chunk,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_read_sig,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_check_crc,(png_structrp png_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_crc_skip,(png_structrp png_ptr,
-+ png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_crc_finish,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_save_buffer,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_restore_buffer,(png_structrp png_ptr,
-+ png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_read_IDAT,(png_structrp png_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
-+ png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_have_row,(png_structrp png_ptr,
-+ png_bytep row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_read_end,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),
-+ PNG_EMPTY);
- # ifdef PNG_READ_tEXt_SUPPORTED
--PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_uint_32 length));
--PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_push_handle_tEXt,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_read_tEXt,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
- # endif
- # ifdef PNG_READ_zTXt_SUPPORTED
--PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_uint_32 length));
--PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_push_handle_zTXt,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_read_zTXt,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
- # endif
- # ifdef PNG_READ_iTXt_SUPPORTED
--PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_uint_32 length));
--PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
-- png_infop info_ptr));
-+PNG_INTERNAL_FUNCTION(void,png_push_handle_iTXt,(png_structrp png_ptr,
-+ png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
-+ png_inforp info_ptr),PNG_EMPTY);
- # endif
-
--#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-+#endif /* PROGRESSIVE_READ */
-
--#ifdef PNG_MNG_FEATURES_SUPPORTED
--PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
-- png_bytep row));
--PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
-- png_bytep row));
-+/* Added at libpng version 1.6.0 */
-+#ifdef PNG_GAMMA_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_fixed_point gAMA), PNG_EMPTY);
-+ /* Set the colorspace gamma with a value provided by the application or by
-+ * the gAMA chunk on read. The value will override anything set by an ICC
-+ * profile.
-+ */
-+
-+PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,
-+ png_inforp info_ptr), PNG_EMPTY);
-+ /* Synchronize the info 'valid' flags with the colorspace */
-+
-+PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,
-+ png_inforp info_ptr), PNG_EMPTY);
-+ /* Copy the png_struct colorspace to the info_struct and call the above to
-+ * synchronize the flags. Checks for NULL info_ptr and does nothing.
-+ */
- #endif
-
- /* Added at libpng version 1.4.0 */
--#ifdef PNG_CHECK_cHRM_SUPPORTED
--PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,
-- png_fixed_point int_white_x, png_fixed_point int_white_y,
-- png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-- int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-- png_fixed_point int_blue_y));
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+/* These internal functions are for maintaining the colorspace structure within
-+ * a png_info or png_struct (or, indeed, both).
-+ */
-+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_chromaticities,
-+ (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy,
-+ int preferred), PNG_EMPTY);
-+
-+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_endpoints,
-+ (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_XYZ *XYZ,
-+ int preferred), PNG_EMPTY);
-+
-+#ifdef PNG_sRGB_SUPPORTED
-+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_sRGB,(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, int intent), PNG_EMPTY);
-+ /* This does set the colorspace gAMA and cHRM values too, but doesn't set the
-+ * flags to write them, if it returns false there was a problem and an error
-+ * message has already been output (but the colorspace may still need to be
-+ * synced to record the invalid flag).
-+ */
-+#endif /* sRGB */
-+
-+#ifdef PNG_iCCP_SUPPORTED
-+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_const_charp name,
-+ png_uint_32 profile_length, png_const_bytep profile, int color_type),
-+ PNG_EMPTY);
-+ /* The 'name' is used for information only */
-+
-+/* Routines for checking parts of an ICC profile. */
-+PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_const_charp name,
-+ png_uint_32 profile_length), PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_const_charp name,
-+ png_uint_32 profile_length,
-+ png_const_bytep profile /* first 132 bytes only */, int color_type),
-+ PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
-+ png_colorspacerp colorspace, png_const_charp name,
-+ png_uint_32 profile_length,
-+ png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
-+#ifdef PNG_sRGB_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_icc_set_sRGB,(
-+ png_const_structrp png_ptr, png_colorspacerp colorspace,
-+ png_const_bytep profile, uLong adler), PNG_EMPTY);
-+ /* 'adler' is the Adler32 checksum of the uncompressed profile data. It may
-+ * be zero to indicate that it is not available. It is used, if provided,
-+ * as a fast check on the profile when checking to see if it is sRGB.
-+ */
-+#endif
-+#endif /* iCCP */
-+
-+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_colorspace_set_rgb_coefficients,
-+ (png_structrp png_ptr), PNG_EMPTY);
-+ /* Set the rgb_to_gray coefficients from the colorspace Y values */
-+#endif /* READ_RGB_TO_GRAY */
-+#endif /* COLORSPACE */
-+
-+/* Added at libpng version 1.4.0 */
-+PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,
-+ png_uint_32 width, png_uint_32 height, int bit_depth,
-+ int color_type, int interlace_type, int compression_type,
-+ int filter_type),PNG_EMPTY);
-+
-+/* Added at libpng version 1.5.10 */
-+#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
-+ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
-+PNG_INTERNAL_FUNCTION(void,png_do_check_palette_indexes,
-+ (png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY);
- #endif
-
--#ifdef PNG_CHECK_cHRM_SUPPORTED
--/* Added at libpng version 1.2.34 and 1.4.0 */
--/* Currently only used by png_check_cHRM_fixed */
--PNG_EXTERN void png_64bit_product PNGARG((long v1, long v2,
-- unsigned long *hi_product, unsigned long *lo_product));
--#endif
--
--/* Added at libpng version 1.4.0 */
--PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,
-- png_uint_32 width, png_uint_32 height, int bit_depth,
-- int color_type, int interlace_type, int compression_type,
-- int filter_type));
--
--/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
--PNG_EXTERN void png_read_destroy PNGARG((png_structp png_ptr,
-- png_infop info_ptr, png_infop end_info_ptr));
--
--/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
--PNG_EXTERN void png_write_destroy PNGARG((png_structp png_ptr));
--
--#ifdef USE_FAR_KEYWORD /* memory model conversion function */
--PNG_EXTERN void *png_far_to_near PNGARG((png_structp png_ptr, png_voidp ptr,
-- int check));
--#endif /* USE_FAR_KEYWORD */
--
- #if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
--PNG_EXTERN PNG_FUNCTION(void, png_fixed_error, (png_structp png_ptr,
-+PNG_INTERNAL_FUNCTION(void,png_fixed_error,(png_const_structrp png_ptr,
- png_const_charp name),PNG_NORETURN);
- #endif
-
-@@ -1133,8 +1587,8 @@
- * the end. Always leaves the buffer nul terminated. Never errors out (and
- * there is no error code.)
- */
--PNG_EXTERN size_t png_safecat(png_charp buffer, size_t bufsize, size_t pos,
-- png_const_charp string);
-+PNG_INTERNAL_FUNCTION(size_t,png_safecat,(png_charp buffer, size_t bufsize,
-+ size_t pos, png_const_charp string),PNG_EMPTY);
-
- /* Various internal functions to handle formatted warning messages, currently
- * only implemented for warnings.
-@@ -1145,8 +1599,8 @@
- * Returns the pointer to the start of the formatted string. This utility only
- * does unsigned values.
- */
--PNG_EXTERN png_charp png_format_number(png_const_charp start, png_charp end,
-- int format, png_alloc_size_t number);
-+PNG_INTERNAL_FUNCTION(png_charp,png_format_number,(png_const_charp start,
-+ png_charp end, int format, png_alloc_size_t number),PNG_EMPTY);
-
- /* Convenience macro that takes an array: */
- #define PNG_FORMAT_NUMBER(buffer,format,number) \
-@@ -1170,7 +1624,7 @@
- #ifdef PNG_WARNINGS_SUPPORTED
- /* New defines and members adding in libpng-1.5.4 */
- # define PNG_WARNING_PARAMETER_SIZE 32
--# define PNG_WARNING_PARAMETER_COUNT 8
-+# define PNG_WARNING_PARAMETER_COUNT 8 /* Maximum 9; see pngerror.c */
-
- /* An l-value of this type has to be passed to the APIs below to cache the
- * values of the parameters to a formatted warning message.
-@@ -1178,48 +1632,97 @@
- typedef char png_warning_parameters[PNG_WARNING_PARAMETER_COUNT][
- PNG_WARNING_PARAMETER_SIZE];
-
--PNG_EXTERN void png_warning_parameter(png_warning_parameters p, int number,
-- png_const_charp string);
-- /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
-- * including the trailing '\0'.
-- */
--PNG_EXTERN void png_warning_parameter_unsigned(png_warning_parameters p,
-- int number, int format, png_alloc_size_t value);
-- /* Use png_alloc_size_t because it is an unsigned type as big as any we
-- * need to output. Use the following for a signed value.
-- */
--PNG_EXTERN void png_warning_parameter_signed(png_warning_parameters p,
-- int number, int format, png_int_32 value);
-+PNG_INTERNAL_FUNCTION(void,png_warning_parameter,(png_warning_parameters p,
-+ int number, png_const_charp string),PNG_EMPTY);
-+ /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
-+ * including the trailing '\0'.
-+ */
-+PNG_INTERNAL_FUNCTION(void,png_warning_parameter_unsigned,
-+ (png_warning_parameters p, int number, int format, png_alloc_size_t value),
-+ PNG_EMPTY);
-+ /* Use png_alloc_size_t because it is an unsigned type as big as any we
-+ * need to output. Use the following for a signed value.
-+ */
-+PNG_INTERNAL_FUNCTION(void,png_warning_parameter_signed,
-+ (png_warning_parameters p, int number, int format, png_int_32 value),
-+ PNG_EMPTY);
-
--PNG_EXTERN void png_formatted_warning(png_structp png_ptr,
-- png_warning_parameters p, png_const_charp message);
-- /* 'message' follows the X/Open approach of using @1, @2 to insert
-- * parameters previously supplied using the above functions. Errors in
-- * specifying the paramters will simple result in garbage substitutions.
-- */
-+PNG_INTERNAL_FUNCTION(void,png_formatted_warning,(png_const_structrp png_ptr,
-+ png_warning_parameters p, png_const_charp message),PNG_EMPTY);
-+ /* 'message' follows the X/Open approach of using @1, @2 to insert
-+ * parameters previously supplied using the above functions. Errors in
-+ * specifying the parameters will simply result in garbage substitutions.
-+ */
- #endif
-
-+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-+/* Application errors (new in 1.6); use these functions (declared below) for
-+ * errors in the parameters or order of API function calls on read. The
-+ * 'warning' should be used for an error that can be handled completely; the
-+ * 'error' for one which can be handled safely but which may lose application
-+ * information or settings.
-+ *
-+ * By default these both result in a png_error call prior to release, while in a
-+ * released version the 'warning' is just a warning. However if the application
-+ * explicitly disables benign errors (explicitly permitting the code to lose
-+ * information) they both turn into warnings.
-+ *
-+ * If benign errors aren't supported they end up as the corresponding base call
-+ * (png_warning or png_error.)
-+ */
-+PNG_INTERNAL_FUNCTION(void,png_app_warning,(png_const_structrp png_ptr,
-+ png_const_charp message),PNG_EMPTY);
-+ /* The application provided invalid parameters to an API function or called
-+ * an API function at the wrong time, libpng can completely recover.
-+ */
-+
-+PNG_INTERNAL_FUNCTION(void,png_app_error,(png_const_structrp png_ptr,
-+ png_const_charp message),PNG_EMPTY);
-+ /* As above but libpng will ignore the call, or attempt some other partial
-+ * recovery from the error.
-+ */
-+#else
-+# define png_app_warning(pp,s) png_warning(pp,s)
-+# define png_app_error(pp,s) png_error(pp,s)
-+#endif
-+
-+PNG_INTERNAL_FUNCTION(void,png_chunk_report,(png_const_structrp png_ptr,
-+ png_const_charp message, int error),PNG_EMPTY);
-+ /* Report a recoverable issue in chunk data. On read this is used to report
-+ * a problem found while reading a particular chunk and the
-+ * png_chunk_benign_error or png_chunk_warning function is used as
-+ * appropriate. On write this is used to report an error that comes from
-+ * data set via an application call to a png_set_ API and png_app_error or
-+ * png_app_warning is used as appropriate.
-+ *
-+ * The 'error' parameter must have one of the following values:
-+ */
-+#define PNG_CHUNK_WARNING 0 /* never an error */
-+#define PNG_CHUNK_WRITE_ERROR 1 /* an error only on write */
-+#define PNG_CHUNK_ERROR 2 /* always an error */
-+
- /* ASCII to FP interfaces, currently only implemented if sCAL
- * support is required.
- */
--#if defined(PNG_READ_sCAL_SUPPORTED)
-+#if defined(PNG_sCAL_SUPPORTED)
- /* MAX_DIGITS is actually the maximum number of characters in an sCAL
- * width or height, derived from the precision (number of significant
-- * digits - a build time settable option) and assumpitions about the
-+ * digits - a build time settable option) and assumptions about the
- * maximum ridiculous exponent.
- */
- #define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)
-
- #ifdef PNG_FLOATING_POINT_SUPPORTED
--PNG_EXTERN void png_ascii_from_fp PNGARG((png_structp png_ptr, png_charp ascii,
-- png_size_t size, double fp, unsigned int precision));
-+PNG_INTERNAL_FUNCTION(void,png_ascii_from_fp,(png_const_structrp png_ptr,
-+ png_charp ascii, png_size_t size, double fp, unsigned int precision),
-+ PNG_EMPTY);
- #endif /* FLOATING_POINT */
-
- #ifdef PNG_FIXED_POINT_SUPPORTED
--PNG_EXTERN void png_ascii_from_fixed PNGARG((png_structp png_ptr,
-- png_charp ascii, png_size_t size, png_fixed_point fp));
-+PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
-+ png_charp ascii, png_size_t size, png_fixed_point fp),PNG_EMPTY);
- #endif /* FIXED_POINT */
--#endif /* READ_sCAL */
-+#endif /* sCAL */
-
- #if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
- /* An internal API to validate the format of a floating point number.
-@@ -1243,7 +1746,7 @@
- * NOTE: The dangling E problem.
- * There is a PNG valid floating point number in the following:
- *
-- * PNG floating point numb1.ers are not greedy.
-+ * PNG floating point numbers are not greedy.
- *
- * Working this out requires *TWO* character lookahead (because of the
- * sign), the parser does not do this - it will fail at the 'r' - this
-@@ -1294,14 +1797,14 @@
- #define PNG_FP_IS_POSITIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_Z_MASK)
- #define PNG_FP_IS_NEGATIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_NZ_MASK)
-
--/* The actual parser. This can be called repeatedly, it updates
-+/* The actual parser. This can be called repeatedly. It updates
- * the index into the string and the state variable (which must
-- * be initialzed to 0). It returns a result code, as above. There
-+ * be initialized to 0). It returns a result code, as above. There
- * is no point calling the parser any more if it fails to advance to
- * the end of the string - it is stuck on an invalid character (or
- * terminated by '\0').
- *
-- * Note that the pointer will consume an E or even an E+ then leave
-+ * Note that the pointer will consume an E or even an E+ and then leave
- * a 'maybe' state even though a preceding integer.fraction is valid.
- * The PNG_FP_WAS_VALID flag indicates that a preceding substring was
- * a valid number. It's possible to recover from this by calling
-@@ -1309,8 +1812,8 @@
- * that omits the last character (i.e. set the size to the index of
- * the problem character.) This has not been tested within libpng.
- */
--PNG_EXTERN int png_check_fp_number PNGARG((png_const_charp string,
-- png_size_t size, int *statep, png_size_tp whereami));
-+PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
-+ png_size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
-
- /* This is the same but it checks a complete string and returns true
- * only if it just contains a floating point number. As of 1.5.4 this
-@@ -1318,11 +1821,11 @@
- * it was valid (otherwise it returns 0.) This can be used for testing
- * for negative or zero values using the sticky flag.
- */
--PNG_EXTERN int png_check_fp_string PNGARG((png_const_charp string,
-- png_size_t size));
-+PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
-+ png_size_t size),PNG_EMPTY);
- #endif /* pCAL || sCAL */
-
--#if defined(PNG_READ_GAMMA_SUPPORTED) ||\
-+#if defined(PNG_GAMMA_SUPPORTED) ||\
- defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
- /* Added at libpng version 1.5.0 */
- /* This is a utility to provide a*times/div (rounded) and indicate
-@@ -1330,29 +1833,37 @@
- * for overflow, true (1) if no overflow, in which case *res
- * holds the result.
- */
--PNG_EXTERN int png_muldiv PNGARG((png_fixed_point_p res, png_fixed_point a,
-- png_int_32 multiplied_by, png_int_32 divided_by));
-+PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,
-+ png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);
- #endif
-
- #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
- /* Same deal, but issue a warning on overflow and return 0. */
--PNG_EXTERN png_fixed_point png_muldiv_warn PNGARG((png_structp png_ptr,
-- png_fixed_point a, png_int_32 multiplied_by, png_int_32 divided_by));
-+PNG_INTERNAL_FUNCTION(png_fixed_point,png_muldiv_warn,
-+ (png_const_structrp png_ptr, png_fixed_point a, png_int_32 multiplied_by,
-+ png_int_32 divided_by),PNG_EMPTY);
- #endif
-
--#ifdef PNG_READ_GAMMA_SUPPORTED
-+#ifdef PNG_GAMMA_SUPPORTED
- /* Calculate a reciprocal - used for gamma values. This returns
-- * 0 if the argument is 0 in order to maintain an undefined value,
-+ * 0 if the argument is 0 in order to maintain an undefined value;
- * there are no warnings.
- */
--PNG_EXTERN png_fixed_point png_reciprocal PNGARG((png_fixed_point a));
-+PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
-+ PNG_EMPTY);
-
-+#ifdef PNG_READ_GAMMA_SUPPORTED
- /* The same but gives a reciprocal of the product of two fixed point
- * values. Accuracy is suitable for gamma calculations but this is
-- * not exact - use png_muldiv for that.
-+ * not exact - use png_muldiv for that. Only required at present on read.
- */
--PNG_EXTERN png_fixed_point png_reciprocal2 PNGARG((png_fixed_point a,
-- png_fixed_point b));
-+PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,
-+ png_fixed_point b),PNG_EMPTY);
-+#endif
-+
-+/* Return true if the gamma value is significantly different from 1.0 */
-+PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
-+ PNG_EMPTY);
- #endif
-
- #ifdef PNG_READ_GAMMA_SUPPORTED
-@@ -1363,19 +1874,93 @@
- * While the input is an 'unsigned' value it must actually be the
- * correct bit value - 0..255 or 0..65535 as required.
- */
--PNG_EXTERN png_uint_16 png_gamma_correct PNGARG((png_structp png_ptr,
-- unsigned int value, png_fixed_point gamma_value));
--PNG_EXTERN int png_gamma_significant PNGARG((png_fixed_point gamma_value));
--PNG_EXTERN png_uint_16 png_gamma_16bit_correct PNGARG((unsigned int value,
-- png_fixed_point gamma_value));
--PNG_EXTERN png_byte png_gamma_8bit_correct PNGARG((unsigned int value,
-- png_fixed_point gamma_value));
--PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr,
-- int bit_depth));
-+PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_correct,(png_structrp png_ptr,
-+ unsigned int value, png_fixed_point gamma_value),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_16bit_correct,(unsigned int value,
-+ png_fixed_point gamma_value),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(png_byte,png_gamma_8bit_correct,(unsigned int value,
-+ png_fixed_point gamma_value),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),
-+ PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,
-+ int bit_depth),PNG_EMPTY);
- #endif
-
--/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
-+/* SIMPLIFIED READ/WRITE SUPPORT */
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-+/* The internal structure that png_image::opaque points to. */
-+typedef struct png_control
-+{
-+ png_structp png_ptr;
-+ png_infop info_ptr;
-+ png_voidp error_buf; /* Always a jmp_buf at present. */
-
-+ png_const_bytep memory; /* Memory buffer. */
-+ png_size_t size; /* Size of the memory buffer. */
-+
-+ unsigned int for_write :1; /* Otherwise it is a read structure */
-+ unsigned int owned_file :1; /* We own the file in io_ptr */
-+} png_control;
-+
-+/* Return the pointer to the jmp_buf from a png_control: necessary because C
-+ * does not reveal the type of the elements of jmp_buf.
-+ */
-+#ifdef __cplusplus
-+# define png_control_jmp_buf(pc) (((jmp_buf*)((pc)->error_buf))[0])
-+#else
-+# define png_control_jmp_buf(pc) ((pc)->error_buf)
-+#endif
-+
-+/* Utility to safely execute a piece of libpng code catching and logging any
-+ * errors that might occur. Returns true on success, false on failure (either
-+ * of the function or as a result of a png_error.)
-+ */
-+PNG_INTERNAL_CALLBACK(void,png_safe_error,(png_structp png_ptr,
-+ png_const_charp error_message),PNG_NORETURN);
-+
-+#ifdef PNG_WARNINGS_SUPPORTED
-+PNG_INTERNAL_CALLBACK(void,png_safe_warning,(png_structp png_ptr,
-+ png_const_charp warning_message),PNG_EMPTY);
-+#else
-+# define png_safe_warning 0/*dummy argument*/
-+#endif
-+
-+PNG_INTERNAL_FUNCTION(int,png_safe_execute,(png_imagep image,
-+ int (*function)(png_voidp), png_voidp arg),PNG_EMPTY);
-+
-+/* Utility to log an error; this also cleans up the png_image; the function
-+ * always returns 0 (false).
-+ */
-+PNG_INTERNAL_FUNCTION(int,png_image_error,(png_imagep image,
-+ png_const_charp error_message),PNG_EMPTY);
-+
-+#ifndef PNG_SIMPLIFIED_READ_SUPPORTED
-+/* png_image_free is used by the write code but not exported */
-+PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY);
-+#endif /* !SIMPLIFIED_READ */
-+
-+#endif /* SIMPLIFIED READ/WRITE */
-+
-+/* These are initialization functions for hardware specific PNG filter
-+ * optimizations; list these here then select the appropriate one at compile
-+ * time using the macro PNG_FILTER_OPTIMIZATIONS. If the macro is not defined
-+ * the generic code is used.
-+ */
-+#ifdef PNG_FILTER_OPTIMIZATIONS
-+PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
-+ unsigned int bpp), PNG_EMPTY);
-+ /* Just declare the optimization that will be used */
-+#else
-+ /* List *all* the possible optimizations here - this branch is required if
-+ * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in
-+ * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.
-+ */
-+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
-+ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
-+#endif
-+
-+/* Maintainer: Put new private prototypes here ^ */
-
- #include "pngdebug.h"
-
-@@ -1383,4 +1968,5 @@
- }
- #endif
-
-+#endif /* PNG_VERSION_INFO_ONLY */
- #endif /* PNGPRIV_H */
---- ./jdk/src/share/native/sun/awt/libpng/pngread.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngread.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -43,6 +43,9 @@
- */
-
- #include "pngpriv.h"
-+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
-+# include <errno.h>
-+#endif
-
- #ifdef PNG_READ_SUPPORTED
-
-@@ -51,10 +54,12 @@
- png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
- png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
- {
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-- warn_fn, NULL, NULL, NULL));
-+#ifndef PNG_USER_MEM_SUPPORTED
-+ png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-+ error_fn, warn_fn, NULL, NULL, NULL);
-+#else
-+ return png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-+ warn_fn, NULL, NULL, NULL);
- }
-
- /* Alternate create PNG structure for reading, and allocate any memory
-@@ -65,134 +70,40 @@
- png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
- png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
- {
--#endif /* PNG_USER_MEM_SUPPORTED */
--
--#ifdef PNG_SETJMP_SUPPORTED
-- volatile
--#endif
-- png_structp png_ptr;
-- volatile int png_cleanup_needed = 0;
--
--#ifdef PNG_SETJMP_SUPPORTED
--#ifdef USE_FAR_KEYWORD
-- jmp_buf tmp_jmpbuf;
--#endif
--#endif
--
-- png_debug(1, "in png_create_read_struct");
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-- malloc_fn, mem_ptr);
--#else
-- png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
--#endif
-- if (png_ptr == NULL)
-- return (NULL);
--
-- /* Added at libpng-1.2.6 */
--#ifdef PNG_USER_LIMITS_SUPPORTED
-- png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-- png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
--
--# ifdef PNG_USER_CHUNK_CACHE_MAX
-- /* Added at libpng-1.2.43 and 1.4.0 */
-- png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
--# endif
--
--# ifdef PNG_SET_USER_CHUNK_MALLOC_MAX
-- /* Added at libpng-1.2.43 and 1.4.1 */
-- png_ptr->user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
--# endif
--#endif
--
--#ifdef PNG_SETJMP_SUPPORTED
--/* Applications that neglect to set up their own setjmp() and then
-- encounter a png_error() will longjmp here. Since the jmpbuf is
-- then meaningless we abort instead of returning. */
--#ifdef USE_FAR_KEYWORD
-- if (setjmp(tmp_jmpbuf))
--#else
-- if (setjmp(png_jmpbuf(png_ptr))) /* Sets longjmp to match setjmp */
--#endif
-- PNG_ABORT();
--#ifdef USE_FAR_KEYWORD
-- png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
--#endif
--#endif /* PNG_SETJMP_SUPPORTED */
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
--#endif
--
-- png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
--
-- /* Call the general version checker (shared with read and write code): */
-- if (!png_user_version_check(png_ptr, user_png_ver))
-- png_cleanup_needed = 1;
--
-- if (!png_cleanup_needed)
-+ png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-+ error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
-+#endif /* USER_MEM */
-+
-+ if (png_ptr != NULL)
- {
-- /* Initialize zbuf - compression buffer */
-- png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-- png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr, png_ptr->zbuf_size);
--
-- if (png_ptr->zbuf == NULL)
-- png_cleanup_needed = 1;
-+ png_ptr->mode = PNG_IS_READ_STRUCT;
-+
-+ /* Added in libpng-1.6.0; this can be used to detect a read structure if
-+ * required (it will be zero in a write structure.)
-+ */
-+# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+ png_ptr->IDAT_read_size = PNG_IDAT_READ_SIZE;
-+# endif
-+
-+# ifdef PNG_BENIGN_READ_ERRORS_SUPPORTED
-+ png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-+
-+ /* In stable builds only warn if an application error can be completely
-+ * handled.
-+ */
-+# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
-+ png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
-+# endif
-+# endif
-+
-+ /* TODO: delay this, it can be done in png_init_io (if the app doesn't
-+ * do it itself) avoiding setting the default function if it is not
-+ * required.
-+ */
-+ png_set_read_fn(png_ptr, NULL, NULL);
- }
-
-- png_ptr->zstream.zalloc = png_zalloc;
-- png_ptr->zstream.zfree = png_zfree;
-- png_ptr->zstream.opaque = (voidpf)png_ptr;
--
-- if (!png_cleanup_needed)
-- {
-- switch (inflateInit(&png_ptr->zstream))
-- {
-- case Z_OK:
-- break; /* Do nothing */
--
-- case Z_MEM_ERROR:
-- png_warning(png_ptr, "zlib memory error");
-- png_cleanup_needed = 1;
-- break;
--
-- case Z_STREAM_ERROR:
-- png_warning(png_ptr, "zlib stream error");
-- png_cleanup_needed = 1;
-- break;
--
-- case Z_VERSION_ERROR:
-- png_warning(png_ptr, "zlib version error");
-- png_cleanup_needed = 1;
-- break;
--
-- default: png_warning(png_ptr, "Unknown zlib error");
-- png_cleanup_needed = 1;
-- }
-- }
--
-- if (png_cleanup_needed)
-- {
-- /* Clean up PNG structure and deallocate any memory. */
-- png_free(png_ptr, png_ptr->zbuf);
-- png_ptr->zbuf = NULL;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)png_ptr,
-- (png_free_ptr)free_fn, (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)png_ptr);
--#endif
-- return (NULL);
-- }
--
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
--
-- png_set_read_fn(png_ptr, NULL, NULL);
--
--
-- return (png_ptr);
-+ return png_ptr;
- }
-
-
-@@ -206,8 +117,12 @@
- * read if it is determined that this isn't a valid PNG file.
- */
- void PNGAPI
--png_read_info(png_structp png_ptr, png_infop info_ptr)
-+png_read_info(png_structrp png_ptr, png_inforp info_ptr)
- {
-+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+ int keep;
-+#endif
-+
- png_debug(1, "in png_read_info");
-
- if (png_ptr == NULL || info_ptr == NULL)
-@@ -218,231 +133,179 @@
-
- for (;;)
- {
-- PNG_IHDR;
-- PNG_IDAT;
-- PNG_IEND;
-- PNG_PLTE;
--#ifdef PNG_READ_bKGD_SUPPORTED
-- PNG_bKGD;
--#endif
--#ifdef PNG_READ_cHRM_SUPPORTED
-- PNG_cHRM;
--#endif
--#ifdef PNG_READ_gAMA_SUPPORTED
-- PNG_gAMA;
--#endif
--#ifdef PNG_READ_hIST_SUPPORTED
-- PNG_hIST;
--#endif
--#ifdef PNG_READ_iCCP_SUPPORTED
-- PNG_iCCP;
--#endif
--#ifdef PNG_READ_iTXt_SUPPORTED
-- PNG_iTXt;
--#endif
--#ifdef PNG_READ_oFFs_SUPPORTED
-- PNG_oFFs;
--#endif
--#ifdef PNG_READ_pCAL_SUPPORTED
-- PNG_pCAL;
--#endif
--#ifdef PNG_READ_pHYs_SUPPORTED
-- PNG_pHYs;
--#endif
--#ifdef PNG_READ_sBIT_SUPPORTED
-- PNG_sBIT;
--#endif
--#ifdef PNG_READ_sCAL_SUPPORTED
-- PNG_sCAL;
--#endif
--#ifdef PNG_READ_sPLT_SUPPORTED
-- PNG_sPLT;
--#endif
--#ifdef PNG_READ_sRGB_SUPPORTED
-- PNG_sRGB;
--#endif
--#ifdef PNG_READ_tEXt_SUPPORTED
-- PNG_tEXt;
--#endif
--#ifdef PNG_READ_tIME_SUPPORTED
-- PNG_tIME;
--#endif
--#ifdef PNG_READ_tRNS_SUPPORTED
-- PNG_tRNS;
--#endif
--#ifdef PNG_READ_zTXt_SUPPORTED
-- PNG_zTXt;
--#endif
- png_uint_32 length = png_read_chunk_header(png_ptr);
-- PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-+ png_uint_32 chunk_name = png_ptr->chunk_name;
-+
-+ /* IDAT logic needs to happen here to simplify getting the two flags
-+ * right.
-+ */
-+ if (chunk_name == png_IDAT)
-+ {
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "Missing IHDR before IDAT");
-+
-+ else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-+ (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-+ png_chunk_error(png_ptr, "Missing PLTE before IDAT");
-+
-+ else if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-+ png_chunk_benign_error(png_ptr, "Too many IDATs found");
-+
-+ png_ptr->mode |= PNG_HAVE_IDAT;
-+ }
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-+ png_ptr->mode |= PNG_AFTER_IDAT;
-
- /* This should be a binary subdivision search or a hash for
- * matching the chunk name rather than a linear search.
- */
-- if (!png_memcmp(chunk_name, png_IDAT, 4))
-- if (png_ptr->mode & PNG_AFTER_IDAT)
-- png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
--
-- if (!png_memcmp(chunk_name, png_IHDR, 4))
-+ if (chunk_name == png_IHDR)
- png_handle_IHDR(png_ptr, info_ptr, length);
-
-- else if (!png_memcmp(chunk_name, png_IEND, 4))
-+ else if (chunk_name == png_IEND)
- png_handle_IEND(png_ptr, info_ptr, length);
-
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- else if (png_handle_as_unknown(png_ptr, chunk_name))
-+ else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
- {
-- if (!png_memcmp(chunk_name, png_IDAT, 4))
-- png_ptr->mode |= PNG_HAVE_IDAT;
--
-- png_handle_unknown(png_ptr, info_ptr, length);
--
-- if (!png_memcmp(chunk_name, png_PLTE, 4))
-+ png_handle_unknown(png_ptr, info_ptr, length, keep);
-+
-+ if (chunk_name == png_PLTE)
- png_ptr->mode |= PNG_HAVE_PLTE;
-
-- else if (!png_memcmp(chunk_name, png_IDAT, 4))
-+ else if (chunk_name == png_IDAT)
- {
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before IDAT");
--
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-- !(png_ptr->mode & PNG_HAVE_PLTE))
-- png_error(png_ptr, "Missing PLTE before IDAT");
--
-+ png_ptr->idat_size = 0; /* It has been consumed */
- break;
- }
- }
- #endif
-- else if (!png_memcmp(chunk_name, png_PLTE, 4))
-+ else if (chunk_name == png_PLTE)
- png_handle_PLTE(png_ptr, info_ptr, length);
-
-- else if (!png_memcmp(chunk_name, png_IDAT, 4))
-+ else if (chunk_name == png_IDAT)
- {
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before IDAT");
--
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-- !(png_ptr->mode & PNG_HAVE_PLTE))
-- png_error(png_ptr, "Missing PLTE before IDAT");
--
- png_ptr->idat_size = length;
-- png_ptr->mode |= PNG_HAVE_IDAT;
- break;
- }
-
- #ifdef PNG_READ_bKGD_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_bKGD, 4))
-+ else if (chunk_name == png_bKGD)
- png_handle_bKGD(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_cHRM_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_cHRM, 4))
-+ else if (chunk_name == png_cHRM)
- png_handle_cHRM(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_gAMA_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_gAMA, 4))
-+ else if (chunk_name == png_gAMA)
- png_handle_gAMA(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_hIST_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_hIST, 4))
-+ else if (chunk_name == png_hIST)
- png_handle_hIST(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_oFFs_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_oFFs, 4))
-+ else if (chunk_name == png_oFFs)
- png_handle_oFFs(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_pCAL_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_pCAL, 4))
-+ else if (chunk_name == png_pCAL)
- png_handle_pCAL(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sCAL_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sCAL, 4))
-+ else if (chunk_name == png_sCAL)
- png_handle_sCAL(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_pHYs_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_pHYs, 4))
-+ else if (chunk_name == png_pHYs)
- png_handle_pHYs(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sBIT_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sBIT, 4))
-+ else if (chunk_name == png_sBIT)
- png_handle_sBIT(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sRGB_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sRGB, 4))
-+ else if (chunk_name == png_sRGB)
- png_handle_sRGB(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_iCCP_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_iCCP, 4))
-+ else if (chunk_name == png_iCCP)
- png_handle_iCCP(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sPLT_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sPLT, 4))
-+ else if (chunk_name == png_sPLT)
- png_handle_sPLT(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_tEXt_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_tEXt, 4))
-+ else if (chunk_name == png_tEXt)
- png_handle_tEXt(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_tIME_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_tIME, 4))
-+ else if (chunk_name == png_tIME)
- png_handle_tIME(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_tRNS_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_tRNS, 4))
-+ else if (chunk_name == png_tRNS)
- png_handle_tRNS(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_zTXt_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_zTXt, 4))
-+ else if (chunk_name == png_zTXt)
- png_handle_zTXt(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_iTXt_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_iTXt, 4))
-+ else if (chunk_name == png_iTXt)
- png_handle_iTXt(png_ptr, info_ptr, length);
- #endif
-
- else
-- png_handle_unknown(png_ptr, info_ptr, length);
-+ png_handle_unknown(png_ptr, info_ptr, length,
-+ PNG_HANDLE_CHUNK_AS_DEFAULT);
- }
- }
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#endif /* SEQUENTIAL_READ */
-
- /* Optional call to update the users info_ptr structure */
- void PNGAPI
--png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-+png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
- {
- png_debug(1, "in png_read_update_info");
-
-- if (png_ptr == NULL)
-- return;
--
-- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-- png_read_start_row(png_ptr);
--
-- else
-- png_warning(png_ptr,
-- "Ignoring extra png_read_update_info() call;"
-- " row buffer not reallocated");
--
--#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-- png_read_transform_info(png_ptr, info_ptr);
--#else
-- PNG_UNUSED(info_ptr)
--#endif
-+ if (png_ptr != NULL)
-+ {
-+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-+ {
-+ png_read_start_row(png_ptr);
-+
-+# ifdef PNG_READ_TRANSFORMS_SUPPORTED
-+ png_read_transform_info(png_ptr, info_ptr);
-+# else
-+ PNG_UNUSED(info_ptr)
-+# endif
-+ }
-+
-+ /* New in 1.6.0 this avoids the bug of doing the initializations twice */
-+ else
-+ png_app_error(png_ptr,
-+ "png_read_update_info/png_start_read_image: duplicate call");
-+ }
- }
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-@@ -452,86 +315,166 @@
- * If the user doesn't call this, we will do it ourselves.
- */
- void PNGAPI
--png_start_read_image(png_structp png_ptr)
-+png_start_read_image(png_structrp png_ptr)
- {
- png_debug(1, "in png_start_read_image");
-
-+ if (png_ptr != NULL)
-+ {
-+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-+ png_read_start_row(png_ptr);
-+
-+ /* New in 1.6.0 this avoids the bug of doing the initializations twice */
-+ else
-+ png_app_error(png_ptr,
-+ "png_start_read_image/png_read_update_info: duplicate call");
-+ }
-+}
-+#endif /* SEQUENTIAL_READ */
-+
-+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+#ifdef PNG_MNG_FEATURES_SUPPORTED
-+/* Undoes intrapixel differencing,
-+ * NOTE: this is apparently only supported in the 'sequential' reader.
-+ */
-+static void
-+png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
-+{
-+ png_debug(1, "in png_do_read_intrapixel");
-+
-+ if (
-+ (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-+ {
-+ int bytes_per_pixel;
-+ png_uint_32 row_width = row_info->width;
-+
-+ if (row_info->bit_depth == 8)
-+ {
-+ png_bytep rp;
-+ png_uint_32 i;
-+
-+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-+ bytes_per_pixel = 3;
-+
-+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+ bytes_per_pixel = 4;
-+
-+ else
-+ return;
-+
-+ for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-+ {
-+ *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
-+ *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
-+ }
-+ }
-+ else if (row_info->bit_depth == 16)
-+ {
-+ png_bytep rp;
-+ png_uint_32 i;
-+
-+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-+ bytes_per_pixel = 6;
-+
-+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+ bytes_per_pixel = 8;
-+
-+ else
-+ return;
-+
-+ for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-+ {
-+ png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
-+ png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
-+ png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
-+ png_uint_32 red = (s0 + s1 + 65536) & 0xffff;
-+ png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
-+ *(rp ) = (png_byte)((red >> 8) & 0xff);
-+ *(rp + 1) = (png_byte)(red & 0xff);
-+ *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-+ *(rp + 5) = (png_byte)(blue & 0xff);
-+ }
-+ }
-+ }
-+}
-+#endif /* MNG_FEATURES */
-+
-+void PNGAPI
-+png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
-+{
-+ png_row_info row_info;
-+
- if (png_ptr == NULL)
- return;
-
-- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-- png_read_start_row(png_ptr);
-- else
-- png_warning(png_ptr,
-- "Ignoring extra png_start_read_image() call;"
-- " row buffer not reallocated");
--}
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
--
--#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
--void PNGAPI
--png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
--{
-- PNG_IDAT;
--#ifdef PNG_READ_INTERLACING_SUPPORTED
-- PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
-- 0xff};
-- PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
--#endif
-- int ret;
--
-- if (png_ptr == NULL)
-- return;
--
- png_debug2(1, "in png_read_row (row %lu, pass %d)",
- (unsigned long)png_ptr->row_number, png_ptr->pass);
-
-- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-+ /* png_read_start_row sets the information (in particular iwidth) for this
-+ * interlace pass.
-+ */
-+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
- png_read_start_row(png_ptr);
-
-+ /* 1.5.6: row_info moved out of png_struct to a local here. */
-+ row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
-+ row_info.color_type = png_ptr->color_type;
-+ row_info.bit_depth = png_ptr->bit_depth;
-+ row_info.channels = png_ptr->channels;
-+ row_info.pixel_depth = png_ptr->pixel_depth;
-+ row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-+
-+#ifdef PNG_WARNINGS_SUPPORTED
- if (png_ptr->row_number == 0 && png_ptr->pass == 0)
- {
- /* Check for transforms that have been set but were defined out */
- #if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
-- if (png_ptr->transformations & PNG_INVERT_MONO)
-+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
- png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
- #endif
-
- #if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
-- if (png_ptr->transformations & PNG_FILLER)
-+ if ((png_ptr->transformations & PNG_FILLER) != 0)
- png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
- #endif
-
- #if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
- !defined(PNG_READ_PACKSWAP_SUPPORTED)
-- if (png_ptr->transformations & PNG_PACKSWAP)
-+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
- png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
- #endif
-
- #if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
-- if (png_ptr->transformations & PNG_PACK)
-+ if ((png_ptr->transformations & PNG_PACK) != 0)
- png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
- #endif
-
- #if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
-- if (png_ptr->transformations & PNG_SHIFT)
-+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
- png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
- #endif
-
- #if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
-- if (png_ptr->transformations & PNG_BGR)
-+ if ((png_ptr->transformations & PNG_BGR) != 0)
- png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
- #endif
-
- #if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
-- if (png_ptr->transformations & PNG_SWAP_BYTES)
-+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
- png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
- #endif
- }
-+#endif /* WARNINGS */
-
- #ifdef PNG_READ_INTERLACING_SUPPORTED
-- /* If interlaced and we do not need a new row, combine row and return */
-- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-+ /* If interlaced and we do not need a new row, combine row and return.
-+ * Notice that the pixels we have from previous rows have been transformed
-+ * already; we can only combine like with like (transformed or
-+ * untransformed) and, because of the libpng API for interlaced images, this
-+ * means we must transform before de-interlacing.
-+ */
-+ if (png_ptr->interlaced != 0 &&
-+ (png_ptr->transformations & PNG_INTERLACE) != 0)
- {
- switch (png_ptr->pass)
- {
-@@ -539,8 +482,7 @@
- if (png_ptr->row_number & 0x07)
- {
- if (dsp_row != NULL)
-- png_combine_row(png_ptr, dsp_row,
-- png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
- png_read_finish_row(png_ptr);
- return;
- }
-@@ -550,8 +492,7 @@
- if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
- {
- if (dsp_row != NULL)
-- png_combine_row(png_ptr, dsp_row,
-- png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
- png_read_finish_row(png_ptr);
- return;
-@@ -562,8 +503,7 @@
- if ((png_ptr->row_number & 0x07) != 4)
- {
- if (dsp_row != NULL && (png_ptr->row_number & 4))
-- png_combine_row(png_ptr, dsp_row,
-- png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
- png_read_finish_row(png_ptr);
- return;
-@@ -574,8 +514,7 @@
- if ((png_ptr->row_number & 3) || png_ptr->width < 3)
- {
- if (dsp_row != NULL)
-- png_combine_row(png_ptr, dsp_row,
-- png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
- png_read_finish_row(png_ptr);
- return;
-@@ -586,19 +525,18 @@
- if ((png_ptr->row_number & 3) != 2)
- {
- if (dsp_row != NULL && (png_ptr->row_number & 2))
-- png_combine_row(png_ptr, dsp_row,
-- png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
- png_read_finish_row(png_ptr);
- return;
- }
- break;
-+
- case 5:
- if ((png_ptr->row_number & 1) || png_ptr->width < 2)
- {
- if (dsp_row != NULL)
-- png_combine_row(png_ptr, dsp_row,
-- png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
- png_read_finish_row(png_ptr);
- return;
-@@ -607,7 +545,7 @@
-
- default:
- case 6:
-- if (!(png_ptr->row_number & 1))
-+ if ((png_ptr->row_number & 1) == 0)
- {
- png_read_finish_row(png_ptr);
- return;
-@@ -617,117 +555,85 @@
- }
- #endif
-
-- if (!(png_ptr->mode & PNG_HAVE_IDAT))
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
- png_error(png_ptr, "Invalid attempt to read row data");
-
-- png_ptr->zstream.next_out = png_ptr->row_buf;
-- png_ptr->zstream.avail_out =
-- (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
-- png_ptr->iwidth) + 1);
--
-- do
-+ /* Fill the row with IDAT data: */
-+ png_read_IDAT_data(png_ptr, png_ptr->row_buf, row_info.rowbytes + 1);
-+
-+ if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
- {
-- if (!(png_ptr->zstream.avail_in))
-- {
-- while (!png_ptr->idat_size)
-- {
-- png_crc_finish(png_ptr, 0);
--
-- png_ptr->idat_size = png_read_chunk_header(png_ptr);
-- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-- png_error(png_ptr, "Not enough image data");
-- }
-- png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-- png_ptr->zstream.next_in = png_ptr->zbuf;
-- if (png_ptr->zbuf_size > png_ptr->idat_size)
-- png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-- png_crc_read(png_ptr, png_ptr->zbuf,
-- (png_size_t)png_ptr->zstream.avail_in);
-- png_ptr->idat_size -= png_ptr->zstream.avail_in;
-- }
--
-- ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
--
-- if (ret == Z_STREAM_END)
-- {
-- if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
-- png_ptr->idat_size)
-- png_benign_error(png_ptr, "Extra compressed data");
-- png_ptr->mode |= PNG_AFTER_IDAT;
-- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-- break;
-- }
--
-- if (ret != Z_OK)
-- png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-- "Decompression error");
--
-- } while (png_ptr->zstream.avail_out);
--
-- png_ptr->row_info.color_type = png_ptr->color_type;
-- png_ptr->row_info.width = png_ptr->iwidth;
-- png_ptr->row_info.channels = png_ptr->channels;
-- png_ptr->row_info.bit_depth = png_ptr->bit_depth;
-- png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
-- png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-- png_ptr->row_info.width);
--
-- if (png_ptr->row_buf[0])
-- png_read_filter_row(png_ptr, &(png_ptr->row_info),
-- png_ptr->row_buf + 1, png_ptr->prev_row + 1,
-- (int)(png_ptr->row_buf[0]));
--
-- png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);
-+ if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
-+ png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
-+ png_ptr->prev_row + 1, png_ptr->row_buf[0]);
-+ else
-+ png_error(png_ptr, "bad adaptive filter value");
-+ }
-+
-+ /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
-+ * 1.5.6, while the buffer really is this big in current versions of libpng
-+ * it may not be in the future, so this was changed just to copy the
-+ * interlaced count:
-+ */
-+ memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
-
- #ifdef PNG_MNG_FEATURES_SUPPORTED
-- if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-+ if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
- (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
- {
- /* Intrapixel differencing */
-- png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
-+ png_do_read_intrapixel(&row_info, png_ptr->row_buf + 1);
- }
- #endif
-
--
- #ifdef PNG_READ_TRANSFORMS_SUPPORTED
- if (png_ptr->transformations)
-- png_do_read_transformations(png_ptr);
-+ png_do_read_transformations(png_ptr, &row_info);
- #endif
-
-+ /* The transformed pixel depth should match the depth now in row_info. */
-+ if (png_ptr->transformed_pixel_depth == 0)
-+ {
-+ png_ptr->transformed_pixel_depth = row_info.pixel_depth;
-+ if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
-+ png_error(png_ptr, "sequential row overflow");
-+ }
-+
-+ else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
-+ png_error(png_ptr, "internal sequential row size calculation error");
-+
- #ifdef PNG_READ_INTERLACING_SUPPORTED
-- /* Blow up interlaced rows to full size */
-- if (png_ptr->interlaced &&
-- (png_ptr->transformations & PNG_INTERLACE))
-+ /* Expand interlaced rows to full size */
-+ if (png_ptr->interlaced != 0 &&
-+ (png_ptr->transformations & PNG_INTERLACE) != 0)
- {
- if (png_ptr->pass < 6)
-- /* Old interface (pre-1.0.9):
-- * png_do_read_interlace(&(png_ptr->row_info),
-- * png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
-- */
-- png_do_read_interlace(png_ptr);
-+ png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
-+ png_ptr->transformations);
-
- if (dsp_row != NULL)
-- png_combine_row(png_ptr, dsp_row, png_pass_dsp_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
- if (row != NULL)
-- png_combine_row(png_ptr, row, png_pass_mask[png_ptr->pass]);
-+ png_combine_row(png_ptr, row, 0/*row*/);
- }
-
- else
- #endif
- {
- if (row != NULL)
-- png_combine_row(png_ptr, row, 0xff);
-+ png_combine_row(png_ptr, row, -1/*ignored*/);
-
- if (dsp_row != NULL)
-- png_combine_row(png_ptr, dsp_row, 0xff);
-+ png_combine_row(png_ptr, dsp_row, -1/*ignored*/);
- }
- png_read_finish_row(png_ptr);
-
- if (png_ptr->read_row_fn != NULL)
- (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-+
- }
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#endif /* SEQUENTIAL_READ */
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read one or more rows of image data. If the image is interlaced,
-@@ -755,7 +661,7 @@
- */
-
- void PNGAPI
--png_read_rows(png_structp png_ptr, png_bytepp row,
-+png_read_rows(png_structrp png_ptr, png_bytepp row,
- png_bytepp display_row, png_uint_32 num_rows)
- {
- png_uint_32 i;
-@@ -794,7 +700,7 @@
- dp++;
- }
- }
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#endif /* SEQUENTIAL_READ */
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read the entire image. If the image has an alpha channel or a tRNS
-@@ -810,7 +716,7 @@
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
- void PNGAPI
--png_read_image(png_structp png_ptr, png_bytepp image)
-+png_read_image(png_structrp png_ptr, png_bytepp image)
- {
- png_uint_32 i, image_height;
- int pass, j;
-@@ -822,7 +728,7 @@
- return;
-
- #ifdef PNG_READ_INTERLACING_SUPPORTED
-- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
- {
- pass = png_set_interlace_handling(png_ptr);
- /* And make sure transforms are initialized. */
-@@ -830,7 +736,8 @@
- }
- else
- {
-- if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
-+ if (png_ptr->interlaced != 0 &&
-+ (png_ptr->transformations & PNG_INTERLACE) == 0)
- {
- /* Caller called png_start_read_image or png_read_update_info without
- * first turning on the PNG_INTERLACE transform. We can fix this here,
-@@ -867,7 +774,7 @@
- }
- }
- }
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#endif /* SEQUENTIAL_READ */
-
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- /* Read the end of the PNG file. Will not read past the end of the
-@@ -875,416 +782,261 @@
- * or time information at the end of the file, if info is not NULL.
- */
- void PNGAPI
--png_read_end(png_structp png_ptr, png_infop info_ptr)
-+png_read_end(png_structrp png_ptr, png_inforp info_ptr)
- {
-+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+ int keep;
-+#endif
-+
- png_debug(1, "in png_read_end");
-
- if (png_ptr == NULL)
- return;
-
-- png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
-+ /* If png_read_end is called in the middle of reading the rows there may
-+ * still be pending IDAT data and an owned zstream. Deal with this here.
-+ */
-+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+ if (png_chunk_unknown_handling(png_ptr, png_IDAT) == 0)
-+#endif
-+ png_read_finish_IDAT(png_ptr);
-+
-+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+ /* Report invalid palette index; added at libng-1.5.10 */
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-+ png_ptr->num_palette_max > png_ptr->num_palette)
-+ png_benign_error(png_ptr, "Read palette index exceeding num_palette");
-+#endif
-
- do
- {
-- PNG_IHDR;
-- PNG_IDAT;
-- PNG_IEND;
-- PNG_PLTE;
--#ifdef PNG_READ_bKGD_SUPPORTED
-- PNG_bKGD;
--#endif
--#ifdef PNG_READ_cHRM_SUPPORTED
-- PNG_cHRM;
--#endif
--#ifdef PNG_READ_gAMA_SUPPORTED
-- PNG_gAMA;
--#endif
--#ifdef PNG_READ_hIST_SUPPORTED
-- PNG_hIST;
--#endif
--#ifdef PNG_READ_iCCP_SUPPORTED
-- PNG_iCCP;
--#endif
--#ifdef PNG_READ_iTXt_SUPPORTED
-- PNG_iTXt;
--#endif
--#ifdef PNG_READ_oFFs_SUPPORTED
-- PNG_oFFs;
--#endif
--#ifdef PNG_READ_pCAL_SUPPORTED
-- PNG_pCAL;
--#endif
--#ifdef PNG_READ_pHYs_SUPPORTED
-- PNG_pHYs;
--#endif
--#ifdef PNG_READ_sBIT_SUPPORTED
-- PNG_sBIT;
--#endif
--#ifdef PNG_READ_sCAL_SUPPORTED
-- PNG_sCAL;
--#endif
--#ifdef PNG_READ_sPLT_SUPPORTED
-- PNG_sPLT;
--#endif
--#ifdef PNG_READ_sRGB_SUPPORTED
-- PNG_sRGB;
--#endif
--#ifdef PNG_READ_tEXt_SUPPORTED
-- PNG_tEXt;
--#endif
--#ifdef PNG_READ_tIME_SUPPORTED
-- PNG_tIME;
--#endif
--#ifdef PNG_READ_tRNS_SUPPORTED
-- PNG_tRNS;
--#endif
--#ifdef PNG_READ_zTXt_SUPPORTED
-- PNG_zTXt;
--#endif
- png_uint_32 length = png_read_chunk_header(png_ptr);
-- PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
--
-- if (!png_memcmp(chunk_name, png_IHDR, 4))
-+ png_uint_32 chunk_name = png_ptr->chunk_name;
-+
-+ if (chunk_name == png_IEND)
-+ png_handle_IEND(png_ptr, info_ptr, length);
-+
-+ else if (chunk_name == png_IHDR)
- png_handle_IHDR(png_ptr, info_ptr, length);
-
-- else if (!png_memcmp(chunk_name, png_IEND, 4))
-- png_handle_IEND(png_ptr, info_ptr, length);
-+ else if (info_ptr == NULL)
-+ png_crc_finish(png_ptr, length);
-
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- else if (png_handle_as_unknown(png_ptr, chunk_name))
-+ else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
- {
-- if (!png_memcmp(chunk_name, png_IDAT, 4))
-+ if (chunk_name == png_IDAT)
- {
-- if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-+ if ((length > 0) ||
-+ (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
- png_benign_error(png_ptr, "Too many IDATs found");
- }
-- png_handle_unknown(png_ptr, info_ptr, length);
-- if (!png_memcmp(chunk_name, png_PLTE, 4))
-+ png_handle_unknown(png_ptr, info_ptr, length, keep);
-+ if (chunk_name == png_PLTE)
- png_ptr->mode |= PNG_HAVE_PLTE;
- }
- #endif
-
-- else if (!png_memcmp(chunk_name, png_IDAT, 4))
-+ else if (chunk_name == png_IDAT)
- {
- /* Zero length IDATs are legal after the last IDAT has been
- * read, but not after other chunks have been read.
- */
-- if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-+ if ((length > 0) ||
-+ (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
- png_benign_error(png_ptr, "Too many IDATs found");
-
- png_crc_finish(png_ptr, length);
- }
-- else if (!png_memcmp(chunk_name, png_PLTE, 4))
-+ else if (chunk_name == png_PLTE)
- png_handle_PLTE(png_ptr, info_ptr, length);
-
- #ifdef PNG_READ_bKGD_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_bKGD, 4))
-+ else if (chunk_name == png_bKGD)
- png_handle_bKGD(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_cHRM_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_cHRM, 4))
-+ else if (chunk_name == png_cHRM)
- png_handle_cHRM(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_gAMA_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_gAMA, 4))
-+ else if (chunk_name == png_gAMA)
- png_handle_gAMA(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_hIST_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_hIST, 4))
-+ else if (chunk_name == png_hIST)
- png_handle_hIST(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_oFFs_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_oFFs, 4))
-+ else if (chunk_name == png_oFFs)
- png_handle_oFFs(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_pCAL_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_pCAL, 4))
-+ else if (chunk_name == png_pCAL)
- png_handle_pCAL(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sCAL_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sCAL, 4))
-+ else if (chunk_name == png_sCAL)
- png_handle_sCAL(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_pHYs_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_pHYs, 4))
-+ else if (chunk_name == png_pHYs)
- png_handle_pHYs(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sBIT_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sBIT, 4))
-+ else if (chunk_name == png_sBIT)
- png_handle_sBIT(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sRGB_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sRGB, 4))
-+ else if (chunk_name == png_sRGB)
- png_handle_sRGB(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_iCCP_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_iCCP, 4))
-+ else if (chunk_name == png_iCCP)
- png_handle_iCCP(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_sPLT_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_sPLT, 4))
-+ else if (chunk_name == png_sPLT)
- png_handle_sPLT(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_tEXt_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_tEXt, 4))
-+ else if (chunk_name == png_tEXt)
- png_handle_tEXt(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_tIME_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_tIME, 4))
-+ else if (chunk_name == png_tIME)
- png_handle_tIME(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_tRNS_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_tRNS, 4))
-+ else if (chunk_name == png_tRNS)
- png_handle_tRNS(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_zTXt_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_zTXt, 4))
-+ else if (chunk_name == png_zTXt)
- png_handle_zTXt(png_ptr, info_ptr, length);
- #endif
-
- #ifdef PNG_READ_iTXt_SUPPORTED
-- else if (!png_memcmp(chunk_name, png_iTXt, 4))
-+ else if (chunk_name == png_iTXt)
- png_handle_iTXt(png_ptr, info_ptr, length);
- #endif
-
- else
-- png_handle_unknown(png_ptr, info_ptr, length);
-- } while (!(png_ptr->mode & PNG_HAVE_IEND));
-+ png_handle_unknown(png_ptr, info_ptr, length,
-+ PNG_HANDLE_CHUNK_AS_DEFAULT);
-+ } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
- }
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#endif /* SEQUENTIAL_READ */
-+
-+/* Free all memory used in the read struct */
-+static void
-+png_read_destroy(png_structrp png_ptr)
-+{
-+ png_debug(1, "in png_read_destroy");
-+
-+#ifdef PNG_READ_GAMMA_SUPPORTED
-+ png_destroy_gamma_table(png_ptr);
-+#endif
-+
-+ png_free(png_ptr, png_ptr->big_row_buf);
-+ png_ptr->big_row_buf = NULL;
-+ png_free(png_ptr, png_ptr->big_prev_row);
-+ png_ptr->big_prev_row = NULL;
-+ png_free(png_ptr, png_ptr->read_buffer);
-+ png_ptr->read_buffer = NULL;
-+
-+#ifdef PNG_READ_QUANTIZE_SUPPORTED
-+ png_free(png_ptr, png_ptr->palette_lookup);
-+ png_ptr->palette_lookup = NULL;
-+ png_free(png_ptr, png_ptr->quantize_index);
-+ png_ptr->quantize_index = NULL;
-+#endif
-+
-+ if ((png_ptr->free_me & PNG_FREE_PLTE) != 0)
-+ {
-+ png_zfree(png_ptr, png_ptr->palette);
-+ png_ptr->palette = NULL;
-+ }
-+ png_ptr->free_me &= ~PNG_FREE_PLTE;
-+
-+#if defined(PNG_tRNS_SUPPORTED) || \
-+ defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-+ if ((png_ptr->free_me & PNG_FREE_TRNS) != 0)
-+ {
-+ png_free(png_ptr, png_ptr->trans_alpha);
-+ png_ptr->trans_alpha = NULL;
-+ }
-+ png_ptr->free_me &= ~PNG_FREE_TRNS;
-+#endif
-+
-+ inflateEnd(&png_ptr->zstream);
-+
-+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-+ png_free(png_ptr, png_ptr->save_buffer);
-+ png_ptr->save_buffer = NULL;
-+#endif
-+
-+#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \
-+ defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
-+ png_free(png_ptr, png_ptr->unknown_chunk.data);
-+ png_ptr->unknown_chunk.data = NULL;
-+#endif
-+
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ png_free(png_ptr, png_ptr->chunk_list);
-+ png_ptr->chunk_list = NULL;
-+#endif
-+
-+ /* NOTE: the 'setjmp' buffer may still be allocated and the memory and error
-+ * callbacks are still set at this point. They are required to complete the
-+ * destruction of the png_struct itself.
-+ */
-+}
-
- /* Free all memory used by the read */
- void PNGAPI
- png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
- png_infopp end_info_ptr_ptr)
- {
-- png_structp png_ptr = NULL;
-- png_infop info_ptr = NULL, end_info_ptr = NULL;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_free_ptr free_fn = NULL;
-- png_voidp mem_ptr = NULL;
--#endif
-+ png_structrp png_ptr = NULL;
-
- png_debug(1, "in png_destroy_read_struct");
-
- if (png_ptr_ptr != NULL)
- png_ptr = *png_ptr_ptr;
-+
- if (png_ptr == NULL)
- return;
-
--#ifdef PNG_USER_MEM_SUPPORTED
-- free_fn = png_ptr->free_fn;
-- mem_ptr = png_ptr->mem_ptr;
--#endif
--
-- if (info_ptr_ptr != NULL)
-- info_ptr = *info_ptr_ptr;
--
-- if (end_info_ptr_ptr != NULL)
-- end_info_ptr = *end_info_ptr_ptr;
--
-- png_read_destroy(png_ptr, info_ptr, end_info_ptr);
--
-- if (info_ptr != NULL)
-- {
--#ifdef PNG_TEXT_SUPPORTED
-- png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
--#endif
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-- (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)info_ptr);
--#endif
-- *info_ptr_ptr = NULL;
-- }
--
-- if (end_info_ptr != NULL)
-- {
--#ifdef PNG_READ_TEXT_SUPPORTED
-- png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
--#endif
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
-- (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)end_info_ptr);
--#endif
-- *end_info_ptr_ptr = NULL;
-- }
--
-- if (png_ptr != NULL)
-- {
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-- (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)png_ptr);
--#endif
-- *png_ptr_ptr = NULL;
-- }
-+ /* libpng 1.6.0: use the API to destroy info structs to ensure consistent
-+ * behavior. Prior to 1.6.0 libpng did extra 'info' destruction in this API.
-+ * The extra was, apparently, unnecessary yet this hides memory leak bugs.
-+ */
-+ png_destroy_info_struct(png_ptr, end_info_ptr_ptr);
-+ png_destroy_info_struct(png_ptr, info_ptr_ptr);
-+
-+ *png_ptr_ptr = NULL;
-+ png_read_destroy(png_ptr);
-+ png_destroy_png_struct(png_ptr);
- }
-
--/* Free all memory used by the read (old method) */
--void /* PRIVATE */
--png_read_destroy(png_structp png_ptr, png_infop info_ptr,
-- png_infop end_info_ptr)
--{
--#ifdef PNG_SETJMP_SUPPORTED
-- jmp_buf tmp_jmp;
--#endif
-- png_error_ptr error_fn;
--#ifdef PNG_WARNINGS_SUPPORTED
-- png_error_ptr warning_fn;
--#endif
-- png_voidp error_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_free_ptr free_fn;
--#endif
--
-- png_debug(1, "in png_read_destroy");
--
-- if (info_ptr != NULL)
-- png_info_destroy(png_ptr, info_ptr);
--
-- if (end_info_ptr != NULL)
-- png_info_destroy(png_ptr, end_info_ptr);
--
-- png_free(png_ptr, png_ptr->zbuf);
-- png_free(png_ptr, png_ptr->big_row_buf);
-- png_free(png_ptr, png_ptr->prev_row);
-- png_free(png_ptr, png_ptr->chunkdata);
--
--#ifdef PNG_READ_QUANTIZE_SUPPORTED
-- png_free(png_ptr, png_ptr->palette_lookup);
-- png_free(png_ptr, png_ptr->quantize_index);
--#endif
--
--#ifdef PNG_READ_GAMMA_SUPPORTED
-- png_free(png_ptr, png_ptr->gamma_table);
--#endif
--
--#ifdef PNG_READ_BACKGROUND_SUPPORTED
-- png_free(png_ptr, png_ptr->gamma_from_1);
-- png_free(png_ptr, png_ptr->gamma_to_1);
--#endif
--
-- if (png_ptr->free_me & PNG_FREE_PLTE)
-- png_zfree(png_ptr, png_ptr->palette);
-- png_ptr->free_me &= ~PNG_FREE_PLTE;
--
--#if defined(PNG_tRNS_SUPPORTED) || \
-- defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-- if (png_ptr->free_me & PNG_FREE_TRNS)
-- png_free(png_ptr, png_ptr->trans_alpha);
-- png_ptr->free_me &= ~PNG_FREE_TRNS;
--#endif
--
--#ifdef PNG_READ_hIST_SUPPORTED
-- if (png_ptr->free_me & PNG_FREE_HIST)
-- png_free(png_ptr, png_ptr->hist);
-- png_ptr->free_me &= ~PNG_FREE_HIST;
--#endif
--
--#ifdef PNG_READ_GAMMA_SUPPORTED
-- if (png_ptr->gamma_16_table != NULL)
-- {
-- int i;
-- int istop = (1 << (8 - png_ptr->gamma_shift));
-- for (i = 0; i < istop; i++)
-- {
-- png_free(png_ptr, png_ptr->gamma_16_table[i]);
-- }
-- png_free(png_ptr, png_ptr->gamma_16_table);
-- }
--
--#ifdef PNG_READ_BACKGROUND_SUPPORTED
-- if (png_ptr->gamma_16_from_1 != NULL)
-- {
-- int i;
-- int istop = (1 << (8 - png_ptr->gamma_shift));
-- for (i = 0; i < istop; i++)
-- {
-- png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
-- }
-- png_free(png_ptr, png_ptr->gamma_16_from_1);
-- }
-- if (png_ptr->gamma_16_to_1 != NULL)
-- {
-- int i;
-- int istop = (1 << (8 - png_ptr->gamma_shift));
-- for (i = 0; i < istop; i++)
-- {
-- png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
-- }
-- png_free(png_ptr, png_ptr->gamma_16_to_1);
-- }
--#endif
--#endif
--
-- inflateEnd(&png_ptr->zstream);
--
--#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-- png_free(png_ptr, png_ptr->save_buffer);
--#endif
--
--#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
--#ifdef PNG_TEXT_SUPPORTED
-- png_free(png_ptr, png_ptr->current_text);
--#endif /* PNG_TEXT_SUPPORTED */
--#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
--
-- /* Save the important info out of the png_struct, in case it is
-- * being used again.
-- */
--#ifdef PNG_SETJMP_SUPPORTED
-- png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
--#endif
--
-- error_fn = png_ptr->error_fn;
--#ifdef PNG_WARNINGS_SUPPORTED
-- warning_fn = png_ptr->warning_fn;
--#endif
-- error_ptr = png_ptr->error_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- free_fn = png_ptr->free_fn;
--#endif
--
-- png_memset(png_ptr, 0, png_sizeof(png_struct));
--
-- png_ptr->error_fn = error_fn;
--#ifdef PNG_WARNINGS_SUPPORTED
-- png_ptr->warning_fn = warning_fn;
--#endif
-- png_ptr->error_ptr = error_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_ptr->free_fn = free_fn;
--#endif
--
--#ifdef PNG_SETJMP_SUPPORTED
-- png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf));
--#endif
--
--}
--
- void PNGAPI
--png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
-+png_set_read_status_fn(png_structrp png_ptr, png_read_status_ptr read_row_fn)
- {
- if (png_ptr == NULL)
- return;
-@@ -1296,12 +1048,10 @@
- #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- void PNGAPI
--png_read_png(png_structp png_ptr, png_infop info_ptr,
-+png_read_png(png_structrp png_ptr, png_inforp info_ptr,
- int transforms,
- voidp params)
- {
-- int row;
--
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-@@ -1309,130 +1059,153 @@
- * PNG file before the first IDAT (image data chunk).
- */
- png_read_info(png_ptr, info_ptr);
-- if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
-+ if (info_ptr->height > PNG_UINT_32_MAX/(sizeof (png_bytep)))
- png_error(png_ptr, "Image is too high to process with png_read_png()");
-
- /* -------------- image transformations start here ------------------- */
--
--#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-+ /* libpng 1.6.10: add code to cause a png_app_error if a selected TRANSFORM
-+ * is not implemented. This will only happen in de-configured (non-default)
-+ * libpng builds. The results can be unexpected - png_read_png may return
-+ * short or mal-formed rows because the transform is skipped.
-+ */
-+
- /* Tell libpng to strip 16-bit/color files down to 8 bits per color.
- */
-- if (transforms & PNG_TRANSFORM_SCALE_16)
-- {
-+ if ((transforms & PNG_TRANSFORM_SCALE_16) != 0)
- /* Added at libpng-1.5.4. "strip_16" produces the same result that it
- * did in earlier versions, while "scale_16" is now more accurate.
- */
-+#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- png_set_scale_16(png_ptr);
-- }
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SCALE_16 not supported");
- #endif
-
--#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
- /* If both SCALE and STRIP are required pngrtran will effectively cancel the
- * latter by doing SCALE first. This is ok and allows apps not to check for
- * which is supported to get the right answer.
- */
-- if (transforms & PNG_TRANSFORM_STRIP_16)
-+ if ((transforms & PNG_TRANSFORM_STRIP_16) != 0)
-+#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
- png_set_strip_16(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_16 not supported");
- #endif
-
--#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- /* Strip alpha bytes from the input data without combining with
- * the background (not recommended).
- */
-- if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
-+ if ((transforms & PNG_TRANSFORM_STRIP_ALPHA) != 0)
-+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- png_set_strip_alpha(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_ALPHA not supported");
- #endif
-
--#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
- /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
- * byte into separate bytes (useful for paletted and grayscale images).
- */
-- if (transforms & PNG_TRANSFORM_PACKING)
-+ if ((transforms & PNG_TRANSFORM_PACKING) != 0)
-+#ifdef PNG_READ_PACK_SUPPORTED
- png_set_packing(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");
- #endif
-
--#ifdef PNG_READ_PACKSWAP_SUPPORTED
- /* Change the order of packed pixels to least significant bit first
- * (not useful if you are using png_set_packing).
- */
-- if (transforms & PNG_TRANSFORM_PACKSWAP)
-+ if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
-+#ifdef PNG_READ_PACKSWAP_SUPPORTED
- png_set_packswap(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");
- #endif
-
--#ifdef PNG_READ_EXPAND_SUPPORTED
- /* Expand paletted colors into true RGB triplets
- * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
- * Expand paletted or RGB images with transparency to full alpha
- * channels so the data will be available as RGBA quartets.
- */
-- if (transforms & PNG_TRANSFORM_EXPAND)
-- if ((png_ptr->bit_depth < 8) ||
-- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-- (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
-- png_set_expand(png_ptr);
-+ if ((transforms & PNG_TRANSFORM_EXPAND) != 0)
-+#ifdef PNG_READ_EXPAND_SUPPORTED
-+ png_set_expand(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND not supported");
- #endif
-
- /* We don't handle background color or gamma transformation or quantizing.
- */
-
--#ifdef PNG_READ_INVERT_SUPPORTED
- /* Invert monochrome files to have 0 as white and 1 as black
- */
-- if (transforms & PNG_TRANSFORM_INVERT_MONO)
-+ if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
-+#ifdef PNG_READ_INVERT_SUPPORTED
- png_set_invert_mono(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");
- #endif
-
--#ifdef PNG_READ_SHIFT_SUPPORTED
- /* If you want to shift the pixel values from the range [0,255] or
- * [0,65535] to the original [0,7] or [0,31], or whatever range the
- * colors were originally in:
- */
-- if ((transforms & PNG_TRANSFORM_SHIFT)
-- && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
-- {
-- png_color_8p sig_bit;
--
-- png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-- png_set_shift(png_ptr, sig_bit);
-- }
-+ if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
-+#ifdef PNG_READ_SHIFT_SUPPORTED
-+ if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
-+ png_set_shift(png_ptr, &info_ptr->sig_bit);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
- #endif
-
-+ /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
-+ if ((transforms & PNG_TRANSFORM_BGR) != 0)
- #ifdef PNG_READ_BGR_SUPPORTED
-- /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
-- if (transforms & PNG_TRANSFORM_BGR)
- png_set_bgr(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");
- #endif
-
-+ /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
-+ if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
- #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-- /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
-- if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
- png_set_swap_alpha(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");
- #endif
-
-+ /* Swap bytes of 16-bit files to least significant byte first */
-+ if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
- #ifdef PNG_READ_SWAP_SUPPORTED
-- /* Swap bytes of 16-bit files to least significant byte first */
-- if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
- png_set_swap(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");
- #endif
-
- /* Added at libpng-1.2.41 */
-+ /* Invert the alpha channel from opacity to transparency */
-+ if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
- #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-- /* Invert the alpha channel from opacity to transparency */
-- if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
- png_set_invert_alpha(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");
- #endif
-
- /* Added at libpng-1.2.41 */
-+ /* Expand grayscale image to RGB */
-+ if ((transforms & PNG_TRANSFORM_GRAY_TO_RGB) != 0)
- #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-- /* Expand grayscale image to RGB */
-- if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
- png_set_gray_to_rgb(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_GRAY_TO_RGB not supported");
- #endif
-
- /* Added at libpng-1.5.4 */
-+ if ((transforms & PNG_TRANSFORM_EXPAND_16) != 0)
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
-- if (transforms & PNG_TRANSFORM_EXPAND_16)
- png_set_expand_16(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND_16 not supported");
- #endif
-
- /* We don't handle adding filler bytes */
-@@ -1455,16 +1228,17 @@
- {
- png_uint_32 iptr;
-
-- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
-- info_ptr->height * png_sizeof(png_bytep));
-+ info_ptr->row_pointers = png_voidcast(png_bytepp, png_malloc(png_ptr,
-+ info_ptr->height * (sizeof (png_bytep))));
-+
- for (iptr=0; iptr<info_ptr->height; iptr++)
- info_ptr->row_pointers[iptr] = NULL;
-
- info_ptr->free_me |= PNG_FREE_ROWS;
-
-- for (row = 0; row < (int)info_ptr->height; row++)
-- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
-- png_get_rowbytes(png_ptr, info_ptr));
-+ for (iptr = 0; iptr < info_ptr->height; iptr++)
-+ info_ptr->row_pointers[iptr] = png_voidcast(png_bytep,
-+ png_malloc(png_ptr, info_ptr->rowbytes));
- }
-
- png_read_image(png_ptr, info_ptr->row_pointers);
-@@ -1473,10 +1247,2903 @@
- /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
- png_read_end(png_ptr, info_ptr);
-
-- PNG_UNUSED(transforms) /* Quiet compiler warnings */
- PNG_UNUSED(params)
--
- }
--#endif /* PNG_INFO_IMAGE_SUPPORTED */
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
--#endif /* PNG_READ_SUPPORTED */
-+#endif /* INFO_IMAGE */
-+#endif /* SEQUENTIAL_READ */
-+
-+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-+/* SIMPLIFIED READ
-+ *
-+ * This code currently relies on the sequential reader, though it could easily
-+ * be made to work with the progressive one.
-+ */
-+/* Arguments to png_image_finish_read: */
-+
-+/* Encoding of PNG data (used by the color-map code) */
-+# define P_NOTSET 0 /* File encoding not yet known */
-+# define P_sRGB 1 /* 8-bit encoded to sRGB gamma */
-+# define P_LINEAR 2 /* 16-bit linear: not encoded, NOT pre-multiplied! */
-+# define P_FILE 3 /* 8-bit encoded to file gamma, not sRGB or linear */
-+# define P_LINEAR8 4 /* 8-bit linear: only from a file value */
-+
-+/* Color-map processing: after libpng has run on the PNG image further
-+ * processing may be needed to convert the data to color-map indices.
-+ */
-+#define PNG_CMAP_NONE 0
-+#define PNG_CMAP_GA 1 /* Process GA data to a color-map with alpha */
-+#define PNG_CMAP_TRANS 2 /* Process GA data to a background index */
-+#define PNG_CMAP_RGB 3 /* Process RGB data */
-+#define PNG_CMAP_RGB_ALPHA 4 /* Process RGBA data */
-+
-+/* The following document where the background is for each processing case. */
-+#define PNG_CMAP_NONE_BACKGROUND 256
-+#define PNG_CMAP_GA_BACKGROUND 231
-+#define PNG_CMAP_TRANS_BACKGROUND 254
-+#define PNG_CMAP_RGB_BACKGROUND 256
-+#define PNG_CMAP_RGB_ALPHA_BACKGROUND 216
-+
-+typedef struct
-+{
-+ /* Arguments: */
-+ png_imagep image;
-+ png_voidp buffer;
-+ png_int_32 row_stride;
-+ png_voidp colormap;
-+ png_const_colorp background;
-+ /* Local variables: */
-+ png_voidp local_row;
-+ png_voidp first_row;
-+ ptrdiff_t row_bytes; /* step between rows */
-+ int file_encoding; /* E_ values above */
-+ png_fixed_point gamma_to_linear; /* For P_FILE, reciprocal of gamma */
-+ int colormap_processing; /* PNG_CMAP_ values above */
-+} png_image_read_control;
-+
-+/* Do all the *safe* initialization - 'safe' means that png_error won't be
-+ * called, so setting up the jmp_buf is not required. This means that anything
-+ * called from here must *not* call png_malloc - it has to call png_malloc_warn
-+ * instead so that control is returned safely back to this routine.
-+ */
-+static int
-+png_image_read_init(png_imagep image)
-+{
-+ if (image->opaque == NULL)
-+ {
-+ png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, image,
-+ png_safe_error, png_safe_warning);
-+
-+ /* And set the rest of the structure to NULL to ensure that the various
-+ * fields are consistent.
-+ */
-+ memset(image, 0, (sizeof *image));
-+ image->version = PNG_IMAGE_VERSION;
-+
-+ if (png_ptr != NULL)
-+ {
-+ png_infop info_ptr = png_create_info_struct(png_ptr);
-+
-+ if (info_ptr != NULL)
-+ {
-+ png_controlp control = png_voidcast(png_controlp,
-+ png_malloc_warn(png_ptr, (sizeof *control)));
-+
-+ if (control != NULL)
-+ {
-+ memset(control, 0, (sizeof *control));
-+
-+ control->png_ptr = png_ptr;
-+ control->info_ptr = info_ptr;
-+ control->for_write = 0;
-+
-+ image->opaque = control;
-+ return 1;
-+ }
-+
-+ /* Error clean up */
-+ png_destroy_info_struct(png_ptr, &info_ptr);
-+ }
-+
-+ png_destroy_read_struct(&png_ptr, NULL, NULL);
-+ }
-+
-+ return png_image_error(image, "png_image_read: out of memory");
-+ }
-+
-+ return png_image_error(image, "png_image_read: opaque pointer not NULL");
-+}
-+
-+/* Utility to find the base format of a PNG file from a png_struct. */
-+static png_uint_32
-+png_image_format(png_structrp png_ptr)
-+{
-+ png_uint_32 format = 0;
-+
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-+ format |= PNG_FORMAT_FLAG_COLOR;
-+
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-+ format |= PNG_FORMAT_FLAG_ALPHA;
-+
-+ /* Use png_ptr here, not info_ptr, because by examination png_handle_tRNS
-+ * sets the png_struct fields; that's all we are interested in here. The
-+ * precise interaction with an app call to png_set_tRNS and PNG file reading
-+ * is unclear.
-+ */
-+ else if (png_ptr->num_trans > 0)
-+ format |= PNG_FORMAT_FLAG_ALPHA;
-+
-+ if (png_ptr->bit_depth == 16)
-+ format |= PNG_FORMAT_FLAG_LINEAR;
-+
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_PALETTE) != 0)
-+ format |= PNG_FORMAT_FLAG_COLORMAP;
-+
-+ return format;
-+}
-+
-+/* Is the given gamma significantly different from sRGB? The test is the same
-+ * one used in pngrtran.c when deciding whether to do gamma correction. The
-+ * arithmetic optimizes the division by using the fact that the inverse of the
-+ * file sRGB gamma is 2.2
-+ */
-+static int
-+png_gamma_not_sRGB(png_fixed_point g)
-+{
-+ if (g < PNG_FP_1)
-+ {
-+ /* An uninitialized gamma is assumed to be sRGB for the simplified API. */
-+ if (g == 0)
-+ return 0;
-+
-+ return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
-+ }
-+
-+ return 1;
-+}
-+
-+/* Do the main body of a 'png_image_begin_read' function; read the PNG file
-+ * header and fill in all the information. This is executed in a safe context,
-+ * unlike the init routine above.
-+ */
-+static int
-+png_image_read_header(png_voidp argument)
-+{
-+ png_imagep image = png_voidcast(png_imagep, argument);
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+ png_inforp info_ptr = image->opaque->info_ptr;
-+
-+ png_set_benign_errors(png_ptr, 1/*warn*/);
-+ png_read_info(png_ptr, info_ptr);
-+
-+ /* Do this the fast way; just read directly out of png_struct. */
-+ image->width = png_ptr->width;
-+ image->height = png_ptr->height;
-+
-+ {
-+ png_uint_32 format = png_image_format(png_ptr);
-+
-+ image->format = format;
-+
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+ /* Does the colorspace match sRGB? If there is no color endpoint
-+ * (colorant) information assume yes, otherwise require the
-+ * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set. If the
-+ * colorspace has been determined to be invalid ignore it.
-+ */
-+ if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags
-+ & (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB|
-+ PNG_COLORSPACE_INVALID)) == PNG_COLORSPACE_HAVE_ENDPOINTS))
-+ image->flags |= PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB;
-+#endif
-+ }
-+
-+ /* We need the maximum number of entries regardless of the format the
-+ * application sets here.
-+ */
-+ {
-+ png_uint_32 cmap_entries;
-+
-+ switch (png_ptr->color_type)
-+ {
-+ case PNG_COLOR_TYPE_GRAY:
-+ cmap_entries = 1U << png_ptr->bit_depth;
-+ break;
-+
-+ case PNG_COLOR_TYPE_PALETTE:
-+ cmap_entries = png_ptr->num_palette;
-+ break;
-+
-+ default:
-+ cmap_entries = 256;
-+ break;
-+ }
-+
-+ if (cmap_entries > 256)
-+ cmap_entries = 256;
-+
-+ image->colormap_entries = cmap_entries;
-+ }
-+
-+ return 1;
-+}
-+
-+#ifdef PNG_STDIO_SUPPORTED
-+int PNGAPI
-+png_image_begin_read_from_stdio(png_imagep image, FILE* file)
-+{
-+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
-+ {
-+ if (file != NULL)
-+ {
-+ if (png_image_read_init(image) != 0)
-+ {
-+ /* This is slightly evil, but png_init_io doesn't do anything other
-+ * than this and we haven't changed the standard IO functions so
-+ * this saves a 'safe' function.
-+ */
-+ image->opaque->png_ptr->io_ptr = file;
-+ return png_safe_execute(image, png_image_read_header, image);
-+ }
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_begin_read_from_stdio: invalid argument");
-+ }
-+
-+ else if (image != NULL)
-+ return png_image_error(image,
-+ "png_image_begin_read_from_stdio: incorrect PNG_IMAGE_VERSION");
-+
-+ return 0;
-+}
-+
-+int PNGAPI
-+png_image_begin_read_from_file(png_imagep image, const char *file_name)
-+{
-+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
-+ {
-+ if (file_name != NULL)
-+ {
-+ FILE *fp = fopen(file_name, "rb");
-+
-+ if (fp != NULL)
-+ {
-+ if (png_image_read_init(image) != 0)
-+ {
-+ image->opaque->png_ptr->io_ptr = fp;
-+ image->opaque->owned_file = 1;
-+ return png_safe_execute(image, png_image_read_header, image);
-+ }
-+
-+ /* Clean up: just the opened file. */
-+ (void)fclose(fp);
-+ }
-+
-+ else
-+ return png_image_error(image, strerror(errno));
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_begin_read_from_file: invalid argument");
-+ }
-+
-+ else if (image != NULL)
-+ return png_image_error(image,
-+ "png_image_begin_read_from_file: incorrect PNG_IMAGE_VERSION");
-+
-+ return 0;
-+}
-+#endif /* STDIO */
-+
-+static void PNGCBAPI
-+png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need)
-+{
-+ if (png_ptr != NULL)
-+ {
-+ png_imagep image = png_voidcast(png_imagep, png_ptr->io_ptr);
-+ if (image != NULL)
-+ {
-+ png_controlp cp = image->opaque;
-+ if (cp != NULL)
-+ {
-+ png_const_bytep memory = cp->memory;
-+ png_size_t size = cp->size;
-+
-+ if (memory != NULL && size >= need)
-+ {
-+ memcpy(out, memory, need);
-+ cp->memory = memory + need;
-+ cp->size = size - need;
-+ return;
-+ }
-+
-+ png_error(png_ptr, "read beyond end of data");
-+ }
-+ }
-+
-+ png_error(png_ptr, "invalid memory read");
-+ }
-+}
-+
-+int PNGAPI png_image_begin_read_from_memory(png_imagep image,
-+ png_const_voidp memory, png_size_t size)
-+{
-+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
-+ {
-+ if (memory != NULL && size > 0)
-+ {
-+ if (png_image_read_init(image) != 0)
-+ {
-+ /* Now set the IO functions to read from the memory buffer and
-+ * store it into io_ptr. Again do this in-place to avoid calling a
-+ * libpng function that requires error handling.
-+ */
-+ image->opaque->memory = png_voidcast(png_const_bytep, memory);
-+ image->opaque->size = size;
-+ image->opaque->png_ptr->io_ptr = image;
-+ image->opaque->png_ptr->read_data_fn = png_image_memory_read;
-+
-+ return png_safe_execute(image, png_image_read_header, image);
-+ }
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_begin_read_from_memory: invalid argument");
-+ }
-+
-+ else if (image != NULL)
-+ return png_image_error(image,
-+ "png_image_begin_read_from_memory: incorrect PNG_IMAGE_VERSION");
-+
-+ return 0;
-+}
-+
-+/* Utility function to skip chunks that are not used by the simplified image
-+ * read functions and an appropriate macro to call it.
-+ */
-+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+static void
-+png_image_skip_unused_chunks(png_structrp png_ptr)
-+{
-+ /* Prepare the reader to ignore all recognized chunks whose data will not
-+ * be used, i.e., all chunks recognized by libpng except for those
-+ * involved in basic image reading:
-+ *
-+ * IHDR, PLTE, IDAT, IEND
-+ *
-+ * Or image data handling:
-+ *
-+ * tRNS, bKGD, gAMA, cHRM, sRGB, [iCCP] and sBIT.
-+ *
-+ * This provides a small performance improvement and eliminates any
-+ * potential vulnerability to security problems in the unused chunks.
-+ *
-+ * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored
-+ * too. This allows the simplified API to be compiled without iCCP support,
-+ * however if the support is there the chunk is still checked to detect
-+ * errors (which are unfortunately quite common.)
-+ */
-+ {
-+ static PNG_CONST png_byte chunks_to_process[] = {
-+ 98, 75, 71, 68, '\0', /* bKGD */
-+ 99, 72, 82, 77, '\0', /* cHRM */
-+ 103, 65, 77, 65, '\0', /* gAMA */
-+# ifdef PNG_READ_iCCP_SUPPORTED
-+ 105, 67, 67, 80, '\0', /* iCCP */
-+# endif
-+ 115, 66, 73, 84, '\0', /* sBIT */
-+ 115, 82, 71, 66, '\0', /* sRGB */
-+ };
-+
-+ /* Ignore unknown chunks and all other chunks except for the
-+ * IHDR, PLTE, tRNS, IDAT, and IEND chunks.
-+ */
-+ png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_NEVER,
-+ NULL, -1);
-+
-+ /* But do not ignore image data handling chunks */
-+ png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT,
-+ chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);
-+ }
-+}
-+
-+# define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p)
-+#else
-+# define PNG_SKIP_CHUNKS(p) ((void)0)
-+#endif /* HANDLE_AS_UNKNOWN */
-+
-+/* The following macro gives the exact rounded answer for all values in the
-+ * range 0..255 (it actually divides by 51.2, but the rounding still generates
-+ * the correct numbers 0..5
-+ */
-+#define PNG_DIV51(v8) (((v8) * 5 + 130) >> 8)
-+
-+/* Utility functions to make particular color-maps */
-+static void
-+set_file_encoding(png_image_read_control *display)
-+{
-+ png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;
-+ if (png_gamma_significant(g) != 0)
-+ {
-+ if (png_gamma_not_sRGB(g) != 0)
-+ {
-+ display->file_encoding = P_FILE;
-+ display->gamma_to_linear = png_reciprocal(g);
-+ }
-+
-+ else
-+ display->file_encoding = P_sRGB;
-+ }
-+
-+ else
-+ display->file_encoding = P_LINEAR8;
-+}
-+
-+static unsigned int
-+decode_gamma(png_image_read_control *display, png_uint_32 value, int encoding)
-+{
-+ if (encoding == P_FILE) /* double check */
-+ encoding = display->file_encoding;
-+
-+ if (encoding == P_NOTSET) /* must be the file encoding */
-+ {
-+ set_file_encoding(display);
-+ encoding = display->file_encoding;
-+ }
-+
-+ switch (encoding)
-+ {
-+ case P_FILE:
-+ value = png_gamma_16bit_correct(value*257, display->gamma_to_linear);
-+ break;
-+
-+ case P_sRGB:
-+ value = png_sRGB_table[value];
-+ break;
-+
-+ case P_LINEAR:
-+ break;
-+
-+ case P_LINEAR8:
-+ value *= 257;
-+ break;
-+
-+ default:
-+ png_error(display->image->opaque->png_ptr,
-+ "unexpected encoding (internal error)");
-+ break;
-+ }
-+
-+ return value;
-+}
-+
-+static png_uint_32
-+png_colormap_compose(png_image_read_control *display,
-+ png_uint_32 foreground, int foreground_encoding, png_uint_32 alpha,
-+ png_uint_32 background, int encoding)
-+{
-+ /* The file value is composed on the background, the background has the given
-+ * encoding and so does the result, the file is encoded with P_FILE and the
-+ * file and alpha are 8-bit values. The (output) encoding will always be
-+ * P_LINEAR or P_sRGB.
-+ */
-+ png_uint_32 f = decode_gamma(display, foreground, foreground_encoding);
-+ png_uint_32 b = decode_gamma(display, background, encoding);
-+
-+ /* The alpha is always an 8-bit value (it comes from the palette), the value
-+ * scaled by 255 is what PNG_sRGB_FROM_LINEAR requires.
-+ */
-+ f = f * alpha + b * (255-alpha);
-+
-+ if (encoding == P_LINEAR)
-+ {
-+ /* Scale to 65535; divide by 255, approximately (in fact this is extremely
-+ * accurate, it divides by 255.00000005937181414556, with no overflow.)
-+ */
-+ f *= 257; /* Now scaled by 65535 */
-+ f += f >> 16;
-+ f = (f+32768) >> 16;
-+ }
-+
-+ else /* P_sRGB */
-+ f = PNG_sRGB_FROM_LINEAR(f);
-+
-+ return f;
-+}
-+
-+/* NOTE: P_LINEAR values to this routine must be 16-bit, but P_FILE values must
-+ * be 8-bit.
-+ */
-+static void
-+png_create_colormap_entry(png_image_read_control *display,
-+ png_uint_32 ip, png_uint_32 red, png_uint_32 green, png_uint_32 blue,
-+ png_uint_32 alpha, int encoding)
-+{
-+ png_imagep image = display->image;
-+ const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
-+ P_LINEAR : P_sRGB;
-+ const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
-+ (red != green || green != blue);
-+
-+ if (ip > 255)
-+ png_error(image->opaque->png_ptr, "color-map index out of range");
-+
-+ /* Update the cache with whether the file gamma is significantly different
-+ * from sRGB.
-+ */
-+ if (encoding == P_FILE)
-+ {
-+ if (display->file_encoding == P_NOTSET)
-+ set_file_encoding(display);
-+
-+ /* Note that the cached value may be P_FILE too, but if it is then the
-+ * gamma_to_linear member has been set.
-+ */
-+ encoding = display->file_encoding;
-+ }
-+
-+ if (encoding == P_FILE)
-+ {
-+ png_fixed_point g = display->gamma_to_linear;
-+
-+ red = png_gamma_16bit_correct(red*257, g);
-+ green = png_gamma_16bit_correct(green*257, g);
-+ blue = png_gamma_16bit_correct(blue*257, g);
-+
-+ if (convert_to_Y != 0 || output_encoding == P_LINEAR)
-+ {
-+ alpha *= 257;
-+ encoding = P_LINEAR;
-+ }
-+
-+ else
-+ {
-+ red = PNG_sRGB_FROM_LINEAR(red * 255);
-+ green = PNG_sRGB_FROM_LINEAR(green * 255);
-+ blue = PNG_sRGB_FROM_LINEAR(blue * 255);
-+ encoding = P_sRGB;
-+ }
-+ }
-+
-+ else if (encoding == P_LINEAR8)
-+ {
-+ /* This encoding occurs quite frequently in test cases because PngSuite
-+ * includes a gAMA 1.0 chunk with most images.
-+ */
-+ red *= 257;
-+ green *= 257;
-+ blue *= 257;
-+ alpha *= 257;
-+ encoding = P_LINEAR;
-+ }
-+
-+ else if (encoding == P_sRGB &&
-+ (convert_to_Y != 0 || output_encoding == P_LINEAR))
-+ {
-+ /* The values are 8-bit sRGB values, but must be converted to 16-bit
-+ * linear.
-+ */
-+ red = png_sRGB_table[red];
-+ green = png_sRGB_table[green];
-+ blue = png_sRGB_table[blue];
-+ alpha *= 257;
-+ encoding = P_LINEAR;
-+ }
-+
-+ /* This is set if the color isn't gray but the output is. */
-+ if (encoding == P_LINEAR)
-+ {
-+ if (convert_to_Y != 0)
-+ {
-+ /* NOTE: these values are copied from png_do_rgb_to_gray */
-+ png_uint_32 y = (png_uint_32)6968 * red + (png_uint_32)23434 * green +
-+ (png_uint_32)2366 * blue;
-+
-+ if (output_encoding == P_LINEAR)
-+ y = (y + 16384) >> 15;
-+
-+ else
-+ {
-+ /* y is scaled by 32768, we need it scaled by 255: */
-+ y = (y + 128) >> 8;
-+ y *= 255;
-+ y = PNG_sRGB_FROM_LINEAR((y + 64) >> 7);
-+ encoding = P_sRGB;
-+ }
-+
-+ blue = red = green = y;
-+ }
-+
-+ else if (output_encoding == P_sRGB)
-+ {
-+ red = PNG_sRGB_FROM_LINEAR(red * 255);
-+ green = PNG_sRGB_FROM_LINEAR(green * 255);
-+ blue = PNG_sRGB_FROM_LINEAR(blue * 255);
-+ alpha = PNG_DIV257(alpha);
-+ encoding = P_sRGB;
-+ }
-+ }
-+
-+ if (encoding != output_encoding)
-+ png_error(image->opaque->png_ptr, "bad encoding (internal error)");
-+
-+ /* Store the value. */
-+ {
-+# ifdef PNG_FORMAT_AFIRST_SUPPORTED
-+ const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
-+ (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
-+# else
-+# define afirst 0
-+# endif
-+# ifdef PNG_FORMAT_BGR_SUPPORTED
-+ const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
-+# else
-+# define bgr 0
-+# endif
-+
-+ if (output_encoding == P_LINEAR)
-+ {
-+ png_uint_16p entry = png_voidcast(png_uint_16p, display->colormap);
-+
-+ entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);
-+
-+ /* The linear 16-bit values must be pre-multiplied by the alpha channel
-+ * value, if less than 65535 (this is, effectively, composite on black
-+ * if the alpha channel is removed.)
-+ */
-+ switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))
-+ {
-+ case 4:
-+ entry[afirst ? 0 : 3] = (png_uint_16)alpha;
-+ /* FALL THROUGH */
-+
-+ case 3:
-+ if (alpha < 65535)
-+ {
-+ if (alpha > 0)
-+ {
-+ blue = (blue * alpha + 32767U)/65535U;
-+ green = (green * alpha + 32767U)/65535U;
-+ red = (red * alpha + 32767U)/65535U;
-+ }
-+
-+ else
-+ red = green = blue = 0;
-+ }
-+ entry[afirst + (2 ^ bgr)] = (png_uint_16)blue;
-+ entry[afirst + 1] = (png_uint_16)green;
-+ entry[afirst + bgr] = (png_uint_16)red;
-+ break;
-+
-+ case 2:
-+ entry[1 ^ afirst] = (png_uint_16)alpha;
-+ /* FALL THROUGH */
-+
-+ case 1:
-+ if (alpha < 65535)
-+ {
-+ if (alpha > 0)
-+ green = (green * alpha + 32767U)/65535U;
-+
-+ else
-+ green = 0;
-+ }
-+ entry[afirst] = (png_uint_16)green;
-+ break;
-+
-+ default:
-+ break;
-+ }
-+ }
-+
-+ else /* output encoding is P_sRGB */
-+ {
-+ png_bytep entry = png_voidcast(png_bytep, display->colormap);
-+
-+ entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);
-+
-+ switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))
-+ {
-+ case 4:
-+ entry[afirst ? 0 : 3] = (png_byte)alpha;
-+ case 3:
-+ entry[afirst + (2 ^ bgr)] = (png_byte)blue;
-+ entry[afirst + 1] = (png_byte)green;
-+ entry[afirst + bgr] = (png_byte)red;
-+ break;
-+
-+ case 2:
-+ entry[1 ^ afirst] = (png_byte)alpha;
-+ case 1:
-+ entry[afirst] = (png_byte)green;
-+ break;
-+
-+ default:
-+ break;
-+ }
-+ }
-+
-+# ifdef afirst
-+# undef afirst
-+# endif
-+# ifdef bgr
-+# undef bgr
-+# endif
-+ }
-+}
-+
-+static int
-+make_gray_file_colormap(png_image_read_control *display)
-+{
-+ unsigned int i;
-+
-+ for (i=0; i<256; ++i)
-+ png_create_colormap_entry(display, i, i, i, i, 255, P_FILE);
-+
-+ return i;
-+}
-+
-+static int
-+make_gray_colormap(png_image_read_control *display)
-+{
-+ unsigned int i;
-+
-+ for (i=0; i<256; ++i)
-+ png_create_colormap_entry(display, i, i, i, i, 255, P_sRGB);
-+
-+ return i;
-+}
-+#define PNG_GRAY_COLORMAP_ENTRIES 256
-+
-+static int
-+make_ga_colormap(png_image_read_control *display)
-+{
-+ unsigned int i, a;
-+
-+ /* Alpha is retained, the output will be a color-map with entries
-+ * selected by six levels of alpha. One transparent entry, 6 gray
-+ * levels for all the intermediate alpha values, leaving 230 entries
-+ * for the opaque grays. The color-map entries are the six values
-+ * [0..5]*51, the GA processing uses PNG_DIV51(value) to find the
-+ * relevant entry.
-+ *
-+ * if (alpha > 229) // opaque
-+ * {
-+ * // The 231 entries are selected to make the math below work:
-+ * base = 0;
-+ * entry = (231 * gray + 128) >> 8;
-+ * }
-+ * else if (alpha < 26) // transparent
-+ * {
-+ * base = 231;
-+ * entry = 0;
-+ * }
-+ * else // partially opaque
-+ * {
-+ * base = 226 + 6 * PNG_DIV51(alpha);
-+ * entry = PNG_DIV51(gray);
-+ * }
-+ */
-+ i = 0;
-+ while (i < 231)
-+ {
-+ unsigned int gray = (i * 256 + 115) / 231;
-+ png_create_colormap_entry(display, i++, gray, gray, gray, 255, P_sRGB);
-+ }
-+
-+ /* 255 is used here for the component values for consistency with the code
-+ * that undoes premultiplication in pngwrite.c.
-+ */
-+ png_create_colormap_entry(display, i++, 255, 255, 255, 0, P_sRGB);
-+
-+ for (a=1; a<5; ++a)
-+ {
-+ unsigned int g;
-+
-+ for (g=0; g<6; ++g)
-+ png_create_colormap_entry(display, i++, g*51, g*51, g*51, a*51,
-+ P_sRGB);
-+ }
-+
-+ return i;
-+}
-+
-+#define PNG_GA_COLORMAP_ENTRIES 256
-+
-+static int
-+make_rgb_colormap(png_image_read_control *display)
-+{
-+ unsigned int i, r;
-+
-+ /* Build a 6x6x6 opaque RGB cube */
-+ for (i=r=0; r<6; ++r)
-+ {
-+ unsigned int g;
-+
-+ for (g=0; g<6; ++g)
-+ {
-+ unsigned int b;
-+
-+ for (b=0; b<6; ++b)
-+ png_create_colormap_entry(display, i++, r*51, g*51, b*51, 255,
-+ P_sRGB);
-+ }
-+ }
-+
-+ return i;
-+}
-+
-+#define PNG_RGB_COLORMAP_ENTRIES 216
-+
-+/* Return a palette index to the above palette given three 8-bit sRGB values. */
-+#define PNG_RGB_INDEX(r,g,b) \
-+ ((png_byte)(6 * (6 * PNG_DIV51(r) + PNG_DIV51(g)) + PNG_DIV51(b)))
-+
-+static int
-+png_image_read_colormap(png_voidp argument)
-+{
-+ png_image_read_control *display =
-+ png_voidcast(png_image_read_control*, argument);
-+ const png_imagep image = display->image;
-+
-+ const png_structrp png_ptr = image->opaque->png_ptr;
-+ const png_uint_32 output_format = image->format;
-+ const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
-+ P_LINEAR : P_sRGB;
-+
-+ unsigned int cmap_entries;
-+ unsigned int output_processing; /* Output processing option */
-+ unsigned int data_encoding = P_NOTSET; /* Encoding libpng must produce */
-+
-+ /* Background information; the background color and the index of this color
-+ * in the color-map if it exists (else 256).
-+ */
-+ unsigned int background_index = 256;
-+ png_uint_32 back_r, back_g, back_b;
-+
-+ /* Flags to accumulate things that need to be done to the input. */
-+ int expand_tRNS = 0;
-+
-+ /* Exclude the NYI feature of compositing onto a color-mapped buffer; it is
-+ * very difficult to do, the results look awful, and it is difficult to see
-+ * what possible use it is because the application can't control the
-+ * color-map.
-+ */
-+ if (((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0 ||
-+ png_ptr->num_trans > 0) /* alpha in input */ &&
-+ ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0) /* no alpha in output */)
-+ {
-+ if (output_encoding == P_LINEAR) /* compose on black */
-+ back_b = back_g = back_r = 0;
-+
-+ else if (display->background == NULL /* no way to remove it */)
-+ png_error(png_ptr,
-+ "a background color must be supplied to remove alpha/transparency");
-+
-+ /* Get a copy of the background color (this avoids repeating the checks
-+ * below.) The encoding is 8-bit sRGB or 16-bit linear, depending on the
-+ * output format.
-+ */
-+ else
-+ {
-+ back_g = display->background->green;
-+ if ((output_format & PNG_FORMAT_FLAG_COLOR) != 0)
-+ {
-+ back_r = display->background->red;
-+ back_b = display->background->blue;
-+ }
-+ else
-+ back_b = back_r = back_g;
-+ }
-+ }
-+
-+ else if (output_encoding == P_LINEAR)
-+ back_b = back_r = back_g = 65535;
-+
-+ else
-+ back_b = back_r = back_g = 255;
-+
-+ /* Default the input file gamma if required - this is necessary because
-+ * libpng assumes that if no gamma information is present the data is in the
-+ * output format, but the simplified API deduces the gamma from the input
-+ * format.
-+ */
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) == 0)
-+ {
-+ /* Do this directly, not using the png_colorspace functions, to ensure
-+ * that it happens even if the colorspace is invalid (though probably if
-+ * it is the setting will be ignored) Note that the same thing can be
-+ * achieved at the application interface with png_set_gAMA.
-+ */
-+ if (png_ptr->bit_depth == 16 &&
-+ (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
-+ png_ptr->colorspace.gamma = PNG_GAMMA_LINEAR;
-+
-+ else
-+ png_ptr->colorspace.gamma = PNG_GAMMA_sRGB_INVERSE;
-+
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-+ }
-+
-+ /* Decide what to do based on the PNG color type of the input data. The
-+ * utility function png_create_colormap_entry deals with most aspects of the
-+ * output transformations; this code works out how to produce bytes of
-+ * color-map entries from the original format.
-+ */
-+ switch (png_ptr->color_type)
-+ {
-+ case PNG_COLOR_TYPE_GRAY:
-+ if (png_ptr->bit_depth <= 8)
-+ {
-+ /* There at most 256 colors in the output, regardless of
-+ * transparency.
-+ */
-+ unsigned int step, i, val, trans = 256/*ignore*/, back_alpha = 0;
-+
-+ cmap_entries = 1U << png_ptr->bit_depth;
-+ if (cmap_entries > image->colormap_entries)
-+ png_error(png_ptr, "gray[8] color-map: too few entries");
-+
-+ step = 255 / (cmap_entries - 1);
-+ output_processing = PNG_CMAP_NONE;
-+
-+ /* If there is a tRNS chunk then this either selects a transparent
-+ * value or, if the output has no alpha, the background color.
-+ */
-+ if (png_ptr->num_trans > 0)
-+ {
-+ trans = png_ptr->trans_color.gray;
-+
-+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0)
-+ back_alpha = output_encoding == P_LINEAR ? 65535 : 255;
-+ }
-+
-+ /* png_create_colormap_entry just takes an RGBA and writes the
-+ * corresponding color-map entry using the format from 'image',
-+ * including the required conversion to sRGB or linear as
-+ * appropriate. The input values are always either sRGB (if the
-+ * gamma correction flag is 0) or 0..255 scaled file encoded values
-+ * (if the function must gamma correct them).
-+ */
-+ for (i=val=0; i<cmap_entries; ++i, val += step)
-+ {
-+ /* 'i' is a file value. While this will result in duplicated
-+ * entries for 8-bit non-sRGB encoded files it is necessary to
-+ * have non-gamma corrected values to do tRNS handling.
-+ */
-+ if (i != trans)
-+ png_create_colormap_entry(display, i, val, val, val, 255,
-+ P_FILE/*8-bit with file gamma*/);
-+
-+ /* Else this entry is transparent. The colors don't matter if
-+ * there is an alpha channel (back_alpha == 0), but it does no
-+ * harm to pass them in; the values are not set above so this
-+ * passes in white.
-+ *
-+ * NOTE: this preserves the full precision of the application
-+ * supplied background color when it is used.
-+ */
-+ else
-+ png_create_colormap_entry(display, i, back_r, back_g, back_b,
-+ back_alpha, output_encoding);
-+ }
-+
-+ /* We need libpng to preserve the original encoding. */
-+ data_encoding = P_FILE;
-+
-+ /* The rows from libpng, while technically gray values, are now also
-+ * color-map indices; however, they may need to be expanded to 1
-+ * byte per pixel. This is what png_set_packing does (i.e., it
-+ * unpacks the bit values into bytes.)
-+ */
-+ if (png_ptr->bit_depth < 8)
-+ png_set_packing(png_ptr);
-+ }
-+
-+ else /* bit depth is 16 */
-+ {
-+ /* The 16-bit input values can be converted directly to 8-bit gamma
-+ * encoded values; however, if a tRNS chunk is present 257 color-map
-+ * entries are required. This means that the extra entry requires
-+ * special processing; add an alpha channel, sacrifice gray level
-+ * 254 and convert transparent (alpha==0) entries to that.
-+ *
-+ * Use libpng to chop the data to 8 bits. Convert it to sRGB at the
-+ * same time to minimize quality loss. If a tRNS chunk is present
-+ * this means libpng must handle it too; otherwise it is impossible
-+ * to do the exact match on the 16-bit value.
-+ *
-+ * If the output has no alpha channel *and* the background color is
-+ * gray then it is possible to let libpng handle the substitution by
-+ * ensuring that the corresponding gray level matches the background
-+ * color exactly.
-+ */
-+ data_encoding = P_sRGB;
-+
-+ if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "gray[16] color-map: too few entries");
-+
-+ cmap_entries = make_gray_colormap(display);
-+
-+ if (png_ptr->num_trans > 0)
-+ {
-+ unsigned int back_alpha;
-+
-+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ back_alpha = 0;
-+
-+ else
-+ {
-+ if (back_r == back_g && back_g == back_b)
-+ {
-+ /* Background is gray; no special processing will be
-+ * required.
-+ */
-+ png_color_16 c;
-+ png_uint_32 gray = back_g;
-+
-+ if (output_encoding == P_LINEAR)
-+ {
-+ gray = PNG_sRGB_FROM_LINEAR(gray * 255);
-+
-+ /* And make sure the corresponding palette entry
-+ * matches.
-+ */
-+ png_create_colormap_entry(display, gray, back_g, back_g,
-+ back_g, 65535, P_LINEAR);
-+ }
-+
-+ /* The background passed to libpng, however, must be the
-+ * sRGB value.
-+ */
-+ c.index = 0; /*unused*/
-+ c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
-+
-+ /* NOTE: does this work without expanding tRNS to alpha?
-+ * It should be the color->gray case below apparently
-+ * doesn't.
-+ */
-+ png_set_background_fixed(png_ptr, &c,
-+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-+ 0/*gamma: not used*/);
-+
-+ output_processing = PNG_CMAP_NONE;
-+ break;
-+ }
-+
-+ back_alpha = output_encoding == P_LINEAR ? 65535 : 255;
-+ }
-+
-+ /* output_processing means that the libpng-processed row will be
-+ * 8-bit GA and it has to be processing to single byte color-map
-+ * values. Entry 254 is replaced by either a completely
-+ * transparent entry or by the background color at full
-+ * precision (and the background color is not a simple gray
-+ * level in this case.)
-+ */
-+ expand_tRNS = 1;
-+ output_processing = PNG_CMAP_TRANS;
-+ background_index = 254;
-+
-+ /* And set (overwrite) color-map entry 254 to the actual
-+ * background color at full precision.
-+ */
-+ png_create_colormap_entry(display, 254, back_r, back_g, back_b,
-+ back_alpha, output_encoding);
-+ }
-+
-+ else
-+ output_processing = PNG_CMAP_NONE;
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_GRAY_ALPHA:
-+ /* 8-bit or 16-bit PNG with two channels - gray and alpha. A minimum
-+ * of 65536 combinations. If, however, the alpha channel is to be
-+ * removed there are only 256 possibilities if the background is gray.
-+ * (Otherwise there is a subset of the 65536 possibilities defined by
-+ * the triangle between black, white and the background color.)
-+ *
-+ * Reduce 16-bit files to 8-bit and sRGB encode the result. No need to
-+ * worry about tRNS matching - tRNS is ignored if there is an alpha
-+ * channel.
-+ */
-+ data_encoding = P_sRGB;
-+
-+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "gray+alpha color-map: too few entries");
-+
-+ cmap_entries = make_ga_colormap(display);
-+
-+ background_index = PNG_CMAP_GA_BACKGROUND;
-+ output_processing = PNG_CMAP_GA;
-+ }
-+
-+ else /* alpha is removed */
-+ {
-+ /* Alpha must be removed as the PNG data is processed when the
-+ * background is a color because the G and A channels are
-+ * independent and the vector addition (non-parallel vectors) is a
-+ * 2-D problem.
-+ *
-+ * This can be reduced to the same algorithm as above by making a
-+ * colormap containing gray levels (for the opaque grays), a
-+ * background entry (for a transparent pixel) and a set of four six
-+ * level color values, one set for each intermediate alpha value.
-+ * See the comments in make_ga_colormap for how this works in the
-+ * per-pixel processing.
-+ *
-+ * If the background is gray, however, we only need a 256 entry gray
-+ * level color map. It is sufficient to make the entry generated
-+ * for the background color be exactly the color specified.
-+ */
-+ if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0 ||
-+ (back_r == back_g && back_g == back_b))
-+ {
-+ /* Background is gray; no special processing will be required. */
-+ png_color_16 c;
-+ png_uint_32 gray = back_g;
-+
-+ if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "gray-alpha color-map: too few entries");
-+
-+ cmap_entries = make_gray_colormap(display);
-+
-+ if (output_encoding == P_LINEAR)
-+ {
-+ gray = PNG_sRGB_FROM_LINEAR(gray * 255);
-+
-+ /* And make sure the corresponding palette entry matches. */
-+ png_create_colormap_entry(display, gray, back_g, back_g,
-+ back_g, 65535, P_LINEAR);
-+ }
-+
-+ /* The background passed to libpng, however, must be the sRGB
-+ * value.
-+ */
-+ c.index = 0; /*unused*/
-+ c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
-+
-+ png_set_background_fixed(png_ptr, &c,
-+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-+ 0/*gamma: not used*/);
-+
-+ output_processing = PNG_CMAP_NONE;
-+ }
-+
-+ else
-+ {
-+ png_uint_32 i, a;
-+
-+ /* This is the same as png_make_ga_colormap, above, except that
-+ * the entries are all opaque.
-+ */
-+ if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "ga-alpha color-map: too few entries");
-+
-+ i = 0;
-+ while (i < 231)
-+ {
-+ png_uint_32 gray = (i * 256 + 115) / 231;
-+ png_create_colormap_entry(display, i++, gray, gray, gray,
-+ 255, P_sRGB);
-+ }
-+
-+ /* NOTE: this preserves the full precision of the application
-+ * background color.
-+ */
-+ background_index = i;
-+ png_create_colormap_entry(display, i++, back_r, back_g, back_b,
-+ output_encoding == P_LINEAR ? 65535U : 255U, output_encoding);
-+
-+ /* For non-opaque input composite on the sRGB background - this
-+ * requires inverting the encoding for each component. The input
-+ * is still converted to the sRGB encoding because this is a
-+ * reasonable approximate to the logarithmic curve of human
-+ * visual sensitivity, at least over the narrow range which PNG
-+ * represents. Consequently 'G' is always sRGB encoded, while
-+ * 'A' is linear. We need the linear background colors.
-+ */
-+ if (output_encoding == P_sRGB) /* else already linear */
-+ {
-+ /* This may produce a value not exactly matching the
-+ * background, but that's ok because these numbers are only
-+ * used when alpha != 0
-+ */
-+ back_r = png_sRGB_table[back_r];
-+ back_g = png_sRGB_table[back_g];
-+ back_b = png_sRGB_table[back_b];
-+ }
-+
-+ for (a=1; a<5; ++a)
-+ {
-+ unsigned int g;
-+
-+ /* PNG_sRGB_FROM_LINEAR expects a 16-bit linear value scaled
-+ * by an 8-bit alpha value (0..255).
-+ */
-+ png_uint_32 alpha = 51 * a;
-+ png_uint_32 back_rx = (255-alpha) * back_r;
-+ png_uint_32 back_gx = (255-alpha) * back_g;
-+ png_uint_32 back_bx = (255-alpha) * back_b;
-+
-+ for (g=0; g<6; ++g)
-+ {
-+ png_uint_32 gray = png_sRGB_table[g*51] * alpha;
-+
-+ png_create_colormap_entry(display, i++,
-+ PNG_sRGB_FROM_LINEAR(gray + back_rx),
-+ PNG_sRGB_FROM_LINEAR(gray + back_gx),
-+ PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB);
-+ }
-+ }
-+
-+ cmap_entries = i;
-+ output_processing = PNG_CMAP_GA;
-+ }
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_RGB:
-+ case PNG_COLOR_TYPE_RGB_ALPHA:
-+ /* Exclude the case where the output is gray; we can always handle this
-+ * with the cases above.
-+ */
-+ if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0)
-+ {
-+ /* The color-map will be grayscale, so we may as well convert the
-+ * input RGB values to a simple grayscale and use the grayscale
-+ * code above.
-+ *
-+ * NOTE: calling this apparently damages the recognition of the
-+ * transparent color in background color handling; call
-+ * png_set_tRNS_to_alpha before png_set_background_fixed.
-+ */
-+ png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, -1,
-+ -1);
-+ data_encoding = P_sRGB;
-+
-+ /* The output will now be one or two 8-bit gray or gray+alpha
-+ * channels. The more complex case arises when the input has alpha.
-+ */
-+ if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-+ png_ptr->num_trans > 0) &&
-+ (output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ /* Both input and output have an alpha channel, so no background
-+ * processing is required; just map the GA bytes to the right
-+ * color-map entry.
-+ */
-+ expand_tRNS = 1;
-+
-+ if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "rgb[ga] color-map: too few entries");
-+
-+ cmap_entries = make_ga_colormap(display);
-+ background_index = PNG_CMAP_GA_BACKGROUND;
-+ output_processing = PNG_CMAP_GA;
-+ }
-+
-+ else
-+ {
-+ /* Either the input or the output has no alpha channel, so there
-+ * will be no non-opaque pixels in the color-map; it will just be
-+ * grayscale.
-+ */
-+ if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "rgb[gray] color-map: too few entries");
-+
-+ /* Ideally this code would use libpng to do the gamma correction,
-+ * but if an input alpha channel is to be removed we will hit the
-+ * libpng bug in gamma+compose+rgb-to-gray (the double gamma
-+ * correction bug). Fix this by dropping the gamma correction in
-+ * this case and doing it in the palette; this will result in
-+ * duplicate palette entries, but that's better than the
-+ * alternative of double gamma correction.
-+ */
-+ if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-+ png_ptr->num_trans > 0) &&
-+ png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
-+ {
-+ cmap_entries = make_gray_file_colormap(display);
-+ data_encoding = P_FILE;
-+ }
-+
-+ else
-+ cmap_entries = make_gray_colormap(display);
-+
-+ /* But if the input has alpha or transparency it must be removed
-+ */
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-+ png_ptr->num_trans > 0)
-+ {
-+ png_color_16 c;
-+ png_uint_32 gray = back_g;
-+
-+ /* We need to ensure that the application background exists in
-+ * the colormap and that completely transparent pixels map to
-+ * it. Achieve this simply by ensuring that the entry
-+ * selected for the background really is the background color.
-+ */
-+ if (data_encoding == P_FILE) /* from the fixup above */
-+ {
-+ /* The app supplied a gray which is in output_encoding, we
-+ * need to convert it to a value of the input (P_FILE)
-+ * encoding then set this palette entry to the required
-+ * output encoding.
-+ */
-+ if (output_encoding == P_sRGB)
-+ gray = png_sRGB_table[gray]; /* now P_LINEAR */
-+
-+ gray = PNG_DIV257(png_gamma_16bit_correct(gray,
-+ png_ptr->colorspace.gamma)); /* now P_FILE */
-+
-+ /* And make sure the corresponding palette entry contains
-+ * exactly the required sRGB value.
-+ */
-+ png_create_colormap_entry(display, gray, back_g, back_g,
-+ back_g, 0/*unused*/, output_encoding);
-+ }
-+
-+ else if (output_encoding == P_LINEAR)
-+ {
-+ gray = PNG_sRGB_FROM_LINEAR(gray * 255);
-+
-+ /* And make sure the corresponding palette entry matches.
-+ */
-+ png_create_colormap_entry(display, gray, back_g, back_g,
-+ back_g, 0/*unused*/, P_LINEAR);
-+ }
-+
-+ /* The background passed to libpng, however, must be the
-+ * output (normally sRGB) value.
-+ */
-+ c.index = 0; /*unused*/
-+ c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
-+
-+ /* NOTE: the following is apparently a bug in libpng. Without
-+ * it the transparent color recognition in
-+ * png_set_background_fixed seems to go wrong.
-+ */
-+ expand_tRNS = 1;
-+ png_set_background_fixed(png_ptr, &c,
-+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-+ 0/*gamma: not used*/);
-+ }
-+
-+ output_processing = PNG_CMAP_NONE;
-+ }
-+ }
-+
-+ else /* output is color */
-+ {
-+ /* We could use png_quantize here so long as there is no transparent
-+ * color or alpha; png_quantize ignores alpha. Easier overall just
-+ * to do it once and using PNG_DIV51 on the 6x6x6 reduced RGB cube.
-+ * Consequently we always want libpng to produce sRGB data.
-+ */
-+ data_encoding = P_sRGB;
-+
-+ /* Is there any transparency or alpha? */
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-+ png_ptr->num_trans > 0)
-+ {
-+ /* Is there alpha in the output too? If so all four channels are
-+ * processed into a special RGB cube with alpha support.
-+ */
-+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ png_uint_32 r;
-+
-+ if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
-+ png_error(png_ptr, "rgb+alpha color-map: too few entries");
-+
-+ cmap_entries = make_rgb_colormap(display);
-+
-+ /* Add a transparent entry. */
-+ png_create_colormap_entry(display, cmap_entries, 255, 255,
-+ 255, 0, P_sRGB);
-+
-+ /* This is stored as the background index for the processing
-+ * algorithm.
-+ */
-+ background_index = cmap_entries++;
-+
-+ /* Add 27 r,g,b entries each with alpha 0.5. */
-+ for (r=0; r<256; r = (r << 1) | 0x7f)
-+ {
-+ png_uint_32 g;
-+
-+ for (g=0; g<256; g = (g << 1) | 0x7f)
-+ {
-+ png_uint_32 b;
-+
-+ /* This generates components with the values 0, 127 and
-+ * 255
-+ */
-+ for (b=0; b<256; b = (b << 1) | 0x7f)
-+ png_create_colormap_entry(display, cmap_entries++,
-+ r, g, b, 128, P_sRGB);
-+ }
-+ }
-+
-+ expand_tRNS = 1;
-+ output_processing = PNG_CMAP_RGB_ALPHA;
-+ }
-+
-+ else
-+ {
-+ /* Alpha/transparency must be removed. The background must
-+ * exist in the color map (achieved by setting adding it after
-+ * the 666 color-map). If the standard processing code will
-+ * pick up this entry automatically that's all that is
-+ * required; libpng can be called to do the background
-+ * processing.
-+ */
-+ unsigned int sample_size =
-+ PNG_IMAGE_SAMPLE_SIZE(output_format);
-+ png_uint_32 r, g, b; /* sRGB background */
-+
-+ if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
-+ png_error(png_ptr, "rgb-alpha color-map: too few entries");
-+
-+ cmap_entries = make_rgb_colormap(display);
-+
-+ png_create_colormap_entry(display, cmap_entries, back_r,
-+ back_g, back_b, 0/*unused*/, output_encoding);
-+
-+ if (output_encoding == P_LINEAR)
-+ {
-+ r = PNG_sRGB_FROM_LINEAR(back_r * 255);
-+ g = PNG_sRGB_FROM_LINEAR(back_g * 255);
-+ b = PNG_sRGB_FROM_LINEAR(back_b * 255);
-+ }
-+
-+ else
-+ {
-+ r = back_r;
-+ g = back_g;
-+ b = back_g;
-+ }
-+
-+ /* Compare the newly-created color-map entry with the one the
-+ * PNG_CMAP_RGB algorithm will use. If the two entries don't
-+ * match, add the new one and set this as the background
-+ * index.
-+ */
-+ if (memcmp((png_const_bytep)display->colormap +
-+ sample_size * cmap_entries,
-+ (png_const_bytep)display->colormap +
-+ sample_size * PNG_RGB_INDEX(r,g,b),
-+ sample_size) != 0)
-+ {
-+ /* The background color must be added. */
-+ background_index = cmap_entries++;
-+
-+ /* Add 27 r,g,b entries each with created by composing with
-+ * the background at alpha 0.5.
-+ */
-+ for (r=0; r<256; r = (r << 1) | 0x7f)
-+ {
-+ for (g=0; g<256; g = (g << 1) | 0x7f)
-+ {
-+ /* This generates components with the values 0, 127
-+ * and 255
-+ */
-+ for (b=0; b<256; b = (b << 1) | 0x7f)
-+ png_create_colormap_entry(display, cmap_entries++,
-+ png_colormap_compose(display, r, P_sRGB, 128,
-+ back_r, output_encoding),
-+ png_colormap_compose(display, g, P_sRGB, 128,
-+ back_g, output_encoding),
-+ png_colormap_compose(display, b, P_sRGB, 128,
-+ back_b, output_encoding),
-+ 0/*unused*/, output_encoding);
-+ }
-+ }
-+
-+ expand_tRNS = 1;
-+ output_processing = PNG_CMAP_RGB_ALPHA;
-+ }
-+
-+ else /* background color is in the standard color-map */
-+ {
-+ png_color_16 c;
-+
-+ c.index = 0; /*unused*/
-+ c.red = (png_uint_16)back_r;
-+ c.gray = c.green = (png_uint_16)back_g;
-+ c.blue = (png_uint_16)back_b;
-+
-+ png_set_background_fixed(png_ptr, &c,
-+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-+ 0/*gamma: not used*/);
-+
-+ output_processing = PNG_CMAP_RGB;
-+ }
-+ }
-+ }
-+
-+ else /* no alpha or transparency in the input */
-+ {
-+ /* Alpha in the output is irrelevant, simply map the opaque input
-+ * pixels to the 6x6x6 color-map.
-+ */
-+ if (PNG_RGB_COLORMAP_ENTRIES > image->colormap_entries)
-+ png_error(png_ptr, "rgb color-map: too few entries");
-+
-+ cmap_entries = make_rgb_colormap(display);
-+ output_processing = PNG_CMAP_RGB;
-+ }
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_PALETTE:
-+ /* It's already got a color-map. It may be necessary to eliminate the
-+ * tRNS entries though.
-+ */
-+ {
-+ unsigned int num_trans = png_ptr->num_trans;
-+ png_const_bytep trans = num_trans > 0 ? png_ptr->trans_alpha : NULL;
-+ png_const_colorp colormap = png_ptr->palette;
-+ const int do_background = trans != NULL &&
-+ (output_format & PNG_FORMAT_FLAG_ALPHA) == 0;
-+ unsigned int i;
-+
-+ /* Just in case: */
-+ if (trans == NULL)
-+ num_trans = 0;
-+
-+ output_processing = PNG_CMAP_NONE;
-+ data_encoding = P_FILE; /* Don't change from color-map indices */
-+ cmap_entries = png_ptr->num_palette;
-+ if (cmap_entries > 256)
-+ cmap_entries = 256;
-+
-+ if (cmap_entries > image->colormap_entries)
-+ png_error(png_ptr, "palette color-map: too few entries");
-+
-+ for (i=0; i < cmap_entries; ++i)
-+ {
-+ if (do_background != 0 && i < num_trans && trans[i] < 255)
-+ {
-+ if (trans[i] == 0)
-+ png_create_colormap_entry(display, i, back_r, back_g,
-+ back_b, 0, output_encoding);
-+
-+ else
-+ {
-+ /* Must compose the PNG file color in the color-map entry
-+ * on the sRGB color in 'back'.
-+ */
-+ png_create_colormap_entry(display, i,
-+ png_colormap_compose(display, colormap[i].red, P_FILE,
-+ trans[i], back_r, output_encoding),
-+ png_colormap_compose(display, colormap[i].green, P_FILE,
-+ trans[i], back_g, output_encoding),
-+ png_colormap_compose(display, colormap[i].blue, P_FILE,
-+ trans[i], back_b, output_encoding),
-+ output_encoding == P_LINEAR ? trans[i] * 257U :
-+ trans[i],
-+ output_encoding);
-+ }
-+ }
-+
-+ else
-+ png_create_colormap_entry(display, i, colormap[i].red,
-+ colormap[i].green, colormap[i].blue,
-+ i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/);
-+ }
-+
-+ /* The PNG data may have indices packed in fewer than 8 bits, it
-+ * must be expanded if so.
-+ */
-+ if (png_ptr->bit_depth < 8)
-+ png_set_packing(png_ptr);
-+ }
-+ break;
-+
-+ default:
-+ png_error(png_ptr, "invalid PNG color type");
-+ /*NOT REACHED*/
-+ break;
-+ }
-+
-+ /* Now deal with the output processing */
-+ if (expand_tRNS != 0 && png_ptr->num_trans > 0 &&
-+ (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0)
-+ png_set_tRNS_to_alpha(png_ptr);
-+
-+ switch (data_encoding)
-+ {
-+ default:
-+ png_error(png_ptr, "bad data option (internal error)");
-+ break;
-+
-+ case P_sRGB:
-+ /* Change to 8-bit sRGB */
-+ png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, PNG_GAMMA_sRGB);
-+ /* FALL THROUGH */
-+
-+ case P_FILE:
-+ if (png_ptr->bit_depth > 8)
-+ png_set_scale_16(png_ptr);
-+ break;
-+ }
-+
-+ if (cmap_entries > 256 || cmap_entries > image->colormap_entries)
-+ png_error(png_ptr, "color map overflow (BAD internal error)");
-+
-+ image->colormap_entries = cmap_entries;
-+
-+ /* Double check using the recorded background index */
-+ switch (output_processing)
-+ {
-+ case PNG_CMAP_NONE:
-+ if (background_index != PNG_CMAP_NONE_BACKGROUND)
-+ goto bad_background;
-+ break;
-+
-+ case PNG_CMAP_GA:
-+ if (background_index != PNG_CMAP_GA_BACKGROUND)
-+ goto bad_background;
-+ break;
-+
-+ case PNG_CMAP_TRANS:
-+ if (background_index >= cmap_entries ||
-+ background_index != PNG_CMAP_TRANS_BACKGROUND)
-+ goto bad_background;
-+ break;
-+
-+ case PNG_CMAP_RGB:
-+ if (background_index != PNG_CMAP_RGB_BACKGROUND)
-+ goto bad_background;
-+ break;
-+
-+ case PNG_CMAP_RGB_ALPHA:
-+ if (background_index != PNG_CMAP_RGB_ALPHA_BACKGROUND)
-+ goto bad_background;
-+ break;
-+
-+ default:
-+ png_error(png_ptr, "bad processing option (internal error)");
-+
-+ bad_background:
-+ png_error(png_ptr, "bad background index (internal error)");
-+ }
-+
-+ display->colormap_processing = output_processing;
-+
-+ return 1/*ok*/;
-+}
-+
-+/* The final part of the color-map read called from png_image_finish_read. */
-+static int
-+png_image_read_and_map(png_voidp argument)
-+{
-+ png_image_read_control *display = png_voidcast(png_image_read_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+ int passes;
-+
-+ /* Called when the libpng data must be transformed into the color-mapped
-+ * form. There is a local row buffer in display->local and this routine must
-+ * do the interlace handling.
-+ */
-+ switch (png_ptr->interlaced)
-+ {
-+ case PNG_INTERLACE_NONE:
-+ passes = 1;
-+ break;
-+
-+ case PNG_INTERLACE_ADAM7:
-+ passes = PNG_INTERLACE_ADAM7_PASSES;
-+ break;
-+
-+ default:
-+ png_error(png_ptr, "unknown interlace type");
-+ }
-+
-+ {
-+ png_uint_32 height = image->height;
-+ png_uint_32 width = image->width;
-+ int proc = display->colormap_processing;
-+ png_bytep first_row = png_voidcast(png_bytep, display->first_row);
-+ ptrdiff_t step_row = display->row_bytes;
-+ int pass;
-+
-+ for (pass = 0; pass < passes; ++pass)
-+ {
-+ unsigned int startx, stepx, stepy;
-+ png_uint_32 y;
-+
-+ if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-+ {
-+ /* The row may be empty for a short image: */
-+ if (PNG_PASS_COLS(width, pass) == 0)
-+ continue;
-+
-+ startx = PNG_PASS_START_COL(pass);
-+ stepx = PNG_PASS_COL_OFFSET(pass);
-+ y = PNG_PASS_START_ROW(pass);
-+ stepy = PNG_PASS_ROW_OFFSET(pass);
-+ }
-+
-+ else
-+ {
-+ y = 0;
-+ startx = 0;
-+ stepx = stepy = 1;
-+ }
-+
-+ for (; y<height; y += stepy)
-+ {
-+ png_bytep inrow = png_voidcast(png_bytep, display->local_row);
-+ png_bytep outrow = first_row + y * step_row;
-+ png_const_bytep end_row = outrow + width;
-+
-+ /* Read read the libpng data into the temporary buffer. */
-+ png_read_row(png_ptr, inrow, NULL);
-+
-+ /* Now process the row according to the processing option, note
-+ * that the caller verifies that the format of the libpng output
-+ * data is as required.
-+ */
-+ outrow += startx;
-+ switch (proc)
-+ {
-+ case PNG_CMAP_GA:
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ /* The data is always in the PNG order */
-+ unsigned int gray = *inrow++;
-+ unsigned int alpha = *inrow++;
-+ unsigned int entry;
-+
-+ /* NOTE: this code is copied as a comment in
-+ * make_ga_colormap above. Please update the
-+ * comment if you change this code!
-+ */
-+ if (alpha > 229) /* opaque */
-+ {
-+ entry = (231 * gray + 128) >> 8;
-+ }
-+ else if (alpha < 26) /* transparent */
-+ {
-+ entry = 231;
-+ }
-+ else /* partially opaque */
-+ {
-+ entry = 226 + 6 * PNG_DIV51(alpha) + PNG_DIV51(gray);
-+ }
-+
-+ *outrow = (png_byte)entry;
-+ }
-+ break;
-+
-+ case PNG_CMAP_TRANS:
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ png_byte gray = *inrow++;
-+ png_byte alpha = *inrow++;
-+
-+ if (alpha == 0)
-+ *outrow = PNG_CMAP_TRANS_BACKGROUND;
-+
-+ else if (gray != PNG_CMAP_TRANS_BACKGROUND)
-+ *outrow = gray;
-+
-+ else
-+ *outrow = (png_byte)(PNG_CMAP_TRANS_BACKGROUND+1);
-+ }
-+ break;
-+
-+ case PNG_CMAP_RGB:
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ *outrow = PNG_RGB_INDEX(inrow[0], inrow[1], inrow[2]);
-+ inrow += 3;
-+ }
-+ break;
-+
-+ case PNG_CMAP_RGB_ALPHA:
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ unsigned int alpha = inrow[3];
-+
-+ /* Because the alpha entries only hold alpha==0.5 values
-+ * split the processing at alpha==0.25 (64) and 0.75
-+ * (196).
-+ */
-+
-+ if (alpha >= 196)
-+ *outrow = PNG_RGB_INDEX(inrow[0], inrow[1],
-+ inrow[2]);
-+
-+ else if (alpha < 64)
-+ *outrow = PNG_CMAP_RGB_ALPHA_BACKGROUND;
-+
-+ else
-+ {
-+ /* Likewise there are three entries for each of r, g
-+ * and b. We could select the entry by popcount on
-+ * the top two bits on those architectures that
-+ * support it, this is what the code below does,
-+ * crudely.
-+ */
-+ unsigned int back_i = PNG_CMAP_RGB_ALPHA_BACKGROUND+1;
-+
-+ /* Here are how the values map:
-+ *
-+ * 0x00 .. 0x3f -> 0
-+ * 0x40 .. 0xbf -> 1
-+ * 0xc0 .. 0xff -> 2
-+ *
-+ * So, as above with the explicit alpha checks, the
-+ * breakpoints are at 64 and 196.
-+ */
-+ if (inrow[0] & 0x80) back_i += 9; /* red */
-+ if (inrow[0] & 0x40) back_i += 9;
-+ if (inrow[0] & 0x80) back_i += 3; /* green */
-+ if (inrow[0] & 0x40) back_i += 3;
-+ if (inrow[0] & 0x80) back_i += 1; /* blue */
-+ if (inrow[0] & 0x40) back_i += 1;
-+
-+ *outrow = (png_byte)back_i;
-+ }
-+
-+ inrow += 4;
-+ }
-+ break;
-+
-+ default:
-+ break;
-+ }
-+ }
-+ }
-+ }
-+
-+ return 1;
-+}
-+
-+static int
-+png_image_read_colormapped(png_voidp argument)
-+{
-+ png_image_read_control *display = png_voidcast(png_image_read_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_controlp control = image->opaque;
-+ png_structrp png_ptr = control->png_ptr;
-+ png_inforp info_ptr = control->info_ptr;
-+
-+ int passes = 0; /* As a flag */
-+
-+ PNG_SKIP_CHUNKS(png_ptr);
-+
-+ /* Update the 'info' structure and make sure the result is as required; first
-+ * make sure to turn on the interlace handling if it will be required
-+ * (because it can't be turned on *after* the call to png_read_update_info!)
-+ */
-+ if (display->colormap_processing == PNG_CMAP_NONE)
-+ passes = png_set_interlace_handling(png_ptr);
-+
-+ png_read_update_info(png_ptr, info_ptr);
-+
-+ /* The expected output can be deduced from the colormap_processing option. */
-+ switch (display->colormap_processing)
-+ {
-+ case PNG_CMAP_NONE:
-+ /* Output must be one channel and one byte per pixel, the output
-+ * encoding can be anything.
-+ */
-+ if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-+ info_ptr->color_type == PNG_COLOR_TYPE_GRAY) &&
-+ info_ptr->bit_depth == 8)
-+ break;
-+
-+ goto bad_output;
-+
-+ case PNG_CMAP_TRANS:
-+ case PNG_CMAP_GA:
-+ /* Output must be two channels and the 'G' one must be sRGB, the latter
-+ * can be checked with an exact number because it should have been set
-+ * to this number above!
-+ */
-+ if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-+ info_ptr->bit_depth == 8 &&
-+ png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
-+ image->colormap_entries == 256)
-+ break;
-+
-+ goto bad_output;
-+
-+ case PNG_CMAP_RGB:
-+ /* Output must be 8-bit sRGB encoded RGB */
-+ if (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-+ info_ptr->bit_depth == 8 &&
-+ png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
-+ image->colormap_entries == 216)
-+ break;
-+
-+ goto bad_output;
-+
-+ case PNG_CMAP_RGB_ALPHA:
-+ /* Output must be 8-bit sRGB encoded RGBA */
-+ if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-+ info_ptr->bit_depth == 8 &&
-+ png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
-+ image->colormap_entries == 244 /* 216 + 1 + 27 */)
-+ break;
-+
-+ /* goto bad_output; */
-+ /* FALL THROUGH */
-+
-+ default:
-+ bad_output:
-+ png_error(png_ptr, "bad color-map processing (internal error)");
-+ }
-+
-+ /* Now read the rows. Do this here if it is possible to read directly into
-+ * the output buffer, otherwise allocate a local row buffer of the maximum
-+ * size libpng requires and call the relevant processing routine safely.
-+ */
-+ {
-+ png_voidp first_row = display->buffer;
-+ ptrdiff_t row_bytes = display->row_stride;
-+
-+ /* The following expression is designed to work correctly whether it gives
-+ * a signed or an unsigned result.
-+ */
-+ if (row_bytes < 0)
-+ {
-+ char *ptr = png_voidcast(char*, first_row);
-+ ptr += (image->height-1) * (-row_bytes);
-+ first_row = png_voidcast(png_voidp, ptr);
-+ }
-+
-+ display->first_row = first_row;
-+ display->row_bytes = row_bytes;
-+ }
-+
-+ if (passes == 0)
-+ {
-+ int result;
-+ png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-+
-+ display->local_row = row;
-+ result = png_safe_execute(image, png_image_read_and_map, display);
-+ display->local_row = NULL;
-+ png_free(png_ptr, row);
-+
-+ return result;
-+ }
-+
-+ else
-+ {
-+ png_alloc_size_t row_bytes = display->row_bytes;
-+
-+ while (--passes >= 0)
-+ {
-+ png_uint_32 y = image->height;
-+ png_bytep row = png_voidcast(png_bytep, display->first_row);
-+
-+ while (y-- > 0)
-+ {
-+ png_read_row(png_ptr, row, NULL);
-+ row += row_bytes;
-+ }
-+ }
-+
-+ return 1;
-+ }
-+}
-+
-+/* Just the row reading part of png_image_read. */
-+static int
-+png_image_read_composite(png_voidp argument)
-+{
-+ png_image_read_control *display = png_voidcast(png_image_read_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+ int passes;
-+
-+ switch (png_ptr->interlaced)
-+ {
-+ case PNG_INTERLACE_NONE:
-+ passes = 1;
-+ break;
-+
-+ case PNG_INTERLACE_ADAM7:
-+ passes = PNG_INTERLACE_ADAM7_PASSES;
-+ break;
-+
-+ default:
-+ png_error(png_ptr, "unknown interlace type");
-+ }
-+
-+ {
-+ png_uint_32 height = image->height;
-+ png_uint_32 width = image->width;
-+ ptrdiff_t step_row = display->row_bytes;
-+ unsigned int channels =
-+ (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
-+ int pass;
-+
-+ for (pass = 0; pass < passes; ++pass)
-+ {
-+ unsigned int startx, stepx, stepy;
-+ png_uint_32 y;
-+
-+ if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-+ {
-+ /* The row may be empty for a short image: */
-+ if (PNG_PASS_COLS(width, pass) == 0)
-+ continue;
-+
-+ startx = PNG_PASS_START_COL(pass) * channels;
-+ stepx = PNG_PASS_COL_OFFSET(pass) * channels;
-+ y = PNG_PASS_START_ROW(pass);
-+ stepy = PNG_PASS_ROW_OFFSET(pass);
-+ }
-+
-+ else
-+ {
-+ y = 0;
-+ startx = 0;
-+ stepx = channels;
-+ stepy = 1;
-+ }
-+
-+ for (; y<height; y += stepy)
-+ {
-+ png_bytep inrow = png_voidcast(png_bytep, display->local_row);
-+ png_bytep outrow;
-+ png_const_bytep end_row;
-+
-+ /* Read the row, which is packed: */
-+ png_read_row(png_ptr, inrow, NULL);
-+
-+ outrow = png_voidcast(png_bytep, display->first_row);
-+ outrow += y * step_row;
-+ end_row = outrow + width * channels;
-+
-+ /* Now do the composition on each pixel in this row. */
-+ outrow += startx;
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ png_byte alpha = inrow[channels];
-+
-+ if (alpha > 0) /* else no change to the output */
-+ {
-+ unsigned int c;
-+
-+ for (c=0; c<channels; ++c)
-+ {
-+ png_uint_32 component = inrow[c];
-+
-+ if (alpha < 255) /* else just use component */
-+ {
-+ /* This is PNG_OPTIMIZED_ALPHA, the component value
-+ * is a linear 8-bit value. Combine this with the
-+ * current outrow[c] value which is sRGB encoded.
-+ * Arithmetic here is 16-bits to preserve the output
-+ * values correctly.
-+ */
-+ component *= 257*255; /* =65535 */
-+ component += (255-alpha)*png_sRGB_table[outrow[c]];
-+
-+ /* So 'component' is scaled by 255*65535 and is
-+ * therefore appropriate for the sRGB to linear
-+ * conversion table.
-+ */
-+ component = PNG_sRGB_FROM_LINEAR(component);
-+ }
-+
-+ outrow[c] = (png_byte)component;
-+ }
-+ }
-+
-+ inrow += channels+1; /* components and alpha channel */
-+ }
-+ }
-+ }
-+ }
-+
-+ return 1;
-+}
-+
-+/* The do_local_background case; called when all the following transforms are to
-+ * be done:
-+ *
-+ * PNG_RGB_TO_GRAY
-+ * PNG_COMPOSITE
-+ * PNG_GAMMA
-+ *
-+ * This is a work-around for the fact that both the PNG_RGB_TO_GRAY and
-+ * PNG_COMPOSITE code performs gamma correction, so we get double gamma
-+ * correction. The fix-up is to prevent the PNG_COMPOSITE operation from
-+ * happening inside libpng, so this routine sees an 8 or 16-bit gray+alpha
-+ * row and handles the removal or pre-multiplication of the alpha channel.
-+ */
-+static int
-+png_image_read_background(png_voidp argument)
-+{
-+ png_image_read_control *display = png_voidcast(png_image_read_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+ png_inforp info_ptr = image->opaque->info_ptr;
-+ png_uint_32 height = image->height;
-+ png_uint_32 width = image->width;
-+ int pass, passes;
-+
-+ /* Double check the convoluted logic below. We expect to get here with
-+ * libpng doing rgb to gray and gamma correction but background processing
-+ * left to the png_image_read_background function. The rows libpng produce
-+ * might be 8 or 16-bit but should always have two channels; gray plus alpha.
-+ */
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
-+ png_error(png_ptr, "lost rgb to gray");
-+
-+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-+ png_error(png_ptr, "unexpected compose");
-+
-+ if (png_get_channels(png_ptr, info_ptr) != 2)
-+ png_error(png_ptr, "lost/gained channels");
-+
-+ /* Expect the 8-bit case to always remove the alpha channel */
-+ if ((image->format & PNG_FORMAT_FLAG_LINEAR) == 0 &&
-+ (image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ png_error(png_ptr, "unexpected 8-bit transformation");
-+
-+ switch (png_ptr->interlaced)
-+ {
-+ case PNG_INTERLACE_NONE:
-+ passes = 1;
-+ break;
-+
-+ case PNG_INTERLACE_ADAM7:
-+ passes = PNG_INTERLACE_ADAM7_PASSES;
-+ break;
-+
-+ default:
-+ png_error(png_ptr, "unknown interlace type");
-+ }
-+
-+ /* Use direct access to info_ptr here because otherwise the simplified API
-+ * would require PNG_EASY_ACCESS_SUPPORTED (just for this.) Note this is
-+ * checking the value after libpng expansions, not the original value in the
-+ * PNG.
-+ */
-+ switch (info_ptr->bit_depth)
-+ {
-+ default:
-+ png_error(png_ptr, "unexpected bit depth");
-+ break;
-+
-+ case 8:
-+ /* 8-bit sRGB gray values with an alpha channel; the alpha channel is
-+ * to be removed by composing on a background: either the row if
-+ * display->background is NULL or display->background->green if not.
-+ * Unlike the code above ALPHA_OPTIMIZED has *not* been done.
-+ */
-+ {
-+ png_bytep first_row = png_voidcast(png_bytep, display->first_row);
-+ ptrdiff_t step_row = display->row_bytes;
-+
-+ for (pass = 0; pass < passes; ++pass)
-+ {
-+ png_bytep row = png_voidcast(png_bytep,
-+ display->first_row);
-+ unsigned int startx, stepx, stepy;
-+ png_uint_32 y;
-+
-+ if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-+ {
-+ /* The row may be empty for a short image: */
-+ if (PNG_PASS_COLS(width, pass) == 0)
-+ continue;
-+
-+ startx = PNG_PASS_START_COL(pass);
-+ stepx = PNG_PASS_COL_OFFSET(pass);
-+ y = PNG_PASS_START_ROW(pass);
-+ stepy = PNG_PASS_ROW_OFFSET(pass);
-+ }
-+
-+ else
-+ {
-+ y = 0;
-+ startx = 0;
-+ stepx = stepy = 1;
-+ }
-+
-+ if (display->background == NULL)
-+ {
-+ for (; y<height; y += stepy)
-+ {
-+ png_bytep inrow = png_voidcast(png_bytep,
-+ display->local_row);
-+ png_bytep outrow = first_row + y * step_row;
-+ png_const_bytep end_row = outrow + width;
-+
-+ /* Read the row, which is packed: */
-+ png_read_row(png_ptr, inrow, NULL);
-+
-+ /* Now do the composition on each pixel in this row. */
-+ outrow += startx;
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ png_byte alpha = inrow[1];
-+
-+ if (alpha > 0) /* else no change to the output */
-+ {
-+ png_uint_32 component = inrow[0];
-+
-+ if (alpha < 255) /* else just use component */
-+ {
-+ /* Since PNG_OPTIMIZED_ALPHA was not set it is
-+ * necessary to invert the sRGB transfer
-+ * function and multiply the alpha out.
-+ */
-+ component = png_sRGB_table[component] * alpha;
-+ component += png_sRGB_table[outrow[0]] *
-+ (255-alpha);
-+ component = PNG_sRGB_FROM_LINEAR(component);
-+ }
-+
-+ outrow[0] = (png_byte)component;
-+ }
-+
-+ inrow += 2; /* gray and alpha channel */
-+ }
-+ }
-+ }
-+
-+ else /* constant background value */
-+ {
-+ png_byte background8 = display->background->green;
-+ png_uint_16 background = png_sRGB_table[background8];
-+
-+ for (; y<height; y += stepy)
-+ {
-+ png_bytep inrow = png_voidcast(png_bytep,
-+ display->local_row);
-+ png_bytep outrow = first_row + y * step_row;
-+ png_const_bytep end_row = outrow + width;
-+
-+ /* Read the row, which is packed: */
-+ png_read_row(png_ptr, inrow, NULL);
-+
-+ /* Now do the composition on each pixel in this row. */
-+ outrow += startx;
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ png_byte alpha = inrow[1];
-+
-+ if (alpha > 0) /* else use background */
-+ {
-+ png_uint_32 component = inrow[0];
-+
-+ if (alpha < 255) /* else just use component */
-+ {
-+ component = png_sRGB_table[component] * alpha;
-+ component += background * (255-alpha);
-+ component = PNG_sRGB_FROM_LINEAR(component);
-+ }
-+
-+ outrow[0] = (png_byte)component;
-+ }
-+
-+ else
-+ outrow[0] = background8;
-+
-+ inrow += 2; /* gray and alpha channel */
-+ }
-+
-+ row += display->row_bytes;
-+ }
-+ }
-+ }
-+ }
-+ break;
-+
-+ case 16:
-+ /* 16-bit linear with pre-multiplied alpha; the pre-multiplication must
-+ * still be done and, maybe, the alpha channel removed. This code also
-+ * handles the alpha-first option.
-+ */
-+ {
-+ png_uint_16p first_row = png_voidcast(png_uint_16p,
-+ display->first_row);
-+ /* The division by two is safe because the caller passed in a
-+ * stride which was multiplied by 2 (below) to get row_bytes.
-+ */
-+ ptrdiff_t step_row = display->row_bytes / 2;
-+ int preserve_alpha = (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
-+ unsigned int outchannels = 1+preserve_alpha;
-+ int swap_alpha = 0;
-+
-+# ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-+ if (preserve_alpha != 0 &&
-+ (image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ swap_alpha = 1;
-+# endif
-+
-+ for (pass = 0; pass < passes; ++pass)
-+ {
-+ unsigned int startx, stepx, stepy;
-+ png_uint_32 y;
-+
-+ /* The 'x' start and step are adjusted to output components here.
-+ */
-+ if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-+ {
-+ /* The row may be empty for a short image: */
-+ if (PNG_PASS_COLS(width, pass) == 0)
-+ continue;
-+
-+ startx = PNG_PASS_START_COL(pass) * outchannels;
-+ stepx = PNG_PASS_COL_OFFSET(pass) * outchannels;
-+ y = PNG_PASS_START_ROW(pass);
-+ stepy = PNG_PASS_ROW_OFFSET(pass);
-+ }
-+
-+ else
-+ {
-+ y = 0;
-+ startx = 0;
-+ stepx = outchannels;
-+ stepy = 1;
-+ }
-+
-+ for (; y<height; y += stepy)
-+ {
-+ png_const_uint_16p inrow;
-+ png_uint_16p outrow = first_row + y*step_row;
-+ png_uint_16p end_row = outrow + width * outchannels;
-+
-+ /* Read the row, which is packed: */
-+ png_read_row(png_ptr, png_voidcast(png_bytep,
-+ display->local_row), NULL);
-+ inrow = png_voidcast(png_const_uint_16p, display->local_row);
-+
-+ /* Now do the pre-multiplication on each pixel in this row.
-+ */
-+ outrow += startx;
-+ for (; outrow < end_row; outrow += stepx)
-+ {
-+ png_uint_32 component = inrow[0];
-+ png_uint_16 alpha = inrow[1];
-+
-+ if (alpha > 0) /* else 0 */
-+ {
-+ if (alpha < 65535) /* else just use component */
-+ {
-+ component *= alpha;
-+ component += 32767;
-+ component /= 65535;
-+ }
-+ }
-+
-+ else
-+ component = 0;
-+
-+ outrow[swap_alpha] = (png_uint_16)component;
-+ if (preserve_alpha != 0)
-+ outrow[1 ^ swap_alpha] = alpha;
-+
-+ inrow += 2; /* components and alpha channel */
-+ }
-+ }
-+ }
-+ }
-+ break;
-+ }
-+
-+ return 1;
-+}
-+
-+/* The guts of png_image_finish_read as a png_safe_execute callback. */
-+static int
-+png_image_read_direct(png_voidp argument)
-+{
-+ png_image_read_control *display = png_voidcast(png_image_read_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+ png_inforp info_ptr = image->opaque->info_ptr;
-+
-+ png_uint_32 format = image->format;
-+ int linear = (format & PNG_FORMAT_FLAG_LINEAR) != 0;
-+ int do_local_compose = 0;
-+ int do_local_background = 0; /* to avoid double gamma correction bug */
-+ int passes = 0;
-+
-+ /* Add transforms to ensure the correct output format is produced then check
-+ * that the required implementation support is there. Always expand; always
-+ * need 8 bits minimum, no palette and expanded tRNS.
-+ */
-+ png_set_expand(png_ptr);
-+
-+ /* Now check the format to see if it was modified. */
-+ {
-+ png_uint_32 base_format = png_image_format(png_ptr) &
-+ ~PNG_FORMAT_FLAG_COLORMAP /* removed by png_set_expand */;
-+ png_uint_32 change = format ^ base_format;
-+ png_fixed_point output_gamma;
-+ int mode; /* alpha mode */
-+
-+ /* Do this first so that we have a record if rgb to gray is happening. */
-+ if ((change & PNG_FORMAT_FLAG_COLOR) != 0)
-+ {
-+ /* gray<->color transformation required. */
-+ if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
-+ png_set_gray_to_rgb(png_ptr);
-+
-+ else
-+ {
-+ /* libpng can't do both rgb to gray and
-+ * background/pre-multiplication if there is also significant gamma
-+ * correction, because both operations require linear colors and
-+ * the code only supports one transform doing the gamma correction.
-+ * Handle this by doing the pre-multiplication or background
-+ * operation in this code, if necessary.
-+ *
-+ * TODO: fix this by rewriting pngrtran.c (!)
-+ *
-+ * For the moment (given that fixing this in pngrtran.c is an
-+ * enormous change) 'do_local_background' is used to indicate that
-+ * the problem exists.
-+ */
-+ if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ do_local_background = 1/*maybe*/;
-+
-+ png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE,
-+ PNG_RGB_TO_GRAY_DEFAULT, PNG_RGB_TO_GRAY_DEFAULT);
-+ }
-+
-+ change &= ~PNG_FORMAT_FLAG_COLOR;
-+ }
-+
-+ /* Set the gamma appropriately, linear for 16-bit input, sRGB otherwise.
-+ */
-+ {
-+ png_fixed_point input_gamma_default;
-+
-+ if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&
-+ (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
-+ input_gamma_default = PNG_GAMMA_LINEAR;
-+ else
-+ input_gamma_default = PNG_DEFAULT_sRGB;
-+
-+ /* Call png_set_alpha_mode to set the default for the input gamma; the
-+ * output gamma is set by a second call below.
-+ */
-+ png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, input_gamma_default);
-+ }
-+
-+ if (linear != 0)
-+ {
-+ /* If there *is* an alpha channel in the input it must be multiplied
-+ * out; use PNG_ALPHA_STANDARD, otherwise just use PNG_ALPHA_PNG.
-+ */
-+ if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ mode = PNG_ALPHA_STANDARD; /* associated alpha */
-+
-+ else
-+ mode = PNG_ALPHA_PNG;
-+
-+ output_gamma = PNG_GAMMA_LINEAR;
-+ }
-+
-+ else
-+ {
-+ mode = PNG_ALPHA_PNG;
-+ output_gamma = PNG_DEFAULT_sRGB;
-+ }
-+
-+ /* If 'do_local_background' is set check for the presence of gamma
-+ * correction; this is part of the work-round for the libpng bug
-+ * described above.
-+ *
-+ * TODO: fix libpng and remove this.
-+ */
-+ if (do_local_background != 0)
-+ {
-+ png_fixed_point gtest;
-+
-+ /* This is 'png_gamma_threshold' from pngrtran.c; the test used for
-+ * gamma correction, the screen gamma hasn't been set on png_struct
-+ * yet; it's set below. png_struct::gamma, however, is set to the
-+ * final value.
-+ */
-+ if (png_muldiv(&gtest, output_gamma, png_ptr->colorspace.gamma,
-+ PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
-+ do_local_background = 0;
-+
-+ else if (mode == PNG_ALPHA_STANDARD)
-+ {
-+ do_local_background = 2/*required*/;
-+ mode = PNG_ALPHA_PNG; /* prevent libpng doing it */
-+ }
-+
-+ /* else leave as 1 for the checks below */
-+ }
-+
-+ /* If the bit-depth changes then handle that here. */
-+ if ((change & PNG_FORMAT_FLAG_LINEAR) != 0)
-+ {
-+ if (linear != 0 /*16-bit output*/)
-+ png_set_expand_16(png_ptr);
-+
-+ else /* 8-bit output */
-+ png_set_scale_16(png_ptr);
-+
-+ change &= ~PNG_FORMAT_FLAG_LINEAR;
-+ }
-+
-+ /* Now the background/alpha channel changes. */
-+ if ((change & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ /* Removing an alpha channel requires composition for the 8-bit
-+ * formats; for the 16-bit it is already done, above, by the
-+ * pre-multiplication and the channel just needs to be stripped.
-+ */
-+ if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ /* If RGB->gray is happening the alpha channel must be left and the
-+ * operation completed locally.
-+ *
-+ * TODO: fix libpng and remove this.
-+ */
-+ if (do_local_background != 0)
-+ do_local_background = 2/*required*/;
-+
-+ /* 16-bit output: just remove the channel */
-+ else if (linear != 0) /* compose on black (well, pre-multiply) */
-+ png_set_strip_alpha(png_ptr);
-+
-+ /* 8-bit output: do an appropriate compose */
-+ else if (display->background != NULL)
-+ {
-+ png_color_16 c;
-+
-+ c.index = 0; /*unused*/
-+ c.red = display->background->red;
-+ c.green = display->background->green;
-+ c.blue = display->background->blue;
-+ c.gray = display->background->green;
-+
-+ /* This is always an 8-bit sRGB value, using the 'green' channel
-+ * for gray is much better than calculating the luminance here;
-+ * we can get off-by-one errors in that calculation relative to
-+ * the app expectations and that will show up in transparent
-+ * pixels.
-+ */
-+ png_set_background_fixed(png_ptr, &c,
-+ PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-+ 0/*gamma: not used*/);
-+ }
-+
-+ else /* compose on row: implemented below. */
-+ {
-+ do_local_compose = 1;
-+ /* This leaves the alpha channel in the output, so it has to be
-+ * removed by the code below. Set the encoding to the 'OPTIMIZE'
-+ * one so the code only has to hack on the pixels that require
-+ * composition.
-+ */
-+ mode = PNG_ALPHA_OPTIMIZED;
-+ }
-+ }
-+
-+ else /* output needs an alpha channel */
-+ {
-+ /* This is tricky because it happens before the swap operation has
-+ * been accomplished; however, the swap does *not* swap the added
-+ * alpha channel (weird API), so it must be added in the correct
-+ * place.
-+ */
-+ png_uint_32 filler; /* opaque filler */
-+ int where;
-+
-+ if (linear != 0)
-+ filler = 65535;
-+
-+ else
-+ filler = 255;
-+
-+# ifdef PNG_FORMAT_AFIRST_SUPPORTED
-+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ {
-+ where = PNG_FILLER_BEFORE;
-+ change &= ~PNG_FORMAT_FLAG_AFIRST;
-+ }
-+
-+ else
-+# endif
-+ where = PNG_FILLER_AFTER;
-+
-+ png_set_add_alpha(png_ptr, filler, where);
-+ }
-+
-+ /* This stops the (irrelevant) call to swap_alpha below. */
-+ change &= ~PNG_FORMAT_FLAG_ALPHA;
-+ }
-+
-+ /* Now set the alpha mode correctly; this is always done, even if there is
-+ * no alpha channel in either the input or the output because it correctly
-+ * sets the output gamma.
-+ */
-+ png_set_alpha_mode_fixed(png_ptr, mode, output_gamma);
-+
-+# ifdef PNG_FORMAT_BGR_SUPPORTED
-+ if ((change & PNG_FORMAT_FLAG_BGR) != 0)
-+ {
-+ /* Check only the output format; PNG is never BGR; don't do this if
-+ * the output is gray, but fix up the 'format' value in that case.
-+ */
-+ if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
-+ png_set_bgr(png_ptr);
-+
-+ else
-+ format &= ~PNG_FORMAT_FLAG_BGR;
-+
-+ change &= ~PNG_FORMAT_FLAG_BGR;
-+ }
-+# endif
-+
-+# ifdef PNG_FORMAT_AFIRST_SUPPORTED
-+ if ((change & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ {
-+ /* Only relevant if there is an alpha channel - it's particularly
-+ * important to handle this correctly because do_local_compose may
-+ * be set above and then libpng will keep the alpha channel for this
-+ * code to remove.
-+ */
-+ if ((format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ /* Disable this if doing a local background,
-+ * TODO: remove this when local background is no longer required.
-+ */
-+ if (do_local_background != 2)
-+ png_set_swap_alpha(png_ptr);
-+ }
-+
-+ else
-+ format &= ~PNG_FORMAT_FLAG_AFIRST;
-+
-+ change &= ~PNG_FORMAT_FLAG_AFIRST;
-+ }
-+# endif
-+
-+ /* If the *output* is 16-bit then we need to check for a byte-swap on this
-+ * architecture.
-+ */
-+ if (linear != 0)
-+ {
-+ PNG_CONST png_uint_16 le = 0x0001;
-+
-+ if ((*(png_const_bytep) & le) != 0)
-+ png_set_swap(png_ptr);
-+ }
-+
-+ /* If change is not now 0 some transformation is missing - error out. */
-+ if (change != 0)
-+ png_error(png_ptr, "png_read_image: unsupported transformation");
-+ }
-+
-+ PNG_SKIP_CHUNKS(png_ptr);
-+
-+ /* Update the 'info' structure and make sure the result is as required; first
-+ * make sure to turn on the interlace handling if it will be required
-+ * (because it can't be turned on *after* the call to png_read_update_info!)
-+ *
-+ * TODO: remove the do_local_background fixup below.
-+ */
-+ if (do_local_compose == 0 && do_local_background != 2)
-+ passes = png_set_interlace_handling(png_ptr);
-+
-+ png_read_update_info(png_ptr, info_ptr);
-+
-+ {
-+ png_uint_32 info_format = 0;
-+
-+ if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-+ info_format |= PNG_FORMAT_FLAG_COLOR;
-+
-+ if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-+ {
-+ /* do_local_compose removes this channel below. */
-+ if (do_local_compose == 0)
-+ {
-+ /* do_local_background does the same if required. */
-+ if (do_local_background != 2 ||
-+ (format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ info_format |= PNG_FORMAT_FLAG_ALPHA;
-+ }
-+ }
-+
-+ else if (do_local_compose != 0) /* internal error */
-+ png_error(png_ptr, "png_image_read: alpha channel lost");
-+
-+ if (info_ptr->bit_depth == 16)
-+ info_format |= PNG_FORMAT_FLAG_LINEAR;
-+
-+# ifdef PNG_FORMAT_BGR_SUPPORTED
-+ if ((png_ptr->transformations & PNG_BGR) != 0)
-+ info_format |= PNG_FORMAT_FLAG_BGR;
-+# endif
-+
-+# ifdef PNG_FORMAT_AFIRST_SUPPORTED
-+ if (do_local_background == 2)
-+ {
-+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ info_format |= PNG_FORMAT_FLAG_AFIRST;
-+ }
-+
-+ if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0 ||
-+ ((png_ptr->transformations & PNG_ADD_ALPHA) != 0 &&
-+ (png_ptr->flags & PNG_FLAG_FILLER_AFTER) == 0))
-+ {
-+ if (do_local_background == 2)
-+ png_error(png_ptr, "unexpected alpha swap transformation");
-+
-+ info_format |= PNG_FORMAT_FLAG_AFIRST;
-+ }
-+# endif
-+
-+ /* This is actually an internal error. */
-+ if (info_format != format)
-+ png_error(png_ptr, "png_read_image: invalid transformations");
-+ }
-+
-+ /* Now read the rows. If do_local_compose is set then it is necessary to use
-+ * a local row buffer. The output will be GA, RGBA or BGRA and must be
-+ * converted to G, RGB or BGR as appropriate. The 'local_row' member of the
-+ * display acts as a flag.
-+ */
-+ {
-+ png_voidp first_row = display->buffer;
-+ ptrdiff_t row_bytes = display->row_stride;
-+
-+ if (linear != 0)
-+ row_bytes *= 2;
-+
-+ /* The following expression is designed to work correctly whether it gives
-+ * a signed or an unsigned result.
-+ */
-+ if (row_bytes < 0)
-+ {
-+ char *ptr = png_voidcast(char*, first_row);
-+ ptr += (image->height-1) * (-row_bytes);
-+ first_row = png_voidcast(png_voidp, ptr);
-+ }
-+
-+ display->first_row = first_row;
-+ display->row_bytes = row_bytes;
-+ }
-+
-+ if (do_local_compose != 0)
-+ {
-+ int result;
-+ png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-+
-+ display->local_row = row;
-+ result = png_safe_execute(image, png_image_read_composite, display);
-+ display->local_row = NULL;
-+ png_free(png_ptr, row);
-+
-+ return result;
-+ }
-+
-+ else if (do_local_background == 2)
-+ {
-+ int result;
-+ png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-+
-+ display->local_row = row;
-+ result = png_safe_execute(image, png_image_read_background, display);
-+ display->local_row = NULL;
-+ png_free(png_ptr, row);
-+
-+ return result;
-+ }
-+
-+ else
-+ {
-+ png_alloc_size_t row_bytes = display->row_bytes;
-+
-+ while (--passes >= 0)
-+ {
-+ png_uint_32 y = image->height;
-+ png_bytep row = png_voidcast(png_bytep, display->first_row);
-+
-+ while (y-- > 0)
-+ {
-+ png_read_row(png_ptr, row, NULL);
-+ row += row_bytes;
-+ }
-+ }
-+
-+ return 1;
-+ }
-+}
-+
-+int PNGAPI
-+png_image_finish_read(png_imagep image, png_const_colorp background,
-+ void *buffer, png_int_32 row_stride, void *colormap)
-+{
-+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
-+ {
-+ png_uint_32 check;
-+
-+ if (row_stride == 0)
-+ row_stride = PNG_IMAGE_ROW_STRIDE(*image);
-+
-+ if (row_stride < 0)
-+ check = -row_stride;
-+
-+ else
-+ check = row_stride;
-+
-+ if (image->opaque != NULL && buffer != NULL &&
-+ check >= PNG_IMAGE_ROW_STRIDE(*image))
-+ {
-+ if ((image->format & PNG_FORMAT_FLAG_COLORMAP) == 0 ||
-+ (image->colormap_entries > 0 && colormap != NULL))
-+ {
-+ int result;
-+ png_image_read_control display;
-+
-+ memset(&display, 0, (sizeof display));
-+ display.image = image;
-+ display.buffer = buffer;
-+ display.row_stride = row_stride;
-+ display.colormap = colormap;
-+ display.background = background;
-+ display.local_row = NULL;
-+
-+ /* Choose the correct 'end' routine; for the color-map case all the
-+ * setup has already been done.
-+ */
-+ if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)
-+ result =
-+ png_safe_execute(image, png_image_read_colormap, &display) &&
-+ png_safe_execute(image, png_image_read_colormapped, &display);
-+
-+ else
-+ result =
-+ png_safe_execute(image, png_image_read_direct, &display);
-+
-+ png_image_free(image);
-+ return result;
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_finish_read[color-map]: no color-map");
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_finish_read: invalid argument");
-+ }
-+
-+ else if (image != NULL)
-+ return png_image_error(image,
-+ "png_image_finish_read: damaged PNG_IMAGE_VERSION");
-+
-+ return 0;
-+}
-+
-+#endif /* SIMPLIFIED_READ */
-+#endif /* READ */
---- ./jdk/src/share/native/sun/awt/libpng/pngrio.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngrio.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.0 [January 6, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -57,7 +57,7 @@
- * to read more then 64K on a 16 bit machine.
- */
- void /* PRIVATE */
--png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-+png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)
- {
- png_debug1(4, "reading %d bytes", (int)length);
-
-@@ -74,7 +74,6 @@
- * read_data function and use it at run time with png_set_read_fn(), rather
- * than changing the library.
- */
--# ifndef USE_FAR_KEYWORD
- void PNGCBAPI
- png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-@@ -86,68 +85,11 @@
- /* fread() returns 0 on error, so it is OK to store this in a png_size_t
- * instead of an int, which is what fread() actually returns.
- */
-- check = fread(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
-+ check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));
-
- if (check != length)
- png_error(png_ptr, "Read Error");
- }
--# else
--/* This is the model-independent version. Since the standard I/O library
-- can't handle far buffers in the medium and small models, we have to copy
-- the data.
--*/
--
--#define NEAR_BUF_SIZE 1024
--#define MIN(a,b) (a <= b ? a : b)
--
--static void PNGCBAPI
--png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
--{
-- png_size_t check;
-- png_byte *n_data;
-- png_FILE_p io_ptr;
--
-- if (png_ptr == NULL)
-- return;
--
-- /* Check if data really is near. If so, use usual code. */
-- n_data = (png_byte *)CVT_PTR_NOCHECK(data);
-- io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
--
-- if ((png_bytep)n_data == data)
-- {
-- check = fread(n_data, 1, length, io_ptr);
-- }
--
-- else
-- {
-- png_byte buf[NEAR_BUF_SIZE];
-- png_size_t read, remaining, err;
-- check = 0;
-- remaining = length;
--
-- do
-- {
-- read = MIN(NEAR_BUF_SIZE, remaining);
-- err = fread(buf, 1, read, io_ptr);
-- png_memcpy(data, buf, read); /* copy far buffer to near buffer */
--
-- if (err != read)
-- break;
--
-- else
-- check += err;
--
-- data += read;
-- remaining -= read;
-- }
-- while (remaining != 0);
-- }
--
-- if ((png_uint_32)check != (png_uint_32)length)
-- png_error(png_ptr, "read Error");
--}
--# endif
- #endif
-
- /* This function allows the application to supply a new input function
-@@ -170,7 +112,7 @@
- * be used.
- */
- void PNGAPI
--png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
-+png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,
- png_rw_ptr read_data_fn)
- {
- if (png_ptr == NULL)
-@@ -188,6 +130,7 @@
- png_ptr->read_data_fn = read_data_fn;
- #endif
-
-+#ifdef PNG_WRITE_SUPPORTED
- /* It is an error to write to a read device */
- if (png_ptr->write_data_fn != NULL)
- {
-@@ -196,9 +139,10 @@
- "Can't set both read_data_fn and write_data_fn in the"
- " same structure");
- }
-+#endif
-
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- png_ptr->output_flush_fn = NULL;
- #endif
- }
--#endif /* PNG_READ_SUPPORTED */
-+#endif /* READ */
---- ./jdk/src/share/native/sun/awt/libpng/pngrtran.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngrtran.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -50,7 +50,7 @@
-
- /* Set the action on getting a CRC error for an ancillary or critical chunk. */
- void PNGAPI
--png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
-+png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action)
- {
- png_debug(1, "in png_set_crc_action");
-
-@@ -116,16 +116,47 @@
- }
- }
-
-+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-+/* Is it OK to set a transformation now? Only if png_start_read_image or
-+ * png_read_update_info have not been called. It is not necessary for the IHDR
-+ * to have been read in all cases; the need_IHDR parameter allows for this
-+ * check too.
-+ */
-+static int
-+png_rtran_ok(png_structrp png_ptr, int need_IHDR)
-+{
-+ if (png_ptr != NULL)
-+ {
-+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
-+ png_app_error(png_ptr,
-+ "invalid after png_start_read_image or png_read_update_info");
-+
-+ else if (need_IHDR && (png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_app_error(png_ptr, "invalid before the PNG header has been read");
-+
-+ else
-+ {
-+ /* Turn on failure to initialize correctly for all transforms. */
-+ png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
-+
-+ return 1; /* Ok */
-+ }
-+ }
-+
-+ return 0; /* no png_error possible! */
-+}
-+#endif
-+
- #ifdef PNG_READ_BACKGROUND_SUPPORTED
- /* Handle alpha and tRNS via a background color */
- void PNGFAPI
--png_set_background_fixed(png_structp png_ptr,
-+png_set_background_fixed(png_structrp png_ptr,
- png_const_color_16p background_color, int background_gamma_code,
- int need_expand, png_fixed_point background_gamma)
- {
- png_debug(1, "in png_set_background_fixed");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0 || background_color == NULL)
- return;
-
- if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
-@@ -138,11 +169,10 @@
- png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
- png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-- png_memcpy(&(png_ptr->background), background_color,
-- png_sizeof(png_color_16));
-+ png_ptr->background = *background_color;
- png_ptr->background_gamma = background_gamma;
- png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
-- if (need_expand)
-+ if (need_expand != 0)
- png_ptr->transformations |= PNG_BACKGROUND_EXPAND;
- else
- png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
-@@ -150,7 +180,7 @@
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_background(png_structp png_ptr,
-+png_set_background(png_structrp png_ptr,
- png_const_color_16p background_color, int background_gamma_code,
- int need_expand, double background_gamma)
- {
-@@ -166,11 +196,11 @@
- */
- #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- void PNGAPI
--png_set_scale_16(png_structp png_ptr)
-+png_set_scale_16(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_scale_16");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= PNG_SCALE_16_TO_8;
-@@ -180,11 +210,11 @@
- #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
- /* Chop 16-bit depth files to 8-bit depth */
- void PNGAPI
--png_set_strip_16(png_structp png_ptr)
-+png_set_strip_16(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_strip_16");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= PNG_16_TO_8;
-@@ -193,11 +223,11 @@
-
- #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- void PNGAPI
--png_set_strip_alpha(png_structp png_ptr)
-+png_set_strip_alpha(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_strip_alpha");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= PNG_STRIP_ALPHA;
-@@ -206,7 +236,7 @@
-
- #if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
- static png_fixed_point
--translate_gamma_flags(png_structp png_ptr, png_fixed_point output_gamma,
-+translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
- int is_screen)
- {
- /* Check for flag values. The main reason for having the old Mac value as a
-@@ -222,8 +252,10 @@
- */
- # ifdef PNG_READ_sRGB_SUPPORTED
- png_ptr->flags |= PNG_FLAG_ASSUME_sRGB;
-+# else
-+ PNG_UNUSED(png_ptr)
- # endif
-- if (is_screen)
-+ if (is_screen != 0)
- output_gamma = PNG_GAMMA_sRGB;
- else
- output_gamma = PNG_GAMMA_sRGB_INVERSE;
-@@ -232,7 +264,7 @@
- else if (output_gamma == PNG_GAMMA_MAC_18 ||
- output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18)
- {
-- if (is_screen)
-+ if (is_screen != 0)
- output_gamma = PNG_GAMMA_MAC_OLD;
- else
- output_gamma = PNG_GAMMA_MAC_INVERSE;
-@@ -243,7 +275,7 @@
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- static png_fixed_point
--convert_gamma_value(png_structp png_ptr, double output_gamma)
-+convert_gamma_value(png_structrp png_ptr, double output_gamma)
- {
- /* The following silently ignores cases where fixed point (times 100,000)
- * gamma values are passed to the floating point API. This is safe and it
-@@ -268,7 +300,7 @@
-
- #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
- void PNGFAPI
--png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
-+png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
- png_fixed_point output_gamma)
- {
- int compose = 0;
-@@ -276,7 +308,7 @@
-
- png_debug(1, "in png_set_alpha_mode");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
-@@ -348,8 +380,11 @@
- * the side effect that the gamma in a second call to png_set_alpha_mode will
- * be ignored.)
- */
-- if (png_ptr->gamma == 0)
-- png_ptr->gamma = file_gamma;
-+ if (png_ptr->colorspace.gamma == 0)
-+ {
-+ png_ptr->colorspace.gamma = file_gamma;
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-+ }
-
- /* But always set the output gamma: */
- png_ptr->screen_gamma = output_gamma;
-@@ -357,28 +392,25 @@
- /* Finally, if pre-multiplying, set the background fields to achieve the
- * desired result.
- */
-- if (compose)
-+ if (compose != 0)
- {
- /* And obtain alpha pre-multiplication by composing on black: */
-- png_memset(&png_ptr->background, 0, sizeof png_ptr->background);
-- png_ptr->background_gamma = png_ptr->gamma; /* just in case */
-+ memset(&png_ptr->background, 0, (sizeof png_ptr->background));
-+ png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */
- png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
- png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
-
-- if (png_ptr->transformations & PNG_COMPOSE)
-+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
- png_error(png_ptr,
- "conflicting calls to set alpha mode and background");
-
- png_ptr->transformations |= PNG_COMPOSE;
- }
--
-- /* New API, make sure apps call the correct initializers: */
-- png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
- }
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_alpha_mode(png_structp png_ptr, int mode, double output_gamma)
-+png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma)
- {
- png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr,
- output_gamma));
-@@ -398,31 +430,31 @@
-
- typedef struct png_dsort_struct
- {
-- struct png_dsort_struct FAR * next;
-+ struct png_dsort_struct * next;
- png_byte left;
- png_byte right;
- } png_dsort;
--typedef png_dsort FAR * png_dsortp;
--typedef png_dsort FAR * FAR * png_dsortpp;
-+typedef png_dsort * png_dsortp;
-+typedef png_dsort * * png_dsortpp;
-
- void PNGAPI
--png_set_quantize(png_structp png_ptr, png_colorp palette,
-+png_set_quantize(png_structrp png_ptr, png_colorp palette,
- int num_palette, int maximum_colors, png_const_uint_16p histogram,
- int full_quantize)
- {
- png_debug(1, "in png_set_quantize");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= PNG_QUANTIZE;
-
-- if (!full_quantize)
-+ if (full_quantize == 0)
- {
- int i;
-
- png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-- (png_uint_32)(num_palette * png_sizeof(png_byte)));
-+ (png_uint_32)(num_palette * (sizeof (png_byte))));
- for (i = 0; i < num_palette; i++)
- png_ptr->quantize_index[i] = (png_byte)i;
- }
-@@ -439,7 +471,7 @@
-
- /* Initialize an array to sort colors */
- png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-- (png_uint_32)(num_palette * png_sizeof(png_byte)));
-+ (png_uint_32)(num_palette * (sizeof (png_byte))));
-
- /* Initialize the quantize_sort array */
- for (i = 0; i < num_palette; i++)
-@@ -472,12 +504,12 @@
- }
- }
-
-- if (done)
-+ if (done != 0)
- break;
- }
-
- /* Swap the palette around, and set up a table, if necessary */
-- if (full_quantize)
-+ if (full_quantize != 0)
- {
- int j = num_palette;
-
-@@ -573,9 +605,9 @@
-
- /* Initialize palette index arrays */
- png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-- (png_uint_32)(num_palette * png_sizeof(png_byte)));
-+ (png_uint_32)(num_palette * (sizeof (png_byte))));
- png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-- (png_uint_32)(num_palette * png_sizeof(png_byte)));
-+ (png_uint_32)(num_palette * (sizeof (png_byte))));
-
- /* Initialize the sort array */
- for (i = 0; i < num_palette; i++)
-@@ -585,7 +617,7 @@
- }
-
- hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 *
-- png_sizeof(png_dsortp)));
-+ (sizeof (png_dsortp))));
-
- num_new_palette = num_palette;
-
-@@ -615,7 +647,7 @@
- {
-
- t = (png_dsortp)png_malloc_warn(png_ptr,
-- (png_uint_32)(png_sizeof(png_dsort)));
-+ (png_uint_32)(sizeof (png_dsort)));
-
- if (t == NULL)
- break;
-@@ -660,7 +692,7 @@
- num_new_palette--;
- palette[png_ptr->index_to_palette[j]]
- = palette[num_new_palette];
-- if (!full_quantize)
-+ if (full_quantize == 0)
- {
- int k;
-
-@@ -728,7 +760,7 @@
- }
- png_ptr->num_palette = (png_uint_16)num_palette;
-
-- if (full_quantize)
-+ if (full_quantize != 0)
- {
- int i;
- png_bytep distance;
-@@ -740,12 +772,12 @@
- png_size_t num_entries = ((png_size_t)1 << total_bits);
-
- png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-- (png_uint_32)(num_entries * png_sizeof(png_byte)));
-+ (png_uint_32)(num_entries * (sizeof (png_byte))));
-
- distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
-- png_sizeof(png_byte)));
--
-- png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
-+ (sizeof (png_byte))));
-+
-+ memset(distance, 0xff, num_entries * (sizeof (png_byte)));
-
- for (i = 0; i < num_palette; i++)
- {
-@@ -790,23 +822,22 @@
- png_free(png_ptr, distance);
- }
- }
--#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-+#endif /* READ_QUANTIZE */
-
- #ifdef PNG_READ_GAMMA_SUPPORTED
- void PNGFAPI
--png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,
-+png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
- png_fixed_point file_gamma)
- {
- png_debug(1, "in png_set_gamma_fixed");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- /* New in libpng-1.5.4 - reserve particular negative values as flags. */
- scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);
- file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);
-
--#if PNG_LIBPNG_VER >= 10600
- /* Checking the gamma values for being >0 was added in 1.5.4 along with the
- * premultiplied alpha support; this actually hides an undocumented feature
- * of the previous implementation which allowed gamma processing to be
-@@ -815,31 +846,32 @@
- * accept '0' for the gamma value it takes, because it isn't always used.
- *
- * Since this is an API change (albeit a very minor one that removes an
-- * undocumented API feature) it will not be made until libpng-1.6.0.
-+ * undocumented API feature) the following checks were only enabled in
-+ * libpng-1.6.0.
- */
- if (file_gamma <= 0)
- png_error(png_ptr, "invalid file gamma in png_set_gamma");
-
- if (scrn_gamma <= 0)
- png_error(png_ptr, "invalid screen gamma in png_set_gamma");
--#endif
-
- /* Set the gamma values unconditionally - this overrides the value in the PNG
- * file if a gAMA chunk was present. png_set_alpha_mode provides a
- * different, easier, way to default the file gamma.
- */
-- png_ptr->gamma = file_gamma;
-+ png_ptr->colorspace.gamma = file_gamma;
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
- png_ptr->screen_gamma = scrn_gamma;
- }
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
-+png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma)
- {
- png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),
- convert_gamma_value(png_ptr, file_gamma));
- }
--# endif /* FLOATING_POINT_SUPPORTED */
-+# endif /* FLOATING_POINT */
- #endif /* READ_GAMMA */
-
- #ifdef PNG_READ_EXPAND_SUPPORTED
-@@ -848,15 +880,14 @@
- * to alpha channels.
- */
- void PNGAPI
--png_set_expand(png_structp png_ptr)
-+png_set_expand(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_expand");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-- png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
- }
-
- /* GRR 19990627: the following three functions currently are identical
-@@ -879,100 +910,95 @@
-
- /* Expand paletted images to RGB. */
- void PNGAPI
--png_set_palette_to_rgb(png_structp png_ptr)
-+png_set_palette_to_rgb(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_palette_to_rgb");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-- png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
- }
-
- /* Expand grayscale images of less than 8-bit depth to 8 bits. */
- void PNGAPI
--png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
-+png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= PNG_EXPAND;
-- png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
- }
-
--
--
- /* Expand tRNS chunks to alpha channels. */
- void PNGAPI
--png_set_tRNS_to_alpha(png_structp png_ptr)
-+png_set_tRNS_to_alpha(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_tRNS_to_alpha");
-
-+ if (png_rtran_ok(png_ptr, 0) == 0)
-+ return;
-+
- png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-- png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
- }
--#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
-+#endif /* READ_EXPAND */
-
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
- /* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise
- * it may not work correctly.)
- */
- void PNGAPI
--png_set_expand_16(png_structp png_ptr)
-+png_set_expand_16(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_expand_16");
-
-- if (png_ptr == NULL)
-+ if (png_rtran_ok(png_ptr, 0) == 0)
- return;
-
- png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS);
-- png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
--
-- /* New API, make sure apps call the correct initializers: */
-- png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
- }
- #endif
-
- #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
- void PNGAPI
--png_set_gray_to_rgb(png_structp png_ptr)
-+png_set_gray_to_rgb(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_gray_to_rgb");
-
-- if (png_ptr != NULL)
-- {
-- /* Because rgb must be 8 bits or more: */
-- png_set_expand_gray_1_2_4_to_8(png_ptr);
-- png_ptr->transformations |= PNG_GRAY_TO_RGB;
-- png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-- }
-+ if (png_rtran_ok(png_ptr, 0) == 0)
-+ return;
-+
-+ /* Because rgb must be 8 bits or more: */
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
-+ png_ptr->transformations |= PNG_GRAY_TO_RGB;
- }
- #endif
-
- #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- void PNGFAPI
--png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
-+png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
- png_fixed_point red, png_fixed_point green)
- {
- png_debug(1, "in png_set_rgb_to_gray");
-
-- if (png_ptr == NULL)
-+ /* Need the IHDR here because of the check on color_type below. */
-+ /* TODO: fix this */
-+ if (png_rtran_ok(png_ptr, 1) == 0)
- return;
-
-- switch(error_action)
-+ switch (error_action)
- {
-- case 1:
-+ case PNG_ERROR_ACTION_NONE:
- png_ptr->transformations |= PNG_RGB_TO_GRAY;
- break;
-
-- case 2:
-+ case PNG_ERROR_ACTION_WARN:
- png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
- break;
-
-- case 3:
-+ case PNG_ERROR_ACTION_ERROR:
- png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
- break;
-
-@@ -980,15 +1006,19 @@
- png_error(png_ptr, "invalid error action to rgb_to_gray");
- break;
- }
-+
- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- #ifdef PNG_READ_EXPAND_SUPPORTED
- png_ptr->transformations |= PNG_EXPAND;
- #else
- {
-- png_warning(png_ptr,
-+ /* Make this an error in 1.6 because otherwise the application may assume
-+ * that it just worked and get a memory overwrite.
-+ */
-+ png_error(png_ptr,
- "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
-
-- png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
-+ /* png_ptr->transformations &= ~PNG_RGB_TO_GRAY; */
- }
- #endif
- {
-@@ -996,32 +1026,37 @@
- {
- png_uint_16 red_int, green_int;
-
-- red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);
-- green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);
-+ /* NOTE: this calculation does not round, but this behavior is retained
-+ * for consistency; the inaccuracy is very small. The code here always
-+ * overwrites the coefficients, regardless of whether they have been
-+ * defaulted or set already.
-+ */
-+ red_int = (png_uint_16)(((png_uint_32)red*32768)/100000);
-+ green_int = (png_uint_16)(((png_uint_32)green*32768)/100000);
-
- png_ptr->rgb_to_gray_red_coeff = red_int;
- png_ptr->rgb_to_gray_green_coeff = green_int;
-- png_ptr->rgb_to_gray_blue_coeff =
-- (png_uint_16)(32768 - red_int - green_int);
-+ png_ptr->rgb_to_gray_coefficients_set = 1;
- }
-
- else
- {
- if (red >= 0 && green >= 0)
-- png_warning(png_ptr,
-+ png_app_warning(png_ptr,
- "ignoring out of range rgb_to_gray coefficients");
-
-- /* Use the defaults, from the cHRM chunk if set, else the built in Rec
-- * 709 values (which correspond to sRGB, so we don't have to worry
-- * about the sRGB chunk!)
-+ /* Use the defaults, from the cHRM chunk if set, else the historical
-+ * values which are close to the sRGB/HDTV/ITU-Rec 709 values. See
-+ * png_do_rgb_to_gray for more discussion of the values. In this case
-+ * the coefficients are not marked as 'set' and are not overwritten if
-+ * something has already provided a default.
- */
- if (png_ptr->rgb_to_gray_red_coeff == 0 &&
-- png_ptr->rgb_to_gray_green_coeff == 0 &&
-- png_ptr->rgb_to_gray_blue_coeff == 0)
-+ png_ptr->rgb_to_gray_green_coeff == 0)
- {
-- png_ptr->rgb_to_gray_red_coeff = 6968; /* .212671 * 32768 + .5 */
-- png_ptr->rgb_to_gray_green_coeff = 23434; /* .715160 * 32768 + .5 */
-- png_ptr->rgb_to_gray_blue_coeff = 2366;
-+ png_ptr->rgb_to_gray_red_coeff = 6968;
-+ png_ptr->rgb_to_gray_green_coeff = 23434;
-+ /* png_ptr->rgb_to_gray_blue_coeff = 2366; */
- }
- }
- }
-@@ -1033,31 +1068,25 @@
- */
-
- void PNGAPI
--png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
-+png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red,
- double green)
- {
-- if (png_ptr == NULL)
-- return;
--
- png_set_rgb_to_gray_fixed(png_ptr, error_action,
- png_fixed(png_ptr, red, "rgb to gray red coefficient"),
- png_fixed(png_ptr, green, "rgb to gray green coefficient"));
- }
- #endif /* FLOATING POINT */
-
--#endif
-+#endif /* RGB_TO_GRAY */
-
- #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
- void PNGAPI
--png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
-+png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
- read_user_transform_fn)
- {
- png_debug(1, "in png_set_read_user_transform_fn");
-
-- if (png_ptr == NULL)
-- return;
--
- #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
- png_ptr->transformations |= PNG_USER_TRANSFORM;
- png_ptr->read_user_transform_fn = read_user_transform_fn;
-@@ -1091,13 +1120,13 @@
- * the palette.
- */
-
--/*For the moment 'png_init_palette_transformations' and
-+/* For the moment 'png_init_palette_transformations' and
- * 'png_init_rgb_transformations' only do some flag canceling optimizations.
- * The intent is that these two routines should have palette or rgb operations
- * extracted from 'png_init_read_transformations'.
- */
- static void /* PRIVATE */
--png_init_palette_transformations(png_structp png_ptr)
-+png_init_palette_transformations(png_structrp png_ptr)
- {
- /* Called to handle the (input) palette case. In png_do_read_transformations
- * the first step is to expand the palette if requested, so this code must
-@@ -1116,25 +1145,31 @@
-
- /* Ignore if all the entries are opaque (unlikely!) */
- for (i=0; i<png_ptr->num_trans; ++i)
-+ {
- if (png_ptr->trans_alpha[i] == 255)
- continue;
- else if (png_ptr->trans_alpha[i] == 0)
- input_has_transparency = 1;
- else
-+ {
-+ input_has_transparency = 1;
- input_has_alpha = 1;
-+ break;
-+ }
-+ }
- }
-
- /* If no alpha we can optimize. */
-- if (!input_has_alpha)
-+ if (input_has_alpha == 0)
- {
- /* Any alpha means background and associative alpha processing is
-- * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA
-+ * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA
- * and ENCODE_ALPHA are irrelevant.
- */
- png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
- png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-- if (!input_has_transparency)
-+ if (input_has_transparency == 0)
- png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);
- }
-
-@@ -1147,8 +1182,8 @@
- /* The following code cannot be entered in the alpha pre-multiplication case
- * because PNG_BACKGROUND_EXPAND is cancelled below.
- */
-- if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-- (png_ptr->transformations & PNG_EXPAND))
-+ if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
-+ (png_ptr->transformations & PNG_EXPAND) != 0)
- {
- {
- png_ptr->background.red =
-@@ -1159,9 +1194,9 @@
- png_ptr->palette[png_ptr->background.index].blue;
-
- #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-- if (png_ptr->transformations & PNG_INVERT_ALPHA)
-+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
- {
-- if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
- {
- /* Invert the alpha channel (in tRNS) unless the pixels are
- * going to be expanded, in which case leave it for later
-@@ -1173,14 +1208,14 @@
- png_ptr->trans_alpha[i]);
- }
- }
--#endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */
-+#endif /* READ_INVERT_ALPHA */
- }
- } /* background expand and (therefore) no alpha association. */
--#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
-+#endif /* READ_EXPAND && READ_BACKGROUND */
- }
-
- static void /* PRIVATE */
--png_init_rgb_transformations(png_structp png_ptr)
-+png_init_rgb_transformations(png_structrp png_ptr)
- {
- /* Added to libpng-1.5.4: check the color type to determine whether there
- * is any alpha or transparency in the image and simply cancel the
-@@ -1190,10 +1225,10 @@
- int input_has_transparency = png_ptr->num_trans > 0;
-
- /* If no alpha we can optimize. */
-- if (!input_has_alpha)
-+ if (input_has_alpha == 0)
- {
- /* Any alpha means background and associative alpha processing is
-- * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA
-+ * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA
- * and ENCODE_ALPHA are irrelevant.
- */
- # ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-@@ -1201,7 +1236,7 @@
- png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
- # endif
-
-- if (!input_has_transparency)
-+ if (input_has_transparency == 0)
- png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);
- }
-
-@@ -1214,67 +1249,58 @@
- /* The following code cannot be entered in the alpha pre-multiplication case
- * because PNG_BACKGROUND_EXPAND is cancelled below.
- */
-- if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-- (png_ptr->transformations & PNG_EXPAND) &&
-- !(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
-+ if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
-+ (png_ptr->transformations & PNG_EXPAND) != 0 &&
-+ (png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
- /* i.e., GRAY or GRAY_ALPHA */
- {
- {
- /* Expand background and tRNS chunks */
-+ int gray = png_ptr->background.gray;
-+ int trans_gray = png_ptr->trans_color.gray;
-+
- switch (png_ptr->bit_depth)
- {
- case 1:
-- png_ptr->background.gray *= (png_uint_16)0xff;
-- png_ptr->background.red = png_ptr->background.green
-- = png_ptr->background.blue = png_ptr->background.gray;
-- if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-- {
-- png_ptr->trans_color.gray *= (png_uint_16)0xff;
-- png_ptr->trans_color.red = png_ptr->trans_color.green
-- = png_ptr->trans_color.blue = png_ptr->trans_color.gray;
-- }
-+ gray *= 0xff;
-+ trans_gray *= 0xff;
- break;
-
- case 2:
-- png_ptr->background.gray *= (png_uint_16)0x55;
-- png_ptr->background.red = png_ptr->background.green
-- = png_ptr->background.blue = png_ptr->background.gray;
-- if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-- {
-- png_ptr->trans_color.gray *= (png_uint_16)0x55;
-- png_ptr->trans_color.red = png_ptr->trans_color.green
-- = png_ptr->trans_color.blue = png_ptr->trans_color.gray;
-- }
-+ gray *= 0x55;
-+ trans_gray *= 0x55;
- break;
-
- case 4:
-- png_ptr->background.gray *= (png_uint_16)0x11;
-- png_ptr->background.red = png_ptr->background.green
-- = png_ptr->background.blue = png_ptr->background.gray;
-- if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-- {
-- png_ptr->trans_color.gray *= (png_uint_16)0x11;
-- png_ptr->trans_color.red = png_ptr->trans_color.green
-- = png_ptr->trans_color.blue = png_ptr->trans_color.gray;
-- }
-+ gray *= 0x11;
-+ trans_gray *= 0x11;
- break;
-
- default:
-
- case 8:
-+ /* FALL THROUGH (Already 8 bits) */
-
- case 16:
-- png_ptr->background.red = png_ptr->background.green
-- = png_ptr->background.blue = png_ptr->background.gray;
-+ /* Already a full 16 bits */
- break;
- }
-+
-+ png_ptr->background.red = png_ptr->background.green =
-+ png_ptr->background.blue = (png_uint_16)gray;
-+
-+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
-+ {
-+ png_ptr->trans_color.red = png_ptr->trans_color.green =
-+ png_ptr->trans_color.blue = (png_uint_16)trans_gray;
-+ }
- }
- } /* background expand and (therefore) no alpha association. */
--#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
-+#endif /* READ_EXPAND && READ_BACKGROUND */
- }
-
- void /* PRIVATE */
--png_init_read_transformations(png_structp png_ptr)
-+png_init_read_transformations(png_structrp png_ptr)
- {
- png_debug(1, "in png_init_read_transformations");
-
-@@ -1299,17 +1325,17 @@
- */
- int gamma_correction = 0;
-
-- if (png_ptr->gamma != 0) /* has been set */
-+ if (png_ptr->colorspace.gamma != 0) /* has been set */
- {
- if (png_ptr->screen_gamma != 0) /* screen set too */
-- gamma_correction = png_gamma_threshold(png_ptr->gamma,
-+ gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma);
-
- else
- /* Assume the output matches the input; a long time default behavior
- * of libpng, although the standard has nothing to say about this.
- */
-- png_ptr->screen_gamma = png_reciprocal(png_ptr->gamma);
-+ png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma);
- }
-
- else if (png_ptr->screen_gamma != 0)
-@@ -1318,7 +1344,7 @@
- * png_set_alpha_mode (even if the alpha handling mode isn't required
- * or isn't changed from the default.)
- */
-- png_ptr->gamma = png_reciprocal(png_ptr->screen_gamma);
-+ png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma);
-
- else /* neither are set */
- /* Just in case the following prevents any processing - file and screen
-@@ -1326,7 +1352,10 @@
- * third gamma value other than png_set_background with 'UNIQUE', and,
- * prior to 1.5.4
- */
-- png_ptr->screen_gamma = png_ptr->gamma = PNG_FP_1;
-+ png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1;
-+
-+ /* We have a gamma value now. */
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
- /* Now turn the gamma transformation on or off as appropriate. Notice
- * that PNG_GAMMA just refers to the file->screen correction. Alpha
-@@ -1336,7 +1365,7 @@
- * the code immediately below if the transform can be handled outside the
- * row loop.
- */
-- if (gamma_correction)
-+ if (gamma_correction != 0)
- png_ptr->transformations |= PNG_GAMMA;
-
- else
-@@ -1345,7 +1374,7 @@
- #endif
-
- /* Certain transformations have the effect of preventing other
-- * transformations that happen afterward in png_do_read_transformations,
-+ * transformations that happen afterward in png_do_read_transformations;
- * resolve the interdependencies here. From the code of
- * png_do_read_transformations the order is:
- *
-@@ -1363,19 +1392,19 @@
- * 12) PNG_EXPAND_16
- * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY
- * 14) PNG_INVERT_MONO
-- * 15) PNG_SHIFT
-- * 16) PNG_PACK
-- * 17) PNG_BGR
-- * 18) PNG_PACKSWAP
-- * 19) PNG_FILLER (includes PNG_ADD_ALPHA)
-- * 20) PNG_INVERT_ALPHA
-+ * 15) PNG_INVERT_ALPHA
-+ * 16) PNG_SHIFT
-+ * 17) PNG_PACK
-+ * 18) PNG_BGR
-+ * 19) PNG_PACKSWAP
-+ * 20) PNG_FILLER (includes PNG_ADD_ALPHA)
- * 21) PNG_SWAP_ALPHA
- * 22) PNG_SWAP_BYTES
- * 23) PNG_USER_TRANSFORM [must be last]
- */
- #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-- if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-- !(png_ptr->transformations & PNG_COMPOSE))
-+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
-+ (png_ptr->transformations & PNG_COMPOSE) == 0)
- {
- /* Stripping the alpha channel happens immediately after the 'expand'
- * transformations, before all other transformation, so it cancels out
-@@ -1401,16 +1430,23 @@
- /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA
- * settings will have no effect.
- */
-- if (!png_gamma_significant(png_ptr->screen_gamma))
-+ if (png_gamma_significant(png_ptr->screen_gamma) == 0)
- {
- png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
- png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
- }
- #endif
-
--#if defined(PNG_READ_EXPAND_SUPPORTED) && \
-- defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-- defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
-+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-+ /* Make sure the coefficients for the rgb to gray conversion are set
-+ * appropriately.
-+ */
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-+ png_colorspace_set_rgb_coefficients(png_ptr);
-+#endif
-+
-+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
- /* Detect gray background and attempt to enable optimization for
- * gray --> RGB case.
- *
-@@ -1426,23 +1462,23 @@
- * png_set_background, along with the bit depth, then the code has a record
- * of exactly what color space the background is currently in.
- */
-- if (png_ptr->transformations & PNG_BACKGROUND_EXPAND)
-+ if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0)
- {
- /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if
-- * the file was greyscale the background value is gray.
-+ * the file was grayscale the background value is gray.
- */
-- if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
- png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
- }
-
-- else if (png_ptr->transformations & PNG_COMPOSE)
-+ else if ((png_ptr->transformations & PNG_COMPOSE) != 0)
- {
- /* PNG_COMPOSE: png_set_background was called with need_expand false,
- * so the color is in the color space of the output or png_set_alpha_mode
- * was called and the color is black. Ignore RGB_TO_GRAY because that
- * happens before GRAY_TO_RGB.
- */
-- if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
- {
- if (png_ptr->background.red == png_ptr->background.green &&
- png_ptr->background.red == png_ptr->background.blue)
-@@ -1452,7 +1488,8 @@
- }
- }
- }
--#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED (etc) */
-+#endif /* READ_EXPAND && READ_BACKGROUND */
-+#endif /* READ_GRAY_TO_RGB */
-
- /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations
- * can be performed directly on the palette, and some (such as rgb to gray)
-@@ -1473,10 +1510,10 @@
-
- #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
- defined(PNG_READ_EXPAND_16_SUPPORTED)
-- if ((png_ptr->transformations & PNG_EXPAND_16) &&
-- (png_ptr->transformations & PNG_COMPOSE) &&
-- !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-- png_ptr->bit_depth != 16)
-+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
-+ (png_ptr->transformations & PNG_COMPOSE) != 0 &&
-+ (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
-+ png_ptr->bit_depth != 16)
- {
- /* TODO: fix this. Because the expand_16 operation is after the compose
- * handling the background color must be 8, not 16, bits deep, but the
-@@ -1488,14 +1525,36 @@
- * NOTE: this discards the low 16 bits of the user supplied background
- * color, but until expand_16 works properly there is no choice!
- */
--# define CHOP(x) (x)=((png_uint_16)(((png_uint_32)(x)*255+32895) >> 16))
-+# define CHOP(x) (x)=((png_uint_16)PNG_DIV257(x))
- CHOP(png_ptr->background.red);
- CHOP(png_ptr->background.green);
- CHOP(png_ptr->background.blue);
- CHOP(png_ptr->background.gray);
- # undef CHOP
- }
--#endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */
-+#endif /* READ_BACKGROUND && READ_EXPAND_16 */
-+
-+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-+ (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \
-+ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED))
-+ if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) != 0 &&
-+ (png_ptr->transformations & PNG_COMPOSE) != 0 &&
-+ (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
-+ png_ptr->bit_depth == 16)
-+ {
-+ /* On the other hand, if a 16-bit file is to be reduced to 8-bits per
-+ * component this will also happen after PNG_COMPOSE and so the background
-+ * color must be pre-expanded here.
-+ *
-+ * TODO: fix this too.
-+ */
-+ png_ptr->background.red = (png_uint_16)(png_ptr->background.red * 257);
-+ png_ptr->background.green =
-+ (png_uint_16)(png_ptr->background.green * 257);
-+ png_ptr->background.blue = (png_uint_16)(png_ptr->background.blue * 257);
-+ png_ptr->background.gray = (png_uint_16)(png_ptr->background.gray * 257);
-+ }
-+#endif
-
- /* NOTE: below 'PNG_READ_ALPHA_MODE_SUPPORTED' is presumed to also enable the
- * background support (see the comments in scripts/pnglibconf.dfa), this
-@@ -1524,27 +1583,36 @@
- * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the
- * tables.
- */
-- if ((png_ptr->transformations & PNG_GAMMA)
-- || ((png_ptr->transformations & PNG_RGB_TO_GRAY)
-- && (png_gamma_significant(png_ptr->gamma) ||
-- png_gamma_significant(png_ptr->screen_gamma)))
-- || ((png_ptr->transformations & PNG_COMPOSE)
-- && (png_gamma_significant(png_ptr->gamma)
-- || png_gamma_significant(png_ptr->screen_gamma)
-+ if ((png_ptr->transformations & PNG_GAMMA) != 0 ||
-+ ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&
-+ (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
-+ png_gamma_significant(png_ptr->screen_gamma) != 0)) ||
-+ ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
-+ (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
-+ png_gamma_significant(png_ptr->screen_gamma) != 0
- # ifdef PNG_READ_BACKGROUND_SUPPORTED
-- || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE
-- && png_gamma_significant(png_ptr->background_gamma))
-+ || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&
-+ png_gamma_significant(png_ptr->background_gamma) != 0)
- # endif
-- )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
-- && png_gamma_significant(png_ptr->screen_gamma))
-- )
-+ )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
-+ png_gamma_significant(png_ptr->screen_gamma) != 0))
- {
- png_build_gamma_table(png_ptr, png_ptr->bit_depth);
-
- #ifdef PNG_READ_BACKGROUND_SUPPORTED
-- if (png_ptr->transformations & PNG_COMPOSE)
-+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
- {
-- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ /* Issue a warning about this combination: because RGB_TO_GRAY is
-+ * optimized to do the gamma transform if present yet do_background has
-+ * to do the same thing if both options are set a
-+ * double-gamma-correction happens. This is true in all versions of
-+ * libpng to date.
-+ */
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-+ png_warning(png_ptr,
-+ "libpng does not support gamma+background+rgb_to_gray");
-+
-+ if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0)
- {
- /* We don't get to here unless there is a tRNS chunk with non-opaque
- * entries - see the checking code at the start of this function.
-@@ -1576,8 +1644,8 @@
- break;
-
- case PNG_BACKGROUND_GAMMA_FILE:
-- g = png_reciprocal(png_ptr->gamma);
-- gs = png_reciprocal2(png_ptr->gamma,
-+ g = png_reciprocal(png_ptr->colorspace.gamma);
-+ gs = png_reciprocal2(png_ptr->colorspace.gamma,
- png_ptr->screen_gamma);
- break;
-
-@@ -1592,7 +1660,7 @@
- break;
- }
-
-- if (png_gamma_significant(gs))
-+ if (png_gamma_significant(gs) != 0)
- {
- back.red = png_gamma_8bit_correct(png_ptr->background.red,
- gs);
-@@ -1609,7 +1677,7 @@
- back.blue = (png_byte)png_ptr->background.blue;
- }
-
-- if (png_gamma_significant(g))
-+ if (png_gamma_significant(g) != 0)
- {
- back_1.red = png_gamma_8bit_correct(png_ptr->background.red,
- g);
-@@ -1663,7 +1731,7 @@
-
- /* Prevent the transformations being done again.
- *
-- * NOTE: this is highly dubious; it zaps the transformations in
-+ * NOTE: this is highly dubious; it removes the transformations in
- * place. This seems inconsistent with the general treatment of the
- * transformations elsewhere.
- */
-@@ -1673,8 +1741,9 @@
- /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
- else /* color_type != PNG_COLOR_TYPE_PALETTE */
- {
-- png_fixed_point g = PNG_FP_1;
-- png_fixed_point gs = PNG_FP_1;
-+ int gs_sig, g_sig;
-+ png_fixed_point g = PNG_FP_1; /* Correction to linear */
-+ png_fixed_point gs = PNG_FP_1; /* Correction to screen */
-
- switch (png_ptr->background_gamma_type)
- {
-@@ -1684,8 +1753,9 @@
- break;
-
- case PNG_BACKGROUND_GAMMA_FILE:
-- g = png_reciprocal(png_ptr->gamma);
-- gs = png_reciprocal2(png_ptr->gamma, png_ptr->screen_gamma);
-+ g = png_reciprocal(png_ptr->colorspace.gamma);
-+ gs = png_reciprocal2(png_ptr->colorspace.gamma,
-+ png_ptr->screen_gamma);
- break;
-
- case PNG_BACKGROUND_GAMMA_UNIQUE:
-@@ -1698,34 +1768,45 @@
- png_error(png_ptr, "invalid background gamma type");
- }
-
-- png_ptr->background_1.gray = png_gamma_correct(png_ptr,
-- png_ptr->background.gray, g);
--
-- png_ptr->background.gray = png_gamma_correct(png_ptr,
-- png_ptr->background.gray, gs);
-+ g_sig = png_gamma_significant(g);
-+ gs_sig = png_gamma_significant(gs);
-+
-+ if (g_sig != 0)
-+ png_ptr->background_1.gray = png_gamma_correct(png_ptr,
-+ png_ptr->background.gray, g);
-+
-+ if (gs_sig != 0)
-+ png_ptr->background.gray = png_gamma_correct(png_ptr,
-+ png_ptr->background.gray, gs);
-
- if ((png_ptr->background.red != png_ptr->background.green) ||
- (png_ptr->background.red != png_ptr->background.blue) ||
- (png_ptr->background.red != png_ptr->background.gray))
- {
- /* RGB or RGBA with color background */
-- png_ptr->background_1.red = png_gamma_correct(png_ptr,
-- png_ptr->background.red, g);
--
-- png_ptr->background_1.green = png_gamma_correct(png_ptr,
-- png_ptr->background.green, g);
--
-- png_ptr->background_1.blue = png_gamma_correct(png_ptr,
-- png_ptr->background.blue, g);
--
-- png_ptr->background.red = png_gamma_correct(png_ptr,
-- png_ptr->background.red, gs);
--
-- png_ptr->background.green = png_gamma_correct(png_ptr,
-- png_ptr->background.green, gs);
--
-- png_ptr->background.blue = png_gamma_correct(png_ptr,
-- png_ptr->background.blue, gs);
-+ if (g_sig != 0)
-+ {
-+ png_ptr->background_1.red = png_gamma_correct(png_ptr,
-+ png_ptr->background.red, g);
-+
-+ png_ptr->background_1.green = png_gamma_correct(png_ptr,
-+ png_ptr->background.green, g);
-+
-+ png_ptr->background_1.blue = png_gamma_correct(png_ptr,
-+ png_ptr->background.blue, g);
-+ }
-+
-+ if (gs_sig != 0)
-+ {
-+ png_ptr->background.red = png_gamma_correct(png_ptr,
-+ png_ptr->background.red, gs);
-+
-+ png_ptr->background.green = png_gamma_correct(png_ptr,
-+ png_ptr->background.green, gs);
-+
-+ png_ptr->background.blue = png_gamma_correct(png_ptr,
-+ png_ptr->background.blue, gs);
-+ }
- }
-
- else
-@@ -1737,20 +1818,29 @@
- png_ptr->background.red = png_ptr->background.green
- = png_ptr->background.blue = png_ptr->background.gray;
- }
-+
-+ /* The background is now in screen gamma: */
-+ png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_SCREEN;
- } /* color_type != PNG_COLOR_TYPE_PALETTE */
- }/* png_ptr->transformations & PNG_BACKGROUND */
-
- else
- /* Transformation does not include PNG_BACKGROUND */
--#endif /* PNG_READ_BACKGROUND_SUPPORTED */
-- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+#endif /* READ_BACKGROUND */
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE
-+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-+ /* RGB_TO_GRAY needs to have non-gamma-corrected values! */
-+ && ((png_ptr->transformations & PNG_EXPAND) == 0 ||
-+ (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
-+#endif
-+ )
- {
- png_colorp palette = png_ptr->palette;
- int num_palette = png_ptr->num_palette;
- int i;
-
-- /*NOTE: there are other transformations that should probably be in here
-- * too.
-+ /* NOTE: there are other transformations that should probably be in
-+ * here too.
- */
- for (i = 0; i < num_palette; i++)
- {
-@@ -1766,11 +1856,11 @@
- #ifdef PNG_READ_BACKGROUND_SUPPORTED
- else
- #endif
--#endif /* PNG_READ_GAMMA_SUPPORTED */
-+#endif /* READ_GAMMA */
-
- #ifdef PNG_READ_BACKGROUND_SUPPORTED
- /* No GAMMA transformation (see the hanging else 4 lines above) */
-- if ((png_ptr->transformations & PNG_COMPOSE) &&
-+ if ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
- {
- int i;
-@@ -1805,35 +1895,53 @@
-
- png_ptr->transformations &= ~PNG_COMPOSE;
- }
--#endif /* PNG_READ_BACKGROUND_SUPPORTED */
-+#endif /* READ_BACKGROUND */
-
- #ifdef PNG_READ_SHIFT_SUPPORTED
-- if ((png_ptr->transformations & PNG_SHIFT) &&
-+ if ((png_ptr->transformations & PNG_SHIFT) != 0 &&
-+ (png_ptr->transformations & PNG_EXPAND) == 0 &&
- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
- {
-- png_uint_16 i;
-- png_uint_16 istop = png_ptr->num_palette;
-- int sr = 8 - png_ptr->sig_bit.red;
-- int sg = 8 - png_ptr->sig_bit.green;
-- int sb = 8 - png_ptr->sig_bit.blue;
--
-- if (sr < 0 || sr > 8)
-- sr = 0;
--
-- if (sg < 0 || sg > 8)
-- sg = 0;
--
-- if (sb < 0 || sb > 8)
-- sb = 0;
--
-- for (i = 0; i < istop; i++)
-- {
-- png_ptr->palette[i].red >>= sr;
-- png_ptr->palette[i].green >>= sg;
-- png_ptr->palette[i].blue >>= sb;
-- }
-+ int i;
-+ int istop = png_ptr->num_palette;
-+ int shift = 8 - png_ptr->sig_bit.red;
-+
-+ png_ptr->transformations &= ~PNG_SHIFT;
-+
-+ /* significant bits can be in the range 1 to 7 for a meaninful result, if
-+ * the number of significant bits is 0 then no shift is done (this is an
-+ * error condition which is silently ignored.)
-+ */
-+ if (shift > 0 && shift < 8)
-+ for (i=0; i<istop; ++i)
-+ {
-+ int component = png_ptr->palette[i].red;
-+
-+ component >>= shift;
-+ png_ptr->palette[i].red = (png_byte)component;
-+ }
-+
-+ shift = 8 - png_ptr->sig_bit.green;
-+ if (shift > 0 && shift < 8)
-+ for (i=0; i<istop; ++i)
-+ {
-+ int component = png_ptr->palette[i].green;
-+
-+ component >>= shift;
-+ png_ptr->palette[i].green = (png_byte)component;
-+ }
-+
-+ shift = 8 - png_ptr->sig_bit.blue;
-+ if (shift > 0 && shift < 8)
-+ for (i=0; i<istop; ++i)
-+ {
-+ int component = png_ptr->palette[i].blue;
-+
-+ component >>= shift;
-+ png_ptr->palette[i].blue = (png_byte)component;
-+ }
- }
--#endif /* PNG_READ_SHIFT_SUPPORTED */
-+#endif /* READ_SHIFT */
- }
-
- /* Modify the info structure to reflect the transformations. The
-@@ -1841,12 +1949,12 @@
- * assuming the transformations result in valid PNG data.
- */
- void /* PRIVATE */
--png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
-+png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
- {
- png_debug(1, "in png_read_transform_info");
-
- #ifdef PNG_READ_EXPAND_SUPPORTED
-- if (png_ptr->transformations & PNG_EXPAND)
-+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
- {
- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- {
-@@ -1868,9 +1976,9 @@
- }
- else
- {
-- if (png_ptr->num_trans)
-+ if (png_ptr->num_trans != 0)
- {
-- if (png_ptr->transformations & PNG_EXPAND_tRNS)
-+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
- info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
- }
- if (info_ptr->bit_depth < 8)
-@@ -1886,7 +1994,7 @@
- /* The following is almost certainly wrong unless the background value is in
- * the screen space!
- */
-- if (png_ptr->transformations & PNG_COMPOSE)
-+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
- info_ptr->background = png_ptr->background;
- #endif
-
-@@ -1895,20 +2003,24 @@
- * however it seems that the code in png_init_read_transformations, which has
- * been called before this from png_read_update_info->png_read_start_row
- * sometimes does the gamma transform and cancels the flag.
-+ *
-+ * TODO: this looks wrong; the info_ptr should end up with a gamma equal to
-+ * the screen_gamma value. The following probably results in weirdness if
-+ * the info_ptr is used by the app after the rows have been read.
- */
-- info_ptr->gamma = png_ptr->gamma;
-+ info_ptr->colorspace.gamma = png_ptr->colorspace.gamma;
- #endif
-
- if (info_ptr->bit_depth == 16)
- {
- # ifdef PNG_READ_16BIT_SUPPORTED
- # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-- if (png_ptr->transformations & PNG_SCALE_16_TO_8)
-+ if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
- info_ptr->bit_depth = 8;
- # endif
-
- # ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-- if (png_ptr->transformations & PNG_16_TO_8)
-+ if ((png_ptr->transformations & PNG_16_TO_8) != 0)
- info_ptr->bit_depth = 8;
- # endif
-
-@@ -1926,7 +2038,7 @@
- info_ptr->bit_depth = 8;
- # else
-
--# if PNG_READ_SCALE_16_TO_8_SUPPORTED
-+# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- png_ptr->transformations |= PNG_SCALE_16_TO_8;
- info_ptr->bit_depth = 8;
- # else
-@@ -1934,25 +2046,27 @@
- CONFIGURATION ERROR: you must enable at least one 16 to 8 method
- # endif
- # endif
--#endif /* !READ_16BIT_SUPPORTED */
-+#endif /* !READ_16BIT */
- }
-
- #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-- if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-- info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
-+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
-+ info_ptr->color_type = (png_byte)(info_ptr->color_type |
-+ PNG_COLOR_MASK_COLOR);
- #endif
-
- #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-- if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-- info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-+ info_ptr->color_type = (png_byte)(info_ptr->color_type &
-+ ~PNG_COLOR_MASK_COLOR);
- #endif
-
- #ifdef PNG_READ_QUANTIZE_SUPPORTED
-- if (png_ptr->transformations & PNG_QUANTIZE)
-+ if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
- {
- if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
- (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
-- png_ptr->palette_lookup && info_ptr->bit_depth == 8)
-+ png_ptr->palette_lookup != 0 && info_ptr->bit_depth == 8)
- {
- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
- }
-@@ -1960,54 +2074,57 @@
- #endif
-
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
-- if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 &&
-- info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
-+ info_ptr->bit_depth == 8 &&
-+ info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
- {
- info_ptr->bit_depth = 16;
- }
- #endif
-
- #ifdef PNG_READ_PACK_SUPPORTED
-- if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
-+ if ((png_ptr->transformations & PNG_PACK) != 0 &&
-+ (info_ptr->bit_depth < 8))
- info_ptr->bit_depth = 8;
- #endif
-
- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- info_ptr->channels = 1;
-
-- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-+ else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
- info_ptr->channels = 3;
-
- else
- info_ptr->channels = 1;
-
- #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-- if (png_ptr->transformations & PNG_STRIP_ALPHA)
-+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0)
- {
-- info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
-+ info_ptr->color_type = (png_byte)(info_ptr->color_type &
-+ ~PNG_COLOR_MASK_ALPHA);
- info_ptr->num_trans = 0;
- }
- #endif
-
-- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-+ if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
- info_ptr->channels++;
-
- #ifdef PNG_READ_FILLER_SUPPORTED
- /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */
-- if ((png_ptr->transformations & PNG_FILLER) &&
-- ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
-+ if ((png_ptr->transformations & PNG_FILLER) != 0 &&
-+ (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
-+ info_ptr->color_type == PNG_COLOR_TYPE_GRAY))
- {
- info_ptr->channels++;
- /* If adding a true alpha channel not just filler */
-- if (png_ptr->transformations & PNG_ADD_ALPHA)
-+ if ((png_ptr->transformations & PNG_ADD_ALPHA) != 0)
- info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
- }
- #endif
-
- #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
- defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-- if (png_ptr->transformations & PNG_USER_TRANSFORM)
-+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
- {
- if (info_ptr->bit_depth < png_ptr->user_transform_depth)
- info_ptr->bit_depth = png_ptr->user_transform_depth;
-@@ -2031,291 +2148,11 @@
- png_ptr->info_rowbytes = info_ptr->rowbytes;
-
- #ifndef PNG_READ_EXPAND_SUPPORTED
-- if (png_ptr)
-+ if (png_ptr != NULL)
- return;
- #endif
- }
-
--/* Transform the row. The order of transformations is significant,
-- * and is very touchy. If you add a transformation, take care to
-- * decide how it fits in with the other transformations here.
-- */
--void /* PRIVATE */
--png_do_read_transformations(png_structp png_ptr)
--{
-- png_debug(1, "in png_do_read_transformations");
--
-- if (png_ptr->row_buf == NULL)
-- {
-- /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this
-- * error is incredibly rare and incredibly easy to debug without this
-- * information.
-- */
-- png_error(png_ptr, "NULL row buffer");
-- }
--
-- /* The following is debugging; prior to 1.5.4 the code was never compiled in;
-- * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro
-- * PNG_WARN_UNINITIALIZED_ROW removed. In 1.5 the new flag is set only for
-- * selected new APIs to ensure that there is no API change.
-- */
-- if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
-- !(png_ptr->flags & PNG_FLAG_ROW_INIT))
-- {
-- /* Application has failed to call either png_read_start_image() or
-- * png_read_update_info() after setting transforms that expand pixels.
-- * This check added to libpng-1.2.19 (but not enabled until 1.5.4).
-- */
-- png_error(png_ptr, "Uninitialized row");
-- }
--
--#ifdef PNG_READ_EXPAND_SUPPORTED
-- if (png_ptr->transformations & PNG_EXPAND)
-- {
-- if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
-- {
-- png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
-- }
--
-- else
-- {
-- if (png_ptr->num_trans &&
-- (png_ptr->transformations & PNG_EXPAND_tRNS))
-- png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- &(png_ptr->trans_color));
--
-- else
-- png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- NULL);
-- }
-- }
--#endif
--
--#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-- if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-- !(png_ptr->transformations & PNG_COMPOSE) &&
-- (png_ptr->row_info.color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-- png_ptr->row_info.color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-- png_do_strip_channel(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- 0 /* at_start == false, because SWAP_ALPHA happens later */);
--#endif
--
--#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-- if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-- {
-- int rgb_error =
-- png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info),
-- png_ptr->row_buf + 1);
--
-- if (rgb_error)
-- {
-- png_ptr->rgb_to_gray_status=1;
-- if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-- PNG_RGB_TO_GRAY_WARN)
-- png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
--
-- if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-- PNG_RGB_TO_GRAY_ERR)
-- png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-- }
-- }
--#endif
--
--/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
-- *
-- * In most cases, the "simple transparency" should be done prior to doing
-- * gray-to-RGB, or you will have to test 3x as many bytes to check if a
-- * pixel is transparent. You would also need to make sure that the
-- * transparency information is upgraded to RGB.
-- *
-- * To summarize, the current flow is:
-- * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
-- * with background "in place" if transparent,
-- * convert to RGB if necessary
-- * - Gray + alpha -> composite with gray background and remove alpha bytes,
-- * convert to RGB if necessary
-- *
-- * To support RGB backgrounds for gray images we need:
-- * - Gray + simple transparency -> convert to RGB + simple transparency,
-- * compare 3 or 6 bytes and composite with
-- * background "in place" if transparent
-- * (3x compare/pixel compared to doing
-- * composite with gray bkgrnd)
-- * - Gray + alpha -> convert to RGB + alpha, composite with background and
-- * remove alpha bytes (3x float
-- * operations/pixel compared with composite
-- * on gray background)
-- *
-- * Greg's change will do this. The reason it wasn't done before is for
-- * performance, as this increases the per-pixel operations. If we would check
-- * in advance if the background was gray or RGB, and position the gray-to-RGB
-- * transform appropriately, then it would save a lot of work/time.
-- */
--
--#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-- /* If gray -> RGB, do so now only if background is non-gray; else do later
-- * for performance reasons
-- */
-- if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-- !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-- png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
-- (defined PNG_READ_ALPHA_MODE_SUPPORTED)
-- if (png_ptr->transformations & PNG_COMPOSE)
-- png_do_compose(&(png_ptr->row_info), png_ptr->row_buf + 1, png_ptr);
--#endif
--
--#ifdef PNG_READ_GAMMA_SUPPORTED
-- if ((png_ptr->transformations & PNG_GAMMA) &&
--#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
-- (defined PNG_READ_ALPHA_MODE_SUPPORTED)
-- !((png_ptr->transformations & PNG_COMPOSE) &&
-- ((png_ptr->num_trans != 0) ||
-- (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
--#endif
-- (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
-- png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1, png_ptr);
--#endif
--
--#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-- if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-- (png_ptr->transformations & PNG_COMPOSE) &&
-- (png_ptr->row_info.color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-- png_ptr->row_info.color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-- png_do_strip_channel(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- 0 /* at_start == false, because SWAP_ALPHA happens later */);
--#endif
--
--#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-- if ((png_ptr->transformations & PNG_ENCODE_ALPHA) &&
-- (png_ptr->row_info.color_type & PNG_COLOR_MASK_ALPHA))
-- png_do_encode_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1, png_ptr);
--#endif
--
--#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-- if (png_ptr->transformations & PNG_SCALE_16_TO_8)
-- png_do_scale_16_to_8(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-- /* There is no harm in doing both of these because only one has any effect,
-- * by putting the 'scale' option first if the app asks for scale (either by
-- * calling the API or in a TRANSFORM flag) this is what happens.
-- */
-- if (png_ptr->transformations & PNG_16_TO_8)
-- png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_QUANTIZE_SUPPORTED
-- if (png_ptr->transformations & PNG_QUANTIZE)
-- {
-- png_do_quantize(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- png_ptr->palette_lookup, png_ptr->quantize_index);
--
-- if (png_ptr->row_info.rowbytes == 0)
-- png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-- }
--#endif /* PNG_READ_QUANTIZE_SUPPORTED */
--
--#ifdef PNG_READ_EXPAND_16_SUPPORTED
-- /* Do the expansion now, after all the arithmetic has been done. Notice
-- * that previous transformations can handle the PNG_EXPAND_16 flag if this
-- * is efficient (particularly true in the case of gamma correction, where
-- * better accuracy results faster!)
-- */
-- if (png_ptr->transformations & PNG_EXPAND_16)
-- png_do_expand_16(&png_ptr->row_info, png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-- /*NOTE: moved here in 1.5.4 (from much later in this list.) */
-- if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-- (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-- png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_INVERT_SUPPORTED
-- if (png_ptr->transformations & PNG_INVERT_MONO)
-- png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_SHIFT_SUPPORTED
-- if (png_ptr->transformations & PNG_SHIFT)
-- png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- &(png_ptr->shift));
--#endif
--
--#ifdef PNG_READ_PACK_SUPPORTED
-- if (png_ptr->transformations & PNG_PACK)
-- png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_BGR_SUPPORTED
-- if (png_ptr->transformations & PNG_BGR)
-- png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_PACKSWAP)
-- png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_FILLER_SUPPORTED
-- if (png_ptr->transformations & PNG_FILLER)
-- png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- (png_uint_32)png_ptr->filler, png_ptr->flags);
--#endif
--
--#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-- if (png_ptr->transformations & PNG_INVERT_ALPHA)
-- png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-- if (png_ptr->transformations & PNG_SWAP_ALPHA)
-- png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_READ_16BIT_SUPPORTED
--#ifdef PNG_READ_SWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_SWAP_BYTES)
-- png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--#endif
--
--#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-- if (png_ptr->transformations & PNG_USER_TRANSFORM)
-- {
-- if (png_ptr->read_user_transform_fn != NULL)
-- (*(png_ptr->read_user_transform_fn)) /* User read transform function */
-- (png_ptr, /* png_ptr */
-- &(png_ptr->row_info), /* row_info: */
-- /* png_uint_32 width; width of row */
-- /* png_size_t rowbytes; number of bytes in row */
-- /* png_byte color_type; color type of pixels */
-- /* png_byte bit_depth; bit depth of samples */
-- /* png_byte channels; number of channels (1-4) */
-- /* png_byte pixel_depth; bits per pixel (depth*channels) */
-- png_ptr->row_buf + 1); /* start of pixel data for row */
--#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-- if (png_ptr->user_transform_depth)
-- png_ptr->row_info.bit_depth = png_ptr->user_transform_depth;
--
-- if (png_ptr->user_transform_channels)
-- png_ptr->row_info.channels = png_ptr->user_transform_channels;
--#endif
-- png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
-- png_ptr->row_info.channels);
--
-- png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-- png_ptr->row_info.width);
-- }
--#endif
--}
--
- #ifdef PNG_READ_PACK_SUPPORTED
- /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
- * without changing the actual values. Thus, if you had a row with
-@@ -2323,7 +2160,7 @@
- * the numbers 0 or 1. If you would rather they contain 0 and 255, use
- * png_do_shift() after this.
- */
--void /* PRIVATE */
-+static void
- png_do_unpack(png_row_infop row_info, png_bytep row)
- {
- png_debug(1, "in png_do_unpack");
-@@ -2421,109 +2258,132 @@
- * a row of bit depth 8, but only 5 are significant, this will shift
- * the values back to 0 through 31.
- */
--void /* PRIVATE */
-+static void
- png_do_unshift(png_row_infop row_info, png_bytep row,
- png_const_color_8p sig_bits)
- {
-+ int color_type;
-+
- png_debug(1, "in png_do_unshift");
-
-- if (
-- row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-+ /* The palette case has already been handled in the _init routine. */
-+ color_type = row_info->color_type;
-+
-+ if (color_type != PNG_COLOR_TYPE_PALETTE)
- {
- int shift[4];
- int channels = 0;
-- int c;
-- png_uint_16 value = 0;
-- png_uint_32 row_width = row_info->width;
--
-- if (row_info->color_type & PNG_COLOR_MASK_COLOR)
-+ int bit_depth = row_info->bit_depth;
-+
-+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
-- shift[channels++] = row_info->bit_depth - sig_bits->red;
-- shift[channels++] = row_info->bit_depth - sig_bits->green;
-- shift[channels++] = row_info->bit_depth - sig_bits->blue;
-+ shift[channels++] = bit_depth - sig_bits->red;
-+ shift[channels++] = bit_depth - sig_bits->green;
-+ shift[channels++] = bit_depth - sig_bits->blue;
- }
-
- else
- {
-- shift[channels++] = row_info->bit_depth - sig_bits->gray;
-+ shift[channels++] = bit_depth - sig_bits->gray;
- }
-
-- if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-+ if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
- {
-- shift[channels++] = row_info->bit_depth - sig_bits->alpha;
-+ shift[channels++] = bit_depth - sig_bits->alpha;
- }
-
-- for (c = 0; c < channels; c++)
- {
-- if (shift[c] <= 0)
-- shift[c] = 0;
--
-- else
-- value = 1;
-+ int c, have_shift;
-+
-+ for (c = have_shift = 0; c < channels; ++c)
-+ {
-+ /* A shift of more than the bit depth is an error condition but it
-+ * gets ignored here.
-+ */
-+ if (shift[c] <= 0 || shift[c] >= bit_depth)
-+ shift[c] = 0;
-+
-+ else
-+ have_shift = 1;
-+ }
-+
-+ if (have_shift == 0)
-+ return;
- }
-
-- if (!value)
-- return;
--
-- switch (row_info->bit_depth)
-+ switch (bit_depth)
- {
- default:
-+ /* Must be 1bpp gray: should not be here! */
-+ /* NOTREACHED */
- break;
-
- case 2:
-+ /* Must be 2bpp gray */
-+ /* assert(channels == 1 && shift[0] == 1) */
- {
-- png_bytep bp;
-- png_size_t i;
-- png_size_t istop = row_info->rowbytes;
--
-- for (bp = row, i = 0; i < istop; i++)
-+ png_bytep bp = row;
-+ png_bytep bp_end = bp + row_info->rowbytes;
-+
-+ while (bp < bp_end)
- {
-- *bp >>= 1;
-- *bp++ &= 0x55;
-+ int b = (*bp >> 1) & 0x55;
-+ *bp++ = (png_byte)b;
- }
- break;
- }
-
- case 4:
-+ /* Must be 4bpp gray */
-+ /* assert(channels == 1) */
- {
- png_bytep bp = row;
-- png_size_t i;
-- png_size_t istop = row_info->rowbytes;
-- png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) |
-- (png_byte)((int)0xf >> shift[0]));
--
-- for (i = 0; i < istop; i++)
-+ png_bytep bp_end = bp + row_info->rowbytes;
-+ int gray_shift = shift[0];
-+ int mask = 0xf >> gray_shift;
-+
-+ mask |= mask << 4;
-+
-+ while (bp < bp_end)
- {
-- *bp >>= shift[0];
-- *bp++ &= mask;
-+ int b = (*bp >> gray_shift) & mask;
-+ *bp++ = (png_byte)b;
- }
- break;
- }
-
- case 8:
-+ /* Single byte components, G, GA, RGB, RGBA */
- {
- png_bytep bp = row;
-- png_uint_32 i;
-- png_uint_32 istop = row_width * channels;
--
-- for (i = 0; i < istop; i++)
-+ png_bytep bp_end = bp + row_info->rowbytes;
-+ int channel = 0;
-+
-+ while (bp < bp_end)
- {
-- *bp++ >>= shift[i%channels];
-+ int b = *bp >> shift[channel];
-+ if (++channel >= channels)
-+ channel = 0;
-+ *bp++ = (png_byte)b;
- }
- break;
- }
-
- #ifdef PNG_READ_16BIT_SUPPORTED
- case 16:
-+ /* Double byte components, G, GA, RGB, RGBA */
- {
- png_bytep bp = row;
-- png_uint_32 i;
-- png_uint_32 istop = channels * row_width;
--
-- for (i = 0; i < istop; i++)
-+ png_bytep bp_end = bp + row_info->rowbytes;
-+ int channel = 0;
-+
-+ while (bp < bp_end)
- {
-- value = (png_uint_16)((*bp << 8) + *(bp + 1));
-- value >>= shift[i%channels];
-+ int value = (bp[0] << 8) + bp[1];
-+
-+ value >>= shift[channel];
-+ if (++channel >= channels)
-+ channel = 0;
- *bp++ = (png_byte)(value >> 8);
- *bp++ = (png_byte)(value & 0xff);
- }
-@@ -2537,7 +2397,7 @@
-
- #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- /* Scale rows of bit depth 16 down to 8 accurately */
--void /* PRIVATE */
-+static void
- png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
- {
- png_debug(1, "in png_do_scale_16_to_8");
-@@ -2545,7 +2405,7 @@
- if (row_info->bit_depth == 16)
- {
- png_bytep sp = row; /* source */
-- png_bytep dp = row; /* destinaton */
-+ png_bytep dp = row; /* destination */
- png_bytep ep = sp + row_info->rowbytes; /* end+1 */
-
- while (sp < ep)
-@@ -2595,7 +2455,7 @@
- #endif
-
- #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
--void /* PRIVATE */
-+static void
- /* Simply discard the low byte. This was the default behavior prior
- * to libpng-1.5.4.
- */
-@@ -2606,7 +2466,7 @@
- if (row_info->bit_depth == 16)
- {
- png_bytep sp = row; /* source */
-- png_bytep dp = row; /* destinaton */
-+ png_bytep dp = row; /* destination */
- png_bytep ep = sp + row_info->rowbytes; /* end+1 */
-
- while (sp < ep)
-@@ -2623,7 +2483,7 @@
- #endif
-
- #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
--void /* PRIVATE */
-+static void
- png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
- {
- png_debug(1, "in png_do_read_swap_alpha");
-@@ -2720,7 +2580,7 @@
- #endif
-
- #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
--void /* PRIVATE */
-+static void
- png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
- {
- png_uint_32 row_width;
-@@ -2822,7 +2682,7 @@
-
- #ifdef PNG_READ_FILLER_SUPPORTED
- /* Add filler channel if we have RGB color */
--void /* PRIVATE */
-+static void
- png_do_read_filler(png_row_infop row_info, png_bytep row,
- png_uint_32 filler, png_uint_32 flags)
- {
-@@ -2841,7 +2701,7 @@
- {
- if (row_info->bit_depth == 8)
- {
-- if (flags & PNG_FLAG_FILLER_AFTER)
-+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
- {
- /* This changes the data from G to GX */
- png_bytep sp = row + (png_size_t)row_width;
-@@ -2876,7 +2736,7 @@
- #ifdef PNG_READ_16BIT_SUPPORTED
- else if (row_info->bit_depth == 16)
- {
-- if (flags & PNG_FLAG_FILLER_AFTER)
-+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
- {
- /* This changes the data from GG to GGXX */
- png_bytep sp = row + (png_size_t)row_width * 2;
-@@ -2918,7 +2778,7 @@
- {
- if (row_info->bit_depth == 8)
- {
-- if (flags & PNG_FLAG_FILLER_AFTER)
-+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
- {
- /* This changes the data from RGB to RGBX */
- png_bytep sp = row + (png_size_t)row_width * 3;
-@@ -2957,7 +2817,7 @@
- #ifdef PNG_READ_16BIT_SUPPORTED
- else if (row_info->bit_depth == 16)
- {
-- if (flags & PNG_FLAG_FILLER_AFTER)
-+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
- {
- /* This changes the data from RRGGBB to RRGGBBXX */
- png_bytep sp = row + (png_size_t)row_width * 6;
-@@ -3009,7 +2869,7 @@
-
- #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
- /* Expand grayscale files to RGB, with or without alpha */
--void /* PRIVATE */
-+static void
- png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
- {
- png_uint_32 i;
-@@ -3018,7 +2878,7 @@
- png_debug(1, "in png_do_gray_to_rgb");
-
- if (row_info->bit_depth >= 8 &&
-- !(row_info->color_type & PNG_COLOR_MASK_COLOR))
-+ (row_info->color_type & PNG_COLOR_MASK_COLOR) == 0)
- {
- if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
- {
-@@ -3086,7 +2946,7 @@
- }
- }
- }
-- row_info->channels += (png_byte)2;
-+ row_info->channels = (png_byte)(row_info->channels + 2);
- row_info->color_type |= PNG_COLOR_MASK_COLOR;
- row_info->pixel_depth = (png_byte)(row_info->channels *
- row_info->bit_depth);
-@@ -3097,269 +2957,242 @@
-
- #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- /* Reduce RGB files to grayscale, with or without alpha
-- * using the equation given in Poynton's ColorFAQ at
-- * <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008)
-- * New link:
-- * <http://www.poynton.com/notes/colour_and_gamma/>
-+ * using the equation given in Poynton's ColorFAQ of 1998-01-04 at
-+ * <http://www.inforamp.net/~poynton/> (THIS LINK IS DEAD June 2008 but
-+ * versions dated 1998 through November 2002 have been archived at
-+ * http://web.archive.org/web/20000816232553/http://www.inforamp.net/
-+ * ~poynton/notes/colour_and_gamma/ColorFAQ.txt )
- * Charles Poynton poynton at poynton.com
- *
- * Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
- *
-- * We approximate this with
-- *
-- * Y = 0.21268 * R + 0.7151 * G + 0.07217 * B
-- *
- * which can be expressed with integers as
- *
- * Y = (6969 * R + 23434 * G + 2365 * B)/32768
- *
-- * The calculation is to be done in a linear colorspace.
-+ * Poynton's current link (as of January 2003 through July 2011):
-+ * <http://www.poynton.com/notes/colour_and_gamma/>
-+ * has changed the numbers slightly:
- *
-- * Other integer coefficents can be used via png_set_rgb_to_gray().
-+ * Y = 0.2126*R + 0.7152*G + 0.0722*B
-+ *
-+ * which can be expressed with integers as
-+ *
-+ * Y = (6966 * R + 23436 * G + 2366 * B)/32768
-+ *
-+ * Historically, however, libpng uses numbers derived from the ITU-R Rec 709
-+ * end point chromaticities and the D65 white point. Depending on the
-+ * precision used for the D65 white point this produces a variety of different
-+ * numbers, however if the four decimal place value used in ITU-R Rec 709 is
-+ * used (0.3127,0.3290) the Y calculation would be:
-+ *
-+ * Y = (6968 * R + 23435 * G + 2366 * B)/32768
-+ *
-+ * While this is correct the rounding results in an overflow for white, because
-+ * the sum of the rounded coefficients is 32769, not 32768. Consequently
-+ * libpng uses, instead, the closest non-overflowing approximation:
-+ *
-+ * Y = (6968 * R + 23434 * G + 2366 * B)/32768
-+ *
-+ * Starting with libpng-1.5.5, if the image being converted has a cHRM chunk
-+ * (including an sRGB chunk) then the chromaticities are used to calculate the
-+ * coefficients. See the chunk handling in pngrutil.c for more information.
-+ *
-+ * In all cases the calculation is to be done in a linear colorspace. If no
-+ * gamma information is available to correct the encoding of the original RGB
-+ * values this results in an implicit assumption that the original PNG RGB
-+ * values were linear.
-+ *
-+ * Other integer coefficents can be used via png_set_rgb_to_gray(). Because
-+ * the API takes just red and green coefficients the blue coefficient is
-+ * calculated to make the sum 32768. This will result in different rounding
-+ * to that used above.
- */
--int /* PRIVATE */
--png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
-+static int
-+png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
-
- {
-- png_uint_32 i;
--
-- png_uint_32 row_width = row_info->width;
- int rgb_error = 0;
-
- png_debug(1, "in png_do_rgb_to_gray");
-
-- if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
-- (row_info->color_type & PNG_COLOR_MASK_COLOR))
-+ if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 &&
-+ (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
-- png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
-- png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
-- png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff;
--
-- if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-+ PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
-+ PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
-+ PNG_CONST png_uint_32 bc = 32768 - rc - gc;
-+ PNG_CONST png_uint_32 row_width = row_info->width;
-+ PNG_CONST int have_alpha =
-+ (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0;
-+
-+ if (row_info->bit_depth == 8)
- {
-- if (row_info->bit_depth == 8)
-+#ifdef PNG_READ_GAMMA_SUPPORTED
-+ /* Notice that gamma to/from 1 are not necessarily inverses (if
-+ * there is an overall gamma correction). Prior to 1.5.5 this code
-+ * checked the linearized values for equality; this doesn't match
-+ * the documentation, the original values must be checked.
-+ */
-+ if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
- {
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-- if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
-+ png_bytep sp = row;
-+ png_bytep dp = row;
-+ png_uint_32 i;
-+
-+ for (i = 0; i < row_width; i++)
- {
-- png_bytep sp = row;
-- png_bytep dp = row;
--
-- for (i = 0; i < row_width; i++)
-+ png_byte red = *(sp++);
-+ png_byte green = *(sp++);
-+ png_byte blue = *(sp++);
-+
-+ if (red != green || red != blue)
- {
-- png_byte red = png_ptr->gamma_to_1[*(sp++)];
-- png_byte green = png_ptr->gamma_to_1[*(sp++)];
-- png_byte blue = png_ptr->gamma_to_1[*(sp++)];
--
-- if (red != green || red != blue)
-- {
-- rgb_error |= 1;
-- *(dp++) = png_ptr->gamma_from_1[
-- (rc*red + gc*green + bc*blue)>>15];
-- }
-+ red = png_ptr->gamma_to_1[red];
-+ green = png_ptr->gamma_to_1[green];
-+ blue = png_ptr->gamma_to_1[blue];
-+
-+ rgb_error |= 1;
-+ *(dp++) = png_ptr->gamma_from_1[
-+ (rc*red + gc*green + bc*blue + 16384)>>15];
-+ }
-+
-+ else
-+ {
-+ /* If there is no overall correction the table will not be
-+ * set.
-+ */
-+ if (png_ptr->gamma_table != NULL)
-+ red = png_ptr->gamma_table[red];
-+
-+ *(dp++) = red;
-+ }
-+
-+ if (have_alpha != 0)
-+ *(dp++) = *(sp++);
-+ }
-+ }
-+ else
-+#endif
-+ {
-+ png_bytep sp = row;
-+ png_bytep dp = row;
-+ png_uint_32 i;
-+
-+ for (i = 0; i < row_width; i++)
-+ {
-+ png_byte red = *(sp++);
-+ png_byte green = *(sp++);
-+ png_byte blue = *(sp++);
-+
-+ if (red != green || red != blue)
-+ {
-+ rgb_error |= 1;
-+ /* NOTE: this is the historical approach which simply
-+ * truncates the results.
-+ */
-+ *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
-+ }
-+
-+ else
-+ *(dp++) = red;
-+
-+ if (have_alpha != 0)
-+ *(dp++) = *(sp++);
-+ }
-+ }
-+ }
-+
-+ else /* RGB bit_depth == 16 */
-+ {
-+#ifdef PNG_READ_GAMMA_SUPPORTED
-+ if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL)
-+ {
-+ png_bytep sp = row;
-+ png_bytep dp = row;
-+ png_uint_32 i;
-+
-+ for (i = 0; i < row_width; i++)
-+ {
-+ png_uint_16 red, green, blue, w;
-+
-+ red = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
-+ green = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
-+ blue = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
-+
-+ if (red == green && red == blue)
-+ {
-+ if (png_ptr->gamma_16_table != NULL)
-+ w = png_ptr->gamma_16_table[(red & 0xff)
-+ >> png_ptr->gamma_shift][red >> 8];
-
- else
-- *(dp++) = *(sp - 1);
-+ w = red;
- }
-- }
-- else
--#endif
-- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-+
-+ else
- {
-- png_byte red = *(sp++);
-- png_byte green = *(sp++);
-- png_byte blue = *(sp++);
--
-- if (red != green || red != blue)
-- {
-- rgb_error |= 1;
-- *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
-- }
--
-- else
-- *(dp++) = *(sp - 1);
-+ png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff)
-+ >> png_ptr->gamma_shift][red>>8];
-+ png_uint_16 green_1 =
-+ png_ptr->gamma_16_to_1[(green&0xff) >>
-+ png_ptr->gamma_shift][green>>8];
-+ png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff)
-+ >> png_ptr->gamma_shift][blue>>8];
-+ png_uint_16 gray16 = (png_uint_16)((rc*red_1 + gc*green_1
-+ + bc*blue_1 + 16384)>>15);
-+ w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
-+ png_ptr->gamma_shift][gray16 >> 8];
-+ rgb_error |= 1;
-+ }
-+
-+ *(dp++) = (png_byte)((w>>8) & 0xff);
-+ *(dp++) = (png_byte)(w & 0xff);
-+
-+ if (have_alpha != 0)
-+ {
-+ *(dp++) = *(sp++);
-+ *(dp++) = *(sp++);
- }
- }
- }
--
-- else /* RGB bit_depth == 16 */
-+ else
-+#endif
- {
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-- if (png_ptr->gamma_16_to_1 != NULL &&
-- png_ptr->gamma_16_from_1 != NULL)
-+ png_bytep sp = row;
-+ png_bytep dp = row;
-+ png_uint_32 i;
-+
-+ for (i = 0; i < row_width; i++)
- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-+ png_uint_16 red, green, blue, gray16;
-+
-+ red = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
-+ green = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
-+ blue = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
-+
-+ if (red != green || red != blue)
-+ rgb_error |= 1;
-+
-+ /* From 1.5.5 in the 16 bit case do the accurate conversion even
-+ * in the 'fast' case - this is because this is where the code
-+ * ends up when handling linear 16 bit data.
-+ */
-+ gray16 = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >>
-+ 15);
-+ *(dp++) = (png_byte)((gray16 >> 8) & 0xff);
-+ *(dp++) = (png_byte)(gray16 & 0xff);
-+
-+ if (have_alpha != 0)
- {
-- png_uint_16 red, green, blue, w;
--
-- red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-- green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-- blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
--
-- if (red == green && red == blue)
-- w = red;
--
-- else
-- {
-- png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff)
-- >> png_ptr->gamma_shift][red>>8];
-- png_uint_16 green_1 =
-- png_ptr->gamma_16_to_1[(green&0xff) >>
-- png_ptr->gamma_shift][green>>8];
-- png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff)
-- >> png_ptr->gamma_shift][blue>>8];
-- png_uint_16 gray16 = (png_uint_16)((rc*red_1 + gc*green_1
-- + bc*blue_1)>>15);
-- w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
-- png_ptr->gamma_shift][gray16 >> 8];
-- rgb_error |= 1;
-- }
--
-- *(dp++) = (png_byte)((w>>8) & 0xff);
-- *(dp++) = (png_byte)(w & 0xff);
-- }
-- }
-- else
--#endif
-- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-- {
-- png_uint_16 red, green, blue, gray16;
--
-- red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-- green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-- blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
--
-- if (red != green || red != blue)
-- rgb_error |= 1;
--
-- gray16 = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
-- *(dp++) = (png_byte)((gray16>>8) & 0xff);
-- *(dp++) = (png_byte)(gray16 & 0xff);
-- }
-- }
-- }
-- }
-- if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-- {
-- if (row_info->bit_depth == 8)
-- {
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-- if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
-- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-- {
-- png_byte red = png_ptr->gamma_to_1[*(sp++)];
-- png_byte green = png_ptr->gamma_to_1[*(sp++)];
-- png_byte blue = png_ptr->gamma_to_1[*(sp++)];
--
-- if (red != green || red != blue)
-- rgb_error |= 1;
--
-- *(dp++) = png_ptr->gamma_from_1
-- [(rc*red + gc*green + bc*blue)>>15];
--
-- *(dp++) = *(sp++); /* alpha */
-- }
-- }
-- else
--#endif
-- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-- {
-- png_byte red = *(sp++);
-- png_byte green = *(sp++);
-- png_byte blue = *(sp++);
-- if (red != green || red != blue)
-- rgb_error |= 1;
--
-- *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
-- *(dp++) = *(sp++); /* alpha */
-- }
-- }
-- }
-- else /* RGBA bit_depth == 16 */
-- {
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-- if (png_ptr->gamma_16_to_1 != NULL &&
-- png_ptr->gamma_16_from_1 != NULL)
-- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-- {
-- png_uint_16 red, green, blue, w;
--
-- red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-- green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-- blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
--
-- if (red == green && red == blue)
-- w = red;
--
-- else
-- {
-- png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) >>
-- png_ptr->gamma_shift][red>>8];
--
-- png_uint_16 green_1 =
-- png_ptr->gamma_16_to_1[(green&0xff) >>
-- png_ptr->gamma_shift][green>>8];
--
-- png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) >>
-- png_ptr->gamma_shift][blue>>8];
--
-- png_uint_16 gray16 = (png_uint_16)((rc * red_1
-- + gc * green_1 + bc * blue_1)>>15);
--
-- w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
-- png_ptr->gamma_shift][gray16 >> 8];
--
-- rgb_error |= 1;
-- }
--
-- *(dp++) = (png_byte)((w>>8) & 0xff);
-- *(dp++) = (png_byte)(w & 0xff);
-- *(dp++) = *(sp++); /* alpha */
- *(dp++) = *(sp++);
-- }
-- }
-- else
--#endif
-- {
-- png_bytep sp = row;
-- png_bytep dp = row;
-- for (i = 0; i < row_width; i++)
-- {
-- png_uint_16 red, green, blue, gray16;
-- red = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2;
-- green = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2;
-- blue = (png_uint_16)((*(sp)<<8) | *(sp + 1)); sp += 2;
--
-- if (red != green || red != blue)
-- rgb_error |= 1;
--
-- gray16 = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
-- *(dp++) = (png_byte)((gray16>>8) & 0xff);
-- *(dp++) = (png_byte)(gray16 & 0xff);
-- *(dp++) = *(sp++); /* alpha */
- *(dp++) = *(sp++);
- }
- }
- }
- }
-- row_info->channels -= 2;
-+
-+ row_info->channels = (png_byte)(row_info->channels - 2);
- row_info->color_type = (png_byte)(row_info->color_type &
- ~PNG_COLOR_MASK_COLOR);
- row_info->pixel_depth = (png_byte)(row_info->channels *
-@@ -3369,73 +3202,15 @@
- return rgb_error;
- }
- #endif
--#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
--
--#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
--/* Build a grayscale palette. Palette is assumed to be 1 << bit_depth
-- * large of png_color. This lets grayscale images be treated as
-- * paletted. Most useful for gamma correction and simplification
-- * of code. This API is not used internally.
-- */
--void PNGAPI
--png_build_grayscale_palette(int bit_depth, png_colorp palette)
--{
-- int num_palette;
-- int color_inc;
-- int i;
-- int v;
--
-- png_debug(1, "in png_do_build_grayscale_palette");
--
-- if (palette == NULL)
-- return;
--
-- switch (bit_depth)
-- {
-- case 1:
-- num_palette = 2;
-- color_inc = 0xff;
-- break;
--
-- case 2:
-- num_palette = 4;
-- color_inc = 0x55;
-- break;
--
-- case 4:
-- num_palette = 16;
-- color_inc = 0x11;
-- break;
--
-- case 8:
-- num_palette = 256;
-- color_inc = 1;
-- break;
--
-- default:
-- num_palette = 0;
-- color_inc = 0;
-- break;
-- }
--
-- for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
-- {
-- palette[i].red = (png_byte)v;
-- palette[i].green = (png_byte)v;
-- palette[i].blue = (png_byte)v;
-- }
--}
--#endif
--
--
--#ifdef PNG_READ_TRANSFORMS_SUPPORTED
--#ifdef PNG_READ_BACKGROUND_SUPPORTED
-+
-+#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-+ defined(PNG_READ_ALPHA_MODE_SUPPORTED)
- /* Replace any alpha or transparency with the supplied background color.
- * "background" is already in the screen gamma, while "background_1" is
- * at a gamma of 1.0. Paletted files have already been taken care of.
- */
--void /* PRIVATE */
--png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
-+static void
-+png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
- {
- #ifdef PNG_READ_GAMMA_SUPPORTED
- png_const_bytep gamma_table = png_ptr->gamma_table;
-@@ -3445,12 +3220,12 @@
- png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1;
- png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1;
- int gamma_shift = png_ptr->gamma_shift;
-+ int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
- #endif
-
- png_bytep sp;
- png_uint_32 i;
- png_uint_32 row_width = row_info->width;
-- int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
- int shift;
-
- png_debug(1, "in png_do_compose");
-@@ -3471,11 +3246,12 @@
- if ((png_uint_16)((*sp >> shift) & 0x01)
- == png_ptr->trans_color.gray)
- {
-- *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
-- *sp |= (png_byte)(png_ptr->background.gray << shift);
-+ unsigned int tmp = *sp & (0x7f7f >> (7 - shift));
-+ tmp |= png_ptr->background.gray << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
-- if (!shift)
-+ if (shift == 0)
- {
- shift = 7;
- sp++;
-@@ -3499,20 +3275,22 @@
- if ((png_uint_16)((*sp >> shift) & 0x03)
- == png_ptr->trans_color.gray)
- {
-- *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-- *sp |= (png_byte)(png_ptr->background.gray << shift);
-+ unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-+ tmp |= png_ptr->background.gray << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
- else
- {
-- png_byte p = (png_byte)((*sp >> shift) & 0x03);
-- png_byte g = (png_byte)((gamma_table [p | (p << 2) |
-- (p << 4) | (p << 6)] >> 6) & 0x03);
-- *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-- *sp |= (png_byte)(g << shift);
-+ unsigned int p = (*sp >> shift) & 0x03;
-+ unsigned int g = (gamma_table [p | (p << 2) |
-+ (p << 4) | (p << 6)] >> 6) & 0x03;
-+ unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-+ tmp |= g << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
-- if (!shift)
-+ if (shift == 0)
- {
- shift = 6;
- sp++;
-@@ -3533,11 +3311,12 @@
- if ((png_uint_16)((*sp >> shift) & 0x03)
- == png_ptr->trans_color.gray)
- {
-- *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-- *sp |= (png_byte)(png_ptr->background.gray << shift);
-+ unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-+ tmp |= png_ptr->background.gray << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
-- if (!shift)
-+ if (shift == 0)
- {
- shift = 6;
- sp++;
-@@ -3562,20 +3341,22 @@
- if ((png_uint_16)((*sp >> shift) & 0x0f)
- == png_ptr->trans_color.gray)
- {
-- *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-- *sp |= (png_byte)(png_ptr->background.gray << shift);
-+ unsigned int tmp = *sp & (0xf0f >> (4 - shift));
-+ tmp |= png_ptr->background.gray << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
- else
- {
-- png_byte p = (png_byte)((*sp >> shift) & 0x0f);
-- png_byte g = (png_byte)((gamma_table[p |
-- (p << 4)] >> 4) & 0x0f);
-- *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-- *sp |= (png_byte)(g << shift);
-+ unsigned int p = (*sp >> shift) & 0x0f;
-+ unsigned int g = (gamma_table[p | (p << 4)] >> 4) &
-+ 0x0f;
-+ unsigned int tmp = *sp & (0xf0f >> (4 - shift));
-+ tmp |= g << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
-- if (!shift)
-+ if (shift == 0)
- {
- shift = 4;
- sp++;
-@@ -3596,11 +3377,12 @@
- if ((png_uint_16)((*sp >> shift) & 0x0f)
- == png_ptr->trans_color.gray)
- {
-- *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-- *sp |= (png_byte)(png_ptr->background.gray << shift);
-+ unsigned int tmp = *sp & (0xf0f >> (4 - shift));
-+ tmp |= png_ptr->background.gray << shift;
-+ *sp = (png_byte)(tmp & 0xff);
- }
-
-- if (!shift)
-+ if (shift == 0)
- {
- shift = 4;
- sp++;
-@@ -3656,8 +3438,10 @@
- if (v == png_ptr->trans_color.gray)
- {
- /* Background is already in screen gamma */
-- *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-- *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-+ *sp = (png_byte)((png_ptr->background.gray >> 8)
-+ & 0xff);
-+ *(sp + 1) = (png_byte)(png_ptr->background.gray
-+ & 0xff);
- }
-
- else
-@@ -3680,8 +3464,10 @@
-
- if (v == png_ptr->trans_color.gray)
- {
-- *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-- *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-+ *sp = (png_byte)((png_ptr->background.gray >> 8)
-+ & 0xff);
-+ *(sp + 1) = (png_byte)(png_ptr->background.gray
-+ & 0xff);
- }
- }
- }
-@@ -3761,9 +3547,12 @@
- /* Background is already in screen gamma */
- *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
- *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-- *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-- *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-- *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-+ *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-+ & 0xff);
-+ *(sp + 3) = (png_byte)(png_ptr->background.green
-+ & 0xff);
-+ *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-+ & 0xff);
- *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
- }
-
-@@ -3804,9 +3593,12 @@
- {
- *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
- *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-- *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-- *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-- *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-+ *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-+ & 0xff);
-+ *(sp + 3) = (png_byte)(png_ptr->background.green
-+ & 0xff);
-+ *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-+ & 0xff);
- *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
- }
- }
-@@ -3843,7 +3635,7 @@
-
- v = gamma_to_1[*sp];
- png_composite(w, v, a, png_ptr->background_1.gray);
-- if (!optimize)
-+ if (optimize == 0)
- w = gamma_from_1[w];
- *sp = w;
- }
-@@ -3861,7 +3653,7 @@
- *sp = (png_byte)png_ptr->background.gray;
-
- else if (a < 0xff)
-- png_composite(*sp, *sp, a, png_ptr->background_1.gray);
-+ png_composite(*sp, *sp, a, png_ptr->background.gray);
- }
- }
- }
-@@ -3889,7 +3681,8 @@
- else if (a == 0)
- {
- /* Background is already in screen gamma */
-- *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-+ *sp = (png_byte)((png_ptr->background.gray >> 8)
-+ & 0xff);
- *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
- }
-
-@@ -3899,7 +3692,7 @@
-
- g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
- png_composite_16(v, g, a, png_ptr->background_1.gray);
-- if (optimize)
-+ if (optimize != 0)
- w = v;
- else
- w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
-@@ -3919,7 +3712,8 @@
-
- if (a == 0)
- {
-- *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-+ *sp = (png_byte)((png_ptr->background.gray >> 8)
-+ & 0xff);
- *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
- }
-
-@@ -3928,7 +3722,7 @@
- png_uint_16 g, v;
-
- g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-- png_composite_16(v, g, a, png_ptr->background_1.gray);
-+ png_composite_16(v, g, a, png_ptr->background.gray);
- *sp = (png_byte)((v >> 8) & 0xff);
- *(sp + 1) = (png_byte)(v & 0xff);
- }
-@@ -3972,17 +3766,17 @@
-
- v = gamma_to_1[*sp];
- png_composite(w, v, a, png_ptr->background_1.red);
-- if (!optimize) w = gamma_from_1[w];
-+ if (optimize == 0) w = gamma_from_1[w];
- *sp = w;
-
- v = gamma_to_1[*(sp + 1)];
- png_composite(w, v, a, png_ptr->background_1.green);
-- if (!optimize) w = gamma_from_1[w];
-+ if (optimize == 0) w = gamma_from_1[w];
- *(sp + 1) = w;
-
- v = gamma_to_1[*(sp + 2)];
- png_composite(w, v, a, png_ptr->background_1.blue);
-- if (!optimize) w = gamma_from_1[w];
-+ if (optimize == 0) w = gamma_from_1[w];
- *(sp + 2) = w;
- }
- }
-@@ -4049,9 +3843,12 @@
- /* Background is already in screen gamma */
- *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
- *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-- *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-- *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-- *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-+ *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-+ & 0xff);
-+ *(sp + 3) = (png_byte)(png_ptr->background.green
-+ & 0xff);
-+ *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-+ & 0xff);
- *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
- }
-
-@@ -4061,23 +3858,26 @@
-
- v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
- png_composite_16(w, v, a, png_ptr->background_1.red);
-- if (!optimize)
-- w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-+ if (optimize == 0)
-+ w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >>
-+ 8];
- *sp = (png_byte)((w >> 8) & 0xff);
- *(sp + 1) = (png_byte)(w & 0xff);
-
- v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
- png_composite_16(w, v, a, png_ptr->background_1.green);
-- if (!optimize)
-- w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-+ if (optimize == 0)
-+ w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >>
-+ 8];
-
- *(sp + 2) = (png_byte)((w >> 8) & 0xff);
- *(sp + 3) = (png_byte)(w & 0xff);
-
- v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
- png_composite_16(w, v, a, png_ptr->background_1.blue);
-- if (!optimize)
-- w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-+ if (optimize == 0)
-+ w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >>
-+ 8];
-
- *(sp + 4) = (png_byte)((w >> 8) & 0xff);
- *(sp + 5) = (png_byte)(w & 0xff);
-@@ -4098,9 +3898,12 @@
- {
- *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
- *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-- *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-- *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-- *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-+ *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-+ & 0xff);
-+ *(sp + 3) = (png_byte)(png_ptr->background.green
-+ & 0xff);
-+ *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-+ & 0xff);
- *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
- }
-
-@@ -4137,7 +3940,7 @@
- }
- }
- }
--#endif
-+#endif /* READ_BACKGROUND || READ_ALPHA_MODE */
-
- #ifdef PNG_READ_GAMMA_SUPPORTED
- /* Gamma correct the image, avoiding the alpha channel. Make sure
-@@ -4146,8 +3949,8 @@
- * is 16, use gamma_16_table and gamma_shift. Build these with
- * build_gamma_table().
- */
--void /* PRIVATE */
--png_do_gamma(png_row_infop row_info, png_bytep row, png_structp png_ptr)
-+static void
-+png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
- {
- png_const_bytep gamma_table = png_ptr->gamma_table;
- png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table;
-@@ -4347,14 +4150,14 @@
- * linear.) Called only with color types that have an alpha channel. Needs the
- * from_1 tables.
- */
--void /* PRIVATE */
--png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structp png_ptr)
-+static void
-+png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
- {
- png_uint_32 row_width = row_info->width;
-
- png_debug(1, "in png_do_encode_alpha");
-
-- if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-+ if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
- {
- if (row_info->bit_depth == 8)
- {
-@@ -4413,7 +4216,7 @@
- /* Expands a palette row to an RGB or RGBA row depending
- * upon whether you supply trans and num_trans.
- */
--void /* PRIVATE */
-+static void
- png_do_expand_palette(png_row_infop row_info, png_bytep row,
- png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
- {
-@@ -4566,7 +4369,7 @@
- /* If the bit depth < 8, it is expanded to 8. Also, if the already
- * expanded transparency value is supplied, an alpha channel is built.
- */
--void /* PRIVATE */
-+static void
- png_do_expand(png_row_infop row_info, png_bytep row,
- png_const_color_16p trans_color)
- {
-@@ -4580,7 +4383,7 @@
- {
- if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
- {
-- png_uint_16 gray = (png_uint_16)(trans_color ? trans_color->gray : 0);
-+ unsigned int gray = trans_color != NULL ? trans_color->gray : 0;
-
- if (row_info->bit_depth < 8)
- {
-@@ -4588,7 +4391,7 @@
- {
- case 1:
- {
-- gray = (png_uint_16)((gray & 0x01) * 0xff);
-+ gray = (gray & 0x01) * 0xff;
- sp = row + (png_size_t)((row_width - 1) >> 3);
- dp = row + (png_size_t)row_width - 1;
- shift = 7 - (int)((row_width + 7) & 0x07);
-@@ -4616,7 +4419,7 @@
-
- case 2:
- {
-- gray = (png_uint_16)((gray & 0x03) * 0x55);
-+ gray = (gray & 0x03) * 0x55;
- sp = row + (png_size_t)((row_width - 1) >> 2);
- dp = row + (png_size_t)row_width - 1;
- shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-@@ -4641,7 +4444,7 @@
-
- case 4:
- {
-- gray = (png_uint_16)((gray & 0x0f) * 0x11);
-+ gray = (gray & 0x0f) * 0x11;
- sp = row + (png_size_t)((row_width - 1) >> 1);
- dp = row + (png_size_t)row_width - 1;
- shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-@@ -4694,8 +4497,8 @@
-
- else if (row_info->bit_depth == 16)
- {
-- png_byte gray_high = (png_byte)((gray >> 8) & 0xff);
-- png_byte gray_low = (png_byte)(gray & 0xff);
-+ unsigned int gray_high = (gray >> 8) & 0xff;
-+ unsigned int gray_low = gray & 0xff;
- sp = row + row_info->rowbytes - 1;
- dp = row + (row_info->rowbytes << 1) - 1;
- for (i = 0; i < row_width; i++)
-@@ -4724,7 +4527,8 @@
- row_width);
- }
- }
-- else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color)
-+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
-+ trans_color != NULL)
- {
- if (row_info->bit_depth == 8)
- {
-@@ -4793,10 +4597,10 @@
- #endif
-
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
--/* If the bit depth is 8 and the colour type is not a palette type expand the
-+/* If the bit depth is 8 and the color type is not a palette type expand the
- * whole row to 16 bits. Has no effect otherwise.
- */
--void /* PRIVATE */
-+static void
- png_do_expand_16(png_row_infop row_info, png_bytep row)
- {
- if (row_info->bit_depth == 8 &&
-@@ -4824,7 +4628,7 @@
- #endif
-
- #ifdef PNG_READ_QUANTIZE_SUPPORTED
--void /* PRIVATE */
-+static void
- png_do_quantize(png_row_infop row_info, png_bytep row,
- png_const_bytep palette_lookup, png_const_bytep quantize_lookup)
- {
-@@ -4915,70 +4719,304 @@
- }
- }
- }
--#endif /* PNG_READ_QUANTIZE_SUPPORTED */
--#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
--
--#ifdef PNG_MNG_FEATURES_SUPPORTED
--/* Undoes intrapixel differencing */
-+#endif /* READ_QUANTIZE */
-+
-+/* Transform the row. The order of transformations is significant,
-+ * and is very touchy. If you add a transformation, take care to
-+ * decide how it fits in with the other transformations here.
-+ */
- void /* PRIVATE */
--png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
-+png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
- {
-- png_debug(1, "in png_do_read_intrapixel");
--
-- if (
-- (row_info->color_type & PNG_COLOR_MASK_COLOR))
-+ png_debug(1, "in png_do_read_transformations");
-+
-+ if (png_ptr->row_buf == NULL)
- {
-- int bytes_per_pixel;
-- png_uint_32 row_width = row_info->width;
--
-- if (row_info->bit_depth == 8)
-+ /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this
-+ * error is incredibly rare and incredibly easy to debug without this
-+ * information.
-+ */
-+ png_error(png_ptr, "NULL row buffer");
-+ }
-+
-+ /* The following is debugging; prior to 1.5.4 the code was never compiled in;
-+ * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro
-+ * PNG_WARN_UNINITIALIZED_ROW removed. In 1.6 the new flag is set only for
-+ * all transformations, however in practice the ROW_INIT always gets done on
-+ * demand, if necessary.
-+ */
-+ if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
-+ (png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-+ {
-+ /* Application has failed to call either png_read_start_image() or
-+ * png_read_update_info() after setting transforms that expand pixels.
-+ * This check added to libpng-1.2.19 (but not enabled until 1.5.4).
-+ */
-+ png_error(png_ptr, "Uninitialized row");
-+ }
-+
-+#ifdef PNG_READ_EXPAND_SUPPORTED
-+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
-+ {
-+ if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
- {
-- png_bytep rp;
-- png_uint_32 i;
--
-- if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-- bytes_per_pixel = 3;
--
-- else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-- bytes_per_pixel = 4;
-+ png_do_expand_palette(row_info, png_ptr->row_buf + 1,
-+ png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
-+ }
-+
-+ else
-+ {
-+ if (png_ptr->num_trans != 0 &&
-+ (png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
-+ png_do_expand(row_info, png_ptr->row_buf + 1,
-+ &(png_ptr->trans_color));
-
- else
-- return;
--
-- for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-- {
-- *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
-- *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
-- }
-- }
-- else if (row_info->bit_depth == 16)
-- {
-- png_bytep rp;
-- png_uint_32 i;
--
-- if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-- bytes_per_pixel = 6;
--
-- else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-- bytes_per_pixel = 8;
--
-- else
-- return;
--
-- for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-- {
-- png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
-- png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
-- png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
-- png_uint_32 red = (png_uint_32)((s0 + s1 + 65536L) & 0xffffL);
-- png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) & 0xffffL);
-- *(rp ) = (png_byte)((red >> 8) & 0xff);
-- *(rp + 1) = (png_byte)(red & 0xff);
-- *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-- *(rp + 5) = (png_byte)(blue & 0xff);
-- }
-+ png_do_expand(row_info, png_ptr->row_buf + 1,
-+ NULL);
- }
- }
-+#endif
-+
-+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
-+ (png_ptr->transformations & PNG_COMPOSE) == 0 &&
-+ (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-+ row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-+ png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-+ 0 /* at_start == false, because SWAP_ALPHA happens later */);
-+#endif
-+
-+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-+ {
-+ int rgb_error =
-+ png_do_rgb_to_gray(png_ptr, row_info,
-+ png_ptr->row_buf + 1);
-+
-+ if (rgb_error != 0)
-+ {
-+ png_ptr->rgb_to_gray_status=1;
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-+ PNG_RGB_TO_GRAY_WARN)
-+ png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-+
-+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-+ PNG_RGB_TO_GRAY_ERR)
-+ png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-+ }
-+ }
-+#endif
-+
-+/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
-+ *
-+ * In most cases, the "simple transparency" should be done prior to doing
-+ * gray-to-RGB, or you will have to test 3x as many bytes to check if a
-+ * pixel is transparent. You would also need to make sure that the
-+ * transparency information is upgraded to RGB.
-+ *
-+ * To summarize, the current flow is:
-+ * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
-+ * with background "in place" if transparent,
-+ * convert to RGB if necessary
-+ * - Gray + alpha -> composite with gray background and remove alpha bytes,
-+ * convert to RGB if necessary
-+ *
-+ * To support RGB backgrounds for gray images we need:
-+ * - Gray + simple transparency -> convert to RGB + simple transparency,
-+ * compare 3 or 6 bytes and composite with
-+ * background "in place" if transparent
-+ * (3x compare/pixel compared to doing
-+ * composite with gray bkgrnd)
-+ * - Gray + alpha -> convert to RGB + alpha, composite with background and
-+ * remove alpha bytes (3x float
-+ * operations/pixel compared with composite
-+ * on gray background)
-+ *
-+ * Greg's change will do this. The reason it wasn't done before is for
-+ * performance, as this increases the per-pixel operations. If we would check
-+ * in advance if the background was gray or RGB, and position the gray-to-RGB
-+ * transform appropriately, then it would save a lot of work/time.
-+ */
-+
-+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-+ /* If gray -> RGB, do so now only if background is non-gray; else do later
-+ * for performance reasons
-+ */
-+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
-+ (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) == 0)
-+ png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-+ defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-+ png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
-+#endif
-+
-+#ifdef PNG_READ_GAMMA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_GAMMA) != 0 &&
-+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-+ /* Because RGB_TO_GRAY does the gamma transform. */
-+ (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0 &&
-+#endif
-+#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-+ defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-+ /* Because PNG_COMPOSE does the gamma transform if there is something to
-+ * do (if there is an alpha channel or transparency.)
-+ */
-+ !((png_ptr->transformations & PNG_COMPOSE) &&
-+ ((png_ptr->num_trans != 0) ||
-+ (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)) &&
-+#endif
-+ /* Because png_init_read_transformations transforms the palette, unless
-+ * RGB_TO_GRAY will do the transform.
-+ */
-+ (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
-+ png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr);
-+#endif
-+
-+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
-+ (png_ptr->transformations & PNG_COMPOSE) != 0 &&
-+ (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-+ row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-+ png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-+ 0 /* at_start == false, because SWAP_ALPHA happens later */);
-+#endif
-+
-+#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-+ if ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
-+ (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-+ png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);
-+#endif
-+
-+#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
-+ png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-+ /* There is no harm in doing both of these because only one has any effect,
-+ * by putting the 'scale' option first if the app asks for scale (either by
-+ * calling the API or in a TRANSFORM flag) this is what happens.
-+ */
-+ if ((png_ptr->transformations & PNG_16_TO_8) != 0)
-+ png_do_chop(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_QUANTIZE_SUPPORTED
-+ if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
-+ {
-+ png_do_quantize(row_info, png_ptr->row_buf + 1,
-+ png_ptr->palette_lookup, png_ptr->quantize_index);
-+
-+ if (row_info->rowbytes == 0)
-+ png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-+ }
-+#endif /* READ_QUANTIZE */
-+
-+#ifdef PNG_READ_EXPAND_16_SUPPORTED
-+ /* Do the expansion now, after all the arithmetic has been done. Notice
-+ * that previous transformations can handle the PNG_EXPAND_16 flag if this
-+ * is efficient (particularly true in the case of gamma correction, where
-+ * better accuracy results faster!)
-+ */
-+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
-+ png_do_expand_16(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-+ /* NOTE: moved here in 1.5.4 (from much later in this list.) */
-+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
-+ (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) != 0)
-+ png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_INVERT_SUPPORTED
-+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
-+ png_do_invert(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
-+ png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_SHIFT_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
-+ png_do_unshift(row_info, png_ptr->row_buf + 1,
-+ &(png_ptr->shift));
-+#endif
-+
-+#ifdef PNG_READ_PACK_SUPPORTED
-+ if ((png_ptr->transformations & PNG_PACK) != 0)
-+ png_do_unpack(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+ /* Added at libpng-1.5.10 */
-+ if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
-+ png_ptr->num_palette_max >= 0)
-+ png_do_check_palette_indexes(png_ptr, row_info);
-+#endif
-+
-+#ifdef PNG_READ_BGR_SUPPORTED
-+ if ((png_ptr->transformations & PNG_BGR) != 0)
-+ png_do_bgr(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_PACKSWAP_SUPPORTED
-+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-+ png_do_packswap(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_FILLER_SUPPORTED
-+ if ((png_ptr->transformations & PNG_FILLER) != 0)
-+ png_do_read_filler(row_info, png_ptr->row_buf + 1,
-+ (png_uint_32)png_ptr->filler, png_ptr->flags);
-+#endif
-+
-+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
-+ png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_READ_16BIT_SUPPORTED
-+#ifdef PNG_READ_SWAP_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
-+ png_do_swap(row_info, png_ptr->row_buf + 1);
-+#endif
-+#endif
-+
-+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
-+ {
-+ if (png_ptr->read_user_transform_fn != NULL)
-+ (*(png_ptr->read_user_transform_fn)) /* User read transform function */
-+ (png_ptr, /* png_ptr */
-+ row_info, /* row_info: */
-+ /* png_uint_32 width; width of row */
-+ /* png_size_t rowbytes; number of bytes in row */
-+ /* png_byte color_type; color type of pixels */
-+ /* png_byte bit_depth; bit depth of samples */
-+ /* png_byte channels; number of channels (1-4) */
-+ /* png_byte pixel_depth; bits per pixel (depth*channels) */
-+ png_ptr->row_buf + 1); /* start of pixel data for row */
-+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-+ if (png_ptr->user_transform_depth != 0)
-+ row_info->bit_depth = png_ptr->user_transform_depth;
-+
-+ if (png_ptr->user_transform_channels != 0)
-+ row_info->channels = png_ptr->user_transform_channels;
-+#endif
-+ row_info->pixel_depth = (png_byte)(row_info->bit_depth *
-+ row_info->channels);
-+
-+ row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width);
-+ }
-+#endif
- }
--#endif /* PNG_MNG_FEATURES_SUPPORTED */
--#endif /* PNG_READ_SUPPORTED */
-+
-+#endif /* READ_TRANSFORMS */
-+#endif /* READ */
---- ./jdk/src/share/native/sun/awt/libpng/pngrutil.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngrutil.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -46,10 +46,8 @@
-
- #ifdef PNG_READ_SUPPORTED
-
--#define png_strtod(p,a,b) strtod(a,b)
--
- png_uint_32 PNGAPI
--png_get_uint_31(png_structp png_ptr, png_const_bytep buf)
-+png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
- {
- png_uint_32 uval = png_get_uint_32(buf);
-
-@@ -68,7 +66,7 @@
- #define PNG_FIXED_ERROR (-1)
-
- static png_fixed_point /* PRIVATE */
--png_get_fixed_point(png_structp png_ptr, png_const_bytep buf)
-+png_get_fixed_point(png_structrp png_ptr, png_const_bytep buf)
- {
- png_uint_32 uval = png_get_uint_32(buf);
-
-@@ -115,10 +113,10 @@
- png_get_int_32)(png_const_bytep buf)
- {
- png_uint_32 uval = png_get_uint_32(buf);
-- if ((uval & 0x80000000L) == 0) /* non-negative */
-+ if ((uval & 0x80000000) == 0) /* non-negative */
- return uval;
-
-- uval = (uval ^ 0xffffffffL) + 1; /* 2's complement: -x = ~x+1 */
-+ uval = (uval ^ 0xffffffff) + 1; /* 2's complement: -x = ~x+1 */
- return -(png_int_32)uval;
- }
-
-@@ -138,11 +136,11 @@
- return (png_uint_16)val;
- }
-
--#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */
-+#endif /* READ_INT_FUNCTIONS */
-
- /* Read and check the PNG file signature */
- void /* PRIVATE */
--png_read_sig(png_structp png_ptr, png_infop info_ptr)
-+png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
- {
- png_size_t num_checked, num_to_check;
-
-@@ -161,7 +159,7 @@
- png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
- png_ptr->sig_bytes = 8;
-
-- if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-+ if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
- {
- if (num_checked < 4 &&
- png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-@@ -177,7 +175,7 @@
- * Put the type name into png_ptr->chunk_name, and return the length.
- */
- png_uint_32 /* PRIVATE */
--png_read_chunk_header(png_structp png_ptr)
-+png_read_chunk_header(png_structrp png_ptr)
- {
- png_byte buf[8];
- png_uint_32 length;
-@@ -193,14 +191,14 @@
- length = png_get_uint_31(png_ptr, buf);
-
- /* Put the chunk name into png_ptr->chunk_name. */
-- png_memcpy(png_ptr->chunk_name, buf + 4, 4);
--
-- png_debug2(0, "Reading %s chunk, length = %u",
-- png_ptr->chunk_name, length);
-+ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
-+
-+ png_debug2(0, "Reading %lx chunk, length = %lu",
-+ (unsigned long)png_ptr->chunk_name, (unsigned long)length);
-
- /* Reset the crc and run it over the chunk name. */
- png_reset_crc(png_ptr);
-- png_calculate_crc(png_ptr, png_ptr->chunk_name, 4);
-+ png_calculate_crc(png_ptr, buf + 4, 4);
-
- /* Check to see if chunk name is valid. */
- png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-@@ -214,7 +212,7 @@
-
- /* Read data, and (optionally) run it through the CRC. */
- void /* PRIVATE */
--png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
-+png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 length)
- {
- if (png_ptr == NULL)
- return;
-@@ -224,41 +222,40 @@
- }
-
- /* Optionally skip data and then check the CRC. Depending on whether we
-- * are reading a ancillary or critical chunk, and how the program has set
-+ * are reading an ancillary or critical chunk, and how the program has set
- * things up, we may calculate the CRC on the data and print a message.
- * Returns '1' if there was a CRC error, '0' otherwise.
- */
- int /* PRIVATE */
--png_crc_finish(png_structp png_ptr, png_uint_32 skip)
-+png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
- {
-- png_size_t i;
-- png_size_t istop = png_ptr->zbuf_size;
--
-- for (i = (png_size_t)skip; i > istop; i -= istop)
-+ /* The size of the local buffer for inflate is a good guess as to a
-+ * reasonable size to use for buffering reads from the application.
-+ */
-+ while (skip > 0)
- {
-- png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-+ png_uint_32 len;
-+ png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
-+
-+ len = (sizeof tmpbuf);
-+ if (len > skip)
-+ len = skip;
-+ skip -= len;
-+
-+ png_crc_read(png_ptr, tmpbuf, len);
- }
-
-- if (i)
-+ if (png_crc_error(png_ptr) != 0)
- {
-- png_crc_read(png_ptr, png_ptr->zbuf, i);
-- }
--
-- if (png_crc_error(png_ptr))
-- {
-- if (((png_ptr->chunk_name[0] & 0x20) && /* Ancillary */
-- !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
-- (!(png_ptr->chunk_name[0] & 0x20) && /* Critical */
-- (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)))
-+ if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
-+ (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
-+ (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
- {
- png_chunk_warning(png_ptr, "CRC error");
- }
-
- else
-- {
-- png_chunk_benign_error(png_ptr, "CRC error");
-- return (0);
-- }
-+ png_chunk_error(png_ptr, "CRC error");
-
- return (1);
- }
-@@ -270,22 +267,22 @@
- * the data it has read thus far.
- */
- int /* PRIVATE */
--png_crc_error(png_structp png_ptr)
-+png_crc_error(png_structrp png_ptr)
- {
- png_byte crc_bytes[4];
- png_uint_32 crc;
- int need_crc = 1;
-
-- if (png_ptr->chunk_name[0] & 0x20) /* ancillary */
-+ if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
- {
- if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
- (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
- need_crc = 0;
- }
-
-- else /* critical */
-+ else /* critical */
- {
-- if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
-+ if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
- need_crc = 0;
- }
-
-@@ -296,7 +293,7 @@
- /* The chunk CRC must be serialized in a single I/O call. */
- png_read_data(png_ptr, crc_bytes, 4);
-
-- if (need_crc)
-+ if (need_crc != 0)
- {
- crc = png_get_uint_32(crc_bytes);
- return ((int)(crc != png_ptr->crc));
-@@ -306,252 +303,522 @@
- return (0);
- }
-
-+#if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
-+ defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\
-+ defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\
-+ defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)
-+/* Manage the read buffer; this simply reallocates the buffer if it is not small
-+ * enough (or if it is not allocated). The routine returns a pointer to the
-+ * buffer; if an error occurs and 'warn' is set the routine returns NULL, else
-+ * it will call png_error (via png_malloc) on failure. (warn == 2 means
-+ * 'silent').
-+ */
-+static png_bytep
-+png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
-+{
-+ png_bytep buffer = png_ptr->read_buffer;
-+
-+ if (buffer != NULL && new_size > png_ptr->read_buffer_size)
-+ {
-+ png_ptr->read_buffer = NULL;
-+ png_ptr->read_buffer = NULL;
-+ png_ptr->read_buffer_size = 0;
-+ png_free(png_ptr, buffer);
-+ buffer = NULL;
-+ }
-+
-+ if (buffer == NULL)
-+ {
-+ buffer = png_voidcast(png_bytep, png_malloc_base(png_ptr, new_size));
-+
-+ if (buffer != NULL)
-+ {
-+ png_ptr->read_buffer = buffer;
-+ png_ptr->read_buffer_size = new_size;
-+ }
-+
-+ else if (warn < 2) /* else silent */
-+ {
-+ if (warn != 0)
-+ png_chunk_warning(png_ptr, "insufficient memory to read chunk");
-+
-+ else
-+ png_chunk_error(png_ptr, "insufficient memory to read chunk");
-+ }
-+ }
-+
-+ return buffer;
-+}
-+#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
-+
-+/* png_inflate_claim: claim the zstream for some nefarious purpose that involves
-+ * decompression. Returns Z_OK on success, else a zlib error code. It checks
-+ * the owner but, in final release builds, just issues a warning if some other
-+ * chunk apparently owns the stream. Prior to release it does a png_error.
-+ */
-+static int
-+png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
-+{
-+ if (png_ptr->zowner != 0)
-+ {
-+ char msg[64];
-+
-+ PNG_STRING_FROM_CHUNK(msg, png_ptr->zowner);
-+ /* So the message that results is "<chunk> using zstream"; this is an
-+ * internal error, but is very useful for debugging. i18n requirements
-+ * are minimal.
-+ */
-+ (void)png_safecat(msg, (sizeof msg), 4, " using zstream");
-+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
-+ png_chunk_warning(png_ptr, msg);
-+ png_ptr->zowner = 0;
-+#else
-+ png_chunk_error(png_ptr, msg);
-+#endif
-+ }
-+
-+ /* Implementation note: unlike 'png_deflate_claim' this internal function
-+ * does not take the size of the data as an argument. Some efficiency could
-+ * be gained by using this when it is known *if* the zlib stream itself does
-+ * not record the number; however, this is an illusion: the original writer
-+ * of the PNG may have selected a lower window size, and we really must
-+ * follow that because, for systems with with limited capabilities, we
-+ * would otherwise reject the application's attempts to use a smaller window
-+ * size (zlib doesn't have an interface to say "this or lower"!).
-+ *
-+ * inflateReset2 was added to zlib 1.2.4; before this the window could not be
-+ * reset, therefore it is necessary to always allocate the maximum window
-+ * size with earlier zlibs just in case later compressed chunks need it.
-+ */
-+ {
-+ int ret; /* zlib return code */
-+#if PNG_ZLIB_VERNUM >= 0x1240
-+
-+# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)
-+ int window_bits;
-+
-+ if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) ==
-+ PNG_OPTION_ON)
-+ window_bits = 15;
-+
-+ else
-+ window_bits = 0;
-+# else
-+# define window_bits 0
-+# endif
-+#endif
-+
-+ /* Set this for safety, just in case the previous owner left pointers to
-+ * memory allocations.
-+ */
-+ png_ptr->zstream.next_in = NULL;
-+ png_ptr->zstream.avail_in = 0;
-+ png_ptr->zstream.next_out = NULL;
-+ png_ptr->zstream.avail_out = 0;
-+
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
-+ {
-+#if PNG_ZLIB_VERNUM < 0x1240
-+ ret = inflateReset(&png_ptr->zstream);
-+#else
-+ ret = inflateReset2(&png_ptr->zstream, window_bits);
-+#endif
-+ }
-+
-+ else
-+ {
-+#if PNG_ZLIB_VERNUM < 0x1240
-+ ret = inflateInit(&png_ptr->zstream);
-+#else
-+ ret = inflateInit2(&png_ptr->zstream, window_bits);
-+#endif
-+
-+ if (ret == Z_OK)
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
-+ }
-+
-+ if (ret == Z_OK)
-+ png_ptr->zowner = owner;
-+
-+ else
-+ png_zstream_error(png_ptr, ret);
-+
-+ return ret;
-+ }
-+
-+#ifdef window_bits
-+# undef window_bits
-+#endif
-+}
-+
- #ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
--static png_size_t
--png_inflate(png_structp png_ptr, png_bytep data, png_size_t size,
-- png_bytep output, png_size_t output_size)
-+/* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to
-+ * allow the caller to do multiple calls if required. If the 'finish' flag is
-+ * set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must
-+ * be returned or there has been a problem, otherwise Z_SYNC_FLUSH is used and
-+ * Z_OK or Z_STREAM_END will be returned on success.
-+ *
-+ * The input and output sizes are updated to the actual amounts of data consumed
-+ * or written, not the amount available (as in a z_stream). The data pointers
-+ * are not changed, so the next input is (data+input_size) and the next
-+ * available output is (output+output_size).
-+ */
-+static int
-+png_inflate(png_structrp png_ptr, png_uint_32 owner, int finish,
-+ /* INPUT: */ png_const_bytep input, png_uint_32p input_size_ptr,
-+ /* OUTPUT: */ png_bytep output, png_alloc_size_t *output_size_ptr)
- {
-- png_size_t count = 0;
--
-- /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't
-- * even necessarily handle 65536 bytes) because the type uInt is "16 bits or
-- * more". Consequently it is necessary to chunk the input to zlib. This
-- * code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value
-- * that can be stored in a uInt.) It is possible to set ZLIB_IO_MAX to a
-- * lower value in pngpriv.h and this may sometimes have a performance
-- * advantage, because it forces access of the input data to be separated from
-- * at least some of the use by some period of time.
-- */
-- png_ptr->zstream.next_in = data;
-- /* avail_in is set below from 'size' */
-- png_ptr->zstream.avail_in = 0;
--
-- while (1)
-+ if (png_ptr->zowner == owner) /* Else not claimed */
- {
-- int ret, avail;
--
-- /* The setting of 'avail_in' used to be outside the loop, by setting it
-- * inside it is possible to chunk the input to zlib and simply rely on
-- * zlib to advance the 'next_in' pointer. This allows arbitrary amounts o
-- * data to be passed through zlib at the unavoidable cost of requiring a
-- * window save (memcpy of up to 32768 output bytes) every ZLIB_IO_MAX
-- * input bytes.
-+ int ret;
-+ png_alloc_size_t avail_out = *output_size_ptr;
-+ png_uint_32 avail_in = *input_size_ptr;
-+
-+ /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it
-+ * can't even necessarily handle 65536 bytes) because the type uInt is
-+ * "16 bits or more". Consequently it is necessary to chunk the input to
-+ * zlib. This code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the
-+ * maximum value that can be stored in a uInt.) It is possible to set
-+ * ZLIB_IO_MAX to a lower value in pngpriv.h and this may sometimes have
-+ * a performance advantage, because it reduces the amount of data accessed
-+ * at each step and that may give the OS more time to page it in.
- */
-- if (png_ptr->zstream.avail_in == 0 && size > 0)
-+ png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);
-+ /* avail_in and avail_out are set below from 'size' */
-+ png_ptr->zstream.avail_in = 0;
-+ png_ptr->zstream.avail_out = 0;
-+
-+ /* Read directly into the output if it is available (this is set to
-+ * a local buffer below if output is NULL).
-+ */
-+ if (output != NULL)
-+ png_ptr->zstream.next_out = output;
-+
-+ do
- {
-- if (size <= ZLIB_IO_MAX)
-+ uInt avail;
-+ Byte local_buffer[PNG_INFLATE_BUF_SIZE];
-+
-+ /* zlib INPUT BUFFER */
-+ /* The setting of 'avail_in' used to be outside the loop; by setting it
-+ * inside it is possible to chunk the input to zlib and simply rely on
-+ * zlib to advance the 'next_in' pointer. This allows arbitrary
-+ * amounts of data to be passed through zlib at the unavoidable cost of
-+ * requiring a window save (memcpy of up to 32768 output bytes)
-+ * every ZLIB_IO_MAX input bytes.
-+ */
-+ avail_in += png_ptr->zstream.avail_in; /* not consumed last time */
-+
-+ avail = ZLIB_IO_MAX;
-+
-+ if (avail_in < avail)
-+ avail = (uInt)avail_in; /* safe: < than ZLIB_IO_MAX */
-+
-+ avail_in -= avail;
-+ png_ptr->zstream.avail_in = avail;
-+
-+ /* zlib OUTPUT BUFFER */
-+ avail_out += png_ptr->zstream.avail_out; /* not written last time */
-+
-+ avail = ZLIB_IO_MAX; /* maximum zlib can process */
-+
-+ if (output == NULL)
- {
-- /* The value is less than ZLIB_IO_MAX so the cast is safe: */
-- png_ptr->zstream.avail_in = (uInt)size;
-- size = 0;
-+ /* Reset the output buffer each time round if output is NULL and
-+ * make available the full buffer, up to 'remaining_space'
-+ */
-+ png_ptr->zstream.next_out = local_buffer;
-+ if ((sizeof local_buffer) < avail)
-+ avail = (sizeof local_buffer);
- }
-
-- else
-- {
-- png_ptr->zstream.avail_in = ZLIB_IO_MAX;
-- size -= ZLIB_IO_MAX;
-- }
-- }
--
-- /* Reset the output buffer each time round - we empty it
-- * after every inflate call.
-+ if (avail_out < avail)
-+ avail = (uInt)avail_out; /* safe: < ZLIB_IO_MAX */
-+
-+ png_ptr->zstream.avail_out = avail;
-+ avail_out -= avail;
-+
-+ /* zlib inflate call */
-+ /* In fact 'avail_out' may be 0 at this point, that happens at the end
-+ * of the read when the final LZ end code was not passed at the end of
-+ * the previous chunk of input data. Tell zlib if we have reached the
-+ * end of the output buffer.
-+ */
-+ ret = inflate(&png_ptr->zstream, avail_out > 0 ? Z_NO_FLUSH :
-+ (finish ? Z_FINISH : Z_SYNC_FLUSH));
-+ } while (ret == Z_OK);
-+
-+ /* For safety kill the local buffer pointer now */
-+ if (output == NULL)
-+ png_ptr->zstream.next_out = NULL;
-+
-+ /* Claw back the 'size' and 'remaining_space' byte counts. */
-+ avail_in += png_ptr->zstream.avail_in;
-+ avail_out += png_ptr->zstream.avail_out;
-+
-+ /* Update the input and output sizes; the updated values are the amount
-+ * consumed or written, effectively the inverse of what zlib uses.
- */
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = png_ptr->zbuf_size;
--
-- ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
-- avail = png_ptr->zbuf_size - png_ptr->zstream.avail_out;
--
-- /* First copy/count any new output - but only if we didn't
-- * get an error code.
-+ if (avail_out > 0)
-+ *output_size_ptr -= avail_out;
-+
-+ if (avail_in > 0)
-+ *input_size_ptr -= avail_in;
-+
-+ /* Ensure png_ptr->zstream.msg is set (even in the success case!) */
-+ png_zstream_error(png_ptr, ret);
-+ return ret;
-+ }
-+
-+ else
-+ {
-+ /* This is a bad internal error. The recovery assigns to the zstream msg
-+ * pointer, which is not owned by the caller, but this is safe; it's only
-+ * used on errors!
- */
-- if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0)
-- {
-- png_size_t space = avail; /* > 0, see above */
--
-- if (output != 0 && output_size > count)
-- {
-- png_size_t copy = output_size - count;
--
-- if (space < copy)
-- copy = space;
--
-- png_memcpy(output + count, png_ptr->zbuf, copy);
-- }
-- count += space;
-- }
--
-- if (ret == Z_OK)
-- continue;
--
-- /* Termination conditions - always reset the zstream, it
-- * must be left in inflateInit state.
-- */
-- png_ptr->zstream.avail_in = 0;
-- inflateReset(&png_ptr->zstream);
--
-- if (ret == Z_STREAM_END)
-- return count; /* NOTE: may be zero. */
--
-- /* Now handle the error codes - the API always returns 0
-- * and the error message is dumped into the uncompressed
-- * buffer if available.
-- */
--# ifdef PNG_WARNINGS_SUPPORTED
-- {
-- png_const_charp msg;
--
-- if (png_ptr->zstream.msg != 0)
-- msg = png_ptr->zstream.msg;
--
-- else switch (ret)
-- {
-- case Z_BUF_ERROR:
-- msg = "Buffer error in compressed datastream";
-- break;
--
-- case Z_DATA_ERROR:
-- msg = "Data error in compressed datastream";
-- break;
--
-- default:
-- msg = "Incomplete compressed datastream";
-- break;
-- }
--
-- png_chunk_warning(png_ptr, msg);
-- }
--# endif
--
-- /* 0 means an error - notice that this code simply ignores
-- * zero length compressed chunks as a result.
-- */
-- return 0;
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");
-+ return Z_STREAM_ERROR;
- }
- }
-
- /*
-- * Decompress trailing data in a chunk. The assumption is that chunkdata
-+ * Decompress trailing data in a chunk. The assumption is that read_buffer
- * points at an allocated area holding the contents of a chunk with a
- * trailing compressed part. What we get back is an allocated area
- * holding the original prefix part and an uncompressed version of the
- * trailing part (the malloc area passed in is freed).
- */
-+static int
-+png_decompress_chunk(png_structrp png_ptr,
-+ png_uint_32 chunklength, png_uint_32 prefix_size,
-+ png_alloc_size_t *newlength /* must be initialized to the maximum! */,
-+ int terminate /*add a '\0' to the end of the uncompressed data*/)
-+{
-+ /* TODO: implement different limits for different types of chunk.
-+ *
-+ * The caller supplies *newlength set to the maximum length of the
-+ * uncompressed data, but this routine allocates space for the prefix and
-+ * maybe a '\0' terminator too. We have to assume that 'prefix_size' is
-+ * limited only by the maximum chunk size.
-+ */
-+ png_alloc_size_t limit = PNG_SIZE_MAX;
-+
-+# ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-+ if (png_ptr->user_chunk_malloc_max > 0 &&
-+ png_ptr->user_chunk_malloc_max < limit)
-+ limit = png_ptr->user_chunk_malloc_max;
-+# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-+ if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-+ limit = PNG_USER_CHUNK_MALLOC_MAX;
-+# endif
-+
-+ if (limit >= prefix_size + (terminate != 0))
-+ {
-+ int ret;
-+
-+ limit -= prefix_size + (terminate != 0);
-+
-+ if (limit < *newlength)
-+ *newlength = limit;
-+
-+ /* Now try to claim the stream. */
-+ ret = png_inflate_claim(png_ptr, png_ptr->chunk_name);
-+
-+ if (ret == Z_OK)
-+ {
-+ png_uint_32 lzsize = chunklength - prefix_size;
-+
-+ ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
-+ /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,
-+ /* output: */ NULL, newlength);
-+
-+ if (ret == Z_STREAM_END)
-+ {
-+ /* Use 'inflateReset' here, not 'inflateReset2' because this
-+ * preserves the previously decided window size (otherwise it would
-+ * be necessary to store the previous window size.) In practice
-+ * this doesn't matter anyway, because png_inflate will call inflate
-+ * with Z_FINISH in almost all cases, so the window will not be
-+ * maintained.
-+ */
-+ if (inflateReset(&png_ptr->zstream) == Z_OK)
-+ {
-+ /* Because of the limit checks above we know that the new,
-+ * expanded, size will fit in a size_t (let alone an
-+ * png_alloc_size_t). Use png_malloc_base here to avoid an
-+ * extra OOM message.
-+ */
-+ png_alloc_size_t new_size = *newlength;
-+ png_alloc_size_t buffer_size = prefix_size + new_size +
-+ (terminate != 0);
-+ png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,
-+ buffer_size));
-+
-+ if (text != NULL)
-+ {
-+ ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
-+ png_ptr->read_buffer + prefix_size, &lzsize,
-+ text + prefix_size, newlength);
-+
-+ if (ret == Z_STREAM_END)
-+ {
-+ if (new_size == *newlength)
-+ {
-+ if (terminate != 0)
-+ text[prefix_size + *newlength] = 0;
-+
-+ if (prefix_size > 0)
-+ memcpy(text, png_ptr->read_buffer, prefix_size);
-+
-+ {
-+ png_bytep old_ptr = png_ptr->read_buffer;
-+
-+ png_ptr->read_buffer = text;
-+ png_ptr->read_buffer_size = buffer_size;
-+ text = old_ptr; /* freed below */
-+ }
-+ }
-+
-+ else
-+ {
-+ /* The size changed on the second read, there can be no
-+ * guarantee that anything is correct at this point.
-+ * The 'msg' pointer has been set to "unexpected end of
-+ * LZ stream", which is fine, but return an error code
-+ * that the caller won't accept.
-+ */
-+ ret = PNG_UNEXPECTED_ZLIB_RETURN;
-+ }
-+ }
-+
-+ else if (ret == Z_OK)
-+ ret = PNG_UNEXPECTED_ZLIB_RETURN; /* for safety */
-+
-+ /* Free the text pointer (this is the old read_buffer on
-+ * success)
-+ */
-+ png_free(png_ptr, text);
-+ text = NULL;
-+
-+ /* This really is very benign, but it's still an error because
-+ * the extra space may otherwise be used as a Trojan Horse.
-+ */
-+ if (ret == Z_STREAM_END &&
-+ chunklength - prefix_size != lzsize)
-+ png_chunk_benign_error(png_ptr, "extra compressed data");
-+ }
-+
-+ else
-+ {
-+ /* Out of memory allocating the buffer */
-+ ret = Z_MEM_ERROR;
-+ png_zstream_error(png_ptr, Z_MEM_ERROR);
-+ }
-+ }
-+
-+ else
-+ {
-+ /* inflateReset failed, store the error message */
-+ png_zstream_error(png_ptr, ret);
-+
-+ if (ret == Z_STREAM_END)
-+ ret = PNG_UNEXPECTED_ZLIB_RETURN;
-+ }
-+ }
-+
-+ else if (ret == Z_OK)
-+ ret = PNG_UNEXPECTED_ZLIB_RETURN;
-+
-+ /* Release the claimed stream */
-+ png_ptr->zowner = 0;
-+ }
-+
-+ else /* the claim failed */ if (ret == Z_STREAM_END) /* impossible! */
-+ ret = PNG_UNEXPECTED_ZLIB_RETURN;
-+
-+ return ret;
-+ }
-+
-+ else
-+ {
-+ /* Application/configuration limits exceeded */
-+ png_zstream_error(png_ptr, Z_MEM_ERROR);
-+ return Z_MEM_ERROR;
-+ }
-+}
-+#endif /* READ_COMPRESSED_TEXT */
-+
-+#ifdef PNG_READ_iCCP_SUPPORTED
-+/* Perform a partial read and decompress, producing 'avail_out' bytes and
-+ * reading from the current chunk as required.
-+ */
-+static int
-+png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
-+ png_uint_32p chunk_bytes, png_bytep next_out, png_alloc_size_t *out_size,
-+ int finish)
-+{
-+ if (png_ptr->zowner == png_ptr->chunk_name)
-+ {
-+ int ret;
-+
-+ /* next_in and avail_in must have been initialized by the caller. */
-+ png_ptr->zstream.next_out = next_out;
-+ png_ptr->zstream.avail_out = 0; /* set in the loop */
-+
-+ do
-+ {
-+ if (png_ptr->zstream.avail_in == 0)
-+ {
-+ if (read_size > *chunk_bytes)
-+ read_size = (uInt)*chunk_bytes;
-+ *chunk_bytes -= read_size;
-+
-+ if (read_size > 0)
-+ png_crc_read(png_ptr, read_buffer, read_size);
-+
-+ png_ptr->zstream.next_in = read_buffer;
-+ png_ptr->zstream.avail_in = read_size;
-+ }
-+
-+ if (png_ptr->zstream.avail_out == 0)
-+ {
-+ uInt avail = ZLIB_IO_MAX;
-+ if (avail > *out_size)
-+ avail = (uInt)*out_size;
-+ *out_size -= avail;
-+
-+ png_ptr->zstream.avail_out = avail;
-+ }
-+
-+ /* Use Z_SYNC_FLUSH when there is no more chunk data to ensure that all
-+ * the available output is produced; this allows reading of truncated
-+ * streams.
-+ */
-+ ret = inflate(&png_ptr->zstream,
-+ *chunk_bytes > 0 ? Z_NO_FLUSH : (finish ? Z_FINISH : Z_SYNC_FLUSH));
-+ }
-+ while (ret == Z_OK && (*out_size > 0 || png_ptr->zstream.avail_out > 0));
-+
-+ *out_size += png_ptr->zstream.avail_out;
-+ png_ptr->zstream.avail_out = 0; /* Should not be required, but is safe */
-+
-+ /* Ensure the error message pointer is always set: */
-+ png_zstream_error(png_ptr, ret);
-+ return ret;
-+ }
-+
-+ else
-+ {
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");
-+ return Z_STREAM_ERROR;
-+ }
-+}
-+#endif
-+
-+/* Read and check the IDHR chunk */
-+
- void /* PRIVATE */
--png_decompress_chunk(png_structp png_ptr, int comp_type,
-- png_size_t chunklength,
-- png_size_t prefix_size, png_size_t *newlength)
--{
-- /* The caller should guarantee this */
-- if (prefix_size > chunklength)
-- {
-- /* The recovery is to delete the chunk. */
-- png_warning(png_ptr, "invalid chunklength");
-- prefix_size = 0; /* To delete everything */
-- }
--
-- else if (comp_type == PNG_COMPRESSION_TYPE_BASE)
-- {
-- png_size_t expanded_size = png_inflate(png_ptr,
-- (png_bytep)(png_ptr->chunkdata + prefix_size),
-- chunklength - prefix_size,
-- 0, /* output */
-- 0); /* output size */
--
-- /* Now check the limits on this chunk - if the limit fails the
-- * compressed data will be removed, the prefix will remain.
-- */
--#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-- if (png_ptr->user_chunk_malloc_max &&
-- (prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
--#else
--# ifdef PNG_USER_CHUNK_MALLOC_MAX
-- if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
-- prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
--# endif
--#endif
-- png_warning(png_ptr, "Exceeded size limit while expanding chunk");
--
-- /* If the size is zero either there was an error and a message
-- * has already been output (warning) or the size really is zero
-- * and we have nothing to do - the code will exit through the
-- * error case below.
-- */
--#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \
-- defined(PNG_USER_CHUNK_MALLOC_MAX)
-- else if (expanded_size > 0)
--#else
-- if (expanded_size > 0)
--#endif
-- {
-- /* Success (maybe) - really uncompress the chunk. */
-- png_size_t new_size = 0;
-- png_charp text = png_malloc_warn(png_ptr,
-- prefix_size + expanded_size + 1);
--
-- if (text != NULL)
-- {
-- png_memcpy(text, png_ptr->chunkdata, prefix_size);
-- new_size = png_inflate(png_ptr,
-- (png_bytep)(png_ptr->chunkdata + prefix_size),
-- chunklength - prefix_size,
-- (png_bytep)(text + prefix_size), expanded_size);
-- text[prefix_size + expanded_size] = 0; /* just in case */
--
-- if (new_size == expanded_size)
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = text;
-- *newlength = prefix_size + expanded_size;
-- return; /* The success return! */
-- }
--
-- png_warning(png_ptr, "png_inflate logic error");
-- png_free(png_ptr, text);
-- }
--
-- else
-- png_warning(png_ptr, "Not enough memory to decompress chunk");
-- }
-- }
--
-- else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
-- {
-- PNG_WARNING_PARAMETERS(p)
-- png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, comp_type);
-- png_formatted_warning(png_ptr, p, "Unknown zTXt compression type @1");
--
-- /* The recovery is to simply drop the data. */
-- }
--
-- /* Generic error return - leave the prefix, delete the compressed
-- * data, reallocate the chunkdata to remove the potentially large
-- * amount of compressed data.
-- */
-- {
-- png_charp text = png_malloc_warn(png_ptr, prefix_size + 1);
--
-- if (text != NULL)
-- {
-- if (prefix_size > 0)
-- png_memcpy(text, png_ptr->chunkdata, prefix_size);
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = text;
--
-- /* This is an extra zero in the 'uncompressed' part. */
-- *(png_ptr->chunkdata + prefix_size) = 0x00;
-- }
-- /* Ignore a malloc error here - it is safe. */
-- }
--
-- *newlength = prefix_size;
--}
--#endif /* PNG_READ_COMPRESSED_TEXT_SUPPORTED */
--
--/* Read and check the IDHR chunk */
--void /* PRIVATE */
--png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_byte buf[13];
- png_uint_32 width, height;
-@@ -560,12 +827,12 @@
-
- png_debug(1, "in png_handle_IHDR");
-
-- if (png_ptr->mode & PNG_HAVE_IHDR)
-- png_error(png_ptr, "Out of place IHDR");
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)
-+ png_chunk_error(png_ptr, "out of place");
-
- /* Check the length */
- if (length != 13)
-- png_error(png_ptr, "Invalid IHDR chunk");
-+ png_chunk_error(png_ptr, "invalid");
-
- png_ptr->mode |= PNG_HAVE_IHDR;
-
-@@ -614,8 +881,7 @@
- }
-
- /* Set up other useful info */
-- png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
-- png_ptr->channels);
-+ png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels);
- png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
- png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
- png_debug1(3, "channels = %d", png_ptr->channels);
-@@ -626,7 +892,7 @@
-
- /* Read and check the palette */
- void /* PRIVATE */
--png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_color palette[PNG_MAX_PALETTE_LENGTH];
- int num, i;
-@@ -636,26 +902,33 @@
-
- png_debug(1, "in png_handle_PLTE");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before PLTE");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ /* Moved to before the 'after IDAT' check below because otherwise duplicate
-+ * PLTE chunks are potentially ignored (the spec says there shall not be more
-+ * than one PLTE, the error is not treated as benign, so this check trumps
-+ * the requirement that PLTE appears before IDAT.)
-+ */
-+ else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
-+ png_chunk_error(png_ptr, "duplicate");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid PLTE after IDAT");
-+ /* This is benign because the non-benign error happened before, when an
-+ * IDAT was encountered in a color-mapped image with no PLTE.
-+ */
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (png_ptr->mode & PNG_HAVE_PLTE)
-- png_error(png_ptr, "Duplicate PLTE chunk");
--
- png_ptr->mode |= PNG_HAVE_PLTE;
-
-- if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
- {
-- png_warning(png_ptr,
-- "Ignoring PLTE chunk in grayscale PNG");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");
- return;
- }
-
-@@ -669,19 +942,18 @@
-
- if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
- {
-+ png_crc_finish(png_ptr, length);
-+
- if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-- {
-- png_warning(png_ptr, "Invalid palette chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
-+ png_chunk_benign_error(png_ptr, "invalid");
-
- else
-- {
-- png_error(png_ptr, "Invalid palette chunk");
-- }
-+ png_chunk_error(png_ptr, "invalid");
-+
-+ return;
- }
-
-+ /* The cast is safe because 'length' is less than 3*PNG_MAX_PALETTE_LENGTH */
- num = (int)length / 3;
-
- #ifdef PNG_POINTER_INDEXING_SUPPORTED
-@@ -720,214 +992,196 @@
- }
-
- #ifndef PNG_READ_OPT_PLTE_SUPPORTED
-- else if (png_crc_error(png_ptr)) /* Only if we have a CRC error */
-+ else if (png_crc_error(png_ptr) != 0) /* Only if we have a CRC error */
- {
- /* If we don't want to use the data from an ancillary chunk,
- * we have two options: an error abort, or a warning and we
- * ignore the data in this chunk (which should be OK, since
- * it's considered ancillary for a RGB or RGBA image).
-+ *
-+ * IMPLEMENTATION NOTE: this is only here because png_crc_finish uses the
-+ * chunk type to determine whether to check the ancillary or the critical
-+ * flags.
- */
-- if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
-+ if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)
- {
-- if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
-- {
-- png_chunk_benign_error(png_ptr, "CRC error");
-- }
-+ if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)
-+ return;
-
- else
-- {
-- png_chunk_warning(png_ptr, "CRC error");
-- return;
-- }
-+ png_chunk_error(png_ptr, "CRC error");
- }
-
- /* Otherwise, we (optionally) emit a warning and use the chunk. */
-- else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
-- {
-+ else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)
- png_chunk_warning(png_ptr, "CRC error");
-- }
- }
- #endif
-
-+ /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to its
-+ * own copy of the palette. This has the side effect that when png_start_row
-+ * is called (this happens after any call to png_read_update_info) the
-+ * info_ptr palette gets changed. This is extremely unexpected and
-+ * confusing.
-+ *
-+ * Fix this by not sharing the palette in this way.
-+ */
- png_set_PLTE(png_ptr, info_ptr, palette, num);
-
-+ /* The three chunks, bKGD, hIST and tRNS *must* appear after PLTE and before
-+ * IDAT. Prior to 1.6.0 this was not checked; instead the code merely
-+ * checked the apparent validity of a tRNS chunk inserted before PLTE on a
-+ * palette PNG. 1.6.0 attempts to rigorously follow the standard and
-+ * therefore does a benign error if the erroneous condition is detected *and*
-+ * cancels the tRNS if the benign error returns. The alternative is to
-+ * amend the standard since it would be rather hypocritical of the standards
-+ * maintainers to ignore it.
-+ */
- #ifdef PNG_READ_tRNS_SUPPORTED
-- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ if (png_ptr->num_trans > 0 ||
-+ (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))
- {
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-- {
-- if (png_ptr->num_trans > (png_uint_16)num)
-- {
-- png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
-- png_ptr->num_trans = (png_uint_16)num;
-- }
--
-- if (info_ptr->num_trans > (png_uint_16)num)
-- {
-- png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
-- info_ptr->num_trans = (png_uint_16)num;
-- }
-- }
-+ /* Cancel this because otherwise it would be used if the transforms
-+ * require it. Don't cancel the 'valid' flag because this would prevent
-+ * detection of duplicate chunks.
-+ */
-+ png_ptr->num_trans = 0;
-+
-+ if (info_ptr != NULL)
-+ info_ptr->num_trans = 0;
-+
-+ png_chunk_benign_error(png_ptr, "tRNS must be after");
- }
- #endif
-
-+#ifdef PNG_READ_hIST_SUPPORTED
-+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-+ png_chunk_benign_error(png_ptr, "hIST must be after");
-+#endif
-+
-+#ifdef PNG_READ_bKGD_SUPPORTED
-+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-+ png_chunk_benign_error(png_ptr, "bKGD must be after");
-+#endif
- }
-
- void /* PRIVATE */
--png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_debug(1, "in png_handle_IEND");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
-- {
-- png_error(png_ptr, "No image in file");
-- }
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||
-+ (png_ptr->mode & PNG_HAVE_IDAT) == 0)
-+ png_chunk_error(png_ptr, "out of place");
-
- png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
-
-+ png_crc_finish(png_ptr, length);
-+
- if (length != 0)
-- {
-- png_warning(png_ptr, "Incorrect IEND chunk length");
-- }
--
-- png_crc_finish(png_ptr, length);
--
-- PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
-+ png_chunk_benign_error(png_ptr, "invalid");
-+
-+ PNG_UNUSED(info_ptr)
- }
-
- #ifdef PNG_READ_gAMA_SUPPORTED
- void /* PRIVATE */
--png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_fixed_point igamma;
- png_byte buf[4];
-
- png_debug(1, "in png_handle_gAMA");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before gAMA");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
- {
-- png_warning(png_ptr, "Invalid gAMA after IDAT");
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
-+ return;
-+ }
-+
-+ if (length != 4)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
-+ return;
-+ }
-+
-+ png_crc_read(png_ptr, buf, 4);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
-+ return;
-+
-+ igamma = png_get_fixed_point(NULL, buf);
-+
-+ png_colorspace_set_gamma(png_ptr, &png_ptr->colorspace, igamma);
-+ png_colorspace_sync(png_ptr, info_ptr);
-+}
-+#endif
-+
-+#ifdef PNG_READ_sBIT_SUPPORTED
-+void /* PRIVATE */
-+png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-+{
-+ unsigned int truelen, i;
-+ png_byte sample_depth;
-+ png_byte buf[4];
-+
-+ png_debug(1, "in png_handle_sBIT");
-+
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
-+ return;
-+ }
-+
-+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
-+ return;
-+ }
-+
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ {
-+ truelen = 3;
-+ sample_depth = 8;
-+ }
-+
-+ else
-+ {
-+ truelen = png_ptr->channels;
-+ sample_depth = png_ptr->bit_depth;
-+ }
-+
-+ if (length != truelen || length > 4)
-+ {
-+ png_chunk_benign_error(png_ptr, "invalid");
- png_crc_finish(png_ptr, length);
- return;
- }
-
-- else if (png_ptr->mode & PNG_HAVE_PLTE)
-- /* Should be an error, but we can cope with it */
-- png_warning(png_ptr, "Out of place gAMA chunk");
--
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
--#ifdef PNG_READ_sRGB_SUPPORTED
-- && !(info_ptr->valid & PNG_INFO_sRGB)
--#endif
-- )
-- {
-- png_warning(png_ptr, "Duplicate gAMA chunk");
-- png_crc_finish(png_ptr, length);
-+ buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;
-+ png_crc_read(png_ptr, buf, truelen);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-- }
--
-- if (length != 4)
-- {
-- png_warning(png_ptr, "Incorrect gAMA chunk length");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- png_crc_read(png_ptr, buf, 4);
--
-- if (png_crc_finish(png_ptr, 0))
-- return;
--
-- igamma = png_get_fixed_point(NULL, buf);
--
-- /* Check for zero gamma or an error. */
-- if (igamma <= 0)
-- {
-- png_warning(png_ptr,
-- "Ignoring gAMA chunk with out of range gamma");
--
-- return;
-- }
--
--# ifdef PNG_READ_sRGB_SUPPORTED
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-- {
-- if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
-+
-+ for (i=0; i<truelen; ++i)
-+ if (buf[i] == 0 || buf[i] > sample_depth)
- {
-- PNG_WARNING_PARAMETERS(p)
-- png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, igamma);
-- png_formatted_warning(png_ptr, p,
-- "Ignoring incorrect gAMA value @1 when sRGB is also present");
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-- }
--# endif /* PNG_READ_sRGB_SUPPORTED */
--
--# ifdef PNG_READ_GAMMA_SUPPORTED
-- /* Gamma correction on read is supported. */
-- png_ptr->gamma = igamma;
--# endif
-- /* And set the 'info' structure members. */
-- png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
--}
--#endif
--
--#ifdef PNG_READ_sBIT_SUPPORTED
--void /* PRIVATE */
--png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
--{
-- png_size_t truelen;
-- png_byte buf[4];
--
-- png_debug(1, "in png_handle_sBIT");
--
-- buf[0] = buf[1] = buf[2] = buf[3] = 0;
--
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before sBIT");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-- {
-- png_warning(png_ptr, "Invalid sBIT after IDAT");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- else if (png_ptr->mode & PNG_HAVE_PLTE)
-- {
-- /* Should be an error, but we can cope with it */
-- png_warning(png_ptr, "Out of place sBIT chunk");
-- }
--
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-- {
-- png_warning(png_ptr, "Duplicate sBIT chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-- truelen = 3;
--
-- else
-- truelen = (png_size_t)png_ptr->channels;
--
-- if (length != truelen || length > 4)
-- {
-- png_warning(png_ptr, "Incorrect sBIT chunk length");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- png_crc_read(png_ptr, buf, truelen);
--
-- if (png_crc_finish(png_ptr, 0))
-- return;
--
-- if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-+
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- png_ptr->sig_bit.red = buf[0];
- png_ptr->sig_bit.green = buf[1];
-@@ -950,377 +1204,416 @@
-
- #ifdef PNG_READ_cHRM_SUPPORTED
- void /* PRIVATE */
--png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_byte buf[32];
-- png_fixed_point x_white, y_white, x_red, y_red, x_green, y_green, x_blue,
-- y_blue;
-+ png_xy xy;
-
- png_debug(1, "in png_handle_cHRM");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before cHRM");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
- {
-- png_warning(png_ptr, "Invalid cHRM after IDAT");
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
-+ return;
-+ }
-+
-+ if (length != 32)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
-+ return;
-+ }
-+
-+ png_crc_read(png_ptr, buf, 32);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
-+ return;
-+
-+ xy.whitex = png_get_fixed_point(NULL, buf);
-+ xy.whitey = png_get_fixed_point(NULL, buf + 4);
-+ xy.redx = png_get_fixed_point(NULL, buf + 8);
-+ xy.redy = png_get_fixed_point(NULL, buf + 12);
-+ xy.greenx = png_get_fixed_point(NULL, buf + 16);
-+ xy.greeny = png_get_fixed_point(NULL, buf + 20);
-+ xy.bluex = png_get_fixed_point(NULL, buf + 24);
-+ xy.bluey = png_get_fixed_point(NULL, buf + 28);
-+
-+ if (xy.whitex == PNG_FIXED_ERROR ||
-+ xy.whitey == PNG_FIXED_ERROR ||
-+ xy.redx == PNG_FIXED_ERROR ||
-+ xy.redy == PNG_FIXED_ERROR ||
-+ xy.greenx == PNG_FIXED_ERROR ||
-+ xy.greeny == PNG_FIXED_ERROR ||
-+ xy.bluex == PNG_FIXED_ERROR ||
-+ xy.bluey == PNG_FIXED_ERROR)
-+ {
-+ png_chunk_benign_error(png_ptr, "invalid values");
-+ return;
-+ }
-+
-+ /* If a colorspace error has already been output skip this chunk */
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-+ return;
-+
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)
-+ {
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-+ png_colorspace_sync(png_ptr, info_ptr);
-+ png_chunk_benign_error(png_ptr, "duplicate");
-+ return;
-+ }
-+
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-+ (void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,
-+ 1/*prefer cHRM values*/);
-+ png_colorspace_sync(png_ptr, info_ptr);
-+}
-+#endif
-+
-+#ifdef PNG_READ_sRGB_SUPPORTED
-+void /* PRIVATE */
-+png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-+{
-+ png_byte intent;
-+
-+ png_debug(1, "in png_handle_sRGB");
-+
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
-+ return;
-+ }
-+
-+ if (length != 1)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
-+ return;
-+ }
-+
-+ png_crc_read(png_ptr, &intent, 1);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
-+ return;
-+
-+ /* If a colorspace error has already been output skip this chunk */
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-+ return;
-+
-+ /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-+ * this.
-+ */
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)
-+ {
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-+ png_colorspace_sync(png_ptr, info_ptr);
-+ png_chunk_benign_error(png_ptr, "too many profiles");
-+ return;
-+ }
-+
-+ (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);
-+ png_colorspace_sync(png_ptr, info_ptr);
-+}
-+#endif /* READ_sRGB */
-+
-+#ifdef PNG_READ_iCCP_SUPPORTED
-+void /* PRIVATE */
-+png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-+/* Note: this does not properly handle profiles that are > 64K under DOS */
-+{
-+ png_const_charp errmsg = NULL; /* error message output, or no error */
-+ int finished = 0; /* crc checked */
-+
-+ png_debug(1, "in png_handle_iCCP");
-+
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
-+ return;
-+ }
-+
-+ /* Consistent with all the above colorspace handling an obviously *invalid*
-+ * chunk is just ignored, so does not invalidate the color space. An
-+ * alternative is to set the 'invalid' flags at the start of this routine
-+ * and only clear them in they were not set before and all the tests pass.
-+ * The minimum 'deflate' stream is assumed to be just the 2 byte header and
-+ * 4 byte checksum. The keyword must be at least one character and there is
-+ * a terminator (0) byte and the compression method.
-+ */
-+ if (length < 9)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "too short");
-+ return;
-+ }
-+
-+ /* If a colorspace error has already been output skip this chunk */
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-+ {
- png_crc_finish(png_ptr, length);
- return;
- }
-
-- else if (png_ptr->mode & PNG_HAVE_PLTE)
-- /* Should be an error, but we can cope with it */
-- png_warning(png_ptr, "Missing PLTE before cHRM");
--
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
--# ifdef PNG_READ_sRGB_SUPPORTED
-- && !(info_ptr->valid & PNG_INFO_sRGB)
--# endif
-- )
-+ /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-+ * this.
-+ */
-+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) == 0)
- {
-- png_warning(png_ptr, "Duplicate cHRM chunk");
-+ uInt read_length, keyword_length;
-+ char keyword[81];
-+
-+ /* Find the keyword; the keyword plus separator and compression method
-+ * bytes can be at most 81 characters long.
-+ */
-+ read_length = 81; /* maximum */
-+ if (read_length > length)
-+ read_length = (uInt)length;
-+
-+ png_crc_read(png_ptr, (png_bytep)keyword, read_length);
-+ length -= read_length;
-+
-+ keyword_length = 0;
-+ while (keyword_length < 80 && keyword_length < read_length &&
-+ keyword[keyword_length] != 0)
-+ ++keyword_length;
-+
-+ /* TODO: make the keyword checking common */
-+ if (keyword_length >= 1 && keyword_length <= 79)
-+ {
-+ /* We only understand '0' compression - deflate - so if we get a
-+ * different value we can't safely decode the chunk.
-+ */
-+ if (keyword_length+1 < read_length &&
-+ keyword[keyword_length+1] == PNG_COMPRESSION_TYPE_BASE)
-+ {
-+ read_length -= keyword_length+2;
-+
-+ if (png_inflate_claim(png_ptr, png_iCCP) == Z_OK)
-+ {
-+ Byte profile_header[132];
-+ Byte local_buffer[PNG_INFLATE_BUF_SIZE];
-+ png_alloc_size_t size = (sizeof profile_header);
-+
-+ png_ptr->zstream.next_in = (Bytef*)keyword + (keyword_length+2);
-+ png_ptr->zstream.avail_in = read_length;
-+ (void)png_inflate_read(png_ptr, local_buffer,
-+ (sizeof local_buffer), &length, profile_header, &size,
-+ 0/*finish: don't, because the output is too small*/);
-+
-+ if (size == 0)
-+ {
-+ /* We have the ICC profile header; do the basic header checks.
-+ */
-+ const png_uint_32 profile_length =
-+ png_get_uint_32(profile_header);
-+
-+ if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
-+ keyword, profile_length) != 0)
-+ {
-+ /* The length is apparently ok, so we can check the 132
-+ * byte header.
-+ */
-+ if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
-+ keyword, profile_length, profile_header,
-+ png_ptr->color_type) != 0)
-+ {
-+ /* Now read the tag table; a variable size buffer is
-+ * needed at this point, allocate one for the whole
-+ * profile. The header check has already validated
-+ * that none of these stuff will overflow.
-+ */
-+ const png_uint_32 tag_count = png_get_uint_32(
-+ profile_header+128);
-+ png_bytep profile = png_read_buffer(png_ptr,
-+ profile_length, 2/*silent*/);
-+
-+ if (profile != NULL)
-+ {
-+ memcpy(profile, profile_header,
-+ (sizeof profile_header));
-+
-+ size = 12 * tag_count;
-+
-+ (void)png_inflate_read(png_ptr, local_buffer,
-+ (sizeof local_buffer), &length,
-+ profile + (sizeof profile_header), &size, 0);
-+
-+ /* Still expect a buffer error because we expect
-+ * there to be some tag data!
-+ */
-+ if (size == 0)
-+ {
-+ if (png_icc_check_tag_table(png_ptr,
-+ &png_ptr->colorspace, keyword, profile_length,
-+ profile) != 0)
-+ {
-+ /* The profile has been validated for basic
-+ * security issues, so read the whole thing in.
-+ */
-+ size = profile_length - (sizeof profile_header)
-+ - 12 * tag_count;
-+
-+ (void)png_inflate_read(png_ptr, local_buffer,
-+ (sizeof local_buffer), &length,
-+ profile + (sizeof profile_header) +
-+ 12 * tag_count, &size, 1/*finish*/);
-+
-+ if (length > 0 && !(png_ptr->flags &
-+ PNG_FLAG_BENIGN_ERRORS_WARN))
-+ errmsg = "extra compressed data";
-+
-+ /* But otherwise allow extra data: */
-+ else if (size == 0)
-+ {
-+ if (length > 0)
-+ {
-+ /* This can be handled completely, so
-+ * keep going.
-+ */
-+ png_chunk_warning(png_ptr,
-+ "extra compressed data");
-+ }
-+
-+ png_crc_finish(png_ptr, length);
-+ finished = 1;
-+
-+# ifdef PNG_sRGB_SUPPORTED
-+ /* Check for a match against sRGB */
-+ png_icc_set_sRGB(png_ptr,
-+ &png_ptr->colorspace, profile,
-+ png_ptr->zstream.adler);
-+# endif
-+
-+ /* Steal the profile for info_ptr. */
-+ if (info_ptr != NULL)
-+ {
-+ png_free_data(png_ptr, info_ptr,
-+ PNG_FREE_ICCP, 0);
-+
-+ info_ptr->iccp_name = png_voidcast(char*,
-+ png_malloc_base(png_ptr,
-+ keyword_length+1));
-+ if (info_ptr->iccp_name != NULL)
-+ {
-+ memcpy(info_ptr->iccp_name, keyword,
-+ keyword_length+1);
-+ info_ptr->iccp_proflen =
-+ profile_length;
-+ info_ptr->iccp_profile = profile;
-+ png_ptr->read_buffer = NULL; /*steal*/
-+ info_ptr->free_me |= PNG_FREE_ICCP;
-+ info_ptr->valid |= PNG_INFO_iCCP;
-+ }
-+
-+ else
-+ {
-+ png_ptr->colorspace.flags |=
-+ PNG_COLORSPACE_INVALID;
-+ errmsg = "out of memory";
-+ }
-+ }
-+
-+ /* else the profile remains in the read
-+ * buffer which gets reused for subsequent
-+ * chunks.
-+ */
-+
-+ if (info_ptr != NULL)
-+ png_colorspace_sync(png_ptr, info_ptr);
-+
-+ if (errmsg == NULL)
-+ {
-+ png_ptr->zowner = 0;
-+ return;
-+ }
-+ }
-+
-+ else if (size > 0)
-+ errmsg = "truncated";
-+
-+ else
-+ errmsg = png_ptr->zstream.msg;
-+ }
-+
-+ /* else png_icc_check_tag_table output an error */
-+ }
-+
-+ else /* profile truncated */
-+ errmsg = png_ptr->zstream.msg;
-+ }
-+
-+ else
-+ errmsg = "out of memory";
-+ }
-+
-+ /* else png_icc_check_header output an error */
-+ }
-+
-+ /* else png_icc_check_length output an error */
-+ }
-+
-+ else /* profile truncated */
-+ errmsg = png_ptr->zstream.msg;
-+
-+ /* Release the stream */
-+ png_ptr->zowner = 0;
-+ }
-+
-+ else /* png_inflate_claim failed */
-+ errmsg = png_ptr->zstream.msg;
-+ }
-+
-+ else
-+ errmsg = "bad compression method"; /* or missing */
-+ }
-+
-+ else
-+ errmsg = "bad keyword";
-+ }
-+
-+ else
-+ errmsg = "too many profiles";
-+
-+ /* Failure: the reason is in 'errmsg' */
-+ if (finished == 0)
- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- if (length != 32)
-- {
-- png_warning(png_ptr, "Incorrect cHRM chunk length");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- png_crc_read(png_ptr, buf, 32);
--
-- if (png_crc_finish(png_ptr, 0))
-- return;
--
-- x_white = png_get_fixed_point(NULL, buf);
-- y_white = png_get_fixed_point(NULL, buf + 4);
-- x_red = png_get_fixed_point(NULL, buf + 8);
-- y_red = png_get_fixed_point(NULL, buf + 12);
-- x_green = png_get_fixed_point(NULL, buf + 16);
-- y_green = png_get_fixed_point(NULL, buf + 20);
-- x_blue = png_get_fixed_point(NULL, buf + 24);
-- y_blue = png_get_fixed_point(NULL, buf + 28);
--
-- if (x_white == PNG_FIXED_ERROR ||
-- y_white == PNG_FIXED_ERROR ||
-- x_red == PNG_FIXED_ERROR ||
-- y_red == PNG_FIXED_ERROR ||
-- x_green == PNG_FIXED_ERROR ||
-- y_green == PNG_FIXED_ERROR ||
-- x_blue == PNG_FIXED_ERROR ||
-- y_blue == PNG_FIXED_ERROR)
-- {
-- png_warning(png_ptr, "Ignoring cHRM chunk with negative chromaticities");
-- return;
-- }
--
--#ifdef PNG_READ_sRGB_SUPPORTED
-- if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
-- {
-- if (PNG_OUT_OF_RANGE(x_white, 31270, 1000) ||
-- PNG_OUT_OF_RANGE(y_white, 32900, 1000) ||
-- PNG_OUT_OF_RANGE(x_red, 64000L, 1000) ||
-- PNG_OUT_OF_RANGE(y_red, 33000, 1000) ||
-- PNG_OUT_OF_RANGE(x_green, 30000, 1000) ||
-- PNG_OUT_OF_RANGE(y_green, 60000L, 1000) ||
-- PNG_OUT_OF_RANGE(x_blue, 15000, 1000) ||
-- PNG_OUT_OF_RANGE(y_blue, 6000, 1000))
-- {
-- PNG_WARNING_PARAMETERS(p)
--
-- png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, x_white);
-- png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_fixed, y_white);
-- png_warning_parameter_signed(p, 3, PNG_NUMBER_FORMAT_fixed, x_red);
-- png_warning_parameter_signed(p, 4, PNG_NUMBER_FORMAT_fixed, y_red);
-- png_warning_parameter_signed(p, 5, PNG_NUMBER_FORMAT_fixed, x_green);
-- png_warning_parameter_signed(p, 6, PNG_NUMBER_FORMAT_fixed, y_green);
-- png_warning_parameter_signed(p, 7, PNG_NUMBER_FORMAT_fixed, x_blue);
-- png_warning_parameter_signed(p, 8, PNG_NUMBER_FORMAT_fixed, y_blue);
--
-- png_formatted_warning(png_ptr, p,
-- "Ignoring incorrect cHRM white(@1,@2) r(@3,@4)g(@5,@6)b(@7,@8) "
-- "when sRGB is also present");
-- }
-- return;
-- }
--#endif /* PNG_READ_sRGB_SUPPORTED */
--
--#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-- /* Store the _white values as default coefficients for the rgb to gray
-- * operation if it is supported.
-- */
-- if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
-- {
-- /* png_set_background has not been called, the coefficients must be in
-- * range for the following to work without overflow.
-- */
-- if (y_red <= (1<<17) && y_green <= (1<<17) && y_blue <= (1<<17))
-- {
-- /* The y values are chromaticities: Y/X+Y+Z, the weights for the gray
-- * transformation are simply the normalized Y values for red, green and
-- * blue scaled by 32768.
-- */
-- png_uint_32 w = y_red + y_green + y_blue;
--
-- png_ptr->rgb_to_gray_red_coeff = (png_uint_16)(((png_uint_32)y_red *
-- 32768)/w);
-- png_ptr->rgb_to_gray_green_coeff = (png_uint_16)(((png_uint_32)y_green
-- * 32768)/w);
-- png_ptr->rgb_to_gray_blue_coeff = (png_uint_16)(((png_uint_32)y_blue *
-- 32768)/w);
-- }
-- }
--#endif
--
-- png_set_cHRM_fixed(png_ptr, info_ptr, x_white, y_white, x_red, y_red,
-- x_green, y_green, x_blue, y_blue);
-+
-+ png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-+ png_colorspace_sync(png_ptr, info_ptr);
-+ if (errmsg != NULL) /* else already output */
-+ png_chunk_benign_error(png_ptr, errmsg);
- }
--#endif
--
--#ifdef PNG_READ_sRGB_SUPPORTED
-+#endif /* READ_iCCP */
-+
-+#ifdef PNG_READ_sPLT_SUPPORTED
- void /* PRIVATE */
--png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
--{
-- int intent;
-- png_byte buf[1];
--
-- png_debug(1, "in png_handle_sRGB");
--
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before sRGB");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-- {
-- png_warning(png_ptr, "Invalid sRGB after IDAT");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- else if (png_ptr->mode & PNG_HAVE_PLTE)
-- /* Should be an error, but we can cope with it */
-- png_warning(png_ptr, "Out of place sRGB chunk");
--
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-- {
-- png_warning(png_ptr, "Duplicate sRGB chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- if (length != 1)
-- {
-- png_warning(png_ptr, "Incorrect sRGB chunk length");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- png_crc_read(png_ptr, buf, 1);
--
-- if (png_crc_finish(png_ptr, 0))
-- return;
--
-- intent = buf[0];
--
-- /* Check for bad intent */
-- if (intent >= PNG_sRGB_INTENT_LAST)
-- {
-- png_warning(png_ptr, "Unknown sRGB intent");
-- return;
-- }
--
--#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
-- {
-- if (PNG_OUT_OF_RANGE(info_ptr->gamma, 45500L, 500))
-- {
-- PNG_WARNING_PARAMETERS(p)
--
-- png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed,
-- info_ptr->gamma);
--
-- png_formatted_warning(png_ptr, p,
-- "Ignoring incorrect gAMA value @1 when sRGB is also present");
-- }
-- }
--#endif /* PNG_READ_gAMA_SUPPORTED */
--
--#ifdef PNG_READ_cHRM_SUPPORTED
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-- if (PNG_OUT_OF_RANGE(info_ptr->x_white, 31270, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->y_white, 32900, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->x_red, 64000L, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->y_red, 33000, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->x_green, 30000, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->y_green, 60000L, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->x_blue, 15000, 1000) ||
-- PNG_OUT_OF_RANGE(info_ptr->y_blue, 6000, 1000))
-- {
-- png_warning(png_ptr,
-- "Ignoring incorrect cHRM value when sRGB is also present");
-- }
--#endif /* PNG_READ_cHRM_SUPPORTED */
--
-- png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
--}
--#endif /* PNG_READ_sRGB_SUPPORTED */
--
--#ifdef PNG_READ_iCCP_SUPPORTED
--void /* PRIVATE */
--png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- /* Note: this does not properly handle chunks that are > 64K under DOS */
- {
-- png_byte compression_type;
-- png_bytep pC;
-- png_charp profile;
-- png_uint_32 skip = 0;
-- png_uint_32 profile_size;
-- png_alloc_size_t profile_length;
-- png_size_t slength, prefix_length, data_length;
--
-- png_debug(1, "in png_handle_iCCP");
--
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before iCCP");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-- {
-- png_warning(png_ptr, "Invalid iCCP after IDAT");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- else if (png_ptr->mode & PNG_HAVE_PLTE)
-- /* Should be an error, but we can cope with it */
-- png_warning(png_ptr, "Out of place iCCP chunk");
--
-- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-- {
-- png_warning(png_ptr, "Duplicate iCCP chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
--#ifdef PNG_MAX_MALLOC_64K
-- if (length > (png_uint_32)65535L)
-- {
-- png_warning(png_ptr, "iCCP chunk too large to fit in memory");
-- skip = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-- }
--#endif
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
--
-- if (png_crc_finish(png_ptr, skip))
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- png_ptr->chunkdata[slength] = 0x00;
--
-- for (profile = png_ptr->chunkdata; *profile; profile++)
-- /* Empty loop to find end of name */ ;
--
-- ++profile;
--
-- /* There should be at least one zero (the compression type byte)
-- * following the separator, and we should be on it
-- */
-- if (profile >= png_ptr->chunkdata + slength - 1)
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- png_warning(png_ptr, "Malformed iCCP chunk");
-- return;
-- }
--
-- /* Compression_type should always be zero */
-- compression_type = *profile++;
--
-- if (compression_type)
-- {
-- png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
-- compression_type = 0x00; /* Reset it to zero (libpng-1.0.6 through 1.0.8
-- wrote nonzero) */
-- }
--
-- prefix_length = profile - png_ptr->chunkdata;
-- png_decompress_chunk(png_ptr, compression_type,
-- slength, prefix_length, &data_length);
--
-- profile_length = data_length - prefix_length;
--
-- if (prefix_length > data_length || profile_length < 4)
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- png_warning(png_ptr, "Profile size field missing from iCCP chunk");
-- return;
-- }
--
-- /* Check the profile_size recorded in the first 32 bits of the ICC profile */
-- pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
-- profile_size = ((*(pC )) << 24) |
-- ((*(pC + 1)) << 16) |
-- ((*(pC + 2)) << 8) |
-- ((*(pC + 3)) );
--
-- /* NOTE: the following guarantees that 'profile_length' fits into 32 bits,
-- * because profile_size is a 32 bit value.
-- */
-- if (profile_size < profile_length)
-- profile_length = profile_size;
--
-- /* And the following guarantees that profile_size == profile_length. */
-- if (profile_size > profile_length)
-- {
-- PNG_WARNING_PARAMETERS(p)
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
--
-- png_warning_parameter_unsigned(p, 1, PNG_NUMBER_FORMAT_u, profile_size);
-- png_warning_parameter_unsigned(p, 2, PNG_NUMBER_FORMAT_u, profile_length);
-- png_formatted_warning(png_ptr, p,
-- "Ignoring iCCP chunk with declared size = @1 and actual length = @2");
-- return;
-- }
--
-- png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
-- compression_type, (png_bytep)png_ptr->chunkdata + prefix_length,
-- profile_size);
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
--}
--#endif /* PNG_READ_iCCP_SUPPORTED */
--
--#ifdef PNG_READ_sPLT_SUPPORTED
--void /* PRIVATE */
--png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
--/* Note: this does not properly handle chunks that are > 64K under DOS */
--{
-- png_bytep entry_start;
-+ png_bytep entry_start, buffer;
- png_sPLT_t new_palette;
- png_sPLT_entryp pp;
- png_uint_32 data_length;
- int entry_size, i;
- png_uint_32 skip = 0;
-- png_size_t slength;
- png_uint_32 dl;
- png_size_t max_dl;
-
- png_debug(1, "in png_handle_sPLT");
-
- #ifdef PNG_USER_LIMITS_SUPPORTED
--
- if (png_ptr->user_chunk_cache_max != 0)
- {
- if (png_ptr->user_chunk_cache_max == 1)
-@@ -1338,55 +1631,53 @@
- }
- #endif
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before sPLT");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid sPLT after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
- #ifdef PNG_MAX_MALLOC_64K
-- if (length > (png_uint_32)65535L)
-+ if (length > 65535U)
- {
-- png_warning(png_ptr, "sPLT chunk too large to fit in memory");
-- skip = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "too large to fit in memory");
-+ return;
- }
- #endif
-
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-+ buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
-+ if (buffer == NULL)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of memory");
-+ return;
-+ }
-+
-
- /* WARNING: this may break if size_t is less than 32 bits; it is assumed
- * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a
- * potential breakage point if the types in pngconf.h aren't exactly right.
- */
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
--
-- if (png_crc_finish(png_ptr, skip))
-+ png_crc_read(png_ptr, buffer, length);
-+
-+ if (png_crc_finish(png_ptr, skip) != 0)
-+ return;
-+
-+ buffer[length] = 0;
-+
-+ for (entry_start = buffer; *entry_start; entry_start++)
-+ /* Empty loop to find end of name */ ;
-+
-+ ++entry_start;
-+
-+ /* A sample depth should follow the separator, and we should be on it */
-+ if (entry_start > buffer + length - 2)
- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- png_ptr->chunkdata[slength] = 0x00;
--
-- for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start;
-- entry_start++)
-- /* Empty loop to find end of name */ ;
--
-- ++entry_start;
--
-- /* A sample depth should follow the separator, and we should be on it */
-- if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
- png_warning(png_ptr, "malformed sPLT chunk");
- return;
- }
-@@ -1394,23 +1685,19 @@
- new_palette.depth = *entry_start++;
- entry_size = (new_palette.depth == 8 ? 6 : 10);
- /* This must fit in a png_uint_32 because it is derived from the original
-- * chunk data length (and use 'length', not 'slength' here for clarity -
-- * they are guaranteed to be the same, see the tests above.)
-+ * chunk data length.
- */
-- data_length = length - (png_uint_32)(entry_start -
-- (png_bytep)png_ptr->chunkdata);
-+ data_length = length - (png_uint_32)(entry_start - buffer);
-
- /* Integrity-check the data length */
-- if (data_length % entry_size)
-+ if ((data_length % entry_size) != 0)
- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
- png_warning(png_ptr, "sPLT chunk has bad length");
- return;
- }
-
- dl = (png_int_32)(data_length / entry_size);
-- max_dl = PNG_SIZE_MAX / png_sizeof(png_sPLT_entry);
-+ max_dl = PNG_SIZE_MAX / (sizeof (png_sPLT_entry));
-
- if (dl > max_dl)
- {
-@@ -1421,7 +1708,7 @@
- new_palette.nentries = (png_int_32)(data_length / entry_size);
-
- new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
-- png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
-+ png_ptr, new_palette.nentries * (sizeof (png_sPLT_entry)));
-
- if (new_palette.entries == NULL)
- {
-@@ -1479,38 +1766,36 @@
- #endif
-
- /* Discard all chunk data except the name and stash that */
-- new_palette.name = png_ptr->chunkdata;
-+ new_palette.name = (png_charp)buffer;
-
- png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
-
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
- png_free(png_ptr, new_palette.entries);
- }
--#endif /* PNG_READ_sPLT_SUPPORTED */
-+#endif /* READ_sPLT */
-
- #ifdef PNG_READ_tRNS_SUPPORTED
- void /* PRIVATE */
--png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
-
- png_debug(1, "in png_handle_tRNS");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before tRNS");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid tRNS after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)
- {
-- png_warning(png_ptr, "Duplicate tRNS chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
-@@ -1520,8 +1805,8 @@
-
- if (length != 2)
- {
-- png_warning(png_ptr, "Incorrect tRNS chunk length");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
-@@ -1536,12 +1821,12 @@
-
- if (length != 6)
- {
-- png_warning(png_ptr, "Incorrect tRNS chunk length");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
-- png_crc_read(png_ptr, buf, (png_size_t)length);
-+ png_crc_read(png_ptr, buf, length);
- png_ptr->num_trans = 1;
- png_ptr->trans_color.red = png_get_uint_16(buf);
- png_ptr->trans_color.green = png_get_uint_16(buf + 2);
-@@ -1550,44 +1835,43 @@
-
- else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- {
-- if (!(png_ptr->mode & PNG_HAVE_PLTE))
-+ if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
- {
-- /* Should be an error, but we can cope with it. */
-- png_warning(png_ptr, "Missing PLTE before tRNS");
-- }
--
-- if (length > (png_uint_32)png_ptr->num_palette ||
-- length > PNG_MAX_PALETTE_LENGTH)
-- {
-- png_warning(png_ptr, "Incorrect tRNS chunk length");
-+ /* TODO: is this actually an error in the ISO spec? */
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- if (length == 0)
-+ if (length > png_ptr->num_palette || length > PNG_MAX_PALETTE_LENGTH ||
-+ length == 0)
- {
-- png_warning(png_ptr, "Zero length tRNS chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
-- png_crc_read(png_ptr, readbuf, (png_size_t)length);
-+ png_crc_read(png_ptr, readbuf, length);
- png_ptr->num_trans = (png_uint_16)length;
- }
-
- else
- {
-- png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid with alpha channel");
- return;
- }
-
-- if (png_crc_finish(png_ptr, 0))
-+ if (png_crc_finish(png_ptr, 0) != 0)
- {
- png_ptr->num_trans = 0;
- return;
- }
-
-+ /* TODO: this is a horrible side effect in the palette case because the
-+ * png_struct ends up with a pointer to the tRNS buffer owned by the
-+ * png_info. Fix this.
-+ */
- png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
- &(png_ptr->trans_color));
- }
-@@ -1595,58 +1879,52 @@
-
- #ifdef PNG_READ_bKGD_SUPPORTED
- void /* PRIVATE */
--png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
-- png_size_t truelen;
-+ unsigned int truelen;
- png_byte buf[6];
- png_color_16 background;
-
- png_debug(1, "in png_handle_bKGD");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before bKGD");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-+ (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-+ (png_ptr->mode & PNG_HAVE_PLTE) == 0))
- {
-- png_warning(png_ptr, "Invalid bKGD after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-- !(png_ptr->mode & PNG_HAVE_PLTE))
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
- {
-- png_warning(png_ptr, "Missing PLTE before bKGD");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ truelen = 1;
-+
-+ else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-+ truelen = 6;
-+
-+ else
-+ truelen = 2;
-+
-+ if (length != truelen)
- {
-- png_warning(png_ptr, "Duplicate bKGD chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
-- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-- truelen = 1;
--
-- else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-- truelen = 6;
--
-- else
-- truelen = 2;
--
-- if (length != truelen)
-- {
-- png_warning(png_ptr, "Incorrect bKGD chunk length");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
- png_crc_read(png_ptr, buf, truelen);
-
-- if (png_crc_finish(png_ptr, 0))
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-
- /* We convert the index value into RGB components so that we can allow
-@@ -1658,11 +1936,11 @@
- {
- background.index = buf[0];
-
-- if (info_ptr && info_ptr->num_palette)
-+ if (info_ptr != NULL && info_ptr->num_palette != 0)
- {
- if (buf[0] >= info_ptr->num_palette)
- {
-- png_warning(png_ptr, "Incorrect bKGD chunk index value");
-+ png_chunk_benign_error(png_ptr, "invalid index");
- return;
- }
-
-@@ -1677,7 +1955,7 @@
- background.gray = 0;
- }
-
-- else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
-+ else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */
- {
- background.index = 0;
- background.red =
-@@ -1701,44 +1979,37 @@
-
- #ifdef PNG_READ_hIST_SUPPORTED
- void /* PRIVATE */
--png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- unsigned int num, i;
- png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
-
- png_debug(1, "in png_handle_hIST");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before hIST");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-+ (png_ptr->mode & PNG_HAVE_PLTE) == 0)
- {
-- png_warning(png_ptr, "Invalid hIST after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (!(png_ptr->mode & PNG_HAVE_PLTE))
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
- {
-- png_warning(png_ptr, "Missing PLTE before hIST");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
-+ num = length / 2 ;
-+
-+ if (num != png_ptr->num_palette || num > PNG_MAX_PALETTE_LENGTH)
- {
-- png_warning(png_ptr, "Duplicate hIST chunk");
- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- num = length / 2 ;
--
-- if (num != (unsigned int)png_ptr->num_palette || num >
-- (unsigned int)PNG_MAX_PALETTE_LENGTH)
-- {
-- png_warning(png_ptr, "Incorrect hIST chunk length");
-- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
-@@ -1750,7 +2021,7 @@
- readbuf[i] = png_get_uint_16(buf);
- }
-
-- if (png_crc_finish(png_ptr, 0))
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-
- png_set_hIST(png_ptr, info_ptr, readbuf);
-@@ -1759,7 +2030,7 @@
-
- #ifdef PNG_READ_pHYs_SUPPORTED
- void /* PRIVATE */
--png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_byte buf[9];
- png_uint_32 res_x, res_y;
-@@ -1767,33 +2038,33 @@
-
- png_debug(1, "in png_handle_pHYs");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before pHYs");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid pHYs after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)
- {
-- png_warning(png_ptr, "Duplicate pHYs chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
- if (length != 9)
- {
-- png_warning(png_ptr, "Incorrect pHYs chunk length");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
- png_crc_read(png_ptr, buf, 9);
-
-- if (png_crc_finish(png_ptr, 0))
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-
- res_x = png_get_uint_32(buf);
-@@ -1805,7 +2076,7 @@
-
- #ifdef PNG_READ_oFFs_SUPPORTED
- void /* PRIVATE */
--png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_byte buf[9];
- png_int_32 offset_x, offset_y;
-@@ -1813,33 +2084,33 @@
-
- png_debug(1, "in png_handle_oFFs");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before oFFs");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid oFFs after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)
- {
-- png_warning(png_ptr, "Duplicate oFFs chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
- if (length != 9)
- {
-- png_warning(png_ptr, "Incorrect oFFs chunk length");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
- png_crc_read(png_ptr, buf, 9);
-
-- if (png_crc_finish(png_ptr, 0))
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-
- offset_x = png_get_int_32(buf);
-@@ -1852,71 +2123,64 @@
- #ifdef PNG_READ_pCAL_SUPPORTED
- /* Read the pCAL chunk (described in the PNG Extensions document) */
- void /* PRIVATE */
--png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_int_32 X0, X1;
- png_byte type, nparams;
-- png_charp buf, units, endptr;
-+ png_bytep buffer, buf, units, endptr;
- png_charpp params;
-- png_size_t slength;
- int i;
-
- png_debug(1, "in png_handle_pCAL");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before pCAL");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid pCAL after IDAT");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)
- {
-- png_warning(png_ptr, "Duplicate pCAL chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
- png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
- length + 1);
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
--
-- if (png_ptr->chunkdata == NULL)
-+
-+ buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
-+
-+ if (buffer == NULL)
- {
-- png_warning(png_ptr, "No memory for pCAL purpose");
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of memory");
- return;
- }
-
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
--
-- if (png_crc_finish(png_ptr, 0))
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-+ png_crc_read(png_ptr, buffer, length);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-- }
--
-- png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
-+
-+ buffer[length] = 0; /* Null terminate the last string */
-
- png_debug(3, "Finding end of pCAL purpose string");
-- for (buf = png_ptr->chunkdata; *buf; buf++)
-+ for (buf = buffer; *buf; buf++)
- /* Empty loop */ ;
-
-- endptr = png_ptr->chunkdata + slength;
-+ endptr = buffer + length;
-
- /* We need to have at least 12 bytes after the purpose string
- * in order to get the parameter information.
- */
- if (endptr <= buf + 12)
- {
-- png_warning(png_ptr, "Invalid pCAL data");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
-@@ -1936,15 +2200,13 @@
- (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
- (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
- {
-- png_warning(png_ptr, "Invalid pCAL parameters for equation type");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-+ png_chunk_benign_error(png_ptr, "invalid parameter count");
- return;
- }
-
- else if (type >= PNG_EQUATION_LAST)
- {
-- png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
-+ png_chunk_benign_error(png_ptr, "unrecognized equation type");
- }
-
- for (buf = units; *buf; buf++)
-@@ -1952,43 +2214,37 @@
-
- png_debug(3, "Allocating pCAL parameters array");
-
-- params = (png_charpp)png_malloc_warn(png_ptr,
-- (png_size_t)(nparams * png_sizeof(png_charp)));
-+ params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
-+ nparams * (sizeof (png_charp))));
-
- if (params == NULL)
- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- png_warning(png_ptr, "No memory for pCAL params");
-+ png_chunk_benign_error(png_ptr, "out of memory");
- return;
- }
-
- /* Get pointers to the start of each parameter string. */
-- for (i = 0; i < (int)nparams; i++)
-+ for (i = 0; i < nparams; i++)
- {
- buf++; /* Skip the null string terminator from previous parameter. */
-
- png_debug1(3, "Reading pCAL parameter %d", i);
-
-- for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
-+ for (params[i] = (png_charp)buf; buf <= endptr && *buf != 0; buf++)
- /* Empty loop to move past each parameter string */ ;
-
- /* Make sure we haven't run out of data yet */
- if (buf > endptr)
- {
-- png_warning(png_ptr, "Invalid pCAL data");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
- png_free(png_ptr, params);
-+ png_chunk_benign_error(png_ptr, "invalid data");
- return;
- }
- }
-
-- png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
-- units, params);
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-+ png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,
-+ (png_charp)units, params);
-+
- png_free(png_ptr, params);
- }
- #endif
-@@ -1996,67 +2252,61 @@
- #ifdef PNG_READ_sCAL_SUPPORTED
- /* Read the sCAL chunk */
- void /* PRIVATE */
--png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
-- png_size_t slength, i;
-+ png_bytep buffer;
-+ png_size_t i;
- int state;
-
- png_debug(1, "in png_handle_sCAL");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before sCAL");
--
-- else if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- {
-- png_warning(png_ptr, "Invalid sCAL after IDAT");
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of place");
-+ return;
-+ }
-+
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
-+ return;
-+ }
-+
-+ /* Need unit type, width, \0, height: minimum 4 bytes */
-+ else if (length < 4)
-+ {
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
-+ return;
-+ }
-+
-+ png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
-+ length + 1);
-+
-+ buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
-+
-+ if (buffer == NULL)
-+ {
-+ png_chunk_benign_error(png_ptr, "out of memory");
- png_crc_finish(png_ptr, length);
- return;
- }
-
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
-+ png_crc_read(png_ptr, buffer, length);
-+ buffer[length] = 0; /* Null terminate the last string */
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
-+ return;
-+
-+ /* Validate the unit. */
-+ if (buffer[0] != 1 && buffer[0] != 2)
- {
-- png_warning(png_ptr, "Duplicate sCAL chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- /* Need unit type, width, \0, height: minimum 4 bytes */
-- else if (length < 4)
-- {
-- png_warning(png_ptr, "sCAL chunk too short");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
-- length + 1);
--
-- png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
--
-- if (png_ptr->chunkdata == NULL)
-- {
-- png_warning(png_ptr, "Out of memory while processing sCAL chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-- png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
--
-- if (png_crc_finish(png_ptr, 0))
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- /* Validate the unit. */
-- if (png_ptr->chunkdata[0] != 1 && png_ptr->chunkdata[0] != 2)
-- {
-- png_warning(png_ptr, "Invalid sCAL ignored: invalid unit");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-+ png_chunk_benign_error(png_ptr, "invalid unit");
- return;
- }
-
-@@ -2066,70 +2316,65 @@
- i = 1;
- state = 0;
-
-- if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-- i >= slength || png_ptr->chunkdata[i++] != 0)
-- png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");
--
-- else if (!PNG_FP_IS_POSITIVE(state))
-- png_warning(png_ptr, "Invalid sCAL chunk ignored: non-positive width");
-+ if (png_check_fp_number((png_const_charp)buffer, length, &state, &i) == 0 ||
-+ i >= length || buffer[i++] != 0)
-+ png_chunk_benign_error(png_ptr, "bad width format");
-+
-+ else if (PNG_FP_IS_POSITIVE(state) == 0)
-+ png_chunk_benign_error(png_ptr, "non-positive width");
-
- else
- {
- png_size_t heighti = i;
-
- state = 0;
-- if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-- i != slength)
-- png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");
--
-- else if (!PNG_FP_IS_POSITIVE(state))
-- png_warning(png_ptr,
-- "Invalid sCAL chunk ignored: non-positive height");
-+ if (png_check_fp_number((png_const_charp)buffer, length,
-+ &state, &i) == 0 || i != length)
-+ png_chunk_benign_error(png_ptr, "bad height format");
-+
-+ else if (PNG_FP_IS_POSITIVE(state) == 0)
-+ png_chunk_benign_error(png_ptr, "non-positive height");
-
- else
- /* This is the (only) success case. */
-- png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0],
-- png_ptr->chunkdata+1, png_ptr->chunkdata+heighti);
-+ png_set_sCAL_s(png_ptr, info_ptr, buffer[0],
-+ (png_charp)buffer+1, (png_charp)buffer+heighti);
- }
--
-- /* Clean up - just free the temporarily allocated buffer. */
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
- }
- #endif
-
- #ifdef PNG_READ_tIME_SUPPORTED
- void /* PRIVATE */
--png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
- png_byte buf[7];
- png_time mod_time;
-
- png_debug(1, "in png_handle_tIME");
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Out of place tIME chunk");
--
-- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)
- {
-- png_warning(png_ptr, "Duplicate tIME chunk");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "duplicate");
- return;
- }
-
-- if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- png_ptr->mode |= PNG_AFTER_IDAT;
-
- if (length != 7)
- {
-- png_warning(png_ptr, "Incorrect tIME chunk length");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "invalid");
- return;
- }
-
- png_crc_read(png_ptr, buf, 7);
-
-- if (png_crc_finish(png_ptr, 0))
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-
- mod_time.second = buf[6];
-@@ -2146,14 +2391,13 @@
- #ifdef PNG_READ_tEXt_SUPPORTED
- /* Note: this does not properly handle chunks that are > 64K under DOS */
- void /* PRIVATE */
--png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
-- png_textp text_ptr;
-+ png_text text_info;
-+ png_bytep buffer;
- png_charp key;
- png_charp text;
- png_uint_32 skip = 0;
-- png_size_t slength;
-- int ret;
-
- png_debug(1, "in png_handle_tEXt");
-
-@@ -2168,84 +2412,59 @@
-
- if (--png_ptr->user_chunk_cache_max == 1)
- {
-- png_warning(png_ptr, "No space in chunk cache for tEXt");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "no space in chunk cache");
- return;
- }
- }
- #endif
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before tEXt");
--
-- if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- png_ptr->mode |= PNG_AFTER_IDAT;
-
- #ifdef PNG_MAX_MALLOC_64K
-- if (length > (png_uint_32)65535L)
-+ if (length > 65535U)
- {
-- png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-- skip = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "too large to fit in memory");
-+ return;
- }
- #endif
-
-- png_free(png_ptr, png_ptr->chunkdata);
--
-- png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
--
-- if (png_ptr->chunkdata == NULL)
-+ buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
-+
-+ if (buffer == NULL)
- {
-- png_warning(png_ptr, "No memory to process text chunk");
-+ png_chunk_benign_error(png_ptr, "out of memory");
- return;
- }
-
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
--
-- if (png_crc_finish(png_ptr, skip))
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-+ png_crc_read(png_ptr, buffer, length);
-+
-+ if (png_crc_finish(png_ptr, skip) != 0)
- return;
-- }
--
-- key = png_ptr->chunkdata;
--
-- key[slength] = 0x00;
-+
-+ key = (png_charp)buffer;
-+ key[length] = 0;
-
- for (text = key; *text; text++)
- /* Empty loop to find end of key */ ;
-
-- if (text != key + slength)
-+ if (text != key + length)
- text++;
-
-- text_ptr = (png_textp)png_malloc_warn(png_ptr,
-- png_sizeof(png_text));
--
-- if (text_ptr == NULL)
-- {
-- png_warning(png_ptr, "Not enough memory to process text chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-- text_ptr->key = key;
-- text_ptr->lang = NULL;
-- text_ptr->lang_key = NULL;
-- text_ptr->itxt_length = 0;
-- text_ptr->text = text;
-- text_ptr->text_length = png_strlen(text);
--
-- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- png_free(png_ptr, text_ptr);
--
-- if (ret)
-+ text_info.compression = PNG_TEXT_COMPRESSION_NONE;
-+ text_info.key = key;
-+ text_info.lang = NULL;
-+ text_info.lang_key = NULL;
-+ text_info.itxt_length = 0;
-+ text_info.text = text;
-+ text_info.text_length = strlen(text);
-+
-+ if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)
- png_warning(png_ptr, "Insufficient memory to process text chunk");
- }
- #endif
-@@ -2253,13 +2472,11 @@
- #ifdef PNG_READ_zTXt_SUPPORTED
- /* Note: this does not correctly handle chunks that are > 64K under DOS */
- void /* PRIVATE */
--png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
-- png_textp text_ptr;
-- png_charp text;
-- int comp_type;
-- int ret;
-- png_size_t slength, prefix_len, data_len;
-+ png_const_charp errmsg = NULL;
-+ png_bytep buffer;
-+ png_uint_32 keyword_length;
-
- png_debug(1, "in png_handle_zTXt");
-
-@@ -2274,123 +2491,101 @@
-
- if (--png_ptr->user_chunk_cache_max == 1)
- {
-- png_warning(png_ptr, "No space in chunk cache for zTXt");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "no space in chunk cache");
- return;
- }
- }
- #endif
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before zTXt");
--
-- if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- png_ptr->mode |= PNG_AFTER_IDAT;
-
--#ifdef PNG_MAX_MALLOC_64K
-- /* We will no doubt have problems with chunks even half this size, but
-- * there is no hard and fast rule to tell us where to stop.
-- */
-- if (length > (png_uint_32)65535L)
-+ buffer = png_read_buffer(png_ptr, length, 2/*silent*/);
-+
-+ if (buffer == NULL)
- {
-- png_warning(png_ptr, "zTXt chunk too large to fit in memory");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of memory");
- return;
- }
--#endif
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
--
-- if (png_ptr->chunkdata == NULL)
-- {
-- png_warning(png_ptr, "Out of memory processing zTXt chunk");
-+
-+ png_crc_read(png_ptr, buffer, length);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
- return;
-- }
--
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
--
-- if (png_crc_finish(png_ptr, 0))
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- png_ptr->chunkdata[slength] = 0x00;
--
-- for (text = png_ptr->chunkdata; *text; text++)
-- /* Empty loop */ ;
--
-- /* zTXt must have some text after the chunkdataword */
-- if (text >= png_ptr->chunkdata + slength - 2)
-- {
-- png_warning(png_ptr, "Truncated zTXt chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
-+
-+ /* TODO: also check that the keyword contents match the spec! */
-+ for (keyword_length = 0;
-+ keyword_length < length && buffer[keyword_length] != 0;
-+ ++keyword_length)
-+ /* Empty loop to find end of name */ ;
-+
-+ if (keyword_length > 79 || keyword_length < 1)
-+ errmsg = "bad keyword";
-+
-+ /* zTXt must have some LZ data after the keyword, although it may expand to
-+ * zero bytes; we need a '\0' at the end of the keyword, the compression type
-+ * then the LZ data:
-+ */
-+ else if (keyword_length + 3 > length)
-+ errmsg = "truncated";
-+
-+ else if (buffer[keyword_length+1] != PNG_COMPRESSION_TYPE_BASE)
-+ errmsg = "unknown compression type";
-
- else
- {
-- comp_type = *(++text);
--
-- if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
-- {
-- png_warning(png_ptr, "Unknown compression type in zTXt chunk");
-- comp_type = PNG_TEXT_COMPRESSION_zTXt;
-- }
--
-- text++; /* Skip the compression_method byte */
-+ png_alloc_size_t uncompressed_length = PNG_SIZE_MAX;
-+
-+ /* TODO: at present png_decompress_chunk imposes a single application
-+ * level memory limit, this should be split to different values for iCCP
-+ * and text chunks.
-+ */
-+ if (png_decompress_chunk(png_ptr, length, keyword_length+2,
-+ &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
-+ {
-+ png_text text;
-+
-+ /* It worked; png_ptr->read_buffer now looks like a tEXt chunk except
-+ * for the extra compression type byte and the fact that it isn't
-+ * necessarily '\0' terminated.
-+ */
-+ buffer = png_ptr->read_buffer;
-+ buffer[uncompressed_length+(keyword_length+2)] = 0;
-+
-+ text.compression = PNG_TEXT_COMPRESSION_zTXt;
-+ text.key = (png_charp)buffer;
-+ text.text = (png_charp)(buffer + keyword_length+2);
-+ text.text_length = uncompressed_length;
-+ text.itxt_length = 0;
-+ text.lang = NULL;
-+ text.lang_key = NULL;
-+
-+ if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-+ errmsg = "insufficient memory";
-+ }
-+
-+ else
-+ errmsg = png_ptr->zstream.msg;
- }
-
-- prefix_len = text - png_ptr->chunkdata;
--
-- png_decompress_chunk(png_ptr, comp_type,
-- (png_size_t)length, prefix_len, &data_len);
--
-- text_ptr = (png_textp)png_malloc_warn(png_ptr,
-- png_sizeof(png_text));
--
-- if (text_ptr == NULL)
-- {
-- png_warning(png_ptr, "Not enough memory to process zTXt chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- text_ptr->compression = comp_type;
-- text_ptr->key = png_ptr->chunkdata;
-- text_ptr->lang = NULL;
-- text_ptr->lang_key = NULL;
-- text_ptr->itxt_length = 0;
-- text_ptr->text = png_ptr->chunkdata + prefix_len;
-- text_ptr->text_length = data_len;
--
-- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
--
-- png_free(png_ptr, text_ptr);
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
--
-- if (ret)
-- png_error(png_ptr, "Insufficient memory to store zTXt chunk");
-+ if (errmsg != NULL)
-+ png_chunk_benign_error(png_ptr, errmsg);
- }
- #endif
-
- #ifdef PNG_READ_iTXt_SUPPORTED
- /* Note: this does not correctly handle chunks that are > 64K under DOS */
- void /* PRIVATE */
--png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
- {
-- png_textp text_ptr;
-- png_charp key, lang, text, lang_key;
-- int comp_flag;
-- int comp_type = 0;
-- int ret;
-- png_size_t slength, prefix_len, data_len;
-+ png_const_charp errmsg = NULL;
-+ png_bytep buffer;
-+ png_uint_32 prefix_length;
-
- png_debug(1, "in png_handle_iTXt");
-
-@@ -2405,274 +2600,393 @@
-
- if (--png_ptr->user_chunk_cache_max == 1)
- {
-- png_warning(png_ptr, "No space in chunk cache for iTXt");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "no space in chunk cache");
- return;
- }
- }
- #endif
-
-- if (!(png_ptr->mode & PNG_HAVE_IHDR))
-- png_error(png_ptr, "Missing IHDR before iTXt");
--
-- if (png_ptr->mode & PNG_HAVE_IDAT)
-+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-+ png_chunk_error(png_ptr, "missing IHDR");
-+
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
- png_ptr->mode |= PNG_AFTER_IDAT;
-
--#ifdef PNG_MAX_MALLOC_64K
-- /* We will no doubt have problems with chunks even half this size, but
-- * there is no hard and fast rule to tell us where to stop.
-- */
-- if (length > (png_uint_32)65535L)
-+ buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
-+
-+ if (buffer == NULL)
- {
-- png_warning(png_ptr, "iTXt chunk too large to fit in memory");
- png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "out of memory");
- return;
- }
--#endif
--
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
--
-- if (png_ptr->chunkdata == NULL)
-+
-+ png_crc_read(png_ptr, buffer, length);
-+
-+ if (png_crc_finish(png_ptr, 0) != 0)
-+ return;
-+
-+ /* First the keyword. */
-+ for (prefix_length=0;
-+ prefix_length < length && buffer[prefix_length] != 0;
-+ ++prefix_length)
-+ /* Empty loop */ ;
-+
-+ /* Perform a basic check on the keyword length here. */
-+ if (prefix_length > 79 || prefix_length < 1)
-+ errmsg = "bad keyword";
-+
-+ /* Expect keyword, compression flag, compression type, language, translated
-+ * keyword (both may be empty but are 0 terminated) then the text, which may
-+ * be empty.
-+ */
-+ else if (prefix_length + 5 > length)
-+ errmsg = "truncated";
-+
-+ else if (buffer[prefix_length+1] == 0 ||
-+ (buffer[prefix_length+1] == 1 &&
-+ buffer[prefix_length+2] == PNG_COMPRESSION_TYPE_BASE))
- {
-- png_warning(png_ptr, "No memory to process iTXt chunk");
-- return;
-+ int compressed = buffer[prefix_length+1] != 0;
-+ png_uint_32 language_offset, translated_keyword_offset;
-+ png_alloc_size_t uncompressed_length = 0;
-+
-+ /* Now the language tag */
-+ prefix_length += 3;
-+ language_offset = prefix_length;
-+
-+ for (; prefix_length < length && buffer[prefix_length] != 0;
-+ ++prefix_length)
-+ /* Empty loop */ ;
-+
-+ /* WARNING: the length may be invalid here, this is checked below. */
-+ translated_keyword_offset = ++prefix_length;
-+
-+ for (; prefix_length < length && buffer[prefix_length] != 0;
-+ ++prefix_length)
-+ /* Empty loop */ ;
-+
-+ /* prefix_length should now be at the trailing '\0' of the translated
-+ * keyword, but it may already be over the end. None of this arithmetic
-+ * can overflow because chunks are at most 2^31 bytes long, but on 16-bit
-+ * systems the available allocation may overflow.
-+ */
-+ ++prefix_length;
-+
-+ if (compressed == 0 && prefix_length <= length)
-+ uncompressed_length = length - prefix_length;
-+
-+ else if (compressed != 0 && prefix_length < length)
-+ {
-+ uncompressed_length = PNG_SIZE_MAX;
-+
-+ /* TODO: at present png_decompress_chunk imposes a single application
-+ * level memory limit, this should be split to different values for
-+ * iCCP and text chunks.
-+ */
-+ if (png_decompress_chunk(png_ptr, length, prefix_length,
-+ &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
-+ buffer = png_ptr->read_buffer;
-+
-+ else
-+ errmsg = png_ptr->zstream.msg;
-+ }
-+
-+ else
-+ errmsg = "truncated";
-+
-+ if (errmsg == NULL)
-+ {
-+ png_text text;
-+
-+ buffer[uncompressed_length+prefix_length] = 0;
-+
-+ if (compressed == 0)
-+ text.compression = PNG_ITXT_COMPRESSION_NONE;
-+
-+ else
-+ text.compression = PNG_ITXT_COMPRESSION_zTXt;
-+
-+ text.key = (png_charp)buffer;
-+ text.lang = (png_charp)buffer + language_offset;
-+ text.lang_key = (png_charp)buffer + translated_keyword_offset;
-+ text.text = (png_charp)buffer + prefix_length;
-+ text.text_length = 0;
-+ text.itxt_length = uncompressed_length;
-+
-+ if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-+ errmsg = "insufficient memory";
-+ }
- }
-
-- slength = (png_size_t)length;
-- png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
--
-- if (png_crc_finish(png_ptr, 0))
-- {
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- png_ptr->chunkdata[slength] = 0x00;
--
-- for (lang = png_ptr->chunkdata; *lang; lang++)
-- /* Empty loop */ ;
--
-- lang++; /* Skip NUL separator */
--
-- /* iTXt must have a language tag (possibly empty), two compression bytes,
-- * translated keyword (possibly empty), and possibly some text after the
-- * keyword
-- */
--
-- if (lang >= png_ptr->chunkdata + slength - 3)
-- {
-- png_warning(png_ptr, "Truncated iTXt chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
- else
-- {
-- comp_flag = *lang++;
-- comp_type = *lang++;
-- }
--
-- for (lang_key = lang; *lang_key; lang_key++)
-- /* Empty loop */ ;
--
-- lang_key++; /* Skip NUL separator */
--
-- if (lang_key >= png_ptr->chunkdata + slength)
-- {
-- png_warning(png_ptr, "Truncated iTXt chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- for (text = lang_key; *text; text++)
-- /* Empty loop */ ;
--
-- text++; /* Skip NUL separator */
--
-- if (text >= png_ptr->chunkdata + slength)
-- {
-- png_warning(png_ptr, "Malformed iTXt chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- prefix_len = text - png_ptr->chunkdata;
--
-- key=png_ptr->chunkdata;
--
-- if (comp_flag)
-- png_decompress_chunk(png_ptr, comp_type,
-- (size_t)length, prefix_len, &data_len);
--
-- else
-- data_len = png_strlen(png_ptr->chunkdata + prefix_len);
--
-- text_ptr = (png_textp)png_malloc_warn(png_ptr,
-- png_sizeof(png_text));
--
-- if (text_ptr == NULL)
-- {
-- png_warning(png_ptr, "Not enough memory to process iTXt chunk");
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
-- return;
-- }
--
-- text_ptr->compression = (int)comp_flag + 1;
-- text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
-- text_ptr->lang = png_ptr->chunkdata + (lang - key);
-- text_ptr->itxt_length = data_len;
-- text_ptr->text_length = 0;
-- text_ptr->key = png_ptr->chunkdata;
-- text_ptr->text = png_ptr->chunkdata + prefix_len;
--
-- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
--
-- png_free(png_ptr, text_ptr);
-- png_free(png_ptr, png_ptr->chunkdata);
-- png_ptr->chunkdata = NULL;
--
-- if (ret)
-- png_error(png_ptr, "Insufficient memory to store iTXt chunk");
-+ errmsg = "bad compression info";
-+
-+ if (errmsg != NULL)
-+ png_chunk_benign_error(png_ptr, errmsg);
- }
- #endif
-
--/* This function is called when we haven't found a handler for a
-- * chunk. If there isn't a problem with the chunk itself (ie bad
-- * chunk name, CRC, or a critical chunk), the chunk is silently ignored
-- * -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
-- * case it will be saved away to be written out later.
-- */
--void /* PRIVATE */
--png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-+/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
-+static int
-+png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
- {
-- png_uint_32 skip = 0;
--
-- png_debug(1, "in png_handle_unknown");
--
--#ifdef PNG_USER_LIMITS_SUPPORTED
-- if (png_ptr->user_chunk_cache_max != 0)
-+ png_alloc_size_t limit = PNG_SIZE_MAX;
-+
-+ if (png_ptr->unknown_chunk.data != NULL)
- {
-- if (png_ptr->user_chunk_cache_max == 1)
-- {
-- png_crc_finish(png_ptr, length);
-- return;
-- }
--
-- if (--png_ptr->user_chunk_cache_max == 1)
-- {
-- png_warning(png_ptr, "No space in chunk cache for unknown chunk");
-- png_crc_finish(png_ptr, length);
-- return;
-- }
-- }
--#endif
--
-- if (png_ptr->mode & PNG_HAVE_IDAT)
-- {
-- PNG_IDAT;
--
-- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) /* Not an IDAT */
-- png_ptr->mode |= PNG_AFTER_IDAT;
-- }
--
-- if (!(png_ptr->chunk_name[0] & 0x20))
-- {
--#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-- PNG_HANDLE_CHUNK_ALWAYS
--#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-- && png_ptr->read_user_chunk_fn == NULL
--#endif
-- )
--#endif
-- png_chunk_error(png_ptr, "unknown critical chunk");
-- }
--
--#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-- if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
--#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-- || (png_ptr->read_user_chunk_fn != NULL)
--#endif
-- )
-- {
--#ifdef PNG_MAX_MALLOC_64K
-- if (length > (png_uint_32)65535L)
-- {
-- png_warning(png_ptr, "unknown chunk too large to fit in memory");
-- skip = length - (png_uint_32)65535L;
-- length = (png_uint_32)65535L;
-- }
--#endif
--
-- png_memcpy((png_charp)png_ptr->unknown_chunk.name,
-- (png_charp)png_ptr->chunk_name,
-- png_sizeof(png_ptr->unknown_chunk.name));
--
-- png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name)-1]
-- = '\0';
--
-- png_ptr->unknown_chunk.size = (png_size_t)length;
--
-- if (length == 0)
-- png_ptr->unknown_chunk.data = NULL;
--
-- else
-- {
-- png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
-- png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
-- }
--
--#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-- if (png_ptr->read_user_chunk_fn != NULL)
-- {
-- /* Callback to user unknown chunk handler */
-- int ret;
--
-- ret = (*(png_ptr->read_user_chunk_fn))
-- (png_ptr, &png_ptr->unknown_chunk);
--
-- if (ret < 0)
-- png_chunk_error(png_ptr, "error in user chunk");
--
-- if (ret == 0)
-- {
-- if (!(png_ptr->chunk_name[0] & 0x20))
-- {
--#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
-- PNG_HANDLE_CHUNK_ALWAYS)
--#endif
-- png_chunk_error(png_ptr, "unknown critical chunk");
-- }
--
-- png_set_unknown_chunks(png_ptr, info_ptr,
-- &png_ptr->unknown_chunk, 1);
-- }
-- }
--
-- else
--#endif
-- png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
--
- png_free(png_ptr, png_ptr->unknown_chunk.data);
- png_ptr->unknown_chunk.data = NULL;
- }
-
-+# ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-+ if (png_ptr->user_chunk_malloc_max > 0 &&
-+ png_ptr->user_chunk_malloc_max < limit)
-+ limit = png_ptr->user_chunk_malloc_max;
-+
-+# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-+ if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-+ limit = PNG_USER_CHUNK_MALLOC_MAX;
-+# endif
-+
-+ if (length <= limit)
-+ {
-+ PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
-+ /* The following is safe because of the PNG_SIZE_MAX init above */
-+ png_ptr->unknown_chunk.size = (png_size_t)length/*SAFE*/;
-+ /* 'mode' is a flag array, only the bottom four bits matter here */
-+ png_ptr->unknown_chunk.location = (png_byte)png_ptr->mode/*SAFE*/;
-+
-+ if (length == 0)
-+ png_ptr->unknown_chunk.data = NULL;
-+
-+ else
-+ {
-+ /* Do a 'warn' here - it is handled below. */
-+ png_ptr->unknown_chunk.data = png_voidcast(png_bytep,
-+ png_malloc_warn(png_ptr, length));
-+ }
-+ }
-+
-+ if (png_ptr->unknown_chunk.data == NULL && length > 0)
-+ {
-+ /* This is benign because we clean up correctly */
-+ png_crc_finish(png_ptr, length);
-+ png_chunk_benign_error(png_ptr, "unknown chunk exceeds memory limits");
-+ return 0;
-+ }
-+
- else
--#endif
-- skip = length;
--
-- png_crc_finish(png_ptr, skip);
--
--#ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-- PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
--#endif
-+ {
-+ if (length > 0)
-+ png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);
-+ png_crc_finish(png_ptr, 0);
-+ return 1;
-+ }
-+}
-+#endif /* READ_UNKNOWN_CHUNKS */
-+
-+/* Handle an unknown, or known but disabled, chunk */
-+void /* PRIVATE */
-+png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
-+ png_uint_32 length, int keep)
-+{
-+ int handled = 0; /* the chunk was handled */
-+
-+ png_debug(1, "in png_handle_unknown");
-+
-+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-+ /* NOTE: this code is based on the code in libpng-1.4.12 except for fixing
-+ * the bug which meant that setting a non-default behavior for a specific
-+ * chunk would be ignored (the default was always used unless a user
-+ * callback was installed).
-+ *
-+ * 'keep' is the value from the png_chunk_unknown_handling, the setting for
-+ * this specific chunk_name, if PNG_HANDLE_AS_UNKNOWN_SUPPORTED, if not it
-+ * will always be PNG_HANDLE_CHUNK_AS_DEFAULT and it needs to be set here.
-+ * This is just an optimization to avoid multiple calls to the lookup
-+ * function.
-+ */
-+# ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+# ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ keep = png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name);
-+# endif
-+# endif
-+
-+ /* One of the following methods will read the chunk or skip it (at least one
-+ * of these is always defined because this is the only way to switch on
-+ * PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
-+ */
-+# ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-+ /* The user callback takes precedence over the chunk keep value, but the
-+ * keep value is still required to validate a save of a critical chunk.
-+ */
-+ if (png_ptr->read_user_chunk_fn != NULL)
-+ {
-+ if (png_cache_unknown_chunk(png_ptr, length) != 0)
-+ {
-+ /* Callback to user unknown chunk handler */
-+ int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr,
-+ &png_ptr->unknown_chunk);
-+
-+ /* ret is:
-+ * negative: An error occured, png_chunk_error will be called.
-+ * zero: The chunk was not handled, the chunk will be discarded
-+ * unless png_set_keep_unknown_chunks has been used to set
-+ * a 'keep' behavior for this particular chunk, in which
-+ * case that will be used. A critical chunk will cause an
-+ * error at this point unless it is to be saved.
-+ * positive: The chunk was handled, libpng will ignore/discard it.
-+ */
-+ if (ret < 0)
-+ png_chunk_error(png_ptr, "error in user chunk");
-+
-+ else if (ret == 0)
-+ {
-+ /* If the keep value is 'default' or 'never' override it, but
-+ * still error out on critical chunks unless the keep value is
-+ * 'always' While this is weird it is the behavior in 1.4.12.
-+ * A possible improvement would be to obey the value set for the
-+ * chunk, but this would be an API change that would probably
-+ * damage some applications.
-+ *
-+ * The png_app_warning below catches the case that matters, where
-+ * the application has not set specific save or ignore for this
-+ * chunk or global save or ignore.
-+ */
-+ if (keep < PNG_HANDLE_CHUNK_IF_SAFE)
-+ {
-+# ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ if (png_ptr->unknown_default < PNG_HANDLE_CHUNK_IF_SAFE)
-+ {
-+ png_chunk_warning(png_ptr, "Saving unknown chunk:");
-+ png_app_warning(png_ptr,
-+ "forcing save of an unhandled chunk;"
-+ " please call png_set_keep_unknown_chunks");
-+ /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */
-+ }
-+# endif
-+ keep = PNG_HANDLE_CHUNK_IF_SAFE;
-+ }
-+ }
-+
-+ else /* chunk was handled */
-+ {
-+ handled = 1;
-+ /* Critical chunks can be safely discarded at this point. */
-+ keep = PNG_HANDLE_CHUNK_NEVER;
-+ }
-+ }
-+
-+ else
-+ keep = PNG_HANDLE_CHUNK_NEVER; /* insufficient memory */
-+ }
-+
-+ else
-+ /* Use the SAVE_UNKNOWN_CHUNKS code or skip the chunk */
-+# endif /* READ_USER_CHUNKS */
-+
-+# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-+ {
-+ /* keep is currently just the per-chunk setting, if there was no
-+ * setting change it to the global default now (not that this may
-+ * still be AS_DEFAULT) then obtain the cache of the chunk if required,
-+ * if not simply skip the chunk.
-+ */
-+ if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT)
-+ keep = png_ptr->unknown_default;
-+
-+ if (keep == PNG_HANDLE_CHUNK_ALWAYS ||
-+ (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
-+ PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
-+ {
-+ if (png_cache_unknown_chunk(png_ptr, length) == 0)
-+ keep = PNG_HANDLE_CHUNK_NEVER;
-+ }
-+
-+ else
-+ png_crc_finish(png_ptr, length);
-+ }
-+# else
-+# ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-+# error no method to support READ_UNKNOWN_CHUNKS
-+# endif
-+
-+ {
-+ /* If here there is no read callback pointer set and no support is
-+ * compiled in to just save the unknown chunks, so simply skip this
-+ * chunk. If 'keep' is something other than AS_DEFAULT or NEVER then
-+ * the app has erroneously asked for unknown chunk saving when there
-+ * is no support.
-+ */
-+ if (keep > PNG_HANDLE_CHUNK_NEVER)
-+ png_app_error(png_ptr, "no unknown chunk support available");
-+
-+ png_crc_finish(png_ptr, length);
-+ }
-+# endif
-+
-+# ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-+ /* Now store the chunk in the chunk list if appropriate, and if the limits
-+ * permit it.
-+ */
-+ if (keep == PNG_HANDLE_CHUNK_ALWAYS ||
-+ (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
-+ PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
-+ {
-+# ifdef PNG_USER_LIMITS_SUPPORTED
-+ switch (png_ptr->user_chunk_cache_max)
-+ {
-+ case 2:
-+ png_ptr->user_chunk_cache_max = 1;
-+ png_chunk_benign_error(png_ptr, "no space in chunk cache");
-+ /* FALL THROUGH */
-+ case 1:
-+ /* NOTE: prior to 1.6.0 this case resulted in an unknown critical
-+ * chunk being skipped, now there will be a hard error below.
-+ */
-+ break;
-+
-+ default: /* not at limit */
-+ --(png_ptr->user_chunk_cache_max);
-+ /* FALL THROUGH */
-+ case 0: /* no limit */
-+# endif /* USER_LIMITS */
-+ /* Here when the limit isn't reached or when limits are compiled
-+ * out; store the chunk.
-+ */
-+ png_set_unknown_chunks(png_ptr, info_ptr,
-+ &png_ptr->unknown_chunk, 1);
-+ handled = 1;
-+# ifdef PNG_USER_LIMITS_SUPPORTED
-+ break;
-+ }
-+# endif
-+ }
-+# else /* no store support: the chunk must be handled by the user callback */
-+ PNG_UNUSED(info_ptr)
-+# endif
-+
-+ /* Regardless of the error handling below the cached data (if any) can be
-+ * freed now. Notice that the data is not freed if there is a png_error, but
-+ * it will be freed by destroy_read_struct.
-+ */
-+ if (png_ptr->unknown_chunk.data != NULL)
-+ png_free(png_ptr, png_ptr->unknown_chunk.data);
-+ png_ptr->unknown_chunk.data = NULL;
-+
-+#else /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */
-+ /* There is no support to read an unknown chunk, so just skip it. */
-+ png_crc_finish(png_ptr, length);
-+ PNG_UNUSED(info_ptr)
-+ PNG_UNUSED(keep)
-+#endif /* !READ_UNKNOWN_CHUNKS */
-+
-+ /* Check for unhandled critical chunks */
-+ if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
-+ png_chunk_error(png_ptr, "unhandled critical chunk");
- }
-
- /* This function is called to verify that a chunk name is valid.
-@@ -2682,267 +2996,527 @@
- * the chunk name itself is valid.
- */
-
--#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-+/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:
-+ *
-+ * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-+ */
-
- void /* PRIVATE */
--png_check_chunk_name(png_structp png_ptr, png_const_bytep chunk_name)
-+png_check_chunk_name(png_structrp png_ptr, png_uint_32 chunk_name)
- {
-+ int i;
-+
- png_debug(1, "in png_check_chunk_name");
-- if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
-- isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
-+
-+ for (i=1; i<=4; ++i)
- {
-- png_chunk_error(png_ptr, "invalid chunk type");
-+ int c = chunk_name & 0xff;
-+
-+ if (c < 65 || c > 122 || (c > 90 && c < 97))
-+ png_chunk_error(png_ptr, "invalid chunk type");
-+
-+ chunk_name >>= 8;
- }
- }
-
--/* Combines the row recently read in with the existing pixels in the
-- * row. This routine takes care of alpha and transparency if requested.
-- * This routine also handles the two methods of progressive display
-- * of interlaced images, depending on the mask value.
-- * The mask value describes which pixels are to be combined with
-- * the row. The pattern always repeats every 8 pixels, so just 8
-- * bits are needed. A one indicates the pixel is to be combined,
-- * a zero indicates the pixel is to be skipped. This is in addition
-- * to any alpha or transparency value associated with the pixel. If
-- * you want all pixels to be combined, pass 0xff (255) in mask.
-+/* Combines the row recently read in with the existing pixels in the row. This
-+ * routine takes care of alpha and transparency if requested. This routine also
-+ * handles the two methods of progressive display of interlaced images,
-+ * depending on the 'display' value; if 'display' is true then the whole row
-+ * (dp) is filled from the start by replicating the available pixels. If
-+ * 'display' is false only those pixels present in the pass are filled in.
- */
--
- void /* PRIVATE */
--png_combine_row(png_structp png_ptr, png_bytep row, int mask)
-+png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
- {
-+ unsigned int pixel_depth = png_ptr->transformed_pixel_depth;
-+ png_const_bytep sp = png_ptr->row_buf + 1;
-+ png_alloc_size_t row_width = png_ptr->width;
-+ unsigned int pass = png_ptr->pass;
-+ png_bytep end_ptr = 0;
-+ png_byte end_byte = 0;
-+ unsigned int end_mask;
-+
- png_debug(1, "in png_combine_row");
-
-- /* Added in 1.5.4: the row_info should match the information returned by any
-- * call to png_read_update_info at this point. Do not continue if we got
-+ /* Added in 1.5.6: it should not be possible to enter this routine until at
-+ * least one row has been read from the PNG data and transformed.
-+ */
-+ if (pixel_depth == 0)
-+ png_error(png_ptr, "internal row logic error");
-+
-+ /* Added in 1.5.4: the pixel depth should match the information returned by
-+ * any call to png_read_update_info at this point. Do not continue if we got
- * this wrong.
- */
- if (png_ptr->info_rowbytes != 0 && png_ptr->info_rowbytes !=
-- PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width))
-+ PNG_ROWBYTES(pixel_depth, row_width))
- png_error(png_ptr, "internal row size calculation error");
-
-- if (mask == 0xff)
-+ /* Don't expect this to ever happen: */
-+ if (row_width == 0)
-+ png_error(png_ptr, "internal row width error");
-+
-+ /* Preserve the last byte in cases where only part of it will be overwritten,
-+ * the multiply below may overflow, we don't care because ANSI-C guarantees
-+ * we get the low bits.
-+ */
-+ end_mask = (pixel_depth * row_width) & 7;
-+ if (end_mask != 0)
- {
-- png_memcpy(row, png_ptr->row_buf + 1,
-- PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width));
-+ /* end_ptr == NULL is a flag to say do nothing */
-+ end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;
-+ end_byte = *end_ptr;
-+# ifdef PNG_READ_PACKSWAP_SUPPORTED
-+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-+ /* little-endian byte */
-+ end_mask = 0xff << end_mask;
-+
-+ else /* big-endian byte */
-+# endif
-+ end_mask = 0xff >> end_mask;
-+ /* end_mask is now the bits to *keep* from the destination row */
- }
-
-- else
-+ /* For non-interlaced images this reduces to a memcpy(). A memcpy()
-+ * will also happen if interlacing isn't supported or if the application
-+ * does not call png_set_interlace_handling(). In the latter cases the
-+ * caller just gets a sequence of the unexpanded rows from each interlace
-+ * pass.
-+ */
-+#ifdef PNG_READ_INTERLACING_SUPPORTED
-+ if (png_ptr->interlaced != 0 &&
-+ (png_ptr->transformations & PNG_INTERLACE) != 0 &&
-+ pass < 6 && (display == 0 ||
-+ /* The following copies everything for 'display' on passes 0, 2 and 4. */
-+ (display == 1 && (pass & 1) != 0)))
- {
-- switch (png_ptr->row_info.pixel_depth)
-+ /* Narrow images may have no bits in a pass; the caller should handle
-+ * this, but this test is cheap:
-+ */
-+ if (row_width <= PNG_PASS_START_COL(pass))
-+ return;
-+
-+ if (pixel_depth < 8)
- {
-- case 1:
-+ /* For pixel depths up to 4 bpp the 8-pixel mask can be expanded to fit
-+ * into 32 bits, then a single loop over the bytes using the four byte
-+ * values in the 32-bit mask can be used. For the 'display' option the
-+ * expanded mask may also not require any masking within a byte. To
-+ * make this work the PACKSWAP option must be taken into account - it
-+ * simply requires the pixels to be reversed in each byte.
-+ *
-+ * The 'regular' case requires a mask for each of the first 6 passes,
-+ * the 'display' case does a copy for the even passes in the range
-+ * 0..6. This has already been handled in the test above.
-+ *
-+ * The masks are arranged as four bytes with the first byte to use in
-+ * the lowest bits (little-endian) regardless of the order (PACKSWAP or
-+ * not) of the pixels in each byte.
-+ *
-+ * NOTE: the whole of this logic depends on the caller of this function
-+ * only calling it on rows appropriate to the pass. This function only
-+ * understands the 'x' logic; the 'y' logic is handled by the caller.
-+ *
-+ * The following defines allow generation of compile time constant bit
-+ * masks for each pixel depth and each possibility of swapped or not
-+ * swapped bytes. Pass 'p' is in the range 0..6; 'x', a pixel index,
-+ * is in the range 0..7; and the result is 1 if the pixel is to be
-+ * copied in the pass, 0 if not. 'S' is for the sparkle method, 'B'
-+ * for the block method.
-+ *
-+ * With some compilers a compile time expression of the general form:
-+ *
-+ * (shift >= 32) ? (a >> (shift-32)) : (b >> shift)
-+ *
-+ * Produces warnings with values of 'shift' in the range 33 to 63
-+ * because the right hand side of the ?: expression is evaluated by
-+ * the compiler even though it isn't used. Microsoft Visual C (various
-+ * versions) and the Intel C compiler are known to do this. To avoid
-+ * this the following macros are used in 1.5.6. This is a temporary
-+ * solution to avoid destabilizing the code during the release process.
-+ */
-+# if PNG_USE_COMPILE_TIME_MASKS
-+# define PNG_LSR(x,s) ((x)>>((s) & 0x1f))
-+# define PNG_LSL(x,s) ((x)<<((s) & 0x1f))
-+# else
-+# define PNG_LSR(x,s) ((x)>>(s))
-+# define PNG_LSL(x,s) ((x)<<(s))
-+# endif
-+# define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822,(3-(p))*8+(7-(x))) :\
-+ PNG_LSR(0xaa55ff00,(7-(p))*8+(7-(x)))) & 1)
-+# define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33,(3-(p))*8+(7-(x))) :\
-+ PNG_LSR(0xff55ff00,(7-(p))*8+(7-(x)))) & 1)
-+
-+ /* Return a mask for pass 'p' pixel 'x' at depth 'd'. The mask is
-+ * little endian - the first pixel is at bit 0 - however the extra
-+ * parameter 's' can be set to cause the mask position to be swapped
-+ * within each byte, to match the PNG format. This is done by XOR of
-+ * the shift with 7, 6 or 4 for bit depths 1, 2 and 4.
-+ */
-+# define PIXEL_MASK(p,x,d,s) \
-+ (PNG_LSL(((PNG_LSL(1U,(d)))-1),(((x)*(d))^((s)?8-(d):0))))
-+
-+ /* Hence generate the appropriate 'block' or 'sparkle' pixel copy mask.
-+ */
-+# define S_MASKx(p,x,d,s) (S_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
-+# define B_MASKx(p,x,d,s) (B_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
-+
-+ /* Combine 8 of these to get the full mask. For the 1-bpp and 2-bpp
-+ * cases the result needs replicating, for the 4-bpp case the above
-+ * generates a full 32 bits.
-+ */
-+# define MASK_EXPAND(m,d) ((m)*((d)==1?0x01010101:((d)==2?0x00010001:1)))
-+
-+# define S_MASK(p,d,s) MASK_EXPAND(S_MASKx(p,0,d,s) + S_MASKx(p,1,d,s) +\
-+ S_MASKx(p,2,d,s) + S_MASKx(p,3,d,s) + S_MASKx(p,4,d,s) +\
-+ S_MASKx(p,5,d,s) + S_MASKx(p,6,d,s) + S_MASKx(p,7,d,s), d)
-+
-+# define B_MASK(p,d,s) MASK_EXPAND(B_MASKx(p,0,d,s) + B_MASKx(p,1,d,s) +\
-+ B_MASKx(p,2,d,s) + B_MASKx(p,3,d,s) + B_MASKx(p,4,d,s) +\
-+ B_MASKx(p,5,d,s) + B_MASKx(p,6,d,s) + B_MASKx(p,7,d,s), d)
-+
-+#if PNG_USE_COMPILE_TIME_MASKS
-+ /* Utility macros to construct all the masks for a depth/swap
-+ * combination. The 's' parameter says whether the format is PNG
-+ * (big endian bytes) or not. Only the three odd-numbered passes are
-+ * required for the display/block algorithm.
-+ */
-+# define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\
-+ S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) }
-+
-+# define B_MASKS(d,s) { B_MASK(1,d,s), B_MASK(3,d,s), B_MASK(5,d,s) }
-+
-+# define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))
-+
-+ /* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and
-+ * then pass:
-+ */
-+ static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
- {
-- png_bytep sp = png_ptr->row_buf + 1;
-- png_bytep dp = row;
-- int s_inc, s_start, s_end;
-- int m = 0x80;
-- int shift;
-- png_uint_32 i;
-- png_uint_32 row_width = png_ptr->width;
--
--#ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_PACKSWAP)
-+ /* Little-endian byte masks for PACKSWAP */
-+ { S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },
-+ /* Normal (big-endian byte) masks - PNG format */
-+ { S_MASKS(1,1), S_MASKS(2,1), S_MASKS(4,1) }
-+ };
-+
-+ /* display_mask has only three entries for the odd passes, so index by
-+ * pass>>1.
-+ */
-+ static PNG_CONST png_uint_32 display_mask[2][3][3] =
-+ {
-+ /* Little-endian byte masks for PACKSWAP */
-+ { B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },
-+ /* Normal (big-endian byte) masks - PNG format */
-+ { B_MASKS(1,1), B_MASKS(2,1), B_MASKS(4,1) }
-+ };
-+
-+# define MASK(pass,depth,display,png)\
-+ ((display)?display_mask[png][DEPTH_INDEX(depth)][pass>>1]:\
-+ row_mask[png][DEPTH_INDEX(depth)][pass])
-+
-+#else /* !PNG_USE_COMPILE_TIME_MASKS */
-+ /* This is the runtime alternative: it seems unlikely that this will
-+ * ever be either smaller or faster than the compile time approach.
-+ */
-+# define MASK(pass,depth,display,png)\
-+ ((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))
-+#endif /* !USE_COMPILE_TIME_MASKS */
-+
-+ /* Use the appropriate mask to copy the required bits. In some cases
-+ * the byte mask will be 0 or 0xff; optimize these cases. row_width is
-+ * the number of pixels, but the code copies bytes, so it is necessary
-+ * to special case the end.
-+ */
-+ png_uint_32 pixels_per_byte = 8 / pixel_depth;
-+ png_uint_32 mask;
-+
-+# ifdef PNG_READ_PACKSWAP_SUPPORTED
-+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-+ mask = MASK(pass, pixel_depth, display, 0);
-+
-+ else
-+# endif
-+ mask = MASK(pass, pixel_depth, display, 1);
-+
-+ for (;;)
-+ {
-+ png_uint_32 m;
-+
-+ /* It doesn't matter in the following if png_uint_32 has more than
-+ * 32 bits because the high bits always match those in m<<24; it is,
-+ * however, essential to use OR here, not +, because of this.
-+ */
-+ m = mask;
-+ mask = (m >> 8) | (m << 24); /* rotate right to good compilers */
-+ m &= 0xff;
-+
-+ if (m != 0) /* something to copy */
- {
-- s_start = 0;
-- s_end = 7;
-- s_inc = 1;
-+ if (m != 0xff)
-+ *dp = (png_byte)((*dp & ~m) | (*sp & m));
-+ else
-+ *dp = *sp;
- }
-
-- else
--#endif
-- {
-- s_start = 7;
-- s_end = 0;
-- s_inc = -1;
-- }
--
-- shift = s_start;
--
-- for (i = 0; i < row_width; i++)
-- {
-- if (m & mask)
-- {
-- int value;
--
-- value = (*sp >> shift) & 0x01;
-- *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
-- *dp |= (png_byte)(value << shift);
-- }
--
-- if (shift == s_end)
-- {
-- shift = s_start;
-- sp++;
-- dp++;
-- }
--
-- else
-- shift += s_inc;
--
-- if (m == 1)
-- m = 0x80;
--
-- else
-- m >>= 1;
-- }
-- break;
-- }
--
-- case 2:
-- {
-- png_bytep sp = png_ptr->row_buf + 1;
-- png_bytep dp = row;
-- int s_start, s_end, s_inc;
-- int m = 0x80;
-- int shift;
-- png_uint_32 i;
-- png_uint_32 row_width = png_ptr->width;
-- int value;
--
--#ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_PACKSWAP)
-- {
-- s_start = 0;
-- s_end = 6;
-- s_inc = 2;
-- }
--
-- else
--#endif
-- {
-- s_start = 6;
-- s_end = 0;
-- s_inc = -2;
-- }
--
-- shift = s_start;
--
-- for (i = 0; i < row_width; i++)
-- {
-- if (m & mask)
-- {
-- value = (*sp >> shift) & 0x03;
-- *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-- *dp |= (png_byte)(value << shift);
-- }
--
-- if (shift == s_end)
-- {
-- shift = s_start;
-- sp++;
-- dp++;
-- }
--
-- else
-- shift += s_inc;
--
-- if (m == 1)
-- m = 0x80;
--
-- else
-- m >>= 1;
-- }
-- break;
-- }
--
-- case 4:
-- {
-- png_bytep sp = png_ptr->row_buf + 1;
-- png_bytep dp = row;
-- int s_start, s_end, s_inc;
-- int m = 0x80;
-- int shift;
-- png_uint_32 i;
-- png_uint_32 row_width = png_ptr->width;
-- int value;
--
--#ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_PACKSWAP)
-- {
-- s_start = 0;
-- s_end = 4;
-- s_inc = 4;
-- }
--
-- else
--#endif
-- {
-- s_start = 4;
-- s_end = 0;
-- s_inc = -4;
-- }
-- shift = s_start;
--
-- for (i = 0; i < row_width; i++)
-- {
-- if (m & mask)
-- {
-- value = (*sp >> shift) & 0xf;
-- *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-- *dp |= (png_byte)(value << shift);
-- }
--
-- if (shift == s_end)
-- {
-- shift = s_start;
-- sp++;
-- dp++;
-- }
--
-- else
-- shift += s_inc;
--
-- if (m == 1)
-- m = 0x80;
--
-- else
-- m >>= 1;
-- }
-- break;
-- }
--
-- default:
-- {
-- png_bytep sp = png_ptr->row_buf + 1;
-- png_bytep dp = row;
-- png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
-- png_uint_32 i;
-- png_uint_32 row_width = png_ptr->width;
-- png_byte m = 0x80;
--
-- for (i = 0; i < row_width; i++)
-- {
-- if (m & mask)
-- {
-- png_memcpy(dp, sp, pixel_bytes);
-- }
--
-- sp += pixel_bytes;
-- dp += pixel_bytes;
--
-- if (m == 1)
-- m = 0x80;
--
-- else
-- m >>= 1;
-- }
-- break;
-+ /* NOTE: this may overwrite the last byte with garbage if the image
-+ * is not an exact number of bytes wide; libpng has always done
-+ * this.
-+ */
-+ if (row_width <= pixels_per_byte)
-+ break; /* May need to restore part of the last byte */
-+
-+ row_width -= pixels_per_byte;
-+ ++dp;
-+ ++sp;
- }
- }
-+
-+ else /* pixel_depth >= 8 */
-+ {
-+ unsigned int bytes_to_copy, bytes_to_jump;
-+
-+ /* Validate the depth - it must be a multiple of 8 */
-+ if (pixel_depth & 7)
-+ png_error(png_ptr, "invalid user transform pixel depth");
-+
-+ pixel_depth >>= 3; /* now in bytes */
-+ row_width *= pixel_depth;
-+
-+ /* Regardless of pass number the Adam 7 interlace always results in a
-+ * fixed number of pixels to copy then to skip. There may be a
-+ * different number of pixels to skip at the start though.
-+ */
-+ {
-+ unsigned int offset = PNG_PASS_START_COL(pass) * pixel_depth;
-+
-+ row_width -= offset;
-+ dp += offset;
-+ sp += offset;
-+ }
-+
-+ /* Work out the bytes to copy. */
-+ if (display != 0)
-+ {
-+ /* When doing the 'block' algorithm the pixel in the pass gets
-+ * replicated to adjacent pixels. This is why the even (0,2,4,6)
-+ * passes are skipped above - the entire expanded row is copied.
-+ */
-+ bytes_to_copy = (1<<((6-pass)>>1)) * pixel_depth;
-+
-+ /* But don't allow this number to exceed the actual row width. */
-+ if (bytes_to_copy > row_width)
-+ bytes_to_copy = (unsigned int)/*SAFE*/row_width;
-+ }
-+
-+ else /* normal row; Adam7 only ever gives us one pixel to copy. */
-+ bytes_to_copy = pixel_depth;
-+
-+ /* In Adam7 there is a constant offset between where the pixels go. */
-+ bytes_to_jump = PNG_PASS_COL_OFFSET(pass) * pixel_depth;
-+
-+ /* And simply copy these bytes. Some optimization is possible here,
-+ * depending on the value of 'bytes_to_copy'. Special case the low
-+ * byte counts, which we know to be frequent.
-+ *
-+ * Notice that these cases all 'return' rather than 'break' - this
-+ * avoids an unnecessary test on whether to restore the last byte
-+ * below.
-+ */
-+ switch (bytes_to_copy)
-+ {
-+ case 1:
-+ for (;;)
-+ {
-+ *dp = *sp;
-+
-+ if (row_width <= bytes_to_jump)
-+ return;
-+
-+ dp += bytes_to_jump;
-+ sp += bytes_to_jump;
-+ row_width -= bytes_to_jump;
-+ }
-+
-+ case 2:
-+ /* There is a possibility of a partial copy at the end here; this
-+ * slows the code down somewhat.
-+ */
-+ do
-+ {
-+ dp[0] = sp[0], dp[1] = sp[1];
-+
-+ if (row_width <= bytes_to_jump)
-+ return;
-+
-+ sp += bytes_to_jump;
-+ dp += bytes_to_jump;
-+ row_width -= bytes_to_jump;
-+ }
-+ while (row_width > 1);
-+
-+ /* And there can only be one byte left at this point: */
-+ *dp = *sp;
-+ return;
-+
-+ case 3:
-+ /* This can only be the RGB case, so each copy is exactly one
-+ * pixel and it is not necessary to check for a partial copy.
-+ */
-+ for (;;)
-+ {
-+ dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2];
-+
-+ if (row_width <= bytes_to_jump)
-+ return;
-+
-+ sp += bytes_to_jump;
-+ dp += bytes_to_jump;
-+ row_width -= bytes_to_jump;
-+ }
-+
-+ default:
-+#if PNG_ALIGN_TYPE != PNG_ALIGN_NONE
-+ /* Check for double byte alignment and, if possible, use a
-+ * 16-bit copy. Don't attempt this for narrow images - ones that
-+ * are less than an interlace panel wide. Don't attempt it for
-+ * wide bytes_to_copy either - use the memcpy there.
-+ */
-+ if (bytes_to_copy < 16 /*else use memcpy*/ &&
-+ png_isaligned(dp, png_uint_16) &&
-+ png_isaligned(sp, png_uint_16) &&
-+ bytes_to_copy % (sizeof (png_uint_16)) == 0 &&
-+ bytes_to_jump % (sizeof (png_uint_16)) == 0)
-+ {
-+ /* Everything is aligned for png_uint_16 copies, but try for
-+ * png_uint_32 first.
-+ */
-+ if (png_isaligned(dp, png_uint_32) != 0 &&
-+ png_isaligned(sp, png_uint_32) != 0 &&
-+ bytes_to_copy % (sizeof (png_uint_32)) == 0 &&
-+ bytes_to_jump % (sizeof (png_uint_32)) == 0)
-+ {
-+ png_uint_32p dp32 = png_aligncast(png_uint_32p,dp);
-+ png_const_uint_32p sp32 = png_aligncastconst(
-+ png_const_uint_32p, sp);
-+ size_t skip = (bytes_to_jump-bytes_to_copy) /
-+ (sizeof (png_uint_32));
-+
-+ do
-+ {
-+ size_t c = bytes_to_copy;
-+ do
-+ {
-+ *dp32++ = *sp32++;
-+ c -= (sizeof (png_uint_32));
-+ }
-+ while (c > 0);
-+
-+ if (row_width <= bytes_to_jump)
-+ return;
-+
-+ dp32 += skip;
-+ sp32 += skip;
-+ row_width -= bytes_to_jump;
-+ }
-+ while (bytes_to_copy <= row_width);
-+
-+ /* Get to here when the row_width truncates the final copy.
-+ * There will be 1-3 bytes left to copy, so don't try the
-+ * 16-bit loop below.
-+ */
-+ dp = (png_bytep)dp32;
-+ sp = (png_const_bytep)sp32;
-+ do
-+ *dp++ = *sp++;
-+ while (--row_width > 0);
-+ return;
-+ }
-+
-+ /* Else do it in 16-bit quantities, but only if the size is
-+ * not too large.
-+ */
-+ else
-+ {
-+ png_uint_16p dp16 = png_aligncast(png_uint_16p, dp);
-+ png_const_uint_16p sp16 = png_aligncastconst(
-+ png_const_uint_16p, sp);
-+ size_t skip = (bytes_to_jump-bytes_to_copy) /
-+ (sizeof (png_uint_16));
-+
-+ do
-+ {
-+ size_t c = bytes_to_copy;
-+ do
-+ {
-+ *dp16++ = *sp16++;
-+ c -= (sizeof (png_uint_16));
-+ }
-+ while (c > 0);
-+
-+ if (row_width <= bytes_to_jump)
-+ return;
-+
-+ dp16 += skip;
-+ sp16 += skip;
-+ row_width -= bytes_to_jump;
-+ }
-+ while (bytes_to_copy <= row_width);
-+
-+ /* End of row - 1 byte left, bytes_to_copy > row_width: */
-+ dp = (png_bytep)dp16;
-+ sp = (png_const_bytep)sp16;
-+ do
-+ *dp++ = *sp++;
-+ while (--row_width > 0);
-+ return;
-+ }
-+ }
-+#endif /* ALIGN_TYPE code */
-+
-+ /* The true default - use a memcpy: */
-+ for (;;)
-+ {
-+ memcpy(dp, sp, bytes_to_copy);
-+
-+ if (row_width <= bytes_to_jump)
-+ return;
-+
-+ sp += bytes_to_jump;
-+ dp += bytes_to_jump;
-+ row_width -= bytes_to_jump;
-+ if (bytes_to_copy > row_width)
-+ bytes_to_copy = (unsigned int)/*SAFE*/row_width;
-+ }
-+ }
-+
-+ /* NOT REACHED*/
-+ } /* pixel_depth >= 8 */
-+
-+ /* Here if pixel_depth < 8 to check 'end_ptr' below. */
- }
-+ else
-+#endif /* READ_INTERLACING */
-+
-+ /* If here then the switch above wasn't used so just memcpy the whole row
-+ * from the temporary row buffer (notice that this overwrites the end of the
-+ * destination row if it is a partial byte.)
-+ */
-+ memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));
-+
-+ /* Restore the overwritten bits from the last byte if necessary. */
-+ if (end_ptr != NULL)
-+ *end_ptr = (png_byte)((end_byte & end_mask) | (*end_ptr & ~end_mask));
- }
-
- #ifdef PNG_READ_INTERLACING_SUPPORTED
- void /* PRIVATE */
--png_do_read_interlace(png_structp png_ptr)
-+png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
-+ png_uint_32 transformations /* Because these may affect the byte layout */)
- {
-- png_row_infop row_info = &(png_ptr->row_info);
-- png_bytep row = png_ptr->row_buf + 1;
-- int pass = png_ptr->pass;
-- png_uint_32 transformations = png_ptr->transformations;
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
- /* Offset to next interlace block */
-- PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
- png_debug(1, "in png_do_read_interlace");
- if (row != NULL && row_info != NULL)
-@@ -2965,7 +3539,7 @@
- int j;
-
- #ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (transformations & PNG_PACKSWAP)
-+ if ((transformations & PNG_PACKSWAP) != 0)
- {
- sshift = (int)((row_info->width + 7) & 0x07);
- dshift = (int)((final_width + 7) & 0x07);
-@@ -2989,8 +3563,9 @@
- v = (png_byte)((*sp >> sshift) & 0x01);
- for (j = 0; j < jstop; j++)
- {
-- *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
-- *dp |= (png_byte)(v << dshift);
-+ unsigned int tmp = *dp & (0x7f7f >> (7 - dshift));
-+ tmp |= v << dshift;
-+ *dp = (png_byte)(tmp & 0xff);
-
- if (dshift == s_end)
- {
-@@ -3024,7 +3599,7 @@
- png_uint_32 i;
-
- #ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (transformations & PNG_PACKSWAP)
-+ if ((transformations & PNG_PACKSWAP) != 0)
- {
- sshift = (int)(((row_info->width + 3) & 0x03) << 1);
- dshift = (int)(((final_width + 3) & 0x03) << 1);
-@@ -3051,8 +3626,9 @@
- v = (png_byte)((*sp >> sshift) & 0x03);
- for (j = 0; j < jstop; j++)
- {
-- *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
-- *dp |= (png_byte)(v << dshift);
-+ unsigned int tmp = *dp & (0x3f3f >> (6 - dshift));
-+ tmp |= v << dshift;
-+ *dp = (png_byte)(tmp & 0xff);
-
- if (dshift == s_end)
- {
-@@ -3086,7 +3662,7 @@
- int jstop = png_pass_inc[pass];
-
- #ifdef PNG_READ_PACKSWAP_SUPPORTED
-- if (transformations & PNG_PACKSWAP)
-+ if ((transformations & PNG_PACKSWAP) != 0)
- {
- sshift = (int)(((row_info->width + 1) & 0x01) << 2);
- dshift = (int)(((final_width + 1) & 0x01) << 2);
-@@ -3107,13 +3683,14 @@
-
- for (i = 0; i < row_info->width; i++)
- {
-- png_byte v = (png_byte)((*sp >> sshift) & 0xf);
-+ png_byte v = (png_byte)((*sp >> sshift) & 0x0f);
- int j;
-
- for (j = 0; j < jstop; j++)
- {
-- *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
-- *dp |= (png_byte)(v << dshift);
-+ unsigned int tmp = *dp & (0xf0f >> (4 - dshift));
-+ tmp |= v << dshift;
-+ *dp = (png_byte)(tmp & 0xff);
-
- if (dshift == s_end)
- {
-@@ -3136,6 +3713,7 @@
- }
- break;
- }
-+
- default:
- {
- png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
-@@ -3150,14 +3728,14 @@
-
- for (i = 0; i < row_info->width; i++)
- {
-- png_byte v[8];
-+ png_byte v[8]; /* SAFE; pixel_depth does not exceed 64 */
- int j;
-
-- png_memcpy(v, sp, pixel_bytes);
-+ memcpy(v, sp, pixel_bytes);
-
- for (j = 0; j < jstop; j++)
- {
-- png_memcpy(dp, v, pixel_bytes);
-+ memcpy(dp, v, pixel_bytes);
- dp -= pixel_bytes;
- }
-
-@@ -3166,6 +3744,7 @@
- break;
- }
- }
-+
- row_info->width = final_width;
- row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
- }
-@@ -3173,167 +3752,427 @@
- PNG_UNUSED(transformations) /* Silence compiler warning */
- #endif
- }
--#endif /* PNG_READ_INTERLACING_SUPPORTED */
-+#endif /* READ_INTERLACING */
-+
-+static void
-+png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
-+ png_const_bytep prev_row)
-+{
-+ png_size_t i;
-+ png_size_t istop = row_info->rowbytes;
-+ unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-+ png_bytep rp = row + bpp;
-+
-+ PNG_UNUSED(prev_row)
-+
-+ for (i = bpp; i < istop; i++)
-+ {
-+ *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-+ rp++;
-+ }
-+}
-+
-+static void
-+png_read_filter_row_up(png_row_infop row_info, png_bytep row,
-+ png_const_bytep prev_row)
-+{
-+ png_size_t i;
-+ png_size_t istop = row_info->rowbytes;
-+ png_bytep rp = row;
-+ png_const_bytep pp = prev_row;
-+
-+ for (i = 0; i < istop; i++)
-+ {
-+ *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-+ rp++;
-+ }
-+}
-+
-+static void
-+png_read_filter_row_avg(png_row_infop row_info, png_bytep row,
-+ png_const_bytep prev_row)
-+{
-+ png_size_t i;
-+ png_bytep rp = row;
-+ png_const_bytep pp = prev_row;
-+ unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-+ png_size_t istop = row_info->rowbytes - bpp;
-+
-+ for (i = 0; i < bpp; i++)
-+ {
-+ *rp = (png_byte)(((int)(*rp) +
-+ ((int)(*pp++) / 2 )) & 0xff);
-+
-+ rp++;
-+ }
-+
-+ for (i = 0; i < istop; i++)
-+ {
-+ *rp = (png_byte)(((int)(*rp) +
-+ (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-+
-+ rp++;
-+ }
-+}
-+
-+static void
-+png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
-+ png_const_bytep prev_row)
-+{
-+ png_bytep rp_end = row + row_info->rowbytes;
-+ int a, c;
-+
-+ /* First pixel/byte */
-+ c = *prev_row++;
-+ a = *row + c;
-+ *row++ = (png_byte)a;
-+
-+ /* Remainder */
-+ while (row < rp_end)
-+ {
-+ int b, pa, pb, pc, p;
-+
-+ a &= 0xff; /* From previous iteration or start */
-+ b = *prev_row++;
-+
-+ p = b - c;
-+ pc = a - c;
-+
-+# ifdef PNG_USE_ABS
-+ pa = abs(p);
-+ pb = abs(pc);
-+ pc = abs(p + pc);
-+# else
-+ pa = p < 0 ? -p : p;
-+ pb = pc < 0 ? -pc : pc;
-+ pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-+# endif
-+
-+ /* Find the best predictor, the least of pa, pb, pc favoring the earlier
-+ * ones in the case of a tie.
-+ */
-+ if (pb < pa) pa = pb, a = b;
-+ if (pc < pa) a = c;
-+
-+ /* Calculate the current pixel in a, and move the previous row pixel to c
-+ * for the next time round the loop
-+ */
-+ c = b;
-+ a += *row;
-+ *row++ = (png_byte)a;
-+ }
-+}
-+
-+static void
-+png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
-+ png_const_bytep prev_row)
-+{
-+ int bpp = (row_info->pixel_depth + 7) >> 3;
-+ png_bytep rp_end = row + bpp;
-+
-+ /* Process the first pixel in the row completely (this is the same as 'up'
-+ * because there is only one candidate predictor for the first row).
-+ */
-+ while (row < rp_end)
-+ {
-+ int a = *row + *prev_row++;
-+ *row++ = (png_byte)a;
-+ }
-+
-+ /* Remainder */
-+ rp_end += row_info->rowbytes - bpp;
-+
-+ while (row < rp_end)
-+ {
-+ int a, b, c, pa, pb, pc, p;
-+
-+ c = *(prev_row - bpp);
-+ a = *(row - bpp);
-+ b = *prev_row++;
-+
-+ p = b - c;
-+ pc = a - c;
-+
-+# ifdef PNG_USE_ABS
-+ pa = abs(p);
-+ pb = abs(pc);
-+ pc = abs(p + pc);
-+# else
-+ pa = p < 0 ? -p : p;
-+ pb = pc < 0 ? -pc : pc;
-+ pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-+# endif
-+
-+ if (pb < pa) pa = pb, a = b;
-+ if (pc < pa) a = c;
-+
-+ a += *row;
-+ *row++ = (png_byte)a;
-+ }
-+}
-+
-+static void
-+png_init_filter_functions(png_structrp pp)
-+ /* This function is called once for every PNG image (except for PNG images
-+ * that only use PNG_FILTER_VALUE_NONE for all rows) to set the
-+ * implementations required to reverse the filtering of PNG rows. Reversing
-+ * the filter is the first transformation performed on the row data. It is
-+ * performed in place, therefore an implementation can be selected based on
-+ * the image pixel format. If the implementation depends on image width then
-+ * take care to ensure that it works correctly if the image is interlaced -
-+ * interlacing causes the actual row width to vary.
-+ */
-+{
-+ unsigned int bpp = (pp->pixel_depth + 7) >> 3;
-+
-+ pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub;
-+ pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up;
-+ pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg;
-+ if (bpp == 1)
-+ pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-+ png_read_filter_row_paeth_1byte_pixel;
-+ else
-+ pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-+ png_read_filter_row_paeth_multibyte_pixel;
-+
-+#ifdef PNG_FILTER_OPTIMIZATIONS
-+ /* To use this define PNG_FILTER_OPTIMIZATIONS as the name of a function to
-+ * call to install hardware optimizations for the above functions; simply
-+ * replace whatever elements of the pp->read_filter[] array with a hardware
-+ * specific (or, for that matter, generic) optimization.
-+ *
-+ * To see an example of this examine what configure.ac does when
-+ * --enable-arm-neon is specified on the command line.
-+ */
-+ PNG_FILTER_OPTIMIZATIONS(pp, bpp);
-+#endif
-+}
-
- void /* PRIVATE */
--png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
-- png_const_bytep prev_row, int filter)
-+png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,
-+ png_const_bytep prev_row, int filter)
- {
-- png_debug(1, "in png_read_filter_row");
-- png_debug2(2, "row = %u, filter = %d", png_ptr->row_number, filter);
-- switch (filter)
-+ /* OPTIMIZATION: DO NOT MODIFY THIS FUNCTION, instead #define
-+ * PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic
-+ * implementations. See png_init_filter_functions above.
-+ */
-+ if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)
- {
-- case PNG_FILTER_VALUE_NONE:
-- break;
--
-- case PNG_FILTER_VALUE_SUB:
-+ if (pp->read_filter[0] == NULL)
-+ png_init_filter_functions(pp);
-+
-+ pp->read_filter[filter-1](row_info, row, prev_row);
-+ }
-+}
-+
-+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+void /* PRIVATE */
-+png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
-+ png_alloc_size_t avail_out)
-+{
-+ /* Loop reading IDATs and decompressing the result into output[avail_out] */
-+ png_ptr->zstream.next_out = output;
-+ png_ptr->zstream.avail_out = 0; /* safety: set below */
-+
-+ if (output == NULL)
-+ avail_out = 0;
-+
-+ do
-+ {
-+ int ret;
-+ png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
-+
-+ if (png_ptr->zstream.avail_in == 0)
- {
-- png_size_t i;
-- png_size_t istop = row_info->rowbytes;
-- unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-- png_bytep rp = row + bpp;
-- png_bytep lp = row;
--
-- for (i = bpp; i < istop; i++)
-+ uInt avail_in;
-+ png_bytep buffer;
-+
-+ while (png_ptr->idat_size == 0)
- {
-- *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
-- rp++;
-+ png_crc_finish(png_ptr, 0);
-+
-+ png_ptr->idat_size = png_read_chunk_header(png_ptr);
-+ /* This is an error even in the 'check' case because the code just
-+ * consumed a non-IDAT header.
-+ */
-+ if (png_ptr->chunk_name != png_IDAT)
-+ png_error(png_ptr, "Not enough image data");
- }
-+
-+ avail_in = png_ptr->IDAT_read_size;
-+
-+ if (avail_in > png_ptr->idat_size)
-+ avail_in = (uInt)png_ptr->idat_size;
-+
-+ /* A PNG with a gradually increasing IDAT size will defeat this attempt
-+ * to minimize memory usage by causing lots of re-allocs, but
-+ * realistically doing IDAT_read_size re-allocs is not likely to be a
-+ * big problem.
-+ */
-+ buffer = png_read_buffer(png_ptr, avail_in, 0/*error*/);
-+
-+ png_crc_read(png_ptr, buffer, avail_in);
-+ png_ptr->idat_size -= avail_in;
-+
-+ png_ptr->zstream.next_in = buffer;
-+ png_ptr->zstream.avail_in = avail_in;
-+ }
-+
-+ /* And set up the output side. */
-+ if (output != NULL) /* standard read */
-+ {
-+ uInt out = ZLIB_IO_MAX;
-+
-+ if (out > avail_out)
-+ out = (uInt)avail_out;
-+
-+ avail_out -= out;
-+ png_ptr->zstream.avail_out = out;
-+ }
-+
-+ else /* after last row, checking for end */
-+ {
-+ png_ptr->zstream.next_out = tmpbuf;
-+ png_ptr->zstream.avail_out = (sizeof tmpbuf);
-+ }
-+
-+ /* Use NO_FLUSH; this gives zlib the maximum opportunity to optimize the
-+ * process. If the LZ stream is truncated the sequential reader will
-+ * terminally damage the stream, above, by reading the chunk header of the
-+ * following chunk (it then exits with png_error).
-+ *
-+ * TODO: deal more elegantly with truncated IDAT lists.
-+ */
-+ ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
-+
-+ /* Take the unconsumed output back. */
-+ if (output != NULL)
-+ avail_out += png_ptr->zstream.avail_out;
-+
-+ else /* avail_out counts the extra bytes */
-+ avail_out += (sizeof tmpbuf) - png_ptr->zstream.avail_out;
-+
-+ png_ptr->zstream.avail_out = 0;
-+
-+ if (ret == Z_STREAM_END)
-+ {
-+ /* Do this for safety; we won't read any more into this row. */
-+ png_ptr->zstream.next_out = NULL;
-+
-+ png_ptr->mode |= PNG_AFTER_IDAT;
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-+
-+ if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
-+ png_chunk_benign_error(png_ptr, "Extra compressed data");
- break;
- }
-- case PNG_FILTER_VALUE_UP:
-+
-+ if (ret != Z_OK)
- {
-- png_size_t i;
-- png_size_t istop = row_info->rowbytes;
-- png_bytep rp = row;
-- png_const_bytep pp = prev_row;
--
-- for (i = 0; i < istop; i++)
-+ png_zstream_error(png_ptr, ret);
-+
-+ if (output != NULL)
-+ png_chunk_error(png_ptr, png_ptr->zstream.msg);
-+
-+ else /* checking */
- {
-- *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-- rp++;
-+ png_chunk_benign_error(png_ptr, png_ptr->zstream.msg);
-+ return;
- }
-- break;
- }
-- case PNG_FILTER_VALUE_AVG:
-- {
-- png_size_t i;
-- png_bytep rp = row;
-- png_const_bytep pp = prev_row;
-- png_bytep lp = row;
-- unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-- png_size_t istop = row_info->rowbytes - bpp;
--
-- for (i = 0; i < bpp; i++)
-- {
-- *rp = (png_byte)(((int)(*rp) +
-- ((int)(*pp++) / 2 )) & 0xff);
--
-- rp++;
-- }
--
-- for (i = 0; i < istop; i++)
-- {
-- *rp = (png_byte)(((int)(*rp) +
-- (int)(*pp++ + *lp++) / 2 ) & 0xff);
--
-- rp++;
-- }
-- break;
-- }
-- case PNG_FILTER_VALUE_PAETH:
-- {
-- png_size_t i;
-- png_bytep rp = row;
-- png_const_bytep pp = prev_row;
-- png_bytep lp = row;
-- png_const_bytep cp = prev_row;
-- unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-- png_size_t istop=row_info->rowbytes - bpp;
--
-- for (i = 0; i < bpp; i++)
-- {
-- *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-- rp++;
-- }
--
-- for (i = 0; i < istop; i++) /* Use leftover rp,pp */
-- {
-- int a, b, c, pa, pb, pc, p;
--
-- a = *lp++;
-- b = *pp++;
-- c = *cp++;
--
-- p = b - c;
-- pc = a - c;
--
--#ifdef PNG_USE_ABS
-- pa = abs(p);
-- pb = abs(pc);
-- pc = abs(p + pc);
--#else
-- pa = p < 0 ? -p : p;
-- pb = pc < 0 ? -pc : pc;
-- pc = (p + pc) < 0 ? -(p + pc) : p + pc;
--#endif
--
-- /*
-- if (pa <= pb && pa <= pc)
-- p = a;
--
-- else if (pb <= pc)
-- p = b;
--
-- else
-- p = c;
-- */
--
-- p = (pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
--
-- *rp = (png_byte)(((int)(*rp) + p) & 0xff);
-- rp++;
-- }
-- break;
-- }
-- default:
-- png_error(png_ptr, "Ignoring bad adaptive filter type");
-- /*NOT REACHED */
-- break;
-+ } while (avail_out > 0);
-+
-+ if (avail_out > 0)
-+ {
-+ /* The stream ended before the image; this is the same as too few IDATs so
-+ * should be handled the same way.
-+ */
-+ if (output != NULL)
-+ png_error(png_ptr, "Not enough image data");
-+
-+ else /* the deflate stream contained extra data */
-+ png_chunk_benign_error(png_ptr, "Too much image data");
- }
- }
-
--#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- void /* PRIVATE */
--png_read_finish_row(png_structp png_ptr)
-+png_read_finish_IDAT(png_structrp png_ptr)
- {
--#ifdef PNG_READ_INTERLACING_SUPPORTED
-+ /* We don't need any more data and the stream should have ended, however the
-+ * LZ end code may actually not have been processed. In this case we must
-+ * read it otherwise stray unread IDAT data or, more likely, an IDAT chunk
-+ * may still remain to be consumed.
-+ */
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
-+ {
-+ /* The NULL causes png_read_IDAT_data to swallow any remaining bytes in
-+ * the compressed stream, but the stream may be damaged too, so even after
-+ * this call we may need to terminate the zstream ownership.
-+ */
-+ png_read_IDAT_data(png_ptr, NULL, 0);
-+ png_ptr->zstream.next_out = NULL; /* safety */
-+
-+ /* Now clear everything out for safety; the following may not have been
-+ * done.
-+ */
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
-+ {
-+ png_ptr->mode |= PNG_AFTER_IDAT;
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-+ }
-+ }
-+
-+ /* If the zstream has not been released do it now *and* terminate the reading
-+ * of the final IDAT chunk.
-+ */
-+ if (png_ptr->zowner == png_IDAT)
-+ {
-+ /* Always do this; the pointers otherwise point into the read buffer. */
-+ png_ptr->zstream.next_in = NULL;
-+ png_ptr->zstream.avail_in = 0;
-+
-+ /* Now we no longer own the zstream. */
-+ png_ptr->zowner = 0;
-+
-+ /* The slightly weird semantics of the sequential IDAT reading is that we
-+ * are always in or at the end of an IDAT chunk, so we always need to do a
-+ * crc_finish here. If idat_size is non-zero we also need to read the
-+ * spurious bytes at the end of the chunk now.
-+ */
-+ (void)png_crc_finish(png_ptr, png_ptr->idat_size);
-+ }
-+}
-+
-+void /* PRIVATE */
-+png_read_finish_row(png_structrp png_ptr)
-+{
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
- /* Start of interlace block */
-- PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-+ static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
- /* Offset to next interlace block */
-- PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
- /* Start of interlace block in the y direction */
-- PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-+ static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
- /* Offset to next interlace block in the y direction */
-- PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
--#endif /* PNG_READ_INTERLACING_SUPPORTED */
-+ static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-
- png_debug(1, "in png_read_finish_row");
- png_ptr->row_number++;
- if (png_ptr->row_number < png_ptr->num_rows)
- return;
-
--#ifdef PNG_READ_INTERLACING_SUPPORTED
-- if (png_ptr->interlaced)
-+ if (png_ptr->interlaced != 0)
- {
- png_ptr->row_number = 0;
-
-- png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-+ /* TO DO: don't do this if prev_row isn't needed (requires
-+ * read-ahead of the next row's filter byte.
-+ */
-+ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
- do
- {
-@@ -3347,7 +4186,7 @@
- png_pass_start[png_ptr->pass]) /
- png_pass_inc[png_ptr->pass];
-
-- if (!(png_ptr->transformations & PNG_INTERLACE))
-+ if ((png_ptr->transformations & PNG_INTERLACE) == 0)
- {
- png_ptr->num_rows = (png_ptr->height +
- png_pass_yinc[png_ptr->pass] - 1 -
-@@ -3363,108 +4202,40 @@
- if (png_ptr->pass < 7)
- return;
- }
--#endif /* PNG_READ_INTERLACING_SUPPORTED */
--
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-- {
-- PNG_IDAT;
-- char extra;
-- int ret;
--
-- png_ptr->zstream.next_out = (Byte *)&extra;
-- png_ptr->zstream.avail_out = (uInt)1;
--
-- for (;;)
-- {
-- if (!(png_ptr->zstream.avail_in))
-- {
-- while (!png_ptr->idat_size)
-- {
-- png_crc_finish(png_ptr, 0);
-- png_ptr->idat_size = png_read_chunk_header(png_ptr);
-- if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-- png_error(png_ptr, "Not enough image data");
-- }
--
-- png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-- png_ptr->zstream.next_in = png_ptr->zbuf;
--
-- if (png_ptr->zbuf_size > png_ptr->idat_size)
-- png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
--
-- png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
-- png_ptr->idat_size -= png_ptr->zstream.avail_in;
-- }
--
-- ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
--
-- if (ret == Z_STREAM_END)
-- {
-- if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
-- png_ptr->idat_size)
-- png_warning(png_ptr, "Extra compressed data");
--
-- png_ptr->mode |= PNG_AFTER_IDAT;
-- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-- break;
-- }
--
-- if (ret != Z_OK)
-- png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-- "Decompression Error");
--
-- if (!(png_ptr->zstream.avail_out))
-- {
-- png_warning(png_ptr, "Extra compressed data");
-- png_ptr->mode |= PNG_AFTER_IDAT;
-- png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-- break;
-- }
--
-- }
-- png_ptr->zstream.avail_out = 0;
-- }
--
-- if (png_ptr->idat_size || png_ptr->zstream.avail_in)
-- png_warning(png_ptr, "Extra compression data");
--
-- inflateReset(&png_ptr->zstream);
--
-- png_ptr->mode |= PNG_AFTER_IDAT;
-+
-+ /* Here after at the end of the last row of the last pass. */
-+ png_read_finish_IDAT(png_ptr);
- }
--#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-+#endif /* SEQUENTIAL_READ */
-
- void /* PRIVATE */
--png_read_start_row(png_structp png_ptr)
-+png_read_start_row(png_structrp png_ptr)
- {
--#ifdef PNG_READ_INTERLACING_SUPPORTED
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
- /* Start of interlace block */
-- PNG_CONST int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-+ static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
- /* Offset to next interlace block */
-- PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
- /* Start of interlace block in the y direction */
-- PNG_CONST int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-+ static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
- /* Offset to next interlace block in the y direction */
-- PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
--#endif
-+ static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-
- int max_pixel_depth;
- png_size_t row_bytes;
-
- png_debug(1, "in png_read_start_row");
-- png_ptr->zstream.avail_in = 0;
-+
- #ifdef PNG_READ_TRANSFORMS_SUPPORTED
- png_init_read_transformations(png_ptr);
- #endif
--#ifdef PNG_READ_INTERLACING_SUPPORTED
-- if (png_ptr->interlaced)
-+ if (png_ptr->interlaced != 0)
- {
-- if (!(png_ptr->transformations & PNG_INTERLACE))
-+ if ((png_ptr->transformations & PNG_INTERLACE) == 0)
- png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
- png_pass_ystart[0]) / png_pass_yinc[0];
-
-@@ -3478,7 +4249,6 @@
- }
-
- else
--#endif /* PNG_READ_INTERLACING_SUPPORTED */
- {
- png_ptr->num_rows = png_ptr->height;
- png_ptr->iwidth = png_ptr->width;
-@@ -3486,17 +4256,27 @@
-
- max_pixel_depth = png_ptr->pixel_depth;
-
-+ /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of
-+ * calculations to calculate the final pixel depth, then
-+ * png_do_read_transforms actually does the transforms. This means that the
-+ * code which effectively calculates this value is actually repeated in three
-+ * separate places. They must all match. Innocent changes to the order of
-+ * transformations can and will break libpng in a way that causes memory
-+ * overwrites.
-+ *
-+ * TODO: fix this.
-+ */
- #ifdef PNG_READ_PACK_SUPPORTED
-- if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
-+ if ((png_ptr->transformations & PNG_PACK) != 0 && png_ptr->bit_depth < 8)
- max_pixel_depth = 8;
- #endif
-
- #ifdef PNG_READ_EXPAND_SUPPORTED
-- if (png_ptr->transformations & PNG_EXPAND)
-+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
- {
- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- {
-- if (png_ptr->num_trans)
-+ if (png_ptr->num_trans != 0)
- max_pixel_depth = 32;
-
- else
-@@ -3508,13 +4288,13 @@
- if (max_pixel_depth < 8)
- max_pixel_depth = 8;
-
-- if (png_ptr->num_trans)
-+ if (png_ptr->num_trans != 0)
- max_pixel_depth *= 2;
- }
-
- else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
- {
-- if (png_ptr->num_trans)
-+ if (png_ptr->num_trans != 0)
- {
- max_pixel_depth *= 4;
- max_pixel_depth /= 3;
-@@ -3524,13 +4304,13 @@
- #endif
-
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
-- if (png_ptr->transformations & PNG_EXPAND_16)
-+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
- {
- # ifdef PNG_READ_EXPAND_SUPPORTED
- /* In fact it is an error if it isn't supported, but checking is
- * the safe way.
- */
-- if (png_ptr->transformations & PNG_EXPAND)
-+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
- {
- if (png_ptr->bit_depth < 16)
- max_pixel_depth *= 2;
-@@ -3542,12 +4322,9 @@
- #endif
-
- #ifdef PNG_READ_FILLER_SUPPORTED
-- if (png_ptr->transformations & (PNG_FILLER))
-+ if ((png_ptr->transformations & (PNG_FILLER)) != 0)
- {
-- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-- max_pixel_depth = 32;
--
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+ if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
- {
- if (max_pixel_depth <= 8)
- max_pixel_depth = 16;
-@@ -3556,7 +4333,8 @@
- max_pixel_depth = 32;
- }
-
-- else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+ else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB ||
-+ png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- {
- if (max_pixel_depth <= 32)
- max_pixel_depth = 32;
-@@ -3568,14 +4346,15 @@
- #endif
-
- #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-- if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
- {
- if (
- #ifdef PNG_READ_EXPAND_SUPPORTED
-- (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
-+ (png_ptr->num_trans != 0 &&
-+ (png_ptr->transformations & PNG_EXPAND) != 0) ||
- #endif
- #ifdef PNG_READ_FILLER_SUPPORTED
-- (png_ptr->transformations & (PNG_FILLER)) ||
-+ (png_ptr->transformations & (PNG_FILLER)) != 0 ||
- #endif
- png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
- {
-@@ -3608,16 +4387,22 @@
-
- #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
- defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-- if (png_ptr->transformations & PNG_USER_TRANSFORM)
-+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
- {
-- int user_pixel_depth = png_ptr->user_transform_depth*
-+ int user_pixel_depth = png_ptr->user_transform_depth *
- png_ptr->user_transform_channels;
-
- if (user_pixel_depth > max_pixel_depth)
-- max_pixel_depth=user_pixel_depth;
-+ max_pixel_depth = user_pixel_depth;
- }
- #endif
-
-+ /* This value is stored in png_struct and double checked in the row read
-+ * code.
-+ */
-+ png_ptr->maximum_pixel_depth = (png_byte)max_pixel_depth;
-+ png_ptr->transformed_pixel_depth = 0; /* calculated on demand */
-+
- /* Align the width on the next larger 8 pixels. Mainly used
- * for interlacing
- */
-@@ -3636,28 +4421,39 @@
- if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
- {
- png_free(png_ptr, png_ptr->big_row_buf);
--
-- if (png_ptr->interlaced)
-+ png_free(png_ptr, png_ptr->big_prev_row);
-+
-+ if (png_ptr->interlaced != 0)
- png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
- row_bytes + 48);
-
- else
-- png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr,
-- row_bytes + 48);
--
-- png_ptr->old_big_row_buf_size = row_bytes + 48;
-+ png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
-+
-+ png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
-
- #ifdef PNG_ALIGNED_MEMORY_SUPPORTED
- /* Use 16-byte aligned memory for row_buf with at least 16 bytes
-- * of padding before and after row_buf.
-+ * of padding before and after row_buf; treat prev_row similarly.
-+ * NOTE: the alignment is to the start of the pixels, one beyond the start
-+ * of the buffer, because of the filter byte. Prior to libpng 1.5.6 this
-+ * was incorrect; the filter byte was aligned, which had the exact
-+ * opposite effect of that intended.
- */
-- png_ptr->row_buf = png_ptr->big_row_buf + 32 -
-- (((png_alloc_size_t)png_ptr->big_row_buf + 15) & 0x0F);
--
-- png_ptr->old_big_row_buf_size = row_bytes + 48;
-+ {
-+ png_bytep temp = png_ptr->big_row_buf + 32;
-+ int extra = (int)((temp - (png_bytep)0) & 0x0f);
-+ png_ptr->row_buf = temp - extra - 1/*filter byte*/;
-+
-+ temp = png_ptr->big_prev_row + 32;
-+ extra = (int)((temp - (png_bytep)0) & 0x0f);
-+ png_ptr->prev_row = temp - extra - 1/*filter byte*/;
-+ }
-+
- #else
-- /* Use 32 bytes of padding before and 16 bytes after row_buf. */
-- png_ptr->row_buf = png_ptr->big_row_buf + 32;
-+ /* Use 31 bytes of padding before and 17 bytes after row_buf. */
-+ png_ptr->row_buf = png_ptr->big_row_buf + 31;
-+ png_ptr->prev_row = png_ptr->big_prev_row + 31;
- #endif
- png_ptr->old_big_row_buf_size = row_bytes + 48;
- }
-@@ -3670,16 +4466,7 @@
- if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))
- png_error(png_ptr, "Row has too many bytes to allocate in memory");
-
-- if (png_ptr->rowbytes + 1 > png_ptr->old_prev_row_size)
-- {
-- png_free(png_ptr, png_ptr->prev_row);
--
-- png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1);
--
-- png_ptr->old_prev_row_size = png_ptr->rowbytes + 1;
-- }
--
-- png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-+ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
- png_debug1(3, "width = %u,", png_ptr->width);
- png_debug1(3, "height = %u,", png_ptr->height);
-@@ -3689,6 +4476,27 @@
- png_debug1(3, "irowbytes = %lu",
- (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
-
-+ /* The sequential reader needs a buffer for IDAT, but the progressive reader
-+ * does not, so free the read buffer now regardless; the sequential reader
-+ * reallocates it on demand.
-+ */
-+ if (png_ptr->read_buffer != 0)
-+ {
-+ png_bytep buffer = png_ptr->read_buffer;
-+
-+ png_ptr->read_buffer_size = 0;
-+ png_ptr->read_buffer = NULL;
-+ png_free(png_ptr, buffer);
-+ }
-+
-+ /* Finally claim the zstream for the inflate of the IDAT data, use the bits
-+ * value from the stream (note that this will result in a fatal error if the
-+ * IDAT stream has a bogus deflate header window_bits value, but this should
-+ * not be happening any longer!)
-+ */
-+ if (png_inflate_claim(png_ptr, png_IDAT) != Z_OK)
-+ png_error(png_ptr, png_ptr->zstream.msg);
-+
- png_ptr->flags |= PNG_FLAG_ROW_INIT;
- }
--#endif /* PNG_READ_SUPPORTED */
-+#endif /* READ */
---- ./jdk/src/share/native/sun/awt/libpng/pngset.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngset.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -50,51 +50,84 @@
-
- #ifdef PNG_bKGD_SUPPORTED
- void PNGAPI
--png_set_bKGD(png_structp png_ptr, png_infop info_ptr,
-+png_set_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
- png_const_color_16p background)
- {
- png_debug1(1, "in %s storage function", "bKGD");
-
-- if (png_ptr == NULL || info_ptr == NULL)
-+ if (png_ptr == NULL || info_ptr == NULL || background == NULL)
- return;
-
-- png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
-+ info_ptr->background = *background;
- info_ptr->valid |= PNG_INFO_bKGD;
- }
- #endif
-
- #ifdef PNG_cHRM_SUPPORTED
- void PNGFAPI
--png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
-+png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
- png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
- png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
- png_fixed_point blue_x, png_fixed_point blue_y)
- {
-+ png_xy xy;
-+
- png_debug1(1, "in %s storage function", "cHRM fixed");
-
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
--# ifdef PNG_CHECK_cHRM_SUPPORTED
-- if (png_check_cHRM_fixed(png_ptr,
-- white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
--# endif
-- {
-- info_ptr->x_white = white_x;
-- info_ptr->y_white = white_y;
-- info_ptr->x_red = red_x;
-- info_ptr->y_red = red_y;
-- info_ptr->x_green = green_x;
-- info_ptr->y_green = green_y;
-- info_ptr->x_blue = blue_x;
-- info_ptr->y_blue = blue_y;
-- info_ptr->valid |= PNG_INFO_cHRM;
-- }
-+ xy.redx = red_x;
-+ xy.redy = red_y;
-+ xy.greenx = green_x;
-+ xy.greeny = green_y;
-+ xy.bluex = blue_x;
-+ xy.bluey = blue_y;
-+ xy.whitex = white_x;
-+ xy.whitey = white_y;
-+
-+ if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
-+ 2/* override with app values*/) != 0)
-+ info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-+
-+ png_colorspace_sync_info(png_ptr, info_ptr);
-+}
-+
-+void PNGFAPI
-+png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_fixed_point int_red_X, png_fixed_point int_red_Y,
-+ png_fixed_point int_red_Z, png_fixed_point int_green_X,
-+ png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-+ png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-+ png_fixed_point int_blue_Z)
-+{
-+ png_XYZ XYZ;
-+
-+ png_debug1(1, "in %s storage function", "cHRM XYZ fixed");
-+
-+ if (png_ptr == NULL || info_ptr == NULL)
-+ return;
-+
-+ XYZ.red_X = int_red_X;
-+ XYZ.red_Y = int_red_Y;
-+ XYZ.red_Z = int_red_Z;
-+ XYZ.green_X = int_green_X;
-+ XYZ.green_Y = int_green_Y;
-+ XYZ.green_Z = int_green_Z;
-+ XYZ.blue_X = int_blue_X;
-+ XYZ.blue_Y = int_blue_Y;
-+ XYZ.blue_Z = int_blue_Z;
-+
-+ if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
-+ &XYZ, 2) != 0)
-+ info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-+
-+ png_colorspace_sync_info(png_ptr, info_ptr);
- }
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
-+png_set_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
- double white_x, double white_y, double red_x, double red_y,
- double green_x, double green_y, double blue_x, double blue_y)
- {
-@@ -108,41 +141,44 @@
- png_fixed(png_ptr, blue_x, "cHRM Blue X"),
- png_fixed(png_ptr, blue_y, "cHRM Blue Y"));
- }
--# endif /* PNG_FLOATING_POINT_SUPPORTED */
-
--#endif /* PNG_cHRM_SUPPORTED */
-+void PNGAPI
-+png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
-+ double red_Y, double red_Z, double green_X, double green_Y, double green_Z,
-+ double blue_X, double blue_Y, double blue_Z)
-+{
-+ png_set_cHRM_XYZ_fixed(png_ptr, info_ptr,
-+ png_fixed(png_ptr, red_X, "cHRM Red X"),
-+ png_fixed(png_ptr, red_Y, "cHRM Red Y"),
-+ png_fixed(png_ptr, red_Z, "cHRM Red Z"),
-+ png_fixed(png_ptr, green_X, "cHRM Red X"),
-+ png_fixed(png_ptr, green_Y, "cHRM Red Y"),
-+ png_fixed(png_ptr, green_Z, "cHRM Red Z"),
-+ png_fixed(png_ptr, blue_X, "cHRM Red X"),
-+ png_fixed(png_ptr, blue_Y, "cHRM Red Y"),
-+ png_fixed(png_ptr, blue_Z, "cHRM Red Z"));
-+}
-+# endif /* FLOATING_POINT */
-+
-+#endif /* cHRM */
-
- #ifdef PNG_gAMA_SUPPORTED
- void PNGFAPI
--png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
-- file_gamma)
-+png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_fixed_point file_gamma)
- {
- png_debug1(1, "in %s storage function", "gAMA");
-
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-- /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-- * occur. Since the fixed point representation is assymetrical it is
-- * possible for 1/gamma to overflow the limit of 21474 and this means the
-- * gamma value must be at least 5/100000 and hence at most 20000.0. For
-- * safety the limits here are a little narrower. The values are 0.00016 to
-- * 6250.0, which are truely ridiculous gammma values (and will produce
-- * displays that are all black or all white.)
-- */
-- if (file_gamma < 16 || file_gamma > 625000000)
-- png_warning(png_ptr, "Out of range gamma value ignored");
--
-- else
-- {
-- info_ptr->gamma = file_gamma;
-- info_ptr->valid |= PNG_INFO_gAMA;
-- }
-+ png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);
-+ png_colorspace_sync_info(png_ptr, info_ptr);
- }
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
-+png_set_gAMA(png_const_structrp png_ptr, png_inforp info_ptr, double file_gamma)
- {
- png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,
- "png_set_gAMA"));
-@@ -152,7 +188,8 @@
-
- #ifdef PNG_hIST_SUPPORTED
- void PNGAPI
--png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_const_uint_16p hist)
-+png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_const_uint_16p hist)
- {
- int i;
-
-@@ -175,26 +212,26 @@
- /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
- * version 1.2.1
- */
-- png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
-- PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));
-+ info_ptr->hist = png_voidcast(png_uint_16p, png_malloc_warn(png_ptr,
-+ PNG_MAX_PALETTE_LENGTH * (sizeof (png_uint_16))));
-
-- if (png_ptr->hist == NULL)
-+ if (info_ptr->hist == NULL)
- {
- png_warning(png_ptr, "Insufficient memory for hIST chunk data");
- return;
- }
-
-+ info_ptr->free_me |= PNG_FREE_HIST;
-+
- for (i = 0; i < info_ptr->num_palette; i++)
-- png_ptr->hist[i] = hist[i];
-+ info_ptr->hist[i] = hist[i];
-
-- info_ptr->hist = png_ptr->hist;
- info_ptr->valid |= PNG_INFO_hIST;
-- info_ptr->free_me |= PNG_FREE_HIST;
- }
- #endif
-
- void PNGAPI
--png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
-+png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,
- png_uint_32 width, png_uint_32 height, int bit_depth,
- int color_type, int interlace_type, int compression_type,
- int filter_type)
-@@ -219,32 +256,23 @@
- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- info_ptr->channels = 1;
-
-- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-+ else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
- info_ptr->channels = 3;
-
- else
- info_ptr->channels = 1;
-
-- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-+ if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
- info_ptr->channels++;
-
- info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
-
-- /* Check for potential overflow */
-- if (width >
-- (PNG_UINT_32_MAX >> 3) /* 8-byte RRGGBBAA pixels */
-- - 48 /* bigrowbuf hack */
-- - 1 /* filter byte */
-- - 7*8 /* rounding of width to multiple of 8 pixels */
-- - 8) /* extra max_pixel_depth pad */
-- info_ptr->rowbytes = 0;
-- else
-- info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-+ info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
- }
-
- #ifdef PNG_oFFs_SUPPORTED
- void PNGAPI
--png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
-+png_set_oFFs(png_const_structrp png_ptr, png_inforp info_ptr,
- png_int_32 offset_x, png_int_32 offset_y, int unit_type)
- {
- png_debug1(1, "in %s storage function", "oFFs");
-@@ -261,7 +289,7 @@
-
- #ifdef PNG_pCAL_SUPPORTED
- void PNGAPI
--png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
-+png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
- png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
- int nparams, png_const_charp units, png_charpp params)
- {
-@@ -270,10 +298,11 @@
-
- png_debug1(1, "in %s storage function", "pCAL");
-
-- if (png_ptr == NULL || info_ptr == NULL)
-+ if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL
-+ || (nparams > 0 && params == NULL))
- return;
-
-- length = png_strlen(purpose) + 1;
-+ length = strlen(purpose) + 1;
- png_debug1(3, "allocating purpose for info (%lu bytes)",
- (unsigned long)length);
-
-@@ -283,12 +312,19 @@
- if (type < 0 || type > 3)
- png_error(png_ptr, "Invalid pCAL equation type");
-
-+ if (nparams < 0 || nparams > 255)
-+ png_error(png_ptr, "Invalid pCAL parameter count");
-+
- /* Validate params[nparams] */
- for (i=0; i<nparams; ++i)
-- if (!png_check_fp_string(params[i], png_strlen(params[i])))
-+ {
-+ if (params[i] == NULL ||
-+ !png_check_fp_string(params[i], strlen(params[i])))
- png_error(png_ptr, "Invalid format for pCAL parameter");
-+ }
-
-- info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
-+ info_ptr->pcal_purpose = png_voidcast(png_charp,
-+ png_malloc_warn(png_ptr, length));
-
- if (info_ptr->pcal_purpose == NULL)
- {
-@@ -296,7 +332,7 @@
- return;
- }
-
-- png_memcpy(info_ptr->pcal_purpose, purpose, length);
-+ memcpy(info_ptr->pcal_purpose, purpose, length);
-
- png_debug(3, "storing X0, X1, type, and nparams in info");
- info_ptr->pcal_X0 = X0;
-@@ -304,11 +340,12 @@
- info_ptr->pcal_type = (png_byte)type;
- info_ptr->pcal_nparams = (png_byte)nparams;
-
-- length = png_strlen(units) + 1;
-+ length = strlen(units) + 1;
- png_debug1(3, "allocating units for info (%lu bytes)",
- (unsigned long)length);
-
-- info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
-+ info_ptr->pcal_units = png_voidcast(png_charp,
-+ png_malloc_warn(png_ptr, length));
-
- if (info_ptr->pcal_units == NULL)
- {
-@@ -316,10 +353,10 @@
- return;
- }
-
-- png_memcpy(info_ptr->pcal_units, units, length);
-+ memcpy(info_ptr->pcal_units, units, length);
-
-- info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
-- (png_size_t)((nparams + 1) * png_sizeof(png_charp)));
-+ info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
-+ (png_size_t)((nparams + 1) * (sizeof (png_charp)))));
-
- if (info_ptr->pcal_params == NULL)
- {
-@@ -327,11 +364,11 @@
- return;
- }
-
-- png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
-+ memset(info_ptr->pcal_params, 0, (nparams + 1) * (sizeof (png_charp)));
-
- for (i = 0; i < nparams; i++)
- {
-- length = png_strlen(params[i]) + 1;
-+ length = strlen(params[i]) + 1;
- png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
- (unsigned long)length);
-
-@@ -343,7 +380,7 @@
- return;
- }
-
-- png_memcpy(info_ptr->pcal_params[i], params[i], length);
-+ memcpy(info_ptr->pcal_params[i], params[i], length);
- }
-
- info_ptr->valid |= PNG_INFO_pCAL;
-@@ -353,7 +390,7 @@
-
- #ifdef PNG_sCAL_SUPPORTED
- void PNGAPI
--png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
-+png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,
- int unit, png_const_charp swidth, png_const_charp sheight)
- {
- png_size_t lengthw = 0, lengthh = 0;
-@@ -369,11 +406,11 @@
- if (unit != 1 && unit != 2)
- png_error(png_ptr, "Invalid sCAL unit");
-
-- if (swidth == NULL || (lengthw = png_strlen(swidth)) == 0 ||
-+ if (swidth == NULL || (lengthw = strlen(swidth)) == 0 ||
- swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))
- png_error(png_ptr, "Invalid sCAL width");
-
-- if (sheight == NULL || (lengthh = png_strlen(sheight)) == 0 ||
-+ if (sheight == NULL || (lengthh = strlen(sheight)) == 0 ||
- sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))
- png_error(png_ptr, "Invalid sCAL height");
-
-@@ -383,7 +420,8 @@
-
- png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
-
-- info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);
-+ info_ptr->scal_s_width = png_voidcast(png_charp,
-+ png_malloc_warn(png_ptr, lengthw));
-
- if (info_ptr->scal_s_width == NULL)
- {
-@@ -391,13 +429,14 @@
- return;
- }
-
-- png_memcpy(info_ptr->scal_s_width, swidth, lengthw);
-+ memcpy(info_ptr->scal_s_width, swidth, lengthw);
-
- ++lengthh;
-
- png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
-
-- info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);
-+ info_ptr->scal_s_height = png_voidcast(png_charp,
-+ png_malloc_warn(png_ptr, lengthh));
-
- if (info_ptr->scal_s_height == NULL)
- {
-@@ -408,7 +447,7 @@
- return;
- }
-
-- png_memcpy(info_ptr->scal_s_height, sheight, lengthh);
-+ memcpy(info_ptr->scal_s_height, sheight, lengthh);
-
- info_ptr->valid |= PNG_INFO_sCAL;
- info_ptr->free_me |= PNG_FREE_SCAL;
-@@ -416,8 +455,8 @@
-
- # ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,
-- double height)
-+png_set_sCAL(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
-+ double width, double height)
- {
- png_debug1(1, "in %s storage function", "sCAL");
-
-@@ -434,9 +473,9 @@
- char swidth[PNG_sCAL_MAX_DIGITS+1];
- char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-- png_ascii_from_fp(png_ptr, swidth, sizeof swidth, width,
-+ png_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,
- PNG_sCAL_PRECISION);
-- png_ascii_from_fp(png_ptr, sheight, sizeof sheight, height,
-+ png_ascii_from_fp(png_ptr, sheight, (sizeof sheight), height,
- PNG_sCAL_PRECISION);
-
- png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-@@ -446,7 +485,7 @@
-
- # ifdef PNG_FIXED_POINT_SUPPORTED
- void PNGAPI
--png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,
-+png_set_sCAL_fixed(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
- png_fixed_point width, png_fixed_point height)
- {
- png_debug1(1, "in %s storage function", "sCAL");
-@@ -464,8 +503,8 @@
- char swidth[PNG_sCAL_MAX_DIGITS+1];
- char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-- png_ascii_from_fixed(png_ptr, swidth, sizeof swidth, width);
-- png_ascii_from_fixed(png_ptr, sheight, sizeof sheight, height);
-+ png_ascii_from_fixed(png_ptr, swidth, (sizeof swidth), width);
-+ png_ascii_from_fixed(png_ptr, sheight, (sizeof sheight), height);
-
- png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
- }
-@@ -475,7 +514,7 @@
-
- #ifdef PNG_pHYs_SUPPORTED
- void PNGAPI
--png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
-+png_set_pHYs(png_const_structrp png_ptr, png_inforp info_ptr,
- png_uint_32 res_x, png_uint_32 res_y, int unit_type)
- {
- png_debug1(1, "in %s storage function", "pHYs");
-@@ -491,7 +530,7 @@
- #endif
-
- void PNGAPI
--png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
-+png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
- png_const_colorp palette, int num_palette)
- {
-
-@@ -526,6 +565,9 @@
- /* 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.
-+ *
-+ * 1.6.0: the above statement appears to be incorrect; something has to set
-+ * the palette inside png_struct on read.
- */
- png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
-
-@@ -533,10 +575,11 @@
- * of num_palette entries, in case of an invalid PNG file that has
- * too-large sample values.
- */
-- png_ptr->palette = (png_colorp)png_calloc(png_ptr,
-- PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
-+ png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr,
-+ PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));
-
-- png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
-+ if (num_palette > 0)
-+ memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color)));
- info_ptr->palette = png_ptr->palette;
- info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
-
-@@ -547,34 +590,34 @@
-
- #ifdef PNG_sBIT_SUPPORTED
- void PNGAPI
--png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
-+png_set_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
- png_const_color_8p sig_bit)
- {
- png_debug1(1, "in %s storage function", "sBIT");
-
-- if (png_ptr == NULL || info_ptr == NULL)
-+ if (png_ptr == NULL || info_ptr == NULL || sig_bit == NULL)
- return;
-
-- png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
-+ info_ptr->sig_bit = *sig_bit;
- info_ptr->valid |= PNG_INFO_sBIT;
- }
- #endif
-
- #ifdef PNG_sRGB_SUPPORTED
- void PNGAPI
--png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)
-+png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)
- {
- png_debug1(1, "in %s storage function", "sRGB");
-
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-- info_ptr->srgb_intent = (png_byte)srgb_intent;
-- info_ptr->valid |= PNG_INFO_sRGB;
-+ (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);
-+ png_colorspace_sync_info(png_ptr, info_ptr);
- }
-
- void PNGAPI
--png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
-+png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
- int srgb_intent)
- {
- png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
-@@ -582,71 +625,87 @@
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-- png_set_sRGB(png_ptr, info_ptr, srgb_intent);
-+ if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,
-+ srgb_intent) != 0)
-+ {
-+ /* This causes the gAMA and cHRM to be written too */
-+ info_ptr->colorspace.flags |=
-+ PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-+ }
-
--# ifdef PNG_gAMA_SUPPORTED
-- png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
--# endif
--
--# ifdef PNG_cHRM_SUPPORTED
-- png_set_cHRM_fixed(png_ptr, info_ptr,
-- /* color x y */
-- /* white */ 31270L, 32900L,
-- /* red */ 64000L, 33000L,
-- /* green */ 30000L, 60000L,
-- /* blue */ 15000L, 6000L
-- );
--# endif /* cHRM */
-+ png_colorspace_sync_info(png_ptr, info_ptr);
- }
- #endif /* sRGB */
-
-
- #ifdef PNG_iCCP_SUPPORTED
- void PNGAPI
--png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
-+png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
- png_const_charp name, int compression_type,
- png_const_bytep profile, png_uint_32 proflen)
- {
- png_charp new_iccp_name;
- png_bytep new_iccp_profile;
-- png_uint_32 length;
-+ png_size_t length;
-
- png_debug1(1, "in %s storage function", "iCCP");
-
- if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
- return;
-
-- length = png_strlen(name)+1;
-- new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
-+ if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-+ png_app_error(png_ptr, "Invalid iCCP compression method");
-+
-+ /* Set the colorspace first because this validates the profile; do not
-+ * override previously set app cHRM or gAMA here (because likely as not the
-+ * application knows better than libpng what the correct values are.) Pass
-+ * the info_ptr color_type field to png_colorspace_set_ICC because in the
-+ * write case it has not yet been stored in png_ptr.
-+ */
-+ {
-+ int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
-+ proflen, profile, info_ptr->color_type);
-+
-+ png_colorspace_sync_info(png_ptr, info_ptr);
-+
-+ /* Don't do any of the copying if the profile was bad, or inconsistent. */
-+ if (result == 0)
-+ return;
-+
-+ /* But do write the gAMA and cHRM chunks from the profile. */
-+ info_ptr->colorspace.flags |=
-+ PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-+ }
-+
-+ length = strlen(name)+1;
-+ new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));
-
- if (new_iccp_name == NULL)
- {
-- png_warning(png_ptr, "Insufficient memory to process iCCP chunk");
-+ png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk");
- return;
- }
-
-- png_memcpy(new_iccp_name, name, length);
-- new_iccp_profile = (png_bytep)png_malloc_warn(png_ptr, proflen);
-+ memcpy(new_iccp_name, name, length);
-+ new_iccp_profile = png_voidcast(png_bytep,
-+ png_malloc_warn(png_ptr, proflen));
-
- if (new_iccp_profile == NULL)
- {
-- png_free (png_ptr, new_iccp_name);
-- png_warning(png_ptr,
-+ png_free(png_ptr, new_iccp_name);
-+ new_iccp_name = NULL;
-+ png_benign_error(png_ptr,
- "Insufficient memory to process iCCP profile");
- return;
- }
-
-- png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
-+ memcpy(new_iccp_profile, profile, proflen);
-
- png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
-
- info_ptr->iccp_proflen = proflen;
- info_ptr->iccp_name = new_iccp_name;
- info_ptr->iccp_profile = new_iccp_profile;
-- /* Compression is always zero but is here so the API and info structure
-- * does not have to change if we introduce multiple compression types
-- */
-- info_ptr->iccp_compression = (png_byte)compression_type;
- info_ptr->free_me |= PNG_FREE_ICCP;
- info_ptr->valid |= PNG_INFO_iCCP;
- }
-@@ -654,74 +713,81 @@
-
- #ifdef PNG_TEXT_SUPPORTED
- void PNGAPI
--png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,
-- int num_text)
-+png_set_text(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_const_textp text_ptr, int num_text)
- {
- int ret;
- ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
-
-- if (ret)
-+ if (ret != 0)
- png_error(png_ptr, "Insufficient memory to store text");
- }
-
- int /* PRIVATE */
--png_set_text_2(png_structp png_ptr, png_infop info_ptr,
-+png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
- png_const_textp text_ptr, int num_text)
- {
- int i;
-
-- png_debug1(1, "in %s storage function", ((png_ptr == NULL ||
-- png_ptr->chunk_name[0] == '\0') ?
-- "text" : (png_const_charp)png_ptr->chunk_name));
-+ png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" :
-+ (unsigned long)png_ptr->chunk_name);
-
-- if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
-+ if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)
- return(0);
-
- /* Make sure we have enough space in the "text" array in info_struct
-- * to hold all of the incoming text_ptr objects.
-+ * to hold all of the incoming text_ptr objects. This compare can't overflow
-+ * because max_text >= num_text (anyway, subtract of two positive integers
-+ * can't overflow in any case.)
- */
-- if (info_ptr->num_text + num_text > info_ptr->max_text)
-+ if (num_text > info_ptr->max_text - info_ptr->num_text)
- {
-- if (info_ptr->text != NULL)
-+ int old_num_text = info_ptr->num_text;
-+ int max_text;
-+ png_textp new_text = NULL;
-+
-+ /* Calculate an appropriate max_text, checking for overflow. */
-+ max_text = old_num_text;
-+ if (num_text <= INT_MAX - max_text)
- {
-- png_textp old_text;
-- int old_max;
-+ max_text += num_text;
-
-- old_max = info_ptr->max_text;
-- info_ptr->max_text = info_ptr->num_text + num_text + 8;
-- old_text = info_ptr->text;
-- info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-- (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-+ /* Round up to a multiple of 8 */
-+ if (max_text < INT_MAX-8)
-+ max_text = (max_text + 8) & ~0x7;
-
-- if (info_ptr->text == NULL)
-- {
-- png_free(png_ptr, old_text);
-- return(1);
-- }
-+ else
-+ max_text = INT_MAX;
-
-- png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
-- png_sizeof(png_text)));
-- png_free(png_ptr, old_text);
-+ /* Now allocate a new array and copy the old members in; this does all
-+ * the overflow checks.
-+ */
-+ new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,
-+ info_ptr->text, old_num_text, max_text-old_num_text,
-+ sizeof *new_text));
- }
-
-- else
-+ if (new_text == NULL)
- {
-- info_ptr->max_text = num_text + 8;
-- info_ptr->num_text = 0;
-- info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-- (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-- if (info_ptr->text == NULL)
-- return(1);
-- info_ptr->free_me |= PNG_FREE_TEXT;
-+ png_chunk_report(png_ptr, "too many text chunks",
-+ PNG_CHUNK_WRITE_ERROR);
-+ return 1;
- }
-
-- png_debug1(3, "allocated %d entries for info_ptr->text",
-- info_ptr->max_text);
-+ png_free(png_ptr, info_ptr->text);
-+
-+ info_ptr->text = new_text;
-+ info_ptr->free_me |= PNG_FREE_TEXT;
-+ info_ptr->max_text = max_text;
-+ /* num_text is adjusted below as the entries are copied in */
-+
-+ png_debug1(3, "allocated %d entries for info_ptr->text", max_text);
- }
-+
- for (i = 0; i < num_text; i++)
- {
-- png_size_t text_length, key_len;
-- png_size_t lang_len, lang_key_len;
-+ size_t text_length, key_len;
-+ size_t lang_len, lang_key_len;
- png_textp textp = &(info_ptr->text[info_ptr->num_text]);
-
- if (text_ptr[i].key == NULL)
-@@ -730,11 +796,12 @@
- if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||
- text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
- {
-- png_warning(png_ptr, "text compression mode is out of range");
-+ png_chunk_report(png_ptr, "text compression mode is out of range",
-+ PNG_CHUNK_WRITE_ERROR);
- continue;
- }
-
-- key_len = png_strlen(text_ptr[i].key);
-+ key_len = strlen(text_ptr[i].key);
-
- if (text_ptr[i].compression <= 0)
- {
-@@ -748,20 +815,21 @@
- /* Set iTXt data */
-
- if (text_ptr[i].lang != NULL)
-- lang_len = png_strlen(text_ptr[i].lang);
-+ lang_len = strlen(text_ptr[i].lang);
-
- else
- lang_len = 0;
-
- if (text_ptr[i].lang_key != NULL)
-- lang_key_len = png_strlen(text_ptr[i].lang_key);
-+ lang_key_len = strlen(text_ptr[i].lang_key);
-
- else
- lang_key_len = 0;
- }
- # else /* PNG_iTXt_SUPPORTED */
- {
-- png_warning(png_ptr, "iTXt chunk not supported");
-+ png_chunk_report(png_ptr, "iTXt chunk not supported",
-+ PNG_CHUNK_WRITE_ERROR);
- continue;
- }
- # endif
-@@ -780,32 +848,35 @@
-
- else
- {
-- text_length = png_strlen(text_ptr[i].text);
-+ text_length = strlen(text_ptr[i].text);
- textp->compression = text_ptr[i].compression;
- }
-
-- textp->key = (png_charp)png_malloc_warn(png_ptr,
-- (png_size_t)
-- (key_len + text_length + lang_len + lang_key_len + 4));
-+ textp->key = png_voidcast(png_charp,png_malloc_base(png_ptr,
-+ key_len + text_length + lang_len + lang_key_len + 4));
-
- if (textp->key == NULL)
-- return(1);
-+ {
-+ png_chunk_report(png_ptr, "text chunk: out of memory",
-+ PNG_CHUNK_WRITE_ERROR);
-+ return 1;
-+ }
-
- png_debug2(2, "Allocated %lu bytes at %p in png_set_text",
- (unsigned long)(png_uint_32)
- (key_len + lang_len + lang_key_len + text_length + 4),
- textp->key);
-
-- png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));
-+ memcpy(textp->key, text_ptr[i].key, key_len);
- *(textp->key + key_len) = '\0';
-
- if (text_ptr[i].compression > 0)
- {
- textp->lang = textp->key + key_len + 1;
-- png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
-+ memcpy(textp->lang, text_ptr[i].lang, lang_len);
- *(textp->lang + lang_len) = '\0';
- textp->lang_key = textp->lang + lang_len + 1;
-- png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
-+ memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
- *(textp->lang_key + lang_key_len) = '\0';
- textp->text = textp->lang_key + lang_key_len + 1;
- }
-@@ -817,9 +888,8 @@
- textp->text = textp->key + key_len + 1;
- }
-
-- if (text_length)
-- png_memcpy(textp->text, text_ptr[i].text,
-- (png_size_t)(text_length));
-+ if (text_length != 0)
-+ memcpy(textp->text, text_ptr[i].text, text_length);
-
- *(textp->text + text_length) = '\0';
-
-@@ -840,28 +910,39 @@
- info_ptr->num_text++;
- png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
- }
-+
- return(0);
- }
- #endif
-
- #ifdef PNG_tIME_SUPPORTED
- void PNGAPI
--png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)
-+png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_const_timep mod_time)
- {
- png_debug1(1, "in %s storage function", "tIME");
-
-- if (png_ptr == NULL || info_ptr == NULL ||
-- (png_ptr->mode & PNG_WROTE_tIME))
-+ if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL ||
-+ (png_ptr->mode & PNG_WROTE_tIME) != 0)
- return;
-
-- png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
-+ if (mod_time->month == 0 || mod_time->month > 12 ||
-+ mod_time->day == 0 || mod_time->day > 31 ||
-+ mod_time->hour > 23 || mod_time->minute > 59 ||
-+ mod_time->second > 60)
-+ {
-+ png_warning(png_ptr, "Ignoring invalid time value");
-+ return;
-+ }
-+
-+ info_ptr->mod_time = *mod_time;
- info_ptr->valid |= PNG_INFO_tIME;
- }
- #endif
-
- #ifdef PNG_tRNS_SUPPORTED
- void PNGAPI
--png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
-+png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
- png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)
- {
- png_debug1(1, "in %s storage function", "tRNS");
-@@ -874,16 +955,20 @@
- /* It may not actually be necessary to set png_ptr->trans_alpha here;
- * we do it for backward compatibility with the way the png_handle_tRNS
- * function used to do the allocation.
-+ *
-+ * 1.6.0: The above statement is incorrect; png_handle_tRNS effectively
-+ * relies on png_set_tRNS storing the information in png_struct
-+ * (otherwise it won't be there for the code in pngrtran.c).
- */
-
- png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
-
- /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-- png_ptr->trans_alpha = info_ptr->trans_alpha =
-- (png_bytep)png_malloc(png_ptr, (png_size_t)PNG_MAX_PALETTE_LENGTH);
-+ png_ptr->trans_alpha = info_ptr->trans_alpha = png_voidcast(png_bytep,
-+ png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
-
- if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-- png_memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
-+ memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
- }
-
- if (trans_color != NULL)
-@@ -891,16 +976,15 @@
- int sample_max = (1 << info_ptr->bit_depth);
-
- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
-- (int)trans_color->gray > sample_max) ||
-+ trans_color->gray > sample_max) ||
- (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-- ((int)trans_color->red > sample_max ||
-- (int)trans_color->green > sample_max ||
-- (int)trans_color->blue > sample_max)))
-+ (trans_color->red > sample_max ||
-+ trans_color->green > sample_max ||
-+ trans_color->blue > sample_max)))
- png_warning(png_ptr,
- "tRNS chunk has out-of-range samples for bit_depth");
-
-- png_memcpy(&(info_ptr->trans_color), trans_color,
-- png_sizeof(png_color_16));
-+ info_ptr->trans_color = *trans_color;
-
- if (num_trans == 0)
- num_trans = 1;
-@@ -918,8 +1002,8 @@
-
- #ifdef PNG_sPLT_SUPPORTED
- void PNGAPI
--png_set_sPLT(png_structp png_ptr,
-- png_infop info_ptr, png_const_sPLT_tp entries, int nentries)
-+png_set_sPLT(png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_sPLT_tp entries, int nentries)
- /*
- * entries - array of png_sPLT_t structures
- * to be added to the list of palettes
-@@ -930,220 +1014,455 @@
- */
- {
- png_sPLT_tp np;
-- int i;
-
-- if (png_ptr == NULL || info_ptr == NULL)
-+ if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)
- return;
-
-- np = (png_sPLT_tp)png_malloc_warn(png_ptr,
-- (info_ptr->splt_palettes_num + nentries) *
-- (png_size_t)png_sizeof(png_sPLT_t));
-+ /* Use the internal realloc function, which checks for all the possible
-+ * overflows. Notice that the parameters are (int) and (size_t)
-+ */
-+ np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,
-+ info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,
-+ sizeof *np));
-
- if (np == NULL)
- {
-- png_warning(png_ptr, "No memory for sPLT palettes");
-+ /* Out of memory or too many chunks */
-+ png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);
- return;
- }
-
-- png_memcpy(np, info_ptr->splt_palettes,
-- info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
-+ png_free(png_ptr, info_ptr->splt_palettes);
-+ info_ptr->splt_palettes = np;
-+ info_ptr->free_me |= PNG_FREE_SPLT;
-
-- png_free(png_ptr, info_ptr->splt_palettes);
-- info_ptr->splt_palettes=NULL;
-+ np += info_ptr->splt_palettes_num;
-
-- for (i = 0; i < nentries; i++)
-+ do
- {
-- png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
-- png_const_sPLT_tp from = entries + i;
-- png_uint_32 length;
-+ png_size_t length;
-
-- length = png_strlen(from->name) + 1;
-- to->name = (png_charp)png_malloc_warn(png_ptr, (png_size_t)length);
--
-- if (to->name == NULL)
-+ /* Skip invalid input entries */
-+ if (entries->name == NULL || entries->entries == NULL)
- {
-- png_warning(png_ptr,
-- "Out of memory while processing sPLT chunk");
-+ /* png_handle_sPLT doesn't do this, so this is an app error */
-+ png_app_error(png_ptr, "png_set_sPLT: invalid sPLT");
-+ /* Just skip the invalid entry */
- continue;
- }
-
-- png_memcpy(to->name, from->name, length);
-- to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
-- (png_size_t)(from->nentries * png_sizeof(png_sPLT_entry)));
-+ np->depth = entries->depth;
-
-- if (to->entries == NULL)
-+ /* In the event of out-of-memory just return - there's no point keeping
-+ * on trying to add sPLT chunks.
-+ */
-+ length = strlen(entries->name) + 1;
-+ np->name = png_voidcast(png_charp, png_malloc_base(png_ptr, length));
-+
-+ if (np->name == NULL)
-+ break;
-+
-+ memcpy(np->name, entries->name, length);
-+
-+ /* IMPORTANT: we have memory now that won't get freed if something else
-+ * goes wrong; this code must free it. png_malloc_array produces no
-+ * warnings; use a png_chunk_report (below) if there is an error.
-+ */
-+ np->entries = png_voidcast(png_sPLT_entryp, png_malloc_array(png_ptr,
-+ entries->nentries, sizeof (png_sPLT_entry)));
-+
-+ if (np->entries == NULL)
- {
-- png_warning(png_ptr,
-- "Out of memory while processing sPLT chunk");
-- png_free(png_ptr, to->name);
-- to->name = NULL;
-- continue;
-+ png_free(png_ptr, np->name);
-+ np->name = NULL;
-+ break;
- }
-
-- png_memcpy(to->entries, from->entries,
-- from->nentries * png_sizeof(png_sPLT_entry));
-+ np->nentries = entries->nentries;
-+ /* This multiply can't overflow because png_malloc_array has already
-+ * checked it when doing the allocation.
-+ */
-+ memcpy(np->entries, entries->entries,
-+ entries->nentries * sizeof (png_sPLT_entry));
-
-- to->nentries = from->nentries;
-- to->depth = from->depth;
-+ /* Note that 'continue' skips the advance of the out pointer and out
-+ * count, so an invalid entry is not added.
-+ */
-+ info_ptr->valid |= PNG_INFO_sPLT;
-+ ++(info_ptr->splt_palettes_num);
-+ ++np;
-+ }
-+ while (++entries, --nentries);
-+
-+ if (nentries > 0)
-+ png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);
-+}
-+#endif /* sPLT */
-+
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-+static png_byte
-+check_location(png_const_structrp png_ptr, int location)
-+{
-+ location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT);
-+
-+ /* New in 1.6.0; copy the location and check it. This is an API
-+ * change; previously the app had to use the
-+ * png_set_unknown_chunk_location API below for each chunk.
-+ */
-+ if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-+ {
-+ /* Write struct, so unknown chunks come from the app */
-+ png_app_warning(png_ptr,
-+ "png_set_unknown_chunks now expects a valid location");
-+ /* Use the old behavior */
-+ location = (png_byte)(png_ptr->mode &
-+ (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));
- }
-
-- info_ptr->splt_palettes = np;
-- info_ptr->splt_palettes_num += nentries;
-- info_ptr->valid |= PNG_INFO_sPLT;
-- info_ptr->free_me |= PNG_FREE_SPLT;
-+ /* This need not be an internal error - if the app calls
-+ * png_set_unknown_chunks on a read pointer it must get the location right.
-+ */
-+ if (location == 0)
-+ png_error(png_ptr, "invalid location in png_set_unknown_chunks");
-+
-+ /* Now reduce the location to the top-most set bit by removing each least
-+ * significant bit in turn.
-+ */
-+ while (location != (location & -location))
-+ location &= ~(location & -location);
-+
-+ /* The cast is safe because 'location' is a bit mask and only the low four
-+ * bits are significant.
-+ */
-+ return (png_byte)location;
- }
--#endif /* PNG_sPLT_SUPPORTED */
-
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
- void PNGAPI
--png_set_unknown_chunks(png_structp png_ptr,
-- png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
-+png_set_unknown_chunks(png_const_structrp png_ptr,
-+ png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
- {
- png_unknown_chunkp np;
-- int i;
-
-- if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
-+ if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||
-+ unknowns == NULL)
- return;
-
-- np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
-- (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
-- png_sizeof(png_unknown_chunk));
-+ /* Check for the failure cases where support has been disabled at compile
-+ * time. This code is hardly ever compiled - it's here because
-+ * STORE_UNKNOWN_CHUNKS is set by both read and write code (compiling in this
-+ * code) but may be meaningless if the read or write handling of unknown
-+ * chunks is not compiled in.
-+ */
-+# if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \
-+ defined(PNG_READ_SUPPORTED)
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-+ {
-+ png_app_error(png_ptr, "no unknown chunk support on read");
-+ return;
-+ }
-+# endif
-+# if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \
-+ defined(PNG_WRITE_SUPPORTED)
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-+ {
-+ png_app_error(png_ptr, "no unknown chunk support on write");
-+ return;
-+ }
-+# endif
-+
-+ /* Prior to 1.6.0 this code used png_malloc_warn; however, this meant that
-+ * unknown critical chunks could be lost with just a warning resulting in
-+ * undefined behavior. Now png_chunk_report is used to provide behavior
-+ * appropriate to read or write.
-+ */
-+ np = png_voidcast(png_unknown_chunkp, png_realloc_array(png_ptr,
-+ info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,
-+ sizeof *np));
-
- if (np == NULL)
- {
-- png_warning(png_ptr,
-- "Out of memory while processing unknown chunk");
-+ png_chunk_report(png_ptr, "too many unknown chunks",
-+ PNG_CHUNK_WRITE_ERROR);
- return;
- }
-
-- png_memcpy(np, info_ptr->unknown_chunks,
-- (png_size_t)info_ptr->unknown_chunks_num *
-- png_sizeof(png_unknown_chunk));
-+ png_free(png_ptr, info_ptr->unknown_chunks);
-+ info_ptr->unknown_chunks = np; /* safe because it is initialized */
-+ info_ptr->free_me |= PNG_FREE_UNKN;
-
-- png_free(png_ptr, info_ptr->unknown_chunks);
-- info_ptr->unknown_chunks = NULL;
-+ np += info_ptr->unknown_chunks_num;
-
-- for (i = 0; i < num_unknowns; i++)
-+ /* Increment unknown_chunks_num each time round the loop to protect the
-+ * just-allocated chunk data.
-+ */
-+ for (; num_unknowns > 0; --num_unknowns, ++unknowns)
- {
-- png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
-- png_const_unknown_chunkp from = unknowns + i;
-+ memcpy(np->name, unknowns->name, (sizeof np->name));
-+ np->name[(sizeof np->name)-1] = '\0';
-+ np->location = check_location(png_ptr, unknowns->location);
-
-- png_memcpy(to->name, from->name, png_sizeof(from->name));
-- to->name[png_sizeof(to->name)-1] = '\0';
-- to->size = from->size;
--
-- /* Note our location in the read or write sequence */
-- to->location = (png_byte)(png_ptr->mode & 0xff);
--
-- if (from->size == 0)
-- to->data=NULL;
-+ if (unknowns->size == 0)
-+ {
-+ np->data = NULL;
-+ np->size = 0;
-+ }
-
- else
- {
-- to->data = (png_bytep)png_malloc_warn(png_ptr,
-- (png_size_t)from->size);
-+ np->data = png_voidcast(png_bytep,
-+ png_malloc_base(png_ptr, unknowns->size));
-
-- if (to->data == NULL)
-+ if (np->data == NULL)
- {
-- png_warning(png_ptr,
-- "Out of memory while processing unknown chunk");
-- to->size = 0;
-+ png_chunk_report(png_ptr, "unknown chunk: out of memory",
-+ PNG_CHUNK_WRITE_ERROR);
-+ /* But just skip storing the unknown chunk */
-+ continue;
- }
-
-- else
-- png_memcpy(to->data, from->data, from->size);
-+ memcpy(np->data, unknowns->data, unknowns->size);
-+ np->size = unknowns->size;
- }
-+
-+ /* These increments are skipped on out-of-memory for the data - the
-+ * unknown chunk entry gets overwritten if the png_chunk_report returns.
-+ * This is correct in the read case (the chunk is just dropped.)
-+ */
-+ ++np;
-+ ++(info_ptr->unknown_chunks_num);
- }
--
-- info_ptr->unknown_chunks = np;
-- info_ptr->unknown_chunks_num += num_unknowns;
-- info_ptr->free_me |= PNG_FREE_UNKN;
- }
-
- void PNGAPI
--png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
-+png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
- int chunk, int location)
- {
-- if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
-- info_ptr->unknown_chunks_num)
-- info_ptr->unknown_chunks[chunk].location = (png_byte)location;
-+ /* This API is pretty pointless in 1.6.0 because the location can be set
-+ * before the call to png_set_unknown_chunks.
-+ *
-+ * TODO: add a png_app_warning in 1.7
-+ */
-+ if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 &&
-+ chunk < info_ptr->unknown_chunks_num)
-+ {
-+ if ((location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)
-+ {
-+ png_app_error(png_ptr, "invalid unknown chunk location");
-+ /* Fake out the pre 1.6.0 behavior: */
-+ if ((location & PNG_HAVE_IDAT) != 0) /* undocumented! */
-+ location = PNG_AFTER_IDAT;
-+
-+ else
-+ location = PNG_HAVE_IHDR; /* also undocumented */
-+ }
-+
-+ info_ptr->unknown_chunks[chunk].location =
-+ check_location(png_ptr, location);
-+ }
- }
- #endif
-
-
- #ifdef PNG_MNG_FEATURES_SUPPORTED
- png_uint_32 PNGAPI
--png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
-+png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
- {
- png_debug(1, "in png_permit_mng_features");
-
- if (png_ptr == NULL)
-- return (png_uint_32)0;
-+ return 0;
-
-- png_ptr->mng_features_permitted =
-- (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
-+ png_ptr->mng_features_permitted = mng_features & PNG_ALL_MNG_FEATURES;
-
-- return (png_uint_32)png_ptr->mng_features_permitted;
-+ return png_ptr->mng_features_permitted;
- }
- #endif
-
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+static unsigned int
-+add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)
-+{
-+ unsigned int i;
-+
-+ /* Utility function: update the 'keep' state of a chunk if it is already in
-+ * the list, otherwise add it to the list.
-+ */
-+ for (i=0; i<count; ++i, list += 5)
-+ {
-+ if (memcmp(list, add, 4) == 0)
-+ {
-+ list[4] = (png_byte)keep;
-+ return count;
-+ }
-+ }
-+
-+ if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)
-+ {
-+ ++count;
-+ memcpy(list, add, 4);
-+ list[4] = (png_byte)keep;
-+ }
-+
-+ return count;
-+}
-+
- void PNGAPI
--png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_const_bytep
-- chunk_list, int num_chunks)
-+png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
-+ png_const_bytep chunk_list, int num_chunks_in)
- {
-- png_bytep new_list, p;
-- int i, old_num_chunks;
-+ png_bytep new_list;
-+ unsigned int num_chunks, old_num_chunks;
-+
- if (png_ptr == NULL)
- return;
-
-- if (num_chunks == 0)
-+ if (keep < 0 || keep >= PNG_HANDLE_CHUNK_LAST)
- {
-- if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
-- png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
--
-- else
-- png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
--
-- if (keep == PNG_HANDLE_CHUNK_ALWAYS)
-- png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
--
-- else
-- png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
--
-+ png_app_error(png_ptr, "png_set_keep_unknown_chunks: invalid keep");
- return;
- }
-
-- if (chunk_list == NULL)
-- return;
-+ if (num_chunks_in <= 0)
-+ {
-+ png_ptr->unknown_default = keep;
-+
-+ /* '0' means just set the flags, so stop here */
-+ if (num_chunks_in == 0)
-+ return;
-+ }
-+
-+ if (num_chunks_in < 0)
-+ {
-+ /* Ignore all unknown chunks and all chunks recognized by
-+ * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND
-+ */
-+ static PNG_CONST png_byte chunks_to_ignore[] = {
-+ 98, 75, 71, 68, '\0', /* bKGD */
-+ 99, 72, 82, 77, '\0', /* cHRM */
-+ 103, 65, 77, 65, '\0', /* gAMA */
-+ 104, 73, 83, 84, '\0', /* hIST */
-+ 105, 67, 67, 80, '\0', /* iCCP */
-+ 105, 84, 88, 116, '\0', /* iTXt */
-+ 111, 70, 70, 115, '\0', /* oFFs */
-+ 112, 67, 65, 76, '\0', /* pCAL */
-+ 112, 72, 89, 115, '\0', /* pHYs */
-+ 115, 66, 73, 84, '\0', /* sBIT */
-+ 115, 67, 65, 76, '\0', /* sCAL */
-+ 115, 80, 76, 84, '\0', /* sPLT */
-+ 115, 84, 69, 82, '\0', /* sTER */
-+ 115, 82, 71, 66, '\0', /* sRGB */
-+ 116, 69, 88, 116, '\0', /* tEXt */
-+ 116, 73, 77, 69, '\0', /* tIME */
-+ 122, 84, 88, 116, '\0' /* zTXt */
-+ };
-+
-+ chunk_list = chunks_to_ignore;
-+ num_chunks = (unsigned int)/*SAFE*/(sizeof chunks_to_ignore)/5U;
-+ }
-+
-+ else /* num_chunks_in > 0 */
-+ {
-+ if (chunk_list == NULL)
-+ {
-+ /* Prior to 1.6.0 this was silently ignored, now it is an app_error
-+ * which can be switched off.
-+ */
-+ png_app_error(png_ptr, "png_set_keep_unknown_chunks: no chunk list");
-+ return;
-+ }
-+
-+ num_chunks = num_chunks_in;
-+ }
-
- old_num_chunks = png_ptr->num_chunk_list;
-- new_list=(png_bytep)png_malloc(png_ptr,
-- (png_size_t)(5*(num_chunks + old_num_chunks)));
-+ if (png_ptr->chunk_list == NULL)
-+ old_num_chunks = 0;
-
-- if (png_ptr->chunk_list != NULL)
-+ /* Since num_chunks is always restricted to UINT_MAX/5 this can't overflow.
-+ */
-+ if (num_chunks + old_num_chunks > UINT_MAX/5)
- {
-- png_memcpy(new_list, png_ptr->chunk_list,
-- (png_size_t)(5*old_num_chunks));
-- png_free(png_ptr, png_ptr->chunk_list);
-- png_ptr->chunk_list=NULL;
-+ png_app_error(png_ptr, "png_set_keep_unknown_chunks: too many chunks");
-+ return;
- }
-
-- png_memcpy(new_list + 5*old_num_chunks, chunk_list,
-- (png_size_t)(5*num_chunks));
-+ /* If these chunks are being reset to the default then no more memory is
-+ * required because add_one_chunk above doesn't extend the list if the 'keep'
-+ * parameter is the default.
-+ */
-+ if (keep != 0)
-+ {
-+ new_list = png_voidcast(png_bytep, png_malloc(png_ptr,
-+ 5 * (num_chunks + old_num_chunks)));
-
-- for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)
-- *p=(png_byte)keep;
-+ if (old_num_chunks > 0)
-+ memcpy(new_list, png_ptr->chunk_list, 5*old_num_chunks);
-+ }
-
-- png_ptr->num_chunk_list = old_num_chunks + num_chunks;
-- png_ptr->chunk_list = new_list;
-- png_ptr->free_me |= PNG_FREE_LIST;
-+ else if (old_num_chunks > 0)
-+ new_list = png_ptr->chunk_list;
-+
-+ else
-+ new_list = NULL;
-+
-+ /* Add the new chunks together with each one's handling code. If the chunk
-+ * already exists the code is updated, otherwise the chunk is added to the
-+ * end. (In libpng 1.6.0 order no longer matters because this code enforces
-+ * the earlier convention that the last setting is the one that is used.)
-+ */
-+ if (new_list != NULL)
-+ {
-+ png_const_bytep inlist;
-+ png_bytep outlist;
-+ unsigned int i;
-+
-+ for (i=0; i<num_chunks; ++i)
-+ {
-+ old_num_chunks = add_one_chunk(new_list, old_num_chunks,
-+ chunk_list+5*i, keep);
-+ }
-+
-+ /* Now remove any spurious 'default' entries. */
-+ num_chunks = 0;
-+ for (i=0, inlist=outlist=new_list; i<old_num_chunks; ++i, inlist += 5)
-+ {
-+ if (inlist[4])
-+ {
-+ if (outlist != inlist)
-+ memcpy(outlist, inlist, 5);
-+ outlist += 5;
-+ ++num_chunks;
-+ }
-+ }
-+
-+ /* This means the application has removed all the specialized handling. */
-+ if (num_chunks == 0)
-+ {
-+ if (png_ptr->chunk_list != new_list)
-+ png_free(png_ptr, new_list);
-+
-+ new_list = NULL;
-+ }
-+ }
-+
-+ else
-+ num_chunks = 0;
-+
-+ png_ptr->num_chunk_list = num_chunks;
-+
-+ if (png_ptr->chunk_list != new_list)
-+ {
-+ if (png_ptr->chunk_list != NULL)
-+ png_free(png_ptr, png_ptr->chunk_list);
-+
-+ png_ptr->chunk_list = new_list;
-+ }
- }
- #endif
-
- #ifdef PNG_READ_USER_CHUNKS_SUPPORTED
- void PNGAPI
--png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
-+png_set_read_user_chunk_fn(png_structrp png_ptr, png_voidp user_chunk_ptr,
- png_user_chunk_ptr read_user_chunk_fn)
- {
- png_debug(1, "in png_set_read_user_chunk_fn");
-@@ -1158,64 +1477,90 @@
-
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- void PNGAPI
--png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
-+png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
-+ png_bytepp row_pointers)
- {
- png_debug1(1, "in %s storage function", "rows");
-
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-- if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
-+ if (info_ptr->row_pointers != NULL &&
-+ (info_ptr->row_pointers != row_pointers))
- png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-
- info_ptr->row_pointers = row_pointers;
-
-- if (row_pointers)
-+ if (row_pointers != NULL)
- info_ptr->valid |= PNG_INFO_IDAT;
- }
- #endif
-
- void PNGAPI
--png_set_compression_buffer_size(png_structp png_ptr, png_size_t size)
-+png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
- {
- if (png_ptr == NULL)
- return;
-
-- png_free(png_ptr, png_ptr->zbuf);
-+ if (size == 0 || size > PNG_UINT_31_MAX)
-+ png_error(png_ptr, "invalid compression buffer size");
-
-- if (size > ZLIB_IO_MAX)
-- {
-- png_warning(png_ptr, "Attempt to set buffer size beyond max ignored");
-- png_ptr->zbuf_size = ZLIB_IO_MAX;
-- size = ZLIB_IO_MAX; /* must fit */
-- }
-+# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-+ {
-+ png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
-+ return;
-+ }
-+# endif
-
-- else
-- png_ptr->zbuf_size = (uInt)size;
-+# ifdef PNG_WRITE_SUPPORTED
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-+ {
-+ if (png_ptr->zowner != 0)
-+ {
-+ png_warning(png_ptr,
-+ "Compression buffer size cannot be changed because it is in use");
-+ return;
-+ }
-
-- png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
-+ if (size > ZLIB_IO_MAX)
-+ {
-+ png_warning(png_ptr,
-+ "Compression buffer size limited to system maximum");
-+ size = ZLIB_IO_MAX; /* must fit */
-+ }
-
-- /* The following ensures a relatively safe failure if this gets called while
-- * the buffer is actually in use.
-- */
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = 0;
-- png_ptr->zstream.avail_in = 0;
-+ else if (size < 6)
-+ {
-+ /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH
-+ * if this is permitted.
-+ */
-+ png_warning(png_ptr,
-+ "Compression buffer size cannot be reduced below 6");
-+ return;
-+ }
-+
-+ if (png_ptr->zbuffer_size != size)
-+ {
-+ png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
-+ png_ptr->zbuffer_size = (uInt)size;
-+ }
-+ }
-+# endif
- }
-
- void PNGAPI
--png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
-+png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
- {
-- if (png_ptr && info_ptr)
-+ if (png_ptr != NULL && info_ptr != NULL)
- info_ptr->valid &= ~mask;
- }
-
-
--
- #ifdef PNG_SET_USER_LIMITS_SUPPORTED
- /* This function was added to libpng 1.2.6 */
- void PNGAPI
--png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
-+png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,
- png_uint_32 user_height_max)
- {
- /* Images with dimensions larger than these limits will be
-@@ -1231,35 +1576,64 @@
-
- /* This function was added to libpng 1.4.0 */
- void PNGAPI
--png_set_chunk_cache_max (png_structp png_ptr,
-- png_uint_32 user_chunk_cache_max)
-+png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
- {
-- if (png_ptr)
-+ if (png_ptr != NULL)
- png_ptr->user_chunk_cache_max = user_chunk_cache_max;
- }
-
- /* This function was added to libpng 1.4.1 */
- void PNGAPI
--png_set_chunk_malloc_max (png_structp png_ptr,
-+png_set_chunk_malloc_max (png_structrp png_ptr,
- png_alloc_size_t user_chunk_malloc_max)
- {
-- if (png_ptr)
-+ if (png_ptr != NULL)
- png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
- }
--#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-+#endif /* ?SET_USER_LIMITS */
-
-
- #ifdef PNG_BENIGN_ERRORS_SUPPORTED
- void PNGAPI
--png_set_benign_errors(png_structp png_ptr, int allowed)
-+png_set_benign_errors(png_structrp png_ptr, int allowed)
- {
- png_debug(1, "in png_set_benign_errors");
-
-- if (allowed)
-- png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-+ /* If allowed is 1, png_benign_error() is treated as a warning.
-+ *
-+ * If allowed is 0, png_benign_error() is treated as an error (which
-+ * is the default behavior if png_set_benign_errors() is not called).
-+ */
-+
-+ if (allowed != 0)
-+ png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |
-+ PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN;
-
- else
-- png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
-+ png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |
-+ PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);
- }
--#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
--#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
-+#endif /* BENIGN_ERRORS */
-+
-+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+ /* Whether to report invalid palette index; added at libng-1.5.10.
-+ * It is possible for an indexed (color-type==3) PNG file to contain
-+ * pixels with invalid (out-of-range) indexes if the PLTE chunk has
-+ * fewer entries than the image's bit-depth would allow. We recover
-+ * from this gracefully by filling any incomplete palette with zeros
-+ * (opaque black). By default, when this occurs libpng will issue
-+ * a benign error. This API can be used to override that behavior.
-+ */
-+void PNGAPI
-+png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)
-+{
-+ png_debug(1, "in png_set_check_for_invalid_index");
-+
-+ if (allowed > 0)
-+ png_ptr->num_palette_max = 0;
-+
-+ else
-+ png_ptr->num_palette_max = -1;
-+}
-+#endif
-+#endif /* READ || WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngstruct.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngstruct.h Fri Apr 10 09:21:28 2015 -0700
-@@ -29,11 +29,11 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Copyright (c) 1998-2013 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-+ * Last changed in libpng 1.6.1 [March 28, 2013]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
-@@ -52,13 +52,130 @@
- * in this structure and is required for decompressing the LZ compressed
- * data in PNG files.
- */
-+#ifndef ZLIB_CONST
-+ /* We must ensure that zlib uses 'const' in declarations. */
-+# define ZLIB_CONST
-+#endif
- #include "zlib.h"
-+#ifdef const
-+ /* zlib.h sometimes #defines const to nothing, undo this. */
-+# undef const
-+#endif
-+
-+/* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility
-+ * with older builds.
-+ */
-+#if ZLIB_VERNUM < 0x1260
-+# define PNGZ_MSG_CAST(s) png_constcast(char*,s)
-+# define PNGZ_INPUT_CAST(b) png_constcast(png_bytep,b)
-+#else
-+# define PNGZ_MSG_CAST(s) (s)
-+# define PNGZ_INPUT_CAST(b) (b)
-+#endif
-+
-+/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
-+ * can handle at once. This type need be no larger than 16 bits (so maximum of
-+ * 65535), this define allows us to discover how big it is, but limited by the
-+ * maximuum for png_size_t. The value can be overriden in a library build
-+ * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
-+ * lower value (e.g. 255 works). A lower value may help memory usage (slightly)
-+ * and may even improve performance on some systems (and degrade it on others.)
-+ */
-+#ifndef ZLIB_IO_MAX
-+# define ZLIB_IO_MAX ((uInt)-1)
-+#endif
-+
-+#ifdef PNG_WRITE_SUPPORTED
-+/* The type of a compression buffer list used by the write code. */
-+typedef struct png_compression_buffer
-+{
-+ struct png_compression_buffer *next;
-+ png_byte output[1]; /* actually zbuf_size */
-+} png_compression_buffer, *png_compression_bufferp;
-+
-+#define PNG_COMPRESSION_BUFFER_SIZE(pp)\
-+ (offsetof(png_compression_buffer, output) + (pp)->zbuffer_size)
-+#endif
-+
-+/* Colorspace support; structures used in png_struct, png_info and in internal
-+ * functions to hold and communicate information about the color space.
-+ *
-+ * PNG_COLORSPACE_SUPPORTED is only required if the application will perform
-+ * colorspace corrections, otherwise all the colorspace information can be
-+ * skipped and the size of libpng can be reduced (significantly) by compiling
-+ * out the colorspace support.
-+ */
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+/* The chromaticities of the red, green and blue colorants and the chromaticity
-+ * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).
-+ */
-+typedef struct png_xy
-+{
-+ png_fixed_point redx, redy;
-+ png_fixed_point greenx, greeny;
-+ png_fixed_point bluex, bluey;
-+ png_fixed_point whitex, whitey;
-+} png_xy;
-+
-+/* The same data as above but encoded as CIE XYZ values. When this data comes
-+ * from chromaticities the sum of the Y values is assumed to be 1.0
-+ */
-+typedef struct png_XYZ
-+{
-+ png_fixed_point red_X, red_Y, red_Z;
-+ png_fixed_point green_X, green_Y, green_Z;
-+ png_fixed_point blue_X, blue_Y, blue_Z;
-+} png_XYZ;
-+#endif /* COLORSPACE */
-+
-+#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-+/* A colorspace is all the above plus, potentially, profile information,
-+ * however at present libpng does not use the profile internally so it is only
-+ * stored in the png_info struct (if iCCP is supported.) The rendering intent
-+ * is retained here and is checked.
-+ *
-+ * The file gamma encoding information is also stored here and gamma correction
-+ * is done by libpng, whereas color correction must currently be done by the
-+ * application.
-+ */
-+typedef struct png_colorspace
-+{
-+#ifdef PNG_GAMMA_SUPPORTED
-+ png_fixed_point gamma; /* File gamma */
-+#endif
-+
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+ png_xy end_points_xy; /* End points as chromaticities */
-+ png_XYZ end_points_XYZ; /* End points as CIE XYZ colorant values */
-+ png_uint_16 rendering_intent; /* Rendering intent of a profile */
-+#endif
-+
-+ /* Flags are always defined to simplify the code. */
-+ png_uint_16 flags; /* As defined below */
-+} png_colorspace, * PNG_RESTRICT png_colorspacerp;
-+
-+typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;
-+
-+/* General flags for the 'flags' field */
-+#define PNG_COLORSPACE_HAVE_GAMMA 0x0001
-+#define PNG_COLORSPACE_HAVE_ENDPOINTS 0x0002
-+#define PNG_COLORSPACE_HAVE_INTENT 0x0004
-+#define PNG_COLORSPACE_FROM_gAMA 0x0008
-+#define PNG_COLORSPACE_FROM_cHRM 0x0010
-+#define PNG_COLORSPACE_FROM_sRGB 0x0020
-+#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040
-+#define PNG_COLORSPACE_MATCHES_sRGB 0x0080 /* exact match on profile */
-+#define PNG_COLORSPACE_INVALID 0x8000
-+#define PNG_COLORSPACE_CANCEL(flags) (0xffff ^ (flags))
-+#endif /* COLORSPACE || GAMMA */
-
- struct png_struct_def
- {
- #ifdef PNG_SETJMP_SUPPORTED
-- jmp_buf longjmp_buffer; /* used in png_error */
-+ jmp_buf jmp_buf_local; /* New name in 1.6.0 for jmp_buf in png_struct */
- png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */
-+ jmp_buf *jmp_buf_ptr; /* passed to longjmp_fn */
-+ size_t jmp_buf_size; /* size of the above, if allocated */
- #endif
- png_error_ptr error_fn; /* function for printing errors and aborting */
- #ifdef PNG_WARNINGS_SUPPORTED
-@@ -91,22 +208,12 @@
- png_uint_32 flags; /* flags indicating various things to libpng */
- png_uint_32 transformations; /* which transformations to perform */
-
-- z_stream zstream; /* pointer to decompression structure (below) */
-- png_bytep zbuf; /* buffer for zlib */
-- uInt zbuf_size; /* size of zbuf (typically 65536) */
-+ png_uint_32 zowner; /* ID (chunk type) of zstream owner, 0 if none */
-+ z_stream zstream; /* decompression structure */
-+
- #ifdef PNG_WRITE_SUPPORTED
--
--/* Added in 1.5.4: state to keep track of whether the zstream has been
-- * initialized and if so whether it is for IDAT or some other chunk.
-- */
--#define PNG_ZLIB_UNINITIALIZED 0
--#define PNG_ZLIB_FOR_IDAT 1
--#define PNG_ZLIB_FOR_TEXT 2 /* anything other than IDAT */
--#define PNG_ZLIB_USE_MASK 3 /* bottom two bits */
--#define PNG_ZLIB_IN_USE 4 /* a flag value */
--
-- png_uint_32 zlib_state; /* State of zlib initialization */
--/* End of material added at libpng 1.5.4 */
-+ png_compression_bufferp zbuffer_list; /* Created on demand during write */
-+ uInt zbuffer_size; /* size of the actual buffer */
-
- int zlib_level; /* holds zlib compression level */
- int zlib_method; /* holds zlib compression method */
-@@ -115,8 +222,7 @@
- int zlib_strategy; /* holds zlib compression strategy */
- #endif
- /* Added at libpng 1.5.4 */
--#if defined(PNG_WRITE_COMPRESSED_TEXT_SUPPORTED) || \
-- defined(PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED)
-+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
- int zlib_text_level; /* holds zlib compression level */
- int zlib_text_method; /* holds zlib compression method */
- int zlib_text_window_bits; /* holds zlib compression window bits */
-@@ -124,6 +230,14 @@
- int zlib_text_strategy; /* holds zlib compression strategy */
- #endif
- /* End of material added at libpng 1.5.4 */
-+/* Added at libpng 1.6.0 */
-+#ifdef PNG_WRITE_SUPPORTED
-+ int zlib_set_level; /* Actual values set into the zstream on write */
-+ int zlib_set_method;
-+ int zlib_set_window_bits;
-+ int zlib_set_mem_level;
-+ int zlib_set_strategy;
-+#endif
-
- png_uint_32 width; /* width of image in pixels */
- png_uint_32 height; /* height of image in pixels */
-@@ -132,21 +246,32 @@
- png_size_t rowbytes; /* size of row in bytes */
- png_uint_32 iwidth; /* width of current interlaced row in pixels */
- png_uint_32 row_number; /* current row in interlace pass */
-- png_bytep prev_row; /* buffer to save previous (unfiltered) row */
-- png_bytep row_buf; /* buffer to save current (unfiltered) row */
-+ png_uint_32 chunk_name; /* PNG_CHUNK() id of current chunk */
-+ png_bytep prev_row; /* buffer to save previous (unfiltered) row.
-+ * This is a pointer into big_prev_row
-+ */
-+ png_bytep row_buf; /* buffer to save current (unfiltered) row.
-+ * This is a pointer into big_row_buf
-+ */
-+#ifdef PNG_WRITE_SUPPORTED
- png_bytep sub_row; /* buffer to save "sub" row when filtering */
- png_bytep up_row; /* buffer to save "up" row when filtering */
- png_bytep avg_row; /* buffer to save "avg" row when filtering */
- png_bytep paeth_row; /* buffer to save "Paeth" row when filtering */
-- png_row_info row_info; /* used for transformation routines */
-+#endif
- png_size_t info_rowbytes; /* Added in 1.5.4: cache of updated row bytes */
-
- png_uint_32 idat_size; /* current IDAT size for read */
- png_uint_32 crc; /* current chunk CRC value */
- png_colorp palette; /* palette from the input file */
- png_uint_16 num_palette; /* number of color entries in palette */
-+
-+/* Added at libpng-1.5.10 */
-+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+ int num_palette_max; /* maximum palette index found in IDAT */
-+#endif
-+
- png_uint_16 num_trans; /* number of transparency values */
-- png_byte chunk_name[5]; /* null-terminated name of current chunk */
- png_byte compression; /* file compression type (always 0) */
- png_byte filter; /* file filter type (always 0) */
- png_byte interlaced; /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-@@ -154,12 +279,17 @@
- png_byte do_filter; /* row filter flags (see PNG_FILTER_ below ) */
- png_byte color_type; /* color type of file */
- png_byte bit_depth; /* bit depth of file */
-- png_byte usr_bit_depth; /* bit depth of users row */
-+ png_byte usr_bit_depth; /* bit depth of users row: write only */
- png_byte pixel_depth; /* number of bits per pixel */
- png_byte channels; /* number of channels in file */
-- png_byte usr_channels; /* channels at start of write */
-+#ifdef PNG_WRITE_SUPPORTED
-+ png_byte usr_channels; /* channels at start of write: write only */
-+#endif
- png_byte sig_bytes; /* magic bytes read/written from start of file */
--
-+ png_byte maximum_pixel_depth;
-+ /* pixel depth used for the row buffers */
-+ png_byte transformed_pixel_depth;
-+ /* pixel depth after read/write transforms */
- #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
- png_uint_16 filler; /* filler bytes for pixel expansion */
- #endif
-@@ -172,7 +302,7 @@
- #ifdef PNG_READ_GAMMA_SUPPORTED
- png_color_16 background_1; /* background normalized to gamma 1.0 */
- #endif
--#endif /* PNG_bKGD_SUPPORTED */
-+#endif /* bKGD */
-
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- png_flush_ptr output_flush_fn; /* Function for flushing output */
-@@ -180,19 +310,20 @@
- png_uint_32 flush_rows; /* number of rows written since last flush */
- #endif
-
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-+#ifdef PNG_READ_GAMMA_SUPPORTED
- int gamma_shift; /* number of "insignificant" bits in 16-bit gamma */
-- png_fixed_point gamma; /* file gamma value */
- png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
--#endif
-
--#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
- png_bytep gamma_table; /* gamma table for 8-bit depth files */
-+ png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
-+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-+ defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-+ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
- png_bytep gamma_from_1; /* converts from 1.0 to screen */
- png_bytep gamma_to_1; /* converts from file to 1.0 */
-- png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
- png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
- png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
-+#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
- #endif
-
- #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
-@@ -228,14 +359,7 @@
- int process_mode; /* what push library is currently doing */
- int cur_palette; /* current push library palette index */
-
--# ifdef PNG_TEXT_SUPPORTED
-- png_size_t current_text_size; /* current size of text input data */
-- png_size_t current_text_left; /* how much text left to read in input */
-- png_charp current_text; /* current text chunk buffer */
-- png_charp current_text_ptr; /* current location in current_text */
--# endif /* PNG_PROGRESSIVE_READ_SUPPORTED && PNG_TEXT_SUPPORTED */
--
--#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-+#endif /* PROGRESSIVE_READ */
-
- #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
- /* For the Borland special 64K segment handler */
-@@ -251,10 +375,6 @@
- png_bytep quantize_index; /* index translation for palette files */
- #endif
-
--#if defined(PNG_READ_QUANTIZE_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
-- png_uint_16p hist; /* histogram */
--#endif
--
- #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
- png_byte heuristic_method; /* heuristic for row filter selection */
- png_byte num_prev_filters; /* number of weights for previous rows */
-@@ -265,9 +385,17 @@
- png_uint_16p inv_filter_costs; /* 1/relative filter calculation cost */
- #endif
-
-+ /* Options */
-+#ifdef PNG_SET_OPTION_SUPPORTED
-+ png_byte options; /* On/off state (up to 4 options) */
-+#endif
-+
-+#if PNG_LIBPNG_VER < 10700
-+/* To do: remove this from libpng-1.7 */
- #ifdef PNG_TIME_RFC1123_SUPPORTED
- char time_buffer[29]; /* String to hold RFC 1123 time text */
- #endif
-+#endif
-
- /* New members added in libpng-1.0.6 */
-
-@@ -275,27 +403,31 @@
-
- #ifdef PNG_USER_CHUNKS_SUPPORTED
- png_voidp user_chunk_ptr;
-+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
- png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
- #endif
-+#endif
-
--#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- int num_chunk_list;
-- png_bytep chunk_list;
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ int unknown_default; /* As PNG_HANDLE_* */
-+ unsigned int num_chunk_list; /* Number of entries in the list */
-+ png_bytep chunk_list; /* List of png_byte[5]; the textual chunk name
-+ * followed by a PNG_HANDLE_* byte */
- #endif
-
- /* New members added in libpng-1.0.3 */
- #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- png_byte rgb_to_gray_status;
-+ /* Added in libpng 1.5.5 to record setting of coefficients: */
-+ png_byte rgb_to_gray_coefficients_set;
- /* These were changed from png_byte in libpng-1.0.6 */
- png_uint_16 rgb_to_gray_red_coeff;
- png_uint_16 rgb_to_gray_green_coeff;
-- png_uint_16 rgb_to_gray_blue_coeff;
-+ /* deleted in 1.5.5: rgb_to_gray_blue_coeff; */
- #endif
-
- /* New member added in libpng-1.0.4 (renamed in 1.0.9) */
--#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
-- defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
-- defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
-+#if defined(PNG_MNG_FEATURES_SUPPORTED)
- /* Changed from png_byte to png_uint_32 at version 1.2.0 */
- png_uint_32 mng_features_permitted;
- #endif
-@@ -345,21 +477,41 @@
- #endif
-
- /* New member added in libpng-1.0.25 and 1.2.17 */
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-- /* Storage for unknown chunk that the library doesn't recognize. */
-+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-+ /* Temporary storage for unknown chunk that the library doesn't recognize,
-+ * used while reading the chunk.
-+ */
- png_unknown_chunk unknown_chunk;
- #endif
-
--/* New members added in libpng-1.2.26 */
-+/* New member added in libpng-1.2.26 */
- png_size_t old_big_row_buf_size;
-- png_size_t old_prev_row_size;
-
-+#ifdef PNG_READ_SUPPORTED
- /* New member added in libpng-1.2.30 */
-- png_charp chunkdata; /* buffer for reading chunk data */
-+ png_bytep read_buffer; /* buffer for reading chunk data */
-+ png_alloc_size_t read_buffer_size; /* current size of the buffer */
-+#endif
-+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-+ uInt IDAT_read_size; /* limit on read buffer size for IDAT */
-+#endif
-
- #ifdef PNG_IO_STATE_SUPPORTED
- /* New member added in libpng-1.4.0 */
- png_uint_32 io_state;
- #endif
-+
-+/* New member added in libpng-1.5.6 */
-+ png_bytep big_prev_row;
-+
-+/* New member added in libpng-1.5.7 */
-+ void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
-+ png_bytep row, png_const_bytep prev_row);
-+
-+#ifdef PNG_READ_SUPPORTED
-+#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-+ png_colorspace colorspace;
-+#endif
-+#endif
- };
- #endif /* PNGSTRUCT_H */
---- ./jdk/src/share/native/sun/awt/libpng/pngtest.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngtest.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -61,16 +61,50 @@
-
- #define _POSIX_SOURCE 1
-
--#include "zlib.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+/* Defined so I can write to a file on gui/windowing platforms */
-+/* #define STDERR stderr */
-+#define STDERR stdout /* For DOS */
-+
- #include "png.h"
-+
-+/* Known chunks that exist in pngtest.png must be supported or pngtest will fail
-+ * simply as a result of re-ordering them. This may be fixed in 1.7
-+ *
-+ * pngtest allocates a single row buffer for each row and overwrites it,
-+ * therefore if the write side doesn't support the writing of interlaced images
-+ * nothing can be done for an interlaced image (and the code below will fail
-+ * horribly trying to write extra data after writing garbage).
-+ */
-+#if defined PNG_READ_SUPPORTED && /* else nothing can be done */\
-+ defined PNG_READ_bKGD_SUPPORTED &&\
-+ defined PNG_READ_cHRM_SUPPORTED &&\
-+ defined PNG_READ_gAMA_SUPPORTED &&\
-+ defined PNG_READ_oFFs_SUPPORTED &&\
-+ defined PNG_READ_pCAL_SUPPORTED &&\
-+ defined PNG_READ_pHYs_SUPPORTED &&\
-+ defined PNG_READ_sBIT_SUPPORTED &&\
-+ defined PNG_READ_sCAL_SUPPORTED &&\
-+ defined PNG_READ_sRGB_SUPPORTED &&\
-+ defined PNG_READ_tEXt_SUPPORTED &&\
-+ defined PNG_READ_tIME_SUPPORTED &&\
-+ defined PNG_READ_zTXt_SUPPORTED &&\
-+ defined PNG_WRITE_INTERLACING_SUPPORTED
-+
-+#ifdef PNG_ZLIB_HEADER
-+# include PNG_ZLIB_HEADER /* defined by pnglibconf.h from 1.7 */
-+#else
-+# include "zlib.h"
-+#endif
-+
- /* Copied from pngpriv.h but only used in error messages below. */
- #ifndef PNG_ZBUF_SIZE
- # define PNG_ZBUF_SIZE 8192
- #endif
--# include <stdio.h>
--# include <stdlib.h>
--# include <string.h>
--# define FCLOSE(file) fclose(file)
-+#define FCLOSE(file) fclose(file)
-
- #ifndef PNG_STDIO_SUPPORTED
- typedef FILE * png_FILE_p;
-@@ -95,17 +129,6 @@
- # define SINGLE_ROWBUF_ALLOC /* Makes buffer overruns easier to nail */
- #endif
-
--/* The code uses memcmp and memcpy on large objects (typically row pointers) so
-- * it is necessary to do soemthing special on certain architectures, note that
-- * the actual support for this was effectively removed in 1.4, so only the
-- * memory remains in this program:
-- */
--#define CVT_PTR(ptr) (ptr)
--#define CVT_PTR_NOCHECK(ptr) (ptr)
--#define png_memcmp memcmp
--#define png_memcpy memcpy
--#define png_memset memset
--
- /* Turn on CPU timing
- #define PNGTEST_TIMING
- */
-@@ -126,30 +149,34 @@
- #endif
-
- static int verbose = 0;
--
--int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
--
--#ifdef __TURBOC__
--#include <mem.h>
--#endif
--
--/* Defined so I can write to a file on gui/windowing platforms */
--/* #define STDERR stderr */
--#define STDERR stdout /* For DOS */
-+static int strict = 0;
-+static int relaxed = 0;
-+static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */
-+static int error_count = 0; /* count calls to png_error */
-+static int warning_count = 0; /* count calls to png_warning */
-
- /* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
- #ifndef png_jmpbuf
- # define png_jmpbuf(png_ptr) png_ptr->jmpbuf
- #endif
-
-+/* Defines for unknown chunk handling if required. */
-+#ifndef PNG_HANDLE_CHUNK_ALWAYS
-+# define PNG_HANDLE_CHUNK_ALWAYS 3
-+#endif
-+#ifndef PNG_HANDLE_CHUNK_IF_SAFE
-+# define PNG_HANDLE_CHUNK_IF_SAFE 2
-+#endif
-+
-+/* Utility to save typing/errors, the argument must be a name */
-+#define MEMZERO(var) ((void)memset(&var, 0, sizeof var))
-+
- /* Example of using row callbacks to make a simple progress meter */
- static int status_pass = 1;
- static int status_dots_requested = 0;
- static int status_dots = 1;
-
--void PNGCBAPI
--read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
--void PNGCBAPI
-+static void PNGCBAPI
- read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
- {
- if (png_ptr == NULL || row_number > PNG_UINT_31_MAX)
-@@ -173,9 +200,8 @@
- fprintf(stdout, "r");
- }
-
--void PNGCBAPI
--write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
--void PNGCBAPI
-+#ifdef PNG_WRITE_SUPPORTED
-+static void PNGCBAPI
- write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
- {
- if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7)
-@@ -183,6 +209,7 @@
-
- fprintf(stdout, "w");
- }
-+#endif
-
-
- #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-@@ -191,9 +218,7 @@
- * 5 in case illegal filter values are present.)
- */
- static png_uint_32 filters_used[256];
--void PNGCBAPI
--count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
--void PNGCBAPI
-+static void PNGCBAPI
- count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
- {
- if (png_ptr != NULL && row_info != NULL)
-@@ -208,9 +233,7 @@
-
- static png_uint_32 zero_samples;
-
--void PNGCBAPI
--count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
--void PNGCBAPI
-+static void PNGCBAPI
- count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
- {
- png_bytep dp = data;
-@@ -288,7 +311,8 @@
- png_uint_32 n, nstop;
- int channel;
- int color_channels = row_info->channels;
-- if (row_info->color_type > 3)color_channels--;
-+ if (row_info->color_type > 3)
-+ color_channels--;
-
- for (n = 0, nstop=row_info->width; n<nstop; n++)
- {
-@@ -315,9 +339,7 @@
- }
- }
- }
--#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
--
--static int wrote_question = 0;
-+#endif /* WRITE_USER_TRANSFORM */
-
- #ifndef PNG_STDIO_SUPPORTED
- /* START of code to validate stdio-free compilation */
-@@ -366,12 +388,11 @@
- default:
- err = 1; /* uninitialized */
- }
-- if (err)
-+ if (err != 0)
- png_error(png_ptr, "Bad I/O state or buffer size");
- }
- #endif
-
--#ifndef USE_FAR_KEYWORD
- static void PNGCBAPI
- pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-@@ -396,59 +417,6 @@
- pngtest_check_io_state(png_ptr, length, PNG_IO_READING);
- #endif
- }
--#else
--/* This is the model-independent version. Since the standard I/O library
-- can't handle far buffers in the medium and small models, we have to copy
-- the data.
--*/
--
--#define NEAR_BUF_SIZE 1024
--#define MIN(a,b) (a <= b ? a : b)
--
--static void PNGCBAPI
--pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
--{
-- png_size_t check;
-- png_byte *n_data;
-- png_FILE_p io_ptr;
--
-- /* Check if data really is near. If so, use usual code. */
-- n_data = (png_byte *)CVT_PTR_NOCHECK(data);
-- io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr));
-- if ((png_bytep)n_data == data)
-- {
-- check = fread(n_data, 1, length, io_ptr);
-- }
-- else
-- {
-- png_byte buf[NEAR_BUF_SIZE];
-- png_size_t read, remaining, err;
-- check = 0;
-- remaining = length;
--
-- do
-- {
-- read = MIN(NEAR_BUF_SIZE, remaining);
-- err = fread(buf, 1, 1, io_ptr);
-- png_memcpy(data, buf, read); /* Copy far buffer to near buffer */
-- if (err != read)
-- break;
-- else
-- check += err;
-- data += read;
-- remaining -= read;
-- }
-- while (remaining != 0);
-- }
--
-- if (check != length)
-- png_error(png_ptr, "Read Error");
--
--#ifdef PNG_IO_STATE_SUPPORTED
-- pngtest_check_io_state(png_ptr, length, PNG_IO_READING);
--#endif
--}
--#endif /* USE_FAR_KEYWORD */
-
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- static void PNGCBAPI
-@@ -464,7 +432,6 @@
- * write_data function and use it at run time with png_set_write_fn(), rather
- * than changing the library.
- */
--#ifndef USE_FAR_KEYWORD
- static void PNGCBAPI
- pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-@@ -481,81 +448,31 @@
- pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
- #endif
- }
--#else
--/* This is the model-independent version. Since the standard I/O library
-- can't handle far buffers in the medium and small models, we have to copy
-- the data.
--*/
--
--#define NEAR_BUF_SIZE 1024
--#define MIN(a,b) (a <= b ? a : b)
--
--static void PNGCBAPI
--pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
--{
-- png_size_t check;
-- png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
-- png_FILE_p io_ptr;
--
-- /* Check if data really is near. If so, use usual code. */
-- near_data = (png_byte *)CVT_PTR_NOCHECK(data);
-- io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr));
--
-- if ((png_bytep)near_data == data)
-- {
-- check = fwrite(near_data, 1, length, io_ptr);
-- }
--
-- else
-- {
-- png_byte buf[NEAR_BUF_SIZE];
-- png_size_t written, remaining, err;
-- check = 0;
-- remaining = length;
--
-- do
-- {
-- written = MIN(NEAR_BUF_SIZE, remaining);
-- png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
-- err = fwrite(buf, 1, written, io_ptr);
-- if (err != written)
-- break;
-- else
-- check += err;
-- data += written;
-- remaining -= written;
-- }
-- while (remaining != 0);
-- }
--
-- if (check != length)
-- {
-- png_error(png_ptr, "Write Error");
-- }
--
--#ifdef PNG_IO_STATE_SUPPORTED
-- pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
--#endif
--}
--#endif /* USE_FAR_KEYWORD */
-+#endif /* !STDIO */
-
- /* This function is called when there is a warning, but the library thinks
- * it can continue anyway. Replacement functions don't have to do anything
- * here if you don't want to. In the default configuration, png_ptr is
- * not used, but it is passed in case it may be useful.
- */
-+typedef struct
-+{
-+ PNG_CONST char *file_name;
-+} pngtest_error_parameters;
-+
- static void PNGCBAPI
- pngtest_warning(png_structp png_ptr, png_const_charp message)
- {
- PNG_CONST char *name = "UNKNOWN (ERROR!)";
-- char *test;
-- test = png_get_error_ptr(png_ptr);
-+ pngtest_error_parameters *test =
-+ (pngtest_error_parameters*)png_get_error_ptr(png_ptr);
-
-- if (test == NULL)
-- fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
-+ ++warning_count;
-
-- else
-- fprintf(STDERR, "%s: libpng warning: %s\n", test, message);
-+ if (test != NULL && test->file_name != NULL)
-+ name = test->file_name;
-+
-+ fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
- }
-
- /* This is the default error handling function. Note that replacements for
-@@ -566,12 +483,14 @@
- static void PNGCBAPI
- pngtest_error(png_structp png_ptr, png_const_charp message)
- {
-+ ++error_count;
-+
- pngtest_warning(png_ptr, message);
- /* We can return because png_error calls the default handler, which is
- * actually OK in this case.
- */
- }
--#endif /* !PNG_STDIO_SUPPORTED */
-+
- /* END of code to validate stdio-free compilation */
-
- /* START of code to validate memory allocation and deallocation */
-@@ -590,9 +509,9 @@
- {
- png_alloc_size_t size;
- png_voidp pointer;
-- struct memory_information FAR *next;
-+ struct memory_information *next;
- } memory_information;
--typedef memory_information FAR *memory_infop;
-+typedef memory_information *memory_infop;
-
- static memory_infop pinformation = NULL;
- static int current_allocation = 0;
-@@ -622,7 +541,7 @@
- memory_infop pinfo;
- png_set_mem_fn(png_ptr, NULL, NULL, NULL);
- pinfo = (memory_infop)png_malloc(png_ptr,
-- png_sizeof(*pinfo));
-+ (sizeof *pinfo));
- pinfo->size = size;
- current_allocation += size;
- total_allocation += size;
-@@ -648,9 +567,9 @@
- pinfo->next = pinformation;
- pinformation = pinfo;
- /* Make sure the caller isn't assuming zeroed memory. */
-- png_memset(pinfo->pointer, 0xdd, pinfo->size);
-+ memset(pinfo->pointer, 0xdd, pinfo->size);
-
-- if (verbose)
-+ if (verbose != 0)
- printf("png_malloc %lu bytes at %p\n", (unsigned long)size,
- pinfo->pointer);
-
-@@ -675,7 +594,7 @@
-
- /* Unlink the element from the list. */
- {
-- memory_infop FAR *ppinfo = &pinformation;
-+ memory_infop *ppinfo = &pinformation;
-
- for (;;)
- {
-@@ -689,15 +608,16 @@
- fprintf(STDERR, "Duplicate free of memory\n");
- /* We must free the list element too, but first kill
- the memory that is to be freed. */
-- png_memset(ptr, 0x55, pinfo->size);
-- png_free_default(png_ptr, pinfo);
-+ memset(ptr, 0x55, pinfo->size);
-+ if (pinfo != NULL)
-+ free(pinfo);
- pinfo = NULL;
- break;
- }
-
- if (pinfo->next == NULL)
- {
-- fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
-+ fprintf(STDERR, "Pointer %p not found\n", ptr);
- break;
- }
-
-@@ -706,35 +626,84 @@
- }
-
- /* Finally free the data. */
-- if (verbose)
-+ if (verbose != 0)
- printf("Freeing %p\n", ptr);
-
-- png_free_default(png_ptr, ptr);
-+ if (ptr != NULL)
-+ free(ptr);
- ptr = NULL;
- }
--#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */
-+#endif /* USER_MEM && DEBUG */
- /* END of code to test memory allocation/deallocation */
-
-
-+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
- /* Demonstration of user chunk support of the sTER and vpAg chunks */
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-
- /* (sTER is a public chunk not yet known by libpng. vpAg is a private
- chunk used in ImageMagick to store "virtual page" size). */
-
--static png_uint_32 user_chunk_data[4];
-+static struct user_chunk_data
-+{
-+ png_const_infop info_ptr;
-+ png_uint_32 vpAg_width, vpAg_height;
-+ png_byte vpAg_units;
-+ png_byte sTER_mode;
-+ int location[2];
-+}
-+user_chunk_data;
-
-- /* 0: sTER mode + 1
-- * 1: vpAg width
-- * 2: vpAg height
-- * 3: vpAg units
-- */
-+/* Used for location and order; zero means nothing. */
-+#define have_sTER 0x01
-+#define have_vpAg 0x02
-+#define before_PLTE 0x10
-+#define before_IDAT 0x20
-+#define after_IDAT 0x40
-
--static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr,
-- png_unknown_chunkp chunk)
-+static void
-+init_callback_info(png_const_infop info_ptr)
- {
-- png_uint_32
-- *my_user_chunk_data;
-+ MEMZERO(user_chunk_data);
-+ user_chunk_data.info_ptr = info_ptr;
-+}
-+
-+static int
-+set_location(png_structp png_ptr, struct user_chunk_data *data, int what)
-+{
-+ int location;
-+
-+ if ((data->location[0] & what) != 0 || (data->location[1] & what) != 0)
-+ return 0; /* already have one of these */
-+
-+ /* Find where we are (the code below zeroes info_ptr to indicate that the
-+ * chunks before the first IDAT have been read.)
-+ */
-+ if (data->info_ptr == NULL) /* after IDAT */
-+ location = what | after_IDAT;
-+
-+ else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE) != 0)
-+ location = what | before_IDAT;
-+
-+ else
-+ location = what | before_PLTE;
-+
-+ if (data->location[0] == 0)
-+ data->location[0] = location;
-+
-+ else
-+ data->location[1] = location;
-+
-+ return 1; /* handled */
-+}
-+
-+static int PNGCBAPI
-+read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk)
-+{
-+ struct user_chunk_data *my_user_chunk_data =
-+ (struct user_chunk_data*)png_get_user_chunk_ptr(png_ptr);
-+
-+ if (my_user_chunk_data == NULL)
-+ png_error(png_ptr, "lost user chunk pointer");
-
- /* Return one of the following:
- * return (-n); chunk had an error
-@@ -759,9 +728,14 @@
- if (chunk->data[0] != 0 && chunk->data[0] != 1)
- return (-1); /* Invalid mode */
-
-- my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
-- my_user_chunk_data[0]=chunk->data[0]+1;
-- return (1);
-+ if (set_location(png_ptr, my_user_chunk_data, have_sTER) != 0)
-+ {
-+ my_user_chunk_data->sTER_mode=chunk->data[0];
-+ return (1);
-+ }
-+
-+ else
-+ return (0); /* duplicate sTER - give it to libpng */
- }
-
- if (chunk->name[0] != 118 || chunk->name[1] != 112 || /* v p */
-@@ -773,30 +747,126 @@
- if (chunk->size != 9)
- return (-1); /* Error return */
-
-- my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
-+ if (set_location(png_ptr, my_user_chunk_data, have_vpAg) == 0)
-+ return (0); /* duplicate vpAg */
-
-- my_user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
-- my_user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
-- my_user_chunk_data[3]=(png_uint_32)chunk->data[8];
-+ my_user_chunk_data->vpAg_width = png_get_uint_31(png_ptr, chunk->data);
-+ my_user_chunk_data->vpAg_height = png_get_uint_31(png_ptr, chunk->data + 4);
-+ my_user_chunk_data->vpAg_units = chunk->data[8];
-
- return (1);
-+}
-
-+#ifdef PNG_WRITE_SUPPORTED
-+static void
-+write_sTER_chunk(png_structp write_ptr)
-+{
-+ png_byte sTER[5] = {115, 84, 69, 82, '\0'};
-+
-+ if (verbose != 0)
-+ fprintf(STDERR, "\n stereo mode = %d\n", user_chunk_data.sTER_mode);
-+
-+ png_write_chunk(write_ptr, sTER, &user_chunk_data.sTER_mode, 1);
- }
-+
-+static void
-+write_vpAg_chunk(png_structp write_ptr)
-+{
-+ png_byte vpAg[5] = {118, 112, 65, 103, '\0'};
-+
-+ png_byte vpag_chunk_data[9];
-+
-+ if (verbose != 0)
-+ fprintf(STDERR, " vpAg = %lu x %lu, units = %d\n",
-+ (unsigned long)user_chunk_data.vpAg_width,
-+ (unsigned long)user_chunk_data.vpAg_height,
-+ user_chunk_data.vpAg_units);
-+
-+ png_save_uint_32(vpag_chunk_data, user_chunk_data.vpAg_width);
-+ png_save_uint_32(vpag_chunk_data + 4, user_chunk_data.vpAg_height);
-+ vpag_chunk_data[8] = user_chunk_data.vpAg_units;
-+ png_write_chunk(write_ptr, vpAg, vpag_chunk_data, 9);
-+}
-+
-+static void
-+write_chunks(png_structp write_ptr, int location)
-+{
-+ int i;
-+
-+ /* Notice that this preserves the original chunk order, however chunks
-+ * intercepted by the callback will be written *after* chunks passed to
-+ * libpng. This will actually reverse a pair of sTER chunks or a pair of
-+ * vpAg chunks, resulting in an error later. This is not worth worrying
-+ * about - the chunks should not be duplicated!
-+ */
-+ for (i=0; i<2; ++i)
-+ {
-+ if (user_chunk_data.location[i] == (location | have_sTER))
-+ write_sTER_chunk(write_ptr);
-+
-+ else if (user_chunk_data.location[i] == (location | have_vpAg))
-+ write_vpAg_chunk(write_ptr);
-+ }
-+}
-+#endif /* WRITE */
-+#else /* !READ_USER_CHUNKS */
-+# define write_chunks(pp,loc) ((void)0)
- #endif
- /* END of code to demonstrate user chunk support */
-
-+/* START of code to check that libpng has the required text support; this only
-+ * checks for the write support because if read support is missing the chunk
-+ * will simply not be reported back to pngtest.
-+ */
-+#ifdef PNG_TEXT_SUPPORTED
-+static void
-+pngtest_check_text_support(png_const_structp png_ptr, png_textp text_ptr,
-+ int num_text)
-+{
-+ while (num_text > 0)
-+ {
-+ switch (text_ptr[--num_text].compression)
-+ {
-+ case PNG_TEXT_COMPRESSION_NONE:
-+ break;
-+
-+ case PNG_TEXT_COMPRESSION_zTXt:
-+# ifndef PNG_WRITE_zTXt_SUPPORTED
-+ ++unsupported_chunks;
-+# endif
-+ break;
-+
-+ case PNG_ITXT_COMPRESSION_NONE:
-+ case PNG_ITXT_COMPRESSION_zTXt:
-+# ifndef PNG_WRITE_iTXt_SUPPORTED
-+ ++unsupported_chunks;
-+# endif
-+ break;
-+
-+ default:
-+ /* This is an error */
-+ png_error(png_ptr, "invalid text chunk compression field");
-+ break;
-+ }
-+ }
-+}
-+#endif
-+/* END of code to check that libpng has the required text support */
-+
- /* Test one file */
--int
-+static int
- test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
- {
- static png_FILE_p fpin;
- static png_FILE_p fpout; /* "static" prevents setjmp corruption */
-+ pngtest_error_parameters error_parameters;
- png_structp read_ptr;
- png_infop read_info_ptr, end_info_ptr;
- #ifdef PNG_WRITE_SUPPORTED
- png_structp write_ptr;
- png_infop write_info_ptr;
- png_infop write_end_info_ptr;
-+ int interlace_preserved = 1;
- #else
- png_structp write_ptr = NULL;
- png_infop write_info_ptr = NULL;
-@@ -805,17 +875,11 @@
- png_bytep row_buf;
- png_uint_32 y;
- png_uint_32 width, height;
-- int num_pass, pass;
-+ int num_pass = 1, pass;
- int bit_depth, color_type;
--#ifdef PNG_SETJMP_SUPPORTED
--#ifdef USE_FAR_KEYWORD
-- jmp_buf tmp_jmpbuf;
--#endif
--#endif
--
-- char inbuf[256], outbuf[256];
-
- row_buf = NULL;
-+ error_parameters.file_name = inname;
-
- if ((fpin = fopen(inname, "rb")) == NULL)
- {
-@@ -839,20 +903,9 @@
- read_ptr =
- png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- #endif
--#ifndef PNG_STDIO_SUPPORTED
-- png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
-- pngtest_warning);
--#endif
-+ png_set_error_fn(read_ptr, &error_parameters, pngtest_error,
-+ pngtest_warning);
-
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-- user_chunk_data[0] = 0;
-- user_chunk_data[1] = 0;
-- user_chunk_data[2] = 0;
-- user_chunk_data[3] = 0;
-- png_set_read_user_chunk_fn(read_ptr, user_chunk_data,
-- read_user_chunk_callback);
--
--#endif
- #ifdef PNG_WRITE_SUPPORTED
- #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
- write_ptr =
-@@ -862,10 +915,8 @@
- write_ptr =
- png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- #endif
--#ifndef PNG_STDIO_SUPPORTED
-- png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
-- pngtest_warning);
--#endif
-+ png_set_error_fn(write_ptr, &error_parameters, pngtest_error,
-+ pngtest_warning);
- #endif
- pngtest_debug("Allocating read_info, write_info and end_info structures");
- read_info_ptr = png_create_info_struct(read_ptr);
-@@ -875,13 +926,15 @@
- write_end_info_ptr = png_create_info_struct(write_ptr);
- #endif
-
-+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-+ init_callback_info(read_info_ptr);
-+ png_set_read_user_chunk_fn(read_ptr, &user_chunk_data,
-+ read_user_chunk_callback);
-+#endif
-+
- #ifdef PNG_SETJMP_SUPPORTED
- pngtest_debug("Setting jmpbuf for read struct");
--#ifdef USE_FAR_KEYWORD
-- if (setjmp(tmp_jmpbuf))
--#else
- if (setjmp(png_jmpbuf(read_ptr)))
--#endif
- {
- fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
- png_free(read_ptr, row_buf);
-@@ -895,18 +948,11 @@
- FCLOSE(fpout);
- return (1);
- }
--#ifdef USE_FAR_KEYWORD
-- png_memcpy(png_jmpbuf(read_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
--#endif
-
- #ifdef PNG_WRITE_SUPPORTED
- pngtest_debug("Setting jmpbuf for write struct");
--#ifdef USE_FAR_KEYWORD
-
-- if (setjmp(tmp_jmpbuf))
--#else
- if (setjmp(png_jmpbuf(write_ptr)))
--#endif
- {
- fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
- png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
-@@ -918,12 +964,34 @@
- FCLOSE(fpout);
- return (1);
- }
-+#endif
-+#endif
-
--#ifdef USE_FAR_KEYWORD
-- png_memcpy(png_jmpbuf(write_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
-+ if (strict != 0)
-+ {
-+ /* Treat png_benign_error() as errors on read */
-+ png_set_benign_errors(read_ptr, 0);
-+
-+#ifdef PNG_WRITE_SUPPORTED
-+ /* Treat them as errors on write */
-+ png_set_benign_errors(write_ptr, 0);
- #endif
-+
-+ /* if strict is not set, then app warnings and errors are treated as
-+ * warnings in release builds, but not in unstable builds; this can be
-+ * changed with '--relaxed'.
-+ */
-+ }
-+
-+ else if (relaxed != 0)
-+ {
-+ /* Allow application (pngtest) errors and warnings to pass */
-+ png_set_benign_errors(read_ptr, 1);
-+
-+#ifdef PNG_WRITE_SUPPORTED
-+ png_set_benign_errors(write_ptr, 1);
- #endif
--#endif
-+ }
-
- pngtest_debug("Initializing input and output streams");
- #ifdef PNG_STDIO_SUPPORTED
-@@ -943,14 +1011,6 @@
- # endif
- #endif
-
--#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-- /* Normally one would use Z_DEFAULT_STRATEGY for text compression.
-- * This is here just to make pngtest replicate the results from libpng
-- * versions prior to 1.5.4, and to test this new API.
-- */
-- png_set_text_compression_strategy(write_ptr, Z_FILTERED);
--#endif
--
- if (status_dots_requested == 1)
- {
- #ifdef PNG_WRITE_SUPPORTED
-@@ -982,36 +1042,65 @@
- png_set_write_user_transform_fn(write_ptr, count_zero_samples);
- #endif
-
--#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
--# ifndef PNG_HANDLE_CHUNK_ALWAYS
--# define PNG_HANDLE_CHUNK_ALWAYS 3
--# endif
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ /* Preserve all the unknown chunks, if possible. If this is disabled then,
-+ * even if the png_{get,set}_unknown_chunks stuff is enabled, we can't use
-+ * libpng to *save* the unknown chunks on read (because we can't switch the
-+ * save option on!)
-+ *
-+ * Notice that if SET_UNKNOWN_CHUNKS is *not* supported read will discard all
-+ * unknown chunks and write will write them all.
-+ */
-+#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
- png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
- NULL, 0);
- #endif
- #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
--# ifndef PNG_HANDLE_CHUNK_IF_SAFE
--# define PNG_HANDLE_CHUNK_IF_SAFE 2
--# endif
-- png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,
-+ png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,
- NULL, 0);
- #endif
-+#endif
-
- pngtest_debug("Reading info struct");
- png_read_info(read_ptr, read_info_ptr);
-
-+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-+ /* This is a bit of a hack; there is no obvious way in the callback function
-+ * to determine that the chunks before the first IDAT have been read, so
-+ * remove the info_ptr (which is only used to determine position relative to
-+ * PLTE) here to indicate that we are after the IDAT.
-+ */
-+ user_chunk_data.info_ptr = NULL;
-+#endif
-+
- pngtest_debug("Transferring info struct");
- {
- int interlace_type, compression_type, filter_type;
-
- if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
-- &color_type, &interlace_type, &compression_type, &filter_type))
-+ &color_type, &interlace_type, &compression_type, &filter_type) != 0)
- {
- png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
--#ifdef PNG_WRITE_INTERLACING_SUPPORTED
- color_type, interlace_type, compression_type, filter_type);
--#else
-- color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
-+#ifndef PNG_READ_INTERLACING_SUPPORTED
-+ /* num_pass will not be set below, set it here if the image is
-+ * interlaced: what happens is that write interlacing is *not* turned
-+ * on an the partial interlaced rows are written directly.
-+ */
-+ switch (interlace_type)
-+ {
-+ case PNG_INTERLACE_NONE:
-+ num_pass = 1;
-+ break;
-+
-+ case PNG_INTERLACE_ADAM7:
-+ num_pass = 7;
-+ break;
-+
-+ default:
-+ png_error(read_ptr, "invalid interlace type");
-+ /*NOT REACHED*/
-+ }
- #endif
- }
- }
-@@ -1022,7 +1111,7 @@
- blue_y;
-
- if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
-- &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y))
-+ &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
- {
- png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
- red_y, green_x, green_y, blue_x, blue_y);
-@@ -1033,7 +1122,7 @@
- {
- png_fixed_point gamma;
-
-- if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
-+ if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma) != 0)
- png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
- }
- #endif
-@@ -1045,7 +1134,7 @@
- blue_y;
-
- if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
-- &red_y, &green_x, &green_y, &blue_x, &blue_y))
-+ &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
- {
- png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
- red_y, green_x, green_y, blue_x, blue_y);
-@@ -1056,7 +1145,7 @@
- {
- double gamma;
-
-- if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
-+ if (png_get_gAMA(read_ptr, read_info_ptr, &gamma) != 0)
- png_set_gAMA(write_ptr, write_info_ptr, gamma);
- }
- #endif
-@@ -1070,7 +1159,7 @@
- int compression_type;
-
- if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
-- &profile, &proflen))
-+ &profile, &proflen) != 0)
- {
- png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
- profile, proflen);
-@@ -1081,7 +1170,7 @@
- {
- int intent;
-
-- if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
-+ if (png_get_sRGB(read_ptr, read_info_ptr, &intent) != 0)
- png_set_sRGB(write_ptr, write_info_ptr, intent);
- }
- #endif
-@@ -1089,14 +1178,14 @@
- png_colorp palette;
- int num_palette;
-
-- if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
-+ if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette) != 0)
- png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
- }
- #ifdef PNG_bKGD_SUPPORTED
- {
- png_color_16p background;
-
-- if (png_get_bKGD(read_ptr, read_info_ptr, &background))
-+ if (png_get_bKGD(read_ptr, read_info_ptr, &background) != 0)
- {
- png_set_bKGD(write_ptr, write_info_ptr, background);
- }
-@@ -1106,7 +1195,7 @@
- {
- png_uint_16p hist;
-
-- if (png_get_hIST(read_ptr, read_info_ptr, &hist))
-+ if (png_get_hIST(read_ptr, read_info_ptr, &hist) != 0)
- png_set_hIST(write_ptr, write_info_ptr, hist);
- }
- #endif
-@@ -1116,7 +1205,7 @@
- int unit_type;
-
- if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
-- &unit_type))
-+ &unit_type) != 0)
- {
- png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
- }
-@@ -1130,7 +1219,7 @@
- int type, nparams;
-
- if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
-- &nparams, &units, &params))
-+ &nparams, &units, &params) != 0)
- {
- png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
- nparams, units, params);
-@@ -1142,7 +1231,8 @@
- png_uint_32 res_x, res_y;
- int unit_type;
-
-- if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
-+ if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y,
-+ &unit_type) != 0)
- png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
- }
- #endif
-@@ -1150,18 +1240,19 @@
- {
- png_color_8p sig_bit;
-
-- if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
-+ if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit) != 0)
- png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
- }
- #endif
- #ifdef PNG_sCAL_SUPPORTED
--#ifdef PNG_FLOATING_POINT_SUPPORTED
-+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-+ defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
- {
- int unit;
- double scal_width, scal_height;
-
- if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
-- &scal_height))
-+ &scal_height) != 0)
- {
- png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
- }
-@@ -1173,7 +1264,7 @@
- png_charp scal_width, scal_height;
-
- if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
-- &scal_height))
-+ &scal_height) != 0)
- {
- png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
- scal_height);
-@@ -1190,6 +1281,21 @@
- if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
- {
- pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
-+
-+ pngtest_check_text_support(read_ptr, text_ptr, num_text);
-+
-+ if (verbose != 0)
-+ {
-+ int i;
-+
-+ printf("\n");
-+ for (i=0; i<num_text; i++)
-+ {
-+ printf(" Text compression[%d]=%d\n",
-+ i, text_ptr[i].compression);
-+ }
-+ }
-+
- png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
- }
- }
-@@ -1198,21 +1304,21 @@
- {
- png_timep mod_time;
-
-- if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
-+ if (png_get_tIME(read_ptr, read_info_ptr, &mod_time) != 0)
- {
- png_set_tIME(write_ptr, write_info_ptr, mod_time);
- #ifdef PNG_TIME_RFC1123_SUPPORTED
-- /* We have to use png_memcpy instead of "=" because the string
-- * pointed to by png_convert_to_rfc1123() gets free'ed before
-- * we use it.
-- */
-- png_memcpy(tIME_string,
-- png_convert_to_rfc1123(read_ptr, mod_time),
-- png_sizeof(tIME_string));
-+ if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
-+ tIME_string[(sizeof tIME_string) - 1] = '\0';
-
-- tIME_string[png_sizeof(tIME_string) - 1] = '\0';
-+ else
-+ {
-+ strncpy(tIME_string, "*** invalid time ***", (sizeof tIME_string));
-+ tIME_string[(sizeof tIME_string) - 1] = '\0';
-+ }
-+
- tIME_chunk_present++;
--#endif /* PNG_TIME_RFC1123_SUPPORTED */
-+#endif /* TIME_RFC1123 */
- }
- }
- #endif
-@@ -1223,7 +1329,7 @@
- png_color_16p trans_color;
-
- if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,
-- &trans_color))
-+ &trans_color) != 0)
- {
- int sample_max = (1 << bit_depth);
- /* libpng doesn't reject a tRNS chunk with out-of-range samples */
-@@ -1244,18 +1350,22 @@
- int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,
- &unknowns);
-
-- if (num_unknowns)
-+ if (num_unknowns != 0)
- {
-- int i;
- png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
- num_unknowns);
-+#if PNG_LIBPNG_VER < 10600
- /* Copy the locations from the read_info_ptr. The automatically
-- * generated locations in write_info_ptr are wrong because we
-- * haven't written anything yet.
-+ * generated locations in write_end_info_ptr are wrong prior to 1.6.0
-+ * because they are reset from the write pointer (removed in 1.6.0).
- */
-- for (i = 0; i < num_unknowns; i++)
-- png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
-- unknowns[i].location);
-+ {
-+ int i;
-+ for (i = 0; i < num_unknowns; i++)
-+ png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
-+ unknowns[i].location);
-+ }
-+#endif
- }
- }
- #endif
-@@ -1263,47 +1373,16 @@
- #ifdef PNG_WRITE_SUPPORTED
- pngtest_debug("Writing info struct");
-
--/* If we wanted, we could write info in two steps:
-- * png_write_info_before_PLTE(write_ptr, write_info_ptr);
-- */
-+ /* Write the info in two steps so that if we write the 'unknown' chunks here
-+ * they go to the correct place.
-+ */
-+ png_write_info_before_PLTE(write_ptr, write_info_ptr);
-+
-+ write_chunks(write_ptr, before_PLTE); /* before PLTE */
-+
- png_write_info(write_ptr, write_info_ptr);
-
--#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-- if (user_chunk_data[0] != 0)
-- {
-- png_byte png_sTER[5] = {115, 84, 69, 82, '\0'};
--
-- unsigned char
-- ster_chunk_data[1];
--
-- if (verbose)
-- fprintf(STDERR, "\n stereo mode = %lu\n",
-- (unsigned long)(user_chunk_data[0] - 1));
--
-- ster_chunk_data[0]=(unsigned char)(user_chunk_data[0] - 1);
-- png_write_chunk(write_ptr, png_sTER, ster_chunk_data, 1);
-- }
--
-- if (user_chunk_data[1] != 0 || user_chunk_data[2] != 0)
-- {
-- png_byte png_vpAg[5] = {118, 112, 65, 103, '\0'};
--
-- unsigned char
-- vpag_chunk_data[9];
--
-- if (verbose)
-- fprintf(STDERR, " vpAg = %lu x %lu, units = %lu\n",
-- (unsigned long)user_chunk_data[1],
-- (unsigned long)user_chunk_data[2],
-- (unsigned long)user_chunk_data[3]);
--
-- png_save_uint_32(vpag_chunk_data, user_chunk_data[1]);
-- png_save_uint_32(vpag_chunk_data + 4, user_chunk_data[2]);
-- vpag_chunk_data[8] = (unsigned char)(user_chunk_data[3] & 0xff);
-- png_write_chunk(write_ptr, png_vpAg, vpag_chunk_data, 9);
-- }
--
--#endif
-+ write_chunks(write_ptr, before_IDAT); /* after PLTE */
- #endif
-
- #ifdef SINGLE_ROWBUF_ALLOC
-@@ -1315,14 +1394,10 @@
- #endif /* SINGLE_ROWBUF_ALLOC */
- pngtest_debug("Writing row data");
-
--#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-- defined(PNG_WRITE_INTERLACING_SUPPORTED)
-+#ifdef PNG_READ_INTERLACING_SUPPORTED
- num_pass = png_set_interlace_handling(read_ptr);
--# ifdef PNG_WRITE_SUPPORTED
-- png_set_interlace_handling(write_ptr);
--# endif
--#else
-- num_pass = 1;
-+ if (png_set_interlace_handling(write_ptr) != num_pass)
-+ png_error(write_ptr, "png_set_interlace_handling: inconsistent num_pass");
- #endif
-
- #ifdef PNGTEST_TIMING
-@@ -1337,11 +1412,12 @@
- {
- #ifndef SINGLE_ROWBUF_ALLOC
- pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);
-+
- row_buf = (png_bytep)png_malloc(read_ptr,
- png_get_rowbytes(read_ptr, read_info_ptr));
-
-- pngtest_debug2("\t0x%08lx (%u bytes)", (unsigned long)row_buf,
-- png_get_rowbytes(read_ptr, read_info_ptr));
-+ pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,
-+ (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
-
- #endif /* !SINGLE_ROWBUF_ALLOC */
- png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
-@@ -1358,7 +1434,7 @@
- t_encode += (t_stop - t_start);
- t_start = t_stop;
- #endif
--#endif /* PNG_WRITE_SUPPORTED */
-+#endif /* WRITE */
-
- #ifndef SINGLE_ROWBUF_ALLOC
- pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);
-@@ -1368,11 +1444,13 @@
- }
- }
-
--#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-- png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
--#endif
--#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-- png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
-+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-+# ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-+ png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
-+# endif
-+# ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-+ png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
-+# endif
- #endif
-
- pngtest_debug("Reading and writing end_info data");
-@@ -1386,6 +1464,21 @@
- if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
- {
- pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
-+
-+ pngtest_check_text_support(read_ptr, text_ptr, num_text);
-+
-+ if (verbose != 0)
-+ {
-+ int i;
-+
-+ printf("\n");
-+ for (i=0; i<num_text; i++)
-+ {
-+ printf(" Text compression[%d]=%d\n",
-+ i, text_ptr[i].compression);
-+ }
-+ }
-+
- png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
- }
- }
-@@ -1394,20 +1487,21 @@
- {
- png_timep mod_time;
-
-- if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
-+ if (png_get_tIME(read_ptr, end_info_ptr, &mod_time) != 0)
- {
- png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
- #ifdef PNG_TIME_RFC1123_SUPPORTED
-- /* We have to use png_memcpy instead of "=" because the string
-- pointed to by png_convert_to_rfc1123() gets free'ed before
-- we use it */
-- png_memcpy(tIME_string,
-- png_convert_to_rfc1123(read_ptr, mod_time),
-- png_sizeof(tIME_string));
-+ if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
-+ tIME_string[(sizeof tIME_string) - 1] = '\0';
-
-- tIME_string[png_sizeof(tIME_string) - 1] = '\0';
-+ else
-+ {
-+ strncpy(tIME_string, "*** invalid time ***", sizeof tIME_string);
-+ tIME_string[(sizeof tIME_string)-1] = '\0';
-+ }
-+
- tIME_chunk_present++;
--#endif /* PNG_TIME_RFC1123_SUPPORTED */
-+#endif /* TIME_RFC1123 */
- }
- }
- #endif
-@@ -1417,27 +1511,48 @@
- int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,
- &unknowns);
-
-- if (num_unknowns)
-+ if (num_unknowns != 0)
- {
-- int i;
- png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
- num_unknowns);
-+#if PNG_LIBPNG_VER < 10600
- /* Copy the locations from the read_info_ptr. The automatically
-- * generated locations in write_end_info_ptr are wrong because we
-- * haven't written the end_info yet.
-+ * generated locations in write_end_info_ptr are wrong prior to 1.6.0
-+ * because they are reset from the write pointer (removed in 1.6.0).
- */
-- for (i = 0; i < num_unknowns; i++)
-- png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
-- unknowns[i].location);
-+ {
-+ int i;
-+ for (i = 0; i < num_unknowns; i++)
-+ png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
-+ unknowns[i].location);
-+ }
-+#endif
- }
- }
- #endif
-+
- #ifdef PNG_WRITE_SUPPORTED
-+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-+ /* Normally one would use Z_DEFAULT_STRATEGY for text compression.
-+ * This is here just to make pngtest replicate the results from libpng
-+ * versions prior to 1.5.4, and to test this new API.
-+ */
-+ png_set_text_compression_strategy(write_ptr, Z_FILTERED);
-+#endif
-+
-+ /* When the unknown vpAg/sTER chunks are written by pngtest the only way to
-+ * do it is to write them *before* calling png_write_end. When unknown
-+ * chunks are written by libpng, however, they are written just before IEND.
-+ * There seems to be no way round this, however vpAg/sTER are not expected
-+ * after IDAT.
-+ */
-+ write_chunks(write_ptr, after_IDAT);
-+
- png_write_end(write_ptr, write_end_info_ptr);
- #endif
-
- #ifdef PNG_EASY_ACCESS_SUPPORTED
-- if (verbose)
-+ if (verbose != 0)
- {
- png_uint_32 iwidth, iheight;
- iwidth = png_get_image_width(write_ptr, write_info_ptr);
-@@ -1466,6 +1581,40 @@
- FCLOSE(fpin);
- FCLOSE(fpout);
-
-+ /* Summarize any warnings or errors and in 'strict' mode fail the test.
-+ * Unsupported chunks can result in warnings, in that case ignore the strict
-+ * setting, otherwise fail the test on warnings as well as errors.
-+ */
-+ if (error_count > 0)
-+ {
-+ /* We don't really expect to get here because of the setjmp handling
-+ * above, but this is safe.
-+ */
-+ fprintf(STDERR, "\n %s: %d libpng errors found (%d warnings)",
-+ inname, error_count, warning_count);
-+
-+ if (strict != 0)
-+ return (1);
-+ }
-+
-+# ifdef PNG_WRITE_SUPPORTED
-+ /* If there we no write support nothing was written! */
-+ else if (unsupported_chunks > 0)
-+ {
-+ fprintf(STDERR, "\n %s: unsupported chunks (%d)%s",
-+ inname, unsupported_chunks, strict ? ": IGNORED --strict!" : "");
-+ }
-+# endif
-+
-+ else if (warning_count > 0)
-+ {
-+ fprintf(STDERR, "\n %s: %d libpng warnings found",
-+ inname, warning_count);
-+
-+ if (strict != 0)
-+ return (1);
-+ }
-+
- pngtest_debug("Opening files for comparison");
- if ((fpin = fopen(inname, "rb")) == NULL)
- {
-@@ -1480,61 +1629,84 @@
- return (1);
- }
-
-- for (;;)
-+#ifdef PNG_WRITE_SUPPORTED /* else nothing was written */
-+ if (interlace_preserved != 0) /* else the files will be changed */
- {
-- png_size_t num_in, num_out;
-+ for (;;)
-+ {
-+ static int wrote_question = 0;
-+ png_size_t num_in, num_out;
-+ char inbuf[256], outbuf[256];
-
-- num_in = fread(inbuf, 1, 1, fpin);
-- num_out = fread(outbuf, 1, 1, fpout);
-+ num_in = fread(inbuf, 1, sizeof inbuf, fpin);
-+ num_out = fread(outbuf, 1, sizeof outbuf, fpout);
-
-- if (num_in != num_out)
-- {
-- fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
-- inname, outname);
-+ if (num_in != num_out)
-+ {
-+ fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
-+ inname, outname);
-
-- if (wrote_question == 0)
-- {
-- fprintf(STDERR,
-+ if (wrote_question == 0 && unsupported_chunks == 0)
-+ {
-+ fprintf(STDERR,
- " Was %s written with the same maximum IDAT chunk size (%d bytes),",
-- inname, PNG_ZBUF_SIZE);
-- fprintf(STDERR,
-- "\n filtering heuristic (libpng default), compression");
-- fprintf(STDERR,
-- " level (zlib default),\n and zlib version (%s)?\n\n",
-- ZLIB_VERSION);
-- wrote_question = 1;
-+ inname, PNG_ZBUF_SIZE);
-+ fprintf(STDERR,
-+ "\n filtering heuristic (libpng default), compression");
-+ fprintf(STDERR,
-+ " level (zlib default),\n and zlib version (%s)?\n\n",
-+ ZLIB_VERSION);
-+ wrote_question = 1;
-+ }
-+
-+ FCLOSE(fpin);
-+ FCLOSE(fpout);
-+
-+ if (strict != 0 && unsupported_chunks == 0)
-+ return (1);
-+
-+ else
-+ return (0);
- }
-
-- FCLOSE(fpin);
-- FCLOSE(fpout);
-- return (0);
-- }
-+ if (num_in == 0)
-+ break;
-
-- if (!num_in)
-- break;
-+ if (memcmp(inbuf, outbuf, num_in))
-+ {
-+ fprintf(STDERR, "\nFiles %s and %s are different\n", inname,
-+ outname);
-
-- if (png_memcmp(inbuf, outbuf, num_in))
-- {
-- fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
-+ if (wrote_question == 0 && unsupported_chunks == 0)
-+ {
-+ fprintf(STDERR,
-+ " Was %s written with the same maximum IDAT chunk size (%d bytes),",
-+ inname, PNG_ZBUF_SIZE);
-+ fprintf(STDERR,
-+ "\n filtering heuristic (libpng default), compression");
-+ fprintf(STDERR,
-+ " level (zlib default),\n and zlib version (%s)?\n\n",
-+ ZLIB_VERSION);
-+ wrote_question = 1;
-+ }
-
-- if (wrote_question == 0)
-- {
-- fprintf(STDERR,
-- " Was %s written with the same maximum IDAT chunk size (%d bytes),",
-- inname, PNG_ZBUF_SIZE);
-- fprintf(STDERR,
-- "\n filtering heuristic (libpng default), compression");
-- fprintf(STDERR,
-- " level (zlib default),\n and zlib version (%s)?\n\n",
-- ZLIB_VERSION);
-- wrote_question = 1;
-+ FCLOSE(fpin);
-+ FCLOSE(fpout);
-+
-+ /* NOTE: the unsupported_chunks escape is permitted here because
-+ * unsupported text chunk compression will result in the compression
-+ * mode being changed (to NONE) yet, in the test case, the result
-+ * can be exactly the same size!
-+ */
-+ if (strict != 0 && unsupported_chunks == 0)
-+ return (1);
-+
-+ else
-+ return (0);
- }
--
-- FCLOSE(fpin);
-- FCLOSE(fpout);
-- return (0);
- }
- }
-+#endif /* WRITE */
-
- FCLOSE(fpin);
- FCLOSE(fpout);
-@@ -1614,6 +1786,24 @@
- inname = argv[2];
- }
-
-+ else if (strcmp(argv[1], "--strict") == 0)
-+ {
-+ status_dots_requested = 0;
-+ verbose = 1;
-+ inname = argv[2];
-+ strict++;
-+ relaxed = 0;
-+ }
-+
-+ else if (strcmp(argv[1], "--relaxed") == 0)
-+ {
-+ status_dots_requested = 0;
-+ verbose = 1;
-+ inname = argv[2];
-+ strict = 0;
-+ relaxed++;
-+ }
-+
- else
- {
- inname = argv[1];
-@@ -1621,10 +1811,11 @@
- }
- }
-
-- if (!multiple && argc == 3 + verbose)
-+ if (multiple == 0 && argc == 3 + verbose)
- outname = argv[2 + verbose];
-
-- if ((!multiple && argc > 3 + verbose) || (multiple && argc < 2))
-+ if ((multiple == 0 && argc > 3 + verbose) ||
-+ (multiple != 0 && argc < 2))
- {
- fprintf(STDERR,
- "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
-@@ -1636,7 +1827,7 @@
- exit(1);
- }
-
-- if (multiple)
-+ if (multiple != 0)
- {
- int i;
- #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-@@ -1646,6 +1837,9 @@
- {
- int kerror;
- fprintf(STDERR, "\n Testing %s:", argv[i]);
-+#if PNG_DEBUG > 0
-+ fprintf(STDERR, "\n");
-+#endif
- kerror = test_one_file(argv[i], outname);
- if (kerror == 0)
- {
-@@ -1660,7 +1854,7 @@
- #endif
- #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
- for (k = 0; k<256; k++)
-- if (filters_used[k])
-+ if (filters_used[k] != 0)
- fprintf(STDERR, " Filter %d was used %lu times\n",
- k, (unsigned long)filters_used[k]);
- #endif
-@@ -1669,7 +1863,7 @@
- fprintf(STDERR, " tIME = %s\n", tIME_string);
-
- tIME_chunk_present = 0;
--#endif /* PNG_TIME_RFC1123_SUPPORTED */
-+#endif /* TIME_RFC1123 */
- }
-
- else
-@@ -1691,9 +1885,9 @@
-
- while (pinfo != NULL)
- {
-- fprintf(STDERR, " %lu bytes at %x\n",
-+ fprintf(STDERR, " %lu bytes at %p\n",
- (unsigned long)pinfo->size,
-- (unsigned int)pinfo->pointer);
-+ pinfo->pointer);
- pinfo = pinfo->next;
- }
- }
-@@ -1727,7 +1921,12 @@
- status_dots_requested = 0;
-
- if (i == 0 || verbose == 1 || ierror != 0)
-+ {
- fprintf(STDERR, "\n Testing %s:", inname);
-+#if PNG_DEBUG > 0
-+ fprintf(STDERR, "\n");
-+#endif
-+ }
-
- kerror = test_one_file(inname, outname);
-
-@@ -1746,21 +1945,26 @@
- #endif
- #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
- for (k = 0; k<256; k++)
-- if (filters_used[k])
-+ if (filters_used[k] != 0)
- fprintf(STDERR, " Filter %d was used %lu times\n",
- k, (unsigned long)filters_used[k]);
- #endif
- #ifdef PNG_TIME_RFC1123_SUPPORTED
- if (tIME_chunk_present != 0)
- fprintf(STDERR, " tIME = %s\n", tIME_string);
--#endif /* PNG_TIME_RFC1123_SUPPORTED */
-+#endif /* TIME_RFC1123 */
- }
- }
-
- else
- {
- if (verbose == 0 && i != 2)
-+ {
- fprintf(STDERR, "\n Testing %s:", inname);
-+#if PNG_DEBUG > 0
-+ fprintf(STDERR, "\n");
-+#endif
-+ }
-
- fprintf(STDERR, " FAIL\n");
- ierror += kerror;
-@@ -1779,8 +1983,8 @@
-
- while (pinfo != NULL)
- {
-- fprintf(STDERR, " %lu bytes at %x\n",
-- (unsigned long)pinfo->size, (unsigned int)pinfo->pointer);
-+ fprintf(STDERR, " %lu bytes at %p\n",
-+ (unsigned long)pinfo->size, pinfo->pointer);
- pinfo = pinfo->next;
- }
- }
-@@ -1820,6 +2024,16 @@
-
- return (int)(ierror != 0);
- }
-+#else
-+int
-+main(void)
-+{
-+ fprintf(STDERR,
-+ " test ignored because libpng was not built with read support\n");
-+ /* And skip this test */
-+ return PNG_LIBPNG_VER < 10600 ? 0 : 77;
-+}
-+#endif
-
- /* Generate a compiler error if there is an old png.h in the search path. */
--typedef png_libpng_version_1_5_4 Your_png_h_is_not_version_1_5_4;
-+typedef png_libpng_version_1_6_16 Your_png_h_is_not_version_1_6_16;
---- ./jdk/src/share/native/sun/awt/libpng/pngtrans.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngtrans.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -46,7 +46,7 @@
- #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
- /* Turn on BGR-to-RGB mapping */
- void PNGAPI
--png_set_bgr(png_structp png_ptr)
-+png_set_bgr(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_bgr");
-
-@@ -60,7 +60,7 @@
- #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
- /* Turn on 16 bit byte swapping */
- void PNGAPI
--png_set_swap(png_structp png_ptr)
-+png_set_swap(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_swap");
-
-@@ -75,7 +75,7 @@
- #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
- /* Turn on pixel packing */
- void PNGAPI
--png_set_packing(png_structp png_ptr)
-+png_set_packing(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_packing");
-
-@@ -85,7 +85,9 @@
- if (png_ptr->bit_depth < 8)
- {
- png_ptr->transformations |= PNG_PACK;
-- png_ptr->usr_bit_depth = 8;
-+# ifdef PNG_WRITE_SUPPORTED
-+ png_ptr->usr_bit_depth = 8;
-+# endif
- }
- }
- #endif
-@@ -93,7 +95,7 @@
- #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
- /* Turn on packed pixel swapping */
- void PNGAPI
--png_set_packswap(png_structp png_ptr)
-+png_set_packswap(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_packswap");
-
-@@ -107,7 +109,7 @@
-
- #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
- void PNGAPI
--png_set_shift(png_structp png_ptr, png_const_color_8p true_bits)
-+png_set_shift(png_structrp png_ptr, png_const_color_8p true_bits)
- {
- png_debug(1, "in png_set_shift");
-
-@@ -122,11 +124,11 @@
- #if defined(PNG_READ_INTERLACING_SUPPORTED) || \
- defined(PNG_WRITE_INTERLACING_SUPPORTED)
- int PNGAPI
--png_set_interlace_handling(png_structp png_ptr)
-+png_set_interlace_handling(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_interlace handling");
-
-- if (png_ptr && png_ptr->interlaced)
-+ if (png_ptr != 0 && png_ptr->interlaced != 0)
- {
- png_ptr->transformations |= PNG_INTERLACE;
- return (7);
-@@ -143,44 +145,91 @@
- * that don't like bytes as parameters.
- */
- void PNGAPI
--png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
-+png_set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
- {
- png_debug(1, "in png_set_filler");
-
- if (png_ptr == NULL)
- return;
-
-+ /* In libpng 1.6 it is possible to determine whether this is a read or write
-+ * operation and therefore to do more checking here for a valid call.
-+ */
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-+ {
-+# ifdef PNG_READ_FILLER_SUPPORTED
-+ /* On read png_set_filler is always valid, regardless of the base PNG
-+ * format, because other transformations can give a format where the
-+ * filler code can execute (basically an 8 or 16-bit component RGB or G
-+ * format.)
-+ *
-+ * NOTE: usr_channels is not used by the read code! (This has led to
-+ * confusion in the past.) The filler is only used in the read code.
-+ */
-+ png_ptr->filler = (png_uint_16)filler;
-+# else
-+ png_app_error(png_ptr, "png_set_filler not supported on read");
-+ PNG_UNUSED(filler) /* not used in the write case */
-+ return;
-+# endif
-+ }
-+
-+ else /* write */
-+ {
-+# ifdef PNG_WRITE_FILLER_SUPPORTED
-+ /* On write the usr_channels parameter must be set correctly at the
-+ * start to record the number of channels in the app-supplied data.
-+ */
-+ switch (png_ptr->color_type)
-+ {
-+ case PNG_COLOR_TYPE_RGB:
-+ png_ptr->usr_channels = 4;
-+ break;
-+
-+ case PNG_COLOR_TYPE_GRAY:
-+ if (png_ptr->bit_depth >= 8)
-+ {
-+ png_ptr->usr_channels = 2;
-+ break;
-+ }
-+
-+ else
-+ {
-+ /* There simply isn't any code in libpng to strip out bits
-+ * from bytes when the components are less than a byte in
-+ * size!
-+ */
-+ png_app_error(png_ptr,
-+ "png_set_filler is invalid for low bit depth gray output");
-+ return;
-+ }
-+
-+ default:
-+ png_app_error(png_ptr,
-+ "png_set_filler: inappropriate color type");
-+ return;
-+ }
-+# else
-+ png_app_error(png_ptr, "png_set_filler not supported on write");
-+ return;
-+# endif
-+ }
-+
-+ /* Here on success - libpng supports the operation, set the transformation
-+ * and the flag to say where the filler channel is.
-+ */
- png_ptr->transformations |= PNG_FILLER;
-- png_ptr->filler = (png_uint_16)filler;
-
- if (filler_loc == PNG_FILLER_AFTER)
- png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
-
- else
- png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
--
-- /* This should probably go in the "do_read_filler" routine.
-- * I attempted to do that in libpng-1.0.1a but that caused problems
-- * so I restored it in libpng-1.0.2a
-- */
--
-- if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-- {
-- png_ptr->usr_channels = 4;
-- }
--
-- /* Also I added this in libpng-1.0.2a (what happens when we expand
-- * a less-than-8-bit grayscale to GA?) */
--
-- if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
-- {
-- png_ptr->usr_channels = 2;
-- }
- }
-
- /* Added to libpng-1.2.7 */
- void PNGAPI
--png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
-+png_set_add_alpha(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
- {
- png_debug(1, "in png_set_add_alpha");
-
-@@ -188,7 +237,9 @@
- return;
-
- png_set_filler(png_ptr, filler, filler_loc);
-- png_ptr->transformations |= PNG_ADD_ALPHA;
-+ /* The above may fail to do anything. */
-+ if ((png_ptr->transformations & PNG_FILLER) != 0)
-+ png_ptr->transformations |= PNG_ADD_ALPHA;
- }
-
- #endif
-@@ -196,7 +247,7 @@
- #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
- defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
- void PNGAPI
--png_set_swap_alpha(png_structp png_ptr)
-+png_set_swap_alpha(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_swap_alpha");
-
-@@ -210,7 +261,7 @@
- #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
- defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
- void PNGAPI
--png_set_invert_alpha(png_structp png_ptr)
-+png_set_invert_alpha(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_invert_alpha");
-
-@@ -223,7 +274,7 @@
-
- #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
- void PNGAPI
--png_set_invert_mono(png_structp png_ptr)
-+png_set_invert_mono(png_structrp png_ptr)
- {
- png_debug(1, "in png_set_invert_mono");
-
-@@ -304,9 +355,16 @@
-
- for (i = 0; i < istop; i++, rp += 2)
- {
-+#ifdef PNG_BUILTIN_BSWAP16_SUPPORTED
-+ /* Feature added to libpng-1.6.11 for testing purposes, not
-+ * enabled by default.
-+ */
-+ *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp);
-+#else
- png_byte t = *rp;
- *rp = *(rp + 1);
- *(rp + 1) = t;
-+#endif
- }
- }
- }
-@@ -448,7 +506,7 @@
- *rp = table[*rp];
- }
- }
--#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
-+#endif /* PACKSWAP || WRITE_PACKSWAP */
-
- #if defined(PNG_WRITE_FILLER_SUPPORTED) || \
- defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-@@ -480,7 +538,7 @@
- {
- if (row_info->bit_depth == 8)
- {
-- if (at_start) /* Skip initial filler */
-+ if (at_start != 0) /* Skip initial filler */
- ++sp;
- else /* Skip initial channel and, for sp, the filler */
- sp += 2, ++dp;
-@@ -494,7 +552,7 @@
-
- else if (row_info->bit_depth == 16)
- {
-- if (at_start) /* Skip initial filler */
-+ if (at_start != 0) /* Skip initial filler */
- sp += 2;
- else /* Skip initial channel and, for sp, the filler */
- sp += 4, dp += 2;
-@@ -520,7 +578,7 @@
- {
- if (row_info->bit_depth == 8)
- {
-- if (at_start) /* Skip initial filler */
-+ if (at_start != 0) /* Skip initial filler */
- ++sp;
- else /* Skip initial channels and, for sp, the filler */
- sp += 4, dp += 3;
-@@ -534,7 +592,7 @@
-
- else if (row_info->bit_depth == 16)
- {
-- if (at_start) /* Skip initial filler */
-+ if (at_start != 0) /* Skip initial filler */
- sp += 2;
- else /* Skip initial channels and, for sp, the filler */
- sp += 8, dp += 6;
-@@ -575,7 +633,7 @@
- {
- png_debug(1, "in png_do_bgr");
-
-- if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-+ if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- png_uint_32 row_width = row_info->width;
- if (row_info->bit_depth == 8)
-@@ -645,19 +703,133 @@
- #endif
- }
- }
--#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
-+#endif /* READ_BGR || WRITE_BGR */
-+
-+#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
-+ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
-+/* Added at libpng-1.5.10 */
-+void /* PRIVATE */
-+png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
-+{
-+ if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
-+ png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
-+ {
-+ /* Calculations moved outside switch in an attempt to stop different
-+ * compiler warnings. 'padding' is in *bits* within the last byte, it is
-+ * an 'int' because pixel_depth becomes an 'int' in the expression below,
-+ * and this calculation is used because it avoids warnings that other
-+ * forms produced on either GCC or MSVC.
-+ */
-+ int padding = (-row_info->pixel_depth * row_info->width) & 7;
-+ png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
-+
-+ switch (row_info->bit_depth)
-+ {
-+ case 1:
-+ {
-+ /* in this case, all bytes must be 0 so we don't need
-+ * to unpack the pixels except for the rightmost one.
-+ */
-+ for (; rp > png_ptr->row_buf; rp--)
-+ {
-+ if (*rp >> padding != 0)
-+ png_ptr->num_palette_max = 1;
-+ padding = 0;
-+ }
-+
-+ break;
-+ }
-+
-+ case 2:
-+ {
-+ for (; rp > png_ptr->row_buf; rp--)
-+ {
-+ int i = ((*rp >> padding) & 0x03);
-+
-+ if (i > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = i;
-+
-+ i = (((*rp >> padding) >> 2) & 0x03);
-+
-+ if (i > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = i;
-+
-+ i = (((*rp >> padding) >> 4) & 0x03);
-+
-+ if (i > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = i;
-+
-+ i = (((*rp >> padding) >> 6) & 0x03);
-+
-+ if (i > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = i;
-+
-+ padding = 0;
-+ }
-+
-+ break;
-+ }
-+
-+ case 4:
-+ {
-+ for (; rp > png_ptr->row_buf; rp--)
-+ {
-+ int i = ((*rp >> padding) & 0x0f);
-+
-+ if (i > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = i;
-+
-+ i = (((*rp >> padding) >> 4) & 0x0f);
-+
-+ if (i > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = i;
-+
-+ padding = 0;
-+ }
-+
-+ break;
-+ }
-+
-+ case 8:
-+ {
-+ for (; rp > png_ptr->row_buf; rp--)
-+ {
-+ if (*rp > png_ptr->num_palette_max)
-+ png_ptr->num_palette_max = (int) *rp;
-+ }
-+
-+ break;
-+ }
-+
-+ default:
-+ break;
-+ }
-+ }
-+}
-+#endif /* CHECK_FOR_INVALID_INDEX */
-
- #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
- #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
- void PNGAPI
--png_set_user_transform_info(png_structp png_ptr, png_voidp
-+png_set_user_transform_info(png_structrp png_ptr, png_voidp
- user_transform_ptr, int user_transform_depth, int user_transform_channels)
- {
- png_debug(1, "in png_set_user_transform_info");
-
- if (png_ptr == NULL)
- return;
-+
-+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-+ (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
-+ {
-+ png_app_error(png_ptr,
-+ "info change after png_start_read_image or png_read_update_info");
-+ return;
-+ }
-+#endif
-+
- png_ptr->user_transform_ptr = user_transform_ptr;
- png_ptr->user_transform_depth = (png_byte)user_transform_depth;
- png_ptr->user_transform_channels = (png_byte)user_transform_channels;
-@@ -671,20 +843,20 @@
- */
- #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
- png_voidp PNGAPI
--png_get_user_transform_ptr(png_const_structp png_ptr)
-+png_get_user_transform_ptr(png_const_structrp png_ptr)
- {
- if (png_ptr == NULL)
- return (NULL);
-
-- return ((png_voidp)png_ptr->user_transform_ptr);
-+ return png_ptr->user_transform_ptr;
- }
- #endif
-
- #ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
- png_uint_32 PNGAPI
--png_get_current_row_number(png_const_structp png_ptr)
-+png_get_current_row_number(png_const_structrp png_ptr)
- {
-- /* See the comments in png.h - this is the sub-image row when reading and
-+ /* See the comments in png.h - this is the sub-image row when reading an
- * interlaced image.
- */
- if (png_ptr != NULL)
-@@ -694,13 +866,12 @@
- }
-
- png_byte PNGAPI
--png_get_current_pass_number(png_const_structp png_ptr)
-+png_get_current_pass_number(png_const_structrp png_ptr)
- {
- if (png_ptr != NULL)
- return png_ptr->pass;
- return 8; /* invalid */
- }
--#endif /* PNG_USER_TRANSFORM_INFO_SUPPORTED */
--#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
-- PNG_WRITE_USER_TRANSFORM_SUPPORTED */
--#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
-+#endif /* USER_TRANSFORM_INFO */
-+#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */
-+#endif /* READ || WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngwio.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngwio.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.0 [January 6, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -58,11 +58,12 @@
- */
-
- void /* PRIVATE */
--png_write_data(png_structp png_ptr, png_const_bytep data, png_size_t length)
-+png_write_data(png_structrp png_ptr, png_const_bytep data, png_size_t length)
- {
- /* NOTE: write_data_fn must not change the buffer! */
- if (png_ptr->write_data_fn != NULL )
-- (*(png_ptr->write_data_fn))(png_ptr, (png_bytep)data, length);
-+ (*(png_ptr->write_data_fn))(png_ptr, png_constcast(png_bytep,data),
-+ length);
-
- else
- png_error(png_ptr, "Call to NULL write function");
-@@ -74,7 +75,6 @@
- * write_data function and use it at run time with png_set_write_fn(), rather
- * than changing the library.
- */
--#ifndef USE_FAR_KEYWORD
- void PNGCBAPI
- png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-@@ -88,64 +88,6 @@
- if (check != length)
- png_error(png_ptr, "Write Error");
- }
--#else
--/* This is the model-independent version. Since the standard I/O library
-- * can't handle far buffers in the medium and small models, we have to copy
-- * the data.
-- */
--
--#define NEAR_BUF_SIZE 1024
--#define MIN(a,b) (a <= b ? a : b)
--
--void PNGCBAPI
--png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
--{
-- png_uint_32 check;
-- png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
-- png_FILE_p io_ptr;
--
-- if (png_ptr == NULL)
-- return;
--
-- /* Check if data really is near. If so, use usual code. */
-- near_data = (png_byte *)CVT_PTR_NOCHECK(data);
-- io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
--
-- if ((png_bytep)near_data == data)
-- {
-- check = fwrite(near_data, 1, length, io_ptr);
-- }
--
-- else
-- {
-- png_byte buf[NEAR_BUF_SIZE];
-- png_size_t written, remaining, err;
-- check = 0;
-- remaining = length;
--
-- do
-- {
-- written = MIN(NEAR_BUF_SIZE, remaining);
-- png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
-- err = fwrite(buf, 1, written, io_ptr);
--
-- if (err != written)
-- break;
--
-- else
-- check += err;
--
-- data += written;
-- remaining -= written;
-- }
-- while (remaining != 0);
-- }
--
-- if (check != length)
-- png_error(png_ptr, "Write Error");
--}
--
--#endif
- #endif
-
- /* This function is called to output any data pending writing (normally
-@@ -154,7 +96,7 @@
- */
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- void /* PRIVATE */
--png_flush(png_structp png_ptr)
-+png_flush(png_structrp png_ptr)
- {
- if (png_ptr->output_flush_fn != NULL)
- (*(png_ptr->output_flush_fn))(png_ptr);
-@@ -169,7 +111,7 @@
- if (png_ptr == NULL)
- return;
-
-- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-+ io_ptr = png_voidcast(png_FILE_p, (png_ptr->io_ptr));
- fflush(io_ptr);
- }
- # endif
-@@ -205,7 +147,7 @@
- * *FILE structure.
- */
- void PNGAPI
--png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
-+png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,
- png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
- {
- if (png_ptr == NULL)
-@@ -235,8 +177,11 @@
- # else
- png_ptr->output_flush_fn = output_flush_fn;
- # endif
--#endif /* PNG_WRITE_FLUSH_SUPPORTED */
-+#else
-+ PNG_UNUSED(output_flush_fn)
-+#endif /* WRITE_FLUSH */
-
-+#ifdef PNG_READ_SUPPORTED
- /* It is an error to read while writing a png file */
- if (png_ptr->read_data_fn != NULL)
- {
-@@ -246,37 +191,6 @@
- "Can't set both read_data_fn and write_data_fn in the"
- " same structure");
- }
-+#endif
- }
--
--#ifdef USE_FAR_KEYWORD
--# ifdef _MSC_VER
--void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
--{
-- void *near_ptr;
-- void FAR *far_ptr;
-- FP_OFF(near_ptr) = FP_OFF(ptr);
-- far_ptr = (void FAR *)near_ptr;
--
-- if (check != 0)
-- if (FP_SEG(ptr) != FP_SEG(far_ptr))
-- png_error(png_ptr, "segment lost in conversion");
--
-- return(near_ptr);
--}
--# else
--void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
--{
-- void *near_ptr;
-- void FAR *far_ptr;
-- near_ptr = (void FAR *)ptr;
-- far_ptr = (void FAR *)near_ptr;
--
-- if (check != 0)
-- if (far_ptr != ptr)
-- png_error(png_ptr, "segment lost in conversion");
--
-- return(near_ptr);
--}
--# endif
--#endif
--#endif /* PNG_WRITE_SUPPORTED */
-+#endif /* WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngwrite.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngwrite.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -40,9 +40,65 @@
- */
-
- #include "pngpriv.h"
-+#if defined(PNG_SIMPLIFIED_WRITE_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
-+# include <errno.h>
-+#endif
-
- #ifdef PNG_WRITE_SUPPORTED
-
-+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-+/* Write out all the unknown chunks for the current given location */
-+static void
-+write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
-+ unsigned int where)
-+{
-+ if (info_ptr->unknown_chunks_num != 0)
-+ {
-+ png_const_unknown_chunkp up;
-+
-+ png_debug(5, "writing extra chunks");
-+
-+ for (up = info_ptr->unknown_chunks;
-+ up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-+ ++up)
-+ if ((up->location & where) != 0)
-+ {
-+ /* If per-chunk unknown chunk handling is enabled use it, otherwise
-+ * just write the chunks the application has set.
-+ */
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ int keep = png_handle_as_unknown(png_ptr, up->name);
-+
-+ /* NOTE: this code is radically different from the read side in the
-+ * matter of handling an ancillary unknown chunk. In the read side
-+ * the default behavior is to discard it, in the code below the default
-+ * behavior is to write it. Critical chunks are, however, only
-+ * written if explicitly listed or if the default is set to write all
-+ * unknown chunks.
-+ *
-+ * The default handling is also slightly weird - it is not possible to
-+ * stop the writing of all unsafe-to-copy chunks!
-+ *
-+ * TODO: REVIEW: this would seem to be a bug.
-+ */
-+ if (keep != PNG_HANDLE_CHUNK_NEVER &&
-+ ((up->name[3] & 0x20) /* safe-to-copy overrides everything */ ||
-+ keep == PNG_HANDLE_CHUNK_ALWAYS ||
-+ (keep == PNG_HANDLE_CHUNK_AS_DEFAULT &&
-+ png_ptr->unknown_default == PNG_HANDLE_CHUNK_ALWAYS)))
-+#endif
-+ {
-+ /* TODO: review, what is wrong with a zero length unknown chunk? */
-+ if (up->size == 0)
-+ png_warning(png_ptr, "Writing zero-length unknown chunk");
-+
-+ png_write_chunk(png_ptr, up->name, up->data, up->size);
-+ }
-+ }
-+ }
-+}
-+#endif /* WRITE_UNKNOWN_CHUNKS */
-+
- /* Writes all the PNG information. This is the suggested way to use the
- * library. If you have a new chunk to add, make a function to write it,
- * and put it in the correct location here. If you want the chunk written
-@@ -53,21 +109,21 @@
- * them in png_write_end(), and compressing them.
- */
- void PNGAPI
--png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
-+png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
- {
- png_debug(1, "in png_write_info_before_PLTE");
-
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-- if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
-+ if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
- {
- /* Write PNG signature */
- png_write_sig(png_ptr);
-
- #ifdef PNG_MNG_FEATURES_SUPPORTED
-- if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \
-- (png_ptr->mng_features_permitted))
-+ if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && \
-+ png_ptr->mng_features_permitted != 0)
- {
- png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
- png_ptr->mng_features_permitted = 0;
-@@ -79,75 +135,88 @@
- info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
- info_ptr->filter_type,
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
-- info_ptr->interlace_type);
-+ info_ptr->interlace_type
- #else
-- 0);
-+ 0
- #endif
-+ );
-+
- /* The rest of these check to see if the valid field has the appropriate
- * flag set, and if it does, writes the chunk.
-+ *
-+ * 1.6.0: COLORSPACE support controls the writing of these chunks too, and
-+ * the chunks will be written if the WRITE routine is there and information
-+ * is available in the COLORSPACE. (See png_colorspace_sync_info in png.c
-+ * for where the valid flags get set.)
-+ *
-+ * Under certain circumstances the colorspace can be invalidated without
-+ * syncing the info_struct 'valid' flags; this happens if libpng detects and
-+ * error and calls png_error while the color space is being set, yet the
-+ * application continues writing the PNG. So check the 'invalid' flag here
-+ * too.
- */
--#ifdef PNG_WRITE_gAMA_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_gAMA)
-- png_write_gAMA_fixed(png_ptr, info_ptr->gamma);
--#endif
--#ifdef PNG_WRITE_sRGB_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_sRGB)
-- png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
-+#ifdef PNG_GAMMA_SUPPORTED
-+# ifdef PNG_WRITE_gAMA_SUPPORTED
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
-+ (info_ptr->valid & PNG_INFO_gAMA) != 0)
-+ png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
-+# endif
- #endif
-
--#ifdef PNG_WRITE_iCCP_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_iCCP)
-- png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
-- (png_charp)info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
--#endif
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+ /* Write only one of sRGB or an ICC profile. If a profile was supplied
-+ * and it matches one of the known sRGB ones issue a warning.
-+ */
-+# ifdef PNG_WRITE_iCCP_SUPPORTED
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-+ (info_ptr->valid & PNG_INFO_iCCP) != 0)
-+ {
-+# ifdef PNG_WRITE_sRGB_SUPPORTED
-+ if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
-+ png_app_warning(png_ptr,
-+ "profile matches sRGB but writing iCCP instead");
-+# endif
-+
-+ png_write_iCCP(png_ptr, info_ptr->iccp_name,
-+ info_ptr->iccp_profile);
-+ }
-+# ifdef PNG_WRITE_sRGB_SUPPORTED
-+ else
-+# endif
-+# endif
-+
-+# ifdef PNG_WRITE_sRGB_SUPPORTED
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-+ (info_ptr->valid & PNG_INFO_sRGB) != 0)
-+ png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent);
-+# endif /* WRITE_sRGB */
-+#endif /* COLORSPACE */
-+
- #ifdef PNG_WRITE_sBIT_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_sBIT)
-+ if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
- png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
- #endif
--#ifdef PNG_WRITE_cHRM_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_cHRM)
-- png_write_cHRM_fixed(png_ptr,
-- info_ptr->x_white, info_ptr->y_white,
-- info_ptr->x_red, info_ptr->y_red,
-- info_ptr->x_green, info_ptr->y_green,
-- info_ptr->x_blue, info_ptr->y_blue);
-+
-+#ifdef PNG_COLORSPACE_SUPPORTED
-+# ifdef PNG_WRITE_cHRM_SUPPORTED
-+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-+ (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&
-+ (info_ptr->valid & PNG_INFO_cHRM) != 0)
-+ png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);
-+# endif
- #endif
-
- #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-- if (info_ptr->unknown_chunks_num)
-- {
-- png_unknown_chunk *up;
-+ write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_IHDR);
-+#endif
-
-- png_debug(5, "writing extra chunks");
--
-- for (up = info_ptr->unknown_chunks;
-- up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-- up++)
-- {
-- int keep = png_handle_as_unknown(png_ptr, up->name);
--
-- if (keep != PNG_HANDLE_CHUNK_NEVER &&
-- up->location &&
-- !(up->location & PNG_HAVE_PLTE) &&
-- !(up->location & PNG_HAVE_IDAT) &&
-- !(up->location & PNG_AFTER_IDAT) &&
-- ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-- (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-- {
-- if (up->size == 0)
-- png_warning(png_ptr, "Writing zero-length unknown chunk");
--
-- png_write_chunk(png_ptr, up->name, up->data, up->size);
-- }
-- }
-- }
--#endif
- png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
- }
- }
-
- void PNGAPI
--png_write_info(png_structp png_ptr, png_infop info_ptr)
-+png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
- {
- #if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
- int i;
-@@ -160,19 +229,19 @@
-
- png_write_info_before_PLTE(png_ptr, info_ptr);
-
-- if (info_ptr->valid & PNG_INFO_PLTE)
-+ if ((info_ptr->valid & PNG_INFO_PLTE) != 0)
- png_write_PLTE(png_ptr, info_ptr->palette,
- (png_uint_32)info_ptr->num_palette);
-
-- else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ else if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) !=0)
- png_error(png_ptr, "Valid palette required for paletted images");
-
- #ifdef PNG_WRITE_tRNS_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_tRNS)
-+ if ((info_ptr->valid & PNG_INFO_tRNS) !=0)
- {
- #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
- /* Invert the alpha channel (in tRNS) */
-- if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
-+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0 &&
- info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- {
- int j;
-@@ -186,42 +255,42 @@
- }
- #endif
- #ifdef PNG_WRITE_bKGD_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_bKGD)
-+ if ((info_ptr->valid & PNG_INFO_bKGD) != 0)
- png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
- #endif
-
- #ifdef PNG_WRITE_hIST_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_hIST)
-+ if ((info_ptr->valid & PNG_INFO_hIST) != 0)
- png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
- #endif
-
- #ifdef PNG_WRITE_oFFs_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_oFFs)
-+ if ((info_ptr->valid & PNG_INFO_oFFs) != 0)
- png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
- info_ptr->offset_unit_type);
- #endif
-
- #ifdef PNG_WRITE_pCAL_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_pCAL)
-+ if ((info_ptr->valid & PNG_INFO_pCAL) != 0)
- png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
- info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
- info_ptr->pcal_units, info_ptr->pcal_params);
- #endif
-
- #ifdef PNG_WRITE_sCAL_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_sCAL)
-+ if ((info_ptr->valid & PNG_INFO_sCAL) != 0)
- png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
- info_ptr->scal_s_width, info_ptr->scal_s_height);
- #endif /* sCAL */
-
- #ifdef PNG_WRITE_pHYs_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_pHYs)
-+ if ((info_ptr->valid & PNG_INFO_pHYs) != 0)
- png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
- info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
- #endif /* pHYs */
-
- #ifdef PNG_WRITE_tIME_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_tIME)
-+ if ((info_ptr->valid & PNG_INFO_tIME) != 0)
- {
- png_write_tIME(png_ptr, &(info_ptr->mod_time));
- png_ptr->mode |= PNG_WROTE_tIME;
-@@ -229,7 +298,7 @@
- #endif /* tIME */
-
- #ifdef PNG_WRITE_sPLT_SUPPORTED
-- if (info_ptr->valid & PNG_INFO_sPLT)
-+ if ((info_ptr->valid & PNG_INFO_sPLT) != 0)
- for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
- png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
- #endif /* sPLT */
-@@ -251,11 +320,14 @@
- info_ptr->text[i].lang,
- info_ptr->text[i].lang_key,
- info_ptr->text[i].text);
-+ /* Mark this chunk as written */
-+ if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-+ else
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
- #else
-- png_warning(png_ptr, "Unable to write international text");
-+ png_warning(png_ptr, "Unable to write international text");
- #endif
-- /* Mark this chunk as written */
-- info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
- }
-
- /* If we want a compressed text chunk */
-@@ -264,13 +336,12 @@
- #ifdef PNG_WRITE_zTXt_SUPPORTED
- /* Write compressed chunk */
- png_write_zTXt(png_ptr, info_ptr->text[i].key,
-- info_ptr->text[i].text, 0,
-- info_ptr->text[i].compression);
-+ info_ptr->text[i].text, info_ptr->text[i].compression);
-+ /* Mark this chunk as written */
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
- #else
- png_warning(png_ptr, "Unable to write compressed text");
- #endif
-- /* Mark this chunk as written */
-- info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
- }
-
- else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-@@ -291,29 +362,7 @@
- #endif /* tEXt */
-
- #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-- if (info_ptr->unknown_chunks_num)
-- {
-- png_unknown_chunk *up;
--
-- png_debug(5, "writing extra chunks");
--
-- for (up = info_ptr->unknown_chunks;
-- up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-- up++)
-- {
-- int keep = png_handle_as_unknown(png_ptr, up->name);
-- if (keep != PNG_HANDLE_CHUNK_NEVER &&
-- up->location &&
-- (up->location & PNG_HAVE_PLTE) &&
-- !(up->location & PNG_HAVE_IDAT) &&
-- !(up->location & PNG_AFTER_IDAT) &&
-- ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-- (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-- {
-- png_write_chunk(png_ptr, up->name, up->data, up->size);
-- }
-- }
-- }
-+ write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_PLTE);
- #endif
- }
-
-@@ -323,16 +372,21 @@
- * comments, I suggest writing them here, and compressing them.
- */
- void PNGAPI
--png_write_end(png_structp png_ptr, png_infop info_ptr)
-+png_write_end(png_structrp png_ptr, png_inforp info_ptr)
- {
- png_debug(1, "in png_write_end");
-
- if (png_ptr == NULL)
- return;
-
-- if (!(png_ptr->mode & PNG_HAVE_IDAT))
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
- png_error(png_ptr, "No IDATs written into file");
-
-+#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+ if (png_ptr->num_palette_max > png_ptr->num_palette)
-+ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
-+#endif
-+
- /* See if user wants us to write information chunks */
- if (info_ptr != NULL)
- {
-@@ -341,8 +395,8 @@
- #endif
- #ifdef PNG_WRITE_tIME_SUPPORTED
- /* Check to see if user has supplied a time chunk */
-- if ((info_ptr->valid & PNG_INFO_tIME) &&
-- !(png_ptr->mode & PNG_WROTE_tIME))
-+ if ((info_ptr->valid & PNG_INFO_tIME) != 0 &&
-+ (png_ptr->mode & PNG_WROTE_tIME) == 0)
- png_write_tIME(png_ptr, &(info_ptr->mod_time));
-
- #endif
-@@ -363,11 +417,14 @@
- info_ptr->text[i].lang,
- info_ptr->text[i].lang_key,
- info_ptr->text[i].text);
-+ /* Mark this chunk as written */
-+ if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-+ else
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
- #else
- png_warning(png_ptr, "Unable to write international text");
- #endif
-- /* Mark this chunk as written */
-- info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
- }
-
- else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
-@@ -375,13 +432,12 @@
- #ifdef PNG_WRITE_zTXt_SUPPORTED
- /* Write compressed chunk */
- png_write_zTXt(png_ptr, info_ptr->text[i].key,
-- info_ptr->text[i].text, 0,
-- info_ptr->text[i].compression);
-+ info_ptr->text[i].text, info_ptr->text[i].compression);
-+ /* Mark this chunk as written */
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
- #else
- png_warning(png_ptr, "Unable to write compressed text");
- #endif
-- /* Mark this chunk as written */
-- info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
- }
-
- else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-@@ -390,37 +446,16 @@
- /* Write uncompressed chunk */
- png_write_tEXt(png_ptr, info_ptr->text[i].key,
- info_ptr->text[i].text, 0);
-+ /* Mark this chunk as written */
-+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
- #else
- png_warning(png_ptr, "Unable to write uncompressed text");
- #endif
--
-- /* Mark this chunk as written */
-- info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
- }
- }
- #endif
- #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-- if (info_ptr->unknown_chunks_num)
-- {
-- png_unknown_chunk *up;
--
-- png_debug(5, "writing extra chunks");
--
-- for (up = info_ptr->unknown_chunks;
-- up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-- up++)
-- {
-- int keep = png_handle_as_unknown(png_ptr, up->name);
-- if (keep != PNG_HANDLE_CHUNK_NEVER &&
-- up->location &&
-- (up->location & PNG_AFTER_IDAT) &&
-- ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-- (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-- {
-- png_write_chunk(png_ptr, up->name, up->data, up->size);
-- }
-- }
-- }
-+ write_unknown_chunks(png_ptr, info_ptr, PNG_AFTER_IDAT);
- #endif
- }
-
-@@ -428,6 +463,7 @@
-
- /* Write end of PNG file */
- png_write_IEND(png_ptr);
-+
- /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
- * and restored again in libpng-1.2.30, may cause some applications that
- * do not set png_ptr->output_flush_fn to crash. If your application
-@@ -443,9 +479,8 @@
- }
-
- #ifdef PNG_CONVERT_tIME_SUPPORTED
--/* "tm" structure is not supported on WindowsCE */
- void PNGAPI
--png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm FAR * ttime)
-+png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm * ttime)
- {
- png_debug(1, "in png_convert_from_struct_tm");
-
-@@ -474,103 +509,75 @@
- png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
- png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
- {
--#ifdef PNG_USER_MEM_SUPPORTED
-- return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
-- warn_fn, NULL, NULL, NULL));
-+#ifndef PNG_USER_MEM_SUPPORTED
-+ png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-+ error_fn, warn_fn, NULL, NULL, NULL);
-+#else
-+ return png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
-+ warn_fn, NULL, NULL, NULL);
- }
-
- /* Alternate initialize png_ptr structure, and allocate any memory needed */
--static void png_reset_filter_heuristics(png_structp png_ptr); /* forward decl */
--
- PNG_FUNCTION(png_structp,PNGAPI
- png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
- png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
- png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
- {
--#endif /* PNG_USER_MEM_SUPPORTED */
-- volatile int png_cleanup_needed = 0;
--#ifdef PNG_SETJMP_SUPPORTED
-- volatile
--#endif
-- png_structp png_ptr;
--#ifdef PNG_SETJMP_SUPPORTED
--#ifdef USE_FAR_KEYWORD
-- jmp_buf tmp_jmpbuf;
--#endif
-+ png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-+ error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
-+#endif /* USER_MEM */
-+ if (png_ptr != NULL)
-+ {
-+ /* Set the zlib control values to defaults; they can be overridden by the
-+ * application after the struct has been created.
-+ */
-+ png_ptr->zbuffer_size = PNG_ZBUF_SIZE;
-+
-+ /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
-+ * pngwutil.c defaults it according to whether or not filters will be
-+ * used, and ignores this setting.
-+ */
-+ png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
-+ png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION;
-+ png_ptr->zlib_mem_level = 8;
-+ png_ptr->zlib_window_bits = 15;
-+ png_ptr->zlib_method = 8;
-+
-+#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-+ png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
-+ png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
-+ png_ptr->zlib_text_mem_level = 8;
-+ png_ptr->zlib_text_window_bits = 15;
-+ png_ptr->zlib_text_method = 8;
-+#endif /* WRITE_COMPRESSED_TEXT */
-+
-+ /* This is a highly dubious configuration option; by default it is off,
-+ * but it may be appropriate for private builds that are testing
-+ * extensions not conformant to the current specification, or of
-+ * applications that must not fail to write at all costs!
-+ */
-+#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
-+ /* In stable builds only warn if an application error can be completely
-+ * handled.
-+ */
-+ png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
- #endif
-
-- png_debug(1, "in png_create_write_struct");
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-- (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
--#else
-- png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
--#endif /* PNG_USER_MEM_SUPPORTED */
-- if (png_ptr == NULL)
-- return (NULL);
--
-- /* Added at libpng-1.2.6 */
--#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-- png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-- png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-+ /* App warnings are warnings in release (or release candidate) builds but
-+ * are errors during development.
-+ */
-+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
-+ png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
- #endif
-
--#ifdef PNG_SETJMP_SUPPORTED
--/* Applications that neglect to set up their own setjmp() and then
-- encounter a png_error() will longjmp here. Since the jmpbuf is
-- then meaningless we abort instead of returning. */
--#ifdef USE_FAR_KEYWORD
-- if (setjmp(tmp_jmpbuf))
--#else
-- if (setjmp(png_jmpbuf(png_ptr))) /* sets longjmp to match setjmp */
--#endif
--#ifdef USE_FAR_KEYWORD
-- png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
--#endif
-- PNG_ABORT();
--#endif
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
--#endif /* PNG_USER_MEM_SUPPORTED */
-- png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
--
-- if (!png_user_version_check(png_ptr, user_png_ver))
-- png_cleanup_needed = 1;
--
-- /* Initialize zbuf - compression buffer */
-- png_ptr->zbuf_size = PNG_ZBUF_SIZE;
--
-- if (!png_cleanup_needed)
-- {
-- png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr,
-- png_ptr->zbuf_size);
-- if (png_ptr->zbuf == NULL)
-- png_cleanup_needed = 1;
-+ /* TODO: delay this, it can be done in png_init_io() (if the app doesn't
-+ * do it itself) avoiding setting the default function if it is not
-+ * required.
-+ */
-+ png_set_write_fn(png_ptr, NULL, NULL, NULL);
- }
-
-- if (png_cleanup_needed)
-- {
-- /* Clean up PNG structure and deallocate any memory. */
-- png_free(png_ptr, png_ptr->zbuf);
-- png_ptr->zbuf = NULL;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)png_ptr,
-- (png_free_ptr)free_fn, (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)png_ptr);
--#endif
-- return (NULL);
-- }
--
-- png_set_write_fn(png_ptr, NULL, NULL, NULL);
--
--#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-- png_reset_filter_heuristics(png_ptr);
--#endif
--
-- return (png_ptr);
-+ return png_ptr;
- }
-
-
-@@ -580,7 +587,7 @@
- * "write" the image seven times.
- */
- void PNGAPI
--png_write_rows(png_structp png_ptr, png_bytepp row,
-+png_write_rows(png_structrp png_ptr, png_bytepp row,
- png_uint_32 num_rows)
- {
- png_uint_32 i; /* row counter */
-@@ -602,7 +609,7 @@
- * if you are writing an interlaced image.
- */
- void PNGAPI
--png_write_image(png_structp png_ptr, png_bytepp image)
-+png_write_image(png_structrp png_ptr, png_bytepp image)
- {
- png_uint_32 i; /* row index */
- int pass, num_pass; /* pass variables */
-@@ -632,10 +639,78 @@
- }
- }
-
-+#ifdef PNG_MNG_FEATURES_SUPPORTED
-+/* Performs intrapixel differencing */
-+static void
-+png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
-+{
-+ png_debug(1, "in png_do_write_intrapixel");
-+
-+ if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-+ {
-+ int bytes_per_pixel;
-+ png_uint_32 row_width = row_info->width;
-+ if (row_info->bit_depth == 8)
-+ {
-+ png_bytep rp;
-+ png_uint_32 i;
-+
-+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-+ bytes_per_pixel = 3;
-+
-+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+ bytes_per_pixel = 4;
-+
-+ else
-+ return;
-+
-+ for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-+ {
-+ *(rp) = (png_byte)((*rp - *(rp + 1)) & 0xff);
-+ *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) & 0xff);
-+ }
-+ }
-+
-+#ifdef PNG_WRITE_16BIT_SUPPORTED
-+ else if (row_info->bit_depth == 16)
-+ {
-+ png_bytep rp;
-+ png_uint_32 i;
-+
-+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-+ bytes_per_pixel = 6;
-+
-+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+ bytes_per_pixel = 8;
-+
-+ else
-+ return;
-+
-+ for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-+ {
-+ png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
-+ png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
-+ png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
-+ png_uint_32 red = (png_uint_32)((s0 - s1) & 0xffffL);
-+ png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
-+ *(rp ) = (png_byte)((red >> 8) & 0xff);
-+ *(rp + 1) = (png_byte)(red & 0xff);
-+ *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-+ *(rp + 5) = (png_byte)(blue & 0xff);
-+ }
-+ }
-+#endif /* WRITE_16BIT */
-+ }
-+}
-+#endif /* MNG_FEATURES */
-+
- /* Called by user to write a row of image data */
- void PNGAPI
--png_write_row(png_structp png_ptr, png_const_bytep row)
-+png_write_row(png_structrp png_ptr, png_const_bytep row)
- {
-+ /* 1.5.6: moved from png_struct to be a local structure: */
-+ png_row_info row_info;
-+
- if (png_ptr == NULL)
- return;
-
-@@ -646,44 +721,44 @@
- if (png_ptr->row_number == 0 && png_ptr->pass == 0)
- {
- /* Make sure we wrote the header info */
-- if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
-+ if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
- png_error(png_ptr,
- "png_write_info was never called before png_write_row");
-
- /* Check for transforms that have been set but were defined out */
- #if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
-- if (png_ptr->transformations & PNG_INVERT_MONO)
-+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
- png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");
- #endif
-
- #if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
-- if (png_ptr->transformations & PNG_FILLER)
-+ if ((png_ptr->transformations & PNG_FILLER) != 0)
- png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");
- #endif
- #if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
- defined(PNG_READ_PACKSWAP_SUPPORTED)
-- if (png_ptr->transformations & PNG_PACKSWAP)
-+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
- png_warning(png_ptr,
- "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");
- #endif
-
- #if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
-- if (png_ptr->transformations & PNG_PACK)
-+ if ((png_ptr->transformations & PNG_PACK) != 0)
- png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");
- #endif
-
- #if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
-- if (png_ptr->transformations & PNG_SHIFT)
-+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
- png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");
- #endif
-
- #if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
-- if (png_ptr->transformations & PNG_BGR)
-+ if ((png_ptr->transformations & PNG_BGR) != 0)
- png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");
- #endif
-
- #if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
-- if (png_ptr->transformations & PNG_SWAP_BYTES)
-+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
- png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");
- #endif
-
-@@ -692,12 +767,13 @@
-
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* If interlaced and not interested in row, return */
-- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-+ if (png_ptr->interlaced != 0 &&
-+ (png_ptr->transformations & PNG_INTERLACE) != 0)
- {
- switch (png_ptr->pass)
- {
- case 0:
-- if (png_ptr->row_number & 0x07)
-+ if ((png_ptr->row_number & 0x07) != 0)
- {
- png_write_finish_row(png_ptr);
- return;
-@@ -705,7 +781,7 @@
- break;
-
- case 1:
-- if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
-+ if ((png_ptr->row_number & 0x07) != 0 || png_ptr->width < 5)
- {
- png_write_finish_row(png_ptr);
- return;
-@@ -721,7 +797,7 @@
- break;
-
- case 3:
-- if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
-+ if ((png_ptr->row_number & 0x03) != 0 || png_ptr->width < 3)
- {
- png_write_finish_row(png_ptr);
- return;
-@@ -737,7 +813,7 @@
- break;
-
- case 5:
-- if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
-+ if ((png_ptr->row_number & 0x01) != 0 || png_ptr->width < 2)
- {
- png_write_finish_row(png_ptr);
- return;
-@@ -745,7 +821,7 @@
- break;
-
- case 6:
-- if (!(png_ptr->row_number & 0x01))
-+ if ((png_ptr->row_number & 0x01) == 0)
- {
- png_write_finish_row(png_ptr);
- return;
-@@ -759,36 +835,31 @@
- #endif
-
- /* Set up row info for transformations */
-- png_ptr->row_info.color_type = png_ptr->color_type;
-- png_ptr->row_info.width = png_ptr->usr_width;
-- png_ptr->row_info.channels = png_ptr->usr_channels;
-- png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
-- png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
-- png_ptr->row_info.channels);
-+ row_info.color_type = png_ptr->color_type;
-+ row_info.width = png_ptr->usr_width;
-+ row_info.channels = png_ptr->usr_channels;
-+ row_info.bit_depth = png_ptr->usr_bit_depth;
-+ row_info.pixel_depth = (png_byte)(row_info.bit_depth * row_info.channels);
-+ row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-- png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
-- png_ptr->row_info.width);
--
-- png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type);
-- png_debug1(3, "row_info->width = %u", png_ptr->row_info.width);
-- png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels);
-- png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth);
-- png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth);
-- png_debug1(3, "row_info->rowbytes = %lu",
-- (unsigned long)png_ptr->row_info.rowbytes);
-+ png_debug1(3, "row_info->color_type = %d", row_info.color_type);
-+ png_debug1(3, "row_info->width = %u", row_info.width);
-+ png_debug1(3, "row_info->channels = %d", row_info.channels);
-+ png_debug1(3, "row_info->bit_depth = %d", row_info.bit_depth);
-+ png_debug1(3, "row_info->pixel_depth = %d", row_info.pixel_depth);
-+ png_debug1(3, "row_info->rowbytes = %lu", (unsigned long)row_info.rowbytes);
-
- /* Copy user's row into buffer, leaving room for filter byte. */
-- png_memcpy(png_ptr->row_buf + 1, row, png_ptr->row_info.rowbytes);
-+ memcpy(png_ptr->row_buf + 1, row, row_info.rowbytes);
-
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* Handle interlacing */
- if (png_ptr->interlaced && png_ptr->pass < 6 &&
-- (png_ptr->transformations & PNG_INTERLACE))
-+ (png_ptr->transformations & PNG_INTERLACE) != 0)
- {
-- png_do_write_interlace(&(png_ptr->row_info),
-- png_ptr->row_buf + 1, png_ptr->pass);
-+ png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass);
- /* This should always get caught above, but still ... */
-- if (!(png_ptr->row_info.width))
-+ if (row_info.width == 0)
- {
- png_write_finish_row(png_ptr);
- return;
-@@ -798,10 +869,17 @@
-
- #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
- /* Handle other transformations */
-- if (png_ptr->transformations)
-- png_do_write_transformations(png_ptr);
-+ if (png_ptr->transformations != 0)
-+ png_do_write_transformations(png_ptr, &row_info);
- #endif
-
-+ /* At this point the row_info pixel depth must match the 'transformed' depth,
-+ * which is also the output depth.
-+ */
-+ if (row_info.pixel_depth != png_ptr->pixel_depth ||
-+ row_info.pixel_depth != png_ptr->transformed_pixel_depth)
-+ png_error(png_ptr, "internal write transform logic error");
-+
- #ifdef PNG_MNG_FEATURES_SUPPORTED
- /* Write filter_method 64 (intrapixel differencing) only if
- * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-@@ -812,16 +890,24 @@
- * 4. The filter_method is 64 and
- * 5. The color_type is RGB or RGBA
- */
-- if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-+ if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
- (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
- {
- /* Intrapixel differencing */
-- png_do_write_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
-+ png_do_write_intrapixel(&row_info, png_ptr->row_buf + 1);
- }
- #endif
-
-+/* Added at libpng-1.5.10 */
-+#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-+ /* Check for out-of-range palette index */
-+ if (row_info.color_type == PNG_COLOR_TYPE_PALETTE &&
-+ png_ptr->num_palette_max >= 0)
-+ png_do_check_palette_indexes(png_ptr, &row_info);
-+#endif
-+
- /* Find a filter if necessary, filter the row and write it out. */
-- png_write_find_filter(png_ptr, &(png_ptr->row_info));
-+ png_write_find_filter(png_ptr, &row_info);
-
- if (png_ptr->write_row_fn != NULL)
- (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-@@ -830,7 +916,7 @@
- #ifdef PNG_WRITE_FLUSH_SUPPORTED
- /* Set the automatic flush interval or 0 to turn flushing off */
- void PNGAPI
--png_set_flush(png_structp png_ptr, int nrows)
-+png_set_flush(png_structrp png_ptr, int nrows)
- {
- png_debug(1, "in png_set_flush");
-
-@@ -842,10 +928,8 @@
-
- /* Flush the current output buffers now */
- void PNGAPI
--png_write_flush(png_structp png_ptr)
-+png_write_flush(png_structrp png_ptr)
- {
-- int wrote_IDAT;
--
- png_debug(1, "in png_write_flush");
-
- if (png_ptr == NULL)
-@@ -855,146 +939,41 @@
- if (png_ptr->row_number >= png_ptr->num_rows)
- return;
-
-- do
-- {
-- int ret;
--
-- /* Compress the data */
-- ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-- wrote_IDAT = 0;
--
-- /* Check for compression errors */
-- if (ret != Z_OK)
-- {
-- if (png_ptr->zstream.msg != NULL)
-- png_error(png_ptr, png_ptr->zstream.msg);
--
-- else
-- png_error(png_ptr, "zlib error");
-- }
--
-- if (!(png_ptr->zstream.avail_out))
-- {
-- /* Write the IDAT and reset the zlib output buffer */
-- png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-- wrote_IDAT = 1;
-- }
-- } while (wrote_IDAT == 1);
--
-- /* If there is any data left to be output, write it into a new IDAT */
-- if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
-- {
-- /* Write the IDAT and reset the zlib output buffer */
-- png_write_IDAT(png_ptr, png_ptr->zbuf,
-- png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-- }
-+ png_compress_IDAT(png_ptr, NULL, 0, Z_SYNC_FLUSH);
- png_ptr->flush_rows = 0;
- png_flush(png_ptr);
- }
--#endif /* PNG_WRITE_FLUSH_SUPPORTED */
-+#endif /* WRITE_FLUSH */
-
--/* Free all memory used by the write */
--void PNGAPI
--png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
--{
-- png_structp png_ptr = NULL;
-- png_infop info_ptr = NULL;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_free_ptr free_fn = NULL;
-- png_voidp mem_ptr = NULL;
-+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-+static void png_reset_filter_heuristics(png_structrp png_ptr);/* forward decl */
- #endif
-
-- png_debug(1, "in png_destroy_write_struct");
--
-- if (png_ptr_ptr != NULL)
-- {
-- png_ptr = *png_ptr_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- free_fn = png_ptr->free_fn;
-- mem_ptr = png_ptr->mem_ptr;
--#endif
-- }
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- if (png_ptr != NULL)
-- {
-- free_fn = png_ptr->free_fn;
-- mem_ptr = png_ptr->mem_ptr;
-- }
--#endif
--
-- if (info_ptr_ptr != NULL)
-- info_ptr = *info_ptr_ptr;
--
-- if (info_ptr != NULL)
-- {
-- if (png_ptr != NULL)
-- {
-- png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
--
--#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-- if (png_ptr->num_chunk_list)
-- {
-- png_free(png_ptr, png_ptr->chunk_list);
-- png_ptr->num_chunk_list = 0;
-- }
--#endif
-- }
--
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-- (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)info_ptr);
--#endif
-- *info_ptr_ptr = NULL;
-- }
--
-- if (png_ptr != NULL)
-- {
-- png_write_destroy(png_ptr);
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-- (png_voidp)mem_ptr);
--#else
-- png_destroy_struct((png_voidp)png_ptr);
--#endif
-- *png_ptr_ptr = NULL;
-- }
--}
--
--
--/* Free any memory used in png_ptr struct (old method) */
--void /* PRIVATE */
--png_write_destroy(png_structp png_ptr)
-+/* Free any memory used in png_ptr struct without freeing the struct itself. */
-+static void
-+png_write_destroy(png_structrp png_ptr)
- {
--#ifdef PNG_SETJMP_SUPPORTED
-- jmp_buf tmp_jmp; /* Save jump buffer */
--#endif
-- png_error_ptr error_fn;
--#ifdef PNG_WARNINGS_SUPPORTED
-- png_error_ptr warning_fn;
--#endif
-- png_voidp error_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_free_ptr free_fn;
--#endif
--
- png_debug(1, "in png_write_destroy");
-
- /* Free any memory zlib uses */
-- if (png_ptr->zlib_state != PNG_ZLIB_UNINITIALIZED)
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
- deflateEnd(&png_ptr->zstream);
-
- /* Free our memory. png_free checks NULL for us. */
-- png_free(png_ptr, png_ptr->zbuf);
-+ png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
- png_free(png_ptr, png_ptr->row_buf);
-+ png_ptr->row_buf = NULL;
- #ifdef PNG_WRITE_FILTER_SUPPORTED
- png_free(png_ptr, png_ptr->prev_row);
- png_free(png_ptr, png_ptr->sub_row);
- png_free(png_ptr, png_ptr->up_row);
- png_free(png_ptr, png_ptr->avg_row);
- png_free(png_ptr, png_ptr->paeth_row);
-+ png_ptr->prev_row = NULL;
-+ png_ptr->sub_row = NULL;
-+ png_ptr->up_row = NULL;
-+ png_ptr->avg_row = NULL;
-+ png_ptr->paeth_row = NULL;
- #endif
-
- #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-@@ -1002,41 +981,51 @@
- png_reset_filter_heuristics(png_ptr);
- png_free(png_ptr, png_ptr->filter_costs);
- png_free(png_ptr, png_ptr->inv_filter_costs);
-+ png_ptr->filter_costs = NULL;
-+ png_ptr->inv_filter_costs = NULL;
- #endif
-
--#ifdef PNG_SETJMP_SUPPORTED
-- /* Reset structure */
-- png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
-+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-+ png_free(png_ptr, png_ptr->chunk_list);
-+ png_ptr->chunk_list = NULL;
- #endif
-
-- error_fn = png_ptr->error_fn;
--#ifdef PNG_WARNINGS_SUPPORTED
-- warning_fn = png_ptr->warning_fn;
--#endif
-- error_ptr = png_ptr->error_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- free_fn = png_ptr->free_fn;
--#endif
-+ /* The error handling and memory handling information is left intact at this
-+ * point: the jmp_buf may still have to be freed. See png_destroy_png_struct
-+ * for how this happens.
-+ */
-+}
-
-- png_memset(png_ptr, 0, png_sizeof(png_struct));
-+/* Free all memory used by the write.
-+ * In libpng 1.6.0 this API changed quietly to no longer accept a NULL value for
-+ * *png_ptr_ptr. Prior to 1.6.0 it would accept such a value and it would free
-+ * the passed in info_structs but it would quietly fail to free any of the data
-+ * inside them. In 1.6.0 it quietly does nothing (it has to be quiet because it
-+ * has no png_ptr.)
-+ */
-+void PNGAPI
-+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
-+{
-+ png_debug(1, "in png_destroy_write_struct");
-
-- png_ptr->error_fn = error_fn;
--#ifdef PNG_WARNINGS_SUPPORTED
-- png_ptr->warning_fn = warning_fn;
--#endif
-- png_ptr->error_ptr = error_ptr;
--#ifdef PNG_USER_MEM_SUPPORTED
-- png_ptr->free_fn = free_fn;
--#endif
-+ if (png_ptr_ptr != NULL)
-+ {
-+ png_structrp png_ptr = *png_ptr_ptr;
-
--#ifdef PNG_SETJMP_SUPPORTED
-- png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf));
--#endif
-+ if (png_ptr != NULL) /* added in libpng 1.6.0 */
-+ {
-+ png_destroy_info_struct(png_ptr, info_ptr_ptr);
-+
-+ *png_ptr_ptr = NULL;
-+ png_write_destroy(png_ptr);
-+ png_destroy_png_struct(png_ptr);
-+ }
-+ }
- }
-
- /* Allow the application to select one or more row filters to use. */
- void PNGAPI
--png_set_filter(png_structp png_ptr, int method, int filters)
-+png_set_filter(png_structrp png_ptr, int method, int filters)
- {
- png_debug(1, "in png_set_filter");
-
-@@ -1044,7 +1033,7 @@
- return;
-
- #ifdef PNG_MNG_FEATURES_SUPPORTED
-- if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-+ if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
- (method == PNG_INTRAPIXEL_DIFFERENCING))
- method = PNG_FILTER_TYPE_BASE;
-
-@@ -1056,8 +1045,9 @@
- #ifdef PNG_WRITE_FILTER_SUPPORTED
- case 5:
- case 6:
-- case 7: png_warning(png_ptr, "Unknown row filter for method 0");
--#endif /* PNG_WRITE_FILTER_SUPPORTED */
-+ case 7: png_app_error(png_ptr, "Unknown row filter for method 0");
-+ /* FALL THROUGH */
-+#endif /* WRITE_FILTER */
- case PNG_FILTER_VALUE_NONE:
- png_ptr->do_filter = PNG_FILTER_NONE; break;
-
-@@ -1078,8 +1068,8 @@
- png_ptr->do_filter = (png_byte)filters; break;
- #else
- default:
-- png_warning(png_ptr, "Unknown row filter for method 0");
--#endif /* PNG_WRITE_FILTER_SUPPORTED */
-+ png_app_error(png_ptr, "Unknown row filter for method 0");
-+#endif /* WRITE_FILTER */
- }
-
- /* If we have allocated the row_buf, this means we have already started
-@@ -1094,14 +1084,16 @@
- if (png_ptr->row_buf != NULL)
- {
- #ifdef PNG_WRITE_FILTER_SUPPORTED
-- if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
-+ if ((png_ptr->do_filter & PNG_FILTER_SUB) != 0 &&
-+ png_ptr->sub_row == NULL)
- {
- png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
- (png_ptr->rowbytes + 1));
- png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
- }
-
-- if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
-+ if ((png_ptr->do_filter & PNG_FILTER_UP) != 0 &&
-+ png_ptr->up_row == NULL)
- {
- if (png_ptr->prev_row == NULL)
- {
-@@ -1118,7 +1110,8 @@
- }
- }
-
-- if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
-+ if ((png_ptr->do_filter & PNG_FILTER_AVG) != 0 &&
-+ png_ptr->avg_row == NULL)
- {
- if (png_ptr->prev_row == NULL)
- {
-@@ -1135,7 +1128,7 @@
- }
- }
-
-- if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
-+ if ((png_ptr->do_filter & PNG_FILTER_PAETH) != 0 &&
- png_ptr->paeth_row == NULL)
- {
- if (png_ptr->prev_row == NULL)
-@@ -1153,7 +1146,7 @@
- }
-
- if (png_ptr->do_filter == PNG_NO_FILTERS)
--#endif /* PNG_WRITE_FILTER_SUPPORTED */
-+#endif /* WRITE_FILTER */
- png_ptr->do_filter = PNG_FILTER_NONE;
- }
- }
-@@ -1171,7 +1164,7 @@
- #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* GRR 970116 */
- /* Convenience reset API. */
- static void
--png_reset_filter_heuristics(png_structp png_ptr)
-+png_reset_filter_heuristics(png_structrp png_ptr)
- {
- /* Clear out any old values in the 'weights' - this must be done because if
- * the app calls set_filter_heuristics multiple times with different
-@@ -1204,7 +1197,7 @@
- }
-
- static int
--png_init_filter_heuristics(png_structp png_ptr, int heuristic_method,
-+png_init_filter_heuristics(png_structrp png_ptr, int heuristic_method,
- int num_weights)
- {
- if (png_ptr == NULL)
-@@ -1224,7 +1217,7 @@
- if (num_weights > 0)
- {
- png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
-- (png_uint_32)(png_sizeof(png_byte) * num_weights));
-+ (png_uint_32)((sizeof (png_byte)) * num_weights));
-
- /* To make sure that the weighting starts out fairly */
- for (i = 0; i < num_weights; i++)
-@@ -1233,10 +1226,10 @@
- }
-
- png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
-- (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
-+ (png_uint_32)((sizeof (png_uint_16)) * num_weights));
-
- png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
-- (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
-+ (png_uint_32)((sizeof (png_uint_16)) * num_weights));
-
- for (i = 0; i < num_weights; i++)
- {
-@@ -1254,10 +1247,10 @@
- if (png_ptr->filter_costs == NULL)
- {
- png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
-- (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
-+ (png_uint_32)((sizeof (png_uint_16)) * PNG_FILTER_VALUE_LAST));
-
- png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
-- (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
-+ (png_uint_32)((sizeof (png_uint_16)) * PNG_FILTER_VALUE_LAST));
- }
-
- for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
-@@ -1287,7 +1280,7 @@
- /* Provide floating and fixed point APIs */
- #ifdef PNG_FLOATING_POINT_SUPPORTED
- void PNGAPI
--png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
-+png_set_filter_heuristics(png_structrp png_ptr, int heuristic_method,
- int num_weights, png_const_doublep filter_weights,
- png_const_doublep filter_costs)
- {
-@@ -1296,7 +1289,7 @@
- /* The internal API allocates all the arrays and ensures that the elements of
- * those arrays are set to the default value.
- */
-- if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
-+ if (png_init_filter_heuristics(png_ptr, heuristic_method, num_weights) == 0)
- return;
-
- /* If using the weighted method copy in the weights. */
-@@ -1342,7 +1335,7 @@
-
- #ifdef PNG_FIXED_POINT_SUPPORTED
- void PNGAPI
--png_set_filter_heuristics_fixed(png_structp png_ptr, int heuristic_method,
-+png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method,
- int num_weights, png_const_fixed_point_p filter_weights,
- png_const_fixed_point_p filter_costs)
- {
-@@ -1351,7 +1344,7 @@
- /* The internal API allocates all the arrays and ensures that the elements of
- * those arrays are set to the default value.
- */
-- if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
-+ if (png_init_filter_heuristics(png_ptr, heuristic_method, num_weights) == 0)
- return;
-
- /* If using the weighted method copy in the weights. */
-@@ -1405,40 +1398,40 @@
- }
- }
- #endif /* FIXED_POINT */
--#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-+#endif /* WRITE_WEIGHTED_FILTER */
-
- void PNGAPI
--png_set_compression_level(png_structp png_ptr, int level)
-+png_set_compression_level(png_structrp png_ptr, int level)
- {
- png_debug(1, "in png_set_compression_level");
-
- if (png_ptr == NULL)
- return;
-
-- png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
- png_ptr->zlib_level = level;
- }
-
- void PNGAPI
--png_set_compression_mem_level(png_structp png_ptr, int mem_level)
-+png_set_compression_mem_level(png_structrp png_ptr, int mem_level)
- {
- png_debug(1, "in png_set_compression_mem_level");
-
- if (png_ptr == NULL)
- return;
-
-- png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
- png_ptr->zlib_mem_level = mem_level;
- }
-
- void PNGAPI
--png_set_compression_strategy(png_structp png_ptr, int strategy)
-+png_set_compression_strategy(png_structrp png_ptr, int strategy)
- {
- png_debug(1, "in png_set_compression_strategy");
-
- if (png_ptr == NULL)
- return;
-
-+ /* The flag setting here prevents the libpng dynamic selection of strategy.
-+ */
- png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
- png_ptr->zlib_strategy = strategy;
- }
-@@ -1447,80 +1440,81 @@
- * smaller value of window_bits if it can do so safely.
- */
- void PNGAPI
--png_set_compression_window_bits(png_structp png_ptr, int window_bits)
-+png_set_compression_window_bits(png_structrp png_ptr, int window_bits)
- {
- if (png_ptr == NULL)
- return;
-
-+ /* Prior to 1.6.0 this would warn but then set the window_bits value, this
-+ * meant that negative window bits values could be selected which would cause
-+ * libpng to write a non-standard PNG file with raw deflate or gzip
-+ * compressed IDAT or ancillary chunks. Such files can be read and there is
-+ * no warning on read, so this seems like a very bad idea.
-+ */
- if (window_bits > 15)
-+ {
- png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-+ window_bits = 15;
-+ }
-
- else if (window_bits < 8)
-+ {
- png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-+ window_bits = 8;
-+ }
-
--#ifndef WBITS_8_OK
-- /* Avoid libpng bug with 256-byte windows */
-- if (window_bits == 8)
-- {
-- png_warning(png_ptr, "Compression window is being reset to 512");
-- window_bits = 9;
-- }
--
--#endif
-- png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
- png_ptr->zlib_window_bits = window_bits;
- }
-
- void PNGAPI
--png_set_compression_method(png_structp png_ptr, int method)
-+png_set_compression_method(png_structrp png_ptr, int method)
- {
- png_debug(1, "in png_set_compression_method");
-
- if (png_ptr == NULL)
- return;
-
-+ /* This would produce an invalid PNG file if it worked, but it doesn't and
-+ * deflate will fault it, so it is harmless to just warn here.
-+ */
- if (method != 8)
- png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-- png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
- png_ptr->zlib_method = method;
- }
-
- /* The following were added to libpng-1.5.4 */
- #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
- void PNGAPI
--png_set_text_compression_level(png_structp png_ptr, int level)
-+png_set_text_compression_level(png_structrp png_ptr, int level)
- {
- png_debug(1, "in png_set_text_compression_level");
-
- if (png_ptr == NULL)
- return;
-
-- png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_LEVEL;
- png_ptr->zlib_text_level = level;
- }
-
- void PNGAPI
--png_set_text_compression_mem_level(png_structp png_ptr, int mem_level)
-+png_set_text_compression_mem_level(png_structrp png_ptr, int mem_level)
- {
- png_debug(1, "in png_set_text_compression_mem_level");
-
- if (png_ptr == NULL)
- return;
-
-- png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL;
- png_ptr->zlib_text_mem_level = mem_level;
- }
-
- void PNGAPI
--png_set_text_compression_strategy(png_structp png_ptr, int strategy)
-+png_set_text_compression_strategy(png_structrp png_ptr, int strategy)
- {
- png_debug(1, "in png_set_text_compression_strategy");
-
- if (png_ptr == NULL)
- return;
-
-- png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_STRATEGY;
- png_ptr->zlib_text_strategy = strategy;
- }
-
-@@ -1528,32 +1522,28 @@
- * smaller value of window_bits if it can do so safely.
- */
- void PNGAPI
--png_set_text_compression_window_bits(png_structp png_ptr, int window_bits)
-+png_set_text_compression_window_bits(png_structrp png_ptr, int window_bits)
- {
- if (png_ptr == NULL)
- return;
-
- if (window_bits > 15)
-+ {
- png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-+ window_bits = 15;
-+ }
-
- else if (window_bits < 8)
-+ {
- png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-+ window_bits = 8;
-+ }
-
--#ifndef WBITS_8_OK
-- /* Avoid libpng bug with 256-byte windows */
-- if (window_bits == 8)
-- {
-- png_warning(png_ptr, "Text compression window is being reset to 512");
-- window_bits = 9;
-- }
--
--#endif
-- png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS;
- png_ptr->zlib_text_window_bits = window_bits;
- }
-
- void PNGAPI
--png_set_text_compression_method(png_structp png_ptr, int method)
-+png_set_text_compression_method(png_structrp png_ptr, int method)
- {
- png_debug(1, "in png_set_text_compression_method");
-
-@@ -1563,14 +1553,13 @@
- if (method != 8)
- png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-- png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_METHOD;
- png_ptr->zlib_text_method = method;
- }
--#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
-+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
- /* end of API added to libpng-1.5.4 */
-
- void PNGAPI
--png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
-+png_set_write_status_fn(png_structrp png_ptr, png_write_status_ptr write_row_fn)
- {
- if (png_ptr == NULL)
- return;
-@@ -1580,7 +1569,7 @@
-
- #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
- void PNGAPI
--png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
-+png_set_write_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
- write_user_transform_fn)
- {
- png_debug(1, "in png_set_write_user_transform_fn");
-@@ -1596,88 +1585,899 @@
-
- #ifdef PNG_INFO_IMAGE_SUPPORTED
- void PNGAPI
--png_write_png(png_structp png_ptr, png_infop info_ptr,
-+png_write_png(png_structrp png_ptr, png_inforp info_ptr,
- int transforms, voidp params)
- {
- if (png_ptr == NULL || info_ptr == NULL)
- return;
-
-+ if ((info_ptr->valid & PNG_INFO_IDAT) == 0)
-+ {
-+ png_app_error(png_ptr, "no rows for png_write_image to write");
-+ return;
-+ }
-+
- /* Write the file header information. */
- png_write_info(png_ptr, info_ptr);
-
- /* ------ these transformations don't touch the info structure ------- */
-
-+ /* Invert monochrome pixels */
-+ if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
- #ifdef PNG_WRITE_INVERT_SUPPORTED
-- /* Invert monochrome pixels */
-- if (transforms & PNG_TRANSFORM_INVERT_MONO)
- png_set_invert_mono(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");
- #endif
-
--#ifdef PNG_WRITE_SHIFT_SUPPORTED
- /* Shift the pixels up to a legal bit depth and fill in
- * as appropriate to correctly scale the image.
- */
-- if ((transforms & PNG_TRANSFORM_SHIFT)
-- && (info_ptr->valid & PNG_INFO_sBIT))
-- png_set_shift(png_ptr, &info_ptr->sig_bit);
-+ if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
-+#ifdef PNG_WRITE_SHIFT_SUPPORTED
-+ if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
-+ png_set_shift(png_ptr, &info_ptr->sig_bit);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
- #endif
-
-+ /* Pack pixels into bytes */
-+ if ((transforms & PNG_TRANSFORM_PACKING) != 0)
- #ifdef PNG_WRITE_PACK_SUPPORTED
-- /* Pack pixels into bytes */
-- if (transforms & PNG_TRANSFORM_PACKING)
-- png_set_packing(png_ptr);
-+ png_set_packing(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");
- #endif
-
-+ /* Swap location of alpha bytes from ARGB to RGBA */
-+ if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
- #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-- /* Swap location of alpha bytes from ARGB to RGBA */
-- if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
- png_set_swap_alpha(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");
- #endif
-
-+ /* Remove a filler (X) from XRGB/RGBX/AG/GA into to convert it into
-+ * RGB, note that the code expects the input color type to be G or RGB; no
-+ * alpha channel.
-+ */
-+ if ((transforms & (PNG_TRANSFORM_STRIP_FILLER_AFTER|
-+ PNG_TRANSFORM_STRIP_FILLER_BEFORE)) != 0)
-+ {
- #ifdef PNG_WRITE_FILLER_SUPPORTED
-- /* Pack XRGB/RGBX/ARGB/RGBA into RGB (4 channels -> 3 channels) */
-- if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
-- png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
-+ if ((transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) != 0)
-+ {
-+ if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
-+ png_app_error(png_ptr,
-+ "PNG_TRANSFORM_STRIP_FILLER: BEFORE+AFTER not supported");
-
-- else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
-- png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-+ /* Continue if ignored - this is the pre-1.6.10 behavior */
-+ png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
-+ }
-+
-+ else if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
-+ png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_FILLER not supported");
-+#endif
-+ }
-+
-+ /* Flip BGR pixels to RGB */
-+ if ((transforms & PNG_TRANSFORM_BGR) != 0)
-+#ifdef PNG_WRITE_BGR_SUPPORTED
-+ png_set_bgr(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");
- #endif
-
--#ifdef PNG_WRITE_BGR_SUPPORTED
-- /* Flip BGR pixels to RGB */
-- if (transforms & PNG_TRANSFORM_BGR)
-- png_set_bgr(png_ptr);
-+ /* Swap bytes of 16-bit files to most significant byte first */
-+ if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
-+#ifdef PNG_WRITE_SWAP_SUPPORTED
-+ png_set_swap(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");
- #endif
-
--#ifdef PNG_WRITE_SWAP_SUPPORTED
-- /* Swap bytes of 16-bit files to most significant byte first */
-- if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
-- png_set_swap(png_ptr);
-+ /* Swap bits of 1, 2, 4 bit packed pixel formats */
-+ if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
-+#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-+ png_set_packswap(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");
- #endif
-
--#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-- /* Swap bits of 1, 2, 4 bit packed pixel formats */
-- if (transforms & PNG_TRANSFORM_PACKSWAP)
-- png_set_packswap(png_ptr);
--#endif
--
-+ /* Invert the alpha channel from opacity to transparency */
-+ if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
- #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-- /* Invert the alpha channel from opacity to transparency */
-- if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
- png_set_invert_alpha(png_ptr);
-+#else
-+ png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");
- #endif
-
- /* ----------------------- end of transformations ------------------- */
-
- /* Write the bits */
-- if (info_ptr->valid & PNG_INFO_IDAT)
-- png_write_image(png_ptr, info_ptr->row_pointers);
-+ png_write_image(png_ptr, info_ptr->row_pointers);
-
- /* It is REQUIRED to call this to finish writing the rest of the file */
- png_write_end(png_ptr, info_ptr);
-
-- PNG_UNUSED(transforms) /* Quiet compiler warnings */
- PNG_UNUSED(params)
- }
- #endif
--#endif /* PNG_WRITE_SUPPORTED */
-+
-+
-+#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-+#ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */
-+/* Initialize the write structure - general purpose utility. */
-+static int
-+png_image_write_init(png_imagep image)
-+{
-+ png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, image,
-+ png_safe_error, png_safe_warning);
-+
-+ if (png_ptr != NULL)
-+ {
-+ png_infop info_ptr = png_create_info_struct(png_ptr);
-+
-+ if (info_ptr != NULL)
-+ {
-+ png_controlp control = png_voidcast(png_controlp,
-+ png_malloc_warn(png_ptr, (sizeof *control)));
-+
-+ if (control != NULL)
-+ {
-+ memset(control, 0, (sizeof *control));
-+
-+ control->png_ptr = png_ptr;
-+ control->info_ptr = info_ptr;
-+ control->for_write = 1;
-+
-+ image->opaque = control;
-+ return 1;
-+ }
-+
-+ /* Error clean up */
-+ png_destroy_info_struct(png_ptr, &info_ptr);
-+ }
-+
-+ png_destroy_write_struct(&png_ptr, NULL);
-+ }
-+
-+ return png_image_error(image, "png_image_write_: out of memory");
-+}
-+
-+/* Arguments to png_image_write_main: */
-+typedef struct
-+{
-+ /* Arguments: */
-+ png_imagep image;
-+ png_const_voidp buffer;
-+ png_int_32 row_stride;
-+ png_const_voidp colormap;
-+ int convert_to_8bit;
-+ /* Local variables: */
-+ png_const_voidp first_row;
-+ ptrdiff_t row_bytes;
-+ png_voidp local_row;
-+} png_image_write_control;
-+
-+/* Write png_uint_16 input to a 16-bit PNG; the png_ptr has already been set to
-+ * do any necessary byte swapping. The component order is defined by the
-+ * png_image format value.
-+ */
-+static int
-+png_write_image_16bit(png_voidp argument)
-+{
-+ png_image_write_control *display = png_voidcast(png_image_write_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+
-+ png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,
-+ display->first_row);
-+ png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row);
-+ png_uint_16p row_end;
-+ const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
-+ int aindex = 0;
-+ png_uint_32 y = image->height;
-+
-+ if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-+ if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ {
-+ aindex = -1;
-+ ++input_row; /* To point to the first component */
-+ ++output_row;
-+ }
-+
-+ else
-+# endif
-+ aindex = channels;
-+ }
-+
-+ else
-+ png_error(png_ptr, "png_write_image: internal call error");
-+
-+ /* Work out the output row end and count over this, note that the increment
-+ * above to 'row' means that row_end can actually be beyond the end of the
-+ * row; this is correct.
-+ */
-+ row_end = output_row + image->width * (channels+1);
-+
-+ while (y-- > 0)
-+ {
-+ png_const_uint_16p in_ptr = input_row;
-+ png_uint_16p out_ptr = output_row;
-+
-+ while (out_ptr < row_end)
-+ {
-+ const png_uint_16 alpha = in_ptr[aindex];
-+ png_uint_32 reciprocal = 0;
-+ int c;
-+
-+ out_ptr[aindex] = alpha;
-+
-+ /* Calculate a reciprocal. The correct calculation is simply
-+ * component/alpha*65535 << 15. (I.e. 15 bits of precision); this
-+ * allows correct rounding by adding .5 before the shift. 'reciprocal'
-+ * is only initialized when required.
-+ */
-+ if (alpha > 0 && alpha < 65535)
-+ reciprocal = ((0xffff<<15)+(alpha>>1))/alpha;
-+
-+ c = channels;
-+ do /* always at least one channel */
-+ {
-+ png_uint_16 component = *in_ptr++;
-+
-+ /* The following gives 65535 for an alpha of 0, which is fine,
-+ * otherwise if 0/0 is represented as some other value there is more
-+ * likely to be a discontinuity which will probably damage
-+ * compression when moving from a fully transparent area to a
-+ * nearly transparent one. (The assumption here is that opaque
-+ * areas tend not to be 0 intensity.)
-+ */
-+ if (component >= alpha)
-+ component = 65535;
-+
-+ /* component<alpha, so component/alpha is less than one and
-+ * component*reciprocal is less than 2^31.
-+ */
-+ else if (component > 0 && alpha < 65535)
-+ {
-+ png_uint_32 calc = component * reciprocal;
-+ calc += 16384; /* round to nearest */
-+ component = (png_uint_16)(calc >> 15);
-+ }
-+
-+ *out_ptr++ = component;
-+ }
-+ while (--c > 0);
-+
-+ /* Skip to next component (skip the intervening alpha channel) */
-+ ++in_ptr;
-+ ++out_ptr;
-+ }
-+
-+ png_write_row(png_ptr, png_voidcast(png_const_bytep, display->local_row));
-+ input_row += display->row_bytes/(sizeof (png_uint_16));
-+ }
-+
-+ return 1;
-+}
-+
-+/* Given 16-bit input (1 to 4 channels) write 8-bit output. If an alpha channel
-+ * is present it must be removed from the components, the components are then
-+ * written in sRGB encoding. No components are added or removed.
-+ *
-+ * Calculate an alpha reciprocal to reverse pre-multiplication. As above the
-+ * calculation can be done to 15 bits of accuracy; however, the output needs to
-+ * be scaled in the range 0..255*65535, so include that scaling here.
-+ */
-+#define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha)
-+
-+static png_byte
-+png_unpremultiply(png_uint_32 component, png_uint_32 alpha,
-+ png_uint_32 reciprocal/*from the above macro*/)
-+{
-+ /* The following gives 1.0 for an alpha of 0, which is fine, otherwise if 0/0
-+ * is represented as some other value there is more likely to be a
-+ * discontinuity which will probably damage compression when moving from a
-+ * fully transparent area to a nearly transparent one. (The assumption here
-+ * is that opaque areas tend not to be 0 intensity.)
-+ *
-+ * There is a rounding problem here; if alpha is less than 128 it will end up
-+ * as 0 when scaled to 8 bits. To avoid introducing spurious colors into the
-+ * output change for this too.
-+ */
-+ if (component >= alpha || alpha < 128)
-+ return 255;
-+
-+ /* component<alpha, so component/alpha is less than one and
-+ * component*reciprocal is less than 2^31.
-+ */
-+ else if (component > 0)
-+ {
-+ /* The test is that alpha/257 (rounded) is less than 255, the first value
-+ * that becomes 255 is 65407.
-+ * NOTE: this must agree with the PNG_DIV257 macro (which must, therefore,
-+ * be exact!) [Could also test reciprocal != 0]
-+ */
-+ if (alpha < 65407)
-+ {
-+ component *= reciprocal;
-+ component += 64; /* round to nearest */
-+ component >>= 7;
-+ }
-+
-+ else
-+ component *= 255;
-+
-+ /* Convert the component to sRGB. */
-+ return (png_byte)PNG_sRGB_FROM_LINEAR(component);
-+ }
-+
-+ else
-+ return 0;
-+}
-+
-+static int
-+png_write_image_8bit(png_voidp argument)
-+{
-+ png_image_write_control *display = png_voidcast(png_image_write_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+
-+ png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,
-+ display->first_row);
-+ png_bytep output_row = png_voidcast(png_bytep, display->local_row);
-+ png_uint_32 y = image->height;
-+ const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
-+
-+ if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ {
-+ png_bytep row_end;
-+ int aindex;
-+
-+# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-+ if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ {
-+ aindex = -1;
-+ ++input_row; /* To point to the first component */
-+ ++output_row;
-+ }
-+
-+ else
-+# endif
-+ aindex = channels;
-+
-+ /* Use row_end in place of a loop counter: */
-+ row_end = output_row + image->width * (channels+1);
-+
-+ while (y-- > 0)
-+ {
-+ png_const_uint_16p in_ptr = input_row;
-+ png_bytep out_ptr = output_row;
-+
-+ while (out_ptr < row_end)
-+ {
-+ png_uint_16 alpha = in_ptr[aindex];
-+ png_byte alphabyte = (png_byte)PNG_DIV257(alpha);
-+ png_uint_32 reciprocal = 0;
-+ int c;
-+
-+ /* Scale and write the alpha channel. */
-+ out_ptr[aindex] = alphabyte;
-+
-+ if (alphabyte > 0 && alphabyte < 255)
-+ reciprocal = UNP_RECIPROCAL(alpha);
-+
-+ c = channels;
-+ do /* always at least one channel */
-+ *out_ptr++ = png_unpremultiply(*in_ptr++, alpha, reciprocal);
-+ while (--c > 0);
-+
-+ /* Skip to next component (skip the intervening alpha channel) */
-+ ++in_ptr;
-+ ++out_ptr;
-+ } /* while out_ptr < row_end */
-+
-+ png_write_row(png_ptr, png_voidcast(png_const_bytep,
-+ display->local_row));
-+ input_row += display->row_bytes/(sizeof (png_uint_16));
-+ } /* while y */
-+ }
-+
-+ else
-+ {
-+ /* No alpha channel, so the row_end really is the end of the row and it
-+ * is sufficient to loop over the components one by one.
-+ */
-+ png_bytep row_end = output_row + image->width * channels;
-+
-+ while (y-- > 0)
-+ {
-+ png_const_uint_16p in_ptr = input_row;
-+ png_bytep out_ptr = output_row;
-+
-+ while (out_ptr < row_end)
-+ {
-+ png_uint_32 component = *in_ptr++;
-+
-+ component *= 255;
-+ *out_ptr++ = (png_byte)PNG_sRGB_FROM_LINEAR(component);
-+ }
-+
-+ png_write_row(png_ptr, output_row);
-+ input_row += display->row_bytes/(sizeof (png_uint_16));
-+ }
-+ }
-+
-+ return 1;
-+}
-+
-+static void
-+png_image_set_PLTE(png_image_write_control *display)
-+{
-+ const png_imagep image = display->image;
-+ const void *cmap = display->colormap;
-+ const int entries = image->colormap_entries > 256 ? 256 :
-+ (int)image->colormap_entries;
-+
-+ /* NOTE: the caller must check for cmap != NULL and entries != 0 */
-+ const png_uint_32 format = image->format;
-+ const int channels = PNG_IMAGE_SAMPLE_CHANNELS(format);
-+
-+# if defined(PNG_FORMAT_BGR_SUPPORTED) &&\
-+ defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED)
-+ const int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
-+ (format & PNG_FORMAT_FLAG_ALPHA) != 0;
-+# else
-+# define afirst 0
-+# endif
-+
-+# ifdef PNG_FORMAT_BGR_SUPPORTED
-+ const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
-+# else
-+# define bgr 0
-+# endif
-+
-+ int i, num_trans;
-+ png_color palette[256];
-+ png_byte tRNS[256];
-+
-+ memset(tRNS, 255, (sizeof tRNS));
-+ memset(palette, 0, (sizeof palette));
-+
-+ for (i=num_trans=0; i<entries; ++i)
-+ {
-+ /* This gets automatically converted to sRGB with reversal of the
-+ * pre-multiplication if the color-map has an alpha channel.
-+ */
-+ if ((format & PNG_FORMAT_FLAG_LINEAR) != 0)
-+ {
-+ png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap);
-+
-+ entry += i * channels;
-+
-+ if ((channels & 1) != 0) /* no alpha */
-+ {
-+ if (channels >= 3) /* RGB */
-+ {
-+ palette[i].blue = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
-+ entry[(2 ^ bgr)]);
-+ palette[i].green = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
-+ entry[1]);
-+ palette[i].red = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
-+ entry[bgr]);
-+ }
-+
-+ else /* Gray */
-+ palette[i].blue = palette[i].red = palette[i].green =
-+ (png_byte)PNG_sRGB_FROM_LINEAR(255 * *entry);
-+ }
-+
-+ else /* alpha */
-+ {
-+ png_uint_16 alpha = entry[afirst ? 0 : channels-1];
-+ png_byte alphabyte = (png_byte)PNG_DIV257(alpha);
-+ png_uint_32 reciprocal = 0;
-+
-+ /* Calculate a reciprocal, as in the png_write_image_8bit code above
-+ * this is designed to produce a value scaled to 255*65535 when
-+ * divided by 128 (i.e. asr 7).
-+ */
-+ if (alphabyte > 0 && alphabyte < 255)
-+ reciprocal = (((0xffff*0xff)<<7)+(alpha>>1))/alpha;
-+
-+ tRNS[i] = alphabyte;
-+ if (alphabyte < 255)
-+ num_trans = i+1;
-+
-+ if (channels >= 3) /* RGB */
-+ {
-+ palette[i].blue = png_unpremultiply(entry[afirst + (2 ^ bgr)],
-+ alpha, reciprocal);
-+ palette[i].green = png_unpremultiply(entry[afirst + 1], alpha,
-+ reciprocal);
-+ palette[i].red = png_unpremultiply(entry[afirst + bgr], alpha,
-+ reciprocal);
-+ }
-+
-+ else /* gray */
-+ palette[i].blue = palette[i].red = palette[i].green =
-+ png_unpremultiply(entry[afirst], alpha, reciprocal);
-+ }
-+ }
-+
-+ else /* Color-map has sRGB values */
-+ {
-+ png_const_bytep entry = png_voidcast(png_const_bytep, cmap);
-+
-+ entry += i * channels;
-+
-+ switch (channels)
-+ {
-+ case 4:
-+ tRNS[i] = entry[afirst ? 0 : 3];
-+ if (tRNS[i] < 255)
-+ num_trans = i+1;
-+ /* FALL THROUGH */
-+ case 3:
-+ palette[i].blue = entry[afirst + (2 ^ bgr)];
-+ palette[i].green = entry[afirst + 1];
-+ palette[i].red = entry[afirst + bgr];
-+ break;
-+
-+ case 2:
-+ tRNS[i] = entry[1 ^ afirst];
-+ if (tRNS[i] < 255)
-+ num_trans = i+1;
-+ /* FALL THROUGH */
-+ case 1:
-+ palette[i].blue = palette[i].red = palette[i].green =
-+ entry[afirst];
-+ break;
-+
-+ default:
-+ break;
-+ }
-+ }
-+ }
-+
-+# ifdef afirst
-+# undef afirst
-+# endif
-+# ifdef bgr
-+# undef bgr
-+# endif
-+
-+ png_set_PLTE(image->opaque->png_ptr, image->opaque->info_ptr, palette,
-+ entries);
-+
-+ if (num_trans > 0)
-+ png_set_tRNS(image->opaque->png_ptr, image->opaque->info_ptr, tRNS,
-+ num_trans, NULL);
-+
-+ image->colormap_entries = entries;
-+}
-+
-+static int
-+png_image_write_main(png_voidp argument)
-+{
-+ png_image_write_control *display = png_voidcast(png_image_write_control*,
-+ argument);
-+ png_imagep image = display->image;
-+ png_structrp png_ptr = image->opaque->png_ptr;
-+ png_inforp info_ptr = image->opaque->info_ptr;
-+ png_uint_32 format = image->format;
-+
-+ /* The following four ints are actually booleans */
-+ int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);
-+ int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */
-+ int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);
-+ int write_16bit = linear && !colormap && (display->convert_to_8bit == 0);
-+
-+# ifdef PNG_BENIGN_ERRORS_SUPPORTED
-+ /* Make sure we error out on any bad situation */
-+ png_set_benign_errors(png_ptr, 0/*error*/);
-+# endif
-+
-+ /* Default the 'row_stride' parameter if required. */
-+ if (display->row_stride == 0)
-+ display->row_stride = PNG_IMAGE_ROW_STRIDE(*image);
-+
-+ /* Set the required transforms then write the rows in the correct order. */
-+ if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0)
-+ {
-+ if (display->colormap != NULL && image->colormap_entries > 0)
-+ {
-+ png_uint_32 entries = image->colormap_entries;
-+
-+ png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
-+ entries > 16 ? 8 : (entries > 4 ? 4 : (entries > 2 ? 2 : 1)),
-+ PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
-+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+
-+ png_image_set_PLTE(display);
-+ }
-+
-+ else
-+ png_error(image->opaque->png_ptr,
-+ "no color-map for color-mapped image");
-+ }
-+
-+ else
-+ png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
-+ write_16bit ? 16 : 8,
-+ ((format & PNG_FORMAT_FLAG_COLOR) ? PNG_COLOR_MASK_COLOR : 0) +
-+ ((format & PNG_FORMAT_FLAG_ALPHA) ? PNG_COLOR_MASK_ALPHA : 0),
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+
-+ /* Counter-intuitively the data transformations must be called *after*
-+ * png_write_info, not before as in the read code, but the 'set' functions
-+ * must still be called before. Just set the color space information, never
-+ * write an interlaced image.
-+ */
-+
-+ if (write_16bit != 0)
-+ {
-+ /* The gamma here is 1.0 (linear) and the cHRM chunk matches sRGB. */
-+ png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_LINEAR);
-+
-+ if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
-+ png_set_cHRM_fixed(png_ptr, info_ptr,
-+ /* color x y */
-+ /* white */ 31270, 32900,
-+ /* red */ 64000, 33000,
-+ /* green */ 30000, 60000,
-+ /* blue */ 15000, 6000
-+ );
-+ }
-+
-+ else if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
-+ png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);
-+
-+ /* Else writing an 8-bit file and the *colors* aren't sRGB, but the 8-bit
-+ * space must still be gamma encoded.
-+ */
-+ else
-+ png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
-+
-+ /* Write the file header. */
-+ png_write_info(png_ptr, info_ptr);
-+
-+ /* Now set up the data transformations (*after* the header is written),
-+ * remove the handled transformations from the 'format' flags for checking.
-+ *
-+ * First check for a little endian system if writing 16 bit files.
-+ */
-+ if (write_16bit != 0)
-+ {
-+ PNG_CONST png_uint_16 le = 0x0001;
-+
-+ if ((*(png_const_bytep) & le) != 0)
-+ png_set_swap(png_ptr);
-+ }
-+
-+# ifdef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-+ if ((format & PNG_FORMAT_FLAG_BGR) != 0)
-+ {
-+ if (colormap == 0 && (format & PNG_FORMAT_FLAG_COLOR) != 0)
-+ png_set_bgr(png_ptr);
-+ format &= ~PNG_FORMAT_FLAG_BGR;
-+ }
-+# endif
-+
-+# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
-+ {
-+ if (colormap == 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0)
-+ png_set_swap_alpha(png_ptr);
-+ format &= ~PNG_FORMAT_FLAG_AFIRST;
-+ }
-+# endif
-+
-+ /* If there are 16 or fewer color-map entries we wrote a lower bit depth
-+ * above, but the application data is still byte packed.
-+ */
-+ if (colormap != 0 && image->colormap_entries <= 16)
-+ png_set_packing(png_ptr);
-+
-+ /* That should have handled all (both) the transforms. */
-+ if ((format & ~(png_uint_32)(PNG_FORMAT_FLAG_COLOR | PNG_FORMAT_FLAG_LINEAR |
-+ PNG_FORMAT_FLAG_ALPHA | PNG_FORMAT_FLAG_COLORMAP)) != 0)
-+ png_error(png_ptr, "png_write_image: unsupported transformation");
-+
-+ {
-+ png_const_bytep row = png_voidcast(png_const_bytep, display->buffer);
-+ ptrdiff_t row_bytes = display->row_stride;
-+
-+ if (linear != 0)
-+ row_bytes *= (sizeof (png_uint_16));
-+
-+ if (row_bytes < 0)
-+ row += (image->height-1) * (-row_bytes);
-+
-+ display->first_row = row;
-+ display->row_bytes = row_bytes;
-+ }
-+
-+ /* Apply 'fast' options if the flag is set. */
-+ if ((image->flags & PNG_IMAGE_FLAG_FAST) != 0)
-+ {
-+ png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_NO_FILTERS);
-+ /* NOTE: determined by experiment using pngstest, this reflects some
-+ * balance between the time to write the image once and the time to read
-+ * it about 50 times. The speed-up in pngstest was about 10-20% of the
-+ * total (user) time on a heavily loaded system.
-+ */
-+ png_set_compression_level(png_ptr, 3);
-+ }
-+
-+ /* Check for the cases that currently require a pre-transform on the row
-+ * before it is written. This only applies when the input is 16-bit and
-+ * either there is an alpha channel or it is converted to 8-bit.
-+ */
-+ if ((linear != 0 && alpha != 0 ) ||
-+ (colormap == 0 && display->convert_to_8bit != 0))
-+ {
-+ png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr,
-+ png_get_rowbytes(png_ptr, info_ptr)));
-+ int result;
-+
-+ display->local_row = row;
-+ if (write_16bit != 0)
-+ result = png_safe_execute(image, png_write_image_16bit, display);
-+ else
-+ result = png_safe_execute(image, png_write_image_8bit, display);
-+ display->local_row = NULL;
-+
-+ png_free(png_ptr, row);
-+
-+ /* Skip the 'write_end' on error: */
-+ if (result == 0)
-+ return 0;
-+ }
-+
-+ /* Otherwise this is the case where the input is in a format currently
-+ * supported by the rest of the libpng write code; call it directly.
-+ */
-+ else
-+ {
-+ png_const_bytep row = png_voidcast(png_const_bytep, display->first_row);
-+ ptrdiff_t row_bytes = display->row_bytes;
-+ png_uint_32 y = image->height;
-+
-+ while (y-- > 0)
-+ {
-+ png_write_row(png_ptr, row);
-+ row += row_bytes;
-+ }
-+ }
-+
-+ png_write_end(png_ptr, info_ptr);
-+ return 1;
-+}
-+
-+int PNGAPI
-+png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,
-+ const void *buffer, png_int_32 row_stride, const void *colormap)
-+{
-+ /* Write the image to the given (FILE*). */
-+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
-+ {
-+ if (file != NULL)
-+ {
-+ if (png_image_write_init(image) != 0)
-+ {
-+ png_image_write_control display;
-+ int result;
-+
-+ /* This is slightly evil, but png_init_io doesn't do anything other
-+ * than this and we haven't changed the standard IO functions so
-+ * this saves a 'safe' function.
-+ */
-+ image->opaque->png_ptr->io_ptr = file;
-+
-+ memset(&display, 0, (sizeof display));
-+ display.image = image;
-+ display.buffer = buffer;
-+ display.row_stride = row_stride;
-+ display.colormap = colormap;
-+ display.convert_to_8bit = convert_to_8bit;
-+
-+ result = png_safe_execute(image, png_image_write_main, &display);
-+ png_image_free(image);
-+ return result;
-+ }
-+
-+ else
-+ return 0;
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_write_to_stdio: invalid argument");
-+ }
-+
-+ else if (image != NULL)
-+ return png_image_error(image,
-+ "png_image_write_to_stdio: incorrect PNG_IMAGE_VERSION");
-+
-+ else
-+ return 0;
-+}
-+
-+int PNGAPI
-+png_image_write_to_file(png_imagep image, const char *file_name,
-+ int convert_to_8bit, const void *buffer, png_int_32 row_stride,
-+ const void *colormap)
-+{
-+ /* Write the image to the named file. */
-+ if (image != NULL && image->version == PNG_IMAGE_VERSION)
-+ {
-+ if (file_name != NULL)
-+ {
-+ FILE *fp = fopen(file_name, "wb");
-+
-+ if (fp != NULL)
-+ {
-+ if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer,
-+ row_stride, colormap) != 0)
-+ {
-+ int error; /* from fflush/fclose */
-+
-+ /* Make sure the file is flushed correctly. */
-+ if (fflush(fp) == 0 && ferror(fp) == 0)
-+ {
-+ if (fclose(fp) == 0)
-+ return 1;
-+
-+ error = errno; /* from fclose */
-+ }
-+
-+ else
-+ {
-+ error = errno; /* from fflush or ferror */
-+ (void)fclose(fp);
-+ }
-+
-+ (void)remove(file_name);
-+ /* The image has already been cleaned up; this is just used to
-+ * set the error (because the original write succeeded).
-+ */
-+ return png_image_error(image, strerror(error));
-+ }
-+
-+ else
-+ {
-+ /* Clean up: just the opened file. */
-+ (void)fclose(fp);
-+ (void)remove(file_name);
-+ return 0;
-+ }
-+ }
-+
-+ else
-+ return png_image_error(image, strerror(errno));
-+ }
-+
-+ else
-+ return png_image_error(image,
-+ "png_image_write_to_file: invalid argument");
-+ }
-+
-+ else if (image != NULL)
-+ return png_image_error(image,
-+ "png_image_write_to_file: incorrect PNG_IMAGE_VERSION");
-+
-+ else
-+ return 0;
-+}
-+#endif /* STDIO */
-+#endif /* SIMPLIFIED_WRITE */
-+#endif /* WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngwtran.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngwtran.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -42,90 +42,14 @@
- #include "pngpriv.h"
-
- #ifdef PNG_WRITE_SUPPORTED
--
- #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
--/* Transform the data according to the user's wishes. The order of
-- * transformations is significant.
-- */
--void /* PRIVATE */
--png_do_write_transformations(png_structp png_ptr)
--{
-- png_debug(1, "in png_do_write_transformations");
--
-- if (png_ptr == NULL)
-- return;
--
--#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-- if (png_ptr->transformations & PNG_USER_TRANSFORM)
-- if (png_ptr->write_user_transform_fn != NULL)
-- (*(png_ptr->write_user_transform_fn)) /* User write transform
-- function */
-- (png_ptr, /* png_ptr */
-- &(png_ptr->row_info), /* row_info: */
-- /* png_uint_32 width; width of row */
-- /* png_size_t rowbytes; number of bytes in row */
-- /* png_byte color_type; color type of pixels */
-- /* png_byte bit_depth; bit depth of samples */
-- /* png_byte channels; number of channels (1-4) */
-- /* png_byte pixel_depth; bits per pixel (depth*channels) */
-- png_ptr->row_buf + 1); /* start of pixel data for row */
--#endif
--
--#ifdef PNG_WRITE_FILLER_SUPPORTED
-- if (png_ptr->transformations & PNG_FILLER)
-- png_do_strip_channel(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
--#endif
--
--#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_PACKSWAP)
-- png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_WRITE_PACK_SUPPORTED
-- if (png_ptr->transformations & PNG_PACK)
-- png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- (png_uint_32)png_ptr->bit_depth);
--#endif
--
--#ifdef PNG_WRITE_SWAP_SUPPORTED
-- if (png_ptr->transformations & PNG_SWAP_BYTES)
-- png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_WRITE_SHIFT_SUPPORTED
-- if (png_ptr->transformations & PNG_SHIFT)
-- png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
-- &(png_ptr->shift));
--#endif
--
--#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-- if (png_ptr->transformations & PNG_SWAP_ALPHA)
-- png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-- if (png_ptr->transformations & PNG_INVERT_ALPHA)
-- png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_WRITE_BGR_SUPPORTED
-- if (png_ptr->transformations & PNG_BGR)
-- png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--
--#ifdef PNG_WRITE_INVERT_SUPPORTED
-- if (png_ptr->transformations & PNG_INVERT_MONO)
-- png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
--#endif
--}
-
- #ifdef PNG_WRITE_PACK_SUPPORTED
- /* Pack pixels into bytes. Pass the true bit depth in bit_depth. The
- * row_info bit depth should be 8 (one pixel per byte). The channels
- * should be 1 (this only happens on grayscale and paletted images).
- */
--void /* PRIVATE */
-+static void
- png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
- {
- png_debug(1, "in png_do_pack");
-@@ -270,7 +194,7 @@
- * would pass 3 as bit_depth, and this routine would translate the
- * data to 0 to 15.
- */
--void /* PRIVATE */
-+static void
- png_do_shift(png_row_infop row_info, png_bytep row,
- png_const_color_8p bit_depth)
- {
-@@ -281,7 +205,7 @@
- int shift_start[4], shift_dec[4];
- int channels = 0;
-
-- if (row_info->color_type & PNG_COLOR_MASK_COLOR)
-+ if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- shift_start[channels] = row_info->bit_depth - bit_depth->red;
- shift_dec[channels] = bit_depth->red;
-@@ -303,7 +227,7 @@
- channels++;
- }
-
-- if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-+ if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
- {
- shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
- shift_dec[channels] = bit_depth->alpha;
-@@ -315,7 +239,7 @@
- {
- png_bytep bp = row;
- png_size_t i;
-- png_byte mask;
-+ unsigned int mask;
- png_size_t row_bytes = row_info->rowbytes;
-
- if (bit_depth->gray == 1 && row_info->bit_depth == 2)
-@@ -329,20 +253,22 @@
-
- for (i = 0; i < row_bytes; i++, bp++)
- {
-- png_uint_16 v;
- int j;
-+ unsigned int v, out;
-
- v = *bp;
-- *bp = 0;
-+ out = 0;
-
- for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
- {
- if (j > 0)
-- *bp |= (png_byte)((v << j) & 0xff);
-+ out |= v << j;
-
- else
-- *bp |= (png_byte)((v >> (-j)) & mask);
-+ out |= (v >> (-j)) & mask;
- }
-+
-+ *bp = (png_byte)(out & 0xff);
- }
- }
-
-@@ -355,21 +281,23 @@
- for (i = 0; i < istop; i++, bp++)
- {
-
-- png_uint_16 v;
-+ const unsigned int c = i%channels;
- int j;
-- int c = (int)(i%channels);
-+ unsigned int v, out;
-
- v = *bp;
-- *bp = 0;
-+ out = 0;
-
- for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
- {
- if (j > 0)
-- *bp |= (png_byte)((v << j) & 0xff);
-+ out |= v << j;
-
- else
-- *bp |= (png_byte)((v >> (-j)) & 0xff);
-+ out |= v >> (-j);
- }
-+
-+ *bp = (png_byte)(out & 0xff);
- }
- }
-
-@@ -381,22 +309,22 @@
-
- for (bp = row, i = 0; i < istop; i++)
- {
-- int c = (int)(i%channels);
-- png_uint_16 value, v;
-+ const unsigned int c = i%channels;
- int j;
-+ unsigned int value, v;
-
-- v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
-+ v = png_get_uint_16(bp);
- value = 0;
-
- for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
- {
- if (j > 0)
-- value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
-+ value |= v << j;
-
- else
-- value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
-+ value |= v >> (-j);
- }
-- *bp++ = (png_byte)(value >> 8);
-+ *bp++ = (png_byte)((value >> 8) & 0xff);
- *bp++ = (png_byte)(value & 0xff);
- }
- }
-@@ -405,7 +333,7 @@
- #endif
-
- #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
--void /* PRIVATE */
-+static void
- png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
- {
- png_debug(1, "in png_do_write_swap_alpha");
-@@ -453,7 +381,7 @@
- *(dp++) = save[1];
- }
- }
--#endif /* PNG_WRITE_16BIT_SUPPORTED */
-+#endif /* WRITE_16BIT */
- }
-
- else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-@@ -492,14 +420,14 @@
- *(dp++) = save[1];
- }
- }
--#endif /* PNG_WRITE_16BIT_SUPPORTED */
-+#endif /* WRITE_16BIT */
- }
- }
- }
- #endif
-
- #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
--void /* PRIVATE */
-+static void
- png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
- {
- png_debug(1, "in png_do_write_invert_alpha");
-@@ -549,7 +477,7 @@
- *(dp++) = (png_byte)(255 - *(sp++));
- }
- }
--#endif /* PNG_WRITE_16BIT_SUPPORTED */
-+#endif /* WRITE_16BIT */
- }
-
- else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-@@ -587,75 +515,88 @@
- *(dp++) = (png_byte)(255 - *(sp++));
- }
- }
--#endif /* PNG_WRITE_16BIT_SUPPORTED */
-+#endif /* WRITE_16BIT */
- }
- }
- }
- #endif
--#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
-
--#ifdef PNG_MNG_FEATURES_SUPPORTED
--/* Undoes intrapixel differencing */
-+/* Transform the data according to the user's wishes. The order of
-+ * transformations is significant.
-+ */
- void /* PRIVATE */
--png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
-+png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info)
- {
-- png_debug(1, "in png_do_write_intrapixel");
-+ png_debug(1, "in png_do_write_transformations");
-
-- if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-- {
-- int bytes_per_pixel;
-- png_uint_32 row_width = row_info->width;
-- if (row_info->bit_depth == 8)
-- {
-- png_bytep rp;
-- png_uint_32 i;
-+ if (png_ptr == NULL)
-+ return;
-
-- if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-- bytes_per_pixel = 3;
-+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
-+ if (png_ptr->write_user_transform_fn != NULL)
-+ (*(png_ptr->write_user_transform_fn)) /* User write transform
-+ function */
-+ (png_ptr, /* png_ptr */
-+ row_info, /* row_info: */
-+ /* png_uint_32 width; width of row */
-+ /* png_size_t rowbytes; number of bytes in row */
-+ /* png_byte color_type; color type of pixels */
-+ /* png_byte bit_depth; bit depth of samples */
-+ /* png_byte channels; number of channels (1-4) */
-+ /* png_byte pixel_depth; bits per pixel (depth*channels) */
-+ png_ptr->row_buf + 1); /* start of pixel data for row */
-+#endif
-
-- else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-- bytes_per_pixel = 4;
-+#ifdef PNG_WRITE_FILLER_SUPPORTED
-+ if ((png_ptr->transformations & PNG_FILLER) != 0)
-+ png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-+ !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
-+#endif
-
-- else
-- return;
-+#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-+ png_do_packswap(row_info, png_ptr->row_buf + 1);
-+#endif
-
-- for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-- {
-- *(rp) = (png_byte)((*rp - *(rp + 1)) & 0xff);
-- *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) & 0xff);
-- }
-- }
-+#ifdef PNG_WRITE_PACK_SUPPORTED
-+ if ((png_ptr->transformations & PNG_PACK) != 0)
-+ png_do_pack(row_info, png_ptr->row_buf + 1,
-+ (png_uint_32)png_ptr->bit_depth);
-+#endif
-
--#ifdef PNG_WRITE_16BIT_SUPPORTED
-- else if (row_info->bit_depth == 16)
-- {
-- png_bytep rp;
-- png_uint_32 i;
-+#ifdef PNG_WRITE_SWAP_SUPPORTED
-+# ifdef PNG_16BIT_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
-+ png_do_swap(row_info, png_ptr->row_buf + 1);
-+# endif
-+#endif
-
-- if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-- bytes_per_pixel = 6;
-+#ifdef PNG_WRITE_SHIFT_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
-+ png_do_shift(row_info, png_ptr->row_buf + 1,
-+ &(png_ptr->shift));
-+#endif
-
-- else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-- bytes_per_pixel = 8;
-+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
-+ png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);
-+#endif
-
-- else
-- return;
-+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
-+ png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);
-+#endif
-
-- for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-- {
-- png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1);
-- png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3);
-- png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5);
-- png_uint_32 red = (png_uint_32)((s0 - s1) & 0xffffL);
-- png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
-- *(rp ) = (png_byte)((red >> 8) & 0xff);
-- *(rp + 1) = (png_byte)(red & 0xff);
-- *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-- *(rp + 5) = (png_byte)(blue & 0xff);
-- }
-- }
--#endif /* PNG_WRITE_16BIT_SUPPORTED */
-- }
-+#ifdef PNG_WRITE_BGR_SUPPORTED
-+ if ((png_ptr->transformations & PNG_BGR) != 0)
-+ png_do_bgr(row_info, png_ptr->row_buf + 1);
-+#endif
-+
-+#ifdef PNG_WRITE_INVERT_SUPPORTED
-+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
-+ png_do_invert(row_info, png_ptr->row_buf + 1);
-+#endif
- }
--#endif /* PNG_MNG_FEATURES_SUPPORTED */
--#endif /* PNG_WRITE_SUPPORTED */
-+#endif /* WRITE_TRANSFORMS */
-+#endif /* WRITE */
---- ./jdk/src/share/native/sun/awt/libpng/pngwutil.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/libpng/pngwutil.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,8 +29,8 @@
- * However, the following notice accompanied the original version of this
- * file and, per its terms, should not be removed:
- *
-- * Last changed in libpng 1.5.4 [July 7, 2011]
-- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
-+ * Last changed in libpng 1.6.15 [November 20, 2014]
-+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
-@@ -57,23 +57,6 @@
- buf[3] = (png_byte)(i & 0xff);
- }
-
--#ifdef PNG_SAVE_INT_32_SUPPORTED
--/* The png_save_int_32 function assumes integers are stored in two's
-- * complement format. If this isn't the case, then this routine needs to
-- * be modified to write data in two's complement format. Note that,
-- * the following works correctly even if png_int_32 has more than 32 bits
-- * (compare the more complex code required on read for sign extention.)
-- */
--void PNGAPI
--png_save_int_32(png_bytep buf, png_int_32 i)
--{
-- buf[0] = (png_byte)((i >> 24) & 0xff);
-- buf[1] = (png_byte)((i >> 16) & 0xff);
-- buf[2] = (png_byte)((i >> 8) & 0xff);
-- buf[3] = (png_byte)(i & 0xff);
--}
--#endif
--
- /* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
-@@ -93,7 +76,7 @@
- * bytes have already been written.
- */
- void PNGAPI
--png_write_sig(png_structp png_ptr)
-+png_write_sig(png_structrp png_ptr)
- {
- png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-@@ -110,6 +93,104 @@
- png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
- }
-
-+/* Write the start of a PNG chunk. The type is the chunk type.
-+ * The total_length is the sum of the lengths of all the data you will be
-+ * passing in png_write_chunk_data().
-+ */
-+static void
-+png_write_chunk_header(png_structrp png_ptr, png_uint_32 chunk_name,
-+ png_uint_32 length)
-+{
-+ png_byte buf[8];
-+
-+#if defined(PNG_DEBUG) && (PNG_DEBUG > 0)
-+ PNG_CSTRING_FROM_CHUNK(buf, chunk_name);
-+ png_debug2(0, "Writing %s chunk, length = %lu", buf, (unsigned long)length);
-+#endif
-+
-+ if (png_ptr == NULL)
-+ return;
-+
-+#ifdef PNG_IO_STATE_SUPPORTED
-+ /* Inform the I/O callback that the chunk header is being written.
-+ * PNG_IO_CHUNK_HDR requires a single I/O call.
-+ */
-+ png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_HDR;
-+#endif
-+
-+ /* Write the length and the chunk name */
-+ png_save_uint_32(buf, length);
-+ png_save_uint_32(buf + 4, chunk_name);
-+ png_write_data(png_ptr, buf, 8);
-+
-+ /* Put the chunk name into png_ptr->chunk_name */
-+ png_ptr->chunk_name = chunk_name;
-+
-+ /* Reset the crc and run it over the chunk name */
-+ png_reset_crc(png_ptr);
-+
-+ png_calculate_crc(png_ptr, buf + 4, 4);
-+
-+#ifdef PNG_IO_STATE_SUPPORTED
-+ /* Inform the I/O callback that chunk data will (possibly) be written.
-+ * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.
-+ */
-+ png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_DATA;
-+#endif
-+}
-+
-+void PNGAPI
-+png_write_chunk_start(png_structrp png_ptr, png_const_bytep chunk_string,
-+ png_uint_32 length)
-+{
-+ png_write_chunk_header(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), length);
-+}
-+
-+/* Write the data of a PNG chunk started with png_write_chunk_header().
-+ * Note that multiple calls to this function are allowed, and that the
-+ * sum of the lengths from these calls *must* add up to the total_length
-+ * given to png_write_chunk_header().
-+ */
-+void PNGAPI
-+png_write_chunk_data(png_structrp png_ptr, png_const_bytep data,
-+ png_size_t length)
-+{
-+ /* Write the data, and run the CRC over it */
-+ if (png_ptr == NULL)
-+ return;
-+
-+ if (data != NULL && length > 0)
-+ {
-+ png_write_data(png_ptr, data, length);
-+
-+ /* Update the CRC after writing the data,
-+ * in case the user I/O routine alters it.
-+ */
-+ png_calculate_crc(png_ptr, data, length);
-+ }
-+}
-+
-+/* Finish a chunk started with png_write_chunk_header(). */
-+void PNGAPI
-+png_write_chunk_end(png_structrp png_ptr)
-+{
-+ png_byte buf[4];
-+
-+ if (png_ptr == NULL) return;
-+
-+#ifdef PNG_IO_STATE_SUPPORTED
-+ /* Inform the I/O callback that the chunk CRC is being written.
-+ * PNG_IO_CHUNK_CRC requires a single I/O function call.
-+ */
-+ png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_CRC;
-+#endif
-+
-+ /* Write the crc in a single operation */
-+ png_save_uint_32(buf, png_ptr->crc);
-+
-+ png_write_data(png_ptr, buf, (png_size_t)4);
-+}
-+
- /* Write a PNG chunk all at once. The type is an array of ASCII characters
- * representing the chunk name. The array must be at least 4 bytes in
- * length, and does not need to be null terminated. To be safe, pass the
-@@ -119,569 +200,592 @@
- * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
- * functions instead.
- */
--void PNGAPI
--png_write_chunk(png_structp png_ptr, png_const_bytep chunk_name,
-+static void
-+png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name,
- png_const_bytep data, png_size_t length)
- {
- if (png_ptr == NULL)
- return;
-
-- png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
-- png_write_chunk_data(png_ptr, data, (png_size_t)length);
-+ /* On 64 bit architectures 'length' may not fit in a png_uint_32. */
-+ if (length > PNG_UINT_31_MAX)
-+ png_error(png_ptr, "length exceeds PNG maximum");
-+
-+ png_write_chunk_header(png_ptr, chunk_name, (png_uint_32)length);
-+ png_write_chunk_data(png_ptr, data, length);
- png_write_chunk_end(png_ptr);
- }
-
--/* Write the start of a PNG chunk. The type is the chunk type.
-- * The total_length is the sum of the lengths of all the data you will be
-- * passing in png_write_chunk_data().
-+/* This is the API that calls the internal function above. */
-+void PNGAPI
-+png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string,
-+ png_const_bytep data, png_size_t length)
-+{
-+ png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,
-+ length);
-+}
-+
-+/* This is used below to find the size of an image to pass to png_deflate_claim,
-+ * so it only needs to be accurate if the size is less than 16384 bytes (the
-+ * point at which a lower LZ window size can be used.)
- */
--void PNGAPI
--png_write_chunk_start(png_structp png_ptr, png_const_bytep chunk_name,
-- png_uint_32 length)
-+static png_alloc_size_t
-+png_image_size(png_structrp png_ptr)
- {
-- png_byte buf[8];
--
-- png_debug2(0, "Writing %s chunk, length = %lu", chunk_name,
-- (unsigned long)length);
--
-- if (png_ptr == NULL)
-- return;
--
--#ifdef PNG_IO_STATE_SUPPORTED
-- /* Inform the I/O callback that the chunk header is being written.
-- * PNG_IO_CHUNK_HDR requires a single I/O call.
-+ /* Only return sizes up to the maximum of a png_uint_32; do this by limiting
-+ * the width and height used to 15 bits.
- */
-- png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_HDR;
--#endif
--
-- /* Write the length and the chunk name */
-- png_save_uint_32(buf, length);
-- png_memcpy(buf + 4, chunk_name, 4);
-- png_write_data(png_ptr, buf, (png_size_t)8);
--
-- /* Put the chunk name into png_ptr->chunk_name */
-- png_memcpy(png_ptr->chunk_name, chunk_name, 4);
--
-- /* Reset the crc and run it over the chunk name */
-- png_reset_crc(png_ptr);
--
-- png_calculate_crc(png_ptr, chunk_name, 4);
--
--#ifdef PNG_IO_STATE_SUPPORTED
-- /* Inform the I/O callback that chunk data will (possibly) be written.
-- * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.
-+ png_uint_32 h = png_ptr->height;
-+
-+ if (png_ptr->rowbytes < 32768 && h < 32768)
-+ {
-+ if (png_ptr->interlaced != 0)
-+ {
-+ /* Interlacing makes the image larger because of the replication of
-+ * both the filter byte and the padding to a byte boundary.
-+ */
-+ png_uint_32 w = png_ptr->width;
-+ unsigned int pd = png_ptr->pixel_depth;
-+ png_alloc_size_t cb_base;
-+ int pass;
-+
-+ for (cb_base=0, pass=0; pass<=6; ++pass)
-+ {
-+ png_uint_32 pw = PNG_PASS_COLS(w, pass);
-+
-+ if (pw > 0)
-+ cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass);
-+ }
-+
-+ return cb_base;
-+ }
-+
-+ else
-+ return (png_ptr->rowbytes+1) * h;
-+ }
-+
-+ else
-+ return 0xffffffffU;
-+}
-+
-+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-+ /* This is the code to hack the first two bytes of the deflate stream (the
-+ * deflate header) to correct the windowBits value to match the actual data
-+ * size. Note that the second argument is the *uncompressed* size but the
-+ * first argument is the *compressed* data (and it must be deflate
-+ * compressed.)
- */
-- png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_DATA;
--#endif
--}
--
--/* Write the data of a PNG chunk started with png_write_chunk_start().
-- * Note that multiple calls to this function are allowed, and that the
-- * sum of the lengths from these calls *must* add up to the total_length
-- * given to png_write_chunk_start().
-- */
--void PNGAPI
--png_write_chunk_data(png_structp png_ptr, png_const_bytep data,
-- png_size_t length)
-+static void
-+optimize_cmf(png_bytep data, png_alloc_size_t data_size)
- {
-- /* Write the data, and run the CRC over it */
-- if (png_ptr == NULL)
-- return;
--
-- if (data != NULL && length > 0)
-+ /* Optimize the CMF field in the zlib stream. The resultant zlib stream is
-+ * still compliant to the stream specification.
-+ */
-+ if (data_size <= 16384) /* else windowBits must be 15 */
- {
-- png_write_data(png_ptr, data, length);
--
-- /* Update the CRC after writing the data,
-- * in case that the user I/O routine alters it.
-- */
-- png_calculate_crc(png_ptr, data, length);
-+ unsigned int z_cmf = data[0]; /* zlib compression method and flags */
-+
-+ if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-+ {
-+ unsigned int z_cinfo;
-+ unsigned int half_z_window_size;
-+
-+ z_cinfo = z_cmf >> 4;
-+ half_z_window_size = 1U << (z_cinfo + 7);
-+
-+ if (data_size <= half_z_window_size) /* else no change */
-+ {
-+ unsigned int tmp;
-+
-+ do
-+ {
-+ half_z_window_size >>= 1;
-+ --z_cinfo;
-+ }
-+ while (z_cinfo > 0 && data_size <= half_z_window_size);
-+
-+ z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
-+
-+ data[0] = (png_byte)z_cmf;
-+ tmp = data[1] & 0xe0;
-+ tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-+ data[1] = (png_byte)tmp;
-+ }
-+ }
- }
- }
--
--/* Finish a chunk started with png_write_chunk_start(). */
--void PNGAPI
--png_write_chunk_end(png_structp png_ptr)
-+#endif /* WRITE_OPTIMIZE_CMF */
-+
-+/* Initialize the compressor for the appropriate type of compression. */
-+static int
-+png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
-+ png_alloc_size_t data_size)
- {
-- png_byte buf[4];
--
-- if (png_ptr == NULL) return;
--
--#ifdef PNG_IO_STATE_SUPPORTED
-- /* Inform the I/O callback that the chunk CRC is being written.
-- * PNG_IO_CHUNK_CRC requires a single I/O function call.
-- */
-- png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_CRC;
-+ if (png_ptr->zowner != 0)
-+ {
-+#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
-+ char msg[64];
-+
-+ PNG_STRING_FROM_CHUNK(msg, owner);
-+ msg[4] = ':';
-+ msg[5] = ' ';
-+ PNG_STRING_FROM_CHUNK(msg+6, png_ptr->zowner);
-+ /* So the message that results is "<chunk> using zstream"; this is an
-+ * internal error, but is very useful for debugging. i18n requirements
-+ * are minimal.
-+ */
-+ (void)png_safecat(msg, (sizeof msg), 10, " using zstream");
- #endif
--
-- /* Write the crc in a single operation */
-- png_save_uint_32(buf, png_ptr->crc);
--
-- png_write_data(png_ptr, buf, (png_size_t)4);
--}
--
--/* Initialize the compressor for the appropriate type of compression. */
--static void
--png_zlib_claim(png_structp png_ptr, png_uint_32 state)
--{
-- if (!(png_ptr->zlib_state & PNG_ZLIB_IN_USE))
-+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
-+ png_warning(png_ptr, msg);
-+
-+ /* Attempt sane error recovery */
-+ if (png_ptr->zowner == png_IDAT) /* don't steal from IDAT */
-+ {
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("in use by IDAT");
-+ return Z_STREAM_ERROR;
-+ }
-+
-+ png_ptr->zowner = 0;
-+#else
-+ png_error(png_ptr, msg);
-+#endif
-+ }
-+
- {
-- /* If already initialized for 'state' do not re-init. */
-- if (png_ptr->zlib_state != state)
-+ int level = png_ptr->zlib_level;
-+ int method = png_ptr->zlib_method;
-+ int windowBits = png_ptr->zlib_window_bits;
-+ int memLevel = png_ptr->zlib_mem_level;
-+ int strategy; /* set below */
-+ int ret; /* zlib return code */
-+
-+ if (owner == png_IDAT)
- {
-- int ret = Z_OK;
-- png_const_charp who = "-";
--
-- /* If actually initialized for another state do a deflateEnd. */
-- if (png_ptr->zlib_state != PNG_ZLIB_UNINITIALIZED)
-+ if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0)
-+ strategy = png_ptr->zlib_strategy;
-+
-+ else if (png_ptr->do_filter != PNG_FILTER_NONE)
-+ strategy = PNG_Z_DEFAULT_STRATEGY;
-+
-+ else
-+ strategy = PNG_Z_DEFAULT_NOFILTER_STRATEGY;
-+ }
-+
-+ else
-+ {
-+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-+ level = png_ptr->zlib_text_level;
-+ method = png_ptr->zlib_text_method;
-+ windowBits = png_ptr->zlib_text_window_bits;
-+ memLevel = png_ptr->zlib_text_mem_level;
-+ strategy = png_ptr->zlib_text_strategy;
-+#else
-+ /* If customization is not supported the values all come from the
-+ * IDAT values except for the strategy, which is fixed to the
-+ * default. (This is the pre-1.6.0 behavior too, although it was
-+ * implemented in a very different way.)
-+ */
-+ strategy = Z_DEFAULT_STRATEGY;
-+#endif
-+ }
-+
-+ /* Adjust 'windowBits' down if larger than 'data_size'; to stop this
-+ * happening just pass 32768 as the data_size parameter. Notice that zlib
-+ * requires an extra 262 bytes in the window in addition to the data to be
-+ * able to see the whole of the data, so if data_size+262 takes us to the
-+ * next windowBits size we need to fix up the value later. (Because even
-+ * though deflate needs the extra window, inflate does not!)
-+ */
-+ if (data_size <= 16384)
-+ {
-+ /* IMPLEMENTATION NOTE: this 'half_window_size' stuff is only here to
-+ * work round a Microsoft Visual C misbehavior which, contrary to C-90,
-+ * widens the result of the following shift to 64-bits if (and,
-+ * apparently, only if) it is used in a test.
-+ */
-+ unsigned int half_window_size = 1U << (windowBits-1);
-+
-+ while (data_size + 262 <= half_window_size)
- {
-- ret = deflateEnd(&png_ptr->zstream);
-- who = "end";
-- png_ptr->zlib_state = PNG_ZLIB_UNINITIALIZED;
-- }
--
-- /* zlib itself detects an incomplete state on deflateEnd */
-- if (ret == Z_OK) switch (state)
-- {
--# ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-- case PNG_ZLIB_FOR_TEXT:
-- ret = deflateInit2(&png_ptr->zstream,
-- png_ptr->zlib_text_level, png_ptr->zlib_text_method,
-- png_ptr->zlib_text_window_bits,
-- png_ptr->zlib_text_mem_level, png_ptr->zlib_text_strategy);
-- who = "text";
-- break;
--# endif
--
-- case PNG_ZLIB_FOR_IDAT:
-- ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
-- png_ptr->zlib_method, png_ptr->zlib_window_bits,
-- png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
-- who = "IDAT";
-- break;
--
-- default:
-- png_error(png_ptr, "invalid zlib state");
-- }
--
-- if (ret == Z_OK)
-- png_ptr->zlib_state = state;
--
-- else /* an error in deflateEnd or deflateInit2 */
-- {
-- size_t pos = 0;
-- char msg[64];
--
-- pos = png_safecat(msg, sizeof msg, pos,
-- "zlib failed to initialize compressor (");
-- pos = png_safecat(msg, sizeof msg, pos, who);
--
-- switch (ret)
-- {
-- case Z_VERSION_ERROR:
-- pos = png_safecat(msg, sizeof msg, pos, ") version error");
-- break;
--
-- case Z_STREAM_ERROR:
-- pos = png_safecat(msg, sizeof msg, pos, ") stream error");
-- break;
--
-- case Z_MEM_ERROR:
-- pos = png_safecat(msg, sizeof msg, pos, ") memory error");
-- break;
--
-- default:
-- pos = png_safecat(msg, sizeof msg, pos, ") unknown error");
-- break;
-- }
--
-- png_error(png_ptr, msg);
-+ half_window_size >>= 1;
-+ --windowBits;
- }
- }
-
-- /* Here on success, claim the zstream: */
-- png_ptr->zlib_state |= PNG_ZLIB_IN_USE;
-+ /* Check against the previous initialized values, if any. */
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0 &&
-+ (png_ptr->zlib_set_level != level ||
-+ png_ptr->zlib_set_method != method ||
-+ png_ptr->zlib_set_window_bits != windowBits ||
-+ png_ptr->zlib_set_mem_level != memLevel ||
-+ png_ptr->zlib_set_strategy != strategy))
-+ {
-+ if (deflateEnd(&png_ptr->zstream) != Z_OK)
-+ png_warning(png_ptr, "deflateEnd failed (ignored)");
-+
-+ png_ptr->flags &= ~PNG_FLAG_ZSTREAM_INITIALIZED;
-+ }
-+
-+ /* For safety clear out the input and output pointers (currently zlib
-+ * doesn't use them on Init, but it might in the future).
-+ */
-+ png_ptr->zstream.next_in = NULL;
-+ png_ptr->zstream.avail_in = 0;
-+ png_ptr->zstream.next_out = NULL;
-+ png_ptr->zstream.avail_out = 0;
-+
-+ /* Now initialize if required, setting the new parameters, otherwise just
-+ * to a simple reset to the previous parameters.
-+ */
-+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
-+ ret = deflateReset(&png_ptr->zstream);
-+
-+ else
-+ {
-+ ret = deflateInit2(&png_ptr->zstream, level, method, windowBits,
-+ memLevel, strategy);
-+
-+ if (ret == Z_OK)
-+ png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
-+ }
-+
-+ /* The return code is from either deflateReset or deflateInit2; they have
-+ * pretty much the same set of error codes.
-+ */
-+ if (ret == Z_OK)
-+ png_ptr->zowner = owner;
-+
-+ else
-+ png_zstream_error(png_ptr, ret);
-+
-+ return ret;
- }
--
-- else
-- png_error(png_ptr, "zstream already in use (internal error)");
- }
-
--/* The opposite: release the stream. It is also reset, this API will warn on
-- * error but will not fail.
-- */
--static void
--png_zlib_release(png_structp png_ptr)
-+/* Clean up (or trim) a linked list of compression buffers. */
-+void /* PRIVATE */
-+png_free_buffer_list(png_structrp png_ptr, png_compression_bufferp *listp)
- {
-- if (png_ptr->zlib_state & PNG_ZLIB_IN_USE)
-+ png_compression_bufferp list = *listp;
-+
-+ if (list != NULL)
- {
-- int ret = deflateReset(&png_ptr->zstream);
--
-- png_ptr->zlib_state &= ~PNG_ZLIB_IN_USE;
--
-- if (ret != Z_OK)
-+ *listp = NULL;
-+
-+ do
- {
-- png_const_charp err;
-- PNG_WARNING_PARAMETERS(p)
--
-- switch (ret)
-- {
-- case Z_VERSION_ERROR:
-- err = "version";
-- break;
--
-- case Z_STREAM_ERROR:
-- err = "stream";
-- break;
--
-- case Z_MEM_ERROR:
-- err = "memory";
-- break;
--
-- default:
-- err = "unknown";
-- break;
-- }
--
-- png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, ret);
-- png_warning_parameter(p, 2, err);
--
-- if (png_ptr->zstream.msg)
-- err = png_ptr->zstream.msg;
-- else
-- err = "[no zlib message]";
--
-- png_warning_parameter(p, 3, err);
--
-- png_formatted_warning(png_ptr, p,
-- "zlib failed to reset compressor: @1(@2): @3");
-+ png_compression_bufferp next = list->next;
-+
-+ png_free(png_ptr, list);
-+ list = next;
- }
-+ while (list != NULL);
- }
--
-- else
-- png_warning(png_ptr, "zstream not in use (internal error)");
- }
-
- #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
- /* This pair of functions encapsulates the operation of (a) compressing a
- * text string, and (b) issuing it later as a series of chunk data writes.
- * The compression_state structure is shared context for these functions
-- * set up by the caller in order to make the whole mess thread-safe.
-+ * set up by the caller to allow access to the relevant local variables.
-+ *
-+ * compression_buffer (new in 1.6.0) is just a linked list of zbuffer_size
-+ * temporary buffers. From 1.6.0 it is retained in png_struct so that it will
-+ * be correctly freed in the event of a write error (previous implementations
-+ * just leaked memory.)
- */
--
- typedef struct
- {
-- png_const_bytep input; /* The uncompressed input data */
-- png_size_t input_len; /* Its length */
-- int num_output_ptr; /* Number of output pointers used */
-- int max_output_ptr; /* Size of output_ptr */
-- png_bytep *output_ptr; /* Array of pointers to output */
-+ png_const_bytep input; /* The uncompressed input data */
-+ png_alloc_size_t input_len; /* Its length */
-+ png_uint_32 output_len; /* Final compressed length */
-+ png_byte output[1024]; /* First block of output */
- } compression_state;
-
--/* Compress given text into storage in the png_ptr structure */
--static int /* PRIVATE */
--png_text_compress(png_structp png_ptr,
-- png_const_charp text, png_size_t text_len, int compression,
-- compression_state *comp)
-+static void
-+png_text_compress_init(compression_state *comp, png_const_bytep input,
-+ png_alloc_size_t input_len)
-+{
-+ comp->input = input;
-+ comp->input_len = input_len;
-+ comp->output_len = 0;
-+}
-+
-+/* Compress the data in the compression state input */
-+static int
-+png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name,
-+ compression_state *comp, png_uint_32 prefix_len)
- {
- int ret;
-
-- comp->num_output_ptr = 0;
-- comp->max_output_ptr = 0;
-- comp->output_ptr = NULL;
-- comp->input = NULL;
-- comp->input_len = text_len;
--
-- /* We may just want to pass the text right through */
-- if (compression == PNG_TEXT_COMPRESSION_NONE)
-+ /* To find the length of the output it is necessary to first compress the
-+ * input. The result is buffered rather than using the two-pass algorithm
-+ * that is used on the inflate side; deflate is assumed to be slower and a
-+ * PNG writer is assumed to have more memory available than a PNG reader.
-+ *
-+ * IMPLEMENTATION NOTE: the zlib API deflateBound() can be used to find an
-+ * upper limit on the output size, but it is always bigger than the input
-+ * size so it is likely to be more efficient to use this linked-list
-+ * approach.
-+ */
-+ ret = png_deflate_claim(png_ptr, chunk_name, comp->input_len);
-+
-+ if (ret != Z_OK)
-+ return ret;
-+
-+ /* Set up the compression buffers, we need a loop here to avoid overflowing a
-+ * uInt. Use ZLIB_IO_MAX to limit the input. The output is always limited
-+ * by the output buffer size, so there is no need to check that. Since this
-+ * is ANSI-C we know that an 'int', hence a uInt, is always at least 16 bits
-+ * in size.
-+ */
- {
-- comp->input = (png_const_bytep)text;
-- return((int)text_len);
-+ png_compression_bufferp *end = &png_ptr->zbuffer_list;
-+ png_alloc_size_t input_len = comp->input_len; /* may be zero! */
-+ png_uint_32 output_len;
-+
-+ /* zlib updates these for us: */
-+ png_ptr->zstream.next_in = PNGZ_INPUT_CAST(comp->input);
-+ png_ptr->zstream.avail_in = 0; /* Set below */
-+ png_ptr->zstream.next_out = comp->output;
-+ png_ptr->zstream.avail_out = (sizeof comp->output);
-+
-+ output_len = png_ptr->zstream.avail_out;
-+
-+ do
-+ {
-+ uInt avail_in = ZLIB_IO_MAX;
-+
-+ if (avail_in > input_len)
-+ avail_in = (uInt)input_len;
-+
-+ input_len -= avail_in;
-+
-+ png_ptr->zstream.avail_in = avail_in;
-+
-+ if (png_ptr->zstream.avail_out == 0)
-+ {
-+ png_compression_buffer *next;
-+
-+ /* Chunk data is limited to 2^31 bytes in length, so the prefix
-+ * length must be counted here.
-+ */
-+ if (output_len + prefix_len > PNG_UINT_31_MAX)
-+ {
-+ ret = Z_MEM_ERROR;
-+ break;
-+ }
-+
-+ /* Need a new (malloc'ed) buffer, but there may be one present
-+ * already.
-+ */
-+ next = *end;
-+ if (next == NULL)
-+ {
-+ next = png_voidcast(png_compression_bufferp, png_malloc_base
-+ (png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
-+
-+ if (next == NULL)
-+ {
-+ ret = Z_MEM_ERROR;
-+ break;
-+ }
-+
-+ /* Link in this buffer (so that it will be freed later) */
-+ next->next = NULL;
-+ *end = next;
-+ }
-+
-+ png_ptr->zstream.next_out = next->output;
-+ png_ptr->zstream.avail_out = png_ptr->zbuffer_size;
-+ output_len += png_ptr->zstream.avail_out;
-+
-+ /* Move 'end' to the next buffer pointer. */
-+ end = &next->next;
-+ }
-+
-+ /* Compress the data */
-+ ret = deflate(&png_ptr->zstream,
-+ input_len > 0 ? Z_NO_FLUSH : Z_FINISH);
-+
-+ /* Claw back input data that was not consumed (because avail_in is
-+ * reset above every time round the loop).
-+ */
-+ input_len += png_ptr->zstream.avail_in;
-+ png_ptr->zstream.avail_in = 0; /* safety */
-+ }
-+ while (ret == Z_OK);
-+
-+ /* There may be some space left in the last output buffer. This needs to
-+ * be subtracted from output_len.
-+ */
-+ output_len -= png_ptr->zstream.avail_out;
-+ png_ptr->zstream.avail_out = 0; /* safety */
-+ comp->output_len = output_len;
-+
-+ /* Now double check the output length, put in a custom message if it is
-+ * too long. Otherwise ensure the z_stream::msg pointer is set to
-+ * something.
-+ */
-+ if (output_len + prefix_len >= PNG_UINT_31_MAX)
-+ {
-+ png_ptr->zstream.msg = PNGZ_MSG_CAST("compressed data too long");
-+ ret = Z_MEM_ERROR;
-+ }
-+
-+ else
-+ png_zstream_error(png_ptr, ret);
-+
-+ /* Reset zlib for another zTXt/iTXt or image data */
-+ png_ptr->zowner = 0;
-+
-+ /* The only success case is Z_STREAM_END, input_len must be 0; if not this
-+ * is an internal error.
-+ */
-+ if (ret == Z_STREAM_END && input_len == 0)
-+ {
-+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-+ /* Fix up the deflate header, if required */
-+ optimize_cmf(comp->output, comp->input_len);
-+#endif
-+ /* But Z_OK is returned, not Z_STREAM_END; this allows the claim
-+ * function above to return Z_STREAM_END on an error (though it never
-+ * does in the current versions of zlib.)
-+ */
-+ return Z_OK;
-+ }
-+
-+ else
-+ return ret;
- }
--
-- if (compression >= PNG_TEXT_COMPRESSION_LAST)
-+}
-+
-+/* Ship the compressed text out via chunk writes */
-+static void
-+png_write_compressed_data_out(png_structrp png_ptr, compression_state *comp)
-+{
-+ png_uint_32 output_len = comp->output_len;
-+ png_const_bytep output = comp->output;
-+ png_uint_32 avail = (sizeof comp->output);
-+ png_compression_buffer *next = png_ptr->zbuffer_list;
-+
-+ for (;;)
-+ {
-+ if (avail > output_len)
-+ avail = output_len;
-+
-+ png_write_chunk_data(png_ptr, output, avail);
-+
-+ output_len -= avail;
-+
-+ if (output_len == 0 || next == NULL)
-+ break;
-+
-+ avail = png_ptr->zbuffer_size;
-+ output = next->output;
-+ next = next->next;
-+ }
-+
-+ /* This is an internal error; 'next' must have been NULL! */
-+ if (output_len > 0)
-+ png_error(png_ptr, "error writing ancillary chunked compressed data");
-+}
-+#endif /* WRITE_COMPRESSED_TEXT */
-+
-+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-+ defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
-+ * and if invalid, correct the keyword rather than discarding the entire
-+ * chunk. The PNG 1.0 specification requires keywords 1-79 characters in
-+ * length, forbids leading or trailing whitespace, multiple internal spaces,
-+ * and the non-break space (0x80) from ISO 8859-1. Returns keyword length.
-+ *
-+ * The 'new_key' buffer must be 80 characters in size (for the keyword plus a
-+ * trailing '\0'). If this routine returns 0 then there was no keyword, or a
-+ * valid one could not be generated, and the caller must png_error.
-+ */
-+static png_uint_32
-+png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
-+{
-+ png_const_charp orig_key = key;
-+ png_uint_32 key_len = 0;
-+ int bad_character = 0;
-+ int space = 1;
-+
-+ png_debug(1, "in png_check_keyword");
-+
-+ if (key == NULL)
-+ {
-+ *new_key = 0;
-+ return 0;
-+ }
-+
-+ while (*key && key_len < 79)
-+ {
-+ png_byte ch = (png_byte)(0xff & *key++);
-+
-+ if ((ch > 32 && ch <= 126) || (ch >= 161 /*&& ch <= 255*/))
-+ *new_key++ = ch, ++key_len, space = 0;
-+
-+ else if (space == 0)
-+ {
-+ /* A space or an invalid character when one wasn't seen immediately
-+ * before; output just a space.
-+ */
-+ *new_key++ = 32, ++key_len, space = 1;
-+
-+ /* If the character was not a space then it is invalid. */
-+ if (ch != 32)
-+ bad_character = ch;
-+ }
-+
-+ else if (bad_character == 0)
-+ bad_character = ch; /* just skip it, record the first error */
-+ }
-+
-+ if (key_len > 0 && space != 0) /* trailing space */
-+ {
-+ --key_len, --new_key;
-+ if (bad_character == 0)
-+ bad_character = 32;
-+ }
-+
-+ /* Terminate the keyword */
-+ *new_key = 0;
-+
-+ if (key_len == 0)
-+ return 0;
-+
-+#ifdef PNG_WARNINGS_SUPPORTED
-+ /* Try to only output one warning per keyword: */
-+ if (*key != 0) /* keyword too long */
-+ png_warning(png_ptr, "keyword truncated");
-+
-+ else if (bad_character != 0)
- {
- PNG_WARNING_PARAMETERS(p)
-
-- png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d,
-- compression);
-- png_formatted_warning(png_ptr, p, "Unknown compression type @1");
-+ png_warning_parameter(p, 1, orig_key);
-+ png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_02x, bad_character);
-+
-+ png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x@2'");
- }
--
-- /* We can't write the chunk until we find out how much data we have,
-- * which means we need to run the compressor first and save the
-- * output. This shouldn't be a problem, as the vast majority of
-- * comments should be reasonable, but we will set up an array of
-- * malloc'd pointers to be sure.
-- *
-- * If we knew the application was well behaved, we could simplify this
-- * greatly by assuming we can always malloc an output buffer large
-- * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
-- * and malloc this directly. The only time this would be a bad idea is
-- * if we can't malloc more than 64K and we have 64K of random input
-- * data, or if the input string is incredibly large (although this
-- * wouldn't cause a failure, just a slowdown due to swapping).
-- */
-- png_zlib_claim(png_ptr, PNG_ZLIB_FOR_TEXT);
--
-- /* Set up the compression buffers */
-- /* TODO: the following cast hides a potential overflow problem. */
-- png_ptr->zstream.avail_in = (uInt)text_len;
--
-- /* NOTE: assume zlib doesn't overwrite the input */
-- png_ptr->zstream.next_in = (Bytef *)text;
-- png_ptr->zstream.avail_out = png_ptr->zbuf_size;
-- png_ptr->zstream.next_out = png_ptr->zbuf;
--
-- /* This is the same compression loop as in png_write_row() */
-- do
-- {
-- /* Compress the data */
-- ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
--
-- if (ret != Z_OK)
-- {
-- /* Error */
-- if (png_ptr->zstream.msg != NULL)
-- png_error(png_ptr, png_ptr->zstream.msg);
--
-- else
-- png_error(png_ptr, "zlib error");
-- }
--
-- /* Check to see if we need more room */
-- if (!(png_ptr->zstream.avail_out))
-- {
-- /* Make sure the output array has room */
-- if (comp->num_output_ptr >= comp->max_output_ptr)
-- {
-- int old_max;
--
-- old_max = comp->max_output_ptr;
-- comp->max_output_ptr = comp->num_output_ptr + 4;
-- if (comp->output_ptr != NULL)
-- {
-- png_bytepp old_ptr;
--
-- old_ptr = comp->output_ptr;
--
-- comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-- (png_alloc_size_t)
-- (comp->max_output_ptr * png_sizeof(png_charpp)));
--
-- png_memcpy(comp->output_ptr, old_ptr, old_max
-- * png_sizeof(png_charp));
--
-- png_free(png_ptr, old_ptr);
-- }
-- else
-- comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-- (png_alloc_size_t)
-- (comp->max_output_ptr * png_sizeof(png_charp)));
-- }
--
-- /* Save the data */
-- comp->output_ptr[comp->num_output_ptr] =
-- (png_bytep)png_malloc(png_ptr,
-- (png_alloc_size_t)png_ptr->zbuf_size);
--
-- png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-- png_ptr->zbuf_size);
--
-- comp->num_output_ptr++;
--
-- /* and reset the buffer */
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- }
-- /* Continue until we don't have any more to compress */
-- } while (png_ptr->zstream.avail_in);
--
-- /* Finish the compression */
-- do
-- {
-- /* Tell zlib we are finished */
-- ret = deflate(&png_ptr->zstream, Z_FINISH);
--
-- if (ret == Z_OK)
-- {
-- /* Check to see if we need more room */
-- if (!(png_ptr->zstream.avail_out))
-- {
-- /* Check to make sure our output array has room */
-- if (comp->num_output_ptr >= comp->max_output_ptr)
-- {
-- int old_max;
--
-- old_max = comp->max_output_ptr;
-- comp->max_output_ptr = comp->num_output_ptr + 4;
-- if (comp->output_ptr != NULL)
-- {
-- png_bytepp old_ptr;
--
-- old_ptr = comp->output_ptr;
--
-- /* This could be optimized to realloc() */
-- comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-- (png_alloc_size_t)(comp->max_output_ptr *
-- png_sizeof(png_charp)));
--
-- png_memcpy(comp->output_ptr, old_ptr,
-- old_max * png_sizeof(png_charp));
--
-- png_free(png_ptr, old_ptr);
-- }
--
-- else
-- comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-- (png_alloc_size_t)(comp->max_output_ptr *
-- png_sizeof(png_charp)));
-- }
--
-- /* Save the data */
-- comp->output_ptr[comp->num_output_ptr] =
-- (png_bytep)png_malloc(png_ptr,
-- (png_alloc_size_t)png_ptr->zbuf_size);
--
-- png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-- png_ptr->zbuf_size);
--
-- comp->num_output_ptr++;
--
-- /* and reset the buffer pointers */
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- }
-- }
-- else if (ret != Z_STREAM_END)
-- {
-- /* We got an error */
-- if (png_ptr->zstream.msg != NULL)
-- png_error(png_ptr, png_ptr->zstream.msg);
--
-- else
-- png_error(png_ptr, "zlib error");
-- }
-- } while (ret != Z_STREAM_END);
--
-- /* Text length is number of buffers plus last buffer */
-- text_len = png_ptr->zbuf_size * comp->num_output_ptr;
--
-- if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-- text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
--
-- return((int)text_len);
-+#endif /* WARNINGS */
-+
-+ return key_len;
- }
--
--/* Ship the compressed text out via chunk writes */
--static void /* PRIVATE */
--png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
--{
-- int i;
--
-- /* Handle the no-compression case */
-- if (comp->input)
-- {
-- png_write_chunk_data(png_ptr, comp->input, comp->input_len);
--
-- return;
-- }
--
--#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-- if (comp->input_len >= 2 && comp->input_len < 16384)
-- {
-- unsigned int z_cmf; /* zlib compression method and flags */
--
-- /* Optimize the CMF field in the zlib stream. This hack of the zlib
-- * stream is compliant to the stream specification.
-- */
--
-- if (comp->num_output_ptr)
-- z_cmf = comp->output_ptr[0][0];
-- else
-- z_cmf = png_ptr->zbuf[0];
--
-- if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-- {
-- unsigned int z_cinfo;
-- unsigned int half_z_window_size;
-- png_size_t uncompressed_text_size = comp->input_len;
--
-- z_cinfo = z_cmf >> 4;
-- half_z_window_size = 1 << (z_cinfo + 7);
--
-- while (uncompressed_text_size <= half_z_window_size &&
-- half_z_window_size >= 256)
-- {
-- z_cinfo--;
-- half_z_window_size >>= 1;
-- }
--
-- z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
--
-- if (comp->num_output_ptr)
-- {
--
-- if (comp->output_ptr[0][0] != z_cmf)
-- {
-- int tmp;
--
-- comp->output_ptr[0][0] = (png_byte)z_cmf;
-- tmp = comp->output_ptr[0][1] & 0xe0;
-- tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-- comp->output_ptr[0][1] = (png_byte)tmp;
-- }
-- }
-- else
-- {
-- int tmp;
--
-- png_ptr->zbuf[0] = (png_byte)z_cmf;
-- tmp = png_ptr->zbuf[1] & 0xe0;
-- tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-- png_ptr->zbuf[1] = (png_byte)tmp;
-- }
-- }
--
-- else
-- png_error(png_ptr,
-- "Invalid zlib compression method or flags in non-IDAT chunk");
-- }
--#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
--
-- /* Write saved output buffers, if any */
-- for (i = 0; i < comp->num_output_ptr; i++)
-- {
-- png_write_chunk_data(png_ptr, comp->output_ptr[i],
-- (png_size_t)png_ptr->zbuf_size);
--
-- png_free(png_ptr, comp->output_ptr[i]);
-- }
--
-- if (comp->max_output_ptr != 0)
-- png_free(png_ptr, comp->output_ptr);
--
-- /* Write anything left in zbuf */
-- if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
-- png_write_chunk_data(png_ptr, png_ptr->zbuf,
-- (png_size_t)(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
--
-- /* Reset zlib for another zTXt/iTXt or image data */
-- png_zlib_release(png_ptr);
--}
--#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
-+#endif /* WRITE_TEXT || WRITE_pCAL || WRITE_iCCP || WRITE_sPLT */
-
- /* Write the IHDR chunk, and update the png_struct with the necessary
- * information. Note that the rest of this code depends upon this
- * information being correct.
- */
- void /* PRIVATE */
--png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
-+png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
- int bit_depth, int color_type, int compression_type, int filter_type,
- int interlace_type)
- {
-- PNG_IHDR;
--
- png_byte buf[13]; /* Buffer to store the IHDR info */
-
- png_debug(1, "in png_write_IHDR");
-@@ -772,8 +876,8 @@
- */
- if (
- #ifdef PNG_MNG_FEATURES_SUPPORTED
-- !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-- ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
-+ !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
-+ ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
- (color_type == PNG_COLOR_TYPE_RGB ||
- color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
- (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
-@@ -823,14 +927,9 @@
- buf[12] = (png_byte)interlace_type;
-
- /* Write the chunk */
-- png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
--
-- /* Initialize zlib with PNG info */
-- png_ptr->zstream.zalloc = png_zalloc;
-- png_ptr->zstream.zfree = png_zfree;
-- png_ptr->zstream.opaque = (voidpf)png_ptr;
--
-- if (!(png_ptr->do_filter))
-+ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
-+
-+ if ((png_ptr->do_filter) == PNG_NO_FILTERS)
- {
- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
- png_ptr->bit_depth < 8)
-@@ -840,55 +939,6 @@
- png_ptr->do_filter = PNG_ALL_FILTERS;
- }
-
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
-- {
-- if (png_ptr->do_filter != PNG_FILTER_NONE)
-- png_ptr->zlib_strategy = Z_FILTERED;
--
-- else
-- png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
-- }
--
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
-- png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
-- png_ptr->zlib_mem_level = 8;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
-- png_ptr->zlib_window_bits = 15;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
-- png_ptr->zlib_method = 8;
--
--#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
--#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-- if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_STRATEGY))
-- png_ptr->zlib_text_strategy = Z_DEFAULT_STRATEGY;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_LEVEL))
-- png_ptr->zlib_text_level = png_ptr->zlib_level;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL))
-- png_ptr->zlib_text_mem_level = png_ptr->zlib_mem_level;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS))
-- png_ptr->zlib_text_window_bits = png_ptr->zlib_window_bits;
--
-- if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_METHOD))
-- png_ptr->zlib_text_method = png_ptr->zlib_method;
--#else
-- png_ptr->zlib_text_strategy = Z_DEFAULT_STRATEGY;
-- png_ptr->zlib_text_level = png_ptr->zlib_level;
-- png_ptr->zlib_text_mem_level = png_ptr->zlib_mem_level;
-- png_ptr->zlib_text_window_bits = png_ptr->zlib_window_bits;
-- png_ptr->zlib_text_method = png_ptr->zlib_method;
--#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
--#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
--
-- /* Record that the compressor has not yet been initialized. */
-- png_ptr->zlib_state = PNG_ZLIB_UNINITIALIZED;
--
- png_ptr->mode = PNG_HAVE_IHDR; /* not READY_FOR_ZTXT */
- }
-
-@@ -897,10 +947,9 @@
- * structure.
- */
- void /* PRIVATE */
--png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
-+png_write_PLTE(png_structrp png_ptr, png_const_colorp palette,
- png_uint_32 num_pal)
- {
-- PNG_PLTE;
- png_uint_32 i;
- png_const_colorp pal_ptr;
- png_byte buf[3];
-@@ -909,7 +958,7 @@
-
- if ((
- #ifdef PNG_MNG_FEATURES_SUPPORTED
-- !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
-+ (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 &&
- #endif
- num_pal == 0) || num_pal > 256)
- {
-@@ -925,7 +974,7 @@
- }
- }
-
-- if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
-+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
- {
- png_warning(png_ptr,
- "Ignoring request to write a PLTE chunk in grayscale PNG");
-@@ -936,7 +985,7 @@
- png_ptr->num_palette = (png_uint_16)num_pal;
- png_debug1(3, "num_palette = %d", png_ptr->num_palette);
-
-- png_write_chunk_start(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));
-+ png_write_chunk_header(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));
- #ifdef PNG_POINTER_INDEXING_SUPPORTED
-
- for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
-@@ -966,127 +1015,192 @@
- png_ptr->mode |= PNG_HAVE_PLTE;
- }
-
--/* Write an IDAT chunk */
-+/* This is similar to png_text_compress, above, except that it does not require
-+ * all of the data at once and, instead of buffering the compressed result,
-+ * writes it as IDAT chunks. Unlike png_text_compress it *can* png_error out
-+ * because it calls the write interface. As a result it does its own error
-+ * reporting and does not return an error code. In the event of error it will
-+ * just call png_error. The input data length may exceed 32-bits. The 'flush'
-+ * parameter is exactly the same as that to deflate, with the following
-+ * meanings:
-+ *
-+ * Z_NO_FLUSH: normal incremental output of compressed data
-+ * Z_SYNC_FLUSH: do a SYNC_FLUSH, used by png_write_flush
-+ * Z_FINISH: this is the end of the input, do a Z_FINISH and clean up
-+ *
-+ * The routine manages the acquire and release of the png_ptr->zstream by
-+ * checking and (at the end) clearing png_ptr->zowner; it does some sanity
-+ * checks on the 'mode' flags while doing this.
-+ */
- void /* PRIVATE */
--png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
-+png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
-+ png_alloc_size_t input_len, int flush)
- {
-- PNG_IDAT;
--
-- png_debug(1, "in png_write_IDAT");
--
-+ if (png_ptr->zowner != png_IDAT)
-+ {
-+ /* First time. Ensure we have a temporary buffer for compression and
-+ * trim the buffer list if it has more than one entry to free memory.
-+ * If 'WRITE_COMPRESSED_TEXT' is not set the list will never have been
-+ * created at this point, but the check here is quick and safe.
-+ */
-+ if (png_ptr->zbuffer_list == NULL)
-+ {
-+ png_ptr->zbuffer_list = png_voidcast(png_compression_bufferp,
-+ png_malloc(png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
-+ png_ptr->zbuffer_list->next = NULL;
-+ }
-+
-+ else
-+ png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list->next);
-+
-+ /* It is a terminal error if we can't claim the zstream. */
-+ if (png_deflate_claim(png_ptr, png_IDAT, png_image_size(png_ptr)) != Z_OK)
-+ png_error(png_ptr, png_ptr->zstream.msg);
-+
-+ /* The output state is maintained in png_ptr->zstream, so it must be
-+ * initialized here after the claim.
-+ */
-+ png_ptr->zstream.next_out = png_ptr->zbuffer_list->output;
-+ png_ptr->zstream.avail_out = png_ptr->zbuffer_size;
-+ }
-+
-+ /* Now loop reading and writing until all the input is consumed or an error
-+ * terminates the operation. The _out values are maintained across calls to
-+ * this function, but the input must be reset each time.
-+ */
-+ png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);
-+ png_ptr->zstream.avail_in = 0; /* set below */
-+ for (;;)
-+ {
-+ int ret;
-+
-+ /* INPUT: from the row data */
-+ uInt avail = ZLIB_IO_MAX;
-+
-+ if (avail > input_len)
-+ avail = (uInt)input_len; /* safe because of the check */
-+
-+ png_ptr->zstream.avail_in = avail;
-+ input_len -= avail;
-+
-+ ret = deflate(&png_ptr->zstream, input_len > 0 ? Z_NO_FLUSH : flush);
-+
-+ /* Include as-yet unconsumed input */
-+ input_len += png_ptr->zstream.avail_in;
-+ png_ptr->zstream.avail_in = 0;
-+
-+ /* OUTPUT: write complete IDAT chunks when avail_out drops to zero. Note
-+ * that these two zstream fields are preserved across the calls, therefore
-+ * there is no need to set these up on entry to the loop.
-+ */
-+ if (png_ptr->zstream.avail_out == 0)
-+ {
-+ png_bytep data = png_ptr->zbuffer_list->output;
-+ uInt size = png_ptr->zbuffer_size;
-+
-+ /* Write an IDAT containing the data then reset the buffer. The
-+ * first IDAT may need deflate header optimization.
-+ */
- #ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-- if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
-- png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-- {
-- /* Optimize the CMF field in the zlib stream. This hack of the zlib
-- * stream is compliant to the stream specification.
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
-+ png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-+ optimize_cmf(data, png_image_size(png_ptr));
-+#endif
-+
-+ png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-+ png_ptr->mode |= PNG_HAVE_IDAT;
-+
-+ png_ptr->zstream.next_out = data;
-+ png_ptr->zstream.avail_out = size;
-+
-+ /* For SYNC_FLUSH or FINISH it is essential to keep calling zlib with
-+ * the same flush parameter until it has finished output, for NO_FLUSH
-+ * it doesn't matter.
-+ */
-+ if (ret == Z_OK && flush != Z_NO_FLUSH)
-+ continue;
-+ }
-+
-+ /* The order of these checks doesn't matter much; it just affects which
-+ * possible error might be detected if multiple things go wrong at once.
- */
-- unsigned int z_cmf = data[0]; /* zlib compression method and flags */
--
-- if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-+ if (ret == Z_OK) /* most likely return code! */
- {
-- /* Avoid memory underflows and multiplication overflows.
-- *
-- * The conditions below are practically always satisfied;
-- * however, they still must be checked.
-+ /* If all the input has been consumed then just return. If Z_FINISH
-+ * was used as the flush parameter something has gone wrong if we get
-+ * here.
- */
-- if (length >= 2 &&
-- png_ptr->height < 16384 && png_ptr->width < 16384)
-+ if (input_len == 0)
- {
-- /* Compute the maximum possible length of the datastream */
--
-- /* Number of pixels, plus for each row a filter byte
-- * and possibly a padding byte, so increase the maximum
-- * size to account for these.
-- */
-- unsigned int z_cinfo;
-- unsigned int half_z_window_size;
-- png_uint_32 uncompressed_idat_size = png_ptr->height *
-- ((png_ptr->width *
-- png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
--
-- /* If it's interlaced, each block of 8 rows is sent as up to
-- * 14 rows, i.e., 6 additional rows, each with a filter byte
-- * and possibly a padding byte
-- */
-- if (png_ptr->interlaced)
-- uncompressed_idat_size += ((png_ptr->height + 7)/8) *
-- (png_ptr->bit_depth < 8 ? 12 : 6);
--
-- z_cinfo = z_cmf >> 4;
-- half_z_window_size = 1 << (z_cinfo + 7);
--
-- while (uncompressed_idat_size <= half_z_window_size &&
-- half_z_window_size >= 256)
-- {
-- z_cinfo--;
-- half_z_window_size >>= 1;
-- }
--
-- z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
--
-- if (data[0] != z_cmf)
-- {
-- int tmp;
-- data[0] = (png_byte)z_cmf;
-- tmp = data[1] & 0xe0;
-- tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-- data[1] = (png_byte)tmp;
-- }
-+ if (flush == Z_FINISH)
-+ png_error(png_ptr, "Z_OK on Z_FINISH with output space");
-+
-+ return;
- }
- }
-
-+ else if (ret == Z_STREAM_END && flush == Z_FINISH)
-+ {
-+ /* This is the end of the IDAT data; any pending output must be
-+ * flushed. For small PNG files we may still be at the beginning.
-+ */
-+ png_bytep data = png_ptr->zbuffer_list->output;
-+ uInt size = png_ptr->zbuffer_size - png_ptr->zstream.avail_out;
-+
-+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
-+ png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-+ optimize_cmf(data, png_image_size(png_ptr));
-+#endif
-+
-+ png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-+ png_ptr->zstream.avail_out = 0;
-+ png_ptr->zstream.next_out = NULL;
-+ png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
-+
-+ png_ptr->zowner = 0; /* Release the stream */
-+ return;
-+ }
-+
- else
-- png_error(png_ptr,
-- "Invalid zlib compression method or flags in IDAT");
-+ {
-+ /* This is an error condition. */
-+ png_zstream_error(png_ptr, ret);
-+ png_error(png_ptr, png_ptr->zstream.msg);
-+ }
- }
--#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
--
-- png_write_chunk(png_ptr, png_IDAT, data, length);
-- png_ptr->mode |= PNG_HAVE_IDAT;
--
-- /* Prior to 1.5.4 this code was replicated in every caller (except at the
-- * end, where it isn't technically necessary). Since this function has
-- * flushed the data we can safely reset the zlib output buffer here.
-- */
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
- }
-
- /* Write an IEND chunk */
- void /* PRIVATE */
--png_write_IEND(png_structp png_ptr)
-+png_write_IEND(png_structrp png_ptr)
- {
-- PNG_IEND;
--
- png_debug(1, "in png_write_IEND");
-
-- png_write_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
-+ png_write_complete_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
- png_ptr->mode |= PNG_HAVE_IEND;
- }
-
- #ifdef PNG_WRITE_gAMA_SUPPORTED
- /* Write a gAMA chunk */
- void /* PRIVATE */
--png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
-+png_write_gAMA_fixed(png_structrp png_ptr, png_fixed_point file_gamma)
- {
-- PNG_gAMA;
- png_byte buf[4];
-
- png_debug(1, "in png_write_gAMA");
-
- /* file_gamma is saved in 1/100,000ths */
- png_save_uint_32(buf, (png_uint_32)file_gamma);
-- png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
-+ png_write_complete_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
- }
- #endif
-
- #ifdef PNG_WRITE_sRGB_SUPPORTED
- /* Write a sRGB chunk */
- void /* PRIVATE */
--png_write_sRGB(png_structp png_ptr, int srgb_intent)
-+png_write_sRGB(png_structrp png_ptr, int srgb_intent)
- {
-- PNG_sRGB;
- png_byte buf[1];
-
- png_debug(1, "in png_write_sRGB");
-@@ -1096,104 +1210,79 @@
- "Invalid sRGB rendering intent specified");
-
- buf[0]=(png_byte)srgb_intent;
-- png_write_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
-+ png_write_complete_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
- }
- #endif
-
- #ifdef PNG_WRITE_iCCP_SUPPORTED
- /* Write an iCCP chunk */
- void /* PRIVATE */
--png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
-- png_const_charp profile, int profile_len)
-+png_write_iCCP(png_structrp png_ptr, png_const_charp name,
-+ png_const_bytep profile)
- {
-- PNG_iCCP;
-- png_size_t name_len;
-- png_charp new_name;
-+ png_uint_32 name_len;
-+ png_uint_32 profile_len;
-+ png_byte new_name[81]; /* 1 byte for the compression byte */
- compression_state comp;
-- int embedded_profile_len = 0;
-+ png_uint_32 temp;
-
- png_debug(1, "in png_write_iCCP");
-
-- comp.num_output_ptr = 0;
-- comp.max_output_ptr = 0;
-- comp.output_ptr = NULL;
-- comp.input = NULL;
-- comp.input_len = 0;
--
-- if ((name_len = png_check_keyword(png_ptr, name, &new_name)) == 0)
-- return;
--
-- if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-- png_warning(png_ptr, "Unknown compression type in iCCP chunk");
--
-+ /* These are all internal problems: the profile should have been checked
-+ * before when it was stored.
-+ */
- if (profile == NULL)
-- profile_len = 0;
--
-- if (profile_len > 3)
-- embedded_profile_len =
-- ((*( (png_const_bytep)profile ))<<24) |
-- ((*( (png_const_bytep)profile + 1))<<16) |
-- ((*( (png_const_bytep)profile + 2))<< 8) |
-- ((*( (png_const_bytep)profile + 3)) );
--
-- if (embedded_profile_len < 0)
-+ png_error(png_ptr, "No profile for iCCP chunk"); /* internal error */
-+
-+ profile_len = png_get_uint_32(profile);
-+
-+ if (profile_len < 132)
-+ png_error(png_ptr, "ICC profile too short");
-+
-+ temp = (png_uint_32) (*(profile+8));
-+ if (temp > 3 && (profile_len & 0x03))
-+ png_error(png_ptr, "ICC profile length invalid (not a multiple of 4)");
-+
- {
-- png_warning(png_ptr,
-- "Embedded profile length in iCCP chunk is negative");
--
-- png_free(png_ptr, new_name);
-- return;
-+ png_uint_32 embedded_profile_len = png_get_uint_32(profile);
-+
-+ if (profile_len != embedded_profile_len)
-+ png_error(png_ptr, "Profile length does not match profile");
- }
-
-- if (profile_len < embedded_profile_len)
-- {
-- png_warning(png_ptr,
-- "Embedded profile length too large in iCCP chunk");
--
-- png_free(png_ptr, new_name);
-- return;
-- }
--
-- if (profile_len > embedded_profile_len)
-- {
-- png_warning(png_ptr,
-- "Truncating profile to actual length in iCCP chunk");
--
-- profile_len = embedded_profile_len;
-- }
--
-- if (profile_len)
-- profile_len = png_text_compress(png_ptr, profile,
-- (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &comp);
-+ name_len = png_check_keyword(png_ptr, name, new_name);
-+
-+ if (name_len == 0)
-+ png_error(png_ptr, "iCCP: invalid keyword");
-+
-+ new_name[++name_len] = PNG_COMPRESSION_TYPE_BASE;
-
- /* Make sure we include the NULL after the name and the compression type */
-- png_write_chunk_start(png_ptr, png_iCCP,
-- (png_uint_32)(name_len + profile_len + 2));
--
-- new_name[name_len + 1] = 0x00;
--
-- png_write_chunk_data(png_ptr, (png_bytep)new_name,
-- (png_size_t)(name_len + 2));
--
-- if (profile_len)
-- {
-- comp.input_len = profile_len;
-- png_write_compressed_data_out(png_ptr, &comp);
-- }
-+ ++name_len;
-+
-+ png_text_compress_init(&comp, profile, profile_len);
-+
-+ /* Allow for keyword terminator and compression byte */
-+ if (png_text_compress(png_ptr, png_iCCP, &comp, name_len) != Z_OK)
-+ png_error(png_ptr, png_ptr->zstream.msg);
-+
-+ png_write_chunk_header(png_ptr, png_iCCP, name_len + comp.output_len);
-+
-+ png_write_chunk_data(png_ptr, new_name, name_len);
-+
-+ png_write_compressed_data_out(png_ptr, &comp);
-
- png_write_chunk_end(png_ptr);
-- png_free(png_ptr, new_name);
- }
- #endif
-
- #ifdef PNG_WRITE_sPLT_SUPPORTED
- /* Write a sPLT chunk */
- void /* PRIVATE */
--png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
-+png_write_sPLT(png_structrp png_ptr, png_const_sPLT_tp spalette)
- {
-- PNG_sPLT;
-- png_size_t name_len;
-- png_charp new_name;
-+ png_uint_32 name_len;
-+ png_byte new_name[80];
- png_byte entrybuf[10];
- png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
- png_size_t palette_size = entry_size * spalette->nentries;
-@@ -1204,11 +1293,13 @@
-
- png_debug(1, "in png_write_sPLT");
-
-- if ((name_len = png_check_keyword(png_ptr,spalette->name, &new_name))==0)
-- return;
-+ name_len = png_check_keyword(png_ptr, spalette->name, new_name);
-+
-+ if (name_len == 0)
-+ png_error(png_ptr, "sPLT: invalid keyword");
-
- /* Make sure we include the NULL after the name */
-- png_write_chunk_start(png_ptr, png_sPLT,
-+ png_write_chunk_header(png_ptr, png_sPLT,
- (png_uint_32)(name_len + 2 + palette_size));
-
- png_write_chunk_data(png_ptr, (png_bytep)new_name,
-@@ -1238,7 +1329,7 @@
- png_save_uint_16(entrybuf + 8, ep->frequency);
- }
-
-- png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
-+ png_write_chunk_data(png_ptr, entrybuf, entry_size);
- }
- #else
- ep=spalette->entries;
-@@ -1262,28 +1353,26 @@
- png_save_uint_16(entrybuf + 8, ep[i].frequency);
- }
-
-- png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
-+ png_write_chunk_data(png_ptr, entrybuf, entry_size);
- }
- #endif
-
- png_write_chunk_end(png_ptr);
-- png_free(png_ptr, new_name);
- }
- #endif
-
- #ifdef PNG_WRITE_sBIT_SUPPORTED
- /* Write the sBIT chunk */
- void /* PRIVATE */
--png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
-+png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)
- {
-- PNG_sBIT;
- png_byte buf[4];
- png_size_t size;
-
- png_debug(1, "in png_write_sBIT");
-
- /* Make sure we don't depend upon the order of PNG_COLOR_8 */
-- if (color_type & PNG_COLOR_MASK_COLOR)
-+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- png_byte maxbits;
-
-@@ -1316,7 +1405,7 @@
- size = 1;
- }
-
-- if (color_type & PNG_COLOR_MASK_ALPHA)
-+ if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
- {
- if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
- {
-@@ -1327,53 +1416,42 @@
- buf[size++] = sbit->alpha;
- }
-
-- png_write_chunk(png_ptr, png_sBIT, buf, size);
-+ png_write_complete_chunk(png_ptr, png_sBIT, buf, size);
- }
- #endif
-
- #ifdef PNG_WRITE_cHRM_SUPPORTED
- /* Write the cHRM chunk */
- void /* PRIVATE */
--png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
-- png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
-- png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
-- png_fixed_point blue_y)
-+png_write_cHRM_fixed(png_structrp png_ptr, const png_xy *xy)
- {
-- PNG_cHRM;
- png_byte buf[32];
-
- png_debug(1, "in png_write_cHRM");
-
- /* Each value is saved in 1/100,000ths */
--#ifdef PNG_CHECK_cHRM_SUPPORTED
-- if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,
-- green_x, green_y, blue_x, blue_y))
--#endif
-- {
-- png_save_uint_32(buf, (png_uint_32)white_x);
-- png_save_uint_32(buf + 4, (png_uint_32)white_y);
--
-- png_save_uint_32(buf + 8, (png_uint_32)red_x);
-- png_save_uint_32(buf + 12, (png_uint_32)red_y);
--
-- png_save_uint_32(buf + 16, (png_uint_32)green_x);
-- png_save_uint_32(buf + 20, (png_uint_32)green_y);
--
-- png_save_uint_32(buf + 24, (png_uint_32)blue_x);
-- png_save_uint_32(buf + 28, (png_uint_32)blue_y);
--
-- png_write_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
-- }
-+ png_save_int_32(buf, xy->whitex);
-+ png_save_int_32(buf + 4, xy->whitey);
-+
-+ png_save_int_32(buf + 8, xy->redx);
-+ png_save_int_32(buf + 12, xy->redy);
-+
-+ png_save_int_32(buf + 16, xy->greenx);
-+ png_save_int_32(buf + 20, xy->greeny);
-+
-+ png_save_int_32(buf + 24, xy->bluex);
-+ png_save_int_32(buf + 28, xy->bluey);
-+
-+ png_write_complete_chunk(png_ptr, png_cHRM, buf, 32);
- }
- #endif
-
- #ifdef PNG_WRITE_tRNS_SUPPORTED
- /* Write the tRNS chunk */
- void /* PRIVATE */
--png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
-+png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
- png_const_color_16p tran, int num_trans, int color_type)
- {
-- PNG_tRNS;
- png_byte buf[6];
-
- png_debug(1, "in png_write_tRNS");
-@@ -1382,12 +1460,14 @@
- {
- if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
- {
-- png_warning(png_ptr, "Invalid number of transparent colors specified");
-+ png_app_warning(png_ptr,
-+ "Invalid number of transparent colors specified");
- return;
- }
-
- /* Write the chunk out as it is */
-- png_write_chunk(png_ptr, png_tRNS, trans_alpha, (png_size_t)num_trans);
-+ png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha,
-+ (png_size_t)num_trans);
- }
-
- else if (color_type == PNG_COLOR_TYPE_GRAY)
-@@ -1395,14 +1475,14 @@
- /* One 16 bit value */
- if (tran->gray >= (1 << png_ptr->bit_depth))
- {
-- png_warning(png_ptr,
-+ png_app_warning(png_ptr,
- "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
-
- return;
- }
-
- png_save_uint_16(buf, tran->gray);
-- png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
-+ png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
- }
-
- else if (color_type == PNG_COLOR_TYPE_RGB)
-@@ -1412,22 +1492,22 @@
- png_save_uint_16(buf + 2, tran->green);
- png_save_uint_16(buf + 4, tran->blue);
- #ifdef PNG_WRITE_16BIT_SUPPORTED
-- if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
-+ if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
- #else
-- if (buf[0] | buf[2] | buf[4])
-+ if ((buf[0] | buf[2] | buf[4]) != 0)
- #endif
- {
-- png_warning(png_ptr,
-+ png_app_warning(png_ptr,
- "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
- return;
- }
-
-- png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
-+ png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
- }
-
- else
- {
-- png_warning(png_ptr, "Can't write tRNS with an alpha channel");
-+ png_app_warning(png_ptr, "Can't write tRNS with an alpha channel");
- }
- }
- #endif
-@@ -1435,9 +1515,8 @@
- #ifdef PNG_WRITE_bKGD_SUPPORTED
- /* Write the background chunk */
- void /* PRIVATE */
--png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
-+png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type)
- {
-- PNG_bKGD;
- png_byte buf[6];
-
- png_debug(1, "in png_write_bKGD");
-@@ -1446,8 +1525,8 @@
- {
- if (
- #ifdef PNG_MNG_FEATURES_SUPPORTED
-- (png_ptr->num_palette ||
-- (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
-+ (png_ptr->num_palette != 0 ||
-+ (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0) &&
- #endif
- back->index >= png_ptr->num_palette)
- {
-@@ -1456,18 +1535,18 @@
- }
-
- buf[0] = back->index;
-- png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
-+ png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
- }
-
-- else if (color_type & PNG_COLOR_MASK_COLOR)
-+ else if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
- {
- png_save_uint_16(buf, back->red);
- png_save_uint_16(buf + 2, back->green);
- png_save_uint_16(buf + 4, back->blue);
- #ifdef PNG_WRITE_16BIT_SUPPORTED
-- if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
-+ if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
- #else
-- if (buf[0] | buf[2] | buf[4])
-+ if ((buf[0] | buf[2] | buf[4]) != 0)
- #endif
- {
- png_warning(png_ptr,
-@@ -1476,7 +1555,7 @@
- return;
- }
-
-- png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
-+ png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
- }
-
- else
-@@ -1490,7 +1569,7 @@
- }
-
- png_save_uint_16(buf, back->gray);
-- png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
-+ png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
- }
- }
- #endif
-@@ -1498,9 +1577,8 @@
- #ifdef PNG_WRITE_hIST_SUPPORTED
- /* Write the histogram */
- void /* PRIVATE */
--png_write_hIST(png_structp png_ptr, png_const_uint_16p hist, int num_hist)
-+png_write_hIST(png_structrp png_ptr, png_const_uint_16p hist, int num_hist)
- {
-- PNG_hIST;
- int i;
- png_byte buf[3];
-
-@@ -1515,7 +1593,7 @@
- return;
- }
-
-- png_write_chunk_start(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
-+ png_write_chunk_header(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
-
- for (i = 0; i < num_hist; i++)
- {
-@@ -1527,236 +1605,93 @@
- }
- #endif
-
--#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-- defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
--/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
-- * and if invalid, correct the keyword rather than discarding the entire
-- * chunk. The PNG 1.0 specification requires keywords 1-79 characters in
-- * length, forbids leading or trailing whitespace, multiple internal spaces,
-- * and the non-break space (0x80) from ISO 8859-1. Returns keyword length.
-- *
-- * The new_key is allocated to hold the corrected keyword and must be freed
-- * by the calling routine. This avoids problems with trying to write to
-- * static keywords without having to have duplicate copies of the strings.
-- */
--png_size_t /* PRIVATE */
--png_check_keyword(png_structp png_ptr, png_const_charp key, png_charpp new_key)
--{
-- png_size_t key_len;
-- png_const_charp ikp;
-- png_charp kp, dp;
-- int kflag;
-- int kwarn=0;
--
-- png_debug(1, "in png_check_keyword");
--
-- *new_key = NULL;
--
-- if (key == NULL || (key_len = png_strlen(key)) == 0)
-- {
-- png_warning(png_ptr, "zero length keyword");
-- return ((png_size_t)0);
-- }
--
-- png_debug1(2, "Keyword to be checked is '%s'", key);
--
-- *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
--
-- if (*new_key == NULL)
-- {
-- png_warning(png_ptr, "Out of memory while procesing keyword");
-- return ((png_size_t)0);
-- }
--
-- /* Replace non-printing characters with a blank and print a warning */
-- for (ikp = key, dp = *new_key; *ikp != '\0'; ikp++, dp++)
-- {
-- if ((png_byte)*ikp < 0x20 ||
-- ((png_byte)*ikp > 0x7E && (png_byte)*ikp < 0xA1))
-- {
-- PNG_WARNING_PARAMETERS(p)
--
-- png_warning_parameter_unsigned(p, 1, PNG_NUMBER_FORMAT_02x,
-- (png_byte)*ikp);
-- png_formatted_warning(png_ptr, p, "invalid keyword character 0x@1");
-- *dp = ' ';
-- }
--
-- else
-- {
-- *dp = *ikp;
-- }
-- }
-- *dp = '\0';
--
-- /* Remove any trailing white space. */
-- kp = *new_key + key_len - 1;
-- if (*kp == ' ')
-- {
-- png_warning(png_ptr, "trailing spaces removed from keyword");
--
-- while (*kp == ' ')
-- {
-- *(kp--) = '\0';
-- key_len--;
-- }
-- }
--
-- /* Remove any leading white space. */
-- kp = *new_key;
-- if (*kp == ' ')
-- {
-- png_warning(png_ptr, "leading spaces removed from keyword");
--
-- while (*kp == ' ')
-- {
-- kp++;
-- key_len--;
-- }
-- }
--
-- png_debug1(2, "Checking for multiple internal spaces in '%s'", kp);
--
-- /* Remove multiple internal spaces. */
-- for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
-- {
-- if (*kp == ' ' && kflag == 0)
-- {
-- *(dp++) = *kp;
-- kflag = 1;
-- }
--
-- else if (*kp == ' ')
-- {
-- key_len--;
-- kwarn = 1;
-- }
--
-- else
-- {
-- *(dp++) = *kp;
-- kflag = 0;
-- }
-- }
-- *dp = '\0';
-- if (kwarn)
-- png_warning(png_ptr, "extra interior spaces removed from keyword");
--
-- if (key_len == 0)
-- {
-- png_free(png_ptr, *new_key);
-- png_warning(png_ptr, "Zero length keyword");
-- }
--
-- if (key_len > 79)
-- {
-- png_warning(png_ptr, "keyword length must be 1 - 79 characters");
-- (*new_key)[79] = '\0';
-- key_len = 79;
-- }
--
-- return (key_len);
--}
--#endif
--
- #ifdef PNG_WRITE_tEXt_SUPPORTED
- /* Write a tEXt chunk */
- void /* PRIVATE */
--png_write_tEXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-+png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
- png_size_t text_len)
- {
-- PNG_tEXt;
-- png_size_t key_len;
-- png_charp new_key;
-+ png_uint_32 key_len;
-+ png_byte new_key[80];
-
- png_debug(1, "in png_write_tEXt");
-
-- if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
-- return;
-+ key_len = png_check_keyword(png_ptr, key, new_key);
-+
-+ if (key_len == 0)
-+ png_error(png_ptr, "tEXt: invalid keyword");
-
- if (text == NULL || *text == '\0')
- text_len = 0;
-
- else
-- text_len = png_strlen(text);
-+ text_len = strlen(text);
-+
-+ if (text_len > PNG_UINT_31_MAX - (key_len+1))
-+ png_error(png_ptr, "tEXt: text too long");
-
- /* Make sure we include the 0 after the key */
-- png_write_chunk_start(png_ptr, png_tEXt,
-- (png_uint_32)(key_len + text_len + 1));
-+ png_write_chunk_header(png_ptr, png_tEXt,
-+ (png_uint_32)/*checked above*/(key_len + text_len + 1));
- /*
- * We leave it to the application to meet PNG-1.0 requirements on the
- * contents of the text. PNG-1.0 through PNG-1.2 discourage the use of
- * any non-Latin-1 characters except for NEWLINE. ISO PNG will forbid them.
- * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
- */
-- png_write_chunk_data(png_ptr, (png_bytep)new_key,
-- (png_size_t)(key_len + 1));
--
-- if (text_len)
-- png_write_chunk_data(png_ptr, (png_const_bytep)text,
-- (png_size_t)text_len);
-+ png_write_chunk_data(png_ptr, new_key, key_len + 1);
-+
-+ if (text_len != 0)
-+ png_write_chunk_data(png_ptr, (png_const_bytep)text, text_len);
-
- png_write_chunk_end(png_ptr);
-- png_free(png_ptr, new_key);
- }
- #endif
-
- #ifdef PNG_WRITE_zTXt_SUPPORTED
- /* Write a compressed text chunk */
- void /* PRIVATE */
--png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-- png_size_t text_len, int compression)
-+png_write_zTXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
-+ int compression)
- {
-- PNG_zTXt;
-- png_size_t key_len;
-- png_byte buf;
-- png_charp new_key;
-+ png_uint_32 key_len;
-+ png_byte new_key[81];
- compression_state comp;
-
- png_debug(1, "in png_write_zTXt");
-
-- comp.num_output_ptr = 0;
-- comp.max_output_ptr = 0;
-- comp.output_ptr = NULL;
-- comp.input = NULL;
-- comp.input_len = 0;
--
-- if ((key_len = png_check_keyword(png_ptr, key, &new_key)) == 0)
-+ if (compression == PNG_TEXT_COMPRESSION_NONE)
- {
-- png_free(png_ptr, new_key);
-+ png_write_tEXt(png_ptr, key, text, 0);
- return;
- }
-
-- if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
-- {
-- png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
-- png_free(png_ptr, new_key);
-- return;
-- }
--
-- text_len = png_strlen(text);
-+ if (compression != PNG_TEXT_COMPRESSION_zTXt)
-+ png_error(png_ptr, "zTXt: invalid compression type");
-+
-+ key_len = png_check_keyword(png_ptr, key, new_key);
-+
-+ if (key_len == 0)
-+ png_error(png_ptr, "zTXt: invalid keyword");
-+
-+ /* Add the compression method and 1 for the keyword separator. */
-+ new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;
-+ ++key_len;
-
- /* Compute the compressed data; do it now for the length */
-- text_len = png_text_compress(png_ptr, text, text_len, compression,
-- &comp);
-+ png_text_compress_init(&comp, (png_const_bytep)text,
-+ text == NULL ? 0 : strlen(text));
-+
-+ if (png_text_compress(png_ptr, png_zTXt, &comp, key_len) != Z_OK)
-+ png_error(png_ptr, png_ptr->zstream.msg);
-
- /* Write start of chunk */
-- png_write_chunk_start(png_ptr, png_zTXt,
-- (png_uint_32)(key_len+text_len + 2));
-+ png_write_chunk_header(png_ptr, png_zTXt, key_len + comp.output_len);
-
- /* Write key */
-- png_write_chunk_data(png_ptr, (png_bytep)new_key,
-- (png_size_t)(key_len + 1));
--
-- png_free(png_ptr, new_key);
--
-- buf = (png_byte)compression;
--
-- /* Write compression */
-- png_write_chunk_data(png_ptr, &buf, (png_size_t)1);
-+ png_write_chunk_data(png_ptr, new_key, key_len);
-
- /* Write the compressed data */
-- comp.input_len = text_len;
- png_write_compressed_data_out(png_ptr, &comp);
-
- /* Close the chunk */
-@@ -1767,104 +1702,109 @@
- #ifdef PNG_WRITE_iTXt_SUPPORTED
- /* Write an iTXt chunk */
- void /* PRIVATE */
--png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
-+png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
- png_const_charp lang, png_const_charp lang_key, png_const_charp text)
- {
-- PNG_iTXt;
-- png_size_t lang_len, key_len, lang_key_len, text_len;
-- png_charp new_lang;
-- png_charp new_key = NULL;
-- png_byte cbuf[2];
-+ png_uint_32 key_len, prefix_len;
-+ png_size_t lang_len, lang_key_len;
-+ png_byte new_key[82];
- compression_state comp;
-
- png_debug(1, "in png_write_iTXt");
-
-- comp.num_output_ptr = 0;
-- comp.max_output_ptr = 0;
-- comp.output_ptr = NULL;
-- comp.input = NULL;
--
-- if ((key_len = png_check_keyword(png_ptr, key, &new_key)) == 0)
-- return;
--
-- if ((lang_len = png_check_keyword(png_ptr, lang, &new_lang)) == 0)
-+ key_len = png_check_keyword(png_ptr, key, new_key);
-+
-+ if (key_len == 0)
-+ png_error(png_ptr, "iTXt: invalid keyword");
-+
-+ /* Set the compression flag */
-+ switch (compression)
- {
-- png_warning(png_ptr, "Empty language field in iTXt chunk");
-- new_lang = NULL;
-- lang_len = 0;
-+ case PNG_ITXT_COMPRESSION_NONE:
-+ case PNG_TEXT_COMPRESSION_NONE:
-+ compression = new_key[++key_len] = 0; /* no compression */
-+ break;
-+
-+ case PNG_TEXT_COMPRESSION_zTXt:
-+ case PNG_ITXT_COMPRESSION_zTXt:
-+ compression = new_key[++key_len] = 1; /* compressed */
-+ break;
-+
-+ default:
-+ png_error(png_ptr, "iTXt: invalid compression");
- }
-
-- if (lang_key == NULL)
-- lang_key_len = 0;
--
-- else
-- lang_key_len = png_strlen(lang_key);
--
-- if (text == NULL)
-- text_len = 0;
--
-- else
-- text_len = png_strlen(text);
--
-- /* Compute the compressed data; do it now for the length */
-- text_len = png_text_compress(png_ptr, text, text_len, compression - 2,
-- &comp);
--
--
-- /* Make sure we include the compression flag, the compression byte,
-- * and the NULs after the key, lang, and lang_key parts
-- */
--
-- png_write_chunk_start(png_ptr, png_iTXt, (png_uint_32)(
-- 5 /* comp byte, comp flag, terminators for key, lang and lang_key */
-- + key_len
-- + lang_len
-- + lang_key_len
-- + text_len));
-+ new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;
-+ ++key_len; /* for the keywod separator */
-
- /* We leave it to the application to meet PNG-1.0 requirements on the
- * contents of the text. PNG-1.0 through PNG-1.2 discourage the use of
-- * any non-Latin-1 characters except for NEWLINE. ISO PNG will forbid them.
-+ * any non-Latin-1 characters except for NEWLINE. ISO PNG, however,
-+ * specifies that the text is UTF-8 and this really doesn't require any
-+ * checking.
-+ *
- * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-+ *
-+ * TODO: validate the language tag correctly (see the spec.)
- */
-- png_write_chunk_data(png_ptr, (png_bytep)new_key, (png_size_t)(key_len + 1));
--
-- /* Set the compression flag */
-- if (compression == PNG_ITXT_COMPRESSION_NONE ||
-- compression == PNG_TEXT_COMPRESSION_NONE)
-- cbuf[0] = 0;
--
-- else /* compression == PNG_ITXT_COMPRESSION_zTXt */
-- cbuf[0] = 1;
--
-- /* Set the compression method */
-- cbuf[1] = 0;
--
-- png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);
--
-- cbuf[0] = 0;
-- png_write_chunk_data(png_ptr, (new_lang ? (png_const_bytep)new_lang : cbuf),
-- (png_size_t)(lang_len + 1));
--
-- png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),
-- (png_size_t)(lang_key_len + 1));
--
-- png_write_compressed_data_out(png_ptr, &comp);
-+ if (lang == NULL) lang = ""; /* empty language is valid */
-+ lang_len = strlen(lang)+1;
-+ if (lang_key == NULL) lang_key = ""; /* may be empty */
-+ lang_key_len = strlen(lang_key)+1;
-+ if (text == NULL) text = ""; /* may be empty */
-+
-+ prefix_len = key_len;
-+ if (lang_len > PNG_UINT_31_MAX-prefix_len)
-+ prefix_len = PNG_UINT_31_MAX;
-+ else
-+ prefix_len = (png_uint_32)(prefix_len + lang_len);
-+
-+ if (lang_key_len > PNG_UINT_31_MAX-prefix_len)
-+ prefix_len = PNG_UINT_31_MAX;
-+ else
-+ prefix_len = (png_uint_32)(prefix_len + lang_key_len);
-+
-+ png_text_compress_init(&comp, (png_const_bytep)text, strlen(text));
-+
-+ if (compression != 0)
-+ {
-+ if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK)
-+ png_error(png_ptr, png_ptr->zstream.msg);
-+ }
-+
-+ else
-+ {
-+ if (comp.input_len > PNG_UINT_31_MAX-prefix_len)
-+ png_error(png_ptr, "iTXt: uncompressed text too long");
-+
-+ /* So the string will fit in a chunk: */
-+ comp.output_len = (png_uint_32)/*SAFE*/comp.input_len;
-+ }
-+
-+ png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
-+
-+ png_write_chunk_data(png_ptr, new_key, key_len);
-+
-+ png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);
-+
-+ png_write_chunk_data(png_ptr, (png_const_bytep)lang_key, lang_key_len);
-+
-+ if (compression != 0)
-+ png_write_compressed_data_out(png_ptr, &comp);
-+
-+ else
-+ png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.input_len);
-
- png_write_chunk_end(png_ptr);
--
-- png_free(png_ptr, new_key);
-- png_free(png_ptr, new_lang);
- }
- #endif
-
- #ifdef PNG_WRITE_oFFs_SUPPORTED
- /* Write the oFFs chunk */
- void /* PRIVATE */
--png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
-+png_write_oFFs(png_structrp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
- int unit_type)
- {
-- PNG_oFFs;
- png_byte buf[9];
-
- png_debug(1, "in png_write_oFFs");
-@@ -1876,52 +1816,57 @@
- png_save_int_32(buf + 4, y_offset);
- buf[8] = (png_byte)unit_type;
-
-- png_write_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
-+ png_write_complete_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
- }
- #endif
- #ifdef PNG_WRITE_pCAL_SUPPORTED
- /* Write the pCAL chunk (described in the PNG extensions document) */
- void /* PRIVATE */
--png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
-+png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
- png_int_32 X1, int type, int nparams, png_const_charp units,
- png_charpp params)
- {
-- PNG_pCAL;
-- png_size_t purpose_len, units_len, total_len;
-- png_uint_32p params_len;
-+ png_uint_32 purpose_len;
-+ png_size_t units_len, total_len;
-+ png_size_tp params_len;
- png_byte buf[10];
-- png_charp new_purpose;
-+ png_byte new_purpose[80];
- int i;
-
- png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
-
- if (type >= PNG_EQUATION_LAST)
-- png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
--
-- purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
-+ png_error(png_ptr, "Unrecognized equation type for pCAL chunk");
-+
-+ purpose_len = png_check_keyword(png_ptr, purpose, new_purpose);
-+
-+ if (purpose_len == 0)
-+ png_error(png_ptr, "pCAL: invalid keyword");
-+
-+ ++purpose_len; /* terminator */
-+
- png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
-- units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
-+ units_len = strlen(units) + (nparams == 0 ? 0 : 1);
- png_debug1(3, "pCAL units length = %d", (int)units_len);
- total_len = purpose_len + units_len + 10;
-
-- params_len = (png_uint_32p)png_malloc(png_ptr,
-- (png_alloc_size_t)(nparams * png_sizeof(png_uint_32)));
-+ params_len = (png_size_tp)png_malloc(png_ptr,
-+ (png_alloc_size_t)(nparams * (sizeof (png_size_t))));
-
- /* Find the length of each parameter, making sure we don't count the
- * null terminator for the last parameter.
- */
- for (i = 0; i < nparams; i++)
- {
-- params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
-+ params_len[i] = strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
- png_debug2(3, "pCAL parameter %d length = %lu", i,
- (unsigned long)params_len[i]);
-- total_len += (png_size_t)params_len[i];
-+ total_len += params_len[i];
- }
-
- png_debug1(3, "pCAL total length = %d", (int)total_len);
-- png_write_chunk_start(png_ptr, png_pCAL, (png_uint_32)total_len);
-- png_write_chunk_data(png_ptr, (png_const_bytep)new_purpose,
-- (png_size_t)purpose_len);
-+ png_write_chunk_header(png_ptr, png_pCAL, (png_uint_32)total_len);
-+ png_write_chunk_data(png_ptr, new_purpose, purpose_len);
- png_save_int_32(buf, X0);
- png_save_int_32(buf + 4, X1);
- buf[8] = (png_byte)type;
-@@ -1929,12 +1874,9 @@
- png_write_chunk_data(png_ptr, buf, (png_size_t)10);
- png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);
-
-- png_free(png_ptr, new_purpose);
--
- for (i = 0; i < nparams; i++)
- {
-- png_write_chunk_data(png_ptr, (png_const_bytep)params[i],
-- (png_size_t)params_len[i]);
-+ png_write_chunk_data(png_ptr, (png_const_bytep)params[i], params_len[i]);
- }
-
- png_free(png_ptr, params_len);
-@@ -1945,17 +1887,16 @@
- #ifdef PNG_WRITE_sCAL_SUPPORTED
- /* Write the sCAL chunk */
- void /* PRIVATE */
--png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
-+png_write_sCAL_s(png_structrp png_ptr, int unit, png_const_charp width,
- png_const_charp height)
- {
-- PNG_sCAL;
- png_byte buf[64];
- png_size_t wlen, hlen, total_len;
-
- png_debug(1, "in png_write_sCAL_s");
-
-- wlen = png_strlen(width);
-- hlen = png_strlen(height);
-+ wlen = strlen(width);
-+ hlen = strlen(height);
- total_len = wlen + hlen + 2;
-
- if (total_len > 64)
-@@ -1965,22 +1906,21 @@
- }
-
- buf[0] = (png_byte)unit;
-- png_memcpy(buf + 1, width, wlen + 1); /* Append the '\0' here */
-- png_memcpy(buf + wlen + 2, height, hlen); /* Do NOT append the '\0' here */
-+ memcpy(buf + 1, width, wlen + 1); /* Append the '\0' here */
-+ memcpy(buf + wlen + 2, height, hlen); /* Do NOT append the '\0' here */
-
- png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
-- png_write_chunk(png_ptr, png_sCAL, buf, total_len);
-+ png_write_complete_chunk(png_ptr, png_sCAL, buf, total_len);
- }
- #endif
-
- #ifdef PNG_WRITE_pHYs_SUPPORTED
- /* Write the pHYs chunk */
- void /* PRIVATE */
--png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
-+png_write_pHYs(png_structrp png_ptr, png_uint_32 x_pixels_per_unit,
- png_uint_32 y_pixels_per_unit,
- int unit_type)
- {
-- PNG_pHYs;
- png_byte buf[9];
-
- png_debug(1, "in png_write_pHYs");
-@@ -1992,7 +1932,7 @@
- png_save_uint_32(buf + 4, y_pixels_per_unit);
- buf[8] = (png_byte)unit_type;
-
-- png_write_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
-+ png_write_complete_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
- }
- #endif
-
-@@ -2001,9 +1941,8 @@
- * or png_convert_from_time_t(), or fill in the structure yourself.
- */
- void /* PRIVATE */
--png_write_tIME(png_structp png_ptr, png_const_timep mod_time)
-+png_write_tIME(png_structrp png_ptr, png_const_timep mod_time)
- {
-- PNG_tIME;
- png_byte buf[7];
-
- png_debug(1, "in png_write_tIME");
-@@ -2023,40 +1962,44 @@
- buf[5] = mod_time->minute;
- buf[6] = mod_time->second;
-
-- png_write_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
-+ png_write_complete_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
- }
- #endif
-
- /* Initializes the row writing capability of libpng */
- void /* PRIVATE */
--png_write_start_row(png_structp png_ptr)
-+png_write_start_row(png_structrp png_ptr)
- {
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
- /* Start of interlace block */
-- int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-+ static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
- /* Offset to next interlace block */
-- int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
- /* Start of interlace block in the y direction */
-- int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-+ static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
- /* Offset to next interlace block in the y direction */
-- int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-+ static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
- #endif
-
-- png_size_t buf_size;
-+ png_alloc_size_t buf_size;
-+ int usr_pixel_depth;
-
- png_debug(1, "in png_write_start_row");
-
-- buf_size = (png_size_t)(PNG_ROWBYTES(
-- png_ptr->usr_channels*png_ptr->usr_bit_depth, png_ptr->width) + 1);
-+ usr_pixel_depth = png_ptr->usr_channels * png_ptr->usr_bit_depth;
-+ buf_size = PNG_ROWBYTES(usr_pixel_depth, png_ptr->width) + 1;
-+
-+ /* 1.5.6: added to allow checking in the row write code. */
-+ png_ptr->transformed_pixel_depth = png_ptr->pixel_depth;
-+ png_ptr->maximum_pixel_depth = (png_byte)usr_pixel_depth;
-
- /* Set up row buffer */
-- png_ptr->row_buf = (png_bytep)png_malloc(png_ptr,
-- (png_alloc_size_t)buf_size);
-+ png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, buf_size);
-
- png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
-
-@@ -2070,13 +2013,13 @@
- }
-
- /* We only need to keep the previous row if we are using one of these. */
-- if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
-+ if ((png_ptr->do_filter &
-+ (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0)
- {
- /* Set up previous row buffer */
-- png_ptr->prev_row = (png_bytep)png_calloc(png_ptr,
-- (png_alloc_size_t)buf_size);
--
-- if (png_ptr->do_filter & PNG_FILTER_UP)
-+ png_ptr->prev_row = (png_bytep)png_calloc(png_ptr, buf_size);
-+
-+ if ((png_ptr->do_filter & PNG_FILTER_UP) != 0)
- {
- png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
- png_ptr->rowbytes + 1);
-@@ -2084,7 +2027,7 @@
- png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
- }
-
-- if (png_ptr->do_filter & PNG_FILTER_AVG)
-+ if ((png_ptr->do_filter & PNG_FILTER_AVG) != 0)
- {
- png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
- png_ptr->rowbytes + 1);
-@@ -2092,7 +2035,7 @@
- png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
- }
-
-- if (png_ptr->do_filter & PNG_FILTER_PAETH)
-+ if ((png_ptr->do_filter & PNG_FILTER_PAETH) != 0)
- {
- png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
- png_ptr->rowbytes + 1);
-@@ -2100,13 +2043,13 @@
- png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
- }
- }
--#endif /* PNG_WRITE_FILTER_SUPPORTED */
-+#endif /* WRITE_FILTER */
-
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* If interlaced, we need to set up width and height of pass */
-- if (png_ptr->interlaced)
-+ if (png_ptr->interlaced != 0)
- {
-- if (!(png_ptr->transformations & PNG_INTERLACE))
-+ if ((png_ptr->transformations & PNG_INTERLACE) == 0)
- {
- png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
- png_pass_ystart[0]) / png_pass_yinc[0];
-@@ -2128,34 +2071,28 @@
- png_ptr->num_rows = png_ptr->height;
- png_ptr->usr_width = png_ptr->width;
- }
--
-- png_zlib_claim(png_ptr, PNG_ZLIB_FOR_IDAT);
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-- png_ptr->zstream.next_out = png_ptr->zbuf;
- }
-
- /* Internal use only. Called when finished processing a row of data. */
- void /* PRIVATE */
--png_write_finish_row(png_structp png_ptr)
-+png_write_finish_row(png_structrp png_ptr)
- {
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
- /* Start of interlace block */
-- int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-+ static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
- /* Offset to next interlace block */
-- int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
- /* Start of interlace block in the y direction */
-- int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-+ static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
- /* Offset to next interlace block in the y direction */
-- int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-+ static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
- #endif
-
-- int ret;
--
- png_debug(1, "in png_write_finish_row");
-
- /* Next row */
-@@ -2167,10 +2104,10 @@
-
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* If interlaced, go to next pass */
-- if (png_ptr->interlaced)
-+ if (png_ptr->interlaced != 0)
- {
- png_ptr->row_number = 0;
-- if (png_ptr->transformations & PNG_INTERLACE)
-+ if ((png_ptr->transformations & PNG_INTERLACE) != 0)
- {
- png_ptr->pass++;
- }
-@@ -2195,7 +2132,7 @@
- png_pass_ystart[png_ptr->pass]) /
- png_pass_yinc[png_ptr->pass];
-
-- if (png_ptr->transformations & PNG_INTERLACE)
-+ if ((png_ptr->transformations & PNG_INTERLACE) != 0)
- break;
-
- } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
-@@ -2206,7 +2143,7 @@
- if (png_ptr->pass < 7)
- {
- if (png_ptr->prev_row != NULL)
-- png_memset(png_ptr->prev_row, 0,
-+ memset(png_ptr->prev_row, 0,
- (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
- png_ptr->usr_bit_depth, png_ptr->width)) + 1);
-
-@@ -2217,42 +2154,7 @@
-
- /* If we get here, we've just written the last row, so we need
- to flush the compressor */
-- do
-- {
-- /* Tell the compressor we are done */
-- ret = deflate(&png_ptr->zstream, Z_FINISH);
--
-- /* Check for an error */
-- if (ret == Z_OK)
-- {
-- /* Check to see if we need more room */
-- if (!(png_ptr->zstream.avail_out))
-- {
-- png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-- png_ptr->zstream.next_out = png_ptr->zbuf;
-- png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-- }
-- }
--
-- else if (ret != Z_STREAM_END)
-- {
-- if (png_ptr->zstream.msg != NULL)
-- png_error(png_ptr, png_ptr->zstream.msg);
--
-- else
-- png_error(png_ptr, "zlib error");
-- }
-- } while (ret != Z_STREAM_END);
--
-- /* Write any extra space */
-- if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-- {
-- png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
-- png_ptr->zstream.avail_out);
-- }
--
-- png_zlib_release(png_ptr);
-- png_ptr->zstream.data_type = Z_BINARY;
-+ png_compress_IDAT(png_ptr, NULL, 0, Z_FINISH);
- }
-
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
-@@ -2269,10 +2171,10 @@
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
- /* Start of interlace block */
-- int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-+ static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
- /* Offset to next interlace block */
-- int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-+ static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
- png_debug(1, "in png_do_write_interlace");
-
-@@ -2416,7 +2318,7 @@
-
- /* Move the pixel */
- if (dp != sp)
-- png_memcpy(dp, sp, pixel_bytes);
-+ memcpy(dp, sp, pixel_bytes);
-
- /* Next pixel */
- dp += pixel_bytes;
-@@ -2440,14 +2342,16 @@
- * been specified by the application, and then writes the row out with the
- * chosen filter.
- */
--static void png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row);
-+static void
-+png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
-+ png_size_t row_bytes);
-
- #define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
- #define PNG_HISHIFT 10
- #define PNG_LOMASK ((png_uint_32)0xffffL)
- #define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
- void /* PRIVATE */
--png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
-+png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
- {
- png_bytep best_row;
- #ifdef PNG_WRITE_FILTER_SUPPORTED
-@@ -2456,7 +2360,7 @@
- png_byte filter_to_do = png_ptr->do_filter;
- png_size_t row_bytes = row_info->rowbytes;
- #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-- int num_p_filters = (int)png_ptr->num_prev_filters;
-+ int num_p_filters = png_ptr->num_prev_filters;
- #endif
-
- png_debug(1, "in png_write_find_filter");
-@@ -2507,7 +2411,7 @@
- /* We don't need to test the 'no filter' case if this is the only filter
- * that has been chosen, as it doesn't actually do anything to the data.
- */
-- if ((filter_to_do & PNG_FILTER_NONE) && filter_to_do != PNG_FILTER_NONE)
-+ if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE)
- {
- png_bytep rp;
- png_uint_32 sum = 0;
-@@ -2583,7 +2487,7 @@
- best_row = png_ptr->sub_row;
- }
-
-- else if (filter_to_do & PNG_FILTER_SUB)
-+ else if ((filter_to_do & PNG_FILTER_SUB) != 0)
- {
- png_bytep rp, dp, lp;
- png_uint_32 sum = 0, lmins = mins;
-@@ -2704,7 +2608,7 @@
- best_row = png_ptr->up_row;
- }
-
-- else if (filter_to_do & PNG_FILTER_UP)
-+ else if ((filter_to_do & PNG_FILTER_UP) != 0)
- {
- png_bytep rp, dp, pp;
- png_uint_32 sum = 0, lmins = mins;
-@@ -2818,7 +2722,7 @@
- best_row = png_ptr->avg_row;
- }
-
-- else if (filter_to_do & PNG_FILTER_AVG)
-+ else if ((filter_to_do & PNG_FILTER_AVG) != 0)
- {
- png_bytep rp, dp, pp, lp;
- png_uint_32 sum = 0, lmins = mins;
-@@ -2920,7 +2824,7 @@
- }
-
- /* Paeth filter */
-- if (filter_to_do == PNG_FILTER_PAETH)
-+ if ((filter_to_do == PNG_FILTER_PAETH) != 0)
- {
- png_bytep rp, dp, pp, cp, lp;
- png_size_t i;
-@@ -2959,7 +2863,7 @@
- best_row = png_ptr->paeth_row;
- }
-
-- else if (filter_to_do & PNG_FILTER_PAETH)
-+ else if ((filter_to_do & PNG_FILTER_PAETH) != 0)
- {
- png_bytep rp, dp, pp, cp, lp;
- png_uint_32 sum = 0, lmins = mins;
-@@ -3029,7 +2933,7 @@
- pc = (p + pc) < 0 ? -(p + pc) : p + pc;
- #endif
- p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
--#else /* PNG_SLOW_PAETH */
-+#else /* SLOW_PAETH */
- p = a + b - c;
- pa = abs(p - a);
- pb = abs(p - b);
-@@ -3043,7 +2947,7 @@
-
- else
- p = c;
--#endif /* PNG_SLOW_PAETH */
-+#endif /* SLOW_PAETH */
-
- v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-
-@@ -3092,10 +2996,10 @@
- best_row = png_ptr->paeth_row;
- }
- }
--#endif /* PNG_WRITE_FILTER_SUPPORTED */
-+#endif /* WRITE_FILTER */
-+
- /* Do the actual writing of the filtered row data from the chosen filter. */
--
-- png_write_filtered_row(png_ptr, best_row);
-+ png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1);
-
- #ifdef PNG_WRITE_FILTER_SUPPORTED
- #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-@@ -3112,74 +3016,20 @@
- png_ptr->prev_filters[j] = best_row[0];
- }
- #endif
--#endif /* PNG_WRITE_FILTER_SUPPORTED */
-+#endif /* WRITE_FILTER */
- }
-
-
- /* Do the actual writing of a previously filtered row. */
- static void
--png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
-+png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
-+ png_size_t full_row_length/*includes filter byte*/)
- {
-- png_size_t avail;
--
- png_debug(1, "in png_write_filtered_row");
-
- png_debug1(2, "filter = %d", filtered_row[0]);
-- /* Set up the zlib input buffer */
--
-- png_ptr->zstream.next_in = filtered_row;
-- png_ptr->zstream.avail_in = 0;
-- avail = png_ptr->row_info.rowbytes + 1;
-- /* Repeat until we have compressed all the data */
-- do
-- {
-- int ret; /* Return of zlib */
--
-- /* Record the number of bytes available - zlib supports at least 65535
-- * bytes at one step, depending on the size of the zlib type 'uInt', the
-- * maximum size zlib can write at once is ZLIB_IO_MAX (from pngpriv.h).
-- * Use this because on 16 bit systems 'rowbytes' can be up to 65536 (i.e.
-- * one more than 16 bits) and, in this case 'rowbytes+1' can overflow a
-- * uInt. ZLIB_IO_MAX can be safely reduced to cause zlib to be called
-- * with smaller chunks of data.
-- */
-- if (png_ptr->zstream.avail_in == 0)
-- {
-- if (avail > ZLIB_IO_MAX)
-- {
-- png_ptr->zstream.avail_in = ZLIB_IO_MAX;
-- avail -= ZLIB_IO_MAX;
-- }
--
-- else
-- {
-- /* So this will fit in the available uInt space: */
-- png_ptr->zstream.avail_in = (uInt)avail;
-- avail = 0;
-- }
-- }
--
-- /* Compress the data */
-- ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
--
-- /* Check for compression errors */
-- if (ret != Z_OK)
-- {
-- if (png_ptr->zstream.msg != NULL)
-- png_error(png_ptr, png_ptr->zstream.msg);
--
-- else
-- png_error(png_ptr, "zlib error");
-- }
--
-- /* See if it is time to write another IDAT */
-- if (!(png_ptr->zstream.avail_out))
-- {
-- /* Write the IDAT and reset the zlib output buffer */
-- png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-- }
-- /* Repeat until all data has been compressed */
-- } while (avail > 0 || png_ptr->zstream.avail_in > 0);
-+
-+ png_compress_IDAT(png_ptr, filtered_row, full_row_length, Z_NO_FLUSH);
-
- /* Swap the current and previous rows */
- if (png_ptr->prev_row != NULL)
-@@ -3202,6 +3052,6 @@
- {
- png_write_flush(png_ptr);
- }
--#endif
-+#endif /* WRITE_FLUSH */
- }
--#endif /* PNG_WRITE_SUPPORTED */
-+#endif /* WRITE */
---- ./jdk/src/share/native/sun/font/layout/LETableReference.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/font/layout/LETableReference.h Fri Apr 10 09:21:28 2015 -0700
-@@ -151,8 +151,8 @@
- if(isEmpty()) {
- //err = LE_MISSING_FONT_TABLE_ERROR;
- clear(); // it's just empty. Not an error.
-- } else if(offset >= fParent->fLength) {
-- LE_DEBUG_TR3("offset out of range: (%p) +%d", NULL, offset);
-+ } else if(offset >= fParent->fLength || (offset & 0x01)) {
-+ LE_DEBUG_TR3("offset out of range or odd alignment: (%p) +%d", NULL, offset);
- err = LE_INDEX_OUT_OF_BOUNDS_ERROR;
- clear();
- } else {
---- ./jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -115,7 +115,7 @@
- LE_DEBUG_BAD_FONT("off end of ligature substitution header");
- return newState; // get out! bad font
- }
-- if(componentGlyph > glyphStorage.getGlyphCount()) {
-+ if(componentGlyph >= glyphStorage.getGlyphCount()) {
- LE_DEBUG_BAD_FONT("preposterous componentGlyph");
- currGlyph++;
- return newState; // get out! bad font
---- ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -119,7 +119,7 @@
-
- offset = action & lafComponentOffsetMask;
- if (offset != 0) {
-- if(componentGlyph > glyphStorage.getGlyphCount()) {
-+ if(componentGlyph >= glyphStorage.getGlyphCount()) {
- LE_DEBUG_BAD_FONT("preposterous componentGlyph");
- currGlyph+= dir;
- return nextStateIndex; // get out! bad font
---- ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -58,7 +58,7 @@
- if( LE_FAILURE(success) ) { return 0; }
- le_uint16 ligCount = SWAPW(ligSetTable->ligatureCount);
-
-- LEReferenceTo<Offset> ligatureTableOffsetArray(base, success, ligSetTable->ligatureTableOffsetArray, ligCount);
-+ LEReferenceToArrayOf<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]);
- LEReferenceTo<LigatureTable> ligTable(ligSetTable, success, ligTableOffset);
---- ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -255,6 +255,7 @@
-
- if (requiredFeatureIndex != 0xFFFF) {
- requiredFeatureTable = featureListTable->getFeatureTable(featureListTable, requiredFeatureIndex, &requiredFeatureTag, success);
-+ if (LE_FAILURE(success)) return;
- featureReferences += SWAPW(requiredFeatureTable->lookupCount);
- }
-
-@@ -292,7 +293,7 @@
- }
-
- featureTable = featureListTable->getFeatureTable(featureListTable, featureIndex, &featureTag, success);
--
-+ if (LE_FAILURE(success)) continue;
- if (featureTag == fm.tag) {
- count += selectLookups(featureTable, fm.mask, order + count, success);
- }
-@@ -319,7 +320,7 @@
- #endif
-
- featureTable = featureListTable->getFeatureTable(featureListTable, featureIndex, &featureTag, success);
--
-+ if (LE_FAILURE(success)) continue;
- if (featureTag == fm.tag) {
- order += selectLookups(featureTable, fm.mask, order, success);
- }
---- ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -71,7 +71,12 @@
- if (coverageIndex >= 0 && coverageIndex < seqCount) {
- Offset sequenceTableOffset = SWAPW(sequenceTableOffsetArray[coverageIndex]);
- LEReferenceTo<SequenceTable> sequenceTable(base, success, sequenceTableOffset);
-+ if (LE_FAILURE(success)) {
-+ return 0;
-+ }
- le_uint16 glyphCount = SWAPW(sequenceTable->glyphCount);
-+ LEReferenceToArrayOf<Offset>
-+ substituteArrayRef(base, success, sequenceTable->substituteArray, glyphCount);
-
- if (glyphCount == 0) {
- glyphIterator->setCurrGlyphID(0xFFFF);
---- ./jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h Fri Apr 10 09:21:28 2015 -0700
-@@ -30,6 +30,8 @@
- extern "C" {
- #endif
-
-+#include <stddef.h>
-+
- #include "java_awt_AlphaComposite.h"
-
- #include "SurfaceData.h"
-@@ -484,7 +486,9 @@
- #define ArraySize(A) (sizeof(A) / sizeof(A[0]))
-
- #define PtrAddBytes(p, b) ((void *) (((intptr_t) (p)) + (b)))
--#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, (y)*(yinc) + (x)*(xinc))
-+#define PtrCoord(p, x, xinc, y, yinc) PtrAddBytes(p, \
-+ ((ptrdiff_t)(y))*(yinc) + \
-+ ((ptrdiff_t)(x))*(xinc))
-
- /*
- * The function to call with an array of NativePrimitive structures
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c Fri Apr 10 09:21:28 2015 -0700
-@@ -110,6 +110,7 @@
- emit_inet("StandardSocketOptions.IP_MULTICAST_LOOP", IPPROTO_IP, IP_MULTICAST_LOOP);
-
- #ifdef AF_INET6
-+ emit_inet6("StandardSocketOptions.IP_TOS", IPPROTO_IPV6, IPV6_TCLASS);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_IF", IPPROTO_IPV6, IPV6_MULTICAST_IF);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_TTL", IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_LOOP", IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
---- ./jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c Fri Apr 10 09:21:28 2015 -0700
-@@ -26,6 +26,7 @@
- #include "sun_security_jgss_wrapper_GSSLibStub.h"
- #include "NativeUtil.h"
- #include "NativeFunc.h"
-+#include "jlong.h"
-
- /* Constants for indicating what type of info is needed for inqueries */
- const int TYPE_CRED_NAME = 10;
-@@ -75,14 +76,14 @@
- jclass jcls,
- jbyteArray jbytes) {
- gss_OID cOid;
-- int i, len;
-+ unsigned int i, len;
- jbyte* bytes;
- jthrowable gssEx;
- jboolean found;
-
- if (jbytes != NULL) {
- found = JNI_FALSE;
-- len = (*env)->GetArrayLength(env, jbytes) - 2;
-+ len = (unsigned int)((*env)->GetArrayLength(env, jbytes) - 2);
- bytes = (*env)->GetByteArrayElements(env, jbytes, NULL);
- if (bytes != NULL) {
- for (i = 0; i < ftab->mechs->count; i++) {
-@@ -98,9 +99,9 @@
- }
- if (found != JNI_TRUE) {
- checkStatus(env, NULL, GSS_S_BAD_MECH, 0, "[GSSLibStub_getMechPtr]");
-- return NULL;
-- } else return cOid;
-- } else return GSS_C_NO_OID;
-+ return ptr_to_jlong(NULL);
-+ } else return ptr_to_jlong(cOid);
-+ } else return ptr_to_jlong(GSS_C_NO_OID);
- }
-
-
-@@ -244,7 +245,7 @@
-
- if (ftab->inquireNamesForMech != NULL) {
-
-- mech = (gss_OID) (*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech);
-+ mech = (gss_OID)jlong_to_ptr((*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech));
- nameTypes = GSS_C_NO_OID_SET;
-
- /* gss_inquire_names_for_mech(...) => N/A */
-@@ -273,7 +274,7 @@
- OM_uint32 minor, major;
- gss_name_t nameHdl;
-
-- nameHdl = (gss_name_t) pName;
-+ nameHdl = (gss_name_t) jlong_to_ptr(pName);
-
- sprintf(debugBuf, "[GSSLibStub_releaseName] %ld", (long) pName);
- debug(env, debugBuf);
-@@ -319,7 +320,7 @@
- resetGSSBuffer(env, jnameVal, &nameVal);
-
- checkStatus(env, jobj, major, minor, "[GSSLibStub_importName]");
-- return (jlong) nameHdl;
-+ return ptr_to_jlong(nameHdl);
- }
-
-
-@@ -339,8 +340,8 @@
- int isEqual;
-
- isEqual = 0;
-- nameHdl1 = (gss_name_t) pName1;
-- nameHdl2 = (gss_name_t) pName2;
-+ nameHdl1 = (gss_name_t) jlong_to_ptr(pName1);
-+ nameHdl2 = (gss_name_t) jlong_to_ptr(pName2);
-
- sprintf(debugBuf, "[GSSLibStub_compareName] %ld %ld", (long) pName1,
- (long) pName2);
-@@ -370,12 +371,12 @@
- gss_name_t nameHdl, mnNameHdl;
- gss_OID mech;
-
-- nameHdl = (gss_name_t) pName;
-+ nameHdl = (gss_name_t) jlong_to_ptr(pName);
- sprintf(debugBuf, "[GSSLibStub_canonicalizeName] %ld", (long) pName);
- debug(env, debugBuf);
-
- if (nameHdl != GSS_C_NO_NAME) {
-- mech = (gss_OID) (*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech);
-+ mech = (gss_OID) jlong_to_ptr((*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech));
- mnNameHdl = GSS_C_NO_NAME;
-
- /* gss_canonicalize_name(...) may return GSS_S_BAD_NAMETYPE,
-@@ -391,7 +392,7 @@
- checkStatus(env, jobj, major, minor, "[GSSLibStub_canonicalizeName]");
- } else mnNameHdl = GSS_C_NO_NAME;
-
-- return (jlong) mnNameHdl;
-+ return ptr_to_jlong(mnNameHdl);
- }
-
- /*
-@@ -408,7 +409,7 @@
- gss_buffer_desc outBuf;
- jbyteArray jresult;
-
-- nameHdl = (gss_name_t) pName;
-+ nameHdl = (gss_name_t) jlong_to_ptr(pName);
- sprintf(debugBuf, "[GSSLibStub_exportName] %ld", (long) pName);
- debug(env, debugBuf);
-
-@@ -420,16 +421,16 @@
- if (major == GSS_S_NAME_NOT_MN) {
- debug(env, "[GSSLibStub_exportName] canonicalize and re-try");
-
-- mNameHdl = (gss_name_t)
-+ mNameHdl = (gss_name_t)jlong_to_ptr(
- Java_sun_security_jgss_wrapper_GSSLibStub_canonicalizeName
-- (env, jobj, pName);
-+ (env, jobj, pName));
- /* return immediately if an exception has occurred */
- if ((*env)->ExceptionCheck(env)) {
- return NULL;
- }
- major = (*ftab->exportName)(&minor, mNameHdl, &outBuf);
- Java_sun_security_jgss_wrapper_GSSLibStub_releaseName
-- (env, jobj, (jlong) mNameHdl);
-+ (env, jobj, ptr_to_jlong(mNameHdl));
- /* return immediately if an exception has occurred */
- if ((*env)->ExceptionCheck(env)) {
- return NULL;
-@@ -460,7 +461,7 @@
- jobject jtype;
- jobjectArray jresult;
-
-- nameHdl = (gss_name_t) pName;
-+ nameHdl = (gss_name_t) jlong_to_ptr(pName);
- sprintf(debugBuf, "[GSSLibStub_displayName] %ld", (long) pName);
- debug(env, debugBuf);
-
-@@ -512,10 +513,10 @@
- debug(env, "[GSSLibStub_acquireCred]");
-
-
-- mech = (gss_OID) (*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech);
-+ mech = (gss_OID) jlong_to_ptr((*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech));
- mechs = newGSSOIDSet(env, mech);
- credUsage = (gss_cred_usage_t) usage;
-- nameHdl = (gss_name_t) pName;
-+ nameHdl = (gss_name_t) jlong_to_ptr(pName);
- credHdl = GSS_C_NO_CREDENTIAL;
-
- sprintf(debugBuf, "[GSSLibStub_acquireCred] pName=%ld, usage=%d",
-@@ -534,7 +535,7 @@
- debug(env, debugBuf);
-
- checkStatus(env, jobj, major, minor, "[GSSLibStub_acquireCred]");
-- return (jlong) credHdl;
-+ return ptr_to_jlong(credHdl);
- }
-
- /*
-@@ -550,9 +551,9 @@
- OM_uint32 minor, major;
- gss_cred_id_t credHdl;
-
-- credHdl = (gss_cred_id_t) pCred;
-+ credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
-
-- sprintf(debugBuf, "[GSSLibStub_releaseCred] %ld", pCred);
-+ sprintf(debugBuf, "[GSSLibStub_releaseCred] %ld", (long int)pCred);
- debug(env, debugBuf);
-
- if (credHdl != GSS_C_NO_CREDENTIAL) {
-@@ -562,7 +563,7 @@
-
- checkStatus(env, jobj, major, minor, "[GSSLibStub_releaseCred]");
- }
-- return (jlong) credHdl;
-+ return ptr_to_jlong(credHdl);
- }
-
- /*
-@@ -570,7 +571,7 @@
- */
- void inquireCred(JNIEnv *env, jobject jobj, gss_cred_id_t pCred,
- jint type, void *result) {
-- OM_uint32 minor, major;
-+ OM_uint32 minor, major=GSS_C_QOP_DEFAULT;
- OM_uint32 routineErr;
- gss_cred_id_t credHdl;
-
-@@ -617,9 +618,9 @@
- gss_name_t nameHdl;
- gss_cred_id_t credHdl;
-
-- credHdl = (gss_cred_id_t) pCred;
-+ credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
-
-- sprintf(debugBuf, "[GSSLibStub_getCredName] %ld", pCred);
-+ sprintf(debugBuf, "[GSSLibStub_getCredName] %ld", (long int)pCred);
- debug(env, debugBuf);
-
- nameHdl = GSS_C_NO_NAME;
-@@ -633,7 +634,7 @@
- sprintf(debugBuf, "[GSSLibStub_getCredName] pName=%ld", (long) nameHdl);
- debug(env, debugBuf);
-
-- return (jlong) nameHdl;
-+ return ptr_to_jlong(nameHdl);
- }
-
- /*
-@@ -649,9 +650,9 @@
- gss_cred_id_t credHdl;
- OM_uint32 lifetime;
-
-- credHdl = (gss_cred_id_t) pCred;
-+ credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
-
-- sprintf(debugBuf, "[GSSLibStub_getCredTime] %ld", pCred);
-+ sprintf(debugBuf, "[GSSLibStub_getCredTime] %ld", (long int)pCred);
- debug(env, debugBuf);
-
- lifetime = 0;
-@@ -677,9 +678,9 @@
- gss_cred_usage_t usage;
- gss_cred_id_t credHdl;
-
-- credHdl = (gss_cred_id_t) pCred;
-+ credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
-
-- sprintf(debugBuf, "[GSSLibStub_getCredUsage] %ld", pCred);
-+ sprintf(debugBuf, "[GSSLibStub_getCredUsage] %ld", (long int)pCred);
- debug(env, debugBuf);
-
- inquireCred(env, jobj, credHdl, TYPE_CRED_USAGE, &usage);
-@@ -738,13 +739,13 @@
- return NULL;
- }
-
-- mech2 = (gss_OID) (*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech);
-+ mech2 = (gss_OID) jlong_to_ptr((*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech));
-
- if (sameMech(env, mech, mech2) == JNI_TRUE) {
- /* mech match - return the context object */
- return (*env)->NewObject(env, CLS_NativeGSSContext,
- MID_NativeGSSContext_ctor,
-- (jlong) contextHdl, jobj);
-+ ptr_to_jlong(contextHdl), jobj);
- } else {
- /* mech mismatch - clean up then return null */
- major = (*ftab->deleteSecContext)(&minor, &contextHdl, GSS_C_NO_BUFFER);
-@@ -784,11 +785,11 @@
- */
- debug(env, "[GSSLibStub_initContext]");
-
-- credHdl = (gss_cred_id_t) pCred;
-- contextHdl = (gss_ctx_id_t)
-- (*env)->GetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext);
-- targetName = (gss_name_t) pName;
-- mech = (gss_OID) (*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech);
-+ credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(
-+ (*env)->GetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext));
-+ targetName = (gss_name_t) jlong_to_ptr(pName);
-+ mech = (gss_OID) jlong_to_ptr((*env)->GetLongField(env, jobj, FID_GSSLibStub_pMech));
- flags = (OM_uint32) (*env)->GetIntField(env, jcontextSpi,
- FID_NativeGSSContext_flags);
- time = getGSSTime((*env)->GetIntField(env, jcontextSpi,
-@@ -821,7 +822,7 @@
- if (GSS_ERROR(major) == GSS_S_COMPLETE) {
- /* update member values if needed */
- (*env)->SetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext,
-- (jlong) contextHdl);
-+ ptr_to_jlong(contextHdl));
- (*env)->SetIntField(env, jcontextSpi, FID_NativeGSSContext_flags, aFlags);
- sprintf(debugBuf, "[GSSLibStub_initContext] set flags=0x%x", aFlags);
- debug(env, debugBuf);
-@@ -879,7 +880,7 @@
- OM_uint32 aFlags;
- OM_uint32 aTime;
- gss_cred_id_t delCred;
-- jobject jsrcName;
-+ jobject jsrcName=GSS_C_NO_NAME;
- jobject jdelCred;
- jobject jMech;
- jbyteArray jresult;
-@@ -889,9 +890,9 @@
-
- debug(env, "[GSSLibStub_acceptContext]");
-
-- contextHdl = (gss_ctx_id_t)
-- (*env)->GetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext);
-- credHdl = (gss_cred_id_t) pCred;
-+ contextHdl = (gss_ctx_id_t)jlong_to_ptr(
-+ (*env)->GetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext));
-+ credHdl = (gss_cred_id_t) jlong_to_ptr(pCred);
- initGSSBuffer(env, jinToken, &inToken);
- cb = getGSSCB(env, jcb);
- srcName = GSS_C_NO_NAME;
-@@ -922,7 +923,7 @@
- if (GSS_ERROR(major) == GSS_S_COMPLETE) {
- /* update member values if needed */
- (*env)->SetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext,
-- (jlong) contextHdl);
-+ ptr_to_jlong(contextHdl));
- sprintf(debugBuf, "[GSSLibStub_acceptContext] set pContext=%ld",
- (long)contextHdl);
- debug(env, debugBuf);
-@@ -940,7 +941,7 @@
- NULL, NULL);
- jtargetName = (*env)->NewObject(env, CLS_GSSNameElement,
- MID_GSSNameElement_ctor,
-- (jlong) targetName, jobj);
-+ ptr_to_jlong(targetName), jobj);
-
- /* return immediately if an exception has occurred */
- if ((*env)->ExceptionCheck(env)) {
-@@ -955,7 +956,7 @@
- if (srcName != GSS_C_NO_NAME) {
- jsrcName = (*env)->NewObject(env, CLS_GSSNameElement,
- MID_GSSNameElement_ctor,
-- (jlong) srcName, jobj);
-+ ptr_to_jlong(srcName), jobj);
- /* return immediately if an exception has occurred */
- if ((*env)->ExceptionCheck(env)) {
- return NULL;
-@@ -981,7 +982,7 @@
- if (delCred != GSS_C_NO_CREDENTIAL) {
- jdelCred = (*env)->NewObject(env, CLS_GSSCredElement,
- MID_GSSCredElement_ctor,
-- (jlong) delCred, jsrcName, jMech);
-+ ptr_to_jlong(delCred), jsrcName, jMech);
- /* return immediately if an exception has occurred */
- if ((*env)->ExceptionCheck(env)) {
- return NULL;
-@@ -1031,7 +1032,7 @@
- jlong result[6];
- jlongArray jresult;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
-
- sprintf(debugBuf, "[GSSLibStub_inquireContext] %ld", (long)contextHdl);
- debug(env, debugBuf);
-@@ -1051,8 +1052,8 @@
- (long)targetName);
- debug(env, debugBuf);
-
-- result[0] = (jlong) srcName;
-- result[1] = (jlong) targetName;
-+ result[0] = ptr_to_jlong(srcName);
-+ result[1] = ptr_to_jlong(targetName);
- result[2] = (jlong) isInitiator;
- result[3] = (jlong) isEstablished;
- result[4] = (jlong) flags;
-@@ -1081,9 +1082,9 @@
- gss_OID mech;
- gss_ctx_id_t contextHdl;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
-
-- sprintf(debugBuf, "[GSSLibStub_getContextMech] %ld", pContext);
-+ sprintf(debugBuf, "[GSSLibStub_getContextMech] %ld", (long int)pContext);
- debug(env, debugBuf);
-
- major = (*ftab->inquireContext)(&minor, contextHdl, NULL, NULL,
-@@ -1111,7 +1112,7 @@
- gss_name_t nameHdl;
- gss_ctx_id_t contextHdl;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
-
- sprintf(debugBuf, "[GSSLibStub_getContextName] %ld, isSrc=%d",
- (long)contextHdl, isSrc);
-@@ -1129,13 +1130,13 @@
- checkStatus(env, jobj, major, minor, "[GSSLibStub_inquireContextAll]");
- /* return immediately if an exception has occurred */
- if ((*env)->ExceptionCheck(env)) {
-- return (long)NULL;
-+ return ptr_to_jlong(NULL);
- }
-
- sprintf(debugBuf, "[GSSLibStub_getContextName] pName=%ld", (long) nameHdl);
- debug(env, debugBuf);
-
-- return (jlong) nameHdl;
-+ return ptr_to_jlong(nameHdl);
- }
-
- /*
-@@ -1151,7 +1152,7 @@
- gss_ctx_id_t contextHdl;
- OM_uint32 time;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_getContextTime] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-@@ -1180,17 +1181,17 @@
- OM_uint32 minor, major;
- gss_ctx_id_t contextHdl;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_deleteContext] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-- if (contextHdl == GSS_C_NO_CONTEXT) return GSS_C_NO_CONTEXT;
-+ if (contextHdl == GSS_C_NO_CONTEXT) return ptr_to_jlong(GSS_C_NO_CONTEXT);
-
- /* gss_delete_sec_context(...) => GSS_S_NO_CONTEXT(!) */
- major = (*ftab->deleteSecContext)(&minor, &contextHdl, GSS_C_NO_BUFFER);
-
- checkStatus(env, jobj, major, minor, "[GSSLibStub_deleteContext]");
-- return (jlong) contextHdl;
-+ return (jlong) ptr_to_jlong(contextHdl);
- }
-
- /*
-@@ -1211,7 +1212,7 @@
- OM_uint32 outSize, maxInSize;
- gss_qop_t qop;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_wrapSizeLimit] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-@@ -1244,7 +1245,7 @@
- gss_buffer_desc interProcToken;
- jbyteArray jresult;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_exportContext] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-@@ -1281,7 +1282,7 @@
- gss_buffer_desc msgToken;
- jbyteArray jresult;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_getMic] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-@@ -1290,7 +1291,7 @@
- checkStatus(env, jobj, GSS_S_CONTEXT_EXPIRED, 0, "[GSSLibStub_getMic]");
- return NULL;
- }
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- qop = (gss_qop_t) jqop;
- initGSSBuffer(env, jmsg, &msg);
-
-@@ -1326,7 +1327,7 @@
- gss_buffer_desc msgToken;
- gss_qop_t qop;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_verifyMic] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-@@ -1376,7 +1377,7 @@
- gss_ctx_id_t contextHdl;
- jbyteArray jresult;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_wrap] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
-@@ -1427,7 +1428,7 @@
- gss_qop_t qop;
- jbyteArray jresult;
-
-- contextHdl = (gss_ctx_id_t) pContext;
-+ contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
- sprintf(debugBuf, "[GSSLibStub_unwrap] %ld", (long)contextHdl);
- debug(env, debugBuf);
-
---- ./jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c Fri Apr 10 09:21:28 2015 -0700
-@@ -25,6 +25,7 @@
-
- #include "NativeUtil.h"
- #include "NativeFunc.h"
-+#include "jlong.h"
-
- const int JAVA_DUPLICATE_TOKEN_CODE = 19; /* DUPLICATE_TOKEN */
- const int JAVA_OLD_TOKEN_CODE = 20; /* OLD_TOKEN */
-@@ -412,7 +413,7 @@
- OM_uint32 result;
-
- /* special handle values equal to JAVA_MAX */
-- if (jtime == JAVA_MAX) {
-+ if (jtime == (jint)JAVA_MAX) {
- result = GSS_C_INDEFINITE;
- } else {
- result = jtime;
-@@ -482,7 +483,7 @@
-
- messageContext = 0;
- if (jstub != NULL) {
-- mech = (gss_OID) (*env)->GetLongField(env, jstub, FID_GSSLibStub_pMech);
-+ mech = (gss_OID) jlong_to_ptr((*env)->GetLongField(env, jstub, FID_GSSLibStub_pMech));
- } else {
- mech = GSS_C_NO_OID;
- }
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c Fri Apr 10 09:21:28 2015 -0700
-@@ -422,6 +422,7 @@
- jfieldID jFieldID;
- jlong jType;
- jobject jPValue;
-+ memset(&ckAttribute, 0, sizeof(CK_ATTRIBUTE));
-
- // TBD: what if jAttribute == NULL?!
-
-@@ -1577,6 +1578,7 @@
- CK_RSA_PKCS_PSS_PARAMS ckParam;
- jfieldID fieldID;
- jlong jHashAlg, jMgf, jSLen;
-+ memset(&ckParam, 0, sizeof(CK_RSA_PKCS_PSS_PARAMS));
-
- /* get hashAlg */
- jRsaPkcsPssParamsClass = (*env)->FindClass(env, CLASS_RSA_PKCS_PSS_PARAMS);
-@@ -1617,6 +1619,7 @@
- jfieldID fieldID;
- jlong jLong;
- jobject jSharedData, jPublicData;
-+ memset(&ckParam, 0, sizeof(CK_ECDH1_DERIVE_PARAMS));
-
- /* get kdf */
- jEcdh1DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH1_DERIVE_PARAMS);
-@@ -1663,6 +1666,7 @@
- jfieldID fieldID;
- jlong jKdf, jPrivateDataLen, jPrivateData;
- jobject jSharedData, jPublicData, jPublicData2;
-+ memset(&ckParam, 0, sizeof(CK_ECDH2_DERIVE_PARAMS));
-
- /* get kdf */
- jEcdh2DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH2_DERIVE_PARAMS);
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c Fri Apr 10 09:21:28 2015 -0700
-@@ -180,14 +180,14 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directIn != 0) {
-- inBufP = (CK_BYTE_PTR) directIn;
-+ inBufP = (CK_BYTE_PTR) jlong_to_ptr(directIn);
- } else {
- inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
- if (inBufP == NULL) { return 0; }
- }
-
- if (directOut != 0) {
-- outBufP = (CK_BYTE_PTR) directOut;
-+ outBufP = (CK_BYTE_PTR) jlong_to_ptr(directOut);
- } else {
- outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
- if (outBufP == NULL) {
-@@ -249,7 +249,7 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directOut != 0) {
-- outBufP = (CK_BYTE_PTR) directOut;
-+ outBufP = (CK_BYTE_PTR) jlong_to_ptr(directOut);
- } else {
- outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
- if (outBufP == NULL) { return 0; }
-@@ -401,14 +401,14 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directIn != 0) {
-- inBufP = (CK_BYTE_PTR) directIn;
-+ inBufP = (CK_BYTE_PTR) jlong_to_ptr(directIn);
- } else {
- inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
- if (inBufP == NULL) { return 0; }
- }
-
- if (directOut != 0) {
-- outBufP = (CK_BYTE_PTR) directOut;
-+ outBufP = (CK_BYTE_PTR) jlong_to_ptr(directOut);
- } else {
- outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
- if (outBufP == NULL) {
-@@ -465,7 +465,7 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directOut != 0) {
-- outBufP = (CK_BYTE_PTR) directOut;
-+ outBufP = (CK_BYTE_PTR) jlong_to_ptr(directOut);
- } else {
- outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
- if (outBufP == NULL) { return 0; }
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c Fri Apr 10 09:21:28 2015 -0700
-@@ -51,6 +51,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-+#include "jlong.h"
-
- #include "sun_security_pkcs11_wrapper_PKCS11.h"
-
-@@ -178,7 +179,7 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directIn != 0) {
-- rv = (*ckpFunctions->C_DigestUpdate)(ckSessionHandle, (CK_BYTE_PTR)directIn, jInLen);
-+ rv = (*ckpFunctions->C_DigestUpdate)(ckSessionHandle, (CK_BYTE_PTR)jlong_to_ptr(directIn), jInLen);
- ckAssertReturnValueOK(env, rv);
- return;
- }
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c Fri Apr 10 09:21:28 2015 -0700
-@@ -250,10 +250,12 @@
- (JNIEnv *env, jobject obj)
- {
- CK_INFO ckLibInfo;
-- jobject jInfoObject;
-+ jobject jInfoObject=NULL;
- CK_RV rv;
-+ CK_FUNCTION_LIST_PTR ckpFunctions;
-+ memset(&ckLibInfo, 0, sizeof(CK_INFO));
-
-- CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
-+ ckpFunctions = getFunctionList(env, obj);
- if (ckpFunctions == NULL) { return NULL; }
-
- rv = (*ckpFunctions->C_GetInfo)(&ckLibInfo);
-@@ -381,7 +383,7 @@
- {
- CK_SLOT_ID ckSlotID;
- CK_SLOT_INFO ckSlotInfo;
-- jobject jSlotInfoObject;
-+ jobject jSlotInfoObject=NULL;
- CK_RV rv;
-
- CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
-@@ -393,7 +395,7 @@
- if (ckAssertReturnValueOK(env, rv) == CK_ASSERT_OK) {
- jSlotInfoObject = ckSlotInfoPtrToJSlotInfo(env, &ckSlotInfo);
- }
-- return jSlotInfoObject ;
-+ return jSlotInfoObject;
- }
-
- /*
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c Fri Apr 10 09:21:28 2015 -0700
-@@ -256,7 +256,7 @@
- {
- CK_SESSION_HANDLE ckSessionHandle;
- CK_SESSION_INFO ckSessionInfo;
-- jobject jSessionInfo;
-+ jobject jSessionInfo=NULL;
- CK_RV rv;
-
- CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c Fri Apr 10 09:21:28 2015 -0700
-@@ -51,6 +51,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-+#include "jlong.h"
-
- #include "sun_security_pkcs11_wrapper_PKCS11.h"
-
-@@ -198,7 +199,7 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directIn != 0) {
-- rv = (*ckpFunctions->C_SignUpdate)(ckSessionHandle, (CK_BYTE_PTR)directIn, jInLen);
-+ rv = (*ckpFunctions->C_SignUpdate)(ckSessionHandle, (CK_BYTE_PTR) jlong_to_ptr(directIn), jInLen);
- ckAssertReturnValueOK(env, rv);
- return;
- }
-@@ -262,7 +263,7 @@
-
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
-- if ((jExpectedLength > 0) && (jExpectedLength < ckSignatureLength)) {
-+ if ((jExpectedLength > 0) && ((CK_ULONG)jExpectedLength < ckSignatureLength)) {
- ckSignatureLength = jExpectedLength;
- }
-
-@@ -496,7 +497,7 @@
- ckSessionHandle = jLongToCKULong(jSessionHandle);
-
- if (directIn != 0) {
-- rv = (*ckpFunctions->C_VerifyUpdate)(ckSessionHandle, (CK_BYTE_PTR)directIn, jInLen);
-+ rv = (*ckpFunctions->C_VerifyUpdate)(ckSessionHandle, (CK_BYTE_PTR)jlong_to_ptr(directIn), jInLen);
- ckAssertReturnValueOK(env, rv);
- return;
- }
---- ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c Fri Apr 10 09:21:28 2015 -0700
-@@ -106,7 +106,7 @@
- if (moduleData == NULL) {
- return ;
- }
-- (*env)->SetLongField(env, pkcs11Implementation, pNativeDataID, (jlong)moduleData);
-+ (*env)->SetLongField(env, pkcs11Implementation, pNativeDataID, ptr_to_jlong(moduleData));
- }
-
-
-@@ -120,7 +120,7 @@
- return NULL;
- }
- jData = (*env)->GetLongField(env, pkcs11Implementation, pNativeDataID);
-- return (ModuleData*)jData;
-+ return (ModuleData*)jlong_to_ptr(jData);
- }
-
- CK_FUNCTION_LIST_PTR getFunctionList(JNIEnv *env, jobject pkcs11Implementation) {
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd Fri Apr 10 09:21:28 2015 -0700
-@@ -35,6 +35,7 @@
- import java.io.InputStream;
- import java.io.OutputStream;
- import java.util.Arrays;
-+import java.util.Locale;
- import java.util.concurrent.Executors;
- import java.util.concurrent.Executor;
- import java.util.concurrent.ThreadFactory;
-@@ -99,7 +100,7 @@
- "jdk.lang.Process.launchMechanism", "posix_spawn");
-
- try {
-- return LaunchMechanism.valueOf(s.toUpperCase());
-+ return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH));
- } catch (IllegalArgumentException e) {
- throw new Error(s + " is not a supported " +
- "process launch mechanism on this platform.");
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Fri Apr 10 09:21:28 2015 -0700
-@@ -35,6 +35,7 @@
- import java.io.InputStream;
- import java.io.OutputStream;
- import java.util.Arrays;
-+import java.util.Locale;
- import java.util.concurrent.Executors;
- import java.util.concurrent.Executor;
- import java.util.concurrent.ThreadFactory;
-@@ -100,7 +101,7 @@
- "jdk.lang.Process.launchMechanism", "vfork");
-
- try {
-- return LaunchMechanism.valueOf(s.toUpperCase());
-+ return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH));
- } catch (IllegalArgumentException e) {
- throw new Error(s + " is not a supported " +
- "process launch mechanism on this platform.");
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris Fri Apr 10 09:21:28 2015 -0700
-@@ -26,6 +26,7 @@
- package java.lang;
-
- import java.io.*;
-+import java.util.Locale;
- import java.security.AccessController;
- import java.security.PrivilegedAction;
-
-@@ -89,7 +90,7 @@
- "jdk.lang.Process.launchMechanism", "fork");
-
- try {
-- return LaunchMechanism.valueOf(s.toUpperCase());
-+ return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH));
- } catch (IllegalArgumentException e) {
- throw new Error(s + " is not a supported " +
- "process launch mechanism on this platform.");
---- ./jdk/src/solaris/classes/java/net/PlainDatagramSocketImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/java/net/PlainDatagramSocketImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -25,6 +25,11 @@
- package java.net;
-
- import java.io.IOException;
-+import java.util.Set;
-+import java.util.HashSet;
-+import java.util.Collections;
-+import jdk.net.*;
-+import static sun.net.ExtendedOptionsImpl.*;
-
- /*
- * On Unix systems we simply delegate to native methods.
-@@ -38,6 +43,32 @@
- init();
- }
-
-+ protected <T> void setOption(SocketOption<T> name, T value) throws IOException {
-+ if (!name.equals(ExtendedSocketOptions.SO_FLOW_SLA)) {
-+ super.setOption(name, value);
-+ } else {
-+ if (isClosed()) {
-+ throw new SocketException("Socket closed");
-+ }
-+ checkSetOptionPermission(name);
-+ checkValueType(value, SocketFlow.class);
-+ setFlowOption(getFileDescriptor(), (SocketFlow)value);
-+ }
-+ }
-+
-+ protected <T> T getOption(SocketOption<T> name) throws IOException {
-+ if (!name.equals(ExtendedSocketOptions.SO_FLOW_SLA)) {
-+ return super.getOption(name);
-+ }
-+ if (isClosed()) {
-+ throw new SocketException("Socket closed");
-+ }
-+ checkGetOptionPermission(name);
-+ SocketFlow flow = SocketFlow.create();
-+ getFlowOption(getFileDescriptor(), flow);
-+ return (T)flow;
-+ }
-+
- protected synchronized native void bind0(int lport, InetAddress laddr)
- throws SocketException;
-
---- ./jdk/src/solaris/classes/java/net/PlainSocketImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/java/net/PlainSocketImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -26,6 +26,12 @@
-
- import java.io.IOException;
- import java.io.FileDescriptor;
-+import java.util.Set;
-+import java.util.HashSet;
-+import java.util.Collections;
-+import jdk.net.*;
-+
-+import static sun.net.ExtendedOptionsImpl.*;
-
- /*
- * On Unix systems we simply delegate to native methods.
-@@ -51,6 +57,32 @@
- this.fd = fd;
- }
-
-+ protected <T> void setOption(SocketOption<T> name, T value) throws IOException {
-+ if (!name.equals(ExtendedSocketOptions.SO_FLOW_SLA)) {
-+ super.setOption(name, value);
-+ } else {
-+ if (isClosedOrPending()) {
-+ throw new SocketException("Socket closed");
-+ }
-+ checkSetOptionPermission(name);
-+ checkValueType(value, SocketFlow.class);
-+ setFlowOption(getFileDescriptor(), (SocketFlow)value);
-+ }
-+ }
-+
-+ protected <T> T getOption(SocketOption<T> name) throws IOException {
-+ if (!name.equals(ExtendedSocketOptions.SO_FLOW_SLA)) {
-+ return super.getOption(name);
-+ }
-+ if (isClosedOrPending()) {
-+ throw new SocketException("Socket closed");
-+ }
-+ checkGetOptionPermission(name);
-+ SocketFlow flow = SocketFlow.create();
-+ getFlowOption(getFileDescriptor(), flow);
-+ return (T)flow;
-+ }
-+
- native void socketCreate(boolean isServer) throws IOException;
-
- native void socketConnect(InetAddress address, int port, int timeout)
-@@ -77,5 +109,4 @@
- native int socketGetOption(int opt, Object iaContainerObj) throws SocketException;
-
- native void socketSendUrgentData(int data) throws IOException;
--
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XButtonPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XButtonPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -82,9 +82,15 @@
- return true;
- }
-
-- public void setLabel(java.lang.String label) {
-- this.label = label;
-- repaint();
-+ @Override
-+ public void setLabel(String label) {
-+ if (label == null) {
-+ label = "";
-+ }
-+ if (!label.equals(this.label)) {
-+ this.label = label;
-+ repaint();
-+ }
- }
-
- public void paint(Graphics g) {
-@@ -277,10 +283,6 @@
- drawMotif3DRect(g, x, y, w-1, h-1, pressed);
- }
-
-- public void setFont(Font f) {
-- super.setFont(f);
-- target.repaint();
-- }
- protected void paintFocus(Graphics g, int x, int y, int w, int h){
- g.setColor(focusColor);
- g.drawRect(x,y,w,h);
---- ./jdk/src/solaris/classes/sun/awt/X11/XCanvasPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XCanvasPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -103,15 +103,4 @@
- protected boolean doEraseBackground() {
- return !eraseBackgroundDisabled;
- }
-- public void setBackground(Color c) {
-- boolean doRepaint = false;
-- if( getPeerBackground() == null ||
-- !getPeerBackground().equals( c ) ) {
-- doRepaint = true;
-- }
-- super.setBackground(c);
-- if( doRepaint ) {
-- target.repaint();
-- }
-- }
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -31,6 +31,7 @@
- import java.awt.image.BufferedImage;
- import javax.swing.plaf.basic.BasicGraphicsUtils;
- import java.awt.geom.AffineTransform;
-+import java.util.Objects;
-
- import sun.util.logging.PlatformLogger;
-
-@@ -135,14 +136,15 @@
-
- public void keyReleased(KeyEvent e) {}
-
-- public void setLabel(java.lang.String label) {
-- if ( label == null ) {
-- this.label = "";
-- } else {
-+ public void setLabel(String label) {
-+ if (label == null) {
-+ label = "";
-+ }
-+ if (!label.equals(this.label)) {
- this.label = label;
-+ layout();
-+ repaint();
- }
-- layout();
-- repaint();
- }
-
- void handleJavaMouseEvent(MouseEvent e) {
-@@ -384,10 +386,6 @@
- g.drawImage(buffer, x, y, null);
- }
- }
-- public void setFont(Font f) {
-- super.setFont(f);
-- target.repaint();
-- }
-
- public void paintRadioButton(Graphics g, int x, int y, int w, int h) {
-
-@@ -437,10 +435,12 @@
- repaint();
- }
- }
-- public void setCheckboxGroup(CheckboxGroup g) {
-- // If changed from grouped/ungrouped, need to repaint()
-- checkBoxGroup = g;
-- repaint();
-+ public void setCheckboxGroup(final CheckboxGroup g) {
-+ if (!Objects.equals(g, checkBoxGroup)) {
-+ // If changed from grouped/ungrouped, need to repaint()
-+ checkBoxGroup = g;
-+ repaint();
-+ }
- }
-
- // NOTE: This method is called by privileged threads.
---- ./jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -63,6 +63,7 @@
- import java.lang.reflect.*;
- import java.security.*;
- import java.util.Collection;
-+import java.util.Objects;
- import java.util.HashSet;
- import java.util.Set;
- import java.util.Vector;
-@@ -647,18 +648,26 @@
- g.drawLine(x+width, y+height, x+width, y+1); // right
- }
-
-+ @Override
- public void setBackground(Color c) {
- if (log.isLoggable(PlatformLogger.FINE)) log.fine("Set background to " + c);
- synchronized (getStateLock()) {
-+ if (Objects.equals(background, c)) {
-+ return;
-+ }
- background = c;
- }
- super.setBackground(c);
- repaint();
- }
-
-+ @Override
- public void setForeground(Color c) {
- if (log.isLoggable(PlatformLogger.FINE)) log.fine("Set foreground to " + c);
- synchronized (getStateLock()) {
-+ if (Objects.equals(foreground, c)) {
-+ return;
-+ }
- foreground = c;
- }
- repaint();
-@@ -680,18 +689,21 @@
- return sun.font.FontDesignMetrics.getMetrics(font);
- }
-
-+ @Override
- public void setFont(Font f) {
-+ if (f == null) {
-+ f = XWindow.getDefaultFont();
-+ }
- synchronized (getStateLock()) {
-- if (f == null) {
-- f = XWindow.getDefaultFont();
-+ if (f.equals(font)) {
-+ return;
- }
- font = f;
- }
-- // as it stands currently we dont need to do layout or repaint since
-+ // as it stands currently we dont need to do layout since
- // layout is done in the Component upon setFont.
- //layout();
-- // target.repaint();
-- //repaint()?
-+ repaint();
- }
-
- public Font getFont() {
---- ./jdk/src/solaris/classes/sun/awt/X11/XContentWindow.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XContentWindow.java Fri Apr 10 09:21:28 2015 -0700
-@@ -140,7 +140,7 @@
- }
-
-
-- public void handleExposeEvent(Component target, int x, int y, int w, int h) {
-+ public void postPaintEvent(Component target, int x, int y, int w, int h) {
- // TODO: ?
- // get rid of 'istanceof' by subclassing:
- // XContentWindow -> XFrameContentWindow
-@@ -158,13 +158,13 @@
- iconifiedExposeEvents.add(new SavedExposeEvent(target, x, y, w, h));
- } else {
- // Normal case: [it is not a frame or] the frame is not iconified.
-- super.handleExposeEvent(target, x, y, w, h);
-+ super.postPaintEvent(target, x, y, w, h);
- }
- }
-
- void purgeIconifiedExposeEvents() {
- for (SavedExposeEvent evt : iconifiedExposeEvents) {
-- super.handleExposeEvent(evt.target, evt.x, evt.y, evt.w, evt.h);
-+ super.postPaintEvent(evt.target, evt.x, evt.y, evt.w, evt.h);
- }
- iconifiedExposeEvents.clear();
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java Fri Apr 10 09:21:28 2015 -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
-@@ -97,6 +97,7 @@
- * @param handler the synthetic error handler to set
- */
- public static void WITH_XERROR_HANDLER(XErrorHandler handler) {
-+ XSync();
- saved_error = null;
- current_error_handler = handler;
- }
-@@ -105,15 +106,9 @@
- * 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();
-- }
-+ // Wait until all requests are processed by the X server
-+ // and only then uninstall the error handler.
-+ XSync();
- current_error_handler = null;
- }
-
---- ./jdk/src/solaris/classes/sun/awt/X11/XLabelPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XLabelPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -131,20 +131,22 @@
- }
- }
-
-- public void setText(String text) {
-- label = text;
-+ @Override
-+ public void setText(String label) {
- if (label == null) {
- label = "";
- }
-- repaint();
-- }
-- public void setFont(Font f) {
-- super.setFont(f);
-- repaint();
-+ if (!label.equals(this.label)) {
-+ this.label = label;
-+ repaint();
-+ }
- }
-
-- public void setAlignment(int align) {
-- alignment = align;
-- repaint();
-+ @Override
-+ public void setAlignment(final int alignment) {
-+ if (this.alignment != alignment) {
-+ this.alignment = alignment;
-+ repaint();
-+ }
- }
- }
---- ./jdk/src/solaris/classes/sun/awt/X11/XListPeer.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XListPeer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -31,8 +31,8 @@
- import java.awt.*;
- import java.awt.event.*;
- import java.awt.peer.*;
-+import java.util.Objects;
- import java.util.Vector;
--import java.awt.geom.*;
- import java.awt.image.*;
- import sun.util.logging.PlatformLogger;
-
-@@ -413,6 +413,7 @@
- Graphics g = getGraphics();
- try {
- painter.paint(g, firstItem, lastItem, options, source, distance);
-+ postPaintEvent(target, 0, 0, getWidth(), getHeight());
- } finally {
- g.dispose();
- }
-@@ -1659,11 +1660,13 @@
- * The bug is due to incorrent caching of the list item size
- * So we should recalculate font metrics on setFont
- */
-- public void setFont(Font f){
-- super.setFont(f);
-- initFontMetrics();
-- layout();
-- repaint();
-+ public void setFont(Font f) {
-+ if (!Objects.equals(getFont(), f)) {
-+ super.setFont(f);
-+ initFontMetrics();
-+ layout();
-+ repaint();
-+ }
- }
-
- /**
---- ./jdk/src/solaris/classes/sun/awt/X11/XRootWindow.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XRootWindow.java Fri Apr 10 09:21:28 2015 -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
-@@ -46,7 +46,8 @@
- }
-
- private XRootWindow() {
-- super(new XCreateWindowParams(new Object[] {DELAYED, Boolean.TRUE}));
-+ super(new XCreateWindowParams(new Object[] { DELAYED, Boolean.TRUE,
-+ EVENT_MASK, XConstants.StructureNotifyMask }));
- }
-
- public void postInit(XCreateWindowParams params){
---- ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Fri Apr 10 09:21:28 2015 -0700
-@@ -2291,9 +2291,7 @@
-
- private static XEventDispatcher oops_waiter;
- private static boolean oops_updated;
-- private static boolean oops_failed;
-- private XAtom oops;
-- private static final long WORKAROUND_SLEEP = 100;
-+ private static boolean oops_move;
-
- /**
- * @inheritDoc
-@@ -2304,51 +2302,34 @@
- if (oops_waiter == null) {
- oops_waiter = new XEventDispatcher() {
- public void dispatchEvent(XEvent e) {
-- if (e.get_type() == XConstants.SelectionNotify) {
-- XSelectionEvent pe = e.get_xselection();
-- if (pe.get_property() == oops.getAtom()) {
-- oops_updated = true;
-- awtLockNotifyAll();
-- } else if (pe.get_selection() == XAtom.get("WM_S0").getAtom() &&
-- pe.get_target() == XAtom.get("VERSION").getAtom() &&
-- pe.get_property() == 0 &&
-- XlibWrapper.XGetSelectionOwner(getDisplay(), XAtom.get("WM_S0").getAtom()) == 0)
-- {
-- // WM forgot to acquire selection or there is no WM
-- oops_failed = true;
-- awtLockNotifyAll();
-- }
--
-+ if (e.get_type() == XConstants.ConfigureNotify) {
-+ // OOPS ConfigureNotify event catched
-+ oops_updated = true;
-+ awtLockNotifyAll();
- }
- }
- };
- }
-
-- if (oops == null) {
-- oops = XAtom.get("OOPS");
-- }
--
- awtLock();
- try {
- addEventDispatcher(win.getWindow(), oops_waiter);
-
- oops_updated = false;
-- oops_failed = false;
-- // Wait for selection notify for oops on win
- long event_number = getEventNumber();
-- XAtom atom = XAtom.get("WM_S0");
-- eventLog.finer("WM_S0 selection owner {0}", XlibWrapper.XGetSelectionOwner(getDisplay(), atom.getAtom()));
-- XlibWrapper.XConvertSelection(getDisplay(), atom.getAtom(),
-- XAtom.get("VERSION").getAtom(), oops.getAtom(),
-- win.getWindow(), XConstants.CurrentTime);
-+ // Generate OOPS ConfigureNotify event
-+ XlibWrapper.XMoveWindow(getDisplay(), win.getWindow(), oops_move ? 0 : 1, 0);
-+ // Change win position each time to avoid system optimization
-+ oops_move = !oops_move;
- XSync();
-
-
-- eventLog.finer("Requested OOPS");
-+ eventLog.finer("Generated OOPS ConfigureNotify event");
-
- long start = System.currentTimeMillis();
-- while (!oops_updated && !oops_failed) {
-+ while (!oops_updated) {
- try {
-+ // Wait for OOPS ConfigureNotify event
- awtLockWait(timeout);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
-@@ -2359,20 +2340,8 @@
- throw new OperationTimedOut(Long.toString(System.currentTimeMillis() - start));
- }
- }
-- if (oops_failed && getEventNumber() - event_number == 1) {
-- // If selection update failed we can simply wait some time
-- // hoping some events will arrive
-- awtUnlock();
-- eventLog.finest("Emergency sleep");
-- try {
-- Thread.sleep(WORKAROUND_SLEEP);
-- } catch (InterruptedException ie) {
-- throw new RuntimeException(ie);
-- } finally {
-- awtLock();
-- }
-- }
-- return getEventNumber() - event_number > 2;
-+ // Don't take into account OOPS ConfigureNotify event
-+ return getEventNumber() - event_number > 1;
- } finally {
- removeEventDispatcher(win.getWindow(), oops_waiter);
- eventLog.finer("Exiting syncNativeQueue");
---- ./jdk/src/solaris/classes/sun/awt/X11/XWindow.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XWindow.java Fri Apr 10 09:21:28 2015 -0700
-@@ -32,7 +32,6 @@
-
- import java.lang.ref.WeakReference;
-
--import java.lang.reflect.Field;
- import java.lang.reflect.Method;
-
- import sun.util.logging.PlatformLogger;
-@@ -491,14 +490,14 @@
- return embedded;
- }
-
-- public void repaint(int x,int y, int width, int height) {
-+ public final void repaint(int x,int y, int width, int height) {
- if (!isVisible()) {
- return;
- }
- Graphics g = getGraphics();
- if (g != null) {
- try {
-- g.setClip(x,y,width,height);
-+ g.setClip(x, y, width, height);
- paint(g);
- } finally {
- g.dispose();
-@@ -507,17 +506,7 @@
- }
-
- public void repaint() {
-- if (!isVisible()) {
-- return;
-- }
-- Graphics g = getGraphics();
-- if (g != null) {
-- try {
-- paint(g);
-- } finally {
-- g.dispose();
-- }
-- }
-+ repaint(0, 0, getWidth(), getHeight());
- }
-
- void paint(Graphics g) {
-@@ -556,11 +545,11 @@
- && compAccessor.getWidth(target) != 0
- && compAccessor.getHeight(target) != 0)
- {
-- handleExposeEvent(target, x, y, w, h);
-+ postPaintEvent(target, x, y, w, h);
- }
- }
-
-- public void handleExposeEvent(Component target, int x, int y, int w, int h) {
-+ public void postPaintEvent(Component target, int x, int y, int w, int h) {
- PaintEvent event = PaintEventDispatcher.getPaintEventDispatcher().
- createPaintEvent(target, x, y, w, h);
- if (event != null) {
---- ./jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -25,10 +25,10 @@
-
- package sun.nio.ch;
-
--import java.io.*;
-+import java.io.FileDescriptor;
-+import java.io.IOException;
-
--class FileDispatcherImpl extends FileDispatcher
--{
-+class FileDispatcherImpl extends FileDispatcher {
-
- static {
- Util.load();
-@@ -108,6 +108,14 @@
- return new FileDescriptor();
- }
-
-+ boolean canTransferToDirectly(java.nio.channels.SelectableChannel sc) {
-+ return true;
-+ }
-+
-+ boolean transferToDirectlyNeedsPositionLock() {
-+ return false;
-+ }
-+
- // -- Native methods --
-
- static native int read0(FileDescriptor fd, long address, int len)
---- ./jdk/src/solaris/native/java/io/io_util_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/java/io/io_util_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -118,3 +118,18 @@
- JNU_ThrowIOExceptionWithLastError(env, "close failed");
- }
- }
-+
-+size_t
-+getLastErrorString(char *buf, size_t len)
-+{
-+ if (errno == 0 || len < 1) return 0;
-+
-+ const char *err = strerror(errno);
-+ size_t n = strlen(err);
-+ if (n >= len)
-+ n = len - 1;
-+
-+ strncpy(buf, err, n);
-+ buf[n] = '\0';
-+ return n;
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,335 @@
-+/*
-+ * 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 <jni.h>
-+#include <string.h>
-+
-+#include "net_util.h"
-+#include "jdk_net_SocketFlow.h"
-+
-+static jclass sf_status_class; /* Status enum type */
-+
-+static jfieldID sf_status;
-+static jfieldID sf_priority;
-+static jfieldID sf_bandwidth;
-+
-+static jfieldID sf_fd_fdID; /* FileDescriptor.fd */
-+
-+/* References to the literal enum values */
-+
-+static jobject sfs_NOSTATUS;
-+static jobject sfs_OK;
-+static jobject sfs_NOPERMISSION;
-+static jobject sfs_NOTCONNECTED;
-+static jobject sfs_NOTSUPPORTED;
-+static jobject sfs_ALREADYCREATED;
-+static jobject sfs_INPROGRESS;
-+static jobject sfs_OTHER;
-+
-+static jobject getEnumField(JNIEnv *env, char *name);
-+static void setStatus(JNIEnv *env, jobject obj, int errval);
-+
-+/* OS specific code is implemented in these three functions */
-+
-+static jboolean flowSupported0() ;
-+
-+/*
-+ * Class: sun_net_ExtendedOptionsImpl
-+ * Method: init
-+ * Signature: ()V
-+ */
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_init
-+ (JNIEnv *env, jclass UNUSED) {
-+
-+ static int initialized = 0;
-+ jclass c;
-+
-+ /* Global class references */
-+
-+ if (initialized) {
-+ return;
-+ }
-+
-+ c = (*env)->FindClass(env, "jdk/net/SocketFlow$Status");
-+ CHECK_NULL(c);
-+ sf_status_class = (*env)->NewGlobalRef(env, c);
-+ CHECK_NULL(sf_status_class);
-+
-+ /* int "fd" field of java.io.FileDescriptor */
-+
-+ c = (*env)->FindClass(env, "java/io/FileDescriptor");
-+ CHECK_NULL(c);
-+ sf_fd_fdID = (*env)->GetFieldID(env, c, "fd", "I");
-+ CHECK_NULL(sf_fd_fdID);
-+
-+
-+ /* SocketFlow fields */
-+
-+ c = (*env)->FindClass(env, "jdk/net/SocketFlow");
-+
-+ /* status */
-+
-+ sf_status = (*env)->GetFieldID(env, c, "status",
-+ "Ljdk/net/SocketFlow$Status;");
-+ CHECK_NULL(sf_status);
-+
-+ /* priority */
-+
-+ sf_priority = (*env)->GetFieldID(env, c, "priority", "I");
-+ CHECK_NULL(sf_priority);
-+
-+ /* bandwidth */
-+
-+ sf_bandwidth = (*env)->GetFieldID(env, c, "bandwidth", "J");
-+ CHECK_NULL(sf_bandwidth);
-+
-+ /* Initialize the static enum values */
-+
-+ sfs_NOSTATUS = getEnumField(env, "NO_STATUS");
-+ CHECK_NULL(sfs_NOSTATUS);
-+ sfs_OK = getEnumField(env, "OK");
-+ CHECK_NULL(sfs_OK);
-+ sfs_NOPERMISSION = getEnumField(env, "NO_PERMISSION");
-+ CHECK_NULL(sfs_NOPERMISSION);
-+ sfs_NOTCONNECTED = getEnumField(env, "NOT_CONNECTED");
-+ CHECK_NULL(sfs_NOTCONNECTED);
-+ sfs_NOTSUPPORTED = getEnumField(env, "NOT_SUPPORTED");
-+ CHECK_NULL(sfs_NOTSUPPORTED);
-+ sfs_ALREADYCREATED = getEnumField(env, "ALREADY_CREATED");
-+ CHECK_NULL(sfs_ALREADYCREATED);
-+ sfs_INPROGRESS = getEnumField(env, "IN_PROGRESS");
-+ CHECK_NULL(sfs_INPROGRESS);
-+ sfs_OTHER = getEnumField(env, "OTHER");
-+ CHECK_NULL(sfs_OTHER);
-+ initialized = JNI_TRUE;
-+}
-+
-+static jobject getEnumField(JNIEnv *env, char *name) {
-+ jobject f;
-+ jfieldID fID = (*env)->GetStaticFieldID(env, sf_status_class, name,
-+ "Ljdk/net/SocketFlow$Status;");
-+ CHECK_NULL_RETURN(fID, NULL);
-+
-+ f = (*env)->GetStaticObjectField(env, sf_status_class, fID);
-+ CHECK_NULL_RETURN(f, NULL);
-+ f = (*env)->NewGlobalRef(env, f);
-+ CHECK_NULL_RETURN(f, NULL);
-+ return f;
-+}
-+
-+/*
-+ * Retrieve the int file-descriptor from a public socket type object.
-+ * Gets impl, then the FileDescriptor from the impl, and then the fd
-+ * from that.
-+ */
-+static int getFD(JNIEnv *env, jobject fileDesc) {
-+ return (*env)->GetIntField(env, fileDesc, sf_fd_fdID);
-+}
-+
-+/**
-+ * Sets the status field of a SocketFlow to one of the
-+ * canned enum values
-+ */
-+static void setStatus (JNIEnv *env, jobject obj, int errval) {
-+ switch (errval) {
-+ case 0: /* OK */
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_OK);
-+ break;
-+ case EPERM:
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_NOPERMISSION);
-+ break;
-+ case ENOTCONN:
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_NOTCONNECTED);
-+ break;
-+ case EOPNOTSUPP:
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_NOTSUPPORTED);
-+ break;
-+ case EALREADY:
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_ALREADYCREATED);
-+ break;
-+ case EINPROGRESS:
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_INPROGRESS);
-+ break;
-+ default:
-+ (*env)->SetObjectField(env, obj, sf_status, sfs_OTHER);
-+ break;
-+ }
-+}
-+
-+#ifdef __solaris__
-+
-+/*
-+ * Class: sun_net_ExtendedOptionsImpl
-+ * Method: setFlowOption
-+ * Signature: (Ljava/io/FileDescriptor;Ljdk/net/SocketFlow;)V
-+ */
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_setFlowOption
-+ (JNIEnv *env, jclass UNUSED, jobject fileDesc, jobject flow) {
-+ int fd = getFD(env, fileDesc);
-+
-+ if (fd < 0) {
-+ NET_ERROR(env, JNU_JAVANETPKG "SocketException", "socket closed");
-+ return;
-+ } else {
-+ sock_flow_props_t props;
-+ jlong bandwidth;
-+ int rv;
-+
-+ jint priority = (*env)->GetIntField(env, flow, sf_priority);
-+ memset(&props, 0, sizeof(props));
-+ props.sfp_version = SOCK_FLOW_PROP_VERSION1;
-+
-+ if (priority != jdk_net_SocketFlow_UNSET) {
-+ props.sfp_mask |= SFP_PRIORITY;
-+ props.sfp_priority = priority;
-+ }
-+ bandwidth = (*env)->GetLongField(env, flow, sf_bandwidth);
-+ if (bandwidth > -1) {
-+ props.sfp_mask |= SFP_MAXBW;
-+ props.sfp_maxbw = (uint64_t) bandwidth;
-+ }
-+ rv = setsockopt(fd, SOL_SOCKET, SO_FLOW_SLA, &props, sizeof(props));
-+ if (rv < 0) {
-+ if (errno == ENOPROTOOPT) {
-+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-+ "unsupported socket option");
-+ } else if (errno == EACCES || errno == EPERM) {
-+ NET_ERROR(env, JNU_JAVANETPKG "SocketException",
-+ "Permission denied");
-+ } else {
-+ NET_ERROR(env, JNU_JAVANETPKG "SocketException",
-+ "set option SO_FLOW_SLA failed");
-+ }
-+ return;
-+ }
-+ setStatus(env, flow, props.sfp_status);
-+ }
-+}
-+
-+/*
-+ * Class: sun_net_ExtendedOptionsImpl
-+ * Method: getFlowOption
-+ * Signature: (Ljava/io/FileDescriptor;Ljdk/net/SocketFlow;)V
-+ */
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_getFlowOption
-+ (JNIEnv *env, jclass UNUSED, jobject fileDesc, jobject flow) {
-+ int fd = getFD(env, fileDesc);
-+
-+ if (fd < 0) {
-+ NET_ERROR(env, JNU_JAVANETPKG "SocketException", "socket closed");
-+ return;
-+ } else {
-+ sock_flow_props_t props;
-+ int status;
-+ socklen_t sz = sizeof(props);
-+
-+ int rv = getsockopt(fd, SOL_SOCKET, SO_FLOW_SLA, &props, &sz);
-+ if (rv < 0) {
-+ if (errno == ENOPROTOOPT) {
-+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-+ "unsupported socket option");
-+ } else if (errno == EACCES || errno == EPERM) {
-+ NET_ERROR(env, JNU_JAVANETPKG "SocketException",
-+ "Permission denied");
-+ } else {
-+ NET_ERROR(env, JNU_JAVANETPKG "SocketException",
-+ "set option SO_FLOW_SLA failed");
-+ }
-+ return;
-+ }
-+ /* first check status to see if flow exists */
-+ status = props.sfp_status;
-+ setStatus(env, flow, status);
-+ if (status == 0) { /* OK */
-+ /* can set the other fields now */
-+ if (props.sfp_mask & SFP_PRIORITY) {
-+ (*env)->SetIntField(env, flow, sf_priority, props.sfp_priority);
-+ }
-+ if (props.sfp_mask & SFP_MAXBW) {
-+ (*env)->SetLongField(env, flow, sf_bandwidth,
-+ (jlong)props.sfp_maxbw);
-+ }
-+ }
-+ }
-+}
-+
-+static jboolean flowsupported;
-+static jboolean flowsupported_set = JNI_FALSE;
-+
-+static jboolean flowSupported0() {
-+ /* Do a simple dummy call, and try to figure out from that */
-+ sock_flow_props_t props;
-+ int rv, s;
-+ if (flowsupported_set) {
-+ return flowsupported;
-+ }
-+ s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-+ if (s < 0) {
-+ flowsupported = JNI_FALSE;
-+ flowsupported_set = JNI_TRUE;
-+ return JNI_FALSE;
-+ }
-+ memset(&props, 0, sizeof(props));
-+ props.sfp_version = SOCK_FLOW_PROP_VERSION1;
-+ props.sfp_mask |= SFP_PRIORITY;
-+ props.sfp_priority = SFP_PRIO_NORMAL;
-+ rv = setsockopt(s, SOL_SOCKET, SO_FLOW_SLA, &props, sizeof(props));
-+ if (rv != 0 && errno == ENOPROTOOPT) {
-+ rv = JNI_FALSE;
-+ } else {
-+ rv = JNI_TRUE;
-+ }
-+ close(s);
-+ flowsupported = rv;
-+ flowsupported_set = JNI_TRUE;
-+ return flowsupported;
-+}
-+
-+#else /* __solaris__ */
-+
-+/* Non Solaris. Functionality is not supported. So, throw UnsupportedOpExc */
-+
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_setFlowOption
-+ (JNIEnv *env, jclass UNUSED, jobject fileDesc, jobject flow) {
-+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-+ "unsupported socket option");
-+}
-+
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_getFlowOption
-+ (JNIEnv *env, jclass UNUSED, jobject fileDesc, jobject flow) {
-+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-+ "unsupported socket option");
-+}
-+
-+static jboolean flowSupported0() {
-+ return JNI_FALSE;
-+}
-+
-+#endif /* __solaris__ */
-+
-+JNIEXPORT jboolean JNICALL Java_sun_net_ExtendedOptionsImpl_flowSupported
-+ (JNIEnv *env, jclass UNUSED) {
-+ return flowSupported0();
-+}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -51,7 +51,33 @@
- #define HAS_GLIBC_GETHOSTBY_R 1
- #endif
-
-+static jclass ni_iacls;
-+static jclass ni_ia4cls;
-+static jmethodID ni_ia4ctrID;
-+
-+static jboolean initializeInetClasses(JNIEnv *env)
-+{
-+ static int initialized = 0;
-+ if (!initialized) {
-+ ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-+ CHECK_NULL_RETURN(ni_iacls, JNI_FALSE);
-+ ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-+ CHECK_NULL_RETURN(ni_iacls, JNI_FALSE);
-+ ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-+ CHECK_NULL_RETURN(ni_ia4cls, JNI_FALSE);
-+ ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-+ CHECK_NULL_RETURN(ni_ia4cls, JNI_FALSE);
-+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-+ CHECK_NULL_RETURN(ni_ia4ctrID, JNI_FALSE);
-+ initialized = 1;
-+ }
-+ return JNI_TRUE;
-+}
-+
-+
- #if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R)
-+extern jobjectArray lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6);
-+
- /* Use getaddrinfo(3), which is thread safe */
- /************************************************************************
- * Inet4AddressImpl
-@@ -99,11 +125,6 @@
- return (*env)->NewStringUTF(env, hostname);
- }
-
--static jclass ni_iacls;
--static jclass ni_ia4cls;
--static jmethodID ni_ia4ctrID;
--static int initialized = 0;
--
- /*
- * Find an internet address for a given hostname. Note that this
- * code only works for addresses of type INET. The translation
-@@ -126,14 +147,8 @@
- int error=0;
- struct addrinfo hints, *res, *resNew = NULL;
-
-- if (!initialized) {
-- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-- initialized = 1;
-- }
-+ if (!initializeInetClasses(env))
-+ return NULL;
-
- if (IS_NULL(host)) {
- JNU_ThrowNullPointerException(env, "host is null");
-@@ -157,12 +172,22 @@
- return NULL;
- }
-
-+#ifdef MACOSX
-+ /* If we're looking up the local machine, bypass DNS lookups and get
-+ * address from getifaddrs.
-+ */
-+ ret = lookupIfLocalhost(env, hostname, JNI_FALSE);
-+ if (ret != NULL || (*env)->ExceptionCheck(env)) {
-+ JNU_ReleaseStringPlatformChars(env, host, hostname);
-+ return ret;
-+ }
-+#endif
-+
- error = getaddrinfo(hostname, NULL, &hints, &res);
-
- if (error) {
- /* report error */
-- JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
-- (char *)hostname);
-+ ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
- JNU_ReleaseStringPlatformChars(env, host, hostname);
- return NULL;
- } else {
-@@ -385,11 +410,6 @@
- return (*env)->NewStringUTF(env, hostname);
- }
-
--static jclass ni_iacls;
--static jclass ni_ia4cls;
--static jmethodID ni_ia4ctrID;
--static int initialized = 0;
--
- /*
- * Find an internet address for a given hostname. Note that this
- * code only works for addresses of type INET. The translation
-@@ -415,14 +435,8 @@
- char *tmp = NULL;
- int h_error=0;
-
-- if (!initialized) {
-- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-- initialized = 1;
-- }
-+ if (!initializeInetClasses(env))
-+ return NULL;
-
- if (IS_NULL(host)) {
- JNU_ThrowNullPointerException(env, "host is null");
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Fri Apr 10 09:21:28 2015 -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
-@@ -33,7 +33,9 @@
- #include <strings.h>
- #include <stdlib.h>
- #include <ctype.h>
--#ifdef _ALLBSD_SOURCE
-+#ifdef MACOSX
-+#include <ifaddrs.h>
-+#include <net/if.h>
- #include <unistd.h> /* gethostname */
- #endif
-
-@@ -122,7 +124,156 @@
- static jclass ni_ia6cls;
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
--static int initialized = 0;
-+static jboolean preferIPv6Address;
-+
-+static jboolean initializeInetClasses(JNIEnv *env)
-+{
-+ jfieldID ni_preferIPv6AddressID;
-+ static int initialized = 0;
-+ if (!initialized) {
-+ ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-+ CHECK_NULL_RETURN(ni_iacls, JNI_FALSE);
-+ ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-+ CHECK_NULL_RETURN(ni_iacls, JNI_FALSE);
-+ ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-+ CHECK_NULL_RETURN(ni_ia4cls, JNI_FALSE);
-+ ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-+ CHECK_NULL_RETURN(ni_ia4cls, JNI_FALSE);
-+ ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
-+ CHECK_NULL_RETURN(ni_ia6cls, JNI_FALSE);
-+ ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
-+ CHECK_NULL_RETURN(ni_ia6cls, JNI_FALSE);
-+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-+ CHECK_NULL_RETURN(ni_ia4ctrID, JNI_FALSE);
-+ ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
-+ CHECK_NULL_RETURN(ni_ia6ctrID, JNI_FALSE);
-+ ni_preferIPv6AddressID =
-+ (*env)->GetStaticFieldID(env, ni_iacls, "preferIPv6Address", "Z");
-+ CHECK_NULL_RETURN(ni_preferIPv6AddressID, JNI_FALSE);
-+ preferIPv6Address =
-+ (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
-+ initialized = 1;
-+ }
-+ return JNI_TRUE;
-+}
-+
-+#ifdef MACOSX
-+/* also called from Inet4AddressImpl.c */
-+__private_extern__ jobjectArray
-+lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6)
-+{
-+ jobjectArray result = NULL;
-+ char myhostname[NI_MAXHOST+1];
-+ struct ifaddrs *ifa = NULL;
-+ int familyOrder = 0;
-+ int count = 0, i, j;
-+ int addrs4 = 0, addrs6 = 0, numV4Loopbacks = 0, numV6Loopbacks = 0;
-+ jboolean includeLoopback = JNI_FALSE;
-+ jobject name;
-+
-+ // Make sure static variables we need are set.
-+ initializeInetClasses(env);
-+
-+ /* If the requested name matches this host's hostname, return IP addresses
-+ * from all attached interfaces. (#2844683 et al) This prevents undesired
-+ * PPP dialup, but may return addresses that don't actually correspond to
-+ * the name (if the name actually matches something in DNS etc.
-+ */
-+ myhostname[0] = '\0';
-+ if (JVM_GetHostName(myhostname, NI_MAXHOST)) {
-+ /* Something went wrong, maybe networking is not setup? */
-+ return NULL;
-+ }
-+ myhostname[NI_MAXHOST] = '\0';
-+
-+ if (strcmp(myhostname, hostname) != 0) {
-+ // Non-self lookup
-+ return NULL;
-+ }
-+
-+ if (getifaddrs(&ifa) != 0) {
-+ NET_ThrowNew(env, errno, "Can't get local interface addresses");
-+ return NULL;
-+ }
-+
-+ name = (*env)->NewStringUTF(env, hostname);
-+
-+ /* Iterate over the interfaces, and total up the number of IPv4 and IPv6
-+ * addresses we have. Also keep a count of loopback addresses. We need to
-+ * exclude them in the normal case, but return them if we don't get an IP
-+ * address.
-+ */
-+ struct ifaddrs *iter = ifa;
-+ while (iter) {
-+ int family = iter->ifa_addr->sa_family;
-+ if (iter->ifa_name[0] != '\0' && iter->ifa_addr)
-+ {
-+ jboolean isLoopback = iter->ifa_flags & IFF_LOOPBACK;
-+ if (family == AF_INET) {
-+ addrs4++;
-+ if (isLoopback) numV4Loopbacks++;
-+ } else if (family == AF_INET6 && includeV6) {
-+ addrs6++;
-+ if (isLoopback) numV6Loopbacks++;
-+ } else {
-+ /* We don't care e.g. AF_LINK */
-+ }
-+ }
-+ iter = iter->ifa_next;
-+ }
-+
-+ if (addrs4 == numV4Loopbacks && addrs6 == numV6Loopbacks) {
-+ // We don't have a real IP address, just loopback. We need to include
-+ // loopback in our results.
-+ includeLoopback = JNI_TRUE;
-+ }
-+
-+ /* Create and fill the Java array. */
-+ int arraySize = addrs4 + addrs6 -
-+ (includeLoopback ? 0 : (numV4Loopbacks + numV6Loopbacks));
-+ result = (*env)->NewObjectArray(env, arraySize, ni_iacls, NULL);
-+ if (!result) goto done;
-+
-+ if (preferIPv6Address) {
-+ i = includeLoopback ? addrs6 : (addrs6 - numV6Loopbacks);
-+ j = 0;
-+ } else {
-+ i = 0;
-+ j = includeLoopback ? addrs4 : (addrs4 - numV4Loopbacks);
-+ }
-+
-+ // Now loop around the ifaddrs
-+ iter = ifa;
-+ while (iter != NULL) {
-+ jboolean isLoopback = iter->ifa_flags & IFF_LOOPBACK;
-+ int family = iter->ifa_addr->sa_family;
-+
-+ if (iter->ifa_name[0] != '\0' && iter->ifa_addr
-+ && (family == AF_INET || (family == AF_INET6 && includeV6))
-+ && (!isLoopback || includeLoopback))
-+ {
-+ int port;
-+ int index = (family == AF_INET) ? i++ : j++;
-+ jobject o = NET_SockaddrToInetAddress(env, iter->ifa_addr, &port);
-+ if (!o) {
-+ freeifaddrs(ifa);
-+ if (!(*env)->ExceptionCheck(env))
-+ JNU_ThrowOutOfMemoryError(env, "Object allocation failed");
-+ return NULL;
-+ }
-+ setInetAddress_hostName(env, o, name);
-+ (*env)->SetObjectArrayElement(env, result, index, o);
-+ (*env)->DeleteLocalRef(env, o);
-+ }
-+ iter = iter->ifa_next;
-+ }
-+
-+ done:
-+ freeifaddrs(ifa);
-+
-+ return result;
-+}
-+#endif
-
- /*
- * Find an internet address for a given hostname. Note that this
-@@ -141,24 +292,13 @@
- const char *hostname;
- jobjectArray ret = 0;
- int retLen = 0;
-- jboolean preferIPv6Address;
-
- int error=0;
- #ifdef AF_INET6
- struct addrinfo hints, *res, *resNew = NULL;
- #endif /* AF_INET6 */
-
-- if (!initialized) {
-- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-- ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
-- 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");
-- initialized = 1;
-- }
-+ initializeInetClasses(env);
-
- if (IS_NULL(host)) {
- JNU_ThrowNullPointerException(env, "host is null");
-@@ -167,24 +307,21 @@
- hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
- CHECK_NULL_RETURN(hostname, NULL);
-
-+#ifdef MACOSX
-+ /*
-+ * If we're looking up the local machine, attempt to get the address
-+ * from getifaddrs. This ensures we get an IPv6 address for the local
-+ * machine.
-+ */
-+ ret = lookupIfLocalhost(env, hostname, JNI_TRUE);
-+ if (ret != NULL || (*env)->ExceptionCheck(env)) {
-+ JNU_ReleaseStringPlatformChars(env, host, hostname);
-+ return ret;
-+ }
-+#endif
-+
- #ifdef AF_INET6
- if (NET_addrtransAvailable()) {
-- static jfieldID ia_preferIPv6AddressID;
-- if (ia_preferIPv6AddressID == NULL) {
-- jclass c = (*env)->FindClass(env,"java/net/InetAddress");
-- if (c) {
-- ia_preferIPv6AddressID =
-- (*env)->GetStaticFieldID(env, c, "preferIPv6Address", "Z");
-- }
-- if (ia_preferIPv6AddressID == NULL) {
-- JNU_ReleaseStringPlatformChars(env, host, hostname);
-- return NULL;
-- }
-- }
-- /* get the address preference */
-- preferIPv6Address
-- = (*env)->GetStaticBooleanField(env, ia_class, ia_preferIPv6AddressID);
--
- /* Try once, with our static buffer. */
- bzero(&hints, sizeof(hints));
- hints.ai_flags = AI_CANONNAME;
---- ./jdk/src/solaris/native/java/net/net_util_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -809,6 +809,12 @@
- }
- #endif
- }
-+
-+JNIEXPORT jint JNICALL
-+NET_EnableFastTcpLoopback(int fd) {
-+ return 0;
-+}
-+
- /* In the case of an IPv4 Inetaddress this method will return an
- * IPv4 mapped address where IPv6 is available and v4MappedAddress is TRUE.
- * Otherwise it will return a sockaddr_in structure for an IPv4 InetAddress.
-@@ -1351,7 +1357,7 @@
- * or sending UDP packet.
- * 2. IPv6 on Linux: By default Linux ignores flowinfo
- * field so enable IPV6_FLOWINFO_SEND so that flowinfo
-- * will be examined.
-+ * will be examined. We also set the IPv4 TOS option in this case.
- * 3. IPv4: set socket option based on ToS and Precedence
- * fields (otherwise get invalid argument)
- */
-@@ -1367,8 +1373,10 @@
- #if defined(AF_INET6) && defined(__linux__)
- if (ipv6_available()) {
- int optval = 1;
-- return setsockopt(fd, IPPROTO_IPV6, IPV6_FLOWINFO_SEND,
-- (void *)&optval, sizeof(optval));
-+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_FLOWINFO_SEND,
-+ (void *)&optval, sizeof(optval)) < 0) {
-+ return -1;
-+ }
- }
- #endif
-
---- ./jdk/src/solaris/native/java/net/net_util_md.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h Fri Apr 10 09:21:28 2015 -0700
-@@ -83,7 +83,46 @@
-
- #ifdef __solaris__
- extern int net_getParam(char *driver, char *param);
--#endif
-+
-+#ifndef SO_FLOW_SLA
-+#define SO_FLOW_SLA 0x1018
-+
-+#if _LONG_LONG_ALIGNMENT == 8 && _LONG_LONG_ALIGNMENT_32 == 4
-+#pragma pack(4)
-+ #endif
-+
-+/*
-+ * Used with the setsockopt(SO_FLOW_SLA, ...) call to set
-+ * per socket service level properties.
-+ * When the application uses per-socket API, we will enforce the properties
-+ * on both outbound and inbound packets.
-+ *
-+ * For now, only priority and maxbw are supported in SOCK_FLOW_PROP_VERSION1.
-+ */
-+typedef struct sock_flow_props_s {
-+ int sfp_version;
-+ uint32_t sfp_mask;
-+ int sfp_priority; /* flow priority */
-+ uint64_t sfp_maxbw; /* bandwidth limit in bps */
-+ int sfp_status; /* flow create status for getsockopt */
-+} sock_flow_props_t;
-+
-+#define SOCK_FLOW_PROP_VERSION1 1
-+
-+/* bit mask values for sfp_mask */
-+#define SFP_MAXBW 0x00000001 /* Flow Bandwidth Limit */
-+#define SFP_PRIORITY 0x00000008 /* Flow priority */
-+
-+/* possible values for sfp_priority */
-+#define SFP_PRIO_NORMAL 1
-+#define SFP_PRIO_HIGH 2
-+
-+#if _LONG_LONG_ALIGNMENT == 8 && _LONG_LONG_ALIGNMENT_32 == 4
-+#pragma pack()
-+#endif /* _LONG_LONG_ALIGNMENT */
-+
-+#endif /* SO_FLOW_SLA */
-+#endif /* __solaris__ */
-
- /* needed from libsocket on Solaris 8 */
-
---- ./jdk/src/solaris/native/sun/awt/awt_util.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h Fri Apr 10 09:21:28 2015 -0700
-@@ -115,6 +115,8 @@
-
- extern int xerror_ignore_bad_window(Display *dpy, XErrorEvent *err);
-
-+Window get_xawt_root_shell(JNIEnv *env);
-+
- #endif /* !HEADLESS */
-
- #ifndef INTERSECTS
---- ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2011, 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
-@@ -281,9 +281,7 @@
- /* for changing the visible shape of a window to an nonrectangular form */
- void
- SplashUpdateShape(Splash * splash) {
-- if (!shapeSupported)
-- return;
-- if (!splash->maskRequired) {
-+ if (splash->currentFrame < 0 || !shapeSupported || !splash->maskRequired) {
- return;
- }
- XShapeCombineRectangles(splash->display, splash->window, ShapeClip, 0, 0,
-@@ -324,6 +322,10 @@
-
- void
- SplashRedrawWindow(Splash * splash) {
-+ if (splash->currentFrame < 0) {
-+ return;
-+ }
-+
- XImage *ximage;
-
- // making this method redraw a part of the image does not make
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -152,10 +152,13 @@
-
- JNIEXPORT jlong JNICALL
- Java_sun_nio_ch_FileChannelImpl_transferTo0(JNIEnv *env, jobject this,
-- jint srcFD,
-+ jobject srcFDO,
- jlong position, jlong count,
-- jint dstFD)
-+ jobject dstFDO)
- {
-+ jint srcFD = fdval(env, srcFDO);
-+ jint dstFD = fdval(env, dstFDO);
-+
- #if defined(__linux__)
- off64_t offset = (off64_t)position;
- jlong n = sendfile64(dstFD, srcFD, &offset, (size_t)count);
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c Fri Apr 10 09:21:28 2015 -0700
-@@ -151,7 +151,7 @@
-
- JNIEXPORT int JNICALL
- Java_sun_nio_ch_Net_socket0(JNIEnv *env, jclass cl, jboolean preferIPv6,
-- jboolean stream, jboolean reuse)
-+ jboolean stream, jboolean reuse, jboolean ignored)
- {
- int fd;
- int type = (stream ? SOCK_STREAM : SOCK_DGRAM);
-@@ -382,7 +382,8 @@
-
- JNIEXPORT void JNICALL
- Java_sun_nio_ch_Net_setIntOption0(JNIEnv *env, jclass clazz, jobject fdo,
-- jboolean mayNeedConversion, jint level, jint opt, jint arg)
-+ jboolean mayNeedConversion, jint level,
-+ jint opt, jint arg, jboolean isIPv6)
- {
- int result;
- struct linger linger;
-@@ -425,6 +426,12 @@
- JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.Net.setIntOption");
- }
-+#ifdef __linux__
-+ if (level == IPPROTO_IPV6 && opt == IPV6_TCLASS && isIPv6) {
-+ // set the V4 option also
-+ setsockopt(fdval(env, fdo), IPPROTO_IP, IP_TOS, parg, arglen);
-+ }
-+#endif
- }
-
- JNIEXPORT jint JNICALL
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c Fri Apr 10 09:21:28 2015 -0700
-@@ -278,7 +278,7 @@
- int res = -1;
-
- RESTARTABLE(dup((int)fd), res);
-- if (fd == -1) {
-+ if (res == -1) {
- throwUnixException(env, errno);
- }
- return (jint)res;
-@@ -306,13 +306,14 @@
- JNIEXPORT void JNICALL
- Java_sun_nio_fs_UnixNativeDispatcher_fclose(JNIEnv* env, jclass this, jlong stream)
- {
-- int res;
- FILE* fp = jlong_to_ptr(stream);
-
-- do {
-- res = fclose(fp);
-- } while (res == EOF && errno == EINTR);
-- if (res == EOF) {
-+ /* NOTE: fclose() wrapper is only used with read-only streams.
-+ * If it ever is used with write streams, it might be better to add
-+ * RESTARTABLE(fflush(fp)) before closing, to make sure the stream
-+ * is completely written even if fclose() failed.
-+ */
-+ if (fclose(fp) == EOF && errno != EINTR) {
- throwUnixException(env, errno);
- }
- }
-@@ -610,11 +611,9 @@
-
- JNIEXPORT void JNICALL
- Java_sun_nio_fs_UnixNativeDispatcher_closedir(JNIEnv* env, jclass this, jlong dir) {
-- int err;
- DIR* dirp = jlong_to_ptr(dir);
-
-- RESTARTABLE(closedir(dirp), err);
-- if (errno == -1) {
-+ if (closedir(dirp) == -1 && errno != EINTR) {
- throwUnixException(env, errno);
- }
- }
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -34,7 +34,7 @@
- #include "j2secmod.h"
-
- void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
-- void *hModule = (void*)jHandle;
-+ void *hModule = (void*)jlong_to_ptr(jHandle);
- void *fAddress = dlsym(hModule, functionName);
- if (fAddress == NULL) {
- char errorMessage[256];
-@@ -53,7 +53,7 @@
- void *hModule = dlopen(libName, RTLD_NOLOAD);
- dprintf2("-handle for %s: %u\n", libName, hModule);
- (*env)->ReleaseStringUTFChars(env, jLibName, libName);
-- return (jlong)hModule;
-+ return ptr_to_jlong(hModule);
- }
-
- JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_Secmod_nssLoadLibrary
-@@ -72,5 +72,5 @@
- return 0;
- }
-
-- return (jlong)hModule;
-+ return ptr_to_jlong(hModule);
- }
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -79,7 +79,7 @@
- {
- void *hModule;
- char *error;
-- CK_C_GetFunctionList C_GetFunctionList;
-+ CK_C_GetFunctionList C_GetFunctionList=NULL;
- CK_RV rv;
- ModuleData *moduleData;
- jobject globalPKCS11ImplementationReference;
---- ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c Fri Apr 10 09:21:28 2015 -0700
-@@ -1942,10 +1942,14 @@
- * Toolkit thread to process PropertyNotify or SelectionNotify events.
- */
- static Bool
--secondary_loop_event(Display* dpy, XEvent* event, char* arg) {
-- return (event->type == SelectionNotify ||
-- event->type == SelectionClear ||
-- event->type == PropertyNotify) ? True : False;
-+secondary_loop_event(Display* dpy, XEvent* event, XPointer xawt_root_window) {
-+ return (
-+ event->type == SelectionNotify ||
-+ event->type == SelectionClear ||
-+ event->type == PropertyNotify ||
-+ (event->type == ConfigureNotify
-+ && event->xany.window == *(Window*) xawt_root_window)
-+ ) ? True : False;
- }
-
-
-@@ -1956,8 +1960,11 @@
-
- AWT_CHECK_HAVE_LOCK();
- exitSecondaryLoop = False;
-+ Window xawt_root_window = get_xawt_root_shell(env);
-+
- while (!exitSecondaryLoop) {
-- if (XCheckIfEvent((Display*) jlong_to_ptr(display), (XEvent*) jlong_to_ptr(ptr), secondary_loop_event, NULL)) {
-+ if (XCheckIfEvent((Display*) jlong_to_ptr(display),
-+ (XEvent*) jlong_to_ptr(ptr), secondary_loop_event, (XPointer) &xawt_root_window)) {
- return JNI_TRUE;
- }
- timeout = (timeout < AWT_SECONDARY_LOOP_TIMEOUT) ? (timeout << 1) : AWT_SECONDARY_LOOP_TIMEOUT;
---- ./jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java Fri Apr 10 09:21:28 2015 -0700
-@@ -25,15 +25,16 @@
-
- package sun.nio.ch;
-
--import java.io.*;
-+import java.io.FileDescriptor;
-+import java.io.IOException;
-+import java.security.PrivilegedAction;
- import sun.misc.SharedSecrets;
- import sun.misc.JavaIOFileDescriptorAccess;
-
--class FileDispatcherImpl extends FileDispatcher
--{
-- static {
-- Util.load();
-- }
-+class FileDispatcherImpl extends FileDispatcher {
-+
-+ // set to true if fast file transmission (TransmitFile) is enabled
-+ private static final boolean fastFileTransfer;
-
- /**
- * Indicates if the dispatcher should first advance the file position
-@@ -120,6 +121,36 @@
- return result;
- }
-
-+ boolean canTransferToDirectly(java.nio.channels.SelectableChannel sc) {
-+ return fastFileTransfer && sc.isBlocking();
-+ }
-+
-+ boolean transferToDirectlyNeedsPositionLock() {
-+ return true;
-+ }
-+
-+ static boolean isFastFileTransferRequested() {
-+ String fileTransferProp = java.security.AccessController.doPrivileged(
-+ new PrivilegedAction<String>() {
-+ @Override
-+ public String run() {
-+ return System.getProperty("jdk.nio.enableFastFileTransfer");
-+ }
-+ });
-+ boolean enable;
-+ if ("".equals(fileTransferProp)) {
-+ enable = true;
-+ } else {
-+ enable = Boolean.parseBoolean(fileTransferProp);
-+ }
-+ return enable;
-+ }
-+
-+ static {
-+ Util.load();
-+ fastFileTransfer = isFastFileTransferRequested();
-+ }
-+
- //-- Native methods
-
- static native int read0(FileDescriptor fd, long address, int len)
---- ./jdk/src/windows/lib/tzmappings Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/lib/tzmappings Fri Apr 10 09:21:28 2015 -0700
-@@ -137,8 +137,8 @@
- Central Standard Time:36,37::America/Chicago:
- Eastern:38,39::America/New_York:
- Eastern Standard Time:38,39::America/New_York:
--E. Europe:4,5:BY:Europe/Minsk:
--E. Europe Standard Time:4,5:BY:Europe/Minsk:
-+E. Europe:4,5::EET:
-+E. Europe Standard Time:4,5::EET:
- Egypt:4,68::Africa/Cairo:
- Egypt Standard Time:4,68::Africa/Cairo:
- South Africa:4,69::Africa/Harare:
-@@ -192,5 +192,11 @@
- Kaliningrad Standard Time:925,925:RU:Europe/Kaliningrad:
- Turkey Standard Time:926,926::Asia/Istanbul:
- Bahia Standard Time:927,927::America/Bahia:
--Western Brazilian Standard Time:928,928:BR:America/Rio_Branco:
--Armenian Standard Time:929,929:AM:Asia/Yerevan:
-+Libya Standard Time:928,928:LY:Africa/Tripoli:
-+Belarus Standard Time:929,929:BY:Europe/Minsk:
-+Line Islands Standard Time:930,930::Pacific/Kiritimati:
-+Russia Time Zone 10:931,931::Asia/Srednekolymsk:
-+Russia Time Zone 11:932,932::Asia/Anadyr:
-+Russia Time Zone 3:933,933::Europe/Samara:
-+Western Brazilian Standard Time:934,934:BR:America/Rio_Branco:
-+Armenian Standard Time:935,935:AM:Asia/Yerevan:
---- ./jdk/src/windows/native/java/io/io_util_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/io/io_util_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,6 +29,7 @@
- #include "io_util.h"
- #include "io_util_md.h"
- #include <stdio.h>
-+#include <windows.h>
-
- #include <wchar.h>
- #include <io.h>
-@@ -589,3 +590,77 @@
- }
- return long_to_jlong(pos.QuadPart);
- }
-+
-+size_t
-+getLastErrorString(char *utf8_jvmErrorMsg, size_t cbErrorMsg)
-+{
-+ size_t n = 0;
-+ if (cbErrorMsg > 0) {
-+ BOOLEAN noError = FALSE;
-+ WCHAR *utf16_osErrorMsg = (WCHAR *)malloc(cbErrorMsg*sizeof(WCHAR));
-+ if (utf16_osErrorMsg == NULL) {
-+ // OOM accident
-+ strncpy(utf8_jvmErrorMsg, "Out of memory", cbErrorMsg);
-+ // truncate if too long
-+ utf8_jvmErrorMsg[cbErrorMsg - 1] = '\0';
-+ n = strlen(utf8_jvmErrorMsg);
-+ } else {
-+ DWORD errval = GetLastError();
-+ if (errval != 0) {
-+ // WIN32 error
-+ n = (size_t)FormatMessageW(
-+ FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-+ NULL,
-+ errval,
-+ 0,
-+ utf16_osErrorMsg,
-+ (DWORD)cbErrorMsg,
-+ NULL);
-+ if (n > 3) {
-+ // Drop final '.', CR, LF
-+ if (utf16_osErrorMsg[n - 1] == L'\n') --n;
-+ if (utf16_osErrorMsg[n - 1] == L'\r') --n;
-+ if (utf16_osErrorMsg[n - 1] == L'.') --n;
-+ utf16_osErrorMsg[n] = L'\0';
-+ }
-+ } else if (errno != 0) {
-+ // C runtime error that has no corresponding WIN32 error code
-+ const WCHAR *rtError = _wcserror(errno);
-+ if (rtError != NULL) {
-+ wcsncpy(utf16_osErrorMsg, rtError, cbErrorMsg);
-+ // truncate if too long
-+ utf16_osErrorMsg[cbErrorMsg - 1] = L'\0';
-+ n = wcslen(utf16_osErrorMsg);
-+ }
-+ } else
-+ noError = TRUE; //OS has no error to report
-+
-+ if (!noError) {
-+ if (n > 0) {
-+ n = WideCharToMultiByte(
-+ CP_UTF8,
-+ 0,
-+ utf16_osErrorMsg,
-+ n,
-+ utf8_jvmErrorMsg,
-+ cbErrorMsg,
-+ NULL,
-+ NULL);
-+
-+ // no way to die
-+ if (n > 0)
-+ utf8_jvmErrorMsg[min(cbErrorMsg - 1, n)] = '\0';
-+ }
-+
-+ if (n <= 0) {
-+ strncpy(utf8_jvmErrorMsg, "Secondary error while OS message extraction", cbErrorMsg);
-+ // truncate if too long
-+ utf8_jvmErrorMsg[cbErrorMsg - 1] = '\0';
-+ n = strlen(utf8_jvmErrorMsg);
-+ }
-+ }
-+ free(utf16_osErrorMsg);
-+ }
-+ }
-+ return n;
-+}
---- ./jdk/src/windows/native/java/lang/ProcessImpl_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/lang/ProcessImpl_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -112,20 +112,70 @@
- return newFlag;
- }
-
-+/* We have THREE locales in action:
-+ * 1. Thread default locale - dictates UNICODE-to-8bit conversion
-+ * 2. System locale that defines the message localization
-+ * 3. The file name locale
-+ * Each locale could be an extended locale, that means that text cannot be
-+ * mapped to 8bit sequence without multibyte encoding.
-+ * VM is ready for that, if text is UTF-8.
-+ * Here we make the work right from the beginning.
-+ */
-+size_t os_error_message(int errnum, WCHAR* utf16_OSErrorMsg, size_t maxMsgLength) {
-+ size_t n = (size_t)FormatMessageW(
-+ FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-+ NULL,
-+ (DWORD)errnum,
-+ 0,
-+ utf16_OSErrorMsg,
-+ (DWORD)maxMsgLength,
-+ NULL);
-+ if (n > 3) {
-+ // Drop final '.', CR, LF
-+ if (utf16_OSErrorMsg[n - 1] == L'\n') --n;
-+ if (utf16_OSErrorMsg[n - 1] == L'\r') --n;
-+ if (utf16_OSErrorMsg[n - 1] == L'.') --n;
-+ utf16_OSErrorMsg[n] = L'\0';
-+ }
-+ return n;
-+}
-+
-+#define MESSAGE_LENGTH (256 + 100)
-+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(*x))
-+
- static void
--win32Error(JNIEnv *env, const char *functionName)
-+win32Error(JNIEnv *env, const WCHAR *functionName)
- {
-- static const char * const format = "%s error=%d, %s";
-- static const char * const fallbackFormat = "%s failed, error=%d";
-- char buf[256];
-- char errmsg[sizeof(buf) + 100];
-- const int errnum = GetLastError();
-- const int n = JVM_GetLastErrorString(buf, sizeof(buf));
-- if (n > 0)
-- sprintf(errmsg, format, functionName, errnum, buf);
-- else
-- sprintf(errmsg, fallbackFormat, functionName, errnum);
-- JNU_ThrowIOException(env, errmsg);
-+ WCHAR utf16_OSErrorMsg[MESSAGE_LENGTH - 100];
-+ WCHAR utf16_javaMessage[MESSAGE_LENGTH];
-+ /*Good suggestion about 2-bytes-per-symbol in localized error reports*/
-+ char utf8_javaMessage[MESSAGE_LENGTH*2];
-+ const int errnum = (int)GetLastError();
-+ int n = os_error_message(errnum, utf16_OSErrorMsg, ARRAY_SIZE(utf16_OSErrorMsg));
-+ n = (n > 0)
-+ ? swprintf(utf16_javaMessage, MESSAGE_LENGTH, L"%s error=%d, %s", functionName, errnum, utf16_OSErrorMsg)
-+ : swprintf(utf16_javaMessage, MESSAGE_LENGTH, L"%s failed, error=%d", functionName, errnum);
-+
-+ if (n > 0) /*terminate '\0' is not a part of conversion procedure*/
-+ n = WideCharToMultiByte(
-+ CP_UTF8,
-+ 0,
-+ utf16_javaMessage,
-+ n, /*by creation n <= MESSAGE_LENGTH*/
-+ utf8_javaMessage,
-+ MESSAGE_LENGTH*2,
-+ NULL,
-+ NULL);
-+
-+ /*no way to die*/
-+ {
-+ const char *errorMessage = "Secondary error while OS message extraction";
-+ if (n > 0) {
-+ utf8_javaMessage[min(MESSAGE_LENGTH*2 - 1, n)] = '\0';
-+ errorMessage = utf8_javaMessage;
-+ }
-+ JNU_ThrowIOException(env, errorMessage);
-+ }
- }
-
- static void
-@@ -193,7 +243,7 @@
- instead of 'Everybody' access */
- PIPE_SIZE))
- {
-- win32Error(env, "CreatePipe");
-+ win32Error(env, L"CreatePipe");
- return FALSE;
- } else {
- /* [thisProcessEnd] has no the inherit flag because
-@@ -349,7 +399,7 @@
- &si, /* (in) startup information */
- &pi)) /* (out) process information */
- {
-- win32Error(env, "CreateProcess");
-+ win32Error(env, L"CreateProcess");
- } else {
- closeSafely(pi.hThread);
- ret = (jlong)pi.hProcess;
-@@ -410,7 +460,7 @@
- {
- DWORD exit_code;
- if (GetExitCodeProcess((HANDLE) handle, &exit_code) == 0)
-- win32Error(env, "GetExitCodeProcess");
-+ win32Error(env, L"GetExitCodeProcess");
- return exit_code;
- }
-
-@@ -431,7 +481,7 @@
- FALSE, /* Wait for ANY event */
- INFINITE) /* Wait forever */
- == WAIT_FAILED)
-- win32Error(env, "WaitForMultipleObjects");
-+ win32Error(env, L"WaitForMultipleObjects");
- }
-
- JNIEXPORT void JNICALL
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/windows/native/java/net/ExtendedOptionsImpl.c Fri Apr 10 09:21:28 2015 -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. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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 <string.h>
-+
-+#include "net_util.h"
-+
-+/*
-+ * Class: sun_net_ExtendedOptionsImpl
-+ * Method: init
-+ * Signature: ()V
-+ */
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_init
-+ (JNIEnv *env, jclass UNUSED)
-+{
-+}
-+
-+/* Non Solaris. Functionality is not supported. So, throw UnsupportedOpExc */
-+
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_setFlowOption
-+ (JNIEnv *env, jclass UNUSED, jobject fileDesc, jobject flow) {
-+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-+ "unsupported socket option");
-+}
-+
-+JNIEXPORT void JNICALL Java_sun_net_ExtendedOptionsImpl_getFlowOption
-+ (JNIEnv *env, jclass UNUSED, jobject fileDesc, jobject flow) {
-+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
-+ "unsupported socket option");
-+}
-+
-+static jboolean flowSupported0() {
-+ return JNI_FALSE;
-+}
-+
-+JNIEXPORT jboolean JNICALL Java_sun_net_ExtendedOptionsImpl_flowSupported
-+ (JNIEnv *env, jclass UNUSED) {
-+ return JNI_FALSE;
-+}
---- ./jdk/src/windows/native/java/net/Inet4AddressImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/net/Inet4AddressImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -142,10 +142,15 @@
-
- if (!initialized) {
- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-+ CHECK_NULL_RETURN(ni_iacls, NULL);
- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-+ CHECK_NULL_RETURN(ni_iacls, NULL);
- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-+ CHECK_NULL_RETURN(ni_ia4cls, NULL);
- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-+ CHECK_NULL_RETURN(ni_ia4cls, NULL);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-+ CHECK_NULL_RETURN(ni_ia4ctrID, NULL);
- initialized = 1;
- }
-
-@@ -241,6 +246,10 @@
- addrp++;
- i++;
- }
-+ } else if (WSAGetLastError() == WSATRY_AGAIN) {
-+ NET_ThrowByNameWithLastError(env,
-+ JNU_JAVANETPKG "UnknownHostException",
-+ hostname);
- } else {
- JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", hostname);
- }
---- ./jdk/src/windows/native/java/net/Inet6AddressImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/net/Inet6AddressImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -93,13 +93,21 @@
-
- if (!initialized) {
- ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
-+ CHECK_NULL_RETURN(ni_iacls, NULL);
- ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
-+ CHECK_NULL_RETURN(ni_iacls, NULL);
- ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
-+ CHECK_NULL_RETURN(ni_ia4cls, NULL);
- ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
-+ CHECK_NULL_RETURN(ni_ia4cls, NULL);
- ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
-+ CHECK_NULL_RETURN(ni_ia6cls, NULL);
- ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
-+ CHECK_NULL_RETURN(ni_ia6cls, NULL);
- ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-+ CHECK_NULL_RETURN(ni_ia4ctrID, NULL);
- ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
-+ CHECK_NULL_RETURN(ni_ia6ctrID, NULL);
- initialized = 1;
- }
- if (IS_NULL(host)) {
-@@ -131,7 +139,13 @@
-
- error = getaddrinfo(hostname, NULL, &hints, &res);
-
-- if (error) {
-+ if (WSAGetLastError() == WSATRY_AGAIN) {
-+ NET_ThrowByNameWithLastError(env,
-+ JNU_JAVANETPKG "UnknownHostException",
-+ hostname);
-+ JNU_ReleaseStringPlatformChars(env, host, hostname);
-+ return NULL;
-+ } else if (error) {
- /* report error */
- JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
- (char *)hostname);
---- ./jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -489,6 +489,9 @@
- }
- }
- } else {
-+ /* NET_BindV6() closes both sockets upon a failure */
-+ (*env)->SetObjectField(env, this, pdsi_fdID, NULL);
-+ (*env)->SetObjectField(env, this, pdsi_fd1ID, NULL);
- NET_ThrowCurrent (env, "Cannot bind");
- return;
- }
---- ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -468,6 +468,10 @@
- (*env)->SetIntField(env, fd1Obj, IO_fd_fdID, fd1);
- }
- }
-+ } else {
-+ /* NET_BindV6() closes both sockets upon a failure */
-+ (*env)->SetObjectField(env, this, psi_fdID, NULL);
-+ (*env)->SetObjectField(env, this, psi_fd1ID, NULL);
- }
- } else {
- rv = NET_WinBind(fd, (struct sockaddr *)&him, len, exclBind);
---- ./jdk/src/windows/native/java/net/net_util_md.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/java/net/net_util_md.c Fri Apr 10 09:21:28 2015 -0700
-@@ -29,6 +29,9 @@
- #include "net_util.h"
- #include "jni.h"
-
-+// Taken from mstcpip.h in Windows SDK 8.0 or newer.
-+#define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16)
-+
- #ifndef IPTOS_TOS_MASK
- #define IPTOS_TOS_MASK 0x1e
- #endif
-@@ -443,6 +446,13 @@
- {
- int rv;
-
-+ if (level == IPPROTO_IPV6 && optname == IPV6_TCLASS) {
-+ int *intopt = (int *)optval;
-+ *intopt = 0;
-+ *optlen = sizeof(*intopt);
-+ return 0;
-+ }
-+
- rv = getsockopt(s, level, optname, optval, optlen);
-
-
-@@ -620,7 +630,7 @@
- * and returns SOCKET_ERROR. Used in NET_BindV6 only.
- */
-
--#define CLOSE_SOCKETS_AND_RETURN { \
-+#define CLOSE_SOCKETS_AND_RETURN do { \
- if (fd != -1) { \
- closesocket (fd); \
- fd = -1; \
-@@ -639,7 +649,7 @@
- } \
- b->ipv4_fd = b->ipv6_fd = -1; \
- return SOCKET_ERROR; \
--}
-+} while(0)
-
- /*
- * if ipv6 is available, call NET_BindV6 to bind to the required address/port.
-@@ -837,6 +847,25 @@
- }
- }
-
-+/**
-+ * Enables SIO_LOOPBACK_FAST_PATH
-+ */
-+JNIEXPORT jint JNICALL
-+NET_EnableFastTcpLoopback(int fd) {
-+ int enabled = 1;
-+ DWORD result_byte_count = -1;
-+ int result = WSAIoctl(fd,
-+ SIO_LOOPBACK_FAST_PATH,
-+ &enabled,
-+ sizeof(enabled),
-+ NULL,
-+ 0,
-+ &result_byte_count,
-+ NULL,
-+ NULL);
-+ return result == SOCKET_ERROR ? WSAGetLastError() : 0;
-+}
-+
- /* If address types is IPv6, then IPv6 must be available. Otherwise
- * no address can be generated. In the case of an IPv4 Inetaddress this
- * method will return an IPv4 mapped address where IPv6 is available and
---- ./jdk/src/windows/native/sun/nio/ch/FileChannelImpl.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/nio/ch/FileChannelImpl.c Fri Apr 10 09:21:28 2015 -0700
-@@ -31,6 +31,11 @@
- #include "nio.h"
- #include "nio_util.h"
- #include "sun_nio_ch_FileChannelImpl.h"
-+#include "java_lang_Integer.h"
-+
-+#include <winsock2.h>
-+#include <Mswsock.h>
-+#pragma comment(lib, "Mswsock.lib")
-
- static jfieldID chan_fd; /* id for jobject 'fd' in java.io.FileChannel */
-
-@@ -174,9 +179,42 @@
-
- JNIEXPORT jlong JNICALL
- Java_sun_nio_ch_FileChannelImpl_transferTo0(JNIEnv *env, jobject this,
-- jint srcFD,
-+ jobject srcFD,
- jlong position, jlong count,
-- jint dstFD)
-+ jobject dstFD)
- {
-- return IOS_UNSUPPORTED;
-+ const int PACKET_SIZE = 524288;
-+
-+ HANDLE src = (HANDLE)(handleval(env, srcFD));
-+ SOCKET dst = (SOCKET)(fdval(env, dstFD));
-+ DWORD chunkSize = (count > java_lang_Integer_MAX_VALUE) ?
-+ java_lang_Integer_MAX_VALUE : (DWORD)count;
-+ BOOL result = 0;
-+
-+ jlong pos = Java_sun_nio_ch_FileChannelImpl_position0(env, this, srcFD, position);
-+ if (pos == IOS_THROWN) {
-+ return IOS_THROWN;
-+ }
-+
-+ result = TransmitFile(
-+ dst,
-+ src,
-+ chunkSize,
-+ PACKET_SIZE,
-+ NULL,
-+ NULL,
-+ TF_USE_KERNEL_APC
-+ );
-+ if (!result) {
-+ int error = WSAGetLastError();
-+ if (WSAEINVAL == error && count >= 0) {
-+ return IOS_UNSUPPORTED_CASE;
-+ }
-+ if (WSAENOTSOCK == error) {
-+ return IOS_UNSUPPORTED_CASE;
-+ }
-+ JNU_ThrowIOExceptionWithLastError(env, "transfer failed");
-+ return IOS_THROWN;
-+ }
-+ return chunkSize;
- }
---- ./jdk/src/windows/native/sun/nio/ch/Net.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/nio/ch/Net.c Fri Apr 10 09:21:28 2015 -0700
-@@ -126,7 +126,7 @@
-
- JNIEXPORT jint JNICALL
- Java_sun_nio_ch_Net_socket0(JNIEnv *env, jclass cl, jboolean preferIPv6,
-- jboolean stream, jboolean reuse)
-+ jboolean stream, jboolean reuse, jboolean fastLoopback)
- {
- SOCKET s;
- int domain = (preferIPv6) ? AF_INET6 : AF_INET;
-@@ -151,6 +151,20 @@
- NET_ThrowNew(env, WSAGetLastError(), "socket");
- }
-
-+ if (stream && fastLoopback) {
-+ static int loopback_available = 1;
-+ if (loopback_available) {
-+ int rv = NET_EnableFastTcpLoopback((jint)s);
-+ if (rv) {
-+ if (rv == WSAEOPNOTSUPP || rv == WSAEINVAL) {
-+ loopback_available = 0;
-+ } else {
-+ NET_ThrowNew(env, rv, "fastLoopback");
-+ }
-+ }
-+ }
-+ }
-+
- return (jint)s;
- }
-
-@@ -294,9 +308,9 @@
- /**
- * HACK: IP_TOS is deprecated on Windows and querying the option
- * returns a protocol error. NET_GetSockOpt handles this and uses
-- * a fallback mechanism.
-+ * a fallback mechanism. Same applies to IPV6_TCLASS
- */
-- if (level == IPPROTO_IP && opt == IP_TOS) {
-+ if ((level == IPPROTO_IP && opt == IP_TOS) || (level == IPPROTO_IPV6 && opt == IPV6_TCLASS)) {
- mayNeedConversion = JNI_TRUE;
- }
-
-@@ -318,7 +332,7 @@
-
- JNIEXPORT void JNICALL
- Java_sun_nio_ch_Net_setIntOption0(JNIEnv *env, jclass clazz, jobject fdo,
-- jboolean mayNeedConversion, jint level, jint opt, jint arg)
-+ jboolean mayNeedConversion, jint level, jint opt, jint arg, jboolean ipv6)
- {
- struct linger linger;
- char *parg;
-@@ -339,6 +353,11 @@
- arglen = sizeof(arg);
- }
-
-+ if (level == IPPROTO_IPV6 && opt == IPV6_TCLASS) {
-+ /* No op */
-+ return;
-+ }
-+
- if (mayNeedConversion) {
- n = NET_SetSockOpt(fdval(env, fdo), level, opt, parg, arglen);
- } else {
---- ./jdk/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c Fri Apr 10 09:21:28 2015 -0700
-@@ -23,6 +23,7 @@
- * questions.
- */
- #include <windows.h>
-+#include <Sddl.h>
- #include <string.h>
-
- #include "jni.h"
-@@ -258,6 +259,25 @@
- HANDLE hPipe;
- char name[MAX_PIPE_NAME_LENGTH];
-
-+ SECURITY_ATTRIBUTES sa;
-+ LPSECURITY_ATTRIBUTES lpSA = NULL;
-+ // Custom Security Descriptor is required here to "get" Medium Integrity Level.
-+ // In order to allow Medium Integrity Level clients to open
-+ // and use a NamedPipe created by an High Integrity Level process.
-+ TCHAR *szSD = TEXT("D:") // Discretionary ACL
-+ TEXT("(A;OICI;GRGW;;;WD)") // Allow read/write to Everybody
-+ TEXT("(A;OICI;GA;;;SY)") // Allow full control to System
-+ TEXT("(A;OICI;GA;;;BA)"); // Allow full control to Administrators
-+
-+ sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-+ sa.bInheritHandle = FALSE;
-+ sa.lpSecurityDescriptor = NULL;
-+
-+ if (ConvertStringSecurityDescriptorToSecurityDescriptor
-+ (szSD, SDDL_REVISION_1, &(sa.lpSecurityDescriptor), NULL)) {
-+ lpSA = &sa;
-+ }
-+
- jstring_to_cstring(env, pipename, name, MAX_PIPE_NAME_LENGTH);
-
- hPipe = CreateNamedPipe(
-@@ -270,7 +290,9 @@
- 128, // output buffer size
- 8192, // input buffer size
- NMPWAIT_USE_DEFAULT_WAIT, // client time-out
-- NULL); // default security attribute
-+ lpSA); // security attributes
-+
-+ LocalFree(sa.lpSecurityDescriptor);
-
- if (hPipe == INVALID_HANDLE_VALUE) {
- JNU_ThrowIOExceptionWithLastError(env, "CreateNamedPipe failed");
---- ./jdk/src/windows/native/sun/windows/WPrinterJob.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/WPrinterJob.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -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
-@@ -927,14 +927,7 @@
- if (type == GETJOBCOUNT) {
- ret = pPrinterInfo->cJobs;
- } else if (type == ACCEPTJOB) {
-- if (pPrinterInfo->Status &
-- (PRINTER_STATUS_ERROR |
-- PRINTER_STATUS_NOT_AVAILABLE |
-- PRINTER_STATUS_NO_TONER |
-- PRINTER_STATUS_OUT_OF_MEMORY |
-- PRINTER_STATUS_OFFLINE |
-- PRINTER_STATUS_USER_INTERVENTION |
-- PRINTER_STATUS_DOOR_OPEN)) {
-+ if (pPrinterInfo->Status & PRINTER_STATUS_PENDING_DELETION) {
- ret = 0;
- }
- else {
---- ./jdk/src/windows/native/sun/windows/awt_Component.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/awt_Component.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -3523,8 +3523,12 @@
- if (ops == SAVE) {
- transTable.put(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)),
- reinterpret_cast<void*>(static_cast<INT_PTR>(translation)));
-- deadKeyFlagTable.put(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)),
-- reinterpret_cast<void*>(static_cast<INT_PTR>(deadKeyFlag)));
-+ if (deadKeyFlag) {
-+ deadKeyFlagTable.put(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)),
-+ reinterpret_cast<void*>(static_cast<INT_PTR>(deadKeyFlag)));
-+ } else {
-+ deadKeyFlagTable.remove(reinterpret_cast<void*>(static_cast<INT_PTR>(wkey)));
-+ }
- }
-
- isDeadKey = deadKeyFlag;
---- ./jdk/src/windows/native/sun/windows/awt_TextArea.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/awt_TextArea.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -47,16 +47,12 @@
-
- jfieldID AwtTextArea::scrollbarVisibilityID;
-
--WNDPROC AwtTextArea::sm_pDefWindowProc = NULL;
--
- /************************************************************************
- * AwtTextArea methods
- */
-
- AwtTextArea::AwtTextArea() {
-- m_bIgnoreEnChange = FALSE;
- m_bCanUndo = FALSE;
-- m_hEditCtrl = NULL;
- m_lHDeltaAccum = 0;
- m_lVDeltaAccum = 0;
- }
-@@ -67,10 +63,6 @@
-
- void AwtTextArea::Dispose()
- {
-- if (m_hEditCtrl != NULL) {
-- VERIFY(::DestroyWindow(m_hEditCtrl));
-- m_hEditCtrl = NULL;
-- }
- AwtTextComponent::Dispose();
- }
-
-@@ -91,10 +83,6 @@
- }
- }
-
--void AwtTextArea::EditGetSel(CHARRANGE &cr) {
-- SendMessage(EM_EXGETSEL, 0, reinterpret_cast<LPARAM>(&cr));
--}
--
- /* Count how many '\n's are there in jStr */
- size_t AwtTextArea::CountNewLines(JNIEnv *env, jstring jStr, size_t maxlen)
- {
-@@ -149,159 +137,6 @@
- return retValue;
- }
-
--/*
-- * This routine is a window procedure for the subclass of the standard edit control
-- * used to generate context menu. RichEdit controls don't have built-in context menu.
-- * To implement this functionality we have to create an invisible edit control and
-- * forward WM_CONTEXTMENU messages from a RichEdit control to this helper edit control.
-- * While the edit control context menu is active we intercept the message generated in
-- * response to particular item selection and forward it back to the RichEdit control.
-- * (See AwtTextArea::WmContextMenu for more details).
-- */
--LRESULT
--AwtTextArea::EditProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
--
-- static BOOL bContextMenuActive = FALSE;
--
-- LRESULT retValue = 0;
-- MsgRouting mr = mrDoDefault;
--
-- DASSERT(::IsWindow(::GetParent(hWnd)));
--
-- switch (message) {
-- case WM_UNDO:
-- case WM_CUT:
-- case WM_COPY:
-- case WM_PASTE:
-- case WM_CLEAR:
-- case EM_SETSEL:
-- if (bContextMenuActive) {
-- ::SendMessage(::GetParent(hWnd), message, wParam, lParam);
-- mr = mrConsume;
-- }
-- break;
-- case WM_CONTEXTMENU:
-- bContextMenuActive = TRUE;
-- break;
-- }
--
-- if (mr == mrDoDefault) {
-- DASSERT(sm_pDefWindowProc != NULL);
-- retValue = ::CallWindowProc(sm_pDefWindowProc,
-- hWnd, message, wParam, lParam);
-- }
--
-- if (message == WM_CONTEXTMENU) {
-- bContextMenuActive = FALSE;
-- }
--
-- return retValue;
--}
--
--MsgRouting
--AwtTextArea::WmContextMenu(HWND hCtrl, UINT xPos, UINT yPos) {
-- /* Use the system provided edit control class to generate context menu. */
-- if (m_hEditCtrl == NULL) {
-- DWORD dwStyle = WS_CHILD;
-- DWORD dwExStyle = 0;
-- m_hEditCtrl = ::CreateWindowEx(dwExStyle,
-- L"EDIT",
-- L"TEXT",
-- dwStyle,
-- 0, 0, 0, 0,
-- GetHWnd(),
-- reinterpret_cast<HMENU>(
-- static_cast<INT_PTR>(
-- CreateControlID())),
-- AwtToolkit::GetInstance().GetModuleHandle(),
-- NULL);
-- DASSERT(m_hEditCtrl != NULL);
-- if (sm_pDefWindowProc == NULL) {
-- sm_pDefWindowProc = (WNDPROC)::GetWindowLongPtr(m_hEditCtrl,
-- GWLP_WNDPROC);
-- }
-- ::SetLastError(0);
-- INT_PTR ret = ::SetWindowLongPtr(m_hEditCtrl, GWLP_WNDPROC,
-- (INT_PTR)AwtTextArea::EditProc);
-- DASSERT(ret != 0 || ::GetLastError() == 0);
-- }
--
-- /*
-- * Tricks on the edit control to ensure that its context menu has
-- * the correct set of enabled items according to the RichEdit state.
-- */
-- ::SetWindowText(m_hEditCtrl, TEXT("TEXT"));
--
-- if (m_bCanUndo == TRUE && SendMessage(EM_CANUNDO)) {
-- /* Enable 'Undo' item. */
-- ::SendMessage(m_hEditCtrl, WM_CHAR, 'A', 0);
-- }
--
-- {
-- /*
-- * Initial selection for the edit control - (0,1).
-- * This enables 'Cut', 'Copy' and 'Delete' and 'Select All'.
-- */
-- INT nStart = 0;
-- INT nEnd = 1;
-- if (SendMessage(EM_SELECTIONTYPE) == SEL_EMPTY) {
-- /*
-- * RichEdit selection is empty - clear selection of the edit control.
-- * This disables 'Cut', 'Copy' and 'Delete'.
-- */
-- nStart = -1;
-- nEnd = 0;
-- } else {
--
-- CHARRANGE cr;
-- EditGetSel(cr);
-- /* Check if all the text is selected. */
-- if (cr.cpMin == 0) {
--
-- int len = ::GetWindowTextLength(GetHWnd());
-- if (cr.cpMin == 0 && cr.cpMax >= len) {
-- /*
-- * All the text is selected in RichEdit - select all the
-- * text in the edit control. This disables 'Select All'.
-- */
-- nStart = 0;
-- nEnd = -1;
-- }
-- }
-- }
-- ::SendMessage(m_hEditCtrl, EM_SETSEL, (WPARAM)nStart, (LPARAM)nEnd);
-- }
--
-- /* Disable 'Paste' item if the RichEdit control is read-only. */
-- ::SendMessage(m_hEditCtrl, EM_SETREADONLY,
-- GetStyle() & ES_READONLY ? TRUE : FALSE, 0);
--
-- POINT p;
-- p.x = xPos;
-- p.y = yPos;
--
-- /*
-- * If the context menu is requested with SHIFT+F10 or VK_APPS key,
-- * we position its top left corner to the center of the RichEdit
-- * client rect.
-- */
-- if (p.x == -1 && p.y == -1) {
-- RECT r;
-- VERIFY(::GetClientRect(GetHWnd(), &r));
-- p.x = (r.left + r.right) / 2;
-- p.y = (r.top + r.bottom) / 2;
-- VERIFY(::ClientToScreen(GetHWnd(), &p));
-- }
--
-- // The context menu steals focus from the proxy.
-- // So, set the focus-restore flag up.
-- SetRestoreFocus(TRUE);
-- ::SendMessage(m_hEditCtrl, WM_CONTEXTMENU, (WPARAM)m_hEditCtrl, MAKELPARAM(p.x, p.y));
-- SetRestoreFocus(FALSE);
--
-- return mrConsume;
--}
--
- MsgRouting
- AwtTextArea::WmNcHitTest(UINT x, UINT y, LRESULT& retVal)
- {
-@@ -314,27 +149,8 @@
-
-
- MsgRouting
--AwtTextArea::WmNotify(UINT notifyCode)
--{
-- if (notifyCode == EN_CHANGE) {
-- /*
-- * Ignore notifications if the text hasn't been changed.
-- * EN_CHANGE sent on character formatting changes as well.
-- */
-- if (m_bIgnoreEnChange == FALSE) {
-- m_bCanUndo = TRUE;
-- DoCallback("valueChanged", "()V");
-- } else {
-- m_bCanUndo = FALSE;
-- }
-- }
-- return mrDoDefault;
--}
--
--MsgRouting
- AwtTextArea::HandleEvent(MSG *msg, BOOL synthetic)
- {
-- MsgRouting returnVal;
- /*
- * RichEdit 1.0 control starts internal message loop if the
- * left mouse button is pressed while the cursor is not over
-@@ -486,26 +302,6 @@
- }
- delete msg;
- return mrConsume;
-- } else if (msg->message == WM_RBUTTONUP ||
-- (msg->message == WM_SYSKEYDOWN && msg->wParam == VK_F10 &&
-- HIBYTE(::GetKeyState(VK_SHIFT)))) {
-- POINT p;
-- if (msg->message == WM_RBUTTONUP) {
-- VERIFY(::GetCursorPos(&p));
-- } else {
-- p.x = -1;
-- p.y = -1;
-- }
--
-- if (!::PostMessage(GetHWnd(), WM_CONTEXTMENU, (WPARAM)GetHWnd(),
-- MAKELPARAM(p.x, p.y))) {
-- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
-- JNU_ThrowInternalError(env, "Message not posted, native event queue may be full.");
-- env->ExceptionDescribe();
-- env->ExceptionClear();
-- }
-- delete msg;
-- return mrConsume;
- } else if (msg->message == WM_MOUSEWHEEL) {
- // 4417236: If there is an old version of RichEd32.dll which
- // does not provide the mouse wheel scrolling we have to
-@@ -596,15 +392,7 @@
- // 4417236: end of fix
- }
-
-- /*
-- * Store the 'synthetic' parameter so that the WM_PASTE security check
-- * happens only for synthetic events.
-- */
-- m_synthetic = synthetic;
-- returnVal = AwtComponent::HandleEvent(msg, synthetic);
-- m_synthetic = FALSE;
--
-- return returnVal;
-+ return AwtTextComponent::HandleEvent(msg, synthetic);
- }
-
-
---- ./jdk/src/windows/native/sun/windows/awt_TextArea.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/awt_TextArea.h Fri Apr 10 09:21:28 2015 -0700
-@@ -57,17 +57,11 @@
- static size_t GetALength(JNIEnv* env, jstring jStr, size_t maxlen);
-
- LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-- static LRESULT CALLBACK EditProc(HWND hWnd, UINT message,
-- WPARAM wParam, LPARAM lParam);
-
- MsgRouting WmEnable(BOOL fEnabled);
-- MsgRouting WmContextMenu(HWND hCtrl, UINT xPos, UINT yPos);
-- MsgRouting WmNotify(UINT notifyCode);
- MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT &retVal);
- MsgRouting HandleEvent(MSG *msg, BOOL synthetic);
-
-- INLINE void SetIgnoreEnChange(BOOL b) { m_bIgnoreEnChange = b; }
--
- virtual BOOL InheritsNativeMouseWheelBehavior();
- virtual void Reshape(int x, int y, int w, int h);
-
-@@ -81,22 +75,7 @@
- protected:
-
- void EditSetSel(CHARRANGE &cr);
-- void EditGetSel(CHARRANGE &cr);
- private:
-- // RichEdit 1.0 control generates EN_CHANGE notifications not only
-- // on text changes, but also on any character formatting change.
-- // This flag is true when the latter case is detected.
-- BOOL m_bIgnoreEnChange;
--
-- // RichEdit 1.0 control undoes a character formatting change
-- // if it is the latest. We don't create our own undo buffer,
-- // but just prohibit undo in case if the latest operation
-- // is a formatting change.
-- BOOL m_bCanUndo;
--
-- HWND m_hEditCtrl;
-- static WNDPROC sm_pDefWindowProc;
--
- LONG m_lHDeltaAccum;
- LONG m_lVDeltaAccum;
-
---- ./jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -66,6 +66,8 @@
- m_lLastPos = -1;
- m_isLFonly = FALSE;
- m_EOLchecked = FALSE;
-+ m_hEditCtrl = NULL;
-+ m_bIgnoreEnChange = FALSE;
- // javaEventsMask = 0; // accessibility support
- }
-
-@@ -213,6 +215,16 @@
- return c;
- }
-
-+void AwtTextComponent::Dispose()
-+{
-+ if (m_hEditCtrl != NULL) {
-+ VERIFY(::DestroyWindow(m_hEditCtrl));
-+ m_hEditCtrl = NULL;
-+ }
-+ AwtComponent::Dispose();
-+}
-+
-+
- LRESULT
- AwtTextComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
-
-@@ -322,7 +334,16 @@
- AwtTextComponent::WmNotify(UINT notifyCode)
- {
- if (notifyCode == EN_CHANGE) {
-- DoCallback("valueChanged", "()V");
-+ /*
-+ * Ignore notifications if the text hasn't been changed.
-+ * EN_CHANGE sent on character formatting changes as well.
-+ */
-+ if (m_bIgnoreEnChange == FALSE) {
-+ m_bCanUndo = TRUE;
-+ DoCallback("valueChanged", "()V");
-+ } else {
-+ m_bCanUndo = FALSE;
-+ }
- }
- return mrDoDefault;
- }
-@@ -337,6 +358,28 @@
- {
- MsgRouting returnVal;
-
-+ if (msg->message == WM_RBUTTONUP ||
-+ (msg->message == WM_SYSKEYDOWN && msg->wParam == VK_F10 &&
-+ HIBYTE(::GetKeyState(VK_SHIFT)))) {
-+ POINT p;
-+ if (msg->message == WM_RBUTTONUP) {
-+ VERIFY(::GetCursorPos(&p));
-+ } else {
-+ p.x = -1;
-+ p.y = -1;
-+ }
-+
-+ if (!::PostMessage(GetHWnd(), WM_CONTEXTMENU, (WPARAM)GetHWnd(),
-+ MAKELPARAM(p.x, p.y))) {
-+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
-+ JNU_ThrowInternalError(env, "Message not posted, native event queue may be full.");
-+ env->ExceptionDescribe();
-+ env->ExceptionClear();
-+ }
-+ delete msg;
-+ return mrConsume;
-+ }
-+
- /*
- * Store the 'synthetic' parameter so that the WM_PASTE security check
- * happens only for synthetic events.
-@@ -701,6 +744,10 @@
- SendMessage(EM_SETBKGNDCOLOR, (WPARAM)FALSE, (LPARAM)GetBackgroundColor());
- }
-
-+void AwtTextComponent::EditGetSel(CHARRANGE &cr) {
-+ SendMessage(EM_EXGETSEL, 0, reinterpret_cast<LPARAM>(&cr));
-+}
-+
-
- /************************************************************************
- * WTextComponentPeer native methods
-@@ -982,6 +1029,161 @@
- }
-
-
-+/*
-+ * This routine is a window procedure for the subclass of the standard edit control
-+ * used to generate context menu. RichEdit controls don't have built-in context menu.
-+ * To implement this functionality we have to create an invisible edit control and
-+ * forward WM_CONTEXTMENU messages from a RichEdit control to this helper edit control.
-+ * While the edit control context menu is active we intercept the message generated in
-+ * response to particular item selection and forward it back to the RichEdit control.
-+ * (See AwtTextArea::WmContextMenu for more details).
-+ */
-+
-+WNDPROC AwtTextComponent::sm_pDefWindowProc = NULL;
-+
-+LRESULT
-+AwtTextComponent::EditProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
-+
-+ static BOOL bContextMenuActive = FALSE;
-+
-+ LRESULT retValue = 0;
-+ MsgRouting mr = mrDoDefault;
-+
-+ DASSERT(::IsWindow(::GetParent(hWnd)));
-+
-+ switch (message) {
-+ case WM_UNDO:
-+ case WM_CUT:
-+ case WM_COPY:
-+ case WM_PASTE:
-+ case WM_CLEAR:
-+ case EM_SETSEL:
-+ if (bContextMenuActive) {
-+ ::SendMessage(::GetParent(hWnd), message, wParam, lParam);
-+ mr = mrConsume;
-+ }
-+ break;
-+ case WM_CONTEXTMENU:
-+ bContextMenuActive = TRUE;
-+ break;
-+ }
-+
-+ if (mr == mrDoDefault) {
-+ DASSERT(sm_pDefWindowProc != NULL);
-+ retValue = ::CallWindowProc(sm_pDefWindowProc,
-+ hWnd, message, wParam, lParam);
-+ }
-+
-+ if (message == WM_CONTEXTMENU) {
-+ bContextMenuActive = FALSE;
-+ }
-+
-+ return retValue;
-+}
-+
-+MsgRouting
-+AwtTextComponent::WmContextMenu(HWND hCtrl, UINT xPos, UINT yPos) {
-+ /* Use the system provided edit control class to generate context menu. */
-+ if (m_hEditCtrl == NULL) {
-+ DWORD dwStyle = WS_CHILD;
-+ DWORD dwExStyle = 0;
-+ m_hEditCtrl = ::CreateWindowEx(dwExStyle,
-+ L"EDIT",
-+ L"TEXT",
-+ dwStyle,
-+ 0, 0, 0, 0,
-+ GetHWnd(),
-+ reinterpret_cast<HMENU>(
-+ static_cast<INT_PTR>(
-+ CreateControlID())),
-+ AwtToolkit::GetInstance().GetModuleHandle(),
-+ NULL);
-+ DASSERT(m_hEditCtrl != NULL);
-+ if (sm_pDefWindowProc == NULL) {
-+ sm_pDefWindowProc = (WNDPROC)::GetWindowLongPtr(m_hEditCtrl,
-+ GWLP_WNDPROC);
-+ }
-+ ::SetLastError(0);
-+ INT_PTR ret = ::SetWindowLongPtr(m_hEditCtrl, GWLP_WNDPROC,
-+ (INT_PTR)AwtTextArea::EditProc);
-+ DASSERT(ret != 0 || ::GetLastError() == 0);
-+ }
-+
-+ /*
-+ * Tricks on the edit control to ensure that its context menu has
-+ * the correct set of enabled items according to the RichEdit state.
-+ */
-+ ::SetWindowText(m_hEditCtrl, TEXT("TEXT"));
-+
-+ if (m_bCanUndo == TRUE && SendMessage(EM_CANUNDO)) {
-+ /* Enable 'Undo' item. */
-+ ::SendMessage(m_hEditCtrl, WM_CHAR, 'A', 0);
-+ }
-+
-+ {
-+ /*
-+ * Initial selection for the edit control - (0,1).
-+ * This enables 'Cut', 'Copy' and 'Delete' and 'Select All'.
-+ */
-+ INT nStart = 0;
-+ INT nEnd = 1;
-+ if (SendMessage(EM_SELECTIONTYPE) == SEL_EMPTY) {
-+ /*
-+ * RichEdit selection is empty - clear selection of the edit control.
-+ * This disables 'Cut', 'Copy' and 'Delete'.
-+ */
-+ nStart = -1;
-+ nEnd = 0;
-+ } else {
-+
-+ CHARRANGE cr;
-+ EditGetSel(cr);
-+ /* Check if all the text is selected. */
-+ if (cr.cpMin == 0) {
-+
-+ int len = ::GetWindowTextLength(GetHWnd());
-+ if (cr.cpMin == 0 && cr.cpMax >= len) {
-+ /*
-+ * All the text is selected in RichEdit - select all the
-+ * text in the edit control. This disables 'Select All'.
-+ */
-+ nStart = 0;
-+ nEnd = -1;
-+ }
-+ }
-+ }
-+ ::SendMessage(m_hEditCtrl, EM_SETSEL, (WPARAM)nStart, (LPARAM)nEnd);
-+ }
-+
-+ /* Disable 'Paste' item if the RichEdit control is read-only. */
-+ ::SendMessage(m_hEditCtrl, EM_SETREADONLY,
-+ GetStyle() & ES_READONLY ? TRUE : FALSE, 0);
-+
-+ POINT p;
-+ p.x = xPos;
-+ p.y = yPos;
-+
-+ /*
-+ * If the context menu is requested with SHIFT+F10 or VK_APPS key,
-+ * we position its top left corner to the center of the RichEdit
-+ * client rect.
-+ */
-+ if (p.x == -1 && p.y == -1) {
-+ RECT r;
-+ VERIFY(::GetClientRect(GetHWnd(), &r));
-+ p.x = (r.left + r.right) / 2;
-+ p.y = (r.top + r.bottom) / 2;
-+ VERIFY(::ClientToScreen(GetHWnd(), &p));
-+ }
-+
-+ // The context menu steals focus from the proxy.
-+ // So, set the focus-restore flag up.
-+ SetRestoreFocus(TRUE);
-+ ::SendMessage(m_hEditCtrl, WM_CONTEXTMENU, (WPARAM)m_hEditCtrl, MAKELPARAM(p.x, p.y));
-+ SetRestoreFocus(FALSE);
-+
-+ return mrConsume;
-+}
-
- //
- // Accessibility support
---- ./jdk/src/windows/native/sun/windows/awt_TextComponent.h Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/awt_TextComponent.h Fri Apr 10 09:21:28 2015 -0700
-@@ -48,6 +48,8 @@
-
- static AwtTextComponent* Create(jobject self, jobject parent, BOOL isMultiline);
-
-+ virtual void Dispose();
-+
- virtual LPCTSTR GetClassName();
- LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
-
-@@ -84,6 +86,8 @@
- MsgRouting HandleEvent(MSG *msg, BOOL synthetic);
- MsgRouting WmPaste();
-
-+ INLINE void SetIgnoreEnChange(BOOL b) { m_bIgnoreEnChange = b; }
-+
- virtual BOOL IsFocusingMouseMessage(MSG *pMsg);
-
- /* To be fully implemented in a future release
-@@ -116,11 +120,24 @@
- INLINE VOID SetEndSelectionPos(LONG lPos) { m_lEndPos = lPos; }
- INLINE VOID SetLastSelectionPos(LONG lPos) { m_lLastPos = lPos; }
-
-+ void EditGetSel(CHARRANGE &cr);
-+
- // Used to prevent untrusted code from synthesizing a WM_PASTE message
- // by posting a <CTRL>-V KeyEvent
- BOOL m_synthetic;
- LONG EditGetCharFromPos(POINT& pt);
-
-+ // RichEdit 1.0 control generates EN_CHANGE notifications not only
-+ // on text changes, but also on any character formatting change.
-+ // This flag is true when the latter case is detected.
-+ BOOL m_bIgnoreEnChange;
-+
-+ // RichEdit 1.0 control undoes a character formatting change
-+ // if it is the latest. We don't create our own undo buffer,
-+ // but just prohibit undo in case if the latest operation
-+ // is a formatting change.
-+ BOOL m_bCanUndo;
-+
- /*****************************************************************
- * Inner class OleCallback declaration.
- */
-@@ -167,6 +184,13 @@
-
- static OleCallback sm_oleCallback;
-
-+ static WNDPROC sm_pDefWindowProc;
-+ HWND m_hEditCtrl;
-+
-+ static LRESULT CALLBACK EditProc(HWND hWnd, UINT message,
-+ WPARAM wParam, LPARAM lParam);
-+ MsgRouting WmContextMenu(HWND hCtrl, UINT xPos, UINT yPos);
-+
- //
- // Accessibility support
- //
---- ./jdk/src/windows/native/sun/windows/awt_TextField.cpp Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/src/windows/native/sun/windows/awt_TextField.cpp Fri Apr 10 09:21:28 2015 -0700
-@@ -238,13 +238,8 @@
- break;
- }
- }
-- /*
-- * Store the 'synthetic' parameter so that the WM_PASTE security check
-- * happens only for synthetic events.
-- */
-- m_synthetic = synthetic;
-- returnVal = AwtComponent::HandleEvent(msg, synthetic);
-- m_synthetic = FALSE;
-+
-+ returnVal = AwtTextComponent::HandleEvent(msg, synthetic);
-
- if(systemBeeperEnabled){
- SystemParametersInfo(SPI_SETBEEP, 1, NULL, 0);
---- ./jdk/test/Makefile Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/Makefile Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 1995, 2012, 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
-@@ -524,7 +524,7 @@
-
- # Stable samevm testruns (minus items from PROBLEM_LIST)
- JDK_ALL_TARGETS += jdk_net
--jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net)
-+jdk_net: $(call TestDirs, com/sun/net java/net jdk/net sun/net com/oracle/net)
- $(call RunAgentvmBatch)
-
- # Stable samevm testruns (minus items from PROBLEM_LIST)
-@@ -550,21 +550,41 @@
- # Stable othervm testruns (minus items from PROBLEM_LIST)
- # Using samevm has serious problems with these tests
- JDK_ALL_TARGETS += jdk_security2
--jdk_security2: $(call TestDirs, javax/crypto com/sun/crypto)
-+jdk_security2: $(call TestDirs, javax/crypto com/sun/crypto javax/xml/crypto)
- $(call RunAgentvmBatch)
-
- # Stable othervm testruns (minus items from PROBLEM_LIST)
- # Using samevm has serious problems with these tests
- JDK_ALL_TARGETS += jdk_security3
--jdk_security3: $(call TestDirs, com/sun/security lib/security \
-- javax/security sun/security \
-+jdk_security3: $(call TestDirs, com/sun/security/auth \
-+ com/sun/security/sasl lib/security javax/net \
-+ javax/security/sasl javax/security/auth/login \
-+ javax/security/auth/PrivateCredentialPermission \
-+ javax/security/auth/Subject \
-+ javax/security/auth/SubjectDomainCombiner \
-+ javax/security/auth/x500 sun/security/acl \
-+ sun/security/action sun/security/ec sun/security/mscapi \
-+ sun/security/pkcs sun/security/pkcs11 sun/security/pkcs12 \
-+ sun/security/provider sun/security/rsa sun/security/ssl \
-+ sun/security/smartcardio sun/security/tools \
-+ sun/security/util sun/security/validator sun/security/x509 \
- com/sun/org/apache/xml/internal/security \
- com/oracle/security)
- $(call SharedLibraryPermissions,sun/security)
- $(call RunAgentvmBatch)
-
-+# Stable othervm testruns (minus items from PROBLEM_LIST)
-+# Using samevm has serious problems with these tests
-+JDK_ALL_TARGETS += jdk_security4
-+jdk_security4: $(call TestDirs, com/sun/security/jgss \
-+ javax/security/auth/kerberos \
-+ sun/security/krb5 \
-+ sun/security/jgss)
-+ $(call SharedLibraryPermissions,sun/security)
-+ $(call RunAgentvmBatch)
-+
- # All security tests
--jdk_security: jdk_security1 jdk_security2 jdk_security3
-+jdk_security: jdk_security1 jdk_security2 jdk_security3 jdk_security4
- @$(SummaryInfo)
-
- # Stable samevm testruns (minus items from PROBLEM_LIST)
-@@ -616,8 +636,8 @@
-
- # ------------------------------------------------------------------
-
--# Default JTREG to run (win32 script works for everybody)
--JTREG = $(JT_HOME)/win32/bin/jtreg
-+# Default JTREG to run
-+JTREG = $(JT_HOME)/bin/jtreg
- # Add any extra options (agentvm etc.)
- JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
- # Only run automatic tests
---- ./jdk/test/ProblemList.txt Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/ProblemList.txt Fri Apr 10 09:21:28 2015 -0700
-@@ -387,9 +387,6 @@
- # Filed 6986875
- sun/tools/jps/jps-Vvml.sh generic-all
-
--# Filed 6979016
--sun/tools/jconsole/ResourceCheckTest.sh generic-all
--
- # 7132203
- sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
-
---- ./jdk/test/com/sun/crypto/provider/Mac/MacClone.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/com/sun/crypto/provider/Mac/MacClone.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1998, 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
-@@ -23,7 +23,7 @@
-
- /*
- * @test
-- * @bug 0000000
-+ * @bug 7087021
- * @summary MacClone
- * @author Jan Luehe
- */
-@@ -56,7 +56,7 @@
- KeyGenerator kgen = KeyGenerator.getInstance("DES");
- SecretKey skey = kgen.generateKey();
-
-- mac = Mac.getInstance("HmacSHA1");
-+ mac = Mac.getInstance("HmacSHA1", "SunJCE");
- mac.init(skey);
- macClone = (Mac)mac.clone();
- System.out.println(macClone.getProvider().toString());
---- ./jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/com/sun/jndi/ldap/LdapTimeoutTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -23,6 +23,7 @@
-
- /**
- * @test
-+ * @run main/othervm LdapTimeoutTest
- * @bug 7094377 8000487 6176036 7056489
- * @summary Timeout tests for ldap
- */
-@@ -33,141 +34,56 @@
- import java.io.*;
- import javax.naming.*;
- import javax.naming.directory.*;
-+import java.util.List;
- import java.util.Hashtable;
-+import java.util.ArrayList;
- import java.util.concurrent.Callable;
-+import java.util.concurrent.ExecutionException;
- import java.util.concurrent.Executors;
-+import java.util.concurrent.ExecutorService;
-+import java.util.concurrent.Future;
- import java.util.concurrent.ScheduledExecutorService;
- import java.util.concurrent.ScheduledFuture;
-+import java.util.concurrent.TimeoutException;
- import java.util.concurrent.TimeUnit;
-
--public class LdapTimeoutTest {
-- private static final ScheduledExecutorService pool =
-- Executors.newScheduledThreadPool(1);
-- static volatile int passed = 0, failed = 0;
-- static void pass() {passed++;}
-- static void fail() {failed++; Thread.dumpStack();}
-+import static java.util.concurrent.TimeUnit.MILLISECONDS;
-+import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
-- public static void main(String[] args) throws Exception {
-- ServerSocket serverSock = new ServerSocket(0);
-- Server s = new Server(serverSock);
-- s.start();
-- Thread.sleep(200);
-
-- Hashtable env = new Hashtable(11);
-- env.put(Context.INITIAL_CONTEXT_FACTORY,
-- "com.sun.jndi.ldap.LdapCtxFactory");
-- env.put(Context.PROVIDER_URL, "ldap://localhost:" +
-- serverSock.getLocalPort());
-+abstract class LdapTest implements Callable {
-
-- env.put(Context.SECURITY_AUTHENTICATION,"simple");
-+ Hashtable env;
-+ TestServer server;
-+ ScheduledExecutorService killSwitchPool;
-+ boolean passed = false;
-+ private int HANGING_TEST_TIMEOUT = 20_000;
-
-- env.put(Context.SECURITY_PRINCIPAL, "user");
-- env.put(Context.SECURITY_CREDENTIALS, "password");
--
-- 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);
-- } finally {
-- s.interrupt();
-- LdapTimeoutTest.pool.shutdown();
-- }
--
-- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
-- if (failed > 0) throw new AssertionError("Some tests failed");
-+ public LdapTest (TestServer server, Hashtable env) {
-+ this.server = server;
-+ this.env = env;
- }
-
-- void ldapReadTimeoutTest(Hashtable env, boolean ssl) {
-- InitialContext ctx = null;
-- if (ssl) env.put(Context.SECURITY_PROTOCOL, "ssl");
-- ScheduledFuture killer = killSwitch(5000);
-- 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) {
-- if (ssl) {
-- if (e.getCause() instanceof SocketTimeoutException) {
-- pass();
-- } else if (e.getCause() instanceof InterruptedIOException) {
-- Thread.interrupted();
-- fail();
-- }
-- } else {
-- pass();
-- }
-- } finally {
-- if (!shutItDown(killer, ctx)) fail();
-- }
-+ public LdapTest(TestServer server, Hashtable env,
-+ ScheduledExecutorService killSwitchPool)
-+ {
-+ this(server, env);
-+ this.killSwitchPool = killSwitchPool;
- }
-
-- void simpleAuthConnectTest(Hashtable env) {
-- InitialContext ctx = null;
-- ScheduledFuture killer = killSwitch(5000);
-- long start = System.nanoTime();
-- try {
-- ctx = new InitialDirContext(env);
-- // shouldn't reach here
-- System.err.println("Fail: InitialDirContext succeeded");
-- fail();
-- } catch (NamingException e) {
-- long end = System.nanoTime();
-- if (e.getCause() instanceof SocketTimeoutException) {
-- if (TimeUnit.NANOSECONDS.toMillis(end - start) < 2900) {
-- pass();
-- } else {
-- System.err.println("Fail: Waited too long");
-- fail();
-- }
-- } else if (e.getCause() instanceof InterruptedIOException) {
-- Thread.interrupted();
-- fail();
-- } else {
-- fail();
-- }
-- } finally {
-- if (!shutItDown(killer, ctx)) fail();
-- }
-+ public abstract void performOp(InitialContext ctx) throws NamingException;
-+ public abstract void handleNamingException(
-+ NamingException e, long start, long end);
-+
-+ public void pass() {
-+ this.passed = true;
- }
-
-- 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();
-- }
-+ public void fail() {
-+ throw new RuntimeException("Test failed");
- }
-
-- boolean shutItDown(ScheduledFuture killer, InitialContext ctx) {
-- killer.cancel(true);
-+ boolean shutItDown(InitialContext ctx) {
- try {
- if (ctx != null) ctx.close();
- return true;
-@@ -176,29 +92,376 @@
- }
- }
-
-- 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()");
-- System.exit(0);
-- return null;
-+ public Boolean call() {
-+ InitialContext ctx = null;
-+ ScheduledFuture killer = null;
-+ long start = System.nanoTime();
-+
-+ try {
-+ while(!server.accepting())
-+ Thread.sleep(200); // allow the server to start up
-+ Thread.sleep(200); // to be sure
-+
-+ // if this is a hanging test, scheduled a thread to
-+ // interrupt after a certain time
-+ if (killSwitchPool != null) {
-+ final Thread current = Thread.currentThread();
-+ killer = killSwitchPool.schedule(
-+ new Callable<Void>() {
-+ public Void call() throws Exception {
-+ current.interrupt();
-+ return null;
-+ }
-+ }, HANGING_TEST_TIMEOUT, MILLISECONDS);
- }
-- }, ms, TimeUnit.MILLISECONDS);
-- }
-
-- static class Server extends Thread {
-- final ServerSocket serverSock;
-+ env.put(Context.PROVIDER_URL, "ldap://localhost:" +
-+ server.getLocalPort());
-
-- Server(ServerSocket serverSock) {
-- this.serverSock = serverSock;
-- }
--
-- public void run() {
- try {
-- Socket socket = serverSock.accept();
-- } catch (IOException e) {}
-+ ctx = new InitialDirContext(env);
-+ performOp(ctx);
-+ fail();
-+ } catch (NamingException e) {
-+ long end = System.nanoTime();
-+ System.out.println(this.getClass().toString() + " - elapsed: "
-+ + NANOSECONDS.toMillis(end - start));
-+ handleNamingException(e, start, end);
-+ } finally {
-+ if (killer != null && !killer.isDone())
-+ killer.cancel(true);
-+ shutItDown(ctx);
-+ server.close();
-+ }
-+ return passed;
-+ } catch (IOException|InterruptedException e) {
-+ throw new RuntimeException(e);
- }
- }
- }
-
-+abstract class ReadServerTest extends LdapTest {
-+
-+ public ReadServerTest(Hashtable env) throws IOException {
-+ super(new BindableServer(), env);
-+ }
-+
-+ public ReadServerTest(Hashtable env,
-+ ScheduledExecutorService killSwitchPool)
-+ throws IOException
-+ {
-+ super(new BindableServer(), env, killSwitchPool);
-+ }
-+
-+ public void performOp(InitialContext ctx) throws NamingException {
-+ SearchControls scl = new SearchControls();
-+ scl.setSearchScope(SearchControls.SUBTREE_SCOPE);
-+ NamingEnumeration<SearchResult> answer = ((InitialDirContext)ctx)
-+ .search("ou=People,o=JNDITutorial", "(objectClass=*)", scl);
-+ }
-+}
-+
-+abstract class DeadServerTest extends LdapTest {
-+
-+ public DeadServerTest(Hashtable env) throws IOException {
-+ super(new DeadServer(), env);
-+ }
-+
-+ public DeadServerTest(Hashtable env,
-+ ScheduledExecutorService killSwitchPool)
-+ throws IOException
-+ {
-+ super(new DeadServer(), env, killSwitchPool);
-+ }
-+
-+ public void performOp(InitialContext ctx) throws NamingException {}
-+}
-+
-+class DeadServerNoTimeoutTest extends DeadServerTest {
-+
-+ public DeadServerNoTimeoutTest(Hashtable env,
-+ ScheduledExecutorService killSwitchPool)
-+ throws IOException
-+ {
-+ super(env, killSwitchPool);
-+ }
-+
-+ public void handleNamingException(NamingException e, long start, long end) {
-+ if (e instanceof InterruptedNamingException) Thread.interrupted();
-+
-+ if (NANOSECONDS.toMillis(end - start) < LdapTimeoutTest.MIN_TIMEOUT) {
-+ System.err.printf("DeadServerNoTimeoutTest fail: timeout should be " +
-+ "at least %s ms, actual time is %s ms%n",
-+ LdapTimeoutTest.MIN_TIMEOUT,
-+ NANOSECONDS.toMillis(end - start));
-+ fail();
-+ } else {
-+ pass();
-+ }
-+ }
-+}
-+
-+class DeadServerTimeoutTest extends DeadServerTest {
-+
-+ public DeadServerTimeoutTest(Hashtable env) throws IOException {
-+ super(env);
-+ }
-+
-+ public void handleNamingException(NamingException e, long start, long end)
-+ {
-+ // non SSL connect will timeout via readReply using connectTimeout
-+ if (NANOSECONDS.toMillis(end - start) < 2_900) {
-+ pass();
-+ } else {
-+ System.err.println("Fail: Waited too long");
-+ fail();
-+ }
-+ }
-+}
-+
-+class DeadServerTimeoutSSLTest extends DeadServerTest {
-+
-+ public DeadServerTimeoutSSLTest(Hashtable env) throws IOException {
-+ super(env);
-+ }
-+
-+ public void handleNamingException(NamingException e, long start, long end) {
-+ if (e.getCause() instanceof SocketTimeoutException) {
-+ // SSL connect will timeout via readReply using
-+ // SocketTimeoutException
-+ pass();
-+ } else {
-+ fail();
-+ }
-+ }
-+}
-+
-+
-+class ReadServerNoTimeoutTest extends ReadServerTest {
-+
-+ public ReadServerNoTimeoutTest(Hashtable env,
-+ ScheduledExecutorService killSwitchPool)
-+ throws IOException
-+ {
-+ super(env, killSwitchPool);
-+ }
-+
-+ public void handleNamingException(NamingException e, long start, long end) {
-+ if (e instanceof InterruptedNamingException) Thread.interrupted();
-+
-+ if (NANOSECONDS.toMillis(end - start) < LdapTimeoutTest.MIN_TIMEOUT) {
-+ System.err.printf("ReadServerNoTimeoutTest fail: timeout should be " +
-+ "at least %s ms, actual time is %s ms%n",
-+ LdapTimeoutTest.MIN_TIMEOUT,
-+ NANOSECONDS.toMillis(end - start));
-+ fail();
-+ } else {
-+ pass();
-+ }
-+ }
-+}
-+
-+class ReadServerTimeoutTest extends ReadServerTest {
-+
-+ public ReadServerTimeoutTest(Hashtable env) throws IOException {
-+ super(env);
-+ }
-+
-+ public void handleNamingException(NamingException e, long start, long end) {
-+ if (NANOSECONDS.toMillis(end - start) < 2_900) {
-+ fail();
-+ } else {
-+ pass();
-+ }
-+ }
-+}
-+
-+class TestServer extends Thread {
-+ ServerSocket serverSock;
-+ boolean accepting = false;
-+
-+ public TestServer() throws IOException {
-+ this.serverSock = new ServerSocket(0);
-+ start();
-+ }
-+
-+ public int getLocalPort() {
-+ return serverSock.getLocalPort();
-+ }
-+
-+ public boolean accepting() {
-+ return accepting;
-+ }
-+
-+ public void close() throws IOException {
-+ serverSock.close();
-+ }
-+}
-+
-+class BindableServer extends TestServer {
-+
-+ public BindableServer() throws IOException {
-+ super();
-+ }
-+
-+ private byte[] bindResponse = {
-+ 0x30, 0x0C, 0x02, 0x01, 0x01, 0x61, 0x07, 0x0A,
-+ 0x01, 0x00, 0x04, 0x00, 0x04, 0x00
-+ };
-+
-+ public void run() {
-+ try {
-+ accepting = true;
-+ Socket socket = serverSock.accept();
-+ InputStream in = socket.getInputStream();
-+ OutputStream out = socket.getOutputStream();
-+
-+ // Read the LDAP BindRequest
-+ while (in.read() != -1) {
-+ in.skip(in.available());
-+ break;
-+ }
-+
-+ // Write an LDAP BindResponse
-+ out.write(bindResponse);
-+ out.flush();
-+ } catch (IOException e) {
-+ // ignore
-+ }
-+ }
-+}
-+
-+class DeadServer extends TestServer {
-+
-+ public DeadServer() throws IOException {
-+ super();
-+ }
-+
-+ public void run() {
-+ while(true) {
-+ try {
-+ accepting = true;
-+ Socket socket = serverSock.accept();
-+ } catch (Exception e) {
-+ break;
-+ }
-+ }
-+ }
-+}
-+
-+public class LdapTimeoutTest {
-+
-+ private static final ExecutorService testPool =
-+ Executors.newFixedThreadPool(3);
-+ private static final ScheduledExecutorService killSwitchPool =
-+ Executors.newScheduledThreadPool(3);
-+ public static int MIN_TIMEOUT = 18_000;
-+
-+ static Hashtable createEnv() {
-+ Hashtable env = new Hashtable(11);
-+ env.put(Context.INITIAL_CONTEXT_FACTORY,
-+ "com.sun.jndi.ldap.LdapCtxFactory");
-+ return env;
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ InitialContext ctx = null;
-+ List<Future> results = new ArrayList<>();
-+
-+ try {
-+ // run the DeadServerTest with no timeouts set
-+ // this should get stuck indefinitely, so we need to kill
-+ // it after a timeout
-+ System.out.println("Running connect timeout test with 20s kill switch");
-+ Hashtable env = createEnv();
-+ results.add(
-+ testPool.submit(new DeadServerNoTimeoutTest(env, killSwitchPool)));
-+
-+ // run the ReadServerTest with connect timeout set
-+ // this should get stuck indefinitely so we need to kill
-+ // it after a timeout
-+ System.out.println("Running read timeout test with 10ms connect timeout & 20s kill switch");
-+ Hashtable env1 = createEnv();
-+ env1.put("com.sun.jndi.ldap.connect.timeout", "10");
-+ results.add(testPool.submit(
-+ new ReadServerNoTimeoutTest(env1, killSwitchPool)));
-+
-+ // run the ReadServerTest with no timeouts set
-+ // this should get stuck indefinitely, so we need to kill
-+ // it after a timeout
-+ System.out.println("Running read timeout test with 20s kill switch");
-+ Hashtable env2 = createEnv();
-+ results.add(testPool.submit(
-+ new ReadServerNoTimeoutTest(env2, killSwitchPool)));
-+
-+ // run the DeadServerTest with connect / read timeouts set
-+ // this should exit after the connect timeout expires
-+ System.out.println("Running connect timeout test with 10ms connect timeout, 3000ms read timeout");
-+ Hashtable env3 = createEnv();
-+ env3.put("com.sun.jndi.ldap.connect.timeout", "10");
-+ env3.put("com.sun.jndi.ldap.read.timeout", "3000");
-+ results.add(testPool.submit(new DeadServerTimeoutTest(env3)));
-+
-+
-+ // run the ReadServerTest with connect / read timeouts set
-+ // this should exit after the connect timeout expires
-+ System.out.println("Running read timeout test with 10ms connect timeout, 3000ms read timeout");
-+ Hashtable env4 = createEnv();
-+ env4.put("com.sun.jndi.ldap.connect.timeout", "10");
-+ env4.put("com.sun.jndi.ldap.read.timeout", "3000");
-+ results.add(testPool.submit(new ReadServerTimeoutTest(env4)));
-+
-+ // run the DeadServerTest with connect timeout set
-+ // this should exit after the connect timeout expires
-+ System.out.println("Running connect timeout test with 10ms connect timeout");
-+ Hashtable env5 = createEnv();
-+ env5.put("com.sun.jndi.ldap.connect.timeout", "10");
-+ results.add(testPool.submit(new DeadServerTimeoutTest(env5)));
-+
-+ // 8000487: Java JNDI connection library on ldap conn is
-+ // not honoring configured timeout
-+ System.out.println("Running simple auth connection test");
-+ Hashtable env6 = createEnv();
-+ env6.put("com.sun.jndi.ldap.connect.timeout", "10");
-+ env6.put("com.sun.jndi.ldap.read.timeout", "3000");
-+ env6.put(Context.SECURITY_AUTHENTICATION, "simple");
-+ env6.put(Context.SECURITY_PRINCIPAL, "user");
-+ env6.put(Context.SECURITY_CREDENTIALS, "password");
-+ results.add(testPool.submit(new DeadServerTimeoutTest(env6)));
-+
-+ boolean testFailed = false;
-+ for (Future test : results) {
-+ while (!test.isDone()) {
-+ if ((Boolean) test.get() == false)
-+ testFailed = true;
-+ }
-+ }
-+
-+ //
-+ // Running this test serially as it seems to tickle a problem
-+ // on older kernels
-+ //
-+ // run the DeadServerTest with connect / read timeouts set
-+ // and ssl enabled
-+ // this should exit with a SocketTimeoutException as the root cause
-+ // it should also use the connect timeout instead of the read timeout
-+ System.out.println("Running connect timeout test with 10ms connect timeout, 3000ms read timeout & SSL");
-+ Hashtable sslenv = createEnv();
-+ sslenv.put("com.sun.jndi.ldap.connect.timeout", "10");
-+ sslenv.put("com.sun.jndi.ldap.read.timeout", "3000");
-+ sslenv.put(Context.SECURITY_PROTOCOL, "ssl");
-+ testFailed = (new DeadServerTimeoutSSLTest(sslenv).call()) ? false : true;
-+
-+ if (testFailed) {
-+ throw new AssertionError("some tests failed");
-+ }
-+
-+ } finally {
-+ LdapTimeoutTest.killSwitchPool.shutdown();
-+ LdapTimeoutTest.testPool.shutdown();
-+ }
-+ }
-+
-+}
-+
---- ./jdk/test/com/sun/net/httpserver/bugs/B6373555.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/com/sun/net/httpserver/bugs/B6373555.java Fri Apr 10 09:21:28 2015 -0700
-@@ -43,14 +43,12 @@
- private static int port;
-
- private static volatile boolean error = false;
-- private static Object lock;
- static HttpServer httpServer;
- static ExecutorService pool, execs;
- static int NUM = 1000;
-
- public static void main(String[] args) throws Exception {
- try {
-- lock = new Object();
- if (args.length > 0) {
- NUM = Integer.parseInt (args[0]);
- }
-@@ -117,12 +115,6 @@
- System.out.println("Doesn't match");
- error = true;
- }
-- synchronized(lock) {
-- ++received;
-- if ((received % 1000) == 0) {
-- System.out.println("Received="+received);
-- }
-- }
- }
- catch(Exception e) {
- e.printStackTrace();
-@@ -150,18 +142,12 @@
- private static HttpServer createHttpServer(ExecutorService execs)
- throws Exception {
- InetSocketAddress inetAddress = new InetSocketAddress(0);
-- HttpServer testServer = HttpServer.create(inetAddress, 5);
-+ HttpServer testServer = HttpServer.create(inetAddress, 15);
- testServer.setExecutor(execs);
- HttpContext context = testServer.createContext("/test");
- context.setHandler(new HttpHandler() {
- public void handle(HttpExchange msg) {
- try {
-- synchronized(lock) {
-- ++s_received;
-- if ((s_received % 1000) == 0) {
-- System.out.println("Received="+s_received);
-- }
-- }
- String method = msg.getRequestMethod();
- if (method.equals("POST")) {
- InputStream is = msg.getRequestBody();
-@@ -172,12 +158,6 @@
- System.out.println("****** METHOD not handled ***** "+method);
- System.out.println("Received="+s_received);
- }
-- synchronized(lock) {
-- ++sent;
-- if ((sent % 1000) == 0) {
-- System.out.println("sent="+sent);
-- }
-- }
- }
- catch(Exception e) {
- e.printStackTrace();
---- ./jdk/test/java/awt/Focus/SortingFPT/JDK8048887.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/awt/Focus/SortingFPT/JDK8048887.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -22,13 +22,12 @@
- */
-
- /*
-- @test
-- @bug 8048887
-- @summary Tests SortingFTP for an exception caused by the tim-sort algo.
-- @author anton.tarasov: area=awt.focus
-- @run main JDK8040632
--*/
--
-+ @test
-+ @bug 8048887
-+ @summary Tests SortingFTP for an exception caused by the tim-sort algo.
-+ @author anton.tarasov: area=awt.focus
-+ @run main JDK8048887
-+ */
- import javax.swing.JFrame;
- import javax.swing.JPanel;
- import javax.swing.SwingUtilities;
-@@ -53,28 +52,31 @@
- public void start() {
- final CountDownLatch latch = new CountDownLatch(1);
-
-- SwingUtilities.invokeLater(() -> {
-+ SwingUtilities.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
- // 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();
-- }
-+ 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();
-- }
-+ public void windowGainedFocus(WindowEvent e) {
-+ latch.countDown();
-+ }
- });
- d.setVisible(true);
-+ }
- });
-
- try {
-@@ -83,10 +85,11 @@
- e.printStackTrace();
- }
-
-- if (passed)
-+ if (passed) {
- System.out.println("Test passed.");
-- else
-+ } else {
- throw new RuntimeException("Test failed!");
-+ }
- }
- }
-
-@@ -94,20 +97,19 @@
-
- // 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};
-+ 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++) {
-+ for (int i = 0; i < Xs.length; i++) {
- gbc.gridx = Xs[i];
- gbc.gridy = 100 - gbc.gridx;
- panel.add(new MyComponent(), gbc);
-@@ -117,7 +119,8 @@
- }
-
- public static class MyComponent extends JPanel {
-- private final static Dimension SIZE = new Dimension(1,1);
-+
-+ private final static Dimension SIZE = new Dimension(1, 1);
-
- public MyComponent() {
- setBackground(Color.BLACK);
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Frame/DisposeStressTest/DisposeStressTest.html Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,21 @@
-+<html>
-+<!--
-+ @test
-+ @bug 4051487 4145670
-+ @summary Tests that disposing of an empty Frame or a Frame with a MenuBar
-+ while it is being created does not crash the VM.
-+ @author dpm area=Threads
-+ @run applet/timeout=7200 DisposeStressTest.html
-+ -->
-+<head>
-+<title>DisposeStressTest</title>
-+</head>
-+<body>
-+
-+<h1>DisposeStressTest<br>Bug ID: 4051487, 4145670</h1>
-+
-+<p> This is an AUTOMATIC test, simply wait for completion </p>
-+
-+<APPLET CODE="DisposeStressTest.class" WIDTH=200 HEIGHT=200></APPLET>
-+</body>
-+</html>
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Frame/DisposeStressTest/DisposeStressTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,247 @@
-+/*
-+ * 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 4051487 4145670 8062021
-+ @summary Tests that disposing of an empty Frame or a Frame with a MenuBar
-+ while it is being created does not crash the VM.
-+ @author dpm area=Threads
-+ @run applet/timeout=7200 DisposeStressTest.html
-+*/
-+
-+// Note there is no @ in front of test above. This is so that the
-+// harness will not mistake this file as a test file. It should
-+// only see the html file as a test file. (the harness runs all
-+// valid test files, so it would run this test twice if this file
-+// were valid as well as the html file.)
-+// Also, note the area= after Your Name in the author tag. Here, you
-+// should put which functional area the test falls in. See the
-+// AWT-core home page -> test areas and/or -> AWT team for a list of
-+// areas.
-+// Note also the 'DisposeStressTest.html' in the run tag. This should
-+// be changed to the name of the test.
-+
-+
-+/**
-+ * DisposeStressTest.java
-+ *
-+ * summary:
-+ */
-+
-+import java.applet.Applet;
-+import java.awt.*;
-+
-+
-+//Automated tests should run as applet tests if possible because they
-+// get their environments cleaned up, including AWT threads, any
-+// test created threads, and any system resources used by the test
-+// such as file descriptors. (This is normally not a problem as
-+// main tests usually run in a separate VM, however on some platforms
-+// such as the Mac, separate VMs are not possible and non-applet
-+// tests will cause problems). Also, you don't have to worry about
-+// synchronisation stuff in Applet tests they way you do in main
-+// tests...
-+
-+
-+public class DisposeStressTest extends Applet
-+ {
-+ //Declare things used in the test, like buttons and labels here
-+
-+ public void init()
-+ {
-+ //Create instructions for the user here, as well as set up
-+ // the environment -- set the layout manager, add buttons,
-+ // etc.
-+
-+ this.setLayout (new BorderLayout ());
-+
-+ String[] instructions =
-+ {
-+ "This is an AUTOMATIC test",
-+ "simply wait until it is done"
-+ };
-+ Sysout.createDialog( );
-+ Sysout.printInstructions( instructions );
-+
-+ }//End init()
-+
-+ public void start ()
-+ {
-+ for (int i = 0; i < 1000; i++) {
-+ Frame f = new Frame();
-+ f.setBounds(10, 10, 10, 10);
-+ f.show();
-+ f.dispose();
-+
-+ Frame f2 = new Frame();
-+ f2.setBounds(10, 10, 100, 100);
-+ MenuBar bar = new MenuBar();
-+ Menu menu = new Menu();
-+ menu.add(new MenuItem("foo"));
-+ bar.add(menu);
-+ f2.setMenuBar(bar);
-+ f2.show();
-+ f2.dispose();
-+ }
-+ }// start()
-+
-+ }// class DisposeStressTest
-+
-+
-+/****************************************************
-+ 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.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
-+
-+/**
-+ 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("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/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,162 @@
-+/*
-+ * 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.Color;
-+import java.awt.Font;
-+import java.awt.Graphics2D;
-+import java.awt.RenderingHints;
-+import java.awt.geom.AffineTransform;
-+import java.awt.image.BufferedImage;
-+import java.io.File;
-+import java.io.IOException;
-+
-+import javax.imageio.ImageIO;
-+
-+import static java.awt.image.BufferedImage.TYPE_INT_RGB;
-+import static java.lang.Math.toRadians;
-+
-+/**
-+ * @test
-+ * @bug 8065373
-+ * @summary Verifies that we get correct direction, when draw rotated string.
-+ * @author Sergey Bylokhov
-+ * @run main DrawRotatedStringUsingRotatedFont
-+ */
-+public final class DrawRotatedStringUsingRotatedFont {
-+
-+ private static final int SIZE = 500;
-+ private static final String STR = "MMMMMMMMMMMMMMMM";
-+
-+ private static AffineTransform[] txs = {
-+ AffineTransform.getRotateInstance(toRadians(00)),
-+ AffineTransform.getRotateInstance(toRadians(45)),
-+ AffineTransform.getRotateInstance(toRadians(-45)),
-+ AffineTransform.getRotateInstance(toRadians(90)),
-+ AffineTransform.getRotateInstance(toRadians(-90)),
-+ AffineTransform.getRotateInstance(toRadians(135)),
-+ AffineTransform.getRotateInstance(toRadians(-135)),
-+ AffineTransform.getRotateInstance(toRadians(180)),
-+ AffineTransform.getRotateInstance(toRadians(-180)),
-+ AffineTransform.getRotateInstance(toRadians(225)),
-+ AffineTransform.getRotateInstance(toRadians(-225)),
-+ AffineTransform.getRotateInstance(toRadians(270)),
-+ AffineTransform.getRotateInstance(toRadians(-270)),
-+ AffineTransform.getRotateInstance(toRadians(315)),
-+ AffineTransform.getRotateInstance(toRadians(-315)),
-+ AffineTransform.getRotateInstance(toRadians(360)),
-+ AffineTransform.getRotateInstance(toRadians(-360))
-+ };
-+
-+ public static void main(final String[] args) throws IOException {
-+ for (final AffineTransform tx2 : txs) {
-+ for (final AffineTransform tx1 : txs) {
-+ for (final boolean aa : new boolean[]{true, false}) {
-+ final BufferedImage bi1 = createImage(aa, tx1, tx2);
-+ final BufferedImage bi2 = createImage(aa, tx2, tx1);
-+ compareImage(bi1, bi2);
-+ fillTextArea(bi1, tx1, tx2);
-+ fillTextArea(bi2, tx2, tx1);
-+ checkColors(bi1, bi2);
-+ }
-+ }
-+ }
-+ System.out.println("Passed");
-+ }
-+
-+ /**
-+ * Compares two images.
-+ */
-+ private static void compareImage(final BufferedImage bi1,
-+ final BufferedImage bi2)
-+ throws IOException {
-+ for (int i = 0; i < SIZE; ++i) {
-+ for (int j = 0; j < SIZE; ++j) {
-+ if (bi1.getRGB(i, j) != bi2.getRGB(i, j)) {
-+ ImageIO.write(bi1, "png", new File("image1.png"));
-+ ImageIO.write(bi2, "png", new File("image2.png"));
-+ throw new RuntimeException("Failed: wrong text location");
-+ }
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Checks an image color. RED and GREEN are allowed only.
-+ */
-+ private static void checkColors(final BufferedImage bi1,
-+ final BufferedImage bi2)
-+ throws IOException {
-+ for (int i = 0; i < SIZE; ++i) {
-+ for (int j = 0; j < SIZE; ++j) {
-+ final int rgb1 = bi1.getRGB(i, j);
-+ final int rgb2 = bi2.getRGB(i, j);
-+ if (rgb1 != rgb2 || rgb1 != 0xFFFF0000 && rgb1 != 0xFF00FF00) {
-+ ImageIO.write(bi1, "png", new File("image1.png"));
-+ ImageIO.write(bi2, "png", new File("image2.png"));
-+ throw new RuntimeException("Failed: wrong text location");
-+ }
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Creates an BufferedImage and draws a text, using two transformations,
-+ * one for graphics and one for font.
-+ */
-+ private static BufferedImage createImage(final boolean aa,
-+ final AffineTransform gtx,
-+ final AffineTransform ftx) {
-+ final BufferedImage bi = new BufferedImage(SIZE, SIZE, 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.transform(gtx);
-+ bg.setColor(Color.BLACK);
-+ bg.setFont(bg.getFont().deriveFont(20.0f).deriveFont(ftx));
-+ bg.drawString(STR, 0, 0);
-+ bg.dispose();
-+ return bi;
-+ }
-+
-+ /**
-+ * Fills the area of text using green solid color.
-+ */
-+ private static void fillTextArea(final BufferedImage bi,
-+ final AffineTransform tx1,
-+ final AffineTransform tx2) {
-+ final Graphics2D bg = bi.createGraphics();
-+ bg.translate(100, 100);
-+ bg.transform(tx1);
-+ bg.transform(tx2);
-+ bg.setColor(Color.GREEN);
-+ final Font font = bg.getFont().deriveFont(20.0f);
-+ bg.setFont(font);
-+ bg.fill(font.getStringBounds(STR, bg.getFontRenderContext()));
-+ bg.dispose();
-+ }
-+}
-+
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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.
-+ */
-+
-+/*
-+ @test
-+ @summary unit test for a new method in Container class: getMousePosition(boolean)
-+ @author dav@sparc.spb.su: area=
-+ @bug 4009555
-+ @run main JContainerMousePositionTest
-+*/
-+
-+import javax.swing.*;
-+import java.awt.*;
-+import java.util.concurrent.atomic.AtomicReference;
-+
-+// this test looks at mouse pointer when it
-+// 1 over component
-+// 2 over Container, but not over one of its child Components.
-+// out of bounds of Container
-+// two values of paramater allowChildren are considered.
-+
-+public class JContainerMousePositionTest {
-+ //Declare things used in the test, like buttons and labels here
-+ private static JButton jButton1;
-+ private static JButton jButton4;
-+ private static JFrame frame1;
-+ private static Container contentPane;
-+
-+ public static void main(final String[] args) throws Exception {
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(200);
-+ robot.setAutoWaitForIdle(true);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ JContainerMousePositionTest.init();
-+ }
-+ });
-+
-+ robot.delay(500);
-+ robot.waitForIdle();
-+
-+ final AtomicReference<Point> centerC4 = new AtomicReference<>();
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ centerC4.set(jButton4.getLocation());
-+ contentPane.remove(jButton4);
-+ contentPane.validate();
-+ contentPane.repaint();
-+ }
-+ });
-+ robot.waitForIdle();
-+
-+ final AtomicReference<Rectangle> frameBounds = new AtomicReference<>();
-+ final AtomicReference<Dimension> button1Size = new AtomicReference<>();
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ frameBounds.set(frame1.getBounds());
-+ button1Size.set(jButton1.getSize());
-+ }
-+ });
-+
-+//point mouse to center of top-left Component (button1)
-+ robot.mouseMove(frameBounds.get().x + button1Size.get().width / 2,
-+ frameBounds.get().y + button1Size.get().height / 2);
-+
-+ final AtomicReference<Point> pFalse = new AtomicReference<>();
-+ final AtomicReference<Point> pTrue = new AtomicReference<>();
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ pFalse.set(frame1.getMousePosition(false));
-+ pTrue.set(frame1.getMousePosition(true));
-+ }
-+ });
-+ robot.waitForIdle();
-+ if (pFalse.get() != null) {
-+ throw new RuntimeException("Test failed: Container.getMousePosition(false) returned non-null over one of children.");
-+ }
-+ System.out.println("Test stage completed: Container.getMousePosition(false) returned null result over child Component. Passed.");
-+
-+ if (pTrue.get() == null) {
-+ throw new RuntimeException("Test failed: Container.getMousePosition(true) returned null result over child Component");
-+ }
-+ System.out.println("Test stage compelted: Container.getMousePosition(true) returned non-null result over child Component. Passed.");
-+
-+//point mouse out from Container's area
-+ robot.mouseMove(frameBounds.get().x + frameBounds.get().width + 10,
-+ frameBounds.get().y + frameBounds.get().height + 10);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ pFalse.set(frame1.getMousePosition(false));
-+ pTrue.set(frame1.getMousePosition(true));
-+ }
-+ });
-+ robot.waitForIdle();
-+ if (pFalse.get() != null || pTrue.get() != null) {
-+ throw new RuntimeException("Test failed: Container.getMousePosition(boolean) returned incorrect result outside Container");
-+ }
-+ System.out.println("Test stage completed: Container.getMousePosition(boolean) returned null result outside Container. Passed.");
-+
-+//point mouse in place free from child components (right-botton component)
-+ robot.mouseMove(frameBounds.get().x + centerC4.get().x,
-+ frameBounds.get().y + centerC4.get().y);
-+
-+ robot.delay(3000);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ pFalse.set(contentPane.getMousePosition(false));
-+ pTrue.set(frame1.getMousePosition(true));
-+ }
-+ });
-+ robot.waitForIdle();
-+
-+ if (pFalse.get() == null || pTrue.get() == null) {
-+ throw new RuntimeException("Test failed: Container.getMousePosition(boolean) returned null result inside Container.");
-+ }
-+ System.out.println("Test stage completed: Container.getMousePosition(boolean) returned non-null results inside Container. Passed.");
-+
-+ if (pTrue.get().x != centerC4.get().x || pTrue.get().y != centerC4.get().y) {
-+ throw new RuntimeException("Test failed: Container.getMousePosition(true) returned incorrect result inside Container.");
-+ }
-+ System.out.println("Test stage completed: Container.getMousePosition(true) returned correct result inside Container. Passed.");
-+
-+ System.out.println("TEST PASSED");
-+ }
-+
-+ private static void init() {
-+ frame1 = new JFrame("Testing getMousePosition() on LWs");
-+ jButton1 = new JButton("C1");
-+ jButton4 = new JButton("C4");
-+ contentPane = frame1.getContentPane();
-+ contentPane.setLayout(new GridLayout(2, 2, 25, 25));
-+ contentPane.add(jButton1);
-+ contentPane.add(new JButton("C2"));
-+ contentPane.add(new JButton("C3"));
-+ contentPane.add(jButton4);
-+ frame1.setSize(200, 200);
-+ frame1.setVisible(true);
-+ }
-+}
-+
-+
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Paint/ButtonRepaint.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+
-+
-+import java.awt.*;
-+import java.awt.peer.ButtonPeer;
-+
-+/**
-+ * @test
-+ * @bug 7090424
-+ * @author Sergey Bylokhov
-+ */
-+public final class ButtonRepaint extends Button {
-+
-+ public static void main(final String[] args) {
-+ for (int i = 0; i < 10; ++i) {
-+ final Frame frame = new Frame();
-+ frame.setSize(300, 300);
-+ frame.setLocationRelativeTo(null);
-+ ButtonRepaint button = new ButtonRepaint();
-+ frame.add(button);
-+ frame.setVisible(true);
-+ sleep();
-+ button.test();
-+ frame.dispose();
-+ }
-+ }
-+
-+ private static void sleep() {
-+ try {
-+ Thread.sleep(2000);
-+ } catch (InterruptedException ignored) {
-+ }
-+ }
-+
-+ @Override
-+ public void paint(final Graphics g) {
-+ super.paint(g);
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ test();
-+ }
-+
-+ void test() {
-+ setLabel("");
-+ setLabel(null);
-+ setLabel(getLabel());
-+ ((ButtonPeer) getPeer()).setLabel("");
-+ ((ButtonPeer) getPeer()).setLabel(null);
-+ ((ButtonPeer) getPeer()).setLabel(getLabel());
-+
-+ setFont(null);
-+ setFont(getFont());
-+ getPeer().setFont(getFont());
-+
-+ setBackground(null);
-+ setBackground(getBackground());
-+ getPeer().setBackground(getBackground());
-+
-+ setForeground(null);
-+ setForeground(getForeground());
-+ getPeer().setForeground(getForeground());
-+
-+ setEnabled(isEnabled());
-+ getPeer().setEnabled(isEnabled());
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Paint/CheckboxRepaint.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.peer.CheckboxPeer;
-+
-+/**
-+ * @test
-+ * @bug 7090424
-+ * @author Sergey Bylokhov
-+ */
-+public final class CheckboxRepaint extends Checkbox {
-+
-+ public static void main(final String[] args) {
-+ for (int i = 0; i < 10; ++i) {
-+ final Frame frame = new Frame();
-+ frame.setSize(300, 300);
-+ frame.setLocationRelativeTo(null);
-+ CheckboxRepaint checkbox = new CheckboxRepaint();
-+ frame.add(checkbox);
-+ frame.setVisible(true);
-+ sleep();
-+ checkbox.test();
-+ frame.dispose();
-+ }
-+ }
-+
-+ private static void sleep() {
-+ try {
-+ Thread.sleep(2000);
-+ } catch (InterruptedException ignored) {
-+ }
-+ }
-+
-+ @Override
-+ public void paint(final Graphics g) {
-+ super.paint(g);
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ test();
-+ }
-+
-+ void test() {
-+ setState(getState());
-+ ((CheckboxPeer) getPeer()).setState(getState());
-+
-+ setCheckboxGroup(getCheckboxGroup());
-+ ((CheckboxPeer) getPeer()).setCheckboxGroup(getCheckboxGroup());
-+
-+ setLabel("");
-+ setLabel(null);
-+ setLabel(getLabel());
-+ ((CheckboxPeer) getPeer()).setLabel("");
-+ ((CheckboxPeer) getPeer()).setLabel(null);
-+ ((CheckboxPeer) getPeer()).setLabel(getLabel());
-+
-+ setFont(null);
-+ setFont(getFont());
-+ getPeer().setFont(getFont());
-+
-+ setBackground(null);
-+ setBackground(getBackground());
-+ getPeer().setBackground(getBackground());
-+
-+ setForeground(null);
-+ setForeground(getForeground());
-+ getPeer().setForeground(getForeground());
-+
-+ setEnabled(isEnabled());
-+ getPeer().setEnabled(isEnabled());
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Paint/ExposeOnEDT.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,293 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.*;
-+
-+/**
-+ * @test
-+ * @bug 7090424
-+ * @author Sergey Bylokhov
-+ * @run main ExposeOnEDT
-+ */
-+public final class ExposeOnEDT {
-+
-+ private static final Button buttonStub = new Button() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ buttonPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Canvas canvasStub = new Canvas() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ canvasPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Checkbox checkboxStub = new Checkbox() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ checkboxPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Choice choiceStub = new Choice() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ choicePainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Component lwComponentStub = new Component() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ lwPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Container containerStub = new Container() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ containerPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Frame frame = new Frame() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ super.paint(g);
-+ framePainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Label labelStub = new Label() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ labelPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final List listStub = new List() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ listPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Panel panelStub = new Panel() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ panelPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final Scrollbar scrollbarStub = new Scrollbar() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ scrollbarPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final ScrollPane scrollPaneStub = new ScrollPane() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ scrollPanePainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final TextArea textAreaStub = new TextArea() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ textAreaPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static final TextField textFieldStub = new TextField() {
-+ @Override
-+ public void paint(final Graphics g) {
-+ textFieldPainted = true;
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ }
-+ };
-+ private static volatile boolean lwPainted;
-+ private static volatile boolean buttonPainted;
-+ private static volatile boolean canvasPainted;
-+ private static volatile boolean checkboxPainted;
-+ private static volatile boolean choicePainted;
-+ private static volatile boolean containerPainted;
-+ private static volatile boolean framePainted;
-+ private static volatile boolean labelPainted;
-+ private static volatile boolean listPainted;
-+ private static volatile boolean panelPainted;
-+ private static volatile boolean scrollbarPainted;
-+ private static volatile boolean scrollPanePainted;
-+ private static volatile boolean textAreaPainted;
-+ private static volatile boolean textFieldPainted;
-+
-+ public static void main(final String[] args) throws Exception {
-+ //Frame initialisation
-+ frame.setLayout(new GridLayout());
-+ frame.setSize(new Dimension(200, 200));
-+ frame.setLocationRelativeTo(null);
-+ frame.setVisible(true);
-+ sleep();
-+
-+ frame.add(buttonStub);
-+ frame.add(canvasStub);
-+ frame.add(checkboxStub);
-+ frame.add(choiceStub);
-+ frame.add(lwComponentStub);
-+ frame.add(containerStub);
-+ frame.add(labelStub);
-+ frame.add(listStub);
-+ frame.add(panelStub);
-+ frame.add(scrollbarStub);
-+ frame.add(scrollPaneStub);
-+ frame.add(textAreaStub);
-+ frame.add(textFieldStub);
-+ frame.validate();
-+ sleep();
-+
-+ // Force expose event from the native system.
-+ initPaintedFlags();
-+ frame.setSize(300, 300);
-+ frame.validate();
-+ sleep();
-+
-+ //Check results.
-+ validation();
-+
-+ cleanup();
-+ }
-+
-+ private static void initPaintedFlags() {
-+ lwPainted = false;
-+ buttonPainted = false;
-+ canvasPainted = false;
-+ checkboxPainted = false;
-+ choicePainted = false;
-+ containerPainted = false;
-+ framePainted = false;
-+ labelPainted = false;
-+ listPainted = false;
-+ panelPainted = false;
-+ scrollbarPainted = false;
-+ scrollPanePainted = false;
-+ textAreaPainted = false;
-+ textFieldPainted = false;
-+ }
-+
-+ private static void validation() {
-+ if (!buttonPainted) {
-+ fail("Paint is not called a Button ");
-+ }
-+ if (!canvasPainted) {
-+ fail("Paint is not called a Canvas ");
-+ }
-+ if (!checkboxPainted) {
-+ fail("Paint is not called a Checkbox ");
-+ }
-+ if (!choicePainted) {
-+ fail("Paint is not called a Choice ");
-+ }
-+ if (!lwPainted) {
-+ fail("Paint is not called on a lightweight");
-+ }
-+ if (!containerPainted) {
-+ fail("Paint is not called on a Container");
-+ }
-+ if (!labelPainted) {
-+ fail("Paint is not called on a Label");
-+ }
-+ if (!listPainted) {
-+ fail("Paint is not called on a List");
-+ }
-+ if (!panelPainted) {
-+ fail("Paint is not called on a Panel");
-+ }
-+ if (!scrollbarPainted) {
-+ fail("Paint is not called on a Scrollbar");
-+ }
-+ if (!scrollPanePainted) {
-+ fail("Paint is not called on a ScrollPane");
-+ }
-+ if (!textAreaPainted) {
-+ fail("Paint is not called on a TextArea");
-+ }
-+ if (!textFieldPainted) {
-+ fail("Paint is not called on a TextField");
-+ }
-+ if (!framePainted) {
-+ fail("Paint is not called on a Frame when paintAll()");
-+ }
-+ }
-+
-+ private static void sleep() {
-+ ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
-+ try {
-+ Thread.sleep(1000L);
-+ } catch (InterruptedException ignored) {
-+ }
-+ }
-+
-+ private static void fail(final String message) {
-+ cleanup();
-+ throw new RuntimeException(message);
-+ }
-+
-+ private static void cleanup() {
-+ frame.dispose();
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Paint/LabelRepaint.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,93 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.EventQueue;
-+import java.awt.Frame;
-+import java.awt.Graphics;
-+import java.awt.Label;
-+import java.awt.peer.LabelPeer;
-+
-+/**
-+ * @test
-+ * @bug 7090424
-+ * @author Sergey Bylokhov
-+ */
-+public final class LabelRepaint extends Label {
-+
-+ public static void main(final String[] args) {
-+ for (int i = 0; i < 10; ++i) {
-+ final Frame frame = new Frame();
-+ frame.setSize(300, 300);
-+ frame.setLocationRelativeTo(null);
-+ LabelRepaint label = new LabelRepaint();
-+ frame.add(label);
-+ frame.setVisible(true);
-+ sleep();
-+ label.test();
-+ frame.dispose();
-+ }
-+ }
-+
-+ private static void sleep() {
-+ try {
-+ Thread.sleep(2000);
-+ } catch (InterruptedException ignored) {
-+ }
-+ }
-+
-+ @Override
-+ public void paint(final Graphics g) {
-+ super.paint(g);
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ test();
-+ }
-+
-+ void test() {
-+ setAlignment(getAlignment());
-+ ((LabelPeer) getPeer()).setAlignment(getAlignment());
-+
-+ setText("");
-+ setText(null);
-+ setText(getText());
-+ ((LabelPeer) getPeer()).setText("");
-+ ((LabelPeer) getPeer()).setText(null);
-+ ((LabelPeer) getPeer()).setText(getText());
-+
-+ setFont(null);
-+ setFont(getFont());
-+ getPeer().setFont(getFont());
-+
-+ setBackground(null);
-+ setBackground(getBackground());
-+ getPeer().setBackground(getBackground());
-+
-+ setForeground(null);
-+ setForeground(getForeground());
-+ getPeer().setForeground(getForeground());
-+
-+ setEnabled(isEnabled());
-+ getPeer().setEnabled(isEnabled());
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/Paint/ListRepaint.java Fri Apr 10 09:21:28 2015 -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.awt.EventQueue;
-+import java.awt.Frame;
-+import java.awt.Graphics;
-+import java.awt.List;
-+import java.awt.peer.ListPeer;
-+
-+/**
-+ * @test
-+ * @bug 7090424
-+ * @author Sergey Bylokhov
-+ */
-+public final class ListRepaint extends List {
-+
-+ public static void main(final String[] args) {
-+ for (int i = 0; i < 10; ++i) {
-+ final Frame frame = new Frame();
-+ frame.setSize(300, 300);
-+ frame.setLocationRelativeTo(null);
-+ ListRepaint list = new ListRepaint();
-+ list.add("1");
-+ list.add("2");
-+ list.add("3");
-+ list.add("4");
-+ list.select(0);
-+ frame.add(list);
-+ frame.setVisible(true);
-+ sleep();
-+ list.test();
-+ frame.dispose();
-+ }
-+ }
-+
-+ private static void sleep() {
-+ try {
-+ Thread.sleep(2000);
-+ } catch (InterruptedException ignored) {
-+ }
-+ }
-+
-+ @Override
-+ public void paint(final Graphics g) {
-+ super.paint(g);
-+ if (!EventQueue.isDispatchThread()) {
-+ throw new RuntimeException("Wrong thread");
-+ }
-+ test();
-+ }
-+
-+ void test() {
-+ select(0);
-+ ((ListPeer) getPeer()).select(getSelectedIndex());
-+
-+ setFont(null);
-+ setFont(getFont());
-+ getPeer().setFont(getFont());
-+
-+ setBackground(null);
-+ setBackground(getBackground());
-+ getPeer().setBackground(getBackground());
-+
-+ setForeground(null);
-+ setForeground(getForeground());
-+ getPeer().setForeground(getForeground());
-+
-+ setEnabled(isEnabled());
-+ getPeer().setEnabled(isEnabled());
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/event/KeyEvent/DeadKey/DeadKeySystemAssertionDialog.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,65 @@
-+/*
-+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+import java.awt.Frame;
-+import java.awt.Robot;
-+import java.awt.TextField;
-+import java.awt.Toolkit;
-+import java.awt.event.KeyEvent;
-+import sun.awt.SunToolkit;
-+/*
-+ * @test
-+ * @bug 8013849
-+ * @summary Awt assert on Hashtable.cpp:124
-+ * @author alexandr.scherbatiy area=awt.event
-+ * @run main/timeout=5 DeadKeySystemAssertionDialog
-+ */
-+
-+public class DeadKeySystemAssertionDialog {
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ Frame frame = new Frame();
-+ frame.setSize(300, 200);
-+
-+ TextField textField = new TextField();
-+ frame.add(textField);
-+
-+ frame.setVisible(true);
-+ toolkit.realSync();
-+
-+ textField.requestFocus();
-+ toolkit.realSync();
-+
-+ // Check that the system assertion dialog does not block Java
-+ Robot robot = new Robot();
-+ robot.setAutoDelay(50);
-+ robot.keyPress(KeyEvent.VK_A);
-+ robot.keyRelease(KeyEvent.VK_A);
-+ toolkit.realSync();
-+
-+ frame.setVisible(false);
-+ frame.dispose();
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/awt/print/PrinterJob/PrintToDir.java Fri Apr 10 09:21:28 2015 -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 4973278 8015586
-+ @run main PrintToDir
-+ @summary Must throw exception when printing to an invalid filename - a dir.
-+*/
-+import java.io.*;
-+import java.net.*;
-+import java.awt.*;
-+import java.awt.geom.*;
-+import java.awt.print.*;
-+import javax.print.PrintService;
-+import javax.print.attribute.*;
-+import javax.print.attribute.standard.*;
-+import java.util.PropertyPermission;
-+
-+public class PrintToDir extends Frame implements Printable {
-+
-+ boolean firstTime = true;
-+ double sx, sy;
-+ Shape clip, firstClip;
-+
-+ TextField tf = new TextField();
-+ Label tfLabel = new Label ("File Name");
-+ Panel p = new Panel (new GridLayout(2,2));
-+ Button b = new Button("Print");
-+
-+ PrintToDir() {
-+ add("South", p);
-+ p.add(tfLabel);
-+ p.add(tf);
-+ p.add(b);
-+ setSize(300, 300);
-+ setVisible(true);
-+ }
-+
-+ public int print(Graphics g, PageFormat pf, int pageIndex) {
-+ Graphics2D g2 = (Graphics2D)g;
-+ if (pageIndex>=1) {
-+ return Printable.NO_SUCH_PAGE;
-+ }
-+ g2.drawString("hello world", 100, 100);
-+ return Printable.PAGE_EXISTS;
-+ }
-+
-+ void doPrintJob(String fileStr) {
-+ PageAttributes pa = new PageAttributes();
-+ JobAttributes ja = new JobAttributes();
-+ ja.setDialog(JobAttributes.DialogType.NONE);
-+ ja.setDestination(JobAttributes.DestinationType.FILE);
-+ ja.setFileName(fileStr);
-+ try {
-+ PrintJob pjob = Toolkit.getDefaultToolkit().getPrintJob(this,
-+ "PrintDialog Testing", ja, pa);
-+ if (pjob != null) {
-+ System.out.println("Printjob successfully created: " + pjob);
-+ Graphics g = pjob.getGraphics();
-+ this.printAll(g);
-+ g.dispose();
-+ pjob.end();
-+ }
-+ System.out.println("Printing completed");
-+ } catch (IllegalArgumentException e) {
-+ System.out.println("PrintJob passed.");
-+ return;
-+ }
-+ throw new RuntimeException("PrintJob::IllegalArgumentException expected but not thrown. \nTEST FAILED");
-+ }
-+
-+ public static void doPrinterJob(String fileStr, OrientationRequested o) {
-+ PrinterJob pj = PrinterJob.getPrinterJob();
-+ PrintService ps = pj.getPrintService();
-+ if (ps == null) {
-+ System.out.println("No print service found.");
-+ return;
-+ }
-+ pj.setPrintable(new PrintToDir());
-+ PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
-+ aset.add(o);
-+ File f = new File(fileStr);
-+ // f.deleteOnExit();
-+ URI dest = f.toURI();
-+ Destination d = new Destination(dest);
-+ if (ps.isAttributeValueSupported(d, null, null)) {
-+ aset.add(d);
-+ try {
-+ pj.print(aset);
-+ } catch (PrinterException e) {
-+ System.out.println("PrinterJob passed.");
-+ return;
-+ }
-+ throw new RuntimeException("PrinterJob:PrinterException expected but not thrown. \nTEST FAILED");
-+ } else {
-+ System.out.println("Destination attribute is not a supported value. PrinterJob passed.");
-+ }
-+ }
-+
-+
-+ public static void main(String arg[]) {
-+ SecurityManager security = System.getSecurityManager();
-+ if (security != null) {
-+ System.out.println("Security manager detected");
-+ try {
-+ security.checkPermission(new FilePermission("<<ALL FILES>>", "read,write"));
-+ security.checkPermission(new PropertyPermission("user.dir", "read"));
-+ } catch (SecurityException se) {
-+ System.out.println("Security requirement not obtained. TEST PASSED");
-+ return;
-+ }
-+ }
-+ String[] testStr = {".", ""};
-+ for (int i=0; i<testStr.length; i++) {
-+ System.out.println("Testing file name = \""+testStr[i]+"\"");
-+ doPrinterJob(testStr[i], OrientationRequested.PORTRAIT);
-+ PrintToDir ptd = new PrintToDir();
-+ ptd.doPrintJob(testStr[i]);
-+ ptd.dispose();
-+ }
-+ System.out.println("TEST PASSED");
-+ }
-+
-+}
---- ./jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java Fri Apr 10 09:21:28 2015 -0700
-@@ -81,7 +81,7 @@
- public static ProcessResults executeChildProcess(final Class classToExecute,
- final String [] args)
- {
-- return executeChildProcess(classToExecute, " ", args);
-+ return executeChildProcess(classToExecute, System.getProperty("java.class.path"), args);
- }
-
- /**
---- ./jdk/test/java/io/pathNames/General.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/io/pathNames/General.java Fri Apr 10 09:21:28 2015 -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
-@@ -28,6 +28,7 @@
-
- import java.io.*;
- import java.util.*;
-+import java.nio.file.*;
-
-
- public class General {
-@@ -38,12 +39,40 @@
-
- private static int gensymCounter = 0;
-
-+ protected static final String userDir = System.getProperty("user.dir");
-+
-+ protected static String baseDir = null;
-+ protected static String relative = null;
-
- /* Generate a filename unique to this run */
- private static String gensym() {
- return "x." + ++gensymCounter;
- }
-
-+ /**
-+ * Create files and folders in the test working directory.
-+ * The purpose is to make sure the test will not go out of
-+ * its user dir when walking the file tree.
-+ *
-+ * @param depth The number of directory levels to be created under
-+ * the user directory. It should be the maximum value
-+ * of the depths passed to checkNames method (including
-+ * direct or indirect calling) in a whole test.
-+ */
-+ protected static void initTestData(int depth) throws IOException {
-+ File parent = new File(userDir);
-+ for (int i = 0; i < depth; i++) {
-+ File tmp = new File(parent, gensym());
-+ tmp.createNewFile();
-+ tmp = new File(parent, gensym());
-+ if (tmp.mkdir())
-+ parent = tmp;
-+ else
-+ throw new IOException("Fail to create directory, " + tmp);
-+ }
-+ baseDir = parent.getAbsolutePath();
-+ relative = baseDir.substring(userDir.length() + 1);
-+ }
-
- /**
- * Find a file in the given subdirectory, or descend into further
-@@ -57,7 +86,7 @@
- for (int i = 0; i < dl.length; i++) {
- File f = new File(subdir, dl[i]);
- File df = new File(dir, f.getPath());
-- if (df.exists() && df.isFile()) {
-+ if (Files.isRegularFile(df.toPath(), LinkOption.NOFOLLOW_LINKS)) {
- return f.getPath();
- }
- }
-@@ -65,7 +94,7 @@
- File f = (subdir.length() == 0) ? new File(dl[i])
- : new File(subdir, dl[i]);
- File df = new File(dir, f.getPath());
-- if (df.exists() && df.isDirectory()) {
-+ if (Files.isDirectory(df.toPath(), LinkOption.NOFOLLOW_LINKS)) {
- String[] dl2 = df.list();
- if (dl2 != null) {
- String ff = findSomeFile(dir, f.getPath(), dl2);
-@@ -90,7 +119,7 @@
- }
- for (int i = 0; i < dl.length; i++) {
- File f = new File(dir, dl[i]);
-- if (f.isFile()) {
-+ if (Files.isRegularFile(f.toPath(), LinkOption.NOFOLLOW_LINKS)) {
- return dl[i];
- }
- }
-@@ -127,9 +156,9 @@
- }
- for (int i = 0; i < dl.length; i++) {
- File f = new File(d, dl[i]);
-- if (f.isDirectory() && f.canRead()) {
-+ if (Files.isDirectory(f.toPath(), LinkOption.NOFOLLOW_LINKS)) {
- String[] dl2 = f.list();
-- if (dl2.length >= 250) {
-+ if (dl2 == null || dl2.length >= 250) {
- /* Heuristic to avoid scanning huge directories */
- continue;
- }
-@@ -213,7 +242,7 @@
-
-
- /** Hash table of input pathnames, used to detect duplicates */
-- private static Hashtable checked = new Hashtable();
-+ private static Hashtable<String, String> checked = new Hashtable<>();
-
- /**
- * Check the given pathname. Its canonical pathname should be the given
-@@ -271,7 +300,7 @@
-
-
- /** Check a single slash case, plus its children */
-- public static void checkSlash(int depth, boolean create,
-+ private static void checkSlash(int depth, boolean create,
- String ans, String ask, String slash)
- throws Exception
- {
-@@ -314,7 +343,7 @@
-
- /* Normal name */
- if (f.exists()) {
-- if (f.isDirectory() && f.canRead()) {
-+ if (Files.isDirectory(f.toPath(), LinkOption.NOFOLLOW_LINKS) && f.list() != null) {
- if ((n = findSomeFile(ans, create)) != null)
- checkSlashes(d, create, ans + n, ask + n);
- if ((n = findSomeDir(ans, create)) != null)
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/io/pathNames/GeneralSolaris.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,78 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/* @test
-+ @bug 4035924 4095767
-+ @summary General exhaustive test of solaris pathname handling
-+ @author Mark Reinhold
-+
-+ @build General GeneralSolaris
-+ @run main GeneralSolaris
-+ */
-+
-+import java.io.*;
-+import java.util.*;
-+import java.nio.file.*;
-+import java.nio.file.attribute.*;
-+
-+public class GeneralSolaris extends General {
-+
-+ private static void checkUnreadable() throws Exception {
-+ Path file = Paths.get(baseDir, "unreadableFile");
-+ Path dir = Paths.get(baseDir, "unreadableDir");
-+ Set<PosixFilePermission> perms = PosixFilePermissions.fromString("---------");
-+ FileAttribute<Set<PosixFilePermission>> attr = PosixFilePermissions.asFileAttribute(perms);
-+ Files.createFile(file, attr);
-+ Files.createDirectory(dir, attr);
-+
-+ String unreadableFile = file.toString();
-+ String unreadableDir = dir.toString();
-+
-+ checkSlashes(2, false, unreadableDir, unreadableDir);
-+ checkSlashes(2, false, unreadableFile, unreadableFile);
-+
-+ Files.delete(file);
-+ Files.delete(dir);
-+ }
-+
-+ private static void checkPaths() throws Exception {
-+ // Make sure that an empty relative path is tested
-+ checkNames(1, true, userDir + File.separator, "");
-+ checkNames(3, true, baseDir + File.separator,
-+ relative + File.separator);
-+
-+ checkSlashes(2, true, baseDir, baseDir);
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ if (File.separatorChar != '/') {
-+ /* This test is only valid on Unix systems */
-+ return;
-+ }
-+ if (args.length > 0) debug = true;
-+
-+ initTestData(3);
-+ checkUnreadable();
-+ checkPaths();
-+ }
-+}
---- ./jdk/test/java/io/pathNames/GeneralWin32.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/io/pathNames/GeneralWin32.java Fri Apr 10 09:21:28 2015 -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
-@@ -22,7 +22,7 @@
- */
-
- /* @test
-- @bug 4032066 4039597 4046914 4054511 4065189 4109131 4875229 6983520
-+ @bug 4032066 4039597 4046914 4054511 4065189 4109131 4875229 6983520 8009258
- @summary General exhaustive test of win32 pathname handling
- @author Mark Reinhold
-
-@@ -31,8 +31,6 @@
- */
-
- import java.io.*;
--import java.util.*;
--
-
- public class GeneralWin32 extends General {
-
-@@ -50,10 +48,9 @@
- private static final String NONEXISTENT_UNC_HOST = "non-existent-unc-host";
- private static final String NONEXISTENT_UNC_SHARE = "bogus-share";
-
--
- /* Pathnames relative to working directory */
-
-- private static void checkCaseLookup(String ud) throws IOException {
-+ private static void checkCaseLookup() throws IOException {
- /* Use long names here to avoid 8.3 format, which Samba servers often
- force to lowercase */
- File d = new File("XyZzY0123", "FOO_bar_BAZ");
-@@ -75,7 +72,7 @@
-
- /* Computing the canonical path of a Win32 file should expose the true
- case of filenames, rather than just using the input case */
-- File y = new File(ud, f.getPath());
-+ File y = new File(userDir, f.getPath());
- String ans = y.getPath();
- check(ans, "XyZzY0123\\FOO_bar_BAZ\\GLORPified");
- check(ans, "xyzzy0123\\foo_bar_baz\\glorpified");
-@@ -91,18 +88,20 @@
- throw new Exception("Wildcard path not rejected: " + f);
- }
-
-- private static void checkWildCards(String ud) throws Exception {
-- File d = new File(ud).getCanonicalFile();
-+ private static void checkWildCards() throws Exception {
-+ File d = new File(userDir).getCanonicalFile();
- checkWild(new File(d, "*.*"));
- checkWild(new File(d, "*.???"));
- checkWild(new File(new File(d, "*.*"), "foo"));
- }
-
-- private static void checkRelativePaths() throws Exception {
-- String ud = System.getProperty("user.dir").replace('/', '\\');
-- checkCaseLookup(ud);
-- checkWildCards(ud);
-- checkNames(3, true, ud + "\\", "");
-+ private static void checkRelativePaths(int depth) throws Exception {
-+ checkCaseLookup();
-+ checkWildCards();
-+ // Make sure that an empty relative path is tested
-+ checkNames(1, true, userDir + File.separator, "");
-+ checkNames(depth, true, baseDir + File.separator,
-+ relative + File.separator);
- }
-
-
-@@ -137,19 +136,19 @@
- checkNames(depth, false, ans, d);
- }
-
-- private static void checkDrivePaths() throws Exception {
-- checkDrive(2, findActiveDrive(), true);
-- checkDrive(2, findInactiveDrive(), false);
-+ private static void checkDrivePaths(int depth) throws Exception {
-+ checkDrive(depth, findActiveDrive(), true);
-+ checkDrive(depth, findInactiveDrive(), false);
- }
-
-
- /* UNC pathnames */
-
-- private static void checkUncPaths() throws Exception {
-+ private static void checkUncPaths(int depth) throws Exception {
- String s = ("\\\\" + NONEXISTENT_UNC_HOST
- + "\\" + NONEXISTENT_UNC_SHARE);
- ensureNon(s);
-- checkSlashes(2, false, s, s);
-+ checkSlashes(depth, false, s, s);
-
- s = "\\\\" + EXISTENT_UNC_HOST + "\\" + EXISTENT_UNC_SHARE;
- if (!(new File(s)).exists()) {
-@@ -158,7 +157,7 @@
- return;
- }
-
-- checkSlashes(2, false, s, s);
-+ checkSlashes(depth, false, s, s);
- }
-
-
-@@ -168,9 +167,11 @@
- return;
- }
- if (args.length > 0) debug = true;
-- checkRelativePaths();
-- checkDrivePaths();
-- checkUncPaths();
-+
-+ initTestData(3);
-+
-+ checkRelativePaths(3);
-+ checkDrivePaths(2);
-+ checkUncPaths(2);
- }
--
- }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,205 @@
-+/*
-+ * 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.reflect.Field;
-+import java.lang.reflect.ReflectPermission;
-+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.Arrays;
-+import java.util.Enumeration;
-+import java.util.concurrent.atomic.AtomicBoolean;
-+
-+/**
-+ * @test
-+ * @bug 8065552
-+ * @summary test that all fields returned by getDeclaredFields() can be
-+ * set accessible if the right permission is granted; this test
-+ * also verifies that Class.classLoader final private field is
-+ * hidden from reflection access.
-+ * @run main/othervm ClassDeclaredFieldsTest UNSECURE
-+ * @run main/othervm ClassDeclaredFieldsTest SECURE
-+ *
-+ * @author danielfuchs
-+ */
-+public class ClassDeclaredFieldsTest {
-+
-+ // Test with or without a security manager
-+ public static enum TestCase {
-+ UNSECURE, SECURE;
-+ public void run() throws Exception {
-+ System.out.println("Running test case: " + name());
-+ Configure.setUp(this);
-+ test(this);
-+ }
-+ }
-+ /**
-+ * @param args the command line arguments
-+ */
-+ public static void main(String[] args) throws Exception {
-+ System.out.println(System.getProperty("java.version"));
-+ if (args == null || args.length == 0) {
-+ args = new String[] { "SECURE" };
-+ } else if (args.length != 1) {
-+ throw new IllegalArgumentException("Only one arg expected: "
-+ + Arrays.asList(args));
-+ }
-+ TestCase.valueOf(args[0]).run();
-+ }
-+
-+ static void test(TestCase test) {
-+ for (Field f : Class.class.getDeclaredFields()) {
-+ f.setAccessible(true);
-+ System.out.println("Field "+f.getName()+" is now accessible.");
-+ if (f.getName().equals("classLoader")) {
-+ throw new RuntimeException("Found "+f.getName()+" field!");
-+ }
-+ }
-+ try {
-+ Class.class.getDeclaredField("classLoader");
-+ throw new RuntimeException("Expected NoSuchFieldException for"
-+ + " 'classLoader' field not raised");
-+ } catch(NoSuchFieldException x) {
-+ System.out.println("Got expected exception: " + x);
-+ }
-+ System.out.println("Passed "+test);
-+ }
-+
-+ // A helper class to configure the security manager for the test,
-+ // and bypass it when needed.
-+ static class Configure {
-+ static Policy policy = null;
-+ static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-+ @Override
-+ protected AtomicBoolean initialValue() {
-+ return new AtomicBoolean(false);
-+ }
-+ };
-+ static void setUp(TestCase test) {
-+ switch (test) {
-+ case SECURE:
-+ if (policy == null && System.getSecurityManager() != null) {
-+ throw new IllegalStateException("SecurityManager already set");
-+ } else if (policy == null) {
-+ policy = new SimplePolicy(TestCase.SECURE, allowAll);
-+ Policy.setPolicy(policy);
-+ System.setSecurityManager(new SecurityManager());
-+ }
-+ if (System.getSecurityManager() == null) {
-+ throw new IllegalStateException("No SecurityManager.");
-+ }
-+ if (policy == null) {
-+ throw new IllegalStateException("policy not configured");
-+ }
-+ break;
-+ case UNSECURE:
-+ if (System.getSecurityManager() != null) {
-+ throw new IllegalStateException("SecurityManager already set");
-+ }
-+ break;
-+ default:
-+ throw new InternalError("No such testcase: " + test);
-+ }
-+ }
-+ static void doPrivileged(Runnable run) {
-+ allowAll.get().set(true);
-+ try {
-+ run.run();
-+ } finally {
-+ allowAll.get().set(false);
-+ }
-+ }
-+ }
-+
-+ // A Helper class to build a set of permissions.
-+ final static class PermissionsBuilder {
-+ final Permissions perms;
-+ public PermissionsBuilder() {
-+ this(new Permissions());
-+ }
-+ public PermissionsBuilder(Permissions perms) {
-+ this.perms = perms;
-+ }
-+ public PermissionsBuilder add(Permission p) {
-+ perms.add(p);
-+ return this;
-+ }
-+ public PermissionsBuilder addAll(PermissionCollection col) {
-+ if (col != null) {
-+ for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-+ perms.add(e.nextElement());
-+ }
-+ }
-+ return this;
-+ }
-+ public Permissions toPermissions() {
-+ final PermissionsBuilder builder = new PermissionsBuilder();
-+ builder.addAll(perms);
-+ return builder.perms;
-+ }
-+ }
-+
-+ // Policy for the test...
-+ public static class SimplePolicy extends Policy {
-+
-+ final Permissions permissions;
-+ final Permissions allPermissions;
-+ final ThreadLocal<AtomicBoolean> allowAll; // actually: this should be in a thread locale
-+ public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-+ this.allowAll = allowAll;
-+ // we don't actually need any permission to create our
-+ // FileHandlers because we're passing invalid parameters
-+ // which will make the creation fail...
-+ permissions = new Permissions();
-+ permissions.add(new RuntimePermission("accessDeclaredMembers"));
-+ permissions.add(new ReflectPermission("suppressAccessChecks"));
-+
-+ // these are used for configuring the test itself...
-+ allPermissions = new Permissions();
-+ allPermissions.add(new java.security.AllPermission());
-+
-+ }
-+
-+ @Override
-+ public boolean implies(ProtectionDomain domain, Permission permission) {
-+ if (allowAll.get().get()) return allPermissions.implies(permission);
-+ return permissions.implies(permission);
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(CodeSource codesource) {
-+ return new PermissionsBuilder().addAll(allowAll.get().get()
-+ ? allPermissions : permissions).toPermissions();
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(ProtectionDomain domain) {
-+ return new PermissionsBuilder().addAll(allowAll.get().get()
-+ ? allPermissions : permissions).toPermissions();
-+ }
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,393 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/**
-+ * @test
-+ * @bug 8065552
-+ * @summary test that all fields returned by getDeclaredFields() can be
-+ * set accessible if the right permission is granted; this test
-+ * loads all the classes in the BCL, get their declared fields,
-+ * and call setAccessible(false) followed by setAccessible(true);
-+ *
-+ * @run main/othervm -XX:PermSize=128m FieldSetAccessibleTest UNSECURE
-+ * @run main/othervm -XX:PermSize=128m FieldSetAccessibleTest SECURE
-+ *
-+ * @author danielfuchs
-+ */
-+
-+import java.io.File;
-+import java.io.FilePermission;
-+import java.io.IOException;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.ReflectPermission;
-+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.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collections;
-+import java.util.Enumeration;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.PropertyPermission;
-+import java.util.concurrent.atomic.AtomicBoolean;
-+import java.util.concurrent.atomic.AtomicLong;
-+import java.util.jar.JarEntry;
-+import java.util.jar.JarFile;
-+
-+public class FieldSetAccessibleTest {
-+
-+ static final List<String> skipped = new ArrayList<>();
-+ static final List<String> cantread = new ArrayList<>();
-+ static final List<String> failed = new ArrayList<>();
-+ static final AtomicLong classCount = new AtomicLong();
-+ static final AtomicLong fieldCount = new AtomicLong();
-+ static long startIndex = 0;
-+ static long maxSize = Long.MAX_VALUE;
-+ static long maxIndex = Long.MAX_VALUE;
-+
-+
-+ // Test that all fields for any given class can be made accessibles
-+ static void testSetFieldsAccessible(Class<?> c) {
-+ for (Field f : c.getDeclaredFields()) {
-+ fieldCount.incrementAndGet();
-+ f.setAccessible(false);
-+ f.setAccessible(true);
-+ }
-+ }
-+
-+ // Performs a series of test on the given class.
-+ // At this time, we only call testSetFieldsAccessible(c)
-+ public static boolean test(Class<?> c) {
-+ //System.out.println(c.getName());
-+ classCount.incrementAndGet();
-+
-+ // Call getDeclaredFields() and try to set their accessible flag.
-+ testSetFieldsAccessible(c);
-+
-+ // add more tests here...
-+
-+ return c == Class.class;
-+ }
-+
-+ // Prints a summary at the end of the test.
-+ static void printSummary(long secs, long millis, long nanos) {
-+ System.out.println("Tested " + fieldCount.get() + " fields of "
-+ + classCount.get() + " classes in "
-+ + secs + "s " + millis + "ms " + nanos + "ns");
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ TestCase.valueOf(args[0]).run();
-+ }
-+
-+ public static void run(TestCase test) {
-+ System.out.println("Testing " + test);
-+ test(listAllClassNames());
-+ System.out.println("Passed " + test);
-+ }
-+
-+ static Iterable<String> listAllClassNames() {
-+ boolean sort = startIndex != 0 || maxIndex != Long.MAX_VALUE;
-+ return new ClassNameListBuilder(sort);
-+ }
-+
-+ static void test(Iterable<String> iterable) {
-+ final long start = System.nanoTime();
-+ boolean classFound = false;
-+ int index = 0;
-+ for (String s: iterable) {
-+ if (index == maxIndex) break;
-+ try {
-+ if (index < startIndex) continue;
-+ if (test(s)) {
-+ classFound = true;
-+ }
-+ } finally {
-+ index++;
-+ }
-+ }
-+ long elapsed = System.nanoTime() - start;
-+ long secs = elapsed / 1000_000_000;
-+ long millis = (elapsed % 1000_000_000) / 1000_000;
-+ long nanos = elapsed % 1000_000;
-+ System.out.println("Unreadable path elements: " + cantread);
-+ System.out.println("Skipped path elements: " + skipped);
-+ System.out.println("Failed path elements: " + failed);
-+ printSummary(secs, millis, nanos);
-+
-+ if (!failed.isEmpty()) {
-+ throw new RuntimeException("Test failed for the following classes: " + failed);
-+ }
-+ if (!classFound && startIndex == 0 && index < maxIndex) {
-+ // this is just to verify that we have indeed parsed rt.jar
-+ // (or the java.base module)
-+ throw new RuntimeException("Test failed: Class.class not found...");
-+ }
-+ if (classCount.get() == 0 && startIndex == 0) {
-+ throw new RuntimeException("Test failed: no class found?");
-+ }
-+ }
-+
-+ static boolean test(String s) {
-+ try {
-+ if (s.startsWith("WrapperGenerator")) {
-+ System.out.println("Skipping "+ s);
-+ return false;
-+ }
-+ final Class<?> c = Class.forName(
-+ s.replace('/', '.').substring(0, s.length() - 6),
-+ false,
-+ null);
-+ return test(c);
-+ } catch (Exception t) {
-+ t.printStackTrace(System.err);
-+ failed.add(s);
-+ } catch (NoClassDefFoundError e) {
-+ e.printStackTrace(System.err);
-+ failed.add(s);
-+ }
-+ return false;
-+ }
-+
-+ static class ClassNameListBuilder implements Iterable<String> {
-+ String[] bcp;
-+ boolean sort;
-+ ClassNameListBuilder(boolean sort) {
-+ bcp = System.getProperty("sun.boot.class.path").split(File.pathSeparator);
-+ this.sort = sort;
-+ }
-+
-+ public List<String> build() {
-+ return findClasses();
-+ }
-+
-+ List<String> findClasses() {
-+ List<String> list = new ArrayList<>();
-+
-+ for (String s : bcp) {
-+ System.out.println("boot class path element: " + s);
-+ if (s.endsWith(".jar")) {
-+ addJarEntries(s, list);
-+ } else {
-+ addFolderEntries(new File(s), s, list);
-+ }
-+ }
-+
-+ if (sort) {
-+ System.out.println("Sorting class names...");
-+ Collections.sort(list);
-+ System.out.println("\t... Sorted.");
-+ }
-+ return list;
-+ }
-+
-+ void addJarEntries(String jarName, List<String> classNames) {
-+ File f = new File(jarName);
-+ if (f.canRead() && f.isFile()) {
-+ try {
-+ JarFile jarFile = new JarFile(f);
-+ for (Enumeration<JarEntry> entries = jarFile.entries() ; entries.hasMoreElements() ;) {
-+ JarEntry e = entries.nextElement();
-+ if (e.isDirectory()) {
-+ continue;
-+ }
-+ if (e.getName().endsWith(".class")) {
-+ classNames.add(e.getName());
-+ }
-+ }
-+ } catch (IOException e) {
-+ e.printStackTrace();
-+ skipped.add(jarName);
-+ }
-+ } else {
-+ cantread.add(jarName);
-+ }
-+ }
-+
-+ void addFolderEntries(File root, String folderName, List<String> classNames) {
-+ File f = new File(folderName);
-+ if (f.canRead()) {
-+ if (f.isDirectory()) {
-+ for (String child : f.list()) {
-+ addFolderEntries(root, new File(f,child).getPath(), classNames);
-+ }
-+ } else if (f.isFile() && f.getName().endsWith(".class")) {
-+ String className = root.toPath().relativize(f.toPath()).toString()
-+ .replace(File.separatorChar, '/');
-+ System.out.println("adding: " + className);
-+ classNames.add(className);
-+ }
-+ } else {
-+ cantread.add(folderName);
-+ }
-+ }
-+
-+ @Override
-+ public Iterator<String> iterator() {
-+ return build().iterator();
-+ }
-+
-+ }
-+
-+ // Test with or without a security manager
-+ public static enum TestCase {
-+ UNSECURE, SECURE;
-+ public void run() throws Exception {
-+ System.out.println("Running test case: " + name());
-+ Configure.setUp(this);
-+ FieldSetAccessibleTest.run(this);
-+ }
-+ }
-+
-+ // A helper class to configure the security manager for the test,
-+ // and bypass it when needed.
-+ static class Configure {
-+ static Policy policy = null;
-+ static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-+ @Override
-+ protected AtomicBoolean initialValue() {
-+ return new AtomicBoolean(false);
-+ }
-+ };
-+ static void setUp(TestCase test) {
-+ switch (test) {
-+ case SECURE:
-+ if (policy == null && System.getSecurityManager() != null) {
-+ throw new IllegalStateException("SecurityManager already set");
-+ } else if (policy == null) {
-+ policy = new SimplePolicy(TestCase.SECURE, allowAll);
-+ Policy.setPolicy(policy);
-+ System.setSecurityManager(new SecurityManager());
-+ }
-+ if (System.getSecurityManager() == null) {
-+ throw new IllegalStateException("No SecurityManager.");
-+ }
-+ if (policy == null) {
-+ throw new IllegalStateException("policy not configured");
-+ }
-+ break;
-+ case UNSECURE:
-+ if (System.getSecurityManager() != null) {
-+ throw new IllegalStateException("SecurityManager already set");
-+ }
-+ break;
-+ default:
-+ throw new InternalError("No such testcase: " + test);
-+ }
-+ }
-+ static void doPrivileged(Runnable run) {
-+ allowAll.get().set(true);
-+ try {
-+ run.run();
-+ } finally {
-+ allowAll.get().set(false);
-+ }
-+ }
-+ }
-+
-+ // A Helper class to build a set of permissions.
-+ final static class PermissionsBuilder {
-+ final Permissions perms;
-+ public PermissionsBuilder() {
-+ this(new Permissions());
-+ }
-+ public PermissionsBuilder(Permissions perms) {
-+ this.perms = perms;
-+ }
-+ public PermissionsBuilder add(Permission p) {
-+ perms.add(p);
-+ return this;
-+ }
-+ public PermissionsBuilder addAll(PermissionCollection col) {
-+ if (col != null) {
-+ for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-+ perms.add(e.nextElement());
-+ }
-+ }
-+ return this;
-+ }
-+ public Permissions toPermissions() {
-+ final PermissionsBuilder builder = new PermissionsBuilder();
-+ builder.addAll(perms);
-+ return builder.perms;
-+ }
-+ }
-+
-+ // Policy for the test...
-+ public static class SimplePolicy extends Policy {
-+
-+ final Permissions permissions;
-+ final Permissions allPermissions;
-+ final ThreadLocal<AtomicBoolean> allowAll;
-+ public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-+ this.allowAll = allowAll;
-+
-+ // Permission needed by the tested code exercised in the test
-+ permissions = new Permissions();
-+ permissions.add(new RuntimePermission("fileSystemProvider"));
-+ permissions.add(new RuntimePermission("createClassLoader"));
-+ permissions.add(new RuntimePermission("closeClassLoader"));
-+ permissions.add(new RuntimePermission("getClassLoader"));
-+ permissions.add(new RuntimePermission("accessDeclaredMembers"));
-+ permissions.add(new ReflectPermission("suppressAccessChecks"));
-+ permissions.add(new PropertyPermission("*", "read"));
-+ permissions.add(new FilePermission("<<ALL FILES>>", "read"));
-+
-+ // these are used for configuring the test itself...
-+ allPermissions = new Permissions();
-+ allPermissions.add(new java.security.AllPermission());
-+ }
-+
-+ @Override
-+ public boolean implies(ProtectionDomain domain, Permission permission) {
-+ if (allowAll.get().get()) return allPermissions.implies(permission);
-+ if (permissions.implies(permission)) return true;
-+ if (permission instanceof java.lang.RuntimePermission) {
-+ if (permission.getName().startsWith("accessClassInPackage.")) {
-+ // add these along to the set of permission we have, when we
-+ // discover that we need them.
-+ permissions.add(permission);
-+ return true;
-+ }
-+ }
-+ return false;
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(CodeSource codesource) {
-+ return new PermissionsBuilder().addAll(allowAll.get().get()
-+ ? allPermissions : permissions).toPermissions();
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(ProtectionDomain domain) {
-+ return new PermissionsBuilder().addAll(allowAll.get().get()
-+ ? allPermissions : permissions).toPermissions();
-+ }
-+ }
-+
-+}
---- ./jdk/test/java/lang/ProcessBuilder/Basic.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/Basic.java Fri Apr 10 09:21:28 2015 -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
-@@ -26,10 +26,11 @@
- * @bug 4199068 4738465 4937983 4930681 4926230 4931433 4932663 4986689
- * 5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313
- * 6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
-- * 4947220 7018606 7034570
-+ * 4947220 7018606 7034570 8047340
- * @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
-+ * @run main/othervm/timeout=300 -DTurkeyTest Basic
- * @author Martin Buchholz
- */
-
-@@ -1083,6 +1084,11 @@
- }
-
- private static void realMain(String[] args) throws Throwable {
-+ if (System.getProperty("TurkeyTest") != null) {
-+ // static initializer test, set this early.
-+ System.out.println("Testing with Turkish locale.");
-+ Locale.setDefault(new Locale("tr", ""));
-+ }
- if (Windows.is())
- System.out.println("This appears to be a Windows system.");
- if (Unix.is())
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/lang/reflect/Generics/ThreadSafety.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,129 @@
-+/*
-+ * 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 8062771 8016236
-+ * @summary Test publication of Class objects via a data race
-+ * @run testng ThreadSafety
-+ */
-+
-+import java.net.URL;
-+import java.net.URLClassLoader;
-+import java.util.Collections;
-+import java.util.concurrent.BrokenBarrierException;
-+import java.util.concurrent.Callable;
-+import java.util.concurrent.CyclicBarrier;
-+import java.util.concurrent.ExecutionException;
-+import java.util.concurrent.ExecutorService;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.Future;
-+import java.util.concurrent.TimeoutException;
-+import static java.util.concurrent.TimeUnit.SECONDS;
-+import static org.testng.Assert.*;
-+import org.testng.annotations.Test;
-+
-+/**
-+ * A test resulting from an attempt to repro this failure (in guice):
-+ *
-+ * java.lang.NullPointerException
-+ * at sun.reflect.generics.visitor.Reifier.visitClassTypeSignature(Reifier.java:125)
-+ * at sun.reflect.generics.tree.ClassTypeSignature.accept(ClassTypeSignature.java:49)
-+ * at sun.reflect.generics.repository.ClassRepository.getSuperclass(ClassRepository.java:84)
-+ * at java.lang.Class.getGenericSuperclass(Class.java:692)
-+ * at com.google.inject.TypeLiteral.getSuperclassTypeParameter(TypeLiteral.java:99)
-+ * at com.google.inject.TypeLiteral.<init>(TypeLiteral.java:79)
-+ *
-+ * However, as one would expect with thread safety problems in reflection, these
-+ * are very hard to reproduce. This very test has never been observed to fail,
-+ * but a similar test has been observed to fail about once in 2000 executions
-+ * (about once every 6 CPU-hours), in jdk7 only. It appears to be fixed in jdk8+ by:
-+ *
-+ * 8016236: Class.getGenericInterfaces performance improvement.
-+ * (by making Class.genericInfo volatile)
-+ */
-+public class ThreadSafety {
-+ public static class EmptyClass {
-+ public static class EmptyGenericSuperclass<T> {}
-+ public static class EmptyGenericSubclass<T> extends EmptyGenericSuperclass<T> {}
-+ }
-+
-+ /** published via data race */
-+ private Class<?> racyClass = Object.class;
-+
-+ private URL[] urls = ((URLClassLoader) ThreadSafety.class.getClassLoader()).getURLs();
-+
-+ private Class<?> createNewEmptyGenericSubclassClass() throws Exception {
-+ URLClassLoader ucl = new URLClassLoader(urls, null);
-+ return Class.forName("ThreadSafety$EmptyClass$EmptyGenericSubclass", true, ucl);
-+ }
-+
-+ @Test
-+ public void testRacy_getGenericSuperclass() throws Exception {
-+ final int nThreads = 10;
-+ final int iterations = 30;
-+ final int timeout = 10;
-+ final CyclicBarrier newCycle = new CyclicBarrier(nThreads);
-+ final Callable<Void> task = new Callable<Void>() {
-+ public Void call() throws Exception {
-+ for (int i = 0; i < iterations; i++) {
-+ final int threadId;
-+ try {
-+ threadId = newCycle.await(timeout, SECONDS);
-+ } catch (BrokenBarrierException e) {
-+ return null;
-+ }
-+ for (int j = 0; j < iterations; j++) {
-+ // one thread publishes the class object via a data
-+ // race, for the other threads to consume.
-+ if (threadId == 0) {
-+ racyClass = createNewEmptyGenericSubclassClass();
-+ } else {
-+ racyClass.getGenericSuperclass();
-+ }
-+ }
-+ }
-+ return null;
-+ }};
-+
-+ final ExecutorService pool = Executors.newFixedThreadPool(nThreads);
-+ try {
-+ for (Future<Void> future :
-+ pool.invokeAll(Collections.nCopies(nThreads, task))) {
-+ try {
-+ future.get(iterations * timeout, SECONDS);
-+ } catch (ExecutionException e) {
-+ // ignore "collateral damage"
-+ if (!(e.getCause() instanceof BrokenBarrierException)
-+ &&
-+ !(e.getCause() instanceof TimeoutException)) {
-+ throw e;
-+ }
-+ }
-+ }
-+ } finally {
-+ pool.shutdownNow();
-+ assertTrue(pool.awaitTermination(2 * timeout, SECONDS));
-+ }
-+ }
-+}
---- ./jdk/test/java/lang/reflect/Method/GenericStringTest.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/lang/reflect/Method/GenericStringTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -47,10 +47,18 @@
- if (egs != null) {
- String actual = method.toGenericString();
- System.out.println(actual);
-- if (! egs.value().equals(actual)) {
-- failures++;
-- System.err.printf("ERROR: Expected ''%s''; got ''%s''.\n",
-- egs.value(), actual);
-+ if (method.isBridge()) {
-+ if (! egs.bridgeValue().equals(actual)) {
-+ failures++;
-+ System.err.printf("ERROR: Expected ''%s''; got ''%s''.\n",
-+ egs.value(), actual);
-+ }
-+ } else {
-+ if (! egs.value().equals(actual)) {
-+ failures++;
-+ System.err.printf("ERROR: Expected ''%s''; got ''%s''.\n",
-+ egs.value(), actual);
-+ }
- }
- }
-
-@@ -116,7 +124,8 @@
-
- class Roebling implements Comparable<Roebling> {
- @ExpectedGenericString(
-- "public int Roebling.compareTo(Roebling)")
-+ value="public int Roebling.compareTo(Roebling)",
-+ bridgeValue="public int Roebling.compareTo(java.lang.Object)")
- public int compareTo(Roebling r) {
- throw new IllegalArgumentException();
- }
-@@ -132,9 +141,11 @@
- @Retention(RetentionPolicy.RUNTIME)
- @interface ExpectedGenericString {
- String value();
-+ String bridgeValue() default "";
- }
-
- @Retention(RetentionPolicy.RUNTIME)
- @interface ExpectedString {
- String value();
- }
-+
---- ./jdk/test/java/net/InetAddress/GetLocalHostWithSM.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/net/InetAddress/GetLocalHostWithSM.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,9 +23,11 @@
-
- /**
- * @test
-- * @bug 4531817
-+ * @bug 4531817 8026245
- * @summary Inet[46]Address.localHost need doPrivileged
- * @run main/othervm GetLocalHostWithSM
-+ * @run main/othervm -Djava.net.preferIPv4Stack=true GetLocalHostWithSM
-+ * @run main/othervm -Djava.net.preferIPv6Addresses=true GetLocalHostWithSM
- * files needed: GetLocalHostWithSM.java, MyPrincipal.java, and policy.file
- */
-
---- ./jdk/test/java/net/InetAddress/IPv4Formats.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/net/InetAddress/IPv4Formats.java Fri Apr 10 09:21:28 2015 -0700
-@@ -27,6 +27,7 @@
- * @summary InetAddress.getByName behaves differently on windows
- */
- import java.net.*;
-+import java.util.UUID;
-
- public class IPv4Formats {
- public static void main(String[] args) {
-@@ -36,7 +37,7 @@
- {"126.1", "126.0.0.1"},
- {"128.50.65534", "128.50.255.254"},
- {"192.168.1.2", "192.168.1.2"},
-- {"hello.foo.bar", null},
-+ {"invalidhost.invalid", null},
- {"1024.1.2.3", null},
- {"128.14.66000", null }
- };
---- ./jdk/test/java/net/Socket/GetLocalAddress.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/net/Socket/GetLocalAddress.java Fri Apr 10 09:21:28 2015 -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
-@@ -23,7 +23,10 @@
-
- /*
- * @test
-- * @bug 4106601
-+ * @bug 4106601 8026245
-+ * @run main/othervm GetLocalAddress
-+ * @run main/othervm -Djava.net.preferIPv4Stack=true GetLocalAddress
-+ * @run main/othervm -Djava.net.preferIPv6Addresses=true GetLocalAddress
- * @summary Test the java.net.socket.GetLocalAddress method
- *
- */
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/net/Socks/BadProxySelector.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,85 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 7178362
-+ * @run main/othervm BadProxySelector
-+ */
-+
-+import java.net.InetSocketAddress;
-+import java.net.Proxy;
-+import java.net.ProxySelector;
-+import java.net.Socket;
-+import java.net.SocketAddress;
-+import java.net.ServerSocket;
-+import java.net.URI;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.io.*;
-+
-+public class BadProxySelector {
-+ public static void main(String[] args) throws Exception {
-+ ProxySelector.setDefault(new HTTPProxySelector());
-+ try (ServerSocket ss = new ServerSocket(0);
-+ Socket s1 = new Socket(ss.getInetAddress(), ss.getLocalPort());
-+ Socket s2 = ss.accept()) {
-+ }
-+
-+ ProxySelector.setDefault(new NullHTTPProxySelector());
-+ try (ServerSocket ss = new ServerSocket(0);
-+ Socket s1 = new Socket(ss.getInetAddress(), ss.getLocalPort());
-+ Socket s2 = ss.accept()) {
-+ }
-+ }
-+
-+ // always returns bogus HTTP proxies
-+ private static class HTTPProxySelector extends ProxySelector {
-+ @Override
-+ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {}
-+
-+ @Override
-+ public List<Proxy> select(URI uri) {
-+ List<Proxy> proxies = new ArrayList<>();
-+ proxies.add(new Proxy(Proxy.Type.HTTP,
-+ new InetSocketAddress("localhost", 0)));
-+ proxies.add(new Proxy(Proxy.Type.HTTP,
-+ new InetSocketAddress("localhost", 0)));
-+ return proxies;
-+ }
-+ }
-+
-+ private static class NullHTTPProxySelector extends ProxySelector {
-+ @Override
-+ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {}
-+
-+ @Override
-+ public List<Proxy> select(URI uri) {
-+ List<Proxy> proxies = new ArrayList<>();
-+ proxies.add(null);
-+ proxies.add(new Proxy(Proxy.Type.HTTP,
-+ new InetSocketAddress("localhost", 0)));
-+ return proxies;
-+ }
-+ }
-+}
---- ./jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java Fri Apr 10 09:21:28 2015 -0700
-@@ -24,6 +24,8 @@
- /* @test
- * @bug 6834246 6842687
- * @summary Stress test connections through the loopback interface
-+ * @run main StressLoopback
-+ * @run main/othervm -Djdk.net.useFastTcpLoopback StressLoopback
- */
-
- import java.nio.ByteBuffer;
---- ./jdk/test/java/nio/channels/FileChannel/TransferToChannel.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/nio/channels/FileChannel/TransferToChannel.java Fri Apr 10 09:21:28 2015 -0700
-@@ -22,8 +22,10 @@
- */
-
- /* @test
-- * @bug 4652496
-+ * @bug 4652496 8064407 8068507
- * @summary Test transferTo with different target channels
-+ * @run main TransferToChannel
-+ * @run main/othervm -Djdk.nio.enableFastFileTransfer TransferToChannel
- */
-
- import java.nio.channels.FileChannel;
---- ./jdk/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java Fri Apr 10 09:21:28 2015 -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
-@@ -23,27 +23,548 @@
-
- /**
- * @test
-- * @bug 4776466
-+ * @bug 4776466 8032573
- * @summary check that CertificateFactory rejects invalid encoded X.509 certs
- */
-
- import java.io.*;
-+import java.util.Collection;
-+import java.util.List;
-+import java.util.LinkedList;
-+import javax.security.auth.x500.X500Principal;
-+import java.security.GeneralSecurityException;
- import java.security.cert.*;
-
- public class DetectInvalidEncoding {
-
-+ // Originally found in the test file:
-+ // java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem
-+ // The first character of the PEM encoding has been changed from "M" to
-+ // "X" to force a failure during decoding.
-+ private static final String INVALID_CERT =
-+ "-----BEGIN CERTIFICATE-----\n" +
-+ "XIICJjCCAdCgAwIBAgIBITANBgkqhkiG9w0BAQQFADCBqTELMAkGA1UEBhMCVVMx\n" +
-+ "EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xFTAT\n" +
-+ "BgNVBAoTDEJFQSBXZWJMb2dpYzERMA8GA1UECxMIU2VjdXJpdHkxIzAhBgNVBAMT\n" +
-+ "GkRlbW8gQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9zdXBw\n" +
-+ "b3J0QGJlYS5jb20wHhcNMDAwNTMwMjEzODAxWhcNMDQwNTEzMjEzODAxWjCBjDEL\n" +
-+ "MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG\n" +
-+ "cmFuY2lzY28xFTATBgNVBAoTDEJFQSBXZWJMb2dpYzEZMBcGA1UEAxMQd2VibG9n\n" +
-+ "aWMuYmVhLmNvbTEeMBwGCSqGSIb3DQEJARYPc3VwcG9ydEBiZWEuY29tMFwwDQYJ\n" +
-+ "KoZIhvcNAQEBBQADSwAwSAJBALdsXEHqKHgs6zj0hU5sXMAUHzoT8kgWXmNkKHXH\n" +
-+ "79qbPh6EfdlriW9G/AbRF/pKrCQu7hhllAxREbqTuSlf2EMCAwEAATANBgkqhkiG\n" +
-+ "9w0BAQQFAANBACgmqflL5m5LNeJGpWx9aIoABCiuDcpw1fFyegsqGX7CBhffcruS\n" +
-+ "1p8h5vkHVbMu1frD1UgGnPlOO/K7Ig/KrsU=\n" +
-+ "-----END CERTIFICATE-----";
-+
-+ // Created with keytool:
-+ // keytool -genkeypair -keyalg rsa -keysize 2048 -keystore <KS_FILE>
-+ // -alias root -sigalg SHA256withRSA -dname "CN=Root, O=SomeCompany"
-+ // -validity 730 -ext bc:critical=ca:true
-+ // -ext ku:critical=keyCertSign,cRLSign
-+ private static final String SINGLE_ROOT_CERT =
-+ "-----BEGIN CERTIFICATE-----\n" +
-+ "MIIDCjCCAfKgAwIBAgIEDUiw+DANBgkqhkiG9w0BAQsFADAlMRQwEgYDVQQKEwtT\n" +
-+ "b21lQ29tcGFueTENMAsGA1UEAxMEUm9vdDAeFw0xNDA4MjgyMTI5MjZaFw0xNjA4\n" +
-+ "MjcyMTI5MjZaMCUxFDASBgNVBAoTC1NvbWVDb21wYW55MQ0wCwYDVQQDEwRSb290\n" +
-+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0VFecSNdH6CJhPOSG127\n" +
-+ "tuvld4y7GGJ0kQf3Q0b8qgprsXAmn0/bQR+YX7PfS408cFW+q2SWXeY2kC/3chvi\n" +
-+ "2syMsGdUJrDzuMbYsbvKPKyuJ2GJskX3mSbLMJj5Tzhg4qmwbzDTFIJ51yGa1Wmh\n" +
-+ "i2+4PhltqT0TohvSVJlBrOWNhmvwv5UWsF4e2i04rebDZQoWkmD3MpImZXF/HYre\n" +
-+ "9P8NP97vN0xZmh5PySHy2ILXN3ZhTn3tq0YxNSQTaMUfhgoyzWFvZKAnm/tZIh/1\n" +
-+ "oswwEQPIZJ25AUTm9r3YPQXl1hsNdLU0asEVYRsgzGSTX5gCuUY+KzhStzisOcUY\n" +
-+ "uQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV\n" +
-+ "HQ4EFgQUz1FBNixG/KCgcn6FOWzxP1hujG0wDQYJKoZIhvcNAQELBQADggEBAL60\n" +
-+ "ZaNc6eIMbKntGVE/pdxxyKwPdDyAAeEevX23KRWoLbQjHXo5jrfDPhI5k45ztlyU\n" +
-+ "+tIQbc81LlCl88I4dIx0fvEbxjNaAYhFNXwwSQBs2CuEAdRK8hodXbRcEeI+G10F\n" +
-+ "ARIVs2C7JNm/RhxskCWgj6tFIOGaTZ9gHyvlQUEM18sr5fXZlXTqspZCmz3t5XPi\n" +
-+ "5/wYLv6vk7k3G8WzMHbBE0bYI+61cCc8rbMHldtymbwSwiqfKC9y7oPEfRCbzVUe\n" +
-+ "fgrKcOyVWDuw0y0hhsQL/oONjPp4uK/bl9B7T84t4+ihxdocWKx6eyhFvOvZH9t2\n" +
-+ "kUylb9yBUYStwGExMHg=\n" +
-+ "-----END CERTIFICATE-----";
-+
-+ // Created with keytool:
-+ // keytool -genkeypair -keyalg rsa -keysize 2048 -keystore <KS_FILE>
-+ // -alias root -sigalg SHA256withRSA
-+ // -dname "CN=Intermed, O=SomeCompany" -validity 730
-+ // -ext bc:critical=ca:true -ext ku:critical=keyCertSign,cRLSign
-+ // keytool -certreq -keystore <KS_FILE> -sigalg SHA256withRSA
-+ // -alias intermed -dname "CN=Intermed, O=SomeCompany"
-+ // keytool -gencert -keystore <KS_FILE> -alias intermed
-+ // -sigalg SHA256withRSA -validity 730
-+ // -ext bc:critical=ca:true -ext ku:critical=keyCertSign,cRLSign
-+ private static final String INTERMED_CA_CERT =
-+ "-----BEGIN CERTIFICATE-----\n" +
-+ "MIIDLzCCAhegAwIBAgIEIIgOyDANBgkqhkiG9w0BAQsFADAlMRQwEgYDVQQKEwtT\n" +
-+ "b21lQ29tcGFueTENMAsGA1UEAxMEUm9vdDAeFw0xNDA4MjgyMjUyNDJaFw0xNjA4\n" +
-+ "MDcyMjUyNDJaMCkxFDASBgNVBAoTC1NvbWVDb21wYW55MREwDwYDVQQDEwhJbnRl\n" +
-+ "cm1lZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJEecvTWla8kdWx+\n" +
-+ "HHu5ryfBpJ95I7V4MEajnmzJVZcwvKhDjlDgABDMuVwFEUUSyeOdbWJF3DLKnyMD\n" +
-+ "KTx6/58kuVak3NX2TJ8cmmIlKf1upFbdrEtjYViSnNrApprfO8B3ORdBbO6QDYza\n" +
-+ "IkAWdI5GllFnVkb4yhMUBg3zfhglF+bl3D3lVRlp9bCrUZoNRs+mZjhVbcMn22ej\n" +
-+ "TfG5Y3VpNM4SN8dFIxPQLLk/aao+cmWEQdbQ0R6ydemRukqrw170olSVLeoGGala\n" +
-+ "3D4oJckde8EgNPcghcsdQ6tpGhkpFhmoyzEsuToR7Gq9UT5V2kkqJneiKXqQg4wz\n" +
-+ "vMAlUGECAwEAAaNjMGEwHwYDVR0jBBgwFoAUOw+92bevFoJz96pR1DrAkPPUKb0w\n" +
-+ "DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLbnErBs\n" +
-+ "q/Mhci5XElfjjLZp3GRyMA0GCSqGSIb3DQEBCwUAA4IBAQAq8y2DpkSV31IXZ1vr\n" +
-+ "/Ye+Nj/2NvBydFeHVRGMAN1LJv6/Q42TCSXbr6cDQ4NWQUtPm90yZBYJSznkbShx\n" +
-+ "HOJEE6R8PRJvoUtMm7fJrNtkybTt6jX4j50Lw8gdYB/rgZb4z8ZQZVEo/0zpW4HV\n" +
-+ "Gs+q4z8TkdmLR18hl39sUEsxt99AOBk8NtKKVNfBWq9b0QDhRkXfmqhyeXdDsHOV\n" +
-+ "8ksulsa7hseheHhdjziEOpQugh8qzSea2kFPrLB53VjWfa4qDzEPaNhahho9piCu\n" +
-+ "82XDnOrcEk9KyHWM7sa7vtK7++W+0MXD/p9nkZ6NHrJXweLriU0DXO6ZY3mzNKJK\n" +
-+ "435M\n" +
-+ "-----END CERTIFICATE-----";
-+
-+ // Subordinate cert created using keytool, both certs exported to
-+ // files individually, then use openssl to place in a PKCS#7:
-+ // openssl crl2pkcs7 -nocrl -certfile <INTERMED-CERT-PEM>
-+ // -certfile <ROOT-CERT-PEM> -out <P7-DEST-PEM-FILE>
-+ private static final String PKCS7_INTERMED_ROOT_CERTS =
-+ "-----BEGIN PKCS7-----\n" +
-+ "MIIGbgYJKoZIhvcNAQcCoIIGXzCCBlsCAQExADALBgkqhkiG9w0BBwGgggZBMIID\n" +
-+ "LzCCAhegAwIBAgIEIIgOyDANBgkqhkiG9w0BAQsFADAlMRQwEgYDVQQKEwtTb21l\n" +
-+ "Q29tcGFueTENMAsGA1UEAxMEUm9vdDAeFw0xNDA4MjgyMjUyNDJaFw0xNjA4MDcy\n" +
-+ "MjUyNDJaMCkxFDASBgNVBAoTC1NvbWVDb21wYW55MREwDwYDVQQDEwhJbnRlcm1l\n" +
-+ "ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJEecvTWla8kdWx+HHu5\n" +
-+ "ryfBpJ95I7V4MEajnmzJVZcwvKhDjlDgABDMuVwFEUUSyeOdbWJF3DLKnyMDKTx6\n" +
-+ "/58kuVak3NX2TJ8cmmIlKf1upFbdrEtjYViSnNrApprfO8B3ORdBbO6QDYzaIkAW\n" +
-+ "dI5GllFnVkb4yhMUBg3zfhglF+bl3D3lVRlp9bCrUZoNRs+mZjhVbcMn22ejTfG5\n" +
-+ "Y3VpNM4SN8dFIxPQLLk/aao+cmWEQdbQ0R6ydemRukqrw170olSVLeoGGala3D4o\n" +
-+ "Jckde8EgNPcghcsdQ6tpGhkpFhmoyzEsuToR7Gq9UT5V2kkqJneiKXqQg4wzvMAl\n" +
-+ "UGECAwEAAaNjMGEwHwYDVR0jBBgwFoAUOw+92bevFoJz96pR1DrAkPPUKb0wDwYD\n" +
-+ "VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLbnErBsq/Mh\n" +
-+ "ci5XElfjjLZp3GRyMA0GCSqGSIb3DQEBCwUAA4IBAQAq8y2DpkSV31IXZ1vr/Ye+\n" +
-+ "Nj/2NvBydFeHVRGMAN1LJv6/Q42TCSXbr6cDQ4NWQUtPm90yZBYJSznkbShxHOJE\n" +
-+ "E6R8PRJvoUtMm7fJrNtkybTt6jX4j50Lw8gdYB/rgZb4z8ZQZVEo/0zpW4HVGs+q\n" +
-+ "4z8TkdmLR18hl39sUEsxt99AOBk8NtKKVNfBWq9b0QDhRkXfmqhyeXdDsHOV8ksu\n" +
-+ "lsa7hseheHhdjziEOpQugh8qzSea2kFPrLB53VjWfa4qDzEPaNhahho9piCu82XD\n" +
-+ "nOrcEk9KyHWM7sa7vtK7++W+0MXD/p9nkZ6NHrJXweLriU0DXO6ZY3mzNKJK435M\n" +
-+ "MIIDCjCCAfKgAwIBAgIEdffjKTANBgkqhkiG9w0BAQsFADAlMRQwEgYDVQQKEwtT\n" +
-+ "b21lQ29tcGFueTENMAsGA1UEAxMEUm9vdDAeFw0xNDA4MjgyMjQ2MzZaFw0xNjA4\n" +
-+ "MjcyMjQ2MzZaMCUxFDASBgNVBAoTC1NvbWVDb21wYW55MQ0wCwYDVQQDEwRSb290\n" +
-+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhnXc8Avv54Gk2xjVa2yA\n" +
-+ "lBL/Cug1nyvKl5wqmN+foT6cMOX6bneCkJOJ4lSbch3gvl4ctlX/9hm3pB/+HhSr\n" +
-+ "em2NcLQrLEq8l9Ar4RnqfoXQR4Uy+4P6wj9OcVV7e/v/+ZPnStOoEAtb5nAwsR2b\n" +
-+ "hOC/tIFNwflrsmsmtMSoOiNftpYLFF4eOAdpDrXYMrqNu6ZxZsOQ7WZl4SsVOx1N\n" +
-+ "/IINXwBLyoHJDzLZ0iJEV0O6mh846s0n6QXeK1P5d0uLcoZaZ1k8Q4sRcdoLA6rS\n" +
-+ "e1WffipBFMvIuoDIigkHZIKVYRLG828rO+PFnRah0ybybkVsN6s3oLxfhswZDvut\n" +
-+ "OwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV\n" +
-+ "HQ4EFgQUOw+92bevFoJz96pR1DrAkPPUKb0wDQYJKoZIhvcNAQELBQADggEBACBN\n" +
-+ "wEaV70FKKBINHtNwesd7TB6fgSaVgDZOO08aseHbXnm7AUhtDV3P5rQR2AsKtbg4\n" +
-+ "COhlKw2/Ki18D4DfdCccFKFTRZBjqj2PxNmn6C68l1/bT4PuUXuM7rW++53RcOA7\n" +
-+ "TbgLuzA25kSz7XinRvR8L4VwHtppu5tSYEthMIMgLZLGGV9r7kBfpY8lXdxQM8vb\n" +
-+ "xZUIysasvVtVUFPOTV6g2dfn8QCoqLOmxyzTLdXe4M6acP6f7lmhgr3LMqDtB6K9\n" +
-+ "pN+OImr77zNdZ+jTB+5e9a8gAvc5ZfG7Nk5RfwUatYTAFZ6Uggy2cKmIRpXCia18\n" +
-+ "If78mc7goS1+lHkGCs2hADEA\n" +
-+ "-----END PKCS7-----";
-+
-+ // Empty PKCS#7 in DER form can be created with openssl:
-+ // openssl crl2pkcs7 -nocrl -outform DER
-+ private static final byte[] PKCS7_BER_EMPTY = {
-+ 48, 39, 6, 9, 42, -122, 72, -122,
-+ -9, 13, 1, 7, 2, -96, 26, 48,
-+ 24, 2, 1, 1, 49, 0, 48, 11,
-+ 6, 9, 42, -122, 72, -122, -9, 13,
-+ 1, 7, 1, -96, 0, -95, 0, 49,
-+ 0
-+ };
-+
-+ private static final String JTEST_ROOT_CRL =
-+ "-----BEGIN X509 CRL-----\n" +
-+ "MIICoTCBigIBATANBgkqhkiG9w0BAQsFADA1MQ4wDAYDVQQKEwVKVGVzdDELMAkG\n" +
-+ "A1UECxMCSVQxFjAUBgNVBAMTDUpUZXN0IFJvb3QgQ0EXDTE0MDkwNDE4NDIyMVqg\n" +
-+ "MDAuMB8GA1UdIwQYMBaAFO6bllCV6kctH77MfqAtefNeRdsmMAsGA1UdFAQEAgIA\n" +
-+ "jjANBgkqhkiG9w0BAQsFAAOCAgEAmp8ihtiRthknDC+VzehmlQw5u8MftMZYQYk5\n" +
-+ "EI04SwyzY9JTL8QHb4u7fXjnZAyN89aYPypI5OSyDsyyGP/JDNsBt2Um/fl0aaCl\n" +
-+ "Z4Np6x+dB9+oIU1XY7y2+uyQUC5MHivQ5ddbGPoAvK/msbugTGAjHvZpM+l0okiV\n" +
-+ "3SofDrii5BSosFEkXfkf2oG9ZLO3YamsFMEZaOj/eWDyGhTyJMGsq2/8NeTF21Tp\n" +
-+ "YkeDcTHqR5KHoYXjOIaS7NjmErm+uDpKH9Lq+JUcYrbUhmjnq5z04EsPF2F2L7Vb\n" +
-+ "THI+awQAUQit16lXGuz7fFRZi2vPyiaRP5n2QT5D+ac1dAs+oWLDJw6Tf2v9KVTe\n" +
-+ "OmW62yd6zQqCwBg+n57UcNu3sv/Sq3t7iRuN0AmWlIhu659POPQv7Np6bEo6dIpp\n" +
-+ "u7Ze6D2KPtM177ETHYlCx2a3g9VEZYKrVhQ2749St0Cp5szVq691jFZAWYOzcfEO\n" +
-+ "XfK1y25pmlBjvhNIIVRlU+T5rjNb8GaleYKVYnKOcv700K32QxFzcPf7nbNKwW99\n" +
-+ "tcaNHFNP+LW/XP8I3CJ8toXLLcOITKVwMA+0GlO5eL7eX5POc+vE9+7IzGuybmU4\n" +
-+ "uslxoLdJ0NSZWpYmf6a6qrJ67cj5i3706H+eBsWQcShfSYreh+TyWQaGk+fkEiUV\n" +
-+ "iy4QdJ0=\n" +
-+ "-----END X509 CRL-----";
-+
-+ private static final String JTEST_INTERMED_CRL =
-+ "-----BEGIN X509 CRL-----\n" +
-+ "MIICzzCBuAIBATANBgkqhkiG9w0BAQsFADA/MQ4wDAYDVQQKEwVKVGVzdDELMAkG\n" +
-+ "A1UECxMCSVQxIDAeBgNVBAMTF0pUZXN0IEludGVybWVkaWF0ZSBDQSAxFw0xNDA5\n" +
-+ "MDQyMjE2NTRaMCIwIAIBBhcNMTQwOTA0MjIxNjU0WjAMMAoGA1UdFQQDCgEFoDAw\n" +
-+ "LjAfBgNVHSMEGDAWgBSvRdjbkSMJ3A7s5H6EWghQ+lkw/zALBgNVHRQEBAICAJsw\n" +
-+ "DQYJKoZIhvcNAQELBQADggIBALJmikMwil8oywhenoO8o9xxCOIU0xrt3KdfiSXw\n" +
-+ "8MtQXZHT9d1C6tlLAsYkWAfmfTvM2OU6wquFCLLsFmDZszbbCqmn4JhYBSKQMqlm\n" +
-+ "IHnsiOFPvITW2FU08fWNLM+FtQzPnTFmx/CJo+wfGpq5tZMIbsccsCJ5uvZVAWGh\n" +
-+ "0KbPmYcJG/O384+kzr/2H2IaoZoMMABec5c5FEF/tpp8jawzY+0VFyaVrumKWdan\n" +
-+ "+3OvRQxT1wLxfNi2vdxB2rmNPo423qanXZAoVv260um3LYlmXBNK1jwQ9lp78jkT\n" +
-+ "B7zMVa4hOUWVxdWc/LE6fUYgPsNqZd+hWy/PolIRp5TS21B5hkc5K87LT59GkexK\n" +
-+ "vNVKQennOLGtH+Q7htK4UeY4Gm/W7UydOQ0k7hZzyfMDkCfLfNfK0l63qKwUku36\n" +
-+ "UdeI1LXqulPEvb/d7rRAAM9p5Sm+RsECj2bcrZBMdIGXcSo26A5tzZpTEC79i4S1\n" +
-+ "yxYIooeBnouUkDJ9+VBsJTSKY5fpU8JSkQPRyHKt+trGAkBt2Ka5MqrHtITzQ1vP\n" +
-+ "5q4tNr45JGEXllH83NlBpWURfsdtkDHa3lxTD/pkrywOCyzz7wQ22D8Kul7EN8nT\n" +
-+ "7LDbN+O3G9GHICxvWlJHp6HMsqGTuH1MIUR+5uZFOJa1S0IzorUIEieLncDUPgzO\n" +
-+ "M4JA\n" +
-+ "-----END X509 CRL-----";
-+
-+ // PKCS#7 CRL Set containing JTEST root and intermediate CRLs
-+ private static final String PKCS7_CRL_SET =
-+ "-----BEGIN PKCS7-----\n" +
-+ "MIIFpQYJKoZIhvcNAQcCoIIFljCCBZICAQExADALBgkqhkiG9w0BBwGgAKGCBXgw\n" +
-+ "ggKhMIGKAgEBMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNVBAoTBUpUZXN0MQswCQYD\n" +
-+ "VQQLEwJJVDEWMBQGA1UEAxMNSlRlc3QgUm9vdCBDQRcNMTQwOTA0MTg0MjIxWqAw\n" +
-+ "MC4wHwYDVR0jBBgwFoAU7puWUJXqRy0fvsx+oC15815F2yYwCwYDVR0UBAQCAgCO\n" +
-+ "MA0GCSqGSIb3DQEBCwUAA4ICAQCanyKG2JG2GScML5XN6GaVDDm7wx+0xlhBiTkQ\n" +
-+ "jThLDLNj0lMvxAdvi7t9eOdkDI3z1pg/Kkjk5LIOzLIY/8kM2wG3ZSb9+XRpoKVn\n" +
-+ "g2nrH50H36ghTVdjvLb67JBQLkweK9Dl11sY+gC8r+axu6BMYCMe9mkz6XSiSJXd\n" +
-+ "Kh8OuKLkFKiwUSRd+R/agb1ks7dhqawUwRlo6P95YPIaFPIkwayrb/w15MXbVOli\n" +
-+ "R4NxMepHkoehheM4hpLs2OYSub64Okof0ur4lRxittSGaOernPTgSw8XYXYvtVtM\n" +
-+ "cj5rBABRCK3XqVca7Pt8VFmLa8/KJpE/mfZBPkP5pzV0Cz6hYsMnDpN/a/0pVN46\n" +
-+ "ZbrbJ3rNCoLAGD6fntRw27ey/9Kre3uJG43QCZaUiG7rn0849C/s2npsSjp0imm7\n" +
-+ "tl7oPYo+0zXvsRMdiULHZreD1URlgqtWFDbvj1K3QKnmzNWrr3WMVkBZg7Nx8Q5d\n" +
-+ "8rXLbmmaUGO+E0ghVGVT5PmuM1vwZqV5gpVico5y/vTQrfZDEXNw9/uds0rBb321\n" +
-+ "xo0cU0/4tb9c/wjcIny2hcstw4hMpXAwD7QaU7l4vt5fk85z68T37sjMa7JuZTi6\n" +
-+ "yXGgt0nQ1JlaliZ/prqqsnrtyPmLfvTof54GxZBxKF9Jit6H5PJZBoaT5+QSJRWL\n" +
-+ "LhB0nTCCAs8wgbgCAQEwDQYJKoZIhvcNAQELBQAwPzEOMAwGA1UEChMFSlRlc3Qx\n" +
-+ "CzAJBgNVBAsTAklUMSAwHgYDVQQDExdKVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMRcN\n" +
-+ "MTQwOTA0MjIxNjU0WjAiMCACAQYXDTE0MDkwNDIyMTY1NFowDDAKBgNVHRUEAwoB\n" +
-+ "BaAwMC4wHwYDVR0jBBgwFoAUr0XY25EjCdwO7OR+hFoIUPpZMP8wCwYDVR0UBAQC\n" +
-+ "AgCbMA0GCSqGSIb3DQEBCwUAA4ICAQCyZopDMIpfKMsIXp6DvKPccQjiFNMa7dyn\n" +
-+ "X4kl8PDLUF2R0/XdQurZSwLGJFgH5n07zNjlOsKrhQiy7BZg2bM22wqpp+CYWAUi\n" +
-+ "kDKpZiB57IjhT7yE1thVNPH1jSzPhbUMz50xZsfwiaPsHxqaubWTCG7HHLAiebr2\n" +
-+ "VQFhodCmz5mHCRvzt/OPpM6/9h9iGqGaDDAAXnOXORRBf7aafI2sM2PtFRcmla7p\n" +
-+ "ilnWp/tzr0UMU9cC8XzYtr3cQdq5jT6ONt6mp12QKFb9utLpty2JZlwTStY8EPZa\n" +
-+ "e/I5Ewe8zFWuITlFlcXVnPyxOn1GID7DamXfoVsvz6JSEaeU0ttQeYZHOSvOy0+f\n" +
-+ "RpHsSrzVSkHp5zixrR/kO4bSuFHmOBpv1u1MnTkNJO4Wc8nzA5Any3zXytJet6is\n" +
-+ "FJLt+lHXiNS16rpTxL2/3e60QADPaeUpvkbBAo9m3K2QTHSBl3EqNugObc2aUxAu\n" +
-+ "/YuEtcsWCKKHgZ6LlJAyfflQbCU0imOX6VPCUpED0chyrfraxgJAbdimuTKqx7SE\n" +
-+ "80Nbz+auLTa+OSRhF5ZR/NzZQaVlEX7HbZAx2t5cUw/6ZK8sDgss8+8ENtg/Crpe\n" +
-+ "xDfJ0+yw2zfjtxvRhyAsb1pSR6ehzLKhk7h9TCFEfubmRTiWtUtCM6K1CBIni53A\n" +
-+ "1D4MzjOCQDEA\n" +
-+ "-----END PKCS7-----";
-+
- public static void main(String[] args) throws Exception {
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
-- File f = new File
-- (System.getProperty("test.src", "."), "invalidcert.pem");
-- InputStream inStream = new FileInputStream(f);
-- try {
-- X509Certificate cert =
-- (X509Certificate) cf.generateCertificate(inStream);
-- } catch (CertificateParsingException ce) {
-- return;
-+ List<DecodeTest> validTests = new LinkedList<>();
-+ List<DecodeTest> invalidTests = new LinkedList<>();
-+
-+ // Load up positive test cases (for sanity checks)
-+ StringBuilder sb = new StringBuilder();
-+
-+ validTests.add(new GenMultiCertTest("Single, valid certificate",
-+ SINGLE_ROOT_CERT.getBytes(), null,
-+ new X500Principal("CN=Root, O=SomeCompany")));
-+ validTests.add(new GenMultiCertTest("PEM-encoded PKCS#7 chain",
-+ PKCS7_INTERMED_ROOT_CERTS.getBytes(), null,
-+ new X500Principal("CN=Intermed, O=SomeCompany"),
-+ new X500Principal("CN=Root, O=SomeCompany")));
-+ validTests.add(new GenMultiCertTest("Two PEM-encoded X509 certs",
-+ (INTERMED_CA_CERT + "\n" + SINGLE_ROOT_CERT).getBytes(),
-+ null,
-+ new X500Principal("CN=Intermed, O=SomeCompany"),
-+ new X500Principal("CN=Root, O=SomeCompany")));
-+ validTests.add(new GenMultiCertTest("Empty data", new byte[0], null));
-+
-+ sb.append("Certificate 1: CN=Root, O=SomeCompany\n");
-+ sb.append(SINGLE_ROOT_CERT).append("\n");
-+ sb.append("Certificate 2: CN=Intermed, O=SomeCompany\n");
-+ sb.append(INTERMED_CA_CERT).append("\n");
-+ sb.append("Extra trailing data\n");
-+ validTests.add(new GenMultiCertTest(
-+ "Two PEM-encoded certs with leading/trailing " +
-+ "text data around each.", sb.toString().getBytes(), null,
-+ new X500Principal("CN=Root, O=SomeCompany"),
-+ new X500Principal("CN=Intermed, O=SomeCompany")));
-+ validTests.add(new GenMultiCertTest(
-+ "BER-encoded PKCS#7 with empty certificates segment",
-+ PKCS7_BER_EMPTY, null));
-+ validTests.add(new GenMultiCRLTest(
-+ "CRL with leading and trailing text data",
-+ ("This is a CRL\n" + JTEST_ROOT_CRL +
-+ "\nSee? Told you so\n\n").getBytes(), null,
-+ new X500Principal("CN=JTest Root CA,OU=IT,O=JTest")));
-+ validTests.add(new GenMultiCRLTest(
-+ "Two CRLs, one after the other with leading/trailing text",
-+ ("This is a CRL\n" + JTEST_ROOT_CRL +
-+ "\nAnd this is another CRL\n" + JTEST_INTERMED_CRL +
-+ "\nAnd this is trailing text\n").getBytes(), null,
-+ new X500Principal("CN=JTest Root CA,OU=IT,O=JTest"),
-+ new X500Principal(
-+ "CN=JTest Intermediate CA 1,OU=IT,O=JTest")));
-+ validTests.add(new GenMultiCRLTest("Two CRLs in a PKCS#7 CRL set",
-+ PKCS7_CRL_SET.getBytes(), null,
-+ new X500Principal("CN=JTest Root CA,OU=IT,O=JTest"),
-+ new X500Principal("CN=JTest Intermediate CA 1,OU=IT,O=JTest")));
-+
-+ // Load up all test cases where we expect failures
-+ invalidTests.add(new GenSingleCertTest("Invalid PEM encoding",
-+ INVALID_CERT.getBytes(),
-+ new CertificateParsingException()));
-+ invalidTests.add(new GenMultiCertTest("Invalid PEM encoding",
-+ INVALID_CERT.getBytes(),
-+ new CertificateParsingException()));
-+ invalidTests.add(new GenMultiCertTest(
-+ "Two cert sequence, one valid and one invalid",
-+ (INTERMED_CA_CERT + "\n" + INVALID_CERT).getBytes(),
-+ new CertificateParsingException()));
-+ invalidTests.add(new GenMultiCertTest("Non-certificate text",
-+ "This is not a certificate".getBytes(),
-+ new CertificateException()));
-+ invalidTests.add(new GenMultiCertTest(
-+ "Non-certificate text with partial PEM header (4 hyphens)",
-+ "----This is not a valid x509 certificate".getBytes(),
-+ new CertificateException()));
-+ invalidTests.add(new GenMultiCertTest(
-+ "Leading non-certificate text plus valid PEM header, " +
-+ "but not on new line",
-+ "This is not valid -----BEGIN CERTIFICATE-----".getBytes(),
-+ new CertificateException()));
-+ byte[] emptyCString = {0};
-+ invalidTests.add(new GenMultiCertTest("Empty C-style string",
-+ emptyCString, new CertificateException()));
-+ invalidTests.add(new GenMultiCRLTest("Non-CRL text",
-+ "This is not a CRL".getBytes(), new CRLException()));
-+ invalidTests.add(new GenMultiCRLTest("Valid headers, but not a CRL",
-+ INTERMED_CA_CERT.getBytes(), new CRLException()));
-+
-+ System.out.println("===== Valid Tests =====");
-+ for (DecodeTest dt : validTests) {
-+ dt.passTest();
- }
-- throw new Exception("CertificateFactory.generateCertificate() did not "
-- + "throw CertificateParsingException on invalid X.509 cert data");
-+ System.out.print("\n");
-+
-+ System.out.println("===== Invalid Tests =====");
-+ for (DecodeTest dt : invalidTests) {
-+ dt.failTest();
-+ }
-+ }
-+
-+ public static abstract class DecodeTest {
-+ protected String testName;
-+ protected byte[] testData;
-+ protected Throwable expectedException;
-+ protected X500Principal[] principals;
-+ protected CertificateFactory cf;
-+
-+ /**
-+ * Construct a DecodeTest
-+ *
-+ * @param name The test name
-+ * @param input A byte array consisting of the input for this test
-+ * @param failType An exception whose class should match the expected
-+ * exception that will be thrown when this test is run
-+ * @param princs Zero of more X500Principals which will be used
-+ * to compare the output in a success case.
-+ */
-+ DecodeTest(String name, byte[] input, Throwable failType,
-+ X500Principal... princs) throws CertificateException {
-+ testName = name;
-+ testData = input.clone();
-+ expectedException = failType;
-+ principals = princs;
-+ cf = CertificateFactory.getInstance("X.509");
-+ }
-+
-+ public abstract void passTest() throws GeneralSecurityException;
-+
-+ public abstract void failTest() throws GeneralSecurityException;
-+ }
-+
-+ public static class GenMultiCertTest extends DecodeTest {
-+ public GenMultiCertTest(String name, byte[] input, Throwable failType,
-+ X500Principal... princs) throws CertificateException {
-+ super(name, input, failType, princs);
-+ }
-+
-+ @Override
-+ public void passTest() throws GeneralSecurityException {
-+ Collection<? extends Certificate> certs;
-+
-+ System.out.println("generateCertificates(): " + testName);
-+ certs = cf.generateCertificates(new ByteArrayInputStream(testData));
-+
-+ // Walk the certs Collection and do a comparison of subject names
-+ int i = 0;
-+ if (certs.size() == principals.length) {
-+ for (Certificate crt : certs) {
-+ X509Certificate xc = (X509Certificate)crt;
-+ if (!xc.getSubjectX500Principal().equals(
-+ principals[i])) {
-+ throw new RuntimeException("Name mismatch: " +
-+ "cert: " + xc.getSubjectX500Principal() +
-+ ", expected: " + principals[i]);
-+ }
-+ i++;
-+ }
-+ } else {
-+ throw new RuntimeException("Size mismatch: certs = " +
-+ certs.size() + ", expected = " +
-+ principals.length);
-+ }
-+ }
-+
-+ @Override
-+ public void failTest() throws GeneralSecurityException {
-+ Throwable caughtException = null;
-+ Collection<? extends Certificate> certs = null;
-+
-+ System.out.println("generateCertificates(): " + testName);
-+ if (expectedException == null) {
-+ throw new RuntimeException("failTest requires non-null " +
-+ "expectedException");
-+ }
-+
-+ try {
-+ certs =
-+ cf.generateCertificates(new ByteArrayInputStream(testData));
-+ } catch (CertificateException ce) {
-+ caughtException = ce;
-+ }
-+
-+ if (caughtException != null) {
-+ // It has to be the right kind of exception though...
-+ if (!caughtException.getClass().equals(
-+ expectedException.getClass())) {
-+ System.err.println("Unexpected exception thrown. " +
-+ "Received: " + caughtException + ", Expected: " +
-+ expectedException.getClass());
-+ throw new RuntimeException(caughtException);
-+ }
-+ } else {
-+ // For a failure test, we'd expect some kind of exception
-+ // to be thrown.
-+ throw new RuntimeException("Failed to catch expected " +
-+ "exception " + expectedException.getClass());
-+ }
-+ }
-+ }
-+
-+ public static class GenSingleCertTest extends DecodeTest {
-+ public GenSingleCertTest(String name, byte[] input, Throwable failType,
-+ X500Principal... princs) throws CertificateException {
-+ super(name, input, failType, princs);
-+ }
-+
-+ @Override
-+ public void passTest() throws GeneralSecurityException {
-+ X509Certificate cert;
-+
-+ System.out.println("generateCertificate(): " + testName);
-+ cert = (X509Certificate)cf.generateCertificate(
-+ new ByteArrayInputStream(testData));
-+
-+ // Compare the cert's subject name against the expected value
-+ // provided in the test. If multiple X500Principals were provided
-+ // just use the first one as the expected value.
-+ if (!cert.getSubjectX500Principal().equals(principals[0])) {
-+ throw new RuntimeException("Name mismatch: " +
-+ "cert: " + cert.getSubjectX500Principal() +
-+ ", expected: " + principals[0]);
-+ }
-+ }
-+
-+ @Override
-+ public void failTest() throws GeneralSecurityException {
-+ Throwable caughtException = null;
-+ X509Certificate cert = null;
-+ System.out.println("generateCertificate(): " + testName);
-+
-+ if (expectedException == null) {
-+ throw new RuntimeException("failTest requires non-null " +
-+ "expectedException");
-+ }
-+
-+ try {
-+ cert = (X509Certificate)cf.generateCertificate(
-+ new ByteArrayInputStream(testData));
-+ } catch (CertificateException e) {
-+ caughtException = e;
-+ }
-+
-+ if (caughtException != null) {
-+ // It has to be the right kind of exception though...
-+ if (!caughtException.getClass().equals(
-+ expectedException.getClass())) {
-+ System.err.println("Unexpected exception thrown. " +
-+ "Received: " + caughtException + ", Expected: " +
-+ expectedException.getClass());
-+ throw new RuntimeException(caughtException);
-+ }
-+ } else {
-+ // For a failure test, we'd expect some kind of exception
-+ // to be thrown.
-+ throw new RuntimeException("Failed to catch expected " +
-+ "exception " + expectedException.getClass());
-+ }
-+ }
-+ }
-+
-+ public static class GenMultiCRLTest extends DecodeTest {
-+ public GenMultiCRLTest(String name, byte[] input, Throwable failType,
-+ X500Principal... princs) throws CertificateException {
-+ super(name, input, failType, princs);
-+ }
-+
-+ @Override
-+ public void passTest() throws GeneralSecurityException {
-+ Collection<? extends CRL> crls;
-+
-+ System.out.println("generateCRLs(): " + testName);
-+ crls = cf.generateCRLs(new ByteArrayInputStream(testData));
-+
-+ // Walk the crls Collection and do a comparison of issuer names
-+ int i = 0;
-+ if (crls.size() == principals.length) {
-+ for (CRL revlist : crls) {
-+ X509CRL xc = (X509CRL)revlist;
-+ if (!xc.getIssuerX500Principal().equals(principals[i])) {
-+ throw new RuntimeException("Name mismatch: " +
-+ "CRL: " + xc.getIssuerX500Principal() +
-+ ", expected: " + principals[i]);
-+ }
-+ i++;
-+ }
-+ } else {
-+ throw new RuntimeException("Size mismatch: crls = " +
-+ crls.size() + ", expected = " +
-+ principals.length);
-+ }
-+ }
-+
-+ @Override
-+ public void failTest() throws GeneralSecurityException {
-+ Throwable caughtException = null;
-+ Collection<? extends CRL> crls = null;
-+
-+ System.out.println("generateCRLs(): " + testName);
-+ if (expectedException == null) {
-+ throw new RuntimeException("failTest requires non-null " +
-+ "expectedException");
-+ }
-+
-+ try {
-+ crls =
-+ cf.generateCRLs(new ByteArrayInputStream(testData));
-+ } catch (CRLException e) {
-+ caughtException = e;
-+ }
-+
-+ if (caughtException != null) {
-+ // It has to be the right kind of exception though...
-+ if (!caughtException.getClass().equals(
-+ expectedException.getClass())) {
-+ System.err.println("Unexpected exception thrown. " +
-+ "Received: " + caughtException + ", Expected: " +
-+ expectedException.getClass());
-+ throw new RuntimeException(caughtException);
-+ }
-+ } else {
-+ // For a failure test, we'd expect some kind of exception
-+ // to be thrown.
-+ throw new RuntimeException("Failed to catch expected " +
-+ "exception " + expectedException.getClass());
-+ }
-+ }
- }
- }
---- ./jdk/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,14 +0,0 @@
-------BEGIN CERTIFICATE-----
--XIICJjCCAdCgAwIBAgIBITANBgkqhkiG9w0BAQQFADCBqTELMAkGA1UEBhMCVVMx
--EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xFTAT
--BgNVBAoTDEJFQSBXZWJMb2dpYzERMA8GA1UECxMIU2VjdXJpdHkxIzAhBgNVBAMT
--GkRlbW8gQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9zdXBw
--b3J0QGJlYS5jb20wHhcNMDAwNTMwMjEzODAxWhcNMDQwNTEzMjEzODAxWjCBjDEL
--MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
--cmFuY2lzY28xFTATBgNVBAoTDEJFQSBXZWJMb2dpYzEZMBcGA1UEAxMQd2VibG9n
--aWMuYmVhLmNvbTEeMBwGCSqGSIb3DQEJARYPc3VwcG9ydEBiZWEuY29tMFwwDQYJ
--KoZIhvcNAQEBBQADSwAwSAJBALdsXEHqKHgs6zj0hU5sXMAUHzoT8kgWXmNkKHXH
--79qbPh6EfdlriW9G/AbRF/pKrCQu7hhllAxREbqTuSlf2EMCAwEAATANBgkqhkiG
--9w0BAQQFAANBACgmqflL5m5LNeJGpWx9aIoABCiuDcpw1fFyegsqGX7CBhffcruS
--1p8h5vkHVbMu1frD1UgGnPlOO/K7Ig/KrsU=
-------END CERTIFICATE-----
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/java/util/logging/LogManagerAppContextDeadlock.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,400 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.CodeSource;
-+import java.security.Permission;
-+import java.security.PermissionCollection;
-+import java.security.Permissions;
-+import java.security.Policy;
-+import java.security.ProtectionDomain;
-+import java.util.Enumeration;
-+import java.util.concurrent.Semaphore;
-+import java.util.concurrent.atomic.AtomicBoolean;
-+import java.util.concurrent.atomic.AtomicInteger;
-+import java.util.logging.LogManager;
-+import java.util.logging.Logger;
-+
-+/**
-+ * @test
-+ * @bug 8065991 8071591
-+ * @summary check that when LogManager is initialized, a deadlock similar
-+ * to that described in 8065709 will not occur.
-+ * @run main/othervm LogManagerAppContextDeadlock UNSECURE
-+ * @run main/othervm LogManagerAppContextDeadlock SECURE
-+ *
-+ * @author danielfuchs
-+ */
-+public class LogManagerAppContextDeadlock {
-+
-+ public static final Semaphore sem = new Semaphore(0);
-+ public static final Semaphore sem2 = new Semaphore(0);
-+ public static final Semaphore sem3 = new Semaphore(-2);
-+ public static volatile boolean goOn = true;
-+ public static volatile Exception thrown;
-+
-+ // Emulate EventQueue
-+ static class FakeEventQueue {
-+ static final Logger logger = Logger.getLogger("foo");
-+ }
-+
-+ // Emulate AppContext
-+ static class FakeAppContext {
-+
-+ final static AtomicInteger numAppContexts = new AtomicInteger(0);
-+ static final class FakeAppContextLock {}
-+ static final FakeAppContextLock lock = new FakeAppContextLock();
-+ static volatile FakeAppContext appContext;
-+
-+ final FakeEventQueue queue;
-+ FakeAppContext() {
-+ appContext = this;
-+ numAppContexts.incrementAndGet();
-+ // release sem2 to let Thread t2 call Logger.getLogger().
-+ sem2.release();
-+ try {
-+ // Wait until we JavaAWTAccess is called by LogManager.
-+ // Thread 2 will call Logger.getLogger() which will
-+ // trigger a call to JavaAWTAccess - which will release
-+ // sem, thus ensuring that Thread #2 is where we want it.
-+ sem.acquire();
-+ System.out.println("Sem acquired: Thread #2 has called JavaAWTAccess");
-+ } catch(InterruptedException x) {
-+ Thread.interrupted();
-+ }
-+ queue = new FakeEventQueue();
-+ }
-+
-+ static FakeAppContext getAppContext() {
-+ synchronized (lock) {
-+ if (numAppContexts.get() == 0) {
-+ return new FakeAppContext();
-+ }
-+ return appContext;
-+ }
-+ }
-+
-+ static {
-+ sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() {
-+ @Override
-+ public Object getAppletContext() {
-+ if (numAppContexts.get() == 0) return null;
-+ // We are in JavaAWTAccess, we can release sem and let
-+ // FakeAppContext constructor proceeed.
-+ System.out.println("Releasing Sem");
-+ sem.release();
-+ return getAppContext();
-+ }
-+
-+ @Override
-+ public Object get(Object key) {
-+ return null;
-+ }
-+
-+ @Override
-+ public void put(Object key, Object value) {
-+
-+ }
-+
-+ @Override
-+ public void remove(Object key) {
-+
-+ }
-+
-+ @Override
-+ public boolean isDisposed() {
-+ return false;
-+ }
-+
-+ @Override
-+ public boolean isMainAppContext() {
-+ return false;
-+ }
-+
-+ });
-+ }
-+
-+ }
-+
-+
-+ // Test with or without a security manager
-+ public static enum TestCase {
-+ UNSECURE, SECURE;
-+ public void run() throws Exception {
-+ System.out.println("Running test case: " + name());
-+ Configure.setUp(this);
-+ test(this);
-+ }
-+ }
-+
-+ public static void test(final TestCase test) throws Exception {
-+ Thread t1 = new Thread() {
-+ @Override
-+ public void run() {
-+ sem3.release();
-+ System.out.println("FakeAppContext.getAppContext()");
-+ FakeAppContext.getAppContext();
-+ System.out.println("Done: FakeAppContext.getAppContext()");
-+ }
-+ };
-+ t1.setDaemon(true);
-+ t1.start();
-+ Thread t2 = new Thread() {
-+ public void run() {
-+ sem3.release();
-+ try {
-+ // Wait until Thread1 is in FakeAppContext constructor
-+ sem2.acquire();
-+ System.out.println("Sem2 acquired: Thread #1 will be waiting to acquire Sem");
-+ } catch (InterruptedException ie) {
-+ Thread.interrupted();
-+ }
-+ System.out.println("Logger.getLogger(name).info(name)");
-+ Logger.getLogger(test.name());//.info(name);
-+ System.out.println("Done: Logger.getLogger(name).info(name)");
-+ }
-+ };
-+ t2.setDaemon(true);
-+ t2.start();
-+ System.out.println("Should exit now...");
-+ Thread detector = new DeadlockDetector();
-+ detector.start();
-+
-+ // Wait for the 3 threads to start
-+ sem3.acquire();
-+
-+ // Now wait for t1 & t2 to finish, or for a deadlock to be detected.
-+ while (goOn && (t1.isAlive() || t2.isAlive())) {
-+ if (t2.isAlive()) t2.join(1000);
-+ if (test == TestCase.UNSECURE && System.getSecurityManager() == null) {
-+ // if there's no security manager, AppContext.getAppContext() is
-+ // not called - so Thread t2 will not end up calling
-+ // sem.release(). In that case we must release the semaphore here
-+ // so that t1 can proceed.
-+ if (LogManager.getLogManager().getLogger(TestCase.UNSECURE.name()) != null) {
-+ // means Thread t2 has created the logger
-+ sem.release();
-+ }
-+ }
-+ if (t1.isAlive()) t1.join(1000);
-+ }
-+ if (thrown != null) {
-+ throw thrown;
-+ }
-+ }
-+
-+ // Thrown by the deadlock detector
-+ static final class DeadlockException extends RuntimeException {
-+ public DeadlockException(String message) {
-+ super(message);
-+ }
-+ @Override
-+ public void printStackTrace() {
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ if (args.length == 0) {
-+ args = new String[] { "SECURE" };
-+ }
-+
-+ // If we don't initialize LogManager here, there will be
-+ // a deadlock.
-+ // See <https://bugs.openjdk.java.net/browse/JDK-8065709?focusedCommentId=13582038&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13582038>
-+ // for more details.
-+ Logger.getLogger("main").info("starting...");
-+ try {
-+ TestCase.valueOf(args[0]).run();
-+ System.out.println("Test "+args[0]+" Passed");
-+ } catch(Throwable t) {
-+ System.err.println("Test " + args[0] +" failed: " + t);
-+ t.printStackTrace();
-+ }
-+ }
-+
-+ // Called by the deadlock detector when a deadlock is found.
-+ static void fail(Exception x) {
-+ x.printStackTrace();
-+ if (thrown == null) {
-+ thrown = x;
-+ }
-+ goOn = false;
-+ }
-+
-+ // A thread that detect deadlocks.
-+ final static class DeadlockDetector extends Thread {
-+
-+ public DeadlockDetector() {
-+ this.setDaemon(true);
-+ }
-+
-+ @Override
-+ public void run() {
-+ sem3.release();
-+ Configure.doPrivileged(new Runnable() {
-+ @Override
-+ public void run() {
-+ DeadlockDetector.this.loop();
-+ }
-+ });
-+ }
-+ public void loop() {
-+ while(goOn) {
-+ try {
-+ long[] ids = ManagementFactory.getThreadMXBean().findDeadlockedThreads();
-+ 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);
-+ }
-+ throw new DeadlockException("Found "+ids.length+" deadlocked threads");
-+ }
-+ Thread.sleep(100);
-+ } catch(InterruptedException | RuntimeException x) {
-+ fail(x);
-+ }
-+ }
-+ }
-+
-+ }
-+
-+ // A helper class to configure the security manager for the test,
-+ // and bypass it when needed.
-+ static class Configure {
-+ static Policy policy = null;
-+ static final ThreadLocal<AtomicBoolean> allowAll = new ThreadLocal<AtomicBoolean>() {
-+ @Override
-+ protected AtomicBoolean initialValue() {
-+ return new AtomicBoolean(false);
-+ }
-+ };
-+ static void setUp(TestCase test) {
-+ switch (test) {
-+ case SECURE:
-+ if (policy == null && System.getSecurityManager() != null) {
-+ throw new IllegalStateException("SecurityManager already set");
-+ } else if (policy == null) {
-+ policy = new SimplePolicy(TestCase.SECURE, allowAll);
-+ Policy.setPolicy(policy);
-+ System.setSecurityManager(new SecurityManager());
-+ }
-+ if (System.getSecurityManager() == null) {
-+ throw new IllegalStateException("No SecurityManager.");
-+ }
-+ if (policy == null) {
-+ throw new IllegalStateException("policy not configured");
-+ }
-+ break;
-+ case UNSECURE:
-+ if (System.getSecurityManager() != null) {
-+ throw new IllegalStateException("SecurityManager already set");
-+ }
-+ break;
-+ default:
-+ new InternalError("No such testcase: " + test);
-+ }
-+ }
-+ static void doPrivileged(Runnable run) {
-+ allowAll.get().set(true);
-+ try {
-+ run.run();
-+ } finally {
-+ allowAll.get().set(false);
-+ }
-+ }
-+ }
-+
-+ // A Helper class to build a set of permissions.
-+ final static class PermissionsBuilder {
-+ final Permissions perms;
-+ public PermissionsBuilder() {
-+ this(new Permissions());
-+ }
-+ public PermissionsBuilder(Permissions perms) {
-+ this.perms = perms;
-+ }
-+ public PermissionsBuilder add(Permission p) {
-+ perms.add(p);
-+ return this;
-+ }
-+ public PermissionsBuilder addAll(PermissionCollection col) {
-+ if (col != null) {
-+ for (Enumeration<Permission> e = col.elements(); e.hasMoreElements(); ) {
-+ perms.add(e.nextElement());
-+ }
-+ }
-+ return this;
-+ }
-+ public Permissions toPermissions() {
-+ final PermissionsBuilder builder = new PermissionsBuilder();
-+ builder.addAll(perms);
-+ return builder.perms;
-+ }
-+ }
-+
-+ // Policy for the test...
-+ public static class SimplePolicy extends Policy {
-+
-+ final Permissions permissions;
-+ final Permissions allPermissions;
-+ final ThreadLocal<AtomicBoolean> allowAll; // actually: this should be in a thread locale
-+ public SimplePolicy(TestCase test, ThreadLocal<AtomicBoolean> allowAll) {
-+ this.allowAll = allowAll;
-+ // we don't actually need any permission to create our
-+ // FileHandlers because we're passing invalid parameters
-+ // which will make the creation fail...
-+ permissions = new Permissions();
-+ permissions.add(new RuntimePermission("accessClassInPackage.sun.misc"));
-+
-+ // these are used for configuring the test itself...
-+ allPermissions = new Permissions();
-+ allPermissions.add(new java.security.AllPermission());
-+
-+ }
-+
-+ @Override
-+ public boolean implies(ProtectionDomain domain, Permission permission) {
-+ if (allowAll.get().get()) return allPermissions.implies(permission);
-+ return permissions.implies(permission);
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(CodeSource codesource) {
-+ return new PermissionsBuilder().addAll(allowAll.get().get()
-+ ? allPermissions : permissions).toPermissions();
-+ }
-+
-+ @Override
-+ public PermissionCollection getPermissions(ProtectionDomain domain) {
-+ return new PermissionsBuilder().addAll(allowAll.get().get()
-+ ? allPermissions : permissions).toPermissions();
-+ }
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/net/ssl/TLSv12/ProtocolFilter.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,318 @@
-+/*
-+ * 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.
-+ */
-+
-+// SunJSSE does not support dynamic system properties, no way to re-use
-+// system properties in samevm/agentvm mode.
-+
-+/*
-+ * @test
-+ * @bug 8052406
-+ * @summary SSLv2Hello protocol may be filter out unexpectedly
-+ * @run main/othervm ProtocolFilter
-+ */
-+
-+import java.io.*;
-+import java.net.*;
-+import javax.net.ssl.*;
-+
-+public class ProtocolFilter {
-+
-+ /*
-+ * =============================================================
-+ * Set the various variables needed for the tests, then
-+ * specify what tests to run on each side.
-+ */
-+
-+ /*
-+ * Should we run the client or server in a separate thread?
-+ * Both sides can throw exceptions, but do you have a preference
-+ * as to which side should be the main thread.
-+ */
-+ static boolean separateServerThread = false;
-+
-+ /*
-+ * Where do we find the keystores?
-+ */
-+ static String pathToStores = "../../../../sun/security/ssl/etc";
-+ static String keyStoreFile = "keystore";
-+ static String trustStoreFile = "truststore";
-+ static String passwd = "passphrase";
-+
-+ /*
-+ * Is the server ready to serve?
-+ */
-+ volatile static boolean serverReady = false;
-+
-+ /*
-+ * Turn on SSL debugging?
-+ */
-+ static boolean debug = false;
-+
-+ /*
-+ * If the client or server is doing some kind of object creation
-+ * that the other side depends on, and that thread prematurely
-+ * exits, you may experience a hang. The test harness will
-+ * terminate all hung threads after its timeout has expired,
-+ * currently 3 minutes by default, but you might try to be
-+ * smart about it....
-+ */
-+
-+ /*
-+ * Define the server side of the test.
-+ *
-+ * If the server prematurely exits, serverReady will be set to true
-+ * to avoid infinite hangs.
-+ */
-+ void doServerSide() throws Exception {
-+ SSLServerSocketFactory sslssf =
-+ (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
-+ SSLServerSocket sslServerSocket =
-+ (SSLServerSocket) sslssf.createServerSocket(serverPort);
-+
-+ // Only enable cipher suites for TLS v1.2.
-+ sslServerSocket.setEnabledCipherSuites(
-+ new String[]{"TLS_RSA_WITH_AES_128_CBC_SHA256"});
-+
-+ serverPort = sslServerSocket.getLocalPort();
-+
-+ /*
-+ * Signal Client, we're ready for his connect.
-+ */
-+ serverReady = true;
-+
-+ SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
-+ InputStream sslIS = sslSocket.getInputStream();
-+ OutputStream sslOS = sslSocket.getOutputStream();
-+
-+ sslIS.read();
-+ sslOS.write(85);
-+ sslOS.flush();
-+
-+ sslSocket.close();
-+ }
-+
-+ /*
-+ * Define the client side of the test.
-+ *
-+ * If the server prematurely exits, serverReady will be set to true
-+ * to avoid infinite hangs.
-+ */
-+ void doClientSide() throws Exception {
-+
-+ /*
-+ * Wait for server to get started.
-+ */
-+ while (!serverReady) {
-+ Thread.sleep(50);
-+ }
-+
-+ SSLSocketFactory sslsf =
-+ (SSLSocketFactory) SSLSocketFactory.getDefault();
-+ SSLSocket sslSocket = (SSLSocket)
-+ sslsf.createSocket("localhost", serverPort);
-+
-+ // Enable all supported protocols, including SSLv2Hello.
-+ sslSocket.setEnabledProtocols(sslSocket.getSupportedProtocols());
-+
-+ String[] ciphers = sslSocket.getSupportedCipherSuites();
-+ sslSocket.setEnabledCipherSuites(ciphers);
-+
-+ InputStream sslIS = sslSocket.getInputStream();
-+ OutputStream sslOS = sslSocket.getOutputStream();
-+
-+ sslOS.write(280);
-+ sslOS.flush();
-+ sslIS.read();
-+
-+ sslSocket.close();
-+ }
-+
-+ /*
-+ * =============================================================
-+ * The remainder is just support stuff
-+ */
-+
-+ // use any free port by default
-+ volatile int serverPort = 0;
-+
-+ volatile Exception serverException = null;
-+ volatile Exception clientException = null;
-+
-+ public static void main(String[] args) throws Exception {
-+ String keyFilename =
-+ System.getProperty("test.src", ".") + "/" + pathToStores +
-+ "/" + keyStoreFile;
-+ String trustFilename =
-+ System.getProperty("test.src", ".") + "/" + pathToStores +
-+ "/" + trustStoreFile;
-+
-+ System.setProperty("javax.net.ssl.keyStore", keyFilename);
-+ System.setProperty("javax.net.ssl.keyStorePassword", passwd);
-+ System.setProperty("javax.net.ssl.trustStore", trustFilename);
-+ System.setProperty("javax.net.ssl.trustStorePassword", passwd);
-+
-+ if (debug)
-+ System.setProperty("javax.net.debug", "all");
-+
-+ /*
-+ * Start the tests.
-+ */
-+ new ProtocolFilter();
-+ }
-+
-+ Thread clientThread = null;
-+ Thread serverThread = null;
-+
-+ /*
-+ * Primary constructor, used to drive remainder of the test.
-+ *
-+ * Fork off the other side, then do your work.
-+ */
-+ ProtocolFilter() throws Exception {
-+ Exception startException = null;
-+ try {
-+ if (separateServerThread) {
-+ startServer(true);
-+ startClient(false);
-+ } else {
-+ startClient(true);
-+ startServer(false);
-+ }
-+ } catch (Exception e) {
-+ startException = e;
-+ }
-+
-+ /*
-+ * Wait for other side to close down.
-+ */
-+ if (separateServerThread) {
-+ if (serverThread != null) {
-+ serverThread.join();
-+ }
-+ } else {
-+ if (clientThread != null) {
-+ clientThread.join();
-+ }
-+ }
-+
-+ /*
-+ * When we get here, the test is pretty much over.
-+ * Which side threw the error?
-+ */
-+ Exception local;
-+ Exception remote;
-+
-+ if (separateServerThread) {
-+ remote = serverException;
-+ local = clientException;
-+ } else {
-+ remote = clientException;
-+ local = serverException;
-+ }
-+
-+ Exception exception = null;
-+
-+ /*
-+ * Check various exception conditions.
-+ */
-+ if ((local != null) && (remote != null)) {
-+ // If both failed, return the curthread's exception.
-+ local.initCause(remote);
-+ exception = local;
-+ } else if (local != null) {
-+ exception = local;
-+ } else if (remote != null) {
-+ exception = remote;
-+ } else if (startException != null) {
-+ exception = startException;
-+ }
-+
-+ /*
-+ * If there was an exception *AND* a startException,
-+ * output it.
-+ */
-+ if (exception != null) {
-+ if (exception != startException && startException != null) {
-+ exception.addSuppressed(startException);
-+ }
-+ throw exception;
-+ }
-+
-+ // Fall-through: no exception to throw!
-+ }
-+
-+ void startServer(boolean newThread) throws Exception {
-+ if (newThread) {
-+ serverThread = new Thread() {
-+ public void run() {
-+ try {
-+ doServerSide();
-+ } catch (Exception e) {
-+ /*
-+ * Our server thread just died.
-+ *
-+ * Release the client, if not active already...
-+ */
-+ System.err.println("Server died...");
-+ serverReady = true;
-+ serverException = e;
-+ }
-+ }
-+ };
-+ serverThread.start();
-+ } else {
-+ try {
-+ doServerSide();
-+ } catch (Exception e) {
-+ serverException = e;
-+ } finally {
-+ serverReady = true;
-+ }
-+ }
-+ }
-+
-+ void startClient(boolean newThread) throws Exception {
-+ if (newThread) {
-+ clientThread = new Thread() {
-+ public void run() {
-+ try {
-+ doClientSide();
-+ } catch (Exception e) {
-+ /*
-+ * Our client thread just died.
-+ */
-+ System.err.println("Client died...");
-+ clientException = e;
-+ }
-+ }
-+ };
-+ clientThread.start();
-+ } else {
-+ try {
-+ doClientSide();
-+ } catch (Exception e) {
-+ clientException = e;
-+ }
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+import javax.swing.BorderFactory;
-+import javax.swing.JColorChooser;
-+import javax.swing.JFrame;
-+import javax.swing.JPanel;
-+import javax.swing.SwingUtilities;
-+
-+/*
-+ * @bug 8065098
-+ * @summary JColorChooser no longer supports drag and drop
-+ * between two JVM instances
-+ */
-+public class JColorChooserDnDTest {
-+
-+ public static void main(String[] args) {
-+ SwingUtilities.invokeLater(new Runnable() {
-+
-+ @Override
-+ public void run() {
-+ JFrame frame = new JFrame();
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ JPanel panel = new JPanel();
-+ JColorChooser colorChooser = new JColorChooser();
-+ colorChooser.setDragEnabled(true);
-+ panel.setBorder(BorderFactory.createTitledBorder("JColorChoosers"));
-+ panel.add(colorChooser);
-+ frame.setContentPane(panel);
-+ frame.pack();
-+ frame.setVisible(true);
-+ }
-+ });
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/swing/JColorChooser/8065098/bug8065098.html Fri Apr 10 09:21:28 2015 -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.
-+
-+ This code is distributed in the hope that it will be useful, but WITHOUT
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ version 2 for more details (a copy is included in the LICENSE file that
-+ accompanied this code).
-+
-+ You should have received a copy of the GNU General Public License version
-+ 2 along with this work; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+ Please 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>
-+ 1. Compile the java test JColorChooserDnDTest.java:
-+ > <path-to-the-tested-jdk>/bin/javac JColorChooserDnDTest.java
-+ 2. Run the first instance of the java test:
-+ > <path-to-the-tested-jdk>/bin/java JColorChooserDnDTest
-+ 3. Select a color in the color chooser
-+ 4. Run the second instance of the java test:
-+ > <path-to-the-tested-jdk>/bin/java JColorChooserDnDTest
-+ 5. Drag and drop the selected color from the first color chooser
-+ preview panel to the second color chooser preview panel
-+ 6. If the color is dragged to the second color chooser then the test passes.
-+
-+ <applet width="500" height="1" code="bug8065098.class">
-+ </applet>
-+</body>
-+</html>
-\ No newline at end of file
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/swing/JColorChooser/8065098/bug8065098.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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 javax.swing.JApplet;
-+
-+/*
-+ * @test
-+ * @bug 8065098
-+ * @summary JColorChooser no longer supports drag and drop
-+ * between two JVM instances
-+ * @run applet/manual=yesno bug8065098.html
-+ */
-+public class bug8065098 extends JApplet {
-+
-+}
---- ./jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java Fri Apr 10 09:21:28 2015 -0700
-@@ -47,15 +47,18 @@
- return;
- }
-
-- SwingUtilities.invokeAndWait(() -> {
-- try {
-- UIManager.setLookAndFeel(new WindowsLookAndFeel());
-- } catch (UnsupportedLookAndFeelException e) {
-- e.printStackTrace();
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ 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);
- }
-- 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/JRadioButton/8033699/bug8033699.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,255 @@
-+/*
-+ * 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 8033699
-+ * @summary Incorrect radio button behavior when pressing tab key
-+ * @author Vivi An
-+ * @run main bug8033699
-+ */
-+
-+import javax.swing.*;
-+import javax.swing.event.*;
-+import java.awt.event.*;
-+import java.awt.*;
-+import sun.awt.SunToolkit;
-+
-+public class bug8033699 {
-+ private static Robot robot;
-+ private static SunToolkit toolkit;
-+
-+ private static JButton btnStart;
-+ private static ButtonGroup btnGrp;
-+ private static JButton btnEnd;
-+ private static JButton btnMiddle;
-+ private static JRadioButton radioBtn1;
-+ private static JRadioButton radioBtn2;
-+ private static JRadioButton radioBtn3;
-+ private static JRadioButton radioBtnSingle;
-+
-+ public static void main(String args[]) throws Throwable {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ robot = new Robot();
-+ Thread.sleep(100);
-+
-+ robot.setAutoDelay(100);
-+ toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+
-+ // tab key test grouped radio button
-+ runTest1();
-+
-+ // tab key test non-grouped radio button
-+ runTest2();
-+
-+ // shift tab key test grouped and non grouped radio button
-+ runTest3();
-+
-+ // left/up key test in grouped radio button
-+ runTest4();
-+
-+ // down/right key test in grouped radio button
-+ runTest5();
-+
-+ // tab from radio button in group to next component in the middle of button group layout
-+ runTest6();
-+
-+ // tab to radio button in group from component in the middle of button group layout
-+ runTest7();
-+
-+ // down key circle back to first button in grouped radio button
-+ runTest8();
-+ }
-+
-+ private static void createAndShowGUI() {
-+ JFrame mainFrame = new JFrame("Bug 8033699 - 8 Tests for Grouped/Non Group Radio Buttons");
-+
-+ btnStart = new JButton("Start");
-+ btnEnd = new JButton("End");
-+ btnMiddle = new JButton("Middle");
-+
-+ JPanel box = new JPanel();
-+ box.setLayout(new BoxLayout(box, BoxLayout.Y_AXIS));
-+ box.setBorder(BorderFactory.createTitledBorder("Grouped Radio Buttons"));
-+ radioBtn1 = new JRadioButton("A");
-+ radioBtn2 = new JRadioButton("B");
-+ radioBtn3 = new JRadioButton("C");
-+
-+ ButtonGroup btnGrp = new ButtonGroup();
-+ btnGrp.add(radioBtn1);
-+ btnGrp.add(radioBtn2);
-+ btnGrp.add(radioBtn3);
-+ radioBtn1.setSelected(true);
-+
-+ box.add(radioBtn1);
-+ box.add(radioBtn2);
-+ box.add(btnMiddle);
-+ box.add(radioBtn3);
-+
-+ radioBtnSingle = new JRadioButton("Not Grouped");
-+ radioBtnSingle.setSelected(true);
-+
-+ mainFrame.getContentPane().add(btnStart);
-+ mainFrame.getContentPane().add(box);
-+ mainFrame.getContentPane().add(radioBtnSingle);
-+ mainFrame.getContentPane().add(btnEnd);
-+
-+ mainFrame.getRootPane().setDefaultButton(btnStart);
-+ btnStart.requestFocus();
-+
-+ mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+ mainFrame.setLayout(new BoxLayout(mainFrame.getContentPane(), BoxLayout.Y_AXIS));
-+
-+ mainFrame.setSize(300, 300);
-+ mainFrame.setLocation(200, 200);
-+ mainFrame.setVisible(true);
-+ mainFrame.toFront();
-+ }
-+
-+ // Radio button Group as a single component when traversing through tab key
-+ private static void runTest1() throws Exception{
-+ hitKey(robot, KeyEvent.VK_TAB);
-+ hitKey(robot, KeyEvent.VK_TAB);
-+
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) {
-+ System.out.println("Radio Button Group Go To Next Component through Tab Key failed");
-+ throw new RuntimeException("Focus is not on Radio Button Single as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ // Non-Grouped Radio button as a single component when traversing through tab key
-+ private static void runTest2() throws Exception{
-+ hitKey(robot, KeyEvent.VK_TAB);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnEnd) {
-+ System.out.println("Non Grouped Radio Button Go To Next Component through Tab Key failed");
-+ throw new RuntimeException("Focus is not on Button End as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ // Non-Grouped Radio button and Group Radio button as a single component when traversing through shift-tab key
-+ private static void runTest3() throws Exception{
-+ hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
-+ hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) {
-+ System.out.println("Radio button Group/Non Grouped Radio Button SHIFT-Tab Key Test failed");
-+ throw new RuntimeException("Focus is not on Radio Button C as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ // Using arrow key to move focus in radio button group
-+ private static void runTest4() throws Exception{
-+ hitKey(robot, KeyEvent.VK_UP);
-+ hitKey(robot, KeyEvent.VK_LEFT);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) {
-+ System.out.println("Radio button Group UP/LEFT Arrow Key Move Focus Failed");
-+ throw new RuntimeException("Focus is not on Radio Button A as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ private static void runTest5() throws Exception{
-+ hitKey(robot, KeyEvent.VK_DOWN);
-+ hitKey(robot, KeyEvent.VK_RIGHT);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) {
-+ System.out.println("Radio button Group Left/Up Arrow Key Move Focus Failed");
-+ throw new RuntimeException("Focus is not on Radio Button C as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ private static void runTest6() throws Exception{
-+ hitKey(robot, KeyEvent.VK_DOWN);
-+ hitKey(robot, KeyEvent.VK_DOWN);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn2) {
-+ System.out.println("Radio button Group Circle Back To First Button Test");
-+ throw new RuntimeException("Focus is not on Radio Button A as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ private static void runTest7() throws Exception{
-+ hitKey(robot, KeyEvent.VK_TAB);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnMiddle) {
-+ System.out.println("Separate Component added in button group layout");
-+ throw new RuntimeException("Focus is not on Middle Button as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ private static void runTest8() throws Exception{
-+ hitKey(robot, KeyEvent.VK_TAB);
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ public void run() {
-+ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) {
-+ System.out.println("Separate Component added in button group layout");
-+ throw new RuntimeException("Focus is not on Radio Button C as Expected");
-+ }
-+ }
-+ });
-+ }
-+
-+ private static void hitKey(Robot robot, int keycode) {
-+ robot.keyPress(keycode);
-+ robot.keyRelease(keycode);
-+ toolkit.realSync();
-+ }
-+
-+ private static void hitKey(Robot robot, int mode, int keycode) {
-+ robot.keyPress(mode);
-+ robot.keyPress(keycode);
-+ robot.keyRelease(mode);
-+ robot.keyRelease(keycode);
-+ toolkit.realSync();
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/swing/plaf/windows/WindowsRootPaneUI/AltKeyProccessingNPETest/AltKeyProccessingNPETest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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 8001633
-+ @summary Wrong alt processing during switching between windows
-+ @author mikhail.cherkasov@oracle.com
-+ @run main AltKeyProccessingNPETest
-+*/
-+import sun.awt.SunToolkit;
-+
-+import java.awt.*;
-+import java.awt.event.KeyEvent;
-+import javax.swing.UIManager;
-+
-+public class AltKeyProccessingNPETest {
-+
-+ private static Robot robot;
-+
-+ public static void initRobot() throws AWTException {
-+ robot = new Robot();
-+ robot.setAutoDelay(100);
-+ }
-+
-+ public static void sync() {
-+ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ toolkit.realSync();
-+ }
-+
-+ public static void main(String args[]) throws Exception {
-+
-+ initRobot();
-+
-+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-+
-+ Frame frame = new Frame();
-+ frame.setSize(400,400);
-+ frame.setVisible(true);
-+
-+ sync();
-+
-+ robot.keyPress(KeyEvent.VK_ALT);
-+ robot.keyRelease(KeyEvent.VK_ALT);
-+ }
-+}
-\ No newline at end of file
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/swing/text/View/8048110/bug8048110.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,121 @@
-+/*
-+ * 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 8048110
-+ * @summary Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow
-+ * @author Dmitry Markov
-+ * @run main bug8048110
-+ */
-+
-+import sun.awt.SunToolkit;
-+
-+import javax.swing.*;
-+import javax.swing.text.Element;
-+import javax.swing.text.html.HTMLDocument;
-+import javax.swing.text.html.HTMLEditorKit;
-+import java.awt.*;
-+
-+public class bug8048110 {
-+ private static SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
-+ private static Object lock = new Object();
-+ private static boolean isRealSyncPerformed = false;
-+ private static final String htmlText = "<table width=\"100%\" cellpadding=\"10\" cellspacing=\"5\" align=\"center\">" +
-+ "<tr><th align=\"left\" bgcolor=\"#bec3c6\">Devices</th><th align=\"left\" bgcolor=\"#bec3c6\">State</th></tr>" +
-+ "<tr><td align=\"left\" bgcolor=\"#bec3c6\">PC</td><td align=\"left\" bgcolor=\"#46a055\">Ok</td></tr></table>";
-+
-+ public static void main(String[] args) throws Exception {
-+ SwingUtilities.invokeAndWait(new Runnable() {
-+ @Override
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ Thread thread = new Thread() {
-+ @Override
-+ public void run() {
-+ toolkit.realSync();
-+ synchronized (lock) {
-+ isRealSyncPerformed = true;
-+ lock.notifyAll();
-+ }
-+ }
-+ };
-+ thread.start();
-+
-+ synchronized (lock) {
-+ if (!isRealSyncPerformed) {
-+ lock.wait(5000);
-+ }
-+ }
-+
-+ if (!isRealSyncPerformed) {
-+ throw new RuntimeException("Test Failed!");
-+ }
-+ }
-+
-+ private static void createAndShowGUI() {
-+ try {
-+ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-+ } catch (Exception ex) {
-+ throw new RuntimeException(ex);
-+ }
-+ HTMLEditorKit editorKit = new HTMLEditorKit();
-+ JTextPane textPane = new JTextPane();
-+ textPane.setContentType("text/html");
-+ textPane.setEditorKit(editorKit);
-+ textPane.setText("Initial text without table");
-+
-+ JFrame frame = new JFrame("bug8048110");
-+ frame.getContentPane().add(textPane, BorderLayout.CENTER);
-+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-+ frame.setSize(500, 200);
-+ frame.setVisible(true);
-+
-+ textPane.setDocument(textPane.getEditorKit().createDefaultDocument());
-+ HTMLDocument htmlDocument = (HTMLDocument) textPane.getDocument();
-+ Element firstParagraph = findFirstElement(textPane.getDocument().getDefaultRootElement(), "p");
-+
-+ try {
-+ htmlDocument.setInnerHTML(firstParagraph, htmlText);
-+ } catch (Exception ex) {
-+ throw new RuntimeException(ex);
-+ }
-+ }
-+
-+ private static Element findFirstElement(Element e, String name) {
-+ String elementName = e.getName();
-+ if (elementName != null && elementName.equalsIgnoreCase(name)) {
-+ return e;
-+ }
-+ for (int i = 0; i < e.getElementCount(); i++) {
-+ Element result = findFirstElement(e.getElement(i), name);
-+ if (result != null) {
-+ return result;
-+ }
-+ }
-+ return null;
-+ }
-+}
-+
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,109 @@
-+/*
-+ * 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 8058120
-+ * @summary Rendering / caret errors with HTMLDocument
-+ * @author Dmitry Markov
-+ * @run main bug8058120
-+ */
-+
-+import sun.awt.SunToolkit;
-+
-+import javax.swing.*;
-+import javax.swing.text.Element;
-+import javax.swing.text.html.HTML;
-+import javax.swing.text.html.HTMLDocument;
-+import javax.swing.text.html.HTMLEditorKit;
-+import java.awt.*;
-+
-+public class bug8058120 {
-+ private static SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-+ private static HTMLDocument document = null;
-+ private static final String text = "<p id = 'ab'>ab</p>";
-+ private static final String textToInsert = "c";
-+
-+ public static void main(String[] args) {
-+ SwingUtilities.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
-+ createAndShowGUI();
-+ }
-+ });
-+
-+ toolkit.realSync();
-+
-+ SwingUtilities.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
-+ try {
-+ document.insertAfterEnd(document.getElement("ab"), textToInsert);
-+ } catch (Exception ex) {
-+ throw new RuntimeException(ex);
-+ }
-+ }
-+ });
-+
-+ toolkit.realSync();
-+
-+ SwingUtilities.invokeLater(new Runnable() {
-+ @Override
-+ public void run() {
-+ Element parent = document.getElement("ab").getParentElement();
-+ int count = parent.getElementCount();
-+ if (count != 2) {
-+ throw new RuntimeException("Test Failed! Unexpected Element count = "+count);
-+ }
-+ Element insertedElement = parent.getElement(count - 1);
-+ if (!HTML.Tag.IMPLIED.toString().equals(insertedElement.getName())) {
-+ throw new RuntimeException("Test Failed! Inserted text is not wrapped by " + HTML.Tag.IMPLIED + " tag");
-+ }
-+ }
-+ });
-+ }
-+
-+ private static void createAndShowGUI() {
-+ try {
-+ UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-+ } catch (Exception ex) {
-+ throw new RuntimeException(ex);
-+ }
-+
-+ JFrame frame = new JFrame("bug8058120");
-+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-+
-+ JEditorPane editorPane = new JEditorPane();
-+ editorPane.setContentType("text/html");
-+ editorPane.setEditorKit(new HTMLEditorKit());
-+
-+ document = (HTMLDocument) editorPane.getDocument();
-+
-+ editorPane.setText(text);
-+
-+ 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/transform/8062923/XslSubstringTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,86 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-+ */
-+
-+/**
-+ * @test
-+ * @bug 8062923 8062924
-+ * @run testng XslSubstringTest
-+ * @summary Test xsl substring function with negative, Inf and
-+ * NaN length and few other use cases
-+ */
-+
-+import java.io.StringReader;
-+import java.io.StringWriter;
-+import javax.xml.transform.Source;
-+import javax.xml.transform.Templates;
-+import javax.xml.transform.Transformer;
-+import javax.xml.transform.TransformerFactory;
-+import javax.xml.transform.stream.StreamResult;
-+import javax.xml.transform.stream.StreamSource;
-+
-+import static org.testng.Assert.assertEquals;
-+import org.testng.annotations.Test;
-+
-+public class XslSubstringTest {
-+
-+ final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><test></test>";
-+ final String xslPre = "<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='/'><t>";
-+ final String xslPost = "</t></xsl:template></xsl:stylesheet>";
-+
-+ private String testTransform(String xsl) throws Exception {
-+ //Prepare sources for transormation
-+ Source src = new StreamSource(new StringReader(xml));
-+ Source xslsrc = new StreamSource(new StringReader(xslPre + xsl + xslPost));
-+ //Create factory, template and transformer
-+ TransformerFactory tf = TransformerFactory.newInstance();
-+ Templates tmpl = tf.newTemplates(xslsrc);
-+ Transformer t = tmpl.newTransformer();
-+ //Prepare output stream
-+ StringWriter xmlResultString = new StringWriter();
-+ StreamResult xmlResultStream = new StreamResult(xmlResultString);
-+ //Transform
-+ t.transform(src, xmlResultStream);
-+ return xmlResultString.toString().trim();
-+ }
-+
-+ @Test
-+ public void test8062923() throws Exception {
-+ assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2,-1)\"/>|"),
-+ "<t>||</t>");
-+ }
-+
-+ @Test
-+ public void test8062924() throws Exception {
-+ assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2,-1 div 0)\"/>|"),
-+ "<t>||</t>");
-+ }
-+
-+ @Test
-+ public void testGeneral1() throws Exception {
-+ assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, 1)\"/>|"),
-+ "<t>|s|</t>");
-+ }
-+
-+ @Test
-+ public void testGeneral2() throws Exception {
-+ assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, 1 div 0)\"/>|"),
-+ "<t>|sdf|</t>");
-+ }
-+
-+ @Test
-+ public void testGeneral3() throws Exception {
-+ assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, -0 div 0)\"/>|"),
-+ "<t>||</t>");
-+ }
-+
-+ @Test
-+ public void testGeneral4() throws Exception {
-+ assertEquals(testTransform("|<xsl:value-of select=\"substring('asdf',2, 0 div 0)\"/>|"),
-+ "<t>||</t>");
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/jdk/net/Sockets/SupportedOptions.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8062744
-+ * @run main SupportedOptions
-+ */
-+
-+import java.net.*;
-+import java.io.IOException;
-+import jdk.net.*;
-+
-+public class SupportedOptions {
-+
-+ public static void main(String[] args) throws Exception {
-+ if (!Sockets.supportedOptions(ServerSocket.class)
-+ .contains(StandardSocketOptions.IP_TOS)) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ // Now set the option
-+ ServerSocket ss = new ServerSocket();
-+ Sockets.setOption(ss, java.net.StandardSocketOptions.IP_TOS, 128);
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/jdk/net/Sockets/Test.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,299 @@
-+/*
-+ * 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 8032808
-+ * @run main/othervm -Xcheck:jni Test
-+ * @run main/othervm/policy=policy.fail -Xcheck:jni Test fail
-+ * @run main/othervm/policy=policy.success -Xcheck:jni Test success
-+ */
-+
-+import java.net.*;
-+import java.io.IOException;
-+import java.nio.channels.*;
-+import java.util.concurrent.*;
-+import java.util.Set;
-+import jdk.net.*;
-+
-+public class Test {
-+
-+ static boolean security;
-+ static boolean success;
-+ static int udp_port;
-+ static InetAddress loop;
-+ static InetSocketAddress loopad;
-+ static SocketFlow flowIn;
-+ static SocketChannel sc;
-+ static Socket s;
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ // quick check to see if supportedOptions() working before
-+ // creating any sockets and libnet loaded
-+
-+ Sockets.supportedOptions(Socket.class);
-+
-+ security = System.getSecurityManager() != null;
-+ success = security && args[0].equals("success");
-+
-+ // Main thing is to check for JNI problems
-+ // Doesn't matter if current system does not support the option
-+ // and currently setting the option with the loopback interface
-+ // doesn't work either
-+
-+ System.out.println ("Security Manager enabled: " + security);
-+ if (security) {
-+ System.out.println ("Success expected: " + success);
-+ }
-+
-+ flowIn = SocketFlow.create()
-+ .bandwidth(1000)
-+ .priority(SocketFlow.HIGH_PRIORITY);
-+
-+ ServerSocket ss = new ServerSocket(0);
-+ int tcp_port = ss.getLocalPort();
-+ loop = InetAddress.getByName("127.0.0.1");
-+ loopad = new InetSocketAddress(loop, tcp_port);
-+
-+ DatagramSocket dg = new DatagramSocket(0);
-+ udp_port = dg.getLocalPort();
-+
-+ // If option not available, end test
-+ Set<SocketOption<?>> options = Sockets.supportedOptions(
-+ DatagramSocket.class
-+ );
-+
-+ if (!options.contains(ExtendedSocketOptions.SO_FLOW_SLA)) {
-+ System.out.println("SO_FLOW_SLA not supported");
-+ return;
-+ }
-+
-+ s = new Socket("127.0.0.1", tcp_port);
-+ sc = SocketChannel.open();
-+ sc.connect (new InetSocketAddress("127.0.0.1", tcp_port));
-+
-+ // Do some standard options tests first. Since JDK 8 doesn't have java.net API
-+ Sockets.setOption(s, StandardSocketOptions.SO_SNDBUF, 8000);
-+ System.out.println ("Set SO_SNDBUF to 8000\ngetting returns: ");
-+ System.out.println (Sockets.getOption(s, StandardSocketOptions.SO_SNDBUF));
-+
-+ Sockets.setOption(ss, StandardSocketOptions.SO_RCVBUF, 5000);
-+ System.out.println ("Set SO_RCVBUF to 5000\ngetting returns: ");
-+ System.out.println (Sockets.getOption(s, StandardSocketOptions.SO_RCVBUF));
-+
-+ try {
-+ Sockets.setOption(ss, StandardSocketOptions.TCP_NODELAY, true);
-+ throw new RuntimeException("TCP_NODELAY should not be supported for ServerSocket");
-+ } catch (UnsupportedOperationException e) {}
-+ try {
-+ Sockets.setOption(dg, StandardSocketOptions.IP_MULTICAST_LOOP, true);
-+ throw new RuntimeException("IP_MULTICAST_LOOP should not be supported for DatagramSocket");
-+ } catch (UnsupportedOperationException e) {}
-+
-+ MulticastSocket mc0 = new MulticastSocket(0);
-+ Sockets.setOption(mc0, StandardSocketOptions.IP_MULTICAST_LOOP, true);
-+ System.out.println ("Expect true: " + Sockets.getOption(mc0, StandardSocketOptions.IP_MULTICAST_LOOP));
-+
-+ // Now the specific tests for SO_FLOW_SLA
-+
-+ doTest1();
-+ doTest2();
-+ doTest3();
-+ doTest4();
-+ doTest5();
-+ doTest6();
-+ doTest7();
-+ doTest8();
-+ }
-+
-+ static void doTest1() throws Exception {
-+ try {
-+ Sockets.setOption(s, ExtendedSocketOptions.SO_FLOW_SLA, flowIn);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest2() throws Exception {
-+ try {
-+ Sockets.getOption(s, ExtendedSocketOptions.SO_FLOW_SLA);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest3() throws Exception {
-+ try {
-+ sc.setOption(ExtendedSocketOptions.SO_FLOW_SLA, flowIn);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest4() throws Exception {
-+ try {
-+ sc.getOption(ExtendedSocketOptions.SO_FLOW_SLA);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest5() throws Exception {
-+ try {
-+ DatagramSocket dg1 = new DatagramSocket(0);
-+ dg1.connect(loop, udp_port);
-+ Sockets.setOption(dg1, ExtendedSocketOptions.SO_FLOW_SLA, flowIn);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest6() throws Exception {
-+ try {
-+ DatagramChannel dg2 = DatagramChannel.open();
-+ dg2.bind(new InetSocketAddress(loop, 0));
-+ dg2.connect(new InetSocketAddress(loop, udp_port));
-+ dg2.setOption(ExtendedSocketOptions.SO_FLOW_SLA, flowIn);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest7() throws Exception {
-+ try {
-+ MulticastSocket mc1 = new MulticastSocket(0);
-+ mc1.connect(loop, udp_port);
-+ Sockets.setOption(mc1, ExtendedSocketOptions.SO_FLOW_SLA, flowIn);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+
-+ static void doTest8() throws Exception {
-+ try {
-+ AsynchronousSocketChannel asc = AsynchronousSocketChannel.open();
-+ Future<Void> f = asc.connect(loopad);
-+ f.get();
-+ asc.setOption(ExtendedSocketOptions.SO_FLOW_SLA, flowIn);
-+ if (security && !success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (SecurityException e) {
-+ if (success) {
-+ throw new RuntimeException("Test failed");
-+ }
-+ } catch (UnsupportedOperationException e) {
-+ System.out.println (e);
-+ } catch (IOException e) {
-+ // Probably a permission error, but we're not
-+ // going to check unless a specific permission exception
-+ // is defined.
-+ System.out.println (e);
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/jdk/net/Sockets/policy.fail Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,4 @@
-+grant {
-+ permission java.net.SocketPermission "127.0.0.1", "connect,accept" ;
-+ permission java.net.SocketPermission "localhost", "listen" ;
-+};
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/jdk/net/Sockets/policy.success Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,6 @@
-+grant {
-+ permission java.net.SocketPermission "127.0.0.1", "connect,accept" ;
-+ permission java.net.SocketPermission "localhost", "listen" ;
-+ permission jdk.net.NetworkPermission "setOption.SO_FLOW_SLA";
-+ permission jdk.net.NetworkPermission "getOption.SO_FLOW_SLA";
-+};
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,115 @@
-+/*
-+ * 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 8058473
-+ @summary "Comparison method violates its general contract" when using Clipboard
-+ Ensure that DataTransferer.DataFlavorComparator conforms to Comparator contract
-+ @author Anton Nashatyrev
-+ @run main DataFlavorComparatorTest1
-+*/
-+import sun.awt.datatransfer.DataTransferer;
-+
-+import java.awt.datatransfer.DataFlavor;
-+import java.util.Comparator;
-+
-+public class DataFlavorComparatorTest1 {
-+
-+ public static void main(String[] args) throws Exception {
-+ String[] mimes = new String[] {
-+ "text/plain",
-+ "text/plain; charset=unicode",
-+ "text/plain; charset=cp1251",
-+ "text/plain; charset=unicode; class=java.io.InputStream",
-+ "text/plain; charset=unicode; class=java.io.Serializable",
-+ "text/plain; charset=unicode; class=java.lang.Object",
-+ "text/plain; class=java.lang.String",
-+ "text/plain; class=java.io.Reader",
-+ "text/plain; class=java.lang.Object",
-+ "text/html",
-+ "text/html; charset=unicode",
-+ "text/html; charset=cp1251",
-+ "text/html; charset=unicode; class=java.io.InputStream",
-+ "text/html; charset=unicode; class=java.io.Serializable",
-+ "text/html; charset=unicode; class=java.lang.Object",
-+ "text/html; class=java.lang.String",
-+ "text/html; class=java.io.Reader",
-+ "text/html; class=java.lang.Object",
-+ "text/unknown",
-+ "text/unknown; charset=unicode",
-+ "text/unknown; charset=cp1251",
-+ "text/unknown; charset=unicode; class=java.io.InputStream",
-+ "text/unknown; charset=unicode; class=java.io.Serializable",
-+ "text/unknown; charset=unicode; class=java.lang.Object",
-+ "text/unknown; class=java.lang.String",
-+ "text/unknown; class=java.io.Reader",
-+ "text/unknown; class=java.lang.Object",
-+ "application/unknown; class=java.io.InputStream",
-+ "application/unknown; class=java.lang.Object",
-+ "application/unknown",
-+ "application/x-java-jvm-local-objectref; class=java.io.InputStream",
-+ "application/x-java-jvm-local-objectref; class=java.lang.Object",
-+ "application/x-java-jvm-local-objectref",
-+ "unknown/flavor",
-+ "unknown/flavor; class=java.io.InputStream",
-+ "unknown/flavor; class=java.lang.Object",
-+ };
-+
-+ DataFlavor[] flavors = new DataFlavor[mimes.length];
-+ for (int i = 0; i < flavors.length; i++) {
-+ flavors[i] = new DataFlavor(mimes[i]);
-+ }
-+
-+ testComparator(new DataTransferer.DataFlavorComparator(true), flavors);
-+ testComparator(new DataTransferer.DataFlavorComparator(false), flavors);
-+
-+ }
-+
-+ private static void testComparator(Comparator cmp, DataFlavor[] flavs)
-+ throws ClassNotFoundException {
-+
-+ for (DataFlavor x: flavs) {
-+ for (DataFlavor y: flavs) {
-+ if (Math.signum(cmp.compare(x,y)) != -Math.signum(cmp.compare(y,x))) {
-+ throw new RuntimeException("Antisymmetry violated: " + x + ", " + y);
-+ }
-+ if (cmp.compare(x,y) == 0 && !x.equals(y)) {
-+ throw new RuntimeException("Equals rule violated: " + x + ", " + y);
-+ }
-+ for (DataFlavor z: flavs) {
-+ if (cmp.compare(x,y) == 0) {
-+ if (Math.signum(cmp.compare(x, z)) != Math.signum(cmp.compare(y, z))) {
-+ throw new RuntimeException("Transitivity (1) violated: " + x + ", " + y + ", " + z);
-+ }
-+ } else {
-+ if (Math.signum(cmp.compare(x, y)) == Math.signum(cmp.compare(y, z))) {
-+ if (Math.signum(cmp.compare(x, y)) != Math.signum(cmp.compare(x, z))) {
-+ throw new RuntimeException("Transitivity (2) violated: " + x + ", " + y + ", " + z);
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+ }
-+}
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Fri Apr 10 09:21:28 2015 -0700
-@@ -277,9 +277,6 @@
- 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();
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/misc/ProxyGenerator/SaveProxyClassFileTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,69 @@
-+/*
-+ * 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 8059563
-+ * @summary ProxyGenerator should create intermediate directories
-+ * for the generated class file
-+ * @build SaveProxyClassFileTest
-+ * @run main/othervm -Dsun.misc.ProxyGenerator.saveGeneratedFiles=true SaveProxyClassFileTest
-+ */
-+
-+import java.io.File;
-+import sun.misc.ProxyGenerator;
-+
-+public class SaveProxyClassFileTest {
-+
-+ static final File dir1 = new File("a");
-+ static final File dir2 = new File(dir1, "b");
-+ static final File cf = new File(dir2, "c.class");
-+
-+ public static void main(String[] args) throws Throwable {
-+ // remove the files in case they were left from
-+ // the previous run
-+ deleteFiles();
-+
-+ try {
-+ ProxyGenerator.generateProxyClass("a.b.c",
-+ new Class[] {Inf.class});
-+
-+ if (!cf.exists()) {
-+ throw new RuntimeException(cf + " wasn't created");
-+ }
-+ } finally {
-+ deleteFiles();
-+ }
-+ }
-+
-+ static interface Inf {
-+ }
-+
-+ /**
-+ * Removes generated file and directories
-+ */
-+ private static void deleteFiles() {
-+ cf.delete();
-+ dir2.delete();
-+ dir1.delete();
-+ }
-+}
---- ./jdk/test/sun/net/www/http/HttpClient/StreamingRetry.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/net/www/http/HttpClient/StreamingRetry.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,8 +23,8 @@
-
- /*
- * @test
-- * @bug 6672144
-- * @summary HttpURLConnection.getInputStream sends POST request after failed chunked send
-+ * @bug 6672144 8050983
-+ * @summary Do not retry failed request with a streaming body.
- */
-
- import java.net.HttpURLConnection;
-@@ -33,31 +33,41 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
-+import static java.lang.System.out;
-
- public class StreamingRetry implements Runnable {
- static final int ACCEPT_TIMEOUT = 20 * 1000; // 20 seconds
-- ServerSocket ss;
-+ volatile ServerSocket ss;
-
-- public static void main(String[] args) throws IOException {
-+ public static void main(String[] args) throws Exception {
- (new StreamingRetry()).instanceMain();
- }
-
-- void instanceMain() throws IOException {
-- test();
-+ void instanceMain() throws Exception {
-+ out.println("Test with default method");
-+ test(null);
-+ out.println("Test with POST method");
-+ test("POST");
-+ out.println("Test with PUT method");
-+ test("PUT");
-+
- if (failed > 0) throw new RuntimeException("Some tests failed");
- }
-
-- void test() throws IOException {
-+ void test(String method) throws Exception {
- ss = new ServerSocket(0);
- ss.setSoTimeout(ACCEPT_TIMEOUT);
- int port = ss.getLocalPort();
-
-- (new Thread(this)).start();
-+ Thread otherThread = new Thread(this);
-+ otherThread.start();
-
- try {
- URL url = new URL("http://localhost:" + port + "/");
- HttpURLConnection uc = (HttpURLConnection) url.openConnection();
- uc.setDoOutput(true);
-+ if (method != null)
-+ uc.setRequestMethod(method);
- uc.setChunkedStreamingMode(4096);
- OutputStream os = uc.getOutputStream();
- os.write("Hello there".getBytes());
-@@ -68,6 +78,7 @@
- //expected.printStackTrace();
- } finally {
- ss.close();
-+ otherThread.join();
- }
- }
-
-@@ -79,7 +90,7 @@
- ss.close();
- fail("The server shouldn't accept a second connection");
- } catch (IOException e) {
-- //OK, the clien will close the server socket if successfull
-+ //OK, the client will close the server socket if successful
- }
- }
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/net/www/protocol/http/B8012625.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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 8012625
-+ * @run main B8012625
-+ */
-+
-+import java.net.*;
-+import java.io.*;
-+
-+import java.net.*;
-+import java.io.*;
-+import java.util.concurrent.*;
-+import com.sun.net.httpserver.*;
-+
-+public class B8012625 implements HttpHandler {
-+
-+ public static void main (String[] args) throws Exception {
-+ B8012625 test = new B8012625();
-+ test.run();
-+ }
-+
-+ public void run() throws Exception {
-+ String u = "http://127.0.0.1:" + port + "/foo";
-+ URL url = new URL(u);
-+ HttpURLConnection uc = (HttpURLConnection)url.openConnection();
-+ uc.setDoOutput(true);
-+ uc.setRequestMethod("POST");
-+ uc.addRequestProperty("Expect", "100-Continue");
-+ //uc.setFixedLengthStreamingMode(256);
-+ System.out.println ("Client: getting outputstream");
-+ long before = System.currentTimeMillis();
-+ OutputStream os = uc.getOutputStream();
-+ long after = System.currentTimeMillis();
-+ System.out.println ("Client: writing to outputstream");
-+ byte[] buf = new byte[256];
-+ os.write(buf);
-+ System.out.println ("Client: done writing ");
-+ int r = uc.getResponseCode();
-+ System.out.println ("Client: received response code " + r);
-+ server.stop(1);
-+ ex.shutdownNow();
-+ if (after - before >= 5000) {
-+ throw new RuntimeException("Error: 5 second delay seen");
-+ }
-+ }
-+
-+ int port;
-+ HttpServer server;
-+ ExecutorService ex;
-+
-+ public B8012625 () throws Exception {
-+ server = HttpServer.create(new InetSocketAddress(0), 10);
-+ HttpContext ctx = server.createContext("/", this);
-+ ex = Executors.newFixedThreadPool(5);
-+ server.setExecutor(ex);
-+ server.start();
-+ port = server.getAddress().getPort();
-+ }
-+
-+ public void handle(HttpExchange ex) throws IOException {
-+ String s = ex.getRequestMethod();
-+ if (!s.equals("POST")) {
-+ ex.getResponseHeaders().set("Allow", "POST");
-+ ex.sendResponseHeaders(500, -1);
-+ ex.close();
-+ return;
-+ }
-+ System.out.println ("Server: reading request body");
-+ InputStream is = ex.getRequestBody();
-+ // read request
-+ byte[] buf = new byte [1024];
-+ while (is.read(buf) != -1) ;
-+ is.close();
-+ ex.sendResponseHeaders(200, -1);
-+ ex.close();
-+ }
-+}
---- ./jdk/test/sun/nio/cs/TestIBMBugs.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/nio/cs/TestIBMBugs.java Fri Apr 10 09:21:28 2015 -0700
-@@ -147,16 +147,17 @@
- }
-
- private static void bug6569191 () throws Exception {
-- byte[] bs = new byte[] { (byte)0x81, (byte)0xad,
-- (byte)0x81, (byte)0xae,
-- (byte)0x81, (byte)0xaf,
-- (byte)0x81, (byte)0xb0,
-- (byte)0x85, (byte)0x81,
-- (byte)0x85, (byte)0x87,
-- (byte)0x85, (byte)0xe0,
-- (byte)0x85, (byte)0xf0 };
-+ byte[] bs = new byte[] { (byte)0x81, (byte)0xad, // fffd ff6d
-+ (byte)0x81, (byte)0xae, // fffd ff6e
-+ (byte)0x81, (byte)0xaf, // fffd ff6f
-+ (byte)0x81, (byte)0xb0, // fffd ff70
-+ (byte)0x85, (byte)0x81, // fffd ->
-+ (byte)0x85, (byte)0x87, // 2266 ->
-+ (byte)0x85, (byte)0xe0, // 32a4 ->
-+ (byte)0x85, (byte)0xf0 };// 7165 fffd
- String s = new String(bs, "Cp943");
-- if (!"\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd"
-+ // see DoubleByte for how the unmappables are handled
-+ if (!"\ufffd\uff6d\ufffd\uff6e\ufffd\uff6f\ufffd\uff70\ufffd\u2266\u32a4\u7165\ufffd"
- .equals(s))
- throw new Exception("Cp943 failed");
- }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/nio/cs/TestUnmappable.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,89 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8008386
-+ * @summary (cs) Unmappable leading should be decoded to replacement.
-+ * Tests for Shift_JIS and MS932 decoding
-+ * @run main TestUnmappable
-+ */
-+
-+import java.nio.*;
-+import java.nio.charset.*;
-+
-+public class TestUnmappable {
-+ public static void main(String args[]) throws Exception {
-+
-+ // illegal leading character test
-+ byte[][] inputBytes = {
-+ // Shift_JIS
-+ {(byte)0xce, (byte)0xa0, (byte)0xce, (byte)0x7a},
-+ // MS932
-+ {(byte)0x3c, (byte)0x21, (byte)0x2d, (byte)0x2d,
-+ (byte)0xe5, (byte)0xaf, (byte)0xbe, (byte)0xe5,
-+ (byte)0xbf, (byte)0x9c, (byte)0x2d, (byte)0x2d,
-+ (byte)0x3e, (byte)0xd, (byte)0xa },
-+ {(byte)0x81, (byte)0xad},
-+ // PCK
-+ {(byte)0xef, (byte)0x90},
-+ {(byte)0x91, (byte)0xfd}
-+ };
-+
-+ String[] charsets = { "Shift_JIS", "MS932", "MS932", "PCK", "PCK" };
-+ String[] expectedStrings = {
-+ // Shift_JIS
-+ "0xce 0x3f 0xce 0x7a ",
-+ // MS932
-+ "0x3c 0x21 0x2d 0x2d 0xe5 0xaf 0xbe 0xe5 0xbf " +
-+ "0x3f 0x2d 0x2d 0x3e 0xd 0xa ",
-+ "0x3f 0xad ",
-+ // PCK
-+ "0x3f 0x3f ",
-+ "0x3f "};
-+
-+ for (int i = 0; i < charsets.length; i++) {
-+ String ret = new String(inputBytes[i], charsets[i]);
-+ System.out.println(charsets[i]);
-+ System.out.println("Expected:" + expectedStrings[i]);
-+ String bString = getByteString(ret.getBytes(Charset.forName(charsets[i])));
-+ if (expectedStrings[i].length() != bString.length()
-+ || ! expectedStrings[i].equals(bString)){
-+ throw new Exception("ByteToChar for " + charsets[i]
-+ + " does not work correctly.\n" +
-+ "Expected: " + expectedStrings[i] + "\n" +
-+ "Received: " + bString);
-+ }
-+ }
-+ }
-+
-+ private static String getByteString(byte[] bytes) {
-+ StringBuffer sb = new StringBuffer();
-+ for (int i = 0; i < bytes.length; i++) {
-+ sb.append("0x" + Integer.toHexString((int)(bytes[i] & 0xFF)) + " ");
-+ }
-+ return sb.toString();
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/krb5/EncTypeTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8058608
-+ * @summary JVM crash during Kerberos logins using des3-cbc-md5 on OSX
-+ * @compile -XDignore.symbol.file EncTypeTest.java
-+ * @run main/othervm EncTypeTest
-+ */
-+
-+import java.io.File;
-+import java.io.FileOutputStream;
-+import sun.security.krb5.Config;
-+import sun.security.krb5.Credentials;
-+import sun.security.krb5.PrincipalName;
-+import sun.security.krb5.internal.ccache.CredentialsCache;
-+
-+public class EncTypeTest {
-+ public static void main(String[] args) throws Exception {
-+ File f = new File("krb5-8058608.conf");
-+ try (FileOutputStream fos = new FileOutputStream(f)) {
-+ fos.write(
-+ "[libdefaults]\ndefault_tkt_enctypes = des3-cbc-md5".getBytes("UTF-8"));
-+ }
-+ f.deleteOnExit();
-+ System.setProperty("java.security.krb5.conf", "krb5-8058608.conf");
-+ Config.refresh();
-+ sun.security.krb5.Credentials.acquireTGTFromCache(null,null);
-+
-+ }
-+}
---- ./jdk/test/sun/security/krb5/ParseConfig.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/krb5/ParseConfig.java Fri Apr 10 09:21:28 2015 -0700
-@@ -22,7 +22,7 @@
- */
- /*
- * @test
-- * @bug 6319046
-+ * @bug 6319046 8055045
- * @run main/othervm ParseConfig
- * @summary Problem with parsing krb5.conf
- */
-@@ -31,7 +31,8 @@
-
- public class ParseConfig {
- public static void main(String[] args) throws Exception {
-- System.setProperty("java.security.krb5.conf", System.getProperty("test.src", ".") +"/krb5.conf");
-+ System.setProperty("java.security.krb5.conf",
-+ System.getProperty("test.src", ".") + "/krb5.conf");
- Config config = Config.getInstance();
- config.listTable();
-
-@@ -43,5 +44,11 @@
- expected + "\"");
- }
- }
-+
-+ // JDK-8055045: IOOBE when reading an empty value
-+ config.getDefault("empty1", "NOVAL.COM");
-+ config.getDefault("empty2", "NOVAL.COM");
-+ config.getDefault("quote1", "NOVAL.COM");
-+ config.getDefault("quote2", "NOVAL.COM");
- }
- }
---- ./jdk/test/sun/security/krb5/auto/DynamicKeytab.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/krb5/auto/DynamicKeytab.java Fri Apr 10 09:21:28 2015 -0700
-@@ -110,11 +110,13 @@
- throw new Exception("Should not success");
- } catch (GSSException gsse) {
- System.out.println(gsse);
-- KrbException ke = (KrbException)gsse.getCause();
-- if (ke.returnCode() != Krb5.KRB_AP_ERR_BADKEYVER) {
-- throw new Exception("Not expected failure code: " +
-- ke.returnCode());
-- }
-+ // Since 7197159, different kvno is accepted, this return code
-+ // will never be thrown out again.
-+ //KrbException ke = (KrbException)gsse.getCause();
-+ //if (ke.returnCode() != Krb5.KRB_AP_ERR_BADKEYVER) {
-+ // throw new Exception("Not expected failure code: " +
-+ // ke.returnCode());
-+ //}
- }
-
- // Test 8: an empty KDC means revoke all
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/krb5/auto/KeyPermissions.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,56 @@
-+/*
-+ * 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 8004488
-+ * @summary wrong permissions checked in krb5
-+ * @compile -XDignore.symbol.file KeyPermissions.java
-+ * @run main/othervm KeyPermissions
-+ */
-+
-+import java.security.AccessControlException;
-+import java.security.Permission;
-+import javax.security.auth.PrivateCredentialPermission;
-+import sun.security.jgss.GSSUtil;
-+
-+public class KeyPermissions extends SecurityManager {
-+
-+ @Override
-+ public void checkPermission(Permission perm) {
-+ if (perm instanceof PrivateCredentialPermission) {
-+ if (!perm.getName().startsWith("javax.security.auth.kerberos.")) {
-+ throw new AccessControlException(
-+ "I don't like this", perm);
-+ }
-+ }
-+ }
-+
-+ public static void main(String[] args) throws Exception {
-+ System.setSecurityManager(new KeyPermissions());
-+ new OneKDC(null).writeJAASConf();
-+ Context s = Context.fromJAAS("server");
-+ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
-+ }
-+}
-+
---- ./jdk/test/sun/security/krb5/auto/KeyTabCompat.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/krb5/auto/KeyTabCompat.java Fri Apr 10 09:21:28 2015 -0700
-@@ -24,6 +24,7 @@
- /*
- * @test
- * @bug 6894072
-+ * @bug 8004488
- * @compile -XDignore.symbol.file KeyTabCompat.java
- * @run main/othervm KeyTabCompat
- * @summary always refresh keytab
-@@ -70,21 +71,8 @@
- s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
- s.status();
-
-- if (s.s().getPrivateCredentials(KerberosKey.class).size() != 1) {
-- throw new Exception("There should be one KerberosKey");
-+ if (s.s().getPrivateCredentials(KerberosKey.class).size() != 0) {
-+ throw new Exception("There should be no KerberosKey");
- }
--
-- Thread.sleep(2000); // make sure ktab timestamp is different
--
-- kdc.addPrincipal(OneKDC.SERVER, "pass2".toCharArray());
-- kdc.writeKtab(OneKDC.KTAB);
--
-- Context.handshake(c, s);
-- s.status();
--
-- if (s.s().getPrivateCredentials(KerberosKey.class).size() != 1) {
-- throw new Exception("There should be only one KerberosKey");
- }
--
- }
--}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/krb5/auto/KvnoNA.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,72 @@
-+/*
-+ * 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 7197159
-+ * @compile -XDignore.symbol.file KvnoNA.java
-+ * @run main/othervm KvnoNA
-+ * @summary accept different kvno if there no match
-+ */
-+
-+import org.ietf.jgss.GSSException;
-+import sun.security.jgss.GSSUtil;
-+import sun.security.krb5.KrbException;
-+import sun.security.krb5.PrincipalName;
-+import sun.security.krb5.internal.ktab.KeyTab;
-+import sun.security.krb5.internal.Krb5;
-+
-+public class KvnoNA {
-+
-+ public static void main(String[] args)
-+ throws Exception {
-+
-+ OneKDC kdc = new OneKDC(null);
-+ kdc.writeJAASConf();
-+
-+ // In KDC, it's 2
-+ char[] pass = "pass2".toCharArray();
-+ kdc.addPrincipal(OneKDC.SERVER, pass);
-+
-+ // In ktab, kvno is 1 or 3, 3 has the same password
-+ KeyTab ktab = KeyTab.create(OneKDC.KTAB);
-+ PrincipalName p = new PrincipalName(
-+ OneKDC.SERVER+"@"+OneKDC.REALM, PrincipalName.KRB_NT_SRV_HST);
-+ ktab.addEntry(p, "pass1".toCharArray(), 1, true);
-+ ktab.addEntry(p, "pass2".toCharArray(), 3, true);
-+ ktab.save();
-+
-+ Context c, s;
-+
-+ c = Context.fromUserPass("dummy", "bogus".toCharArray(), false);
-+ s = Context.fromJAAS("server");
-+
-+ c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-+ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
-+
-+ Context.handshake(c, s);
-+
-+ s.dispose();
-+ c.dispose();
-+ }
-+}
---- ./jdk/test/sun/security/krb5/auto/MoreKvno.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/krb5/auto/MoreKvno.java Fri Apr 10 09:21:28 2015 -0700
-@@ -23,8 +23,7 @@
-
- /*
- * @test
-- * @bug 6893158
-- * @bug 6907425
-+ * @bug 6893158 6907425 7197159
- * @run main/othervm MoreKvno
- * @summary AP_REQ check should use key version number
- */
-@@ -69,11 +68,13 @@
- go(OneKDC.SERVER, "com.sun.security.jgss.krb5.accept", pass);
- throw new Exception("This test should fail");
- } catch (GSSException gsse) {
-- KrbException ke = (KrbException)gsse.getCause();
-- if (ke.returnCode() != Krb5.KRB_AP_ERR_BADKEYVER) {
-- throw new Exception("Not expected failure code: " +
-- ke.returnCode());
-- }
-+ // Since 7197159, different kvno is accepted, this return code
-+ // will never be thrown out again.
-+ //KrbException ke = (KrbException)gsse.getCause();
-+ //if (ke.returnCode() != Krb5.KRB_AP_ERR_BADKEYVER) {
-+ // throw new Exception("Not expected failure code: " +
-+ // ke.returnCode());
-+ //}
- }
- }
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/krb5/ccache/DefaultFile.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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 8054817
-+ * @summary File ccache only recognizes Linux and Solaris defaults
-+ */
-+
-+import sun.security.krb5.internal.ccache.FileCredentialsCache;
-+
-+public class DefaultFile {
-+ public static void main(String[] args) throws Exception {
-+ // There are 2 cases where default ccache name is not
-+ // /tmp/krb5cc_uid.
-+ if (System.getenv("KRB5CCNAME") != null) {
-+ return;
-+ }
-+ if (System.getProperty("os.name").startsWith("Windows")) {
-+ return;
-+ }
-+ String name = FileCredentialsCache.getDefaultCacheName();
-+ if (!name.startsWith("/tmp/krb5cc_")) {
-+ throw new Exception("default name is " + name);
-+ }
-+ }
-+}
---- ./jdk/test/sun/security/krb5/krb5.conf Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/krb5/krb5.conf Fri Apr 10 09:21:28 2015 -0700
-@@ -27,3 +27,9 @@
- }
- }
-
-+ NOVAL.COM = {
-+ empty1 =
-+ empty2 =.
-+ quote1 = "
-+ quote2 = '
-+ }
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigShortPath.java Fri Apr 10 09:21:28 2015 -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
-@@ -22,8 +22,8 @@
- */
- /**
- * @test
-- * @bug 6581254 6986789
-- * @summary Allow '~' and '+' in config file
-+ * @bug 6581254 6986789 7196009 8062170
-+ * @summary Allow '~', '+', and quoted paths in config file
- * @author Valerie Peng
- */
-
-@@ -33,7 +33,9 @@
-
- public class ConfigShortPath {
-
-- private static final String[] configNames = { "csp.cfg", "cspPlus.cfg" };
-+ private static final String[] configNames = {
-+ "csp.cfg", "cspPlus.cfg", "cspSpace.cfg", "cspQuotedPath.cfg"
-+ };
-
- public static void main(String[] args) throws Exception {
- Constructor cons = null;
-@@ -53,12 +55,22 @@
- Object obj = cons.newInstance(configFile);
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getCause();
-+ System.out.println(cause);
- if (cause instanceof ProviderException) {
-- String causeMsg = cause.getCause().getMessage();
-- // Indicate failure if due to parsing config
-- if (causeMsg.indexOf("Unexpected token") != -1) {
-- throw (ProviderException) cause;
-+ while ((cause = cause.getCause()) != null) {
-+ System.out.println(cause);
-+ String causeMsg = cause.getMessage();
-+ // Indicate failure if due to parsing config
-+ if (causeMsg.indexOf("Unexpected") != -1) {
-+ throw (ProviderException) cause;
-+ }
- }
-+ // Consider the test passes if the exception is
-+ // thrown after parsing, i.e. due to the absolute
-+ // path requirement or the non-existent path.
-+ } else {
-+ // unexpected exception
-+ throw new RuntimeException("Unexpected Exception", cause);
- }
- }
- }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/pkcs11/Provider/cspQuotedPath.cfg Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,6 @@
-+showInfo = false
-+name=GemPlusPKCS11
-+library="C:\\Program Files (x86)\\Gemalto\\Classic Client\\BIN\\gclib.dll"
-+attributes(*,CKO_PRIVATE_KEY,*) = {
-+ CKA_SIGN = true
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/pkcs11/Provider/cspSpace.cfg Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,5 @@
-+showInfo = false
-+name = test
-+library = C:\pki DLL\x64\acpkcs211.dll
-+
-+
---- ./jdk/test/sun/security/smartcardio/TestDirect.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/smartcardio/TestDirect.java Fri Apr 10 09:21:28 2015 -0700
-@@ -30,6 +30,7 @@
-
- // This test requires special hardware.
-
-+import java.util.List;
- import javax.smartcardio.Card;
- import javax.smartcardio.CardTerminal;
- import javax.smartcardio.CardTerminals;
-@@ -38,8 +39,12 @@
- 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);
-+ List<CardTerminal> cardTerminals = terminalFactory.terminals().list();
-+ System.out.println("Terminals: " + cardTerminals);
-+ if (cardTerminals.isEmpty()) {
-+ throw new Exception("No card terminals available");
-+ }
-+ CardTerminal cardTerminal = cardTerminals.get(0);
- Card card = cardTerminal.connect("DIRECT");
- card.disconnect(true);
-
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * 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
-@@ -146,14 +146,14 @@
- "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2" };
-
- for (String protocol : protocols) {
-- log("Testing " + protocol);
- /*
- * Run the tests with direct and indirect buffers.
- */
-- SSLEngineBadBufferArrayAccess test =
-- new SSLEngineBadBufferArrayAccess(protocol);
-- test.runTest(true);
-- test.runTest(false);
-+ log("Testing " + protocol + ":true");
-+ new SSLEngineBadBufferArrayAccess(protocol).runTest(true);
-+
-+ log("Testing " + protocol + ":false");
-+ new SSLEngineBadBufferArrayAccess(protocol).runTest(false);
- }
-
- System.out.println("Test Passed.");
-@@ -287,18 +287,27 @@
- if (serverClose) {
- serverEngine.closeOutbound();
- }
-+ }
-+
-+ if (closed && isEngineClosed(serverEngine)) {
- serverIn.flip();
-
- /*
- * A sanity check to ensure we got what was sent.
- */
- if (serverIn.remaining() != clientMsg.length) {
-- throw new Exception("Client: Data length error");
-+ throw new Exception("Client: Data length error -" +
-+ " IF THIS FAILS, PLEASE REPORT THIS TO THE" +
-+ " SECURITY TEAM. WE HAVE BEEN UNABLE TO" +
-+ " RELIABLY DUPLICATE.");
- }
-
- for (int i = 0; i < clientMsg.length; i++) {
- if (clientMsg[i] != serverIn.get()) {
-- throw new Exception("Client: Data content error");
-+ throw new Exception("Client: Data content error -" +
-+ " IF THIS FAILS, PLEASE REPORT THIS TO THE" +
-+ " SECURITY TEAM. WE HAVE BEEN UNABLE TO" +
-+ " RELIABLY DUPLICATE.");
- }
- }
- serverIn.compact();
---- ./jdk/test/sun/security/tools/keytool/ListKeychainStore.sh Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/ListKeychainStore.sh Fri Apr 10 09:21:28 2015 -0700
-@@ -22,7 +22,7 @@
- #
-
- # @test
--# @bug 7133495
-+# @bug 7133495 8041740
- # @summary [macosx] KeyChain KeyStore implementation retrieves only one private key entry
-
- if [ "${TESTJAVA}" = "" ] ; then
-@@ -49,8 +49,10 @@
- KEYTOOL="${TESTJAVA}/bin/keytool -storetype KeychainStore -keystore NONE -storepass $PWD"
- TEMPORARY_P12="$TESTCLASSES/7133495.p12"
- TEMPORARY_KC="$TESTCLASSES/7133495.keychain"
-+TEMPORARY_LIST="$TESTCLASSES/7133495.tmp"
- CLEANUP_P12="rm -f $TEMPORARY_P12"
- CLEANUP_KC="security delete-keychain $TEMPORARY_KC"
-+CLEANUP_LIST="rm -f $TEMPORARY_LIST"
-
- # Count the number of private key entries in the Keychain keystores
-
-@@ -115,6 +117,15 @@
- fi
- echo "Imported keypairs from PKCS12 keystore into the keychain"
-
-+# Adjust the keychain search order
-+
-+echo "\"$TEMPORARY_KC\"" > $TEMPORARY_LIST
-+security list-keychains >> $TEMPORARY_LIST
-+security list-keychains -s `xargs < ${TEMPORARY_LIST}`
-+`$CLEANUP_LIST`
-+echo "Temporary keychain search order:"
-+security list-keychains
-+
- # Recount the number of private key entries in the Keychain keystores
-
- COUNT=`$KEYTOOL -list | grep PrivateKeyEntry | wc -l`
---- ./jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java Fri Apr 10 09:21:28 2015 -0700
-@@ -187,6 +187,9 @@
- in = new FileInputStream(new File(PATH, "cert4.crt"));
- X509Certificate cert4 = (X509Certificate)cf.generateCertificate(in);
- in.close();
-+ in = new FileInputStream(new File(PATH, "cert5.crt"));
-+ X509Certificate cert5 = (X509Certificate)cf.generateCertificate(in);
-+ in.close();
-
- HostnameChecker checker = HostnameChecker.getInstance(
- HostnameChecker.TYPE_TLS);
-@@ -202,6 +205,9 @@
- check(checker, "5.6.7.8", cert3, true);
- check(checker, "foo.bar.com", cert4, true);
- check(checker, "altfoo.bar.com", cert4, true);
-+ check(checker, "2001:db8:3c4d:15::1a2f:1a2b", cert5, true);
-+ check(checker, "2001:0db8:3c4d:0015:0000:0000:1a2f:1a2b", cert5, true);
-+ check(checker, "2002:db8:3c4d:15::1a2f:1a2b", cert5, false);
-
- checker = HostnameChecker.getInstance(
- HostnameChecker.TYPE_LDAP);
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/security/util/HostnameMatcher/cert5.crt Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,24 @@
-+-----BEGIN CERTIFICATE-----
-+MIIECDCCAvCgAwIBAgIJAJaBmuUlfY8sMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
-+VQQGEwJVUzETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU29tZS1DaXR5
-+MSowKAYDVQQKDCFVbmNvbmZpZ3VyZWQgT3BlblNTTCBJbnN0YWxsYXRpb24xEDAO
-+BgNVBAsMB3NlY3Rpb24xMDAuBgNVBAMMJzIwMDE6MGRiODozYzRkOjAwMTU6MDAw
-+MDowMDAwOjFhMmY6MWEyYjAeFw0xNTAyMTAxODMzMjBaFw0xNTAzMTIxODMzMjBa
-+MIGmMQswCQYDVQQGEwJVUzETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJ
-+U29tZS1DaXR5MSowKAYDVQQKDCFVbmNvbmZpZ3VyZWQgT3BlblNTTCBJbnN0YWxs
-+YXRpb24xEDAOBgNVBAsMB3NlY3Rpb24xMDAuBgNVBAMMJzIwMDE6MGRiODozYzRk
-+OjAwMTU6MDAwMDowMDAwOjFhMmY6MWEyYjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-+ADCCAQoCggEBAMcigWxmeF6Dmo3xAw3y/8d3vB8Th4YsmvwXb9DxwNWV+B3vxJgq
-+ww6T6VBxrle1bgu/RtZDJwLf5vMhVElxuuE86di2qyurKFbpe29C9xnCxuMlXpje
-+X2pNknz4ZzOqD4opmIAFjXZ2Xp1kLt+HJX7ABoz7Uga+IbVfDRPPf2KOqYNpBQkp
-+dgI5VOZDQNVNb+8vdXDwyanMQ0TgPXKL4BQIkGB4RM8sgpPMUvB+tEB7zmUtgSco
-+2a5M84wIhxv85CmFFoTVSzXsRCDhVAZj0aHRkkmAsMSmzPa4HiPnuVRV740oQjDy
-+oMGLndaEs2nxIqckUFHOHcSTf0/wmcvPbIsCAwEAAaM3MDUwCQYDVR0TBAIwADAL
-+BgNVHQ8EBAMCBeAwGwYDVR0RBBQwEocQIAENuDxNABUAAAAAGi8aKzANBgkqhkiG
-+9w0BAQUFAAOCAQEAtnelRbYPPZRgTd4oxOiPqwc01EE9JgtkFWlooCwVUDChOR2k
-+us1qlhKsvbN2Tcsm1Ss3p0Uxk/g1o2/mY8rA/dJ8qiN6jbfjpEi8b2MirP5tQSE0
-+QNXbVGr5FnLbuUmn+82pB0vBSaq7gxehbV6S7dteyQUnb2imltC5wS9PwYb8wWx7
-+IpyXWt0jkYkC8KJEevVYI7qtwpjYhyc1FqwzUiPmdqGz2AFLQ4RgTXJi93SPoyKM
-+s65oPV+r6/0qwnslScxVfszHxxFn1Yfsc5Oseare1MnlNzH69PmWs523C/fBvnB2
-+MsHKLPdoN7uSpBLB7j46g5jQG/ceri/cquZKYA==
-+-----END CERTIFICATE-----
---- ./jdk/test/sun/text/resources/LocaleData Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/text/resources/LocaleData Fri Apr 10 09:21:28 2015 -0700
-@@ -7027,3 +7027,9 @@
-
- # bug 8021121
- CurrencyNames/lv_LV/EUR=\u20AC
-+
-+# bug 6931564
-+LocaleNames/sv/ZA=Sydafrika
-+
-+# bug 8027695
-+FormatData/sv_SE/NumberPatterns/2=#,##0 %
---- ./jdk/test/sun/text/resources/LocaleDataTest.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/text/resources/LocaleDataTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -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 7028073 7195759 7085757
-+ * 7171028 8013836 7028073 7195759 7085757 6931564 8027695
- * @summary Verify locale data
- *
- */
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.java Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, 2007, 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
-@@ -27,377 +27,134 @@
- * This isn't the test case: ResourceCheckTest.sh is.
- * Refer to ResourceCheckTest.sh when running this test.
- *
-- * @bug 5008856 5023573 5024917 5062569
-+ * @bug 5008856 5023573 5024917 5062569 7172176
- * @summary 'missing resource key' error for key = "Operating system"
- */
-
--import java.awt.event.KeyEvent;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.Modifier;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.ResourceBundle;
-
-+import sun.tools.jconsole.Messages;
- import sun.tools.jconsole.Resources;
-
-+/*
-+ * Ensures that there is a one-to-one mapping between constants in the
-+ * Message class and the keys in the sun.tools.jconsole.resources.messages
-+ * bundle.
-+ *
-+ * An error will be thrown if there is a:
-+ *
-+ * - key in the resource bundle that doesn't have a public static field with
-+ * the same name in the Message class.
-+ *
-+ * - public static field in the Message class that doesn't have a key with
-+ * the same name in the resource bundle.
-+ *
-+ * - message with a mnemonic identifier(&) for which a mnemonic can't
-+ * be looked up using Resources#getMnemonicInt().
-+ *
-+ */
- public class ResourceCheckTest {
-+ private static final String MISSING_RESOURCE_KEY_PREFIX = "missing message for";
-+ private static final String RESOURCE_BUNDLE = "sun.tools.jconsole.resources.messages";
-+ private static final String NEW_LINE = String.format("%n");
-
-- public static void main(String[] args){
-- Object [][] testData = {
-- {"<", "", "", "", ""},
-- {"<<", "", "", "", ""},
-- {">", "", "", "", ""},
-- {" 1 day", "", "", "", ""},
-- {" 1 hour", "", "", "", ""},
-- {" 1 min", "", "", "", ""},
-- {" 1 month", "", "", "", ""},
-- {" 1 year", "", "", "", ""},
-- {" 2 hours", "", "", "", ""},
-- {" 3 hours", "", "", "", ""},
-- {" 3 months", "", "", "", ""},
-- {" 5 min", "", "", "", ""},
-- {" 6 hours", "", "", "", ""},
-- {" 6 months", "", "", "", ""},
-- {" 7 days", "", "", "", ""},
-- {"10 min", "", "", "", ""},
-- {"12 hours", "", "", "", ""},
-- {"30 min", "", "", "", ""},
-- {"ACTION", "", "", "", ""},
-- {"ACTION_INFO", "", "", "", ""},
-- {"All", "", "", "", ""},
-- {"Architecture", "", "", "", ""},
-- {"Attribute", "", "", "", ""},
-- {"Attribute value", "", "", "", ""},
-- {"Attribute values", "", "", "", ""},
-- {"Attributes", "", "", "", ""},
-- {"Blank", "", "", "", ""},
-- {"BlockedCount WaitedCount", "BlockedCount", "WaitedCount", "", ""},
-- {"Boot class path", "", "", "", ""},
-- {"BorderedComponent.moreOrLessButton.toolTip", "", "", "", ""},
-- {"Close", "", "", "", ""},
-- {"CPU Usage", "", "", "", ""},
-- {"CPUUsageFormat","PhonyPercentage", "", "", ""},
-- {"Cancel", "", "", "", ""},
-- {"Cascade", "", "", "", ""},
-- {"Cascade.mnemonic", "", "", "", ""},
-- {"Chart:", "", "", "", ""},
-- {"Chart:.mnemonic", "", "", "", ""},
-- {"ClassTab.infoLabelFormat", "LoadedCount", "UnloadedCount", "TotalCount", ""},
-- {"ClassTab.loadedClassesPlotter.accessibleName", "", "", "", ""},
-- {"Class path", "", "", "", ""},
-- {"Classes", "", "", "", ""},
-- {"ClassName", "", "", "", ""},
-- {"Column.Name", "", "", "", ""},
-- {"Column.PID", "", "", "", ""},
-- {"Committed", "", "", "", ""},
-- {"Committed memory", "", "", "", ""},
-- {"Committed virtual memory", "", "", "", ""},
-- {"Compiler", "", "", "", ""},
-- {"Connect...", "", "", "", ""},
-- {"Connect", "", "", "", ""},
-- {"Connect.mnemonic", "", "", "", ""},
-- {"ConnectDialog.connectButton.toolTip", "", "", "", ""},
-- {"ConnectDialog.accessibleDescription", "", "", "", ""},
-- {"ConnectDialog.masthead.accessibleName", "", "", "", ""},
-- {"ConnectDialog.masthead.title", "", "", "", ""},
-- {"ConnectDialog.statusBar.accessibleName", "", "", "", ""},
-- {"ConnectDialog.title", "", "", "", ""},
-- {"Connected. Click to disconnect.", "", "", "", ""},
-- {"connectingTo1", "PhonyConnectionName", "", "", ""},
-- {"connectingTo2", "PhonyConnectionName", "", "", ""},
-- {"connectionFailed1", "", "", "", ""},
-- {"connectionFailed2", "PhonyConnectionName", "", "", ""},
-- {"connectionLost1", "", "", "", ""},
-- {"connectionLost2", "PhonyConnectionName", "", "", ""},
-- {"Connection failed", "", "", "", ""},
-- {"Connection", "", "", "", ""},
-- {"Connection.mnemonic", "", "", "", ""},
-- {"Connection name", "", "", "", ""},
-- {"ConnectionName (disconnected)", "Phony", "Phony", "", ""},
-- {"Constructor", "", "", "", ""},
-- {"Create", "Phony", "Phony", "", ""},
-- {"Current classes loaded", "", "", "", ""},
-- {"Current heap size", "", "", "", ""},
-- {"Current value", "PhonyValue", "", "", ""},
-- {"Daemon threads", "", "", "", ""},
-- {"deadlockAllTab", "", "", "", ""},
-- {"deadlockTab", "", "", "", ""},
-- {"deadlockTabN", "PhonyInt", "", "", ""},
-- {"Description", "", "", "", ""},
-- {"Descriptor", "", "", "", ""},
-- {"Details", "", "", "", ""},
-- {"Detect Deadlock", "", "", "", ""},
-- {"Detect Deadlock.mnemonic", "", "", "", ""},
-- {"Detect Deadlock.toolTip", "", "", "", ""},
-- {"Dimension is not supported:", "", "", "", ""},
-- {"Discard chart", "", "", "", ""},
-- {"Disconnected. Click to connect.", "", "", "", ""},
-- {"Double click to expand/collapse", "", "", "", ""},
-- {"Double click to visualize", "", "", "", ""},
-- {"DurationDaysHoursMinutes", 0, 13, 54, ""},
-- {"DurationDaysHoursMinutes", 1, 13, 54, ""},
-- {"DurationDaysHoursMinutes", 2, 13, 54, ""},
-- {"DurationDaysHoursMinutes", 1024, 13, 45, ""},
-- {"DurationHoursMinutes", 0, 13, "", ""},
-- {"DurationHoursMinutes", 1, 0, "", ""},
-- {"DurationHoursMinutes", 1, 1, "", ""},
-- {"DurationHoursMinutes", 2, 42, "", ""},
-- {"DurationMinutes", 0, "", "", ""},
-- {"DurationMinutes", 1, "", "", ""},
-- {"DurationMinutes", 2, "", "", ""},
-- {"DurationSeconds", 0, "", "", ""},
-- {"DurationSeconds", 1, "", "", ""},
-- {"DurationSeconds", 2, "", "", ""},
-- {"Empty array", "", "", "", ""},
-- {"Error", "", "", "", ""},
-- {"Error: MBeans already exist", "", "", "", ""},
-- {"Error: MBeans do not exist", "", "", "", ""},
-- {"Event", "", "", "", ""},
-- {"Exit", "", "", "", ""},
-- {"Exit.mnemonic", "", "", "", ""},
-- {"expand", "", "", "", ""},
-- {"Fail to load plugin", "", "", "", ""},
-- {"FileChooser.fileExists.cancelOption", "", "", "", ""},
-- {"FileChooser.fileExists.message", "PhonyFileName", "", "", ""},
-- {"FileChooser.fileExists.okOption", "", "", "", ""},
-- {"FileChooser.fileExists.title", "", "", "", ""},
-- {"FileChooser.savedFile", "PhonyFilePath", "PhonyFileSize", "", ""},
-- {"FileChooser.saveFailed.message", "PhonyFilePath", "PhonyMessage", "", ""},
-- {"FileChooser.saveFailed.title", "", "", "", ""},
-- {"Free physical memory", "", "", "", ""},
-- {"Free swap space", "", "", "", ""},
-- {"Garbage collector", "", "", "", ""},
-- {"GC time", "", "", "", ""},
-- {"GC time details", 54, "Phony", 11, ""},
-- {"GcInfo", "Phony", -1, 768, ""},
-- {"GcInfo", "Phony", 0, 768, ""},
-- {"GcInfo", "Phony", 1, 768, ""},
-- {"Heap", "", "", "", ""},
-- {"Heap Memory Usage", "", "", "", ""},
-- {"Help.AboutDialog.accessibleDescription", "", "", "", ""},
-- {"Help.AboutDialog.jConsoleVersion", "DummyVersion", "", "", ""},
-- {"Help.AboutDialog.javaVersion", "DummyVersion", "", "", ""},
-- {"Help.AboutDialog.masthead.accessibleName", "", "", "", ""},
-- {"Help.AboutDialog.masthead.title", "", "", "", ""},
-- {"Help.AboutDialog.title", "", "", "", ""},
-- {"Help.AboutDialog.userGuideLink", "DummyMessage", "", "", ""},
-- {"Help.AboutDialog.userGuideLink.mnemonic", "", "", "", ""},
-- {"Help.AboutDialog.userGuideLink.url", "DummyURL", "", "", ""},
-- {"HelpMenu.About.title", "", "", "", ""},
-- {"HelpMenu.About.title.mnemonic", "", "", "", ""},
-- {"HelpMenu.UserGuide.title", "", "", "", ""},
-- {"HelpMenu.UserGuide.title.mnemonic", "", "", "", ""},
-- {"HelpMenu.title", "", "", "", ""},
-- {"HelpMenu.title.mnemonic", "", "", "", ""},
-- {"Hotspot MBeans...", "", "", "", ""},
-- {"Hotspot MBeans....mnemonic", "", "", "", ""},
-- {"Hotspot MBeans.dialog.accessibleDescription", "", "", "", ""},
-- {"Impact", "", "", "", ""},
-- {"Info", "", "", "", ""},
-- {"INFO", "", "", "", ""},
-- {"Invalid plugin path", "", "", "", ""},
-- {"Invalid URL", "", "", "", ""},
-- {"Is", "", "", "", ""},
-- {"Java Monitoring & Management Console", "", "", "", ""},
-- {"Java Virtual Machine", "", "", "", ""},
-- {"JConsole: ", "", "", "", ""},
-- {"JConsole.accessibleDescription", "", "", "", ""},
-- {"JConsole version", "PhonyVersion", "", "", ""},
-- {"JIT compiler", "", "", "", ""},
-- {"Library path", "", "", "", ""},
-- {"Live Threads", "", "", "", ""},
-- {"Loaded", "", "", "", ""},
-- {"Local Process:", "", "", "", ""},
-- {"Local Process:.mnemonic", "", "", "", ""},
-- {"Manage Hotspot MBeans in: ", "", "", "", ""},
-- {"Management Not Enabled", "", "", "", ""},
-- {"Management Will Be Enabled", "", "", "", ""},
-- {"Masthead.font", "", "", "", ""},
-- {"Max", "", "", "", ""},
-- {"Max", "", "", "", ""},
-- {"Maximum heap size", "", "", "", ""},
-- {"MBeanAttributeInfo", "", "", "", ""},
-- {"MBeanInfo", "", "", "", ""},
-- {"MBeanNotificationInfo", "", "", "", ""},
-- {"MBeanOperationInfo", "", "", "", ""},
-- {"MBeans", "", "", "", ""},
-- {"MBeansTab.clearNotificationsButton", "", "", "", ""},
-- {"MBeansTab.clearNotificationsButton.mnemonic", "", "", "", ""},
-- {"MBeansTab.clearNotificationsButton.toolTip", "", "", "", ""},
-- {"MBeansTab.compositeNavigationMultiple", 0, 0, "", ""},
-- {"MBeansTab.compositeNavigationSingle", "", "", "", ""},
-- {"MBeansTab.refreshAttributesButton", "", "", "", ""},
-- {"MBeansTab.refreshAttributesButton.mnemonic", "", "", "", ""},
-- {"MBeansTab.refreshAttributesButton.toolTip", "", "", "", ""},
-- {"MBeansTab.subscribeNotificationsButton", "", "", "", ""},
-- {"MBeansTab.subscribeNotificationsButton.mnemonic", "", "", "", ""},
-- {"MBeansTab.subscribeNotificationsButton.toolTip", "", "", "", ""},
-- {"MBeansTab.tabularNavigationMultiple", 0, 0, "", ""},
-- {"MBeansTab.tabularNavigationSingle", "", "", "", ""},
-- {"MBeansTab.unsubscribeNotificationsButton", "", "", "", ""},
-- {"MBeansTab.unsubscribeNotificationsButton.mnemonic", "", "", "", ""},
-- {"MBeansTab.unsubscribeNotificationsButton.toolTip", "", "", "", ""},
-- {"Memory", "", "", "", ""},
-- {"MemoryPoolLabel", "PhonyMemoryPool", "", "", ""},
-- {"MemoryTab.heapPlotter.accessibleName", "", "", "", ""},
-- {"MemoryTab.infoLabelFormat", "UsedCount", "CommittedCount", "MaxCount", ""},
-- {"MemoryTab.nonHeapPlotter.accessibleName", "", "", "", ""},
-- {"MemoryTab.poolChart.aboveThreshold", "Threshold", "", "", ""},
-- {"MemoryTab.poolChart.accessibleName", "", "", "", ""},
-- {"MemoryTab.poolChart.belowThreshold", "Threshold", "", "", ""},
-- {"MemoryTab.poolPlotter.accessibleName", "PhonyMemoryPool", "", "", ""},
-- {"Message", "", "", "", ""},
-- {"Method successfully invoked", "", "", "", ""},
-- {"Monitor locked", "", "", "", ""},
-- {"Minimize All", "", "", "", ""},
-- {"Minimize All.mnemonic", "", "", "", ""},
-- {"Name", "", "", "", ""},
-- {"Name and Build", "PhonyName", "PhonyBuild", "", ""},
-- {"Name Build and Mode", "PhonyName", "PhonyBuild", "PhonyMode", ""},
-- {"Name State", "PhonyName", "PhonyState", "", ""},
-- {"Name State LockName", "PhonyName", "PhonyState", "PhonyLock", ""},
-- {"Name State LockName LockOwner", "PhonyName", "PhonyState", "PhonyLock", "PhonyOwner"},
-- {"New Connection...", "", "", "", ""},
-- {"New Connection....mnemonic", "", "", "", ""},
-- {"No deadlock detected", "", "", "", ""},
-- {"Non-Heap", "", "", "", ""},
-- {"Non-Heap Memory Usage", "", "", "", ""},
-- {"Notification", "", "", "", ""},
-- {"Notification buffer", "", "", "", ""},
-- {"Notifications", "", "", "", ""},
-- {"NotifTypes", "", "", "", ""},
-- {"Number of Loaded Classes", "", "", "", ""},
-- {"Number of processors", "", "", "", ""},
-- {"Number of Threads", "", "", "", ""},
-- {"ObjectName", "", "", "", ""},
-- {"Operating System", "", "", "", ""},
-- {"Operation", "", "", "", ""},
-- {"Operation invocation", "", "", "", ""},
-- {"Operation return value", "", "", "", ""},
-- {"Operations", "", "", "", ""},
-- {"Overview", "", "", "", ""},
-- {"OverviewPanel.plotter.accessibleName", "PhonyPlotter", "", "", ""},
-- {"Parameter", "", "", "", ""},
-- {"Password: ", "", "", "", ""},
-- {"Password: .mnemonic", "", "", "", ""},
-- {"Password.accessibleName", "", "", "", ""},
-- {"Peak", "", "", "", ""},
-- {"Perform GC", "", "", "", ""},
-- {"Perform GC.mnemonic", "", "", "", ""},
-- {"Perform GC.toolTip", "", "", "", ""},
-- {"Plotter.accessibleName", "", "", "", ""},
-- {"Plotter.accessibleName.keyAndValue", "Key", "Value", "", ""},
-- {"Plotter.accessibleName.noData", "", "", "", ""},
-- {"Plotter.saveAsMenuItem", "", "", "", ""},
-- {"Plotter.saveAsMenuItem.mnemonic", "", "", "", ""},
-- {"Plotter.timeRangeMenu", "", "", "", ""},
-- {"Plotter.timeRangeMenu.mnemonic", "", "", "", ""},
-- {"plot", "", "", "", ""},
-- {"Problem adding listener", "", "", "", ""},
-- {"Problem displaying MBean", "", "", "", ""},
-- {"Problem invoking", "", "", "", ""},
-- {"Problem removing listener", "", "", "", ""},
-- {"Problem setting attribute", "", "", "", ""},
-- {"Process CPU time", "", "", "", ""},
-- {"Readable", "", "", "", ""},
-- {"Reconnect", "", "", "", ""},
-- {"Remote Process:", "", "", "", ""},
-- {"Remote Process:.mnemonic", "", "", "", ""},
-- {"Remote Process.textField.accessibleName", "", "", "", ""},
-- {"remoteTF.usage", "", "", "", ""},
-- {"Restore All", "", "", "", ""},
-- {"Restore All.mnemonic", "", "", "", ""},
-- {"ReturnType", "", "", "", ""},
-- {"SeqNum", "", "", "", ""},
-- {"Size Bytes", 512, "", "", ""},
-- {"Size Gb", 512, "", "", ""},
-- {"Size Kb", 512, "", "", ""},
-- {"Size Mb", 512, "", "", ""},
-- {"Source", "", "", "", ""},
-- {"Stack trace", "", "", "", ""},
-- {"SummaryTab.headerDateTimeFormat", "", "", "", ""},
-- {"SummaryTab.pendingFinalization.label", "", "", "", ""},
-- {"SummaryTab.pendingFinalization.value", "ObjectCount", "", "", ""},
-- {"SummaryTab.tabName", "", "", "", ""},
-- {"SummaryTab.vmVersion", "VMName", "VMVersion", "", ""},
-- {"ThreadTab.infoLabelFormat", "LiveCount", "PeakCount", "TotalCount", ""},
-- {"ThreadTab.threadInfo.accessibleName", "", "", "", ""},
-- {"ThreadTab.threadPlotter.accessibleName", "", "", "", ""},
-- {"Threads", "", "", "", ""},
-- {"Threshold", "", "", "", ""},
-- {"Tile", "", "", "", ""},
-- {"Tile.mnemonic", "", "", "", ""},
-- {"Time", "", "", "", ""},
-- {"Time Range:", "", "", "", ""},
-- {"Time Range:.mnemonic", "", "", "", ""},
-- {"TimeStamp", "", "", "", ""},
-- {"Total classes loaded", "", "", "", ""},
-- {"Total classes unloaded", "", "", "", ""},
-- {"Total compile time", "", "", "", ""},
-- {"Total Loaded", "", "", "", ""},
-- {"Total physical memory", "", "", "", ""},
-- {"Total swap space", "", "", "", ""},
-- {"Total threads started", "", "", "", ""},
-- {"Type", "", "", "", ""},
-- {"Unavailable", "", "", "", ""},
-- {"UNKNOWN", "", "", "", ""},
-- {"Unregister", "", "", "", ""},
-- {"Uptime", "", "", "", ""},
-- {"Usage Threshold", "", "", "", ""},
-- {"Used", "", "", "", ""},
-- {"Username: ", "", "", "", ""},
-- {"Username: .mnemonic", "", "", "", ""},
-- {"Username.accessibleName", "", "", "", ""},
-- {"UserData", "", "", "", ""},
-- {"Value", "", "", "", ""},
-- {"Vendor", "", "", "", ""},
-- {"Verbose Output", "", "", "", ""},
-- {"Verbose Output.toolTip", "", "", "", ""},
-- {"visualize", "", "", "", ""},
-- {"VM", "", "", "", ""},
-- {"VMInternalFrame.accessibleDescription", "", "", "", ""},
-- {"VM arguments", "", "", "", ""},
-- {"Virtual Machine", "", "", "", ""},
-- {"Window", "", "", "", ""},
-- {"Window.mnemonic", "", "", "", ""},
-- {"Writable", "", "", "", ""},
-- {"zz usage text", "PhonyName", "", "", ""},
-- };
-- //boolean verbose = false;
-- boolean verbose = true;
--
-- long badLookups = 0;
-- System.out.println("Start...");
-- for (int ii = 0; ii < testData.length; ii++) {
-- String key = (String)testData[ii][0];
--
-- if (key.endsWith(".mnemonic")) {
-- String baseKey = key.substring(0, key.length() - ".mnemonic".length());
-- int mnemonic = Resources.getMnemonicInt(baseKey);
-- if (mnemonic == 0) {
-- badLookups++;
-- System.out.println("****lookup failed for key = " + key);
-+ public static void main(String... args) {
-+ List<String> errors = new ArrayList<>();
-+ // Ensure that all Message fields have a corresponding key/value
-+ // in the resource bundle and that mnemonics can be looked
-+ // up where applicable.
-+ ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_BUNDLE);
-+ for (Field field : Messages.class.getFields()) {
-+ if (isResourceKeyField(field)) {
-+ String resourceKey = field.getName();
-+ String message = readField(field);
-+ if (message.startsWith(MISSING_RESOURCE_KEY_PREFIX)) {
-+ errors.add("Can't find message (and perhaps mnemonic) for "
-+ + Messages.class.getSimpleName() + "."
-+ + resourceKey + " in resource bundle.");
- } else {
-- if (verbose) {
-- System.out.println(" mnemonic: " + KeyEvent.getKeyText(mnemonic));
-+ String resourceMessage = rb.getString(resourceKey);
-+ if (hasMnemonicIdentifier(resourceMessage)) {
-+ int mi = Resources.getMnemonicInt(message);
-+ if (mi == 0) {
-+ errors.add("Could not look up mnemonic for message '"
-+ + message + "'.");
-+ }
- }
- }
-- continue;
-- }
--
-- String ss = Resources.getText(key,
-- testData[ii][1],
-- testData[ii][2],
-- testData[ii][3],
-- testData[ii][4]);
-- if (ss.startsWith("missing resource key")) {
-- badLookups++;
-- System.out.println("****lookup failed for key = " + key);
-- } else {
-- if (verbose) {
-- System.out.println(" " + ss);
-- }
- }
- }
-- if (badLookups > 0) {
-- throw new Error ("Resource lookup failed " + badLookups +
-- " time(s); Test failed");
-+
-+ // Ensure that there is Message class field for every resource key.
-+ for (String key : Collections.list(rb.getKeys())) {
-+ try {
-+ Messages.class.getField(key);
-+ } catch (NoSuchFieldException nfe) {
-+ errors.add("Can't find static field ("
-+ + Messages.class.getSimpleName() + "." + key
-+ + ") matching '" + key
-+ + "' in resource bundle. Unused message?");
-+ }
- }
-- System.out.println("...Finished.");
-+
-+ if (errors.size() > 0) {
-+ throwError(errors);
-+ }
-+ }
-+
-+ private static String readField(Field field) {
-+ try {
-+ return (String) field.get(null);
-+ } catch (IllegalArgumentException | IllegalAccessException e) {
-+ throw new Error("Could not access field " + field.getName()
-+ + " when trying to read resource message.");
-+ }
-+ }
-+
-+ private static boolean isResourceKeyField(Field field) {
-+ int modifiers = field.getModifiers();
-+ return Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers);
-+ }
-+
-+ private static boolean hasMnemonicIdentifier(String s) {
-+ for (int i = 0; i < s.length() - 1; i++) {
-+ if (s.charAt(i) == '&') {
-+ if (s.charAt(i + 1) != '&') {
-+ return true;
-+ } else {
-+ i++;
-+ }
-+ }
-+ }
-+ return false;
-+ }
-+
-+ private static void throwError(List<String> errors) {
-+ StringBuffer buffer = new StringBuffer();
-+ buffer.append("Found ");
-+ buffer.append(errors.size());
-+ buffer.append(" error(s) when checking one-to-one mapping ");
-+ buffer.append("between Message and resource bundle keys in ");
-+ buffer.append(RESOURCE_BUNDLE);
-+ buffer.append(" with ");
-+ buffer.append(Locale.getDefault());
-+ buffer.append(" locale.");
-+ buffer.append(NEW_LINE);
-+ int errorIndex = 1;
-+ for (String error : errors) {
-+ buffer.append("Error ");
-+ buffer.append(errorIndex);
-+ buffer.append(": ");
-+ buffer.append(error);
-+ buffer.append(NEW_LINE);
-+ errorIndex++;
-+ }
-+ throw new Error(buffer.toString());
- }
- }
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Mon Jan 05 11:57:27 2015 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Fri Apr 10 09:21:28 2015 -0700
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2004, 2007, 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
-@@ -54,7 +54,7 @@
-
- OS=`uname -s`
- case "$OS" in
-- SunOS | Linux )
-+ SunOS | Linux | Darwin)
- PATHSEP=":"
- ;;
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/JstatGCUtilParser.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,155 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.Arrays;
-+
-+import jdk.testlibrary.Utils;
-+import static jdk.testlibrary.Asserts.*;
-+
-+/**
-+ * The helper class for parsing following output from command 'jstat -gcutil':
-+ *
-+ * S0 S1 E O P YGC YGCT FGC FGCT GCT
-+ * 100.00 0.00 25.07 10.96 26.17 2 0.008 1 0.032 0.040
-+ * 100.00 0.00 31.34 10.96 26.17 2 0.008 1 0.032 0.040
-+ * 100.00 0.00 34.29 10.96 26.17 2 0.008 1 0.032 0.040
-+ * 100.00 0.00 35.33 10.96 26.17 2 0.008 1 0.032 0.040
-+ * 100.00 0.00 36.37 10.96 26.17 2 0.008 1 0.032 0.040
-+ *
-+ * It will be verified that numerical values have defined types and are reasonable,
-+ * for example percentage should fit within 0-100 interval.
-+ */
-+public class JstatGCUtilParser {
-+
-+ public enum GcStatisticsType {
-+ INTEGER, DOUBLE, PERCENTAGE, PERCENTAGE_OR_DASH;
-+ }
-+
-+ public enum GcStatistics {
-+ S0(GcStatisticsType.PERCENTAGE),
-+ S1(GcStatisticsType.PERCENTAGE),
-+ E(GcStatisticsType.PERCENTAGE),
-+ O(GcStatisticsType.PERCENTAGE),
-+ P(GcStatisticsType.PERCENTAGE),
-+ YGC(GcStatisticsType.INTEGER),
-+ YGCT(GcStatisticsType.DOUBLE),
-+ FGC(GcStatisticsType.INTEGER),
-+ FGCT(GcStatisticsType.DOUBLE),
-+ GCT(GcStatisticsType.DOUBLE);
-+
-+ private final GcStatisticsType type;
-+
-+ private GcStatistics(GcStatisticsType type) {
-+ this.type = type;
-+ }
-+
-+ private GcStatisticsType getType() {
-+ return type;
-+ }
-+
-+ public static boolean isHeadline(String... valueArray) {
-+ if (valueArray.length != values().length) {
-+ return false;
-+ }
-+ int headersCount = 0;
-+ for (int i = 0; i < values().length; i++) {
-+ if (valueArray[i].equals(values()[i].toString())) {
-+ headersCount++;
-+ }
-+ }
-+ if (headersCount != values().length) {
-+ return false;
-+ }
-+ return true;
-+ }
-+
-+ private static void verifyLength(String... valueArray) throws Exception {
-+ assertEquals(valueArray.length, values().length,
-+ "Invalid number of data columns: " + Arrays.toString(valueArray));
-+ }
-+
-+ public static void verify(String... valueArray) throws Exception {
-+ verifyLength(valueArray);
-+ for (int i = 0; i < values().length; i++) {
-+ GcStatisticsType type = values()[i].getType();
-+ String value = valueArray[i].trim();
-+ if (type.equals(GcStatisticsType.INTEGER)) {
-+ Integer.parseInt(value);
-+ break;
-+ }
-+ if (type.equals(GcStatisticsType.DOUBLE)) {
-+ Double.parseDouble(value);
-+ break;
-+ }
-+ if (type.equals(GcStatisticsType.PERCENTAGE_OR_DASH) &&
-+ value.equals("-")) {
-+ break;
-+ }
-+ double percentage = Double.parseDouble(value);
-+ assertTrue(0 <= percentage && percentage <= 100,
-+ "Not a percentage: " + value);
-+ }
-+ }
-+
-+ }
-+
-+ private final String output;
-+
-+ public JstatGCUtilParser(String output) {
-+ this.output = output;
-+ }
-+
-+ public String getOutput() {
-+ return output;
-+ }
-+
-+ /**
-+ * The function will discard any lines that come before the header line.
-+ * This can happen if the JVM outputs a warning message for some reason
-+ * before running jstat.
-+ */
-+ public void parse(int samples) throws Exception {
-+ boolean headlineFound = false;
-+ int datalineCount = 0;
-+
-+ String[] lines = output.split(Utils.NEW_LINE);
-+ for (String line : lines) {
-+ line = line.replaceAll("\\s+", " ").trim();
-+ String[] valueArray = line.split(" ");
-+
-+ if (!headlineFound) {
-+ headlineFound = GcStatistics.isHeadline(valueArray);
-+ continue;
-+ }
-+
-+ GcStatistics.verify(valueArray);
-+ datalineCount++;
-+ }
-+
-+ assertTrue(headlineFound, "No or invalid headline found, expected: " +
-+ Utils.NEW_LINE + Arrays.toString(GcStatistics.values()).replaceAll(",", " "));
-+ assertEquals(samples, datalineCount,
-+ "Expected " + samples + " samples, got " + datalineCount);
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/JstatdTest.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,356 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please 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.net.UnknownHostException;
-+import java.rmi.RemoteException;
-+import java.rmi.registry.LocateRegistry;
-+import java.rmi.registry.Registry;
-+import java.util.Arrays;
-+
-+import static jdk.testlibrary.Asserts.*;
-+import jdk.testlibrary.JDKToolLauncher;
-+import jdk.testlibrary.OutputAnalyzer;
-+import jdk.testlibrary.ProcessThread;
-+import jdk.testlibrary.TestThread;
-+import jdk.testlibrary.Utils;
-+
-+/**
-+ * The base class for tests of jstatd.
-+ *
-+ * The test sequence for TestJstatdDefaults for example is:
-+ * <pre>
-+ * {@code
-+ * // start jstatd process
-+ * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy
-+ *
-+ * // run jps and verify its output
-+ * jps -J-XX:+UsePerfData hostname
-+ *
-+ * // run jstat and verify its output
-+ * jstat -J-XX:+UsePerfData -J-Duser.language=en -gcutil pid@hostname 250 5
-+ *
-+ * // stop jstatd process and verify that no unexpected exceptions have been thrown
-+ * }
-+ * </pre>
-+ */
-+public final class JstatdTest {
-+
-+ /**
-+ * jstat gcutil option: takes JSTAT_GCUTIL_SAMPLES samples at
-+ * JSTAT_GCUTIL_INTERVAL_MS millisecond intervals
-+ */
-+ private static final int JSTAT_GCUTIL_SAMPLES = 5;
-+ private static final int JSTAT_GCUTIL_INTERVAL_MS = 250;
-+ private static final String JPS_OUTPUT_REGEX = "^\\d+\\s*.*";
-+
-+ private boolean useDefaultPort = true;
-+ private String port;
-+ private String serverName;
-+ private String jstatdPid;
-+ private boolean withExternalRegistry = false;
-+
-+ public void setServerName(String serverName) {
-+ this.serverName = serverName;
-+ }
-+
-+ public void setUseDefaultPort(boolean useDefaultPort) {
-+ this.useDefaultPort = useDefaultPort;
-+ }
-+
-+ public void setWithExternalRegistry(boolean withExternalRegistry) {
-+ this.withExternalRegistry = withExternalRegistry;
-+ }
-+
-+ /**
-+ * Parse pid from jps output
-+ */
-+ private String parsePid(String tool, OutputAnalyzer output) throws Exception {
-+ String[] lines = output.getOutput().split(Utils.NEW_LINE);
-+ String pid = null;
-+ int count = 0;
-+ String processName = tool;
-+ if (tool == "rmiregistry") {
-+ processName = "registryimpl";
-+ }
-+ for (String line : lines) {
-+ if (line.toLowerCase().matches("^\\d+\\s{1}" + processName + "$")) {
-+ pid = line.split(" ")[0];
-+ count++;
-+ }
-+ }
-+ if (count > 1) {
-+ throw new Exception("Expected one " + tool
-+ + " process, got " + count + ". Test will be canceled.");
-+ }
-+
-+ return pid;
-+ }
-+
-+ private String getToolPid(String tool)
-+ throws Exception {
-+ OutputAnalyzer output = runJps();
-+ return parsePid(tool, output);
-+ }
-+
-+ private String waitOnTool(String tool, TestThread thread) throws Throwable {
-+ while (true) {
-+ String pid = getToolPid(tool);
-+
-+ if (pid != null) {
-+ System.out.println(tool + " pid: " + pid);
-+ return pid;
-+ }
-+
-+ Throwable t = thread.getUncaught();
-+ if (t != null) {
-+ if (t.getMessage().contains(
-+ "java.rmi.server.ExportException: Port already in use")) {
-+ System.out.println("Port already in use. Trying to restart with a new one...");
-+ Thread.sleep(100);
-+ return null;
-+ } else {
-+ // Something unexpected has happened
-+ throw new Throwable(t);
-+ }
-+ }
-+
-+ System.out.println("Waiting until " + tool + " is running...");
-+ Thread.sleep(100);
-+ }
-+ }
-+
-+ private void log(String caption, String... cmd) {
-+ System.out.println(Utils.NEW_LINE + caption + ":");
-+ System.out.println(Arrays.toString(cmd).replace(",", ""));
-+ }
-+
-+ private String getDestination() throws UnknownHostException {
-+ String option = Utils.getHostname();
-+ if (port != null) {
-+ option += ":" + port;
-+ }
-+ if (serverName != null) {
-+ option += "/" + serverName;
-+ }
-+ return option;
-+ }
-+
-+ /**
-+ * Depending on test settings command line can look like:
-+ *
-+ * jps -J-XX:+UsePerfData hostname
-+ * jps -J-XX:+UsePerfData hostname:port
-+ * jps -J-XX:+UsePerfData hostname/serverName
-+ * jps -J-XX:+UsePerfData hostname:port/serverName
-+ */
-+ private OutputAnalyzer runJps() throws Exception {
-+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
-+ launcher.addVMArg("-XX:+UsePerfData");
-+ launcher.addToolArg(getDestination());
-+
-+ String[] cmd = launcher.getCommand();
-+ log("Start jps", cmd);
-+
-+ ProcessBuilder processBuilder = new ProcessBuilder(cmd);
-+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
-+ System.out.println(output.getOutput());
-+
-+ return output;
-+ }
-+
-+ /**
-+ * Verifies output form jps contains pids and programs' name information.
-+ * The function will discard any lines that come before the first line with pid.
-+ * This can happen if the JVM outputs a warning message for some reason
-+ * before running jps.
-+ *
-+ * The output can look like:
-+ * 35536 Jstatd
-+ * 35417 Main
-+ * 31103 org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar
-+ */
-+ private void verifyJpsOutput(OutputAnalyzer output) throws Exception {
-+ output.shouldHaveExitValue(0);
-+ assertFalse(output.getOutput().isEmpty(), "Output should not be empty");
-+
-+ boolean foundFirstLineWithPid = false;
-+ String[] lines = output.getOutput().split(Utils.NEW_LINE);
-+ for (String line : lines) {
-+ if (!foundFirstLineWithPid) {
-+ foundFirstLineWithPid = line.matches(JPS_OUTPUT_REGEX);
-+ continue;
-+ }
-+ assertTrue(line.matches(JPS_OUTPUT_REGEX),
-+ "Output does not match the pattern" + Utils.NEW_LINE + line);
-+ }
-+ assertTrue(foundFirstLineWithPid, "Invalid output");
-+ }
-+
-+ /**
-+ * Depending on test settings command line can look like:
-+ *
-+ * jstat -J-XX:+UsePerfData -J-Duser.language=en -gcutil pid@hostname 250 5
-+ * jstat -J-XX:+UsePerfData -J-Duser.language=en -gcutil pid@hostname:port 250 5
-+ * jstat -J-XX:+UsePerfData -J-Duser.language=en -gcutil pid@hostname/serverName 250 5
-+ * jstat -J-XX:+UsePerfData -J-Duser.language=en -gcutil pid@hostname:port/serverName 250 5
-+ */
-+ private OutputAnalyzer runJstat() throws Exception {
-+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstat");
-+ launcher.addVMArg("-XX:+UsePerfData");
-+ launcher.addVMArg("-Duser.language=en");
-+ launcher.addToolArg("-gcutil");
-+ launcher.addToolArg(jstatdPid + "@" + getDestination());
-+ launcher.addToolArg(Integer.toString(JSTAT_GCUTIL_INTERVAL_MS));
-+ launcher.addToolArg(Integer.toString(JSTAT_GCUTIL_SAMPLES));
-+
-+ String[] cmd = launcher.getCommand();
-+ log("Start jstat", cmd);
-+
-+ ProcessBuilder processBuilder = new ProcessBuilder(cmd);
-+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
-+ System.out.println(output.getOutput());
-+
-+ return output;
-+ }
-+
-+ private void verifyJstatOutput(OutputAnalyzer output)
-+ throws Exception {
-+ output.shouldHaveExitValue(0);
-+ assertFalse(output.getOutput().isEmpty(), "Output should not be empty");
-+
-+ JstatGCUtilParser gcUtilParser = new JstatGCUtilParser(
-+ output.getOutput());
-+ gcUtilParser.parse(JSTAT_GCUTIL_SAMPLES);
-+ }
-+
-+ private void runToolsAndVerify() throws Exception {
-+ OutputAnalyzer output = runJps();
-+ verifyJpsOutput(output);
-+
-+ output = runJstat();
-+ verifyJstatOutput(output);
-+ }
-+
-+ private Registry startRegistry()
-+ throws InterruptedException, RemoteException {
-+ Registry registry = null;
-+ try {
-+ System.out.println("Start rmiregistry on port " + port);
-+ registry = LocateRegistry
-+ .createRegistry(Integer.parseInt(port));
-+ } catch (RemoteException e) {
-+ if (e.getMessage().contains("Port already in use")) {
-+ System.out.println("Port already in use. Trying to restart with a new one...");
-+ Thread.sleep(100);
-+ return null;
-+ } else {
-+ throw e;
-+ }
-+ }
-+ return registry;
-+ }
-+
-+ private void cleanUpThread(ProcessThread thread) throws Throwable {
-+ if (thread != null) {
-+ thread.stopProcess();
-+ thread.joinAndThrow();
-+ }
-+ }
-+
-+ /**
-+ * Depending on test settings command line can look like:
-+ *
-+ * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy
-+ * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -p port
-+ * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -n serverName
-+ * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -p port -n serverName
-+ */
-+ private String[] getJstatdCmd() throws UnknownHostException {
-+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstatd");
-+ launcher.addVMArg("-XX:+UsePerfData");
-+ String testSrc = System.getProperty("test.src");
-+ File policy = new File(testSrc, "all.policy");
-+ launcher.addVMArg("-Djava.security.policy=" + policy.getAbsolutePath());
-+ if (port != null) {
-+ launcher.addToolArg("-p");
-+ launcher.addToolArg(port);
-+ }
-+ if (serverName != null) {
-+ launcher.addToolArg("-n");
-+ launcher.addToolArg(serverName);
-+ }
-+
-+ String[] cmd = launcher.getCommand();
-+ log("Start jstatd", cmd);
-+ return cmd;
-+ }
-+
-+ private ProcessThread tryToSetupJstatdProcess() throws Throwable {
-+ ProcessThread jstatdThread = new ProcessThread("Jstatd-Thread",
-+ getJstatdCmd());
-+ try {
-+ jstatdThread.start();
-+ // Make sure jstatd is up and running
-+ jstatdPid = waitOnTool("jstatd", jstatdThread);
-+ if (jstatdPid == null) {
-+ // The port is already in use. Cancel and try with new one.
-+ jstatdThread.stopProcess();
-+ jstatdThread.join();
-+ return null;
-+ }
-+ } catch (Throwable t) {
-+ // Something went wrong in the product - clean up!
-+ cleanUpThread(jstatdThread);
-+ throw t;
-+ }
-+
-+ return jstatdThread;
-+ }
-+
-+ public void doTest() throws Throwable {
-+ ProcessThread jstatdThread = null;
-+ try {
-+ while (jstatdThread == null) {
-+ if (!useDefaultPort || withExternalRegistry) {
-+ port = Integer.toString(Utils.getFreePort());
-+ }
-+
-+ if (withExternalRegistry) {
-+ Registry registry = startRegistry();
-+ if (registry == null) {
-+ // The port is already in use. Cancel and try with new one.
-+ continue;
-+ }
-+ }
-+
-+ jstatdThread = tryToSetupJstatdProcess();
-+ }
-+
-+ runToolsAndVerify();
-+ } finally {
-+ cleanUpThread(jstatdThread);
-+ }
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/TestJstatdDefaults.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,38 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 4990825
-+ * @library /lib/testlibrary
-+ * @build JstatdTest JstatGCUtilParser
-+ * @run main/timeout=60 TestJstatdDefaults
-+ */
-+public class TestJstatdDefaults {
-+
-+ public static void main(String[] args) throws Throwable {
-+ JstatdTest test = new JstatdTest();
-+ test.doTest();
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 4990825 7092186
-+ * @library /lib/testlibrary
-+ * @build JstatdTest JstatGCUtilParser
-+ * @run main/timeout=60 TestJstatdExternalRegistry
-+ */
-+public class TestJstatdExternalRegistry {
-+
-+ public static void main(String[] args) throws Throwable {
-+ JstatdTest test = new JstatdTest();
-+ test.setWithExternalRegistry(true);
-+ test.doTest();
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/TestJstatdPort.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 4990825
-+ * @library /lib/testlibrary
-+ * @build JstatdTest JstatGCUtilParser
-+ * @run main/timeout=60 TestJstatdPort
-+ */
-+public class TestJstatdPort {
-+
-+ public static void main(String[] args) throws Throwable {
-+ JstatdTest test = new JstatdTest();
-+ test.setUseDefaultPort(false);
-+ test.doTest();
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java Fri Apr 10 09:21:28 2015 -0700
-@@ -0,0 +1,40 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 4990825
-+ * @library /lib/testlibrary
-+ * @build JstatdTest JstatGCUtilParser
-+ * @run main/timeout=60 TestJstatdPortAndServer
-+ */
-+public class TestJstatdPortAndServer {
-+
-+ public static void main(String[] args) throws Throwable {
-+ JstatdTest test = new JstatdTest();
-+ test.setUseDefaultPort(false);
-+ test.setServerName("TestJstatdServer");
-+ test.doTest();
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/TestJstatdServer.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 4990825
-+ * @library /lib/testlibrary
-+ * @build JstatdTest JstatGCUtilParser
-+ * @run main/timeout=60 TestJstatdServer
-+ */
-+public class TestJstatdServer {
-+
-+ public static void main(String[] args) throws Throwable {
-+ JstatdTest test = new JstatdTest();
-+ test.setServerName("TestJstatdServer");
-+ test.doTest();
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jstatd/TestJstatdUsage.java Fri Apr 10 09:21:28 2015 -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.
-+ */
-+
-+import jdk.testlibrary.JDKToolLauncher;
-+import jdk.testlibrary.OutputAnalyzer;
-+
-+/*
-+ * @test
-+ * @bug 4990825
-+ * @library /lib/testlibrary
-+ * @build jdk.testlibrary.JDKToolLauncher jdk.testlibrary.OutputAnalyzer
-+ * @run main TestJstatdUsage
-+ */
-+public class TestJstatdUsage {
-+
-+ public static void main(String[] args) throws Exception {
-+ testUsage("-help");
-+ testUsage("-?");
-+ }
-+
-+ private static void testUsage(String option) throws Exception {
-+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstatd");
-+ launcher.addToolArg(option);
-+ ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
-+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
-+
-+ output.shouldContain("usage: jstatd [-nr] [-p port] [-n rminame]");
-+ output.shouldHaveExitValue(1);
-+ }
-+
-+}
---- ./jdk/test/sun/tools/jstatd/jpsOutput1.awk Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,27 +0,0 @@
--#
--BEGIN {
-- totallines=0; matched=0
-- }
--
--/^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\$|\.]*$/ {
-- matched++;
-- }
--
--/^[0-9]+ -- .*$/ {
-- matched++;
-- }
--
--/^[0-9]+ $/ {
-- matched++;
-- }
--
-- { totallines++; print $0 }
--
--END {
-- if ((totallines > 0) && (matched == totallines)) {
-- exit 0
-- }
-- else {
-- exit 1
-- }
-- }
---- ./jdk/test/sun/tools/jstatd/jstatGcutilOutput1.awk Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,34 +0,0 @@
--#
--# matching the following output specified as a pattern that verifies
--# that the numerical values conform to a specific pattern, rather than
--# specific values.
--#
--# S0 S1 E O P YGC YGCT FGC FGCT GCT
--# 0.00 100.00 68.87 1.24 27.75 1 0.044 0 0.000 0.044
--# 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044
--# 0.00 100.00 68.87 1.24 27.84 1 0.044 0 0.000 0.044
--# 0.00 100.00 70.89 1.24 27.84 1 0.044 0 0.000 0.044
--# 0.00 100.00 70.89 1.24 27.84 1 0.044 0 0.000 0.044
--
--BEGIN {
-- headerlines=0; datalines=0; totallines=0
-- }
--
--/^ S0 S1 E O P YGC YGCT FGC FGCT GCT $/ {
-- headerlines++;
-- }
--
--/^[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ {
-- datalines++;
-- }
--
-- { totallines++; print $0 }
--
--END {
-- if ((headerlines == 1) && (datalines == 5) && (totallines == 6)) {
-- exit 0
-- }
-- else {
-- exit 1
-- }
-- }
---- ./jdk/test/sun/tools/jstatd/jstatdDefaults.sh Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,79 +0,0 @@
--#
--# 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
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--
--# @test
--# @bug 4990825
--# @run shell/timeout=60 jstatdDefaults.sh
--# @summary Test functionality of 'jstatd &'
--
--. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
--
--setup
--verify_os
--
--cleanup() {
-- kill_proc ${JSTATD_PID}
--}
--
--trap 'cleanup' 0 HUP INT QUIT TERM
--
--JSTATD="${TESTJAVA}/bin/jstatd"
--JPS="${TESTJAVA}/bin/jps"
--JSTAT="${TESTJAVA}/bin/jstat"
--
--HOSTNAME=`uname -n`
--
--JSTATD_OUT="jstatd_$$.out"
--
--${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy 2>&1 > ${JSTATD_OUT} &
--JSTATD_PID=$!
--
--echo "jstatd started as pid ${JSTATD_PID}"
--sleep 3
--
--${JPS} -J-XX:+UsePerfData ${HOSTNAME} 2>&1 | awk -f ${TESTSRC}/jpsOutput1.awk
--
--if [ $? -ne 0 ]
--then
-- echo "Output of jps differs from expected output. Failed."
-- cleanup
-- exit 1
--fi
--
--${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_PID}@${HOSTNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
--RC=$?
--
--if [ ${RC} -ne 0 ]
--then
-- echo "jstat output differs from expected output"
--fi
--
--if [ -s ${JSTATD_OUT} ]
--then
-- echo "jstatd generated the following, unexpected output:"
-- RC=1
--fi
--
--cleanup
--
--exit ${RC}
---- ./jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,96 +0,0 @@
--#
--# 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
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--
--# @test
--# @bug 4990825 7092186
--# @run shell/timeout=90 jstatdExternalRegistry.sh
--# @summary Test functionality of 'jstatd -p<port>&' with an external RMI registry
--
--. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
--
--setup
--verify_os
--
--cleanup() {
-- kill_proc ${RMIREGISTRY_PID}
-- kill_proc ${JSTATD_PID}
--}
--
--trap 'cleanup' 0 HUP INT QUIT TERM
--
--RMIREGISTRY="${TESTJAVA}/bin/rmiregistry"
--JSTATD="${TESTJAVA}/bin/jstatd"
--JPS="${TESTJAVA}/bin/jps"
--JSTAT="${TESTJAVA}/bin/jstat"
--
--HOSTNAME=`uname -n`
--PORT=`freePort`
--if [ "${PORT}" = "0" ] ; then
-- echo "Cannot get free port"
-- exit 1
--fi
--
--RMIREGISTRY_OUT="rmiregistry_$$.out"
--JSTATD_OUT="jstatd_$$.out"
--
--${RMIREGISTRY} -J-XX:+UsePerfData ${PORT} > ${RMIREGISTRY_OUT} 2>&1 &
--RMIREGISTRY_PID=$!
--
--echo "rmiregistry started on port ${PORT} as pid ${RMIREGISTRY_PID}"
--sleep 3
--
--${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy -p ${PORT} > ${JSTATD_OUT} 2>&1 &
--JSTATD_PID=$!
--
--echo "jstatd started as pid ${JSTATD_PID}"
--sleep 3
--
--${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT} 2>&1 | awk -f ${TESTSRC}/jpsOutput1.awk
--
--if [ $? -ne 0 ]
--then
-- echo "Output of jps differs from expected output. Failed."
-- exit 1
--fi
--
--${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
--RC=$?
--
--if [ ${RC} -ne 0 ]
--then
-- echo "jstat output differs from expected output"
--fi
--
--if [ -s ${JSTATD_OUT} ]
--then
-- echo "jstatd generated unexpected output: see ${JSTATD_OUT}"
-- RC=1
--fi
--
--if [ -s ${RMIREGISTRY_OUT} ]
--then
-- echo "rmiregistry generated unexpected output: see ${RMIREGISTRY_OUT}"
-- RC=1
--fi
--
--exit ${RC}
---- ./jdk/test/sun/tools/jstatd/jstatdPort.sh Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,84 +0,0 @@
--#
--# 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
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--
--# @test
--# @bug 4990825
--# @run shell/timeout=60 jstatdPort.sh
--# @summary Test functionality of 'jstatd -p <port>&'
--
--. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
--
--setup
--verify_os
--
--cleanup() {
-- kill_proc ${JSTATD_PID}
--}
--
--trap 'cleanup' 0 HUP INT QUIT TERM
--
--JSTATD="${TESTJAVA}/bin/jstatd"
--JPS="${TESTJAVA}/bin/jps"
--JSTAT="${TESTJAVA}/bin/jstat"
--
--HOSTNAME=`uname -n`
--PORT=`freePort`
--if [ "${PORT}" = "0" ] ; then
-- echo "Cannot get free port"
-- exit 1
--fi
--
--JSTATD_OUT="jstatd_$$.out"
--
--${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy -p ${PORT} 2>&1 > ${JSTATD_OUT} &
--JSTATD_PID=$!
--
--echo "jstatd started as pid ${JSTATD_PID} on port ${PORT}"
--sleep 3
--
--${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT} 2>&1 | tee jps.out | awk -f ${TESTSRC}/jpsOutput1.awk
--
--if [ $? -ne 0 ]
--then
-- echo "Output of jps differs from expected output. Failed."
-- cleanup
-- exit 1
--fi
--
--${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
--RC=$?
--
--if [ ${RC} -ne 0 ]
--then
-- echo "jstat output differs from expected output"
--fi
--
--if [ -s ${JSTATD_OUT} ]
--then
-- echo "jstatd generated the following, unexpected output:"
-- RC=1
--fi
--
--cleanup
--
--exit ${RC}
---- ./jdk/test/sun/tools/jstatd/jstatdServerName.sh Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,121 +0,0 @@
--#
--# 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
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--
--# @test
--# @bug 4990825
--# @run shell/timeout=90 jstatdServerName.sh
--# @summary Test functionality of 'jstatd -p <port> -n <servername>&'
--
--. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
--
--setup
--verify_os
--
--cleanup() {
-- kill_proc ${JSTATD_1_PID}
-- kill_proc ${JSTATD_2_PID}
--}
--
--trap 'cleanup' 0 HUP INT QUIT TERM
--
--JSTATD="${TESTJAVA}/bin/jstatd"
--JPS="${TESTJAVA}/bin/jps"
--JSTAT="${TESTJAVA}/bin/jstat"
--
--HOSTNAME=`uname -n`
--PORT_1=`freePort`
--if [ "${PORT_1}" = "0" ] ; then
-- echo "ERROR: No free port"
-- exit 1
--fi
--PORT_2=`expr ${PORT_1} '+' 1`
--SERVERNAME="SecondJstatdServer"
--
--JSTATD_1_OUT="jstatd_$$_1.out"
--JSTATD_2_OUT="jstatd_$$_2.out"
--
--${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy -p ${PORT_1} 2>&1 > ${JSTATD_1_OUT} &
--JSTATD_1_PID=$!
--
--echo "first jstatd started as pid ${JSTATD_1_PID} on port ${PORT_1} with default server name"
--sleep 3
--
--${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy -p ${PORT_2} -n ${SERVERNAME} 2>&1 > ${JSTATD_2_OUT} &
--JSTATD_2_PID=$!
--
--echo "second jstatd started as pid ${JSTATD_2_PID} on port ${PORT_2} with name ${SERVERNAME}"
--sleep 3
--
--echo "running: ${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_1}"
--${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_1} 2>&1 | awk -f ${TESTSRC}/jpsOutput1.awk
--
--if [ $? -ne 0 ]
--then
-- echo "Output of jps differs from expected output. Failed."
-- cleanup
-- exit 1
--fi
--
--echo "running: ${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_2}/${SERVERNAME}"
--${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_2}/${SERVERNAME} 2>&1 | awk -f ${TESTSRC}/jpsOutput1.awk
--
--if [ $? -ne 0 ]
--then
-- echo "Output of jps differs from expected output. Failed."
-- cleanup
-- exit 1
--fi
--
--echo "running: ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5"
--${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
--RC=$?
--
--if [ ${RC} -ne 0 ]
--then
-- echo "jstat output differs from expected output"
--fi
--
--echo "running: ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5"
--${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
--RC=$?
--
--if [ ${RC} -ne 0 ]
--then
-- echo "jstat output differs from expected output"
--fi
--
--if [ -s ${JSTATD_1_OUT} ]
--then
-- echo "first jstatd generated the following, unexpected output:"
-- RC=1
--fi
--
--if [ -s ${JSTATD_2_OUT} ]
--then
-- echo "second jstatd generated the following, unexpected output:"
-- RC=1
--fi
--
--cleanup
--
--exit ${RC}
---- ./jdk/test/sun/tools/jstatd/jstatdUsage1.sh Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,56 +0,0 @@
--#
--# Copyright (c) 2004, 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 4990825
--# @run shell jstatdUsage1.sh
--# @summary Test that output of 'jstatd -help' matches the usage.out file
--
--. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh
--
--setup
--
--JSTATD="${TESTJAVA}/bin/jstatd"
--
--JSTATD_1_OUT="jstatd_$$_1.out"
--JSTATD_2_OUT="jstatd_$$_2.out"
--
--${JSTATD} -? > ${JSTATD_1_OUT} 2>&1
--
--diff -w ${JSTATD_1_OUT} ${TESTSRC}/usage.out
--if [ $? != 0 ]
--then
-- echo "Output of jstatd -? differs from expected output. Failed."
-- exit 1
--fi
--
--${JSTATD} -help > ${JSTATD_2_OUT} 2>&1
--
--diff -w ${JSTATD_2_OUT} ${TESTSRC}/usage.out
--if [ $? != 0 ]
--then
-- echo "Output of jstatd -help differs from expected output. Failed."
-- exit 1
--fi
--
--exit 0
---- ./jdk/test/sun/tools/jstatd/usage.out Mon Jan 05 11:57:27 2015 -0800
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,1 +0,0 @@
--usage: jstatd [-nr] [-p port] [-n rminame]
---- ./langtools/.hgtags Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/.hgtags Fri Apr 10 09:22:56 2015 -0700
-@@ -527,6 +527,10 @@
- 6106b56a874e19e603660a09d506fe8afcde9e14 jdk7u72-b14
- 7a09f7596c8bb17d3b25b4506dd76425f6efb15e jdk7u72-b30
- de0088aaf97fa861be8c17e97b57139287068c86 jdk7u72-b31
-+2a4f0a3ead7dca917132e0bb55157fca5f85e109 jdk7u72-b32
-+a01a26976001088d402da55635e00737b529a961 jdk7u72-b33
-+1aef1c42bb783a25b54ea786e9bd112a4744e464 jdk7u72-b34
-+8fa35635fddba4b0ea01c841c118a841bd6ff34a jdk7u72-b35
- 0138c5f55af0c700882deeac4411fbd9118b4d6e jdk7u75-b00
- 7ecfdbf693cfc14d648ebdf2cc87716068569e8d jdk7u75-b01
- 688a304d3215af8104336ecce50b7f4edfb88d36 jdk7u75-b02
-@@ -558,3 +562,37 @@
- f0a6f4f62959a43e21d377436e3e60f6431ee5b4 jdk7u76-b12
- d9e79541170f453dda964319f268fdad80dce9d7 jdk7u76-b13
- 24f0420bb212b05d572689bae8ec2d232b9ac5a0 jdk7u76-b30
-+f260514e9d6fa7d8c9ee96eb7b5496c61f27d830 jdk7u76-b31
-+9c4eaa276d52892371ae4adc79234e8f44c084d2 jdk7u76-b32
-+bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u79-b00
-+a5f66b87b6c4c14375e8a1aa0405ddb4c63e7014 jdk7u79-b01
-+0747b795b08a7de0fbe724cc7042d0e8ebccc4f8 jdk7u79-b02
-+421c914fbf030014497053ae58ed7c182043211a jdk7u79-b03
-+f6453624f39f9f0922b2746b6f56dcf600a15a4a jdk7u79-b06
-+7c626c9382b7705feefb7acfe508ec82d53d7957 jdk7u79-b07
-+3a870689bd136b326476a6f21475adc941e33afa jdk7u79-b08
-+04176e60f5f58de621a75e5a5c3b59e2d8d00ef7 jdk7u79-b09
-+2ea5521a55a35b9700e95d98dc2cf560834b1df6 jdk7u79-b10
-+e0d3d80136d7cd11fd26f22fead1f78068fdddaf jdk7u79-b11
-+a5f2b51a4ea77cd5471d03501a460c80b375379a jdk7u79-b12
-+525562d90c3c06ddc9ef6c266db2d2aa8177b7e0 jdk7u79-b13
-+185113eafdbffa675b5db5859ccdd16cfd19ae6f jdk7u79-b14
-+79923da8c058124a3a181b9d000753f9b573db35 jdk7u79-b30
-+e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15
-+772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
-+6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
-+5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02
-+bcbd241df6cd0a643480c8de183c541a662dd506 jdk7u80-b03
-+04b56f4312b62d8bdf4eb1159132de8437994d34 jdk7u80-b04
-+f40fb76025c798cab4fb0e1966be1bceb8234527 jdk7u80-b05
-+335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06
-+6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07
-+e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08
-+88b7f1ad17d20eace30d0ab83d4e7413c0c863ff jdk7u80-b09
-+55f4bb77c71c8e0b9be2ac6484c7a3838203d53a jdk7u80-b10
-+ae5ecf167fb7d70f98aa117ea6a053307db98b14 jdk7u80-b11
-+c084fb3e386393774886645aee8ef57b22854c08 jdk7u80-b12
-+e6845c405f95b6336e000f054f87a964a33927d9 jdk7u80-b13
-+242015274be21260757835134fcfb9bfa5ba6a81 jdk7u80-b14
-+d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30
-+f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15
---- ./langtools/THIRD_PARTY_README Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/THIRD_PARTY_README Fri Apr 10 09:22:56 2015 -0700
-@@ -1001,7 +1001,7 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to libpng 1.5.4, which is
-+%% This notice is provided with respect to libpng 1.6.16, which is
- included with JRE 7, JDK 7, and OpenJDK 7.
-
- --- begin of LICENSE ---
-@@ -1017,7 +1017,7 @@
-
- This code is released under the libpng license.
-
--libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
- Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
-@@ -1115,7 +1115,7 @@
-
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
--July 7, 2011
-+December 22, 2014
-
- --- end of LICENSE ---
-
-@@ -1912,35 +1912,6 @@
-
- -------------------------------------------------------------------------------
-
--%% This notice is provided with respect to Sparkle v.1.5,
--which is included with JRE 7 on Mac OS X.
--
----- begin of LICENSE ---
--
--Copyright (c) 2012 Sparkle.org and Andy Matuschak
--
--Permission is hereby granted, free of charge, to any person obtaining a copy
--of this software and associated documentation files (the "Software"), to deal
--in the Software without restriction, including without limitation the rights
--to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--copies of the Software, and to permit persons to whom the Software is
--furnished to do so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
--
----- end of LICENSE ---
--
---------------------------------------------------------------------------------
--
- %% Portions licensed from Taligent, Inc.
-
- -------------------------------------------------------------------------------
-@@ -3198,12 +3169,12 @@
- %% This notice is provided with respect to the following which is
- included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
-
-- Apache Derby 10.8.3.0 [included with JDK 7 only]
-+ Apache Derby 10.8.1.2 [included with JDK 7 only]
- Apache Jakarta BCEL 5.2
- Apache Jakarta Regexp 1.4
- Apache Santuario XMLSec-Java 1.4.2
- Apache Xalan-Java 2.7.1
-- Apache Xerces2 Java 2.11.0
-+ Apache Xerces2 Java 2.10.0
- Apache XML Resolver 1.1
-
-
---- ./langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Fri Apr 10 09:22:56 2015 -0700
-@@ -2400,9 +2400,9 @@
- }
- });
- for (Scope.Entry e = a.annotationType.type.tsym.members().elems;
-- e != null;
-- e = e.sibling)
-- if (e.sym.kind == MTH)
-+ e != null;
-+ e = e.sibling)
-+ if (e.sym.kind == MTH && e.sym.name != names.clinit)
- members.add((MethodSymbol) e.sym);
-
- // count them off as they're annotated
---- ./langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Fri Apr 10 09:22:56 2015 -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
-@@ -223,6 +223,12 @@
- meth.name,
- bridgeType,
- origin);
-+ /* once JDK-6996415 is solved it should be checked if this approach can
-+ * be applied to method addOverrideBridgesIfNeeded
-+ */
-+ bridge.params = createBridgeParams(impl, bridge, bridgeType);
-+ bridge.attributes_field = impl.attributes_field;
-+
- if (!hypothetical) {
- JCMethodDecl md = make.MethodDef(bridge, null);
-
-@@ -257,6 +263,26 @@
- overridden.put(bridge, meth);
- }
-
-+ private List<VarSymbol> createBridgeParams(MethodSymbol impl, MethodSymbol bridge,
-+ Type bridgeType) {
-+ List<VarSymbol> bridgeParams = null;
-+ if (impl.params != null) {
-+ bridgeParams = List.nil();
-+ List<VarSymbol> implParams = impl.params;
-+ Type.MethodType mType = (Type.MethodType)bridgeType;
-+ List<Type> argTypes = mType.argtypes;
-+ while (implParams.nonEmpty() && argTypes.nonEmpty()) {
-+ VarSymbol param = new VarSymbol(implParams.head.flags() | SYNTHETIC | PARAMETER,
-+ implParams.head.name, argTypes.head, bridge);
-+ param.attributes_field = implParams.head.attributes_field;
-+ bridgeParams = bridgeParams.append(param);
-+ implParams = implParams.tail;
-+ argTypes = argTypes.tail;
-+ }
-+ }
-+ return bridgeParams;
-+ }
-+
- /** Add bridge if given symbol is a non-private, non-static member
- * of the given class, which is either defined in the class or non-final
- * inherited, and one of the two following conditions holds:
---- ./langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Fri Apr 10 09:22:56 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -1541,15 +1541,17 @@
- // The method wasn't found: emit a warning and recover
- JavaFileObject prevSource = log.useSource(requestingOwner.classfile);
- try {
-- if (failure == null) {
-- log.warning("annotation.method.not.found",
-- container,
-- name);
-- } else {
-- log.warning("annotation.method.not.found.reason",
-- container,
-- name,
-- failure.getDetailValue());//diagnostic, if present
-+ if (lintClassfile) {
-+ if (failure == null) {
-+ log.warning("annotation.method.not.found",
-+ container,
-+ name);
-+ } else {
-+ log.warning("annotation.method.not.found.reason",
-+ container,
-+ name,
-+ failure.getDetailValue()); //diagnostic, if present
-+ }
- }
- } finally {
- log.useSource(prevSource);
---- ./langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Fri Apr 10 09:22:56 2015 -0700
-@@ -1012,25 +1012,29 @@
-
- if (code.varBufferSize > 0) {
- int alenIdx = writeAttr(names.LocalVariableTable);
-- databuf.appendChar(code.varBufferSize);
-+ databuf.appendChar(code.getLVTSize());
-
- for (int i=0; i<code.varBufferSize; i++) {
- Code.LocalVar var = code.varBuffer[i];
--
-- // write variable info
-- Assert.check(var.start_pc >= 0
-- && var.start_pc <= code.cp);
-- databuf.appendChar(var.start_pc);
-- Assert.check(var.length >= 0
-- && (var.start_pc + var.length) <= code.cp);
-- databuf.appendChar(var.length);
-- VarSymbol sym = var.sym;
-- databuf.appendChar(pool.put(sym.name));
-- Type vartype = sym.erasure(types);
-- if (needsLocalVariableTypeEntry(sym.type))
-- nGenericVars++;
-- databuf.appendChar(pool.put(typeSig(vartype)));
-- databuf.appendChar(var.reg);
-+ for (Code.LocalVar.Range r: var.aliveRanges) {
-+ // write variable info
-+ if (!(r.start_pc >= 0 && r.start_pc <= code.cp)) {
-+ throw new AssertionError();
-+ }
-+ databuf.appendChar(r.start_pc);
-+ if (!(r.length >= 0 && (r.start_pc + r.length) <= code.cp)) {
-+ throw new AssertionError();
-+ }
-+ databuf.appendChar(r.length);
-+ VarSymbol sym = var.sym;
-+ databuf.appendChar(pool.put(sym.name));
-+ Type vartype = sym.erasure(types);
-+ databuf.appendChar(pool.put(typeSig(vartype)));
-+ databuf.appendChar(var.reg);
-+ if (needsLocalVariableTypeEntry(var.sym.type)) {
-+ nGenericVars++;
-+ }
-+ }
- }
- endAttr(alenIdx);
- acount++;
-@@ -1046,13 +1050,15 @@
- VarSymbol sym = var.sym;
- if (!needsLocalVariableTypeEntry(sym.type))
- continue;
-- count++;
-- // write variable info
-- databuf.appendChar(var.start_pc);
-- databuf.appendChar(var.length);
-- databuf.appendChar(pool.put(sym.name));
-- databuf.appendChar(pool.put(typeSig(sym.type)));
-- databuf.appendChar(var.reg);
-+ for (Code.LocalVar.Range r : var.aliveRanges) {
-+ // write variable info
-+ databuf.appendChar(r.start_pc);
-+ databuf.appendChar(r.length);
-+ databuf.appendChar(pool.put(sym.name));
-+ databuf.appendChar(pool.put(typeSig(sym.type)));
-+ databuf.appendChar(var.reg);
-+ count++;
-+ }
- }
- Assert.check(count == nGenericVars);
- endAttr(alenIdx);
---- ./langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Fri Apr 10 09:22:56 2015 -0700
-@@ -1151,7 +1151,9 @@
- public int entryPoint(State state) {
- int pc = curPc();
- alive = true;
-- this.state = state.dup();
-+ State newState = state.dup();
-+ setDefined(newState.defined);
-+ this.state = newState;
- Assert.check(state.stacksize <= max_stack);
- if (debugCode) System.err.println("entry point " + state);
- pendingStackMap = needStackMap;
-@@ -1164,7 +1166,9 @@
- public int entryPoint(State state, Type pushed) {
- int pc = curPc();
- alive = true;
-- this.state = state.dup();
-+ State newState = state.dup();
-+ setDefined(newState.defined);
-+ this.state = newState;
- Assert.check(state.stacksize <= max_stack);
- this.state.push(pushed);
- if (debugCode) System.err.println("entry point " + state);
-@@ -1452,6 +1456,10 @@
- chain.pc + 3 == target && target == cp && !fixedPc) {
- // If goto the next instruction, the jump is not needed:
- // compact the code.
-+ if (varDebugInfo) {
-+ adjustAliveRanges(cp, -3);
-+ }
-+
- cp = cp - 3;
- target = target - 3;
- if (chain.next == null) {
-@@ -1736,8 +1744,7 @@
- sym = sym.clone(sym.owner);
- sym.type = newtype;
- LocalVar newlv = lvar[i] = new LocalVar(sym);
-- // should the following be initialized to cp?
-- newlv.start_pc = lv.start_pc;
-+ newlv.aliveRanges = lv.aliveRanges;
- }
- }
- }
-@@ -1825,18 +1832,118 @@
- static class LocalVar {
- final VarSymbol sym;
- final char reg;
-- char start_pc = Character.MAX_VALUE;
-- char length = Character.MAX_VALUE;
-+
-+ class Range {
-+ char start_pc = Character.MAX_VALUE;
-+ char length = Character.MAX_VALUE;
-+
-+ Range() {}
-+
-+ Range(char start) {
-+ this.start_pc = start;
-+ }
-+
-+ Range(char start, char length) {
-+ this.start_pc = start;
-+ this.length = length;
-+ }
-+
-+ boolean closed() {
-+ return start_pc != Character.MAX_VALUE && length != Character.MAX_VALUE;
-+ }
-+
-+ @Override
-+ public String toString() {
-+ int currentStartPC = start_pc;
-+ int currentLength = length;
-+ return "startpc = " + currentStartPC + " length " + currentLength;
-+ }
-+ }
-+
-+ java.util.List<Range> aliveRanges = new java.util.ArrayList<Range>();
-+
- LocalVar(VarSymbol v) {
- this.sym = v;
- this.reg = (char)v.adr;
- }
-+
- public LocalVar dup() {
- return new LocalVar(sym);
- }
-+
-+ Range firstRange() {
-+ return aliveRanges.isEmpty() ? null : aliveRanges.get(0);
-+ }
-+
-+ Range lastRange() {
-+ return aliveRanges.isEmpty() ? null : aliveRanges.get(aliveRanges.size() - 1);
-+ }
-+
-+ void removeLastRange() {
-+ Range lastRange = lastRange();
-+ if (lastRange != null) {
-+ aliveRanges.remove(lastRange);
-+ }
-+ }
-+
-+ @Override
- public String toString() {
-- return "" + sym + " in register " + ((int)reg) + " starts at pc=" + ((int)start_pc) + " length=" + ((int)length);
-+ if (aliveRanges == null) {
-+ return "empty local var";
-+ }
-+ StringBuilder sb = new StringBuilder().append(sym)
-+ .append(" in register ").append((int)reg).append(" \n");
-+ for (Range r : aliveRanges) {
-+ sb.append(" starts at pc=").append(Integer.toString(((int)r.start_pc)))
-+ .append(" length=").append(Integer.toString(((int)r.length)))
-+ .append("\n");
-+ }
-+ return sb.toString();
- }
-+
-+ public void openRange(char start) {
-+ if (!hasOpenRange()) {
-+ aliveRanges.add(new Range(start));
-+ }
-+ }
-+
-+ public void closeRange(char length) {
-+ if (isLastRangeInitialized() && length > 0) {
-+ Range range = lastRange();
-+ if (range != null) {
-+ if (range.length == Character.MAX_VALUE) {
-+ range.length = length;
-+ }
-+ }
-+ } else {
-+ removeLastRange();
-+ }
-+ }
-+
-+ public boolean hasOpenRange() {
-+ if (aliveRanges.isEmpty()) {
-+ return false;
-+ }
-+ return lastRange().length == Character.MAX_VALUE;
-+ }
-+
-+ public boolean isLastRangeInitialized() {
-+ if (aliveRanges.isEmpty()) {
-+ return false;
-+ }
-+ return lastRange().start_pc != Character.MAX_VALUE;
-+ }
-+
-+ public Range getWidestRange() {
-+ if (aliveRanges.isEmpty()) {
-+ return new Range();
-+ } else {
-+ Range firstRange = firstRange();
-+ Range lastRange = lastRange();
-+ char length = (char)(lastRange.length + (lastRange.start_pc - firstRange.start_pc));
-+ return new Range(firstRange.start_pc, length);
-+ }
-+ }
- };
-
- /** Local variables, indexed by register. */
-@@ -1858,6 +1965,30 @@
- state.defined.excl(adr);
- }
-
-+ void adjustAliveRanges(int oldCP, int delta) {
-+ for (LocalVar localVar: lvar) {
-+ if (localVar != null) {
-+ for (LocalVar.Range range: localVar.aliveRanges) {
-+ if (range.closed() && range.start_pc + range.length >= oldCP) {
-+ range.length += delta;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Calculates the size of the LocalVariableTable.
-+ */
-+ public int getLVTSize() {
-+ int result = varBufferSize;
-+ for (int i = 0; i < varBufferSize; i++) {
-+ LocalVar var = varBuffer[i];
-+ result += var.aliveRanges.size() - 1;
-+ }
-+ return result;
-+ }
-+
- /** Set the current variable defined state. */
- public void setDefined(Bits newDefined) {
- if (alive && newDefined != state.defined) {
-@@ -1883,8 +2014,7 @@
- } else {
- state.defined.incl(adr);
- if (cp < Character.MAX_VALUE) {
-- if (v.start_pc == Character.MAX_VALUE)
-- v.start_pc = (char)cp;
-+ v.openRange((char)cp);
- }
- }
- }
-@@ -1894,15 +2024,15 @@
- state.defined.excl(adr);
- if (adr < lvar.length &&
- lvar[adr] != null &&
-- lvar[adr].start_pc != Character.MAX_VALUE) {
-+ lvar[adr].isLastRangeInitialized()) {
- LocalVar v = lvar[adr];
-- char length = (char)(curPc() - v.start_pc);
-+ char length = (char)(curPc()- v.lastRange().start_pc);
- if (length > 0 && length < Character.MAX_VALUE) {
- lvar[adr] = v.dup();
-- v.length = length;
-+ v.closeRange(length);
- putVar(v);
- } else {
-- v.start_pc = Character.MAX_VALUE;
-+ v.removeLastRange();
- }
- }
- }
-@@ -1912,10 +2042,10 @@
- LocalVar v = lvar[adr];
- if (v != null) {
- lvar[adr] = null;
-- if (v.start_pc != Character.MAX_VALUE) {
-- char length = (char)(curPc() - v.start_pc);
-+ if (v.isLastRangeInitialized()) {
-+ char length = (char)(curPc()- v.lastRange().start_pc);
- if (length < Character.MAX_VALUE) {
-- v.length = length;
-+ v.closeRange(length);
- putVar(v);
- }
- }
---- ./langtools/test/tools/javac/6889255/T6889255.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/test/tools/javac/6889255/T6889255.java Fri Apr 10 09:22:56 2015 -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
-@@ -429,9 +429,9 @@
- // -- no Code attribute for the LocalVariableTable attribute
- if ((v.owner.flags() & Flags.ABSTRACT) != 0)
- return "arg" + (i - 1);
-- // bridge methods use xN
-+ // bridge methods use argN. No LVT for them anymore
- if ((v.owner.flags() & Flags.BRIDGE) != 0)
-- return "x" + (i - 1);
-+ return "arg" + (i - 1);
-
- // The rest of this method assumes the local conventions in the test program
- Type t = v.type;
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,103 @@
-+/*
-+ * 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 6695379
-+ * @summary Copy method annotations and parameter annotations to synthetic
-+ * bridge methods
-+ * @run main AnnotationsAreNotCopiedToBridgeMethodsTest
-+ */
-+
-+import java.lang.annotation.ElementType;
-+import java.lang.annotation.Target;
-+import java.io.BufferedInputStream;
-+import java.lang.annotation.Retention;
-+import java.lang.annotation.RetentionPolicy;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+
-+import com.sun.tools.classfile.AccessFlags;
-+import com.sun.tools.classfile.Attribute;
-+import com.sun.tools.classfile.Attributes;
-+import com.sun.tools.classfile.ClassFile;
-+import com.sun.tools.classfile.Method;
-+import com.sun.tools.javac.util.Assert;
-+
-+public class AnnotationsAreNotCopiedToBridgeMethodsTest {
-+
-+ public static void main(String[] args) throws Exception {
-+ new AnnotationsAreNotCopiedToBridgeMethodsTest().run();
-+ }
-+
-+ void run() throws Exception {
-+ checkClassFile(Paths.get(System.getProperty("test.classes"),
-+ this.getClass().getSimpleName() + "$CovariantReturnType.class"));
-+ checkClassFile(Paths.get(System.getProperty("test.classes"),
-+ this.getClass().getSimpleName() +
-+ "$CovariantReturnType$VisibilityChange.class"));
-+ }
-+
-+ void checkClassFile(final Path cfilePath) throws Exception {
-+ ClassFile classFile = ClassFile.read(
-+ new BufferedInputStream(Files.newInputStream(cfilePath)));
-+ for (Method method : classFile.methods) {
-+ if (method.access_flags.is(AccessFlags.ACC_BRIDGE)) {
-+ checkForAttr(method.attributes,
-+ "Annotations hasn't been copied to bridge method",
-+ Attribute.RuntimeVisibleAnnotations,
-+ Attribute.RuntimeVisibleParameterAnnotations);
-+ }
-+ }
-+ }
-+
-+ void checkForAttr(Attributes attrs, String errorMsg, String... attrNames) {
-+ for (String attrName : attrNames) {
-+ Assert.checkNonNull(attrs.get(attrName), errorMsg);
-+ }
-+ }
-+
-+ @Target(value = {ElementType.PARAMETER})
-+ @Retention(RetentionPolicy.RUNTIME)
-+ @interface ParamAnnotation {}
-+
-+ @Target(value = {ElementType.METHOD})
-+ @Retention(RetentionPolicy.RUNTIME)
-+ @interface MethodAnnotation {}
-+
-+ abstract class T<A,B> {
-+ B m(A a){return null;}
-+ }
-+
-+ class CovariantReturnType extends T<Integer, Integer> {
-+ @MethodAnnotation
-+ Integer m(@ParamAnnotation Integer i) {
-+ return i;
-+ }
-+
-+ public class VisibilityChange extends CovariantReturnType {}
-+
-+ }
-+
-+}
---- ./langtools/test/tools/javac/annotations/6214965/T6214965.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/test/tools/javac/annotations/6214965/T6214965.java Fri Apr 10 09:22:56 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,9 +23,10 @@
-
- /**
- * @test
-- * @bug 6214965 6365854
-+ * @bug 6214965 6365854 8068639
- * @summary Compiler crash on redefing nested annotation types
- * @compile CompilerAnnotationTest.java CompilerAnnotationTest2.java
- * @compile CompilerAnnotationTest2bad.java
-- * @compile/ref=T6214965.out -XDrawDiagnostics CompilerAnnotationTest2bad.java
-+ * @compile/ref=T6214965.out -XDrawDiagnostics -Xlint:classfile CompilerAnnotationTest2bad.java
-+ * @compile -Werror CompilerAnnotationTest2bad.java
- */
---- ./langtools/test/tools/javac/annotations/6365854/T6365854.java Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/test/tools/javac/annotations/6365854/T6365854.java Fri Apr 10 09:22:56 2015 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -23,7 +23,7 @@
-
- /**
- * @test
-- * @bug 6365854
-+ * @bug 6365854 8068639
- * @summary javac crashes when compiling against an annotated class
- * @compile TestAnnotation.java TestCore.java
- * @clean test.annotation.TestAnnotation
-@@ -33,11 +33,11 @@
- *
- * @compile TestAnnotation.java TestCore.java
- * @clean test.annotation.TestAnnotation
-- * @compile/ref=test1.out -XDrawDiagnostics T6365854.java
-+ * @compile/ref=test1.out -XDrawDiagnostics -Xlint:classfile T6365854.java
- * @run main T6365854
-- * @compile/ref=test2.out -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java
-+ * @compile/ref=test2.out -XDrawDiagnostics -Xlint:classfile evolve/TestAnnotation.java T6365854.java
- * @run main T6365854
-- * @compile/ref=test2.out -XDrawDiagnostics T6365854.java
-+ * @compile/ref=test2.out -XDrawDiagnostics -Xlint:classfile T6365854.java
- * @run main T6365854
- */
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/annotations/clinit/AnnoWithClinit1.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 8013485
-+ * @summary Annotations that gets a clinit can't be verified for correct elements in a second compilation unit
-+ * @compile AnnoWithClinit1.java
-+ */
-+
-+public @interface AnnoWithClinit1 {
-+ Foo f = new Foo();
-+
-+ @AnnoWithClinit1
-+ static class C {} // this is in the same CU so there wont be a
-+ // <clinit> when the this anno instance is checked
-+
-+ class Foo {}
-+}
-+
-+
-+@AnnoWithClinit1
-+class BarAnnoClinit1 {}
-+
-+@interface AAnnoClinit1 {
-+ Runnable r2 = new Runnable() { public void run() { }};
-+ String str1();
-+ String str2withdefault() default "bar";
-+}
-+
-+@AAnnoClinit1(str1="value")
-+class TestAnnoClinit1 { }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java Fri Apr 10 09:22:56 2015 -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 8013485
-+ * @summary Annotations that gets a clinit can't be verified for correct elements in a second compilation unit
-+ * @compile/fail/ref=AnnoWithClinitFail.out -XDrawDiagnostics AnnoWithClinitFail.java
-+ */
-+
-+public @interface AnnoWithClinitFail {
-+ Foo f = new Foo();
-+
-+ String foo();
-+ String bar() default "bar";
-+
-+ @AnnoWithClinitFail
-+ static class C {} // this is in the same CU so there wont be a
-+ // <clinit> when the this anno instance is checked
-+
-+ class Foo {}
-+}
-+
-+@AnnoWithClinitFail
-+class TestAnnoWithClinitFail { }
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,3 @@
-+AnnoWithClinitFail.java:37:5: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo
-+AnnoWithClinitFail.java:44:1: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo
-+2 errors
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/DARanges.java Fri Apr 10 09:22:56 2015 -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.
-+ */
-+import java.lang.annotation.*;
-+
-+@Target({ElementType.METHOD})
-+@interface DARange {
-+ String varName();
-+ int bytecodeStart();
-+ int bytecodeLength();
-+}
-+
-+@Target({ElementType.METHOD})
-+@interface DARanges {DARange[] value();}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/LVTHarness.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,290 @@
-+/*
-+ * 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 8058708
-+ * @summary The LVT is not generated correctly during some try/catch scenarios
-+ * javac crash while creating LVT entry for a local variable defined in
-+ * an inner block
-+ * @library /tools/javac/lib
-+ * @build JavacTestingAbstractProcessor LVTHarness
-+ * @run main LVTHarness
-+ */
-+
-+import java.io.File;
-+import java.io.IOException;
-+import java.lang.annotation.Annotation;
-+import java.util.Set;
-+import java.util.Arrays;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.List;
-+import java.util.Map;
-+
-+import javax.annotation.processing.RoundEnvironment;
-+import javax.lang.model.element.Element;
-+import javax.lang.model.element.TypeElement;
-+import javax.tools.JavaCompiler;
-+import javax.tools.JavaFileObject;
-+import javax.tools.StandardJavaFileManager;
-+import javax.tools.ToolProvider;
-+
-+import com.sun.source.util.JavacTask;
-+import com.sun.tools.classfile.Attribute;
-+import com.sun.tools.classfile.ClassFile;
-+import com.sun.tools.classfile.ConstantPool;
-+import com.sun.tools.classfile.ConstantPoolException;
-+import com.sun.tools.classfile.Code_attribute;
-+import com.sun.tools.classfile.ConstantPool.InvalidIndex;
-+import com.sun.tools.classfile.ConstantPool.UnexpectedEntry;
-+import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
-+import com.sun.tools.classfile.LocalVariableTable_attribute;
-+import com.sun.tools.classfile.Method;
-+
-+import static javax.tools.StandardLocation.*;
-+import static com.sun.tools.classfile.LocalVariableTable_attribute.Entry;
-+import static javax.tools.JavaFileObject.Kind.SOURCE;
-+
-+public class LVTHarness {
-+
-+ static int nerrors = 0;
-+
-+ static final JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
-+ static final StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
-+
-+ public static void main(String[] args) throws Exception {
-+
-+ String testDir = System.getProperty("test.src");
-+ fm.setLocation(SOURCE_PATH, Arrays.asList(new File(testDir, "tests")));
-+
-+ // Make sure classes are written to scratch dir.
-+ fm.setLocation(CLASS_OUTPUT, Arrays.asList(new File(".")));
-+
-+ for (JavaFileObject jfo : fm.list(SOURCE_PATH, "", Collections.singleton(SOURCE), true)) {
-+ new LVTHarness(jfo).check();
-+ }
-+ if (nerrors > 0) {
-+ throw new AssertionError("Errors were found");
-+ }
-+ }
-+
-+
-+ JavaFileObject jfo;
-+ Map<ElementKey, DARanges> aliveRangeMap = new HashMap<ElementKey, DARanges>();
-+ Set<String> declaredKeys = new HashSet<String>();
-+ List<ElementKey> seenDARanges = new ArrayList<ElementKey>();
-+
-+ protected LVTHarness(JavaFileObject jfo) {
-+ this.jfo = jfo;
-+ }
-+
-+ protected void check() throws Exception {
-+
-+ JavacTask ct = (JavacTask) comp.getTask(null, fm, null, Arrays.asList("-g"),
-+ null, Arrays.asList(jfo));
-+ System.err.println("compiling code " + jfo);
-+ ct.setProcessors(Collections.singleton(new DARangeFinder()));
-+ if (!ct.call()) {
-+ throw new AssertionError("Error during compilation");
-+ }
-+
-+
-+ File javaFile = new File(jfo.getName());
-+ File classFile = new File(javaFile.getName().replace(".java", ".class"));
-+ checkClassFile(classFile);
-+
-+ //check all candidates have been used up
-+ for (Map.Entry<ElementKey, DARanges> entry : aliveRangeMap.entrySet()) {
-+ if (!seenDARanges.contains(entry.getKey())) {
-+ error("Redundant @DARanges annotation on method " +
-+ entry.getKey().elem + " with key " + entry.getKey());
-+ }
-+ }
-+ }
-+
-+ void checkClassFile(File file)
-+ throws IOException, ConstantPoolException, InvalidDescriptor {
-+ ClassFile classFile = ClassFile.read(file);
-+ ConstantPool constantPool = classFile.constant_pool;
-+
-+ //lets get all the methods in the class file.
-+ for (Method method : classFile.methods) {
-+ for (ElementKey elementKey: aliveRangeMap.keySet()) {
-+ String methodDesc = method.getName(constantPool) +
-+ method.descriptor.getParameterTypes(constantPool).replace(" ", "");
-+ if (methodDesc.equals(elementKey.elem.toString())) {
-+ checkMethod(constantPool, method, aliveRangeMap.get(elementKey));
-+ seenDARanges.add(elementKey);
-+ }
-+ }
-+ }
-+ }
-+
-+ void checkMethod(ConstantPool constantPool, Method method, DARanges ranges)
-+ throws InvalidIndex, UnexpectedEntry {
-+ Code_attribute code = (Code_attribute) method.attributes.get(Attribute.Code);
-+ LocalVariableTable_attribute lvt =
-+ (LocalVariableTable_attribute) (code.attributes.get(Attribute.LocalVariableTable));
-+ List<String> infoFromRanges = convertToStringList(ranges);
-+ List<String> infoFromLVT = convertToStringList(constantPool, lvt);
-+
-+ // infoFromRanges most be contained in infoFromLVT
-+ int i = 0;
-+ int j = 0;
-+ while (i < infoFromRanges.size() && j < infoFromLVT.size()) {
-+ int comparison = infoFromRanges.get(i).compareTo(infoFromLVT.get(j));
-+ if (comparison == 0) {
-+ i++; j++;
-+ } else if (comparison > 0) {
-+ j++;
-+ } else {
-+ break;
-+ }
-+ }
-+
-+ if (i < infoFromRanges.size()) {
-+ error(infoFromLVT, infoFromRanges);
-+ }
-+ }
-+
-+ List<String> convertToStringList(DARanges ranges) {
-+ List<String> result = new ArrayList<String>();
-+ for (Annotation anno : ranges.value()) {
-+ DARange range = (DARange)anno;
-+ String str = formatLocalVariableData(range.varName(),
-+ range.bytecodeStart(), range.bytecodeLength());
-+ result.add(str);
-+ }
-+ Collections.sort(result);
-+ return result;
-+ }
-+
-+ List<String> convertToStringList(ConstantPool constantPool,
-+ LocalVariableTable_attribute lvt) throws InvalidIndex, UnexpectedEntry {
-+ List<String> result = new ArrayList<String>();
-+ for (Entry entry : lvt.local_variable_table) {
-+ String str = formatLocalVariableData(constantPool.getUTF8Value(entry.name_index),
-+ entry.start_pc, entry.length);
-+ result.add(str);
-+ }
-+ Collections.sort(result);
-+ return result;
-+ }
-+
-+ String formatLocalVariableData(String varName, int start, int length) {
-+ StringBuilder sb = new StringBuilder()
-+ .append("var name: ").append(varName)
-+ .append(" start: ").append(start)
-+ .append(" length: ").append(length);
-+ return sb.toString();
-+ }
-+
-+ protected void error(List<String> infoFromLVT, List<String> infoFromRanges) {
-+ nerrors++;
-+ System.err.printf("Error occurred while checking file: %s\n", jfo.getName());
-+ System.err.println("The range info from the annotations is");
-+ printStringListToErrOutput(infoFromRanges);
-+ System.err.println();
-+ System.err.println("And the range info from the class file is");
-+ printStringListToErrOutput(infoFromLVT);
-+ System.err.println();
-+ }
-+
-+ void printStringListToErrOutput(List<String> list) {
-+ for (String s : list) {
-+ System.err.println("\t" + s);
-+ }
-+ }
-+
-+ protected void error(String msg) {
-+ nerrors++;
-+ System.err.printf("Error occurred while checking file: %s\nreason: %s\n",
-+ jfo.getName(), msg);
-+ }
-+
-+ class DARangeFinder extends JavacTestingAbstractProcessor {
-+
-+ @Override
-+ public boolean process(Set<? extends TypeElement> annotations,
-+ RoundEnvironment roundEnv) {
-+ if (roundEnv.processingOver())
-+ return true;
-+
-+ TypeElement aliveRangeAnno = elements.getTypeElement("DARanges");
-+
-+ if (!annotations.contains(aliveRangeAnno)) {
-+ error("no @DARanges annotation found in test class");
-+ }
-+
-+ for (Element elem: roundEnv.getElementsAnnotatedWith(aliveRangeAnno)) {
-+ Annotation annotation = elem.getAnnotation(DARanges.class);
-+ aliveRangeMap.put(new ElementKey(elem), (DARanges)annotation);
-+ }
-+ return true;
-+ }
-+ }
-+
-+ class ElementKey {
-+
-+ String key;
-+ Element elem;
-+
-+ public ElementKey(Element elem) {
-+ this.elem = elem;
-+ this.key = computeKey(elem);
-+ }
-+
-+ @Override
-+ public boolean equals(Object obj) {
-+ if (obj instanceof ElementKey) {
-+ ElementKey other = (ElementKey)obj;
-+ return other.key.equals(key);
-+ }
-+ return false;
-+ }
-+
-+ @Override
-+ public int hashCode() {
-+ return key.hashCode();
-+ }
-+
-+ String computeKey(Element e) {
-+ StringBuilder buf = new StringBuilder();
-+ while (e != null) {
-+ buf.append(e.toString());
-+ e = e.getEnclosingElement();
-+ }
-+ buf.append(jfo.getName());
-+ return buf.toString();
-+ }
-+
-+ @Override
-+ public String toString() {
-+ return "Key{" + key + "}";
-+ }
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseConditional.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,15 @@
-+public class TestCaseConditional {
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=5, bytecodeLength=33),
-+ @DARange(varName="oo", bytecodeStart=23, bytecodeLength=15)
-+ })
-+ void m(String[] args) {
-+ Boolean o;
-+ Boolean oo = ((o = Boolean.TRUE).booleanValue()) ?
-+ o = Boolean.TRUE :
-+ Boolean.FALSE;
-+ oo.hashCode();
-+ o = Boolean.FALSE;
-+ o.hashCode();
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseDoLoop.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,15 @@
-+public class TestCaseDoLoop {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=3, bytecodeLength=15),
-+ @DARange(varName="args", bytecodeStart=0, bytecodeLength=18)
-+ })
-+ void m(String[] args) {
-+ Object o;
-+ do {
-+ o = "";
-+ o.hashCode();
-+ } while (args[0] != null);
-+ o = "";
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseFor.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,29 @@
-+public class TestCaseFor {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=10, bytecodeLength=11),
-+ @DARange(varName="o", bytecodeStart=24, bytecodeLength=1)
-+ })
-+ void m1(String[] args) {
-+ Object o;
-+ for (int i = 0; i < 5; i++) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=10, bytecodeLength=11),
-+ @DARange(varName="o", bytecodeStart=24, bytecodeLength=1)
-+ })
-+ void m2(String[] args) {
-+ Object o;
-+ for (int i = 0; i < 5; i++) {
-+ o = "";
-+ o.hashCode();
-+ continue;
-+ }
-+ o = "";
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseForEach.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,15 @@
-+public class TestCaseForEach {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=25, bytecodeLength=11),
-+ @DARange(varName="o", bytecodeStart=39, bytecodeLength=1)
-+ })
-+ void m(String[] args) {
-+ Object o;
-+ for (String s : args) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseIf.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,84 @@
-+public class TestCaseIf {
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=9, bytecodeLength=5),
-+ @DARange(varName="o", bytecodeStart=17, bytecodeLength=1)
-+ })
-+ void m0(String[] args) {
-+ Object o;
-+ if (args[0] != null) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=10, bytecodeLength=5),
-+ @DARange(varName="o", bytecodeStart=18, bytecodeLength=1)
-+ })
-+ void m1() {
-+ Object o;
-+ int i = 5;
-+ if (i == 5) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=10, bytecodeLength=5),
-+ @DARange(varName="o", bytecodeStart=18, bytecodeLength=1)
-+ })
-+ void m2() {
-+ Object o;
-+ int i = 5;
-+ if (!(i == 5)) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=15, bytecodeLength=5),
-+ @DARange(varName="o", bytecodeStart=23, bytecodeLength=1)
-+ })
-+ void m3(String[] args) {
-+ Object o;
-+ if (args[0] != null && args[1] != null) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=15, bytecodeLength=5),
-+ @DARange(varName="o", bytecodeStart=23, bytecodeLength=1)
-+ })
-+ void m4(String[] args) {
-+ Object o;
-+ if (args[0] != null || args[1] != null) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="finalLocal", bytecodeStart=11, bytecodeLength=6),
-+ @DARange(varName="used", bytecodeStart=13, bytecodeLength=4)
-+ })
-+ void m5(Object o) {
-+ if (o != null) {
-+ Object notUsed;
-+ Object used;
-+ if (o != null) {
-+ final Object finalLocal = null;
-+ used = null;
-+ if (o == null) {}
-+ }
-+ }
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseIfElse.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,69 @@
-+public class TestCaseIfElse {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=9, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=20, bytecodeLength=9)
-+ })
-+ void m0(String[] args) {
-+ Object o;
-+ if (args[0] != null) {
-+ o = "then";
-+ o.hashCode();
-+ } else {
-+ o = "else";
-+ o.hashCode();
-+ }
-+ o = "finish";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=10, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=21, bytecodeLength=9)
-+ })
-+ void m1() {
-+ Object o;
-+ int i = 5;
-+ if (i == 5) {
-+ o = "then";
-+ o.hashCode();
-+ } else {
-+ o = "else";
-+ o.hashCode();
-+ }
-+ o = "finish";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=10, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=21, bytecodeLength=9)
-+ })
-+ void m2() {
-+ Object o;
-+ int i = 5;
-+ if (i != 5) {
-+ o = "then";
-+ o.hashCode();
-+ } else {
-+ o = "else";
-+ o.hashCode();
-+ }
-+ o = "finish";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=11, bytecodeLength=3),
-+ @DARange(varName="o", bytecodeStart=17, bytecodeLength=2)
-+ })
-+ Object m3(boolean cond1, boolean cond2) {
-+ Object o;
-+ if (cond1) {
-+ if (cond2) {
-+ o = "then";
-+ } else {
-+ o = "else";
-+ return null;
-+ }
-+ }
-+ return null;
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseLocalInInnerBlock.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,20 @@
-+public class TestCaseLocalInInnerBlock {
-+
-+ @DARanges({
-+ @DARange(varName="fm", bytecodeStart=23, bytecodeLength=10),
-+ @DARange(varName="newWidth", bytecodeStart=2, bytecodeLength=33),
-+ @DARange(varName="tc", bytecodeStart=5, bytecodeLength=30)
-+ })
-+ int m() {
-+ int newWidth = 0;
-+ String tc = "b";
-+ if (tc != null) {
-+ String fm;
-+ if (tc.trim() != null) {
-+ } else if ((fm = "b") != null) {
-+ newWidth += fm.length();
-+ }
-+ }
-+ return newWidth;
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseSwitch.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,86 @@
-+public class TestCaseSwitch {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=31, bytecodeLength=16),
-+ @DARange(varName="o", bytecodeStart=50, bytecodeLength=15),
-+ @DARange(varName="o", bytecodeStart=68, bytecodeLength=1),
-+ @DARange(varName="oo", bytecodeStart=39, bytecodeLength=8),
-+ @DARange(varName="uu", bytecodeStart=59, bytecodeLength=6)
-+ })
-+ void m1(String[] args) {
-+ Object o;
-+ switch (args.length) {
-+ case 0:
-+ o = "0";
-+ o.hashCode();
-+ Object oo = "oo";
-+ oo.hashCode();
-+ break;
-+ case 1:
-+ o = "1";
-+ o.hashCode();
-+ Object uu = "uu";
-+ uu.hashCode();
-+ break;
-+ }
-+ o = "return";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=35, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=46, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=78, bytecodeLength=5),
-+ @DARange(varName="o", bytecodeStart=86, bytecodeLength=1),
-+ @DARange(varName="oo", bytecodeStart=56, bytecodeLength=16)
-+ })
-+ void m3(int i) {
-+ Object o;
-+ switch (i) {
-+ case 0:
-+ o = "0";
-+ o.hashCode();
-+ break;
-+ case 1:
-+ o = "1";
-+ o.hashCode();
-+ break;
-+ case 2:
-+ int oo = i;
-+ if (oo > 1) {
-+ System.out.println("greater");
-+ }
-+ break;
-+ case 3:
-+ int uu = i;
-+ default:
-+ o = "default";
-+ o.hashCode();
-+ }
-+ o = "finish";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="oCache", bytecodeStart=30, bytecodeLength=6),
-+ @DARange(varName="cache", bytecodeStart=41, bytecodeLength=3),
-+ @DARange(varName="cache", bytecodeStart=54, bytecodeLength=2),
-+ @DARange(varName="service", bytecodeStart=39, bytecodeLength=5)
-+ })
-+ public Object m(int i) {
-+ Object cache;
-+ switch (i) {
-+ case 0:
-+ Object oCache = null;
-+ if (oCache != null) {
-+ return oCache;
-+ }
-+ case 1:
-+ Object service = null;
-+ cache = null;
-+ break;
-+ default:
-+ throw new AssertionError("");
-+ }
-+ return cache;
-+ }
-+
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseTry.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,55 @@
-+public class TestCaseTry {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=3, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=15, bytecodeLength=1)
-+ })
-+ void m0(String[] args) {
-+ Object o;
-+ try {
-+ o = "";
-+ o.hashCode();
-+ } catch (RuntimeException e) {}
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=3, bytecodeLength=16),
-+ @DARange(varName="o", bytecodeStart=23, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=35, bytecodeLength=11)
-+ })
-+ void m1() {
-+ Object o;
-+ try {
-+ o = "";
-+ o.hashCode();
-+ } catch (RuntimeException e) {
-+ }
-+ finally {
-+ o = "finally";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=3, bytecodeLength=16),
-+ @DARange(varName="o", bytecodeStart=23, bytecodeLength=16),
-+ @DARange(varName="o", bytecodeStart=43, bytecodeLength=11)
-+ })
-+ void m2() {
-+ Object o;
-+ try {
-+ o = "";
-+ o.hashCode();
-+ } catch (RuntimeException e) {
-+ o = "catch";
-+ o.hashCode();
-+ }
-+ finally {
-+ o = "finally";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./langtools/test/tools/javac/flow/tests/TestCaseWhile.java Fri Apr 10 09:22:56 2015 -0700
-@@ -0,0 +1,15 @@
-+public class TestCaseWhile {
-+
-+ @DARanges({
-+ @DARange(varName="o", bytecodeStart=9, bytecodeLength=8),
-+ @DARange(varName="o", bytecodeStart=20, bytecodeLength=1)
-+ })
-+ void m(String[] args) {
-+ Object o;
-+ while (args[0] != null) {
-+ o = "";
-+ o.hashCode();
-+ }
-+ o = "";
-+ }
-+}
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh Mon Jan 05 12:00:55 2015 -0800
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh Fri Apr 10 09:22:56 2015 -0700
-@@ -71,4 +71,5 @@
- "${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
-+chmod -R u+w src
- rm -fr src
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 17:14:26 +0000