changeset 599:aac1cda37627

Merge jdk7u25-b16
author andrew
date Thu, 08 Aug 2013 23:15:34 +0100
parents 5393f32bae76 (diff) 9cebeb3118ac (current diff)
children d31a609466d9
files .hgtags src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java src/com/sun/org/apache/bcel/internal/util/Class2HTML.java src/com/sun/org/apache/bcel/internal/util/ClassPath.java src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java src/com/sun/org/apache/xalan/internal/res/XSLMessages.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java src/com/sun/org/apache/xalan/internal/xslt/Process.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java src/com/sun/org/apache/xerces/internal/util/SecurityManager.java src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java src/com/sun/org/apache/xml/internal/dtm/DTMManager.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java src/com/sun/org/apache/xml/internal/res/XMLMessages.java src/com/sun/org/apache/xml/internal/resolver/Catalog.java src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java src/com/sun/org/apache/xml/internal/resolver/Resolver.java src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java src/com/sun/org/apache/xml/internal/serializer/Encodings.java src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java src/com/sun/org/apache/xml/internal/serializer/ToStream.java src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java src/com/sun/org/apache/xml/internal/utils/TreeWalker.java src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java src/com/sun/xml/internal/stream/XMLEntityStorage.java src/com/sun/xml/internal/stream/writers/WriterUtility.java src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java src/javax/xml/datatype/FactoryFinder.java src/javax/xml/parsers/FactoryFinder.java src/javax/xml/stream/FactoryFinder.java src/javax/xml/transform/FactoryFinder.java src/javax/xml/validation/SchemaFactoryFinder.java src/javax/xml/xpath/XPathFactoryFinder.java src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java src/org/xml/sax/helpers/NewInstance.java src/org/xml/sax/helpers/ParserAdapter.java src/org/xml/sax/helpers/ParserFactory.java src/org/xml/sax/helpers/XMLReaderFactory.java
diffstat 2 files changed, 24 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 11 11:45:22 2013 -0700
+++ b/.hgtags	Thu Aug 08 23:15:34 2013 +0100
@@ -50,6 +50,7 @@
 feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
 d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -123,6 +126,7 @@
 bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
@@ -141,6 +145,7 @@
 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
@@ -157,6 +162,7 @@
 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
@@ -191,6 +197,7 @@
 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -199,6 +206,15 @@
 8824bcbfd7cd8059ededf70f1e7f2b06f02cb33f jdk7u6-b23
 378f719cfb9491b766cd9f7cd47ad7fa3503e141 jdk7u6-b24
 5f1b80e8baec46fc28826a3a6ab8e1913c872f4c jdk7u6-b30
+1d3e59049a8998841ec63bc119adb1ea3f4c7116 icedtea-2.3
+20e3c00ca7ae9649a40b385223a6c3b0d1155b93 icedtea-2.3.1
+9bd1d8e8b802a8e22637c8a2e0acad9c9cb4a114 icedtea-2.3.2
+ee4bd94136ece0fed96b7b8d18f4d99f74fbd326 icedtea-2.3.3
+f45296ac69be649f775ac878387e96fd16504b81 icedtea-2.3.4
+91fcc41a0b4b27db954f1bb44b1b6ebe1780b7bb icedtea-2.3.5
+dce7523618e418ebd4505dc574a9f3772c15758c icedtea-2.3.6
+dce7523618e418ebd4505dc574a9f3772c15758c icedtea-2.3.6
+0000000000000000000000000000000000000000 icedtea-2.3.6
 2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u6-b31
 2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u7-b10
 c4aa15da8529451cc678d5747e7b82e9cc38627e jdk7u7-b30
@@ -237,6 +253,10 @@
 225aa78c36e9b776c87e585329bbb7ee0e3259a3 jdk7u11-b07
 48491f5a58172f0fbdf9b774842c2ec1a42f609a jdk7u11-b08
 eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u13-b09
+0000000000000000000000000000000000000000 icedtea-2.3.6
+387d46be7c40696fcadd9f15c5538e8517af79d1 icedtea-2.3.6
+d7feafb8427bd47a4b9239ff529999d65b0936ac icedtea-2.3.7
+1d46a56eb51c0efa3ef68a8aab67b3d992e36645 icedtea-2.3.8
 f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b10
 0a6a09e5174a4c15632ff7e06d6b215164e3fa15 jdk7u13-b30
 f9fe0d38b1103cb33073538c959d982e28ed7b11 jdk7u13-b20
@@ -248,6 +268,10 @@
 a55f67cfe182dc42a86aae836674eb8ba5b79891 jdk7u15-b03
 eb9d57159e5126cf4316c9571ac39324a8b442a8 jdk7u15-b32
 8a9867ee429440b657eb5852c4dae5f029356022 jdk7u17-b01
+d2142901bcb789071858ae249d5a29f12d8bce78 icedtea-2.3.9
+1a02956fcfaf708c626e06105dbf615594af88f7 icedtea-2.3.10
+181faea8867b60279d38450b37c52a916fd11046 icedtea-2.3.11
+332f0234a53eb42c90363abcdf361ae5f2b71ffa icedtea-2.3.12
 7863a60ae4b4a0c7d762a95e77e589fafa4e50ae jdk7u17-b02
 a5e6594fc1ae20101b5d69632f65078d7a99b76d jdk7u17-b30
 8fb34202383ece5386acecc3a6c1dac68dccbf05 jdk7u17-b31
--- a/.jcheck/conf	Tue Jun 11 11:45:22 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup