/hg/release/icedtea7-forest-2.6/jaxp: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 20 21:52:14 UTC 2015
changeset 35dc0af3c933 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=35dc0af3c933
author: aefimov
date: Tue Apr 28 15:04:23 2015 +0300
8068842: Better JAXP data handling
Reviewed-by: joehw, dfuchs, lancea
changeset 7fb0bb6f3bd0 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=7fb0bb6f3bd0
author: aefimov
date: Tue Apr 28 16:07:40 2015 +0300
8078822: 8068842 fix missed one new file PrimeNumberSequenceGenerator.java
Reviewed-by: joehw, dfuchs, lancea
changeset ba508fc2eeb6 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=ba508fc2eeb6
author: aefimov
date: Wed Jun 03 17:05:41 2015 +0300
8078427: More supportive home environment
Reviewed-by: dfuchs, lancea, skoivu
changeset fe931343ad6a in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=fe931343ad6a
author: aefimov
date: Sun Jul 12 22:35:12 2015 +0300
8086733: Improve namespace handling
Reviewed-by: dfuchs, lancea, ahgross
changeset ab72c17cd492 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=ab72c17cd492
author: aefimov
date: Wed Jul 15 18:40:53 2015 +0300
8130078: Document better processing
Reviewed-by: dfuchs, lancea, ahgross
changeset e95e9042c8f3 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=e95e9042c8f3
author: aefimov
date: Fri May 15 11:24:22 2015 +0300
8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization
Reviewed-by: dfuchs, lancea, hawtin
changeset 9f5bcd95c8d5 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=9f5bcd95c8d5
author: andrew
date: Mon Oct 19 09:41:34 2015 +0100
Added tag jdk7u91-b00 for changeset e95e9042c8f3
changeset d16fa19bd343 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=d16fa19bd343
author: andrew
date: Mon Oct 19 09:48:09 2015 +0100
Merge jdk7u91-b00
diffstat:
.hgtags | 45 +
.jcheck/conf | 2 -
make/Makefile | 4 +-
src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java | 20 +-
src/com/sun/org/apache/xalan/internal/lib/Extensions.java | 32 +-
src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java | 30 +-
src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java | 400 +--
src/com/sun/org/apache/xalan/internal/xsltc/DOM.java | 22 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java | 25 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java | 35 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java | 35 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java | 20 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java | 26 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java | 27 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java | 263 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java | 25 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java | 26 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java | 20 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java | 100 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java | 89 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java | 91 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java | 88 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java | 108 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java | 130 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java | 23 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java | 21 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java | 23 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java | 49 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java | 22 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java | 18 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java | 44 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java | 89 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java | 25 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java | 19 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java | 25 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java | 53 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java | 61 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java | 42 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java | 92 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java | 28 +-
src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java | 117 +-
src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 53 +-
src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java | 345 ---
src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java | 29 +-
src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java | 3 +-
src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java | 29 +-
src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java | 85 +-
src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java | 26 +-
src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java | 89 +-
src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java | 704 ++++---
src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java | 20 +-
src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java | 182 +-
src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java | 121 +-
src/com/sun/org/apache/xerces/internal/dom/LCount.java | 27 +-
src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java | 23 +-
src/com/sun/org/apache/xerces/internal/dom/ParentNode.java | 18 +-
src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java | 80 +-
src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java | 121 +-
src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java | 74 +-
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 40 +-
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java | 7 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 69 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java | 69 +-
src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java | 81 +-
src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java | 13 +-
src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java | 43 +-
src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java | 200 +-
src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java | 76 +-
src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java | 22 +-
src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java | 70 +-
src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java | 67 +-
src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java | 10 +
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties | 6 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties | 2 +-
src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java | 138 +-
src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java | 27 +-
src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java | 113 +-
src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java | 18 +-
src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java | 69 +-
src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java | 100 +-
src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java | 17 +-
src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java | 30 +-
src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java | 90 +-
src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java | 43 +-
src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java | 59 +-
src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java | 32 +-
src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java | 38 +-
src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java | 58 +-
src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java | 55 +-
src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java | 260 +-
src/com/sun/org/apache/xerces/internal/util/DOMUtil.java | 29 +-
src/com/sun/org/apache/xerces/internal/util/EncodingMap.java | 925 ++++-----
src/com/sun/org/apache/xerces/internal/util/PrimeNumberSequenceGenerator.java | 45 +
src/com/sun/org/apache/xerces/internal/util/SymbolHash.java | 148 +-
src/com/sun/org/apache/xerces/internal/util/SymbolTable.java | 285 ++-
src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java | 134 -
src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java | 304 ++-
src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java | 25 +-
src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java | 41 +-
src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java | 9 +
src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java | 119 +-
src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 2 +-
src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java | 61 +-
src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java | 6 +-
src/com/sun/org/apache/xml/internal/resolver/Catalog.java | 73 +-
src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java | 47 +-
src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java | 45 +-
src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java | 33 +-
src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java | 29 +-
src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java | 41 +-
src/com/sun/org/apache/xml/internal/serialize/ElementState.java | 20 +-
src/com/sun/org/apache/xml/internal/serialize/Encodings.java | 34 +-
src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java | 29 +-
src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java | 47 +-
src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java | 32 +-
src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java | 35 +-
src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java | 45 +-
src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java | 30 +-
src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java | 27 +-
src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java | 45 +-
src/com/sun/org/apache/xml/internal/serializer/Utils.java | 80 -
src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java | 16 +-
src/com/sun/org/apache/xml/internal/utils/DOMHelper.java | 40 +-
src/com/sun/org/apache/xml/internal/utils/ElemDesc.java | 28 +-
src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java | 751 --------
src/com/sun/org/apache/xml/internal/utils/TreeWalker.java | 49 +-
src/com/sun/org/apache/xpath/internal/compiler/Keywords.java | 502 +++--
src/com/sun/xml/internal/stream/Entity.java | 6 +-
src/com/sun/xml/internal/stream/XMLEntityStorage.java | 31 +-
src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java | 162 +-
src/org/xml/sax/helpers/NamespaceSupport.java | 74 +-
135 files changed, 4928 insertions(+), 5929 deletions(-)
diffs (truncated from 19234 to 500 lines):
diff -r b5c74ec32065 -r d16fa19bd343 .hgtags
--- a/.hgtags Thu Aug 27 23:31:51 2015 +0100
+++ b/.hgtags Mon Oct 19 09:48:09 2015 +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
@@ -186,11 +192,15 @@
f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10
5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11
c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b01
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b02
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b03
15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13
da79c0fdf9a8b5403904e6ffdd8f5dc335d489d0 jdk7u6-b14
94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -258,12 +268,14 @@
1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
+14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint
23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10
825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11
560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12
937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13
7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14
aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15
+1d1e1fc3b88d2fda0c7da55ee3abb2b455e0d317 ppc-aix-port-b04
99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01
edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02
14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30
@@ -382,6 +394,7 @@
4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31
+d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33
b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34
7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35
@@ -431,8 +444,11 @@
d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
+74093b75ddd4fc2e578a3469d32b8bb2de3692d5 icedtea-2.5pre01
+d7085aad637fa90d027840c7f7066dba82b21667 icedtea-2.5pre02
359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03
7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04
+10314bfd5ba43a63f2f06353f3d219b877f5120f icedtea-2.6pre01
673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05
fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06
cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07
@@ -442,7 +458,11 @@
e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11
a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12
92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13
+a0138328f7db004859b30b9143ae61d598a21cf9 icedtea-2.6pre02
+33912ce9492d29c3faa5eb6787d5141f87ebb385 icedtea-2.6pre03
2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14
+c3178eab3782f4135ea21b060683d29bde3bbc7e icedtea-2.6pre04
+b9104a740dcd6ec07a868efd6f57dad3560e402c icedtea-2.6pre05
10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15
fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16
ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
@@ -582,10 +602,27 @@
6abf26813c3bd6047d5425e41dbc9dd1fd51cc63 jdk7u79-b15
7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
+614b7c12f276c52ebef06fb17c79cf0eadbcc774 icedtea-2.6pre07
+75513ef5e265955b432550ec73770b8404a4d36b icedtea-2.6pre06
+fbc3c0ab4c1d53059c32d330ca36cb33a3c04299 icedtea-2.6pre08
25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
+f59ee51637102611d2ecce975da8f4271bdee85f icedtea-2.6pre09
+603009854864635cbfc36e95f39b6da4070f541a icedtea-2.6pre10
+79d217da0a7a03fb071e7f2e99fbd5fc7c38aed5 icedtea-2.6pre11
1853995499cef61fc16e0e4b840276223314669b jdk7u80-b03
+1edb9d1d6451a8e147d74e69021bc3f00622b8c6 icedtea-2.6pre12
+a2841c1a7f292ee7ba33121435b566d347b99ddb icedtea-2.6pre13
+35cfccb24a9c229f960169ec986beae2329b0688 icedtea-2.6pre14
+133c38a2d10fdb95e332ceefa4db8cf765c8b413 icedtea-2.6pre15
+a41b3447afd7011c7d08b5077549695687b70ea4 icedtea-2.6pre16
+54100657ce67cb5164cb0683ceb58ae60542fd79 icedtea-2.6pre17
3f6f053831796f654ad8fd77a6e4f99163742649 jdk7u80-b04
b93c3e02132fd13971aea6df3c5f6fcd4c3b1780 jdk7u80-b05
+8cc37ea6edf6a464d1ef01578df02da984d2c79f icedtea-2.6pre18
+0e0fc4440a3ba74f0df5df62da9306f353e1d574 icedtea-2.6pre19
+3bb57abb921fcc182015e3f87b796af29fce4b68 icedtea-2.6pre20
+522863522a4d0b82790915d674ea37ef3b39c2a7 icedtea-2.6pre21
+8904cf73c0483d713996c71bf4496b748e014d2c icedtea-2.6pre22
d220098f4f327db250263b6c2b460fecec19331a jdk7u80-b06
535bdb640a91a8562b96799cefe9de94724ed761 jdk7u80-b07
3999f9baa3f0a28f82c6a7a073ad2f7a8e12866d jdk7u80-b08
@@ -598,6 +635,14 @@
1b435d2f2050ac43a7f89aadd0fdaa9bf0441e3d jdk7u80-b30
acfe75cb9d7a723fbaae0bf7e1b0fb3429df4ff8 jdk7u80-b15
b45dfccc8773ad062c128f63fa8073b0645f7848 jdk7u80-b32
+9150a16a7b801124e13a4f4b1260badecd96729a icedtea-2.6pre23
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6pre24
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6.0
b50728249c16d97369f0ed3e9d45302eae3943e4 jdk7u85-b00
e9190eeef373a9d2313829a9561e32cb722d68a9 jdk7u85-b01
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6-branchpoint
+ffbe529eeac7aa3b4cedd78be2f843c2f00f603c icedtea-2.6.1
d42101f9c06eebe7722c38d84d5ef228c0280089 jdk7u85-b02
+a5f1374a47150e3cdda1cc9a8775417ceaa62657 icedtea-2.6.2pre01
+4e264c1f6b2f335e0068608e9ec4c312cddde7a4 icedtea-2.6.2pre02
+e95e9042c8f31c5fe3149afdbe114592a3e32e91 jdk7u91-b00
diff -r b5c74ec32065 -r d16fa19bd343 .jcheck/conf
--- a/.jcheck/conf Thu Aug 27 23:31:51 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r b5c74ec32065 -r d16fa19bd343 make/Makefile
--- a/make/Makefile Thu Aug 27 23:31:51 2015 +0100
+++ b/make/Makefile Mon Oct 19 09:48:09 2015 +0100
@@ -118,13 +118,13 @@
ifdef ALT_LANGTOOLS_DIST
ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
- ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
+ ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR)
endif
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
ifdef ALT_JDK_IMPORT_PATH
ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
- ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
+ ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH)
endif
endif
diff -r b5c74ec32065 -r d16fa19bd343 src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
--- a/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java Thu Aug 27 23:31:51 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java Mon Oct 19 09:48:09 2015 +0100
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 1999-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -22,10 +22,10 @@
*/
package com.sun.org.apache.xalan.internal.lib;
-import java.util.Hashtable;
-
import com.sun.org.apache.xml.internal.utils.DOMHelper;
import com.sun.org.apache.xpath.internal.NodeSet;
+import java.util.HashMap;
+import java.util.Map;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -192,7 +192,7 @@
NodeSet dist = new NodeSet();
dist.setShouldCacheNodes(true);
- Hashtable stringTable = new Hashtable();
+ Map<String, Node> stringTable = new HashMap<>();
for (int i = 0; i < nl.getLength(); i++)
{
diff -r b5c74ec32065 -r d16fa19bd343 src/com/sun/org/apache/xalan/internal/lib/Extensions.java
--- a/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Thu Aug 27 23:31:51 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Mon Oct 19 09:48:09 2015 +0100
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 1999-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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -22,28 +22,24 @@
*/
package com.sun.org.apache.xalan.internal.lib;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import com.sun.org.apache.xalan.internal.extensions.ExpressionContext;
+import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
import com.sun.org.apache.xalan.internal.xslt.EnvironmentCheck;
import com.sun.org.apache.xpath.internal.NodeSet;
import com.sun.org.apache.xpath.internal.objects.XBoolean;
import com.sun.org.apache.xpath.internal.objects.XNumber;
import com.sun.org.apache.xpath.internal.objects.XObject;
-import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
-
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.StringTokenizer;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.w3c.dom.traversal.NodeIterator;
-
import org.xml.sax.SAXNotSupportedException;
/**
@@ -313,7 +309,7 @@
// If reflection failed, fallback to our internal EnvironmentCheck
EnvironmentCheck envChecker = new EnvironmentCheck();
- Hashtable h = envChecker.getEnvironmentHash();
+ Map<String, Object> h = envChecker.getEnvironmentHash();
resultNode = factoryDocument.createElement("checkEnvironmentExtension");
envChecker.appendEnvironmentReport(resultNode, factoryDocument, h);
envChecker = null;
diff -r b5c74ec32065 -r d16fa19bd343 src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
--- a/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Thu Aug 27 23:31:51 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java Mon Oct 19 09:48:09 2015 +0100
@@ -65,27 +65,31 @@
*/
public static enum Limit {
- ENTITY_EXPANSION_LIMIT(XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
+ ENTITY_EXPANSION_LIMIT("EntityExpansionLimit", XalanConstants.JDK_ENTITY_EXPANSION_LIMIT,
XalanConstants.SP_ENTITY_EXPANSION_LIMIT, 0, 64000),
- MAX_OCCUR_NODE_LIMIT(XalanConstants.JDK_MAX_OCCUR_LIMIT,
+ MAX_OCCUR_NODE_LIMIT("MaxOccurLimit", XalanConstants.JDK_MAX_OCCUR_LIMIT,
XalanConstants.SP_MAX_OCCUR_LIMIT, 0, 5000),
- ELEMENT_ATTRIBUTE_LIMIT(XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
+ ELEMENT_ATTRIBUTE_LIMIT("ElementAttributeLimit", XalanConstants.JDK_ELEMENT_ATTRIBUTE_LIMIT,
XalanConstants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000),
- TOTAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
+ TOTAL_ENTITY_SIZE_LIMIT("TotalEntitySizeLimit", XalanConstants.JDK_TOTAL_ENTITY_SIZE_LIMIT,
XalanConstants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000),
- GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
+ GENEAL_ENTITY_SIZE_LIMIT("MaxEntitySizeLimit", XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT,
XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0),
- PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
+ PARAMETER_ENTITY_SIZE_LIMIT("MaxEntitySizeLimit", XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT,
XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000),
- MAX_ELEMENT_DEPTH_LIMIT(XalanConstants.JDK_MAX_ELEMENT_DEPTH,
- XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0);
+ MAX_ELEMENT_DEPTH_LIMIT("MaxElementDepthLimit", XalanConstants.JDK_MAX_ELEMENT_DEPTH,
+ XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0),
+ MAX_NAME_LIMIT("MaxXMLNameLimit", XalanConstants.JDK_XML_NAME_LIMIT,
+ XalanConstants.SP_XML_NAME_LIMIT, 1000, 1000);
+ final String key;
final String apiProperty;
final String systemProperty;
final int defaultValue;
final int secureValue;
- Limit(String apiProperty, String systemProperty, int value, int secureValue) {
+ Limit(String key, String apiProperty, String systemProperty, int value, int secureValue) {
+ this.key = key;
this.apiProperty = apiProperty;
this.systemProperty = systemProperty;
this.defaultValue = value;
@@ -100,6 +104,10 @@
return (propertyName == null) ? false : systemProperty.equals(propertyName);
}
+ public String key() {
+ return key;
+ }
+
public String apiProperty() {
return apiProperty;
}
@@ -108,7 +116,7 @@
return systemProperty;
}
- int defaultValue() {
+ public int defaultValue() {
return defaultValue;
}
@@ -160,7 +168,7 @@
/**
* Index of the special entityCountInfo property
*/
- private int indexEntityCountInfo = 10000;
+ private final int indexEntityCountInfo = 10000;
private String printEntityCountInfo = "";
/**
diff -r b5c74ec32065 -r d16fa19bd343 src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
--- a/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java Thu Aug 27 23:31:51 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java Mon Oct 19 09:48:09 2015 +0100
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * 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.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
*
@@ -24,17 +24,17 @@
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
import com.sun.org.apache.xalan.internal.utils.SecuritySupport;
-
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Vector;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -171,7 +171,7 @@
outWriter = pw;
// Setup a hash to store various environment information in
- Hashtable hash = getEnvironmentHash();
+ Map<String, Object> hash = getEnvironmentHash();
// Check for ERROR keys in the hashtable, and print report
boolean environmentHasErrors = writeEnvironmentReport(hash);
@@ -214,13 +214,13 @@
* point out the most common classpath and system property
* problems that we've seen.</p>
*
- * @return Hashtable full of useful environment info about Xalan
- * and related system properties, etc.
+ * @return Map full of useful environment info about Xalan and related
+ * system properties, etc.
*/
- public Hashtable getEnvironmentHash()
+ public Map<String, Object> getEnvironmentHash()
{
// Setup a hash to store various environment information in
- Hashtable hash = new Hashtable();
+ Map<String, Object> hash = new HashMap<>();
// Call various worker methods to fill in the hash
// These are explicitly separate for maintenance and so
@@ -242,22 +242,22 @@
* Dump a basic Xalan environment report to outWriter.
*
* <p>This dumps a simple header and then each of the entries in
- * the Hashtable to our PrintWriter; it does special processing
+ * the Map to our PrintWriter; it does special processing
* for entries that are .jars found in the classpath.</p>
*
- * @param h Hashtable of items to report on; presumably
+ * @param h Map of items to report on; presumably
* filled in by our various check*() methods
* @return true if your environment appears to have no major
* problems; false if potential environment problems found
- * @see #appendEnvironmentReport(Node, Document, Hashtable)
+ * @see #appendEnvironmentReport(Node, Document, Map)
* for an equivalent that appends to a Node instead
*/
- protected boolean writeEnvironmentReport(Hashtable h)
+ protected boolean writeEnvironmentReport(Map<String, Object> h)
{
if (null == h)
{
- logMsg("# ERROR: writeEnvironmentReport called with null Hashtable");
+ logMsg("# ERROR: writeEnvironmentReport called with null Map");
return false;
}
@@ -267,39 +267,28 @@
"#---- BEGIN writeEnvironmentReport($Revision: 1.10 $): Useful stuff found: ----");
// Fake the Properties-like output
- for (Enumeration keys = h.keys();
- keys.hasMoreElements();
- /* no increment portion */
- )
- {
- Object key = keys.nextElement();
- String keyStr = (String) key;
- try
- {
- // Special processing for classes found..
- if (keyStr.startsWith(FOUNDCLASSES))
- {
- Vector v = (Vector) h.get(keyStr);
- errors |= logFoundJars(v, keyStr);
+ for (Map.Entry<String, Object> entry : h.entrySet()) {
+ String keyStr = entry.getKey();
+ try {
+ // Special processing for classes found..
+ if (keyStr.startsWith(FOUNDCLASSES)) {
+ List<Map> v = (ArrayList<Map>)entry.getValue();
+ errors |= logFoundJars(v, keyStr);
+ }
+ // ..normal processing for all other entries
+ else {
+ // Note: we could just check for the ERROR key by itself,
More information about the distro-pkg-dev
mailing list