/hg/release/icedtea7-forest-2.4/jaxp: 42 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 17 12:23:50 PST 2014
changeset 056494e83d15 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=056494e83d15
author: cl
date: Wed Oct 09 09:34:55 2013 -0700
Added tag jdk7u45-b31 for changeset 3c34f244296e
changeset d439603c2c1d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=d439603c2c1d
author: joehw
date: Mon Aug 26 20:39:36 2013 -0700
8022935: Enhance Apache resolver classes
Reviewed-by: alanb, mchung, skoivu
changeset 821f4884bf5a in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=821f4884bf5a
author: asaha
date: Tue Aug 27 15:36:21 2013 -0700
Merge
changeset b58b3eebb5d9 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b58b3eebb5d9
author: asaha
date: Wed Sep 04 12:28:58 2013 -0700
Merge
changeset 71670df6abf8 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=71670df6abf8
author: asaha
date: Wed Sep 11 15:32:33 2013 -0700
Merge
changeset a21c2865342f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a21c2865342f
author: asaha
date: Thu Sep 12 08:10:00 2013 -0700
Merge
changeset b5cd020bcc60 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b5cd020bcc60
author: asaha
date: Wed Sep 18 11:18:34 2013 -0700
Merge
changeset ed11b0eb4ce8 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ed11b0eb4ce8
author: asaha
date: Wed Sep 18 11:32:36 2013 -0700
Merge
changeset 1c4467ab7019 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1c4467ab7019
author: asaha
date: Thu Sep 19 15:32:49 2013 -0700
Merge
changeset ae069ad1324d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ae069ad1324d
author: asaha
date: Tue Sep 24 10:54:19 2013 -0700
Merge
changeset 47eb61009d86 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=47eb61009d86
author: asaha
date: Thu Sep 26 11:25:04 2013 -0700
Merge
changeset 0af40df02030 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0af40df02030
author: asaha
date: Fri Sep 27 12:16:39 2013 -0700
Merge
changeset 3a348ded5559 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3a348ded5559
author: asaha
date: Fri Sep 27 13:17:26 2013 -0700
Merge
changeset 07fa2d34974d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=07fa2d34974d
author: asaha
date: Mon Sep 30 10:59:57 2013 -0700
Added tag jdk7u51-b00 for changeset 0a8b95184728
changeset 2450ace952f4 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2450ace952f4
author: asaha
date: Mon Sep 30 11:13:54 2013 -0700
Merge
changeset f3bdb445348f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f3bdb445348f
author: cl
date: Tue Oct 01 08:36:47 2013 -0700
Added tag jdk7u51-b01 for changeset 2450ace952f4
changeset 7a6fa252ff6f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7a6fa252ff6f
author: asaha
date: Tue Oct 08 11:55:17 2013 -0700
Merge
changeset 68def851cc6b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=68def851cc6b
author: asaha
date: Wed Oct 09 09:54:51 2013 -0700
Merge
changeset 0df316a3b311 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0df316a3b311
author: cl
date: Thu Oct 10 10:16:38 2013 -0700
Added tag jdk7u51-b02 for changeset 68def851cc6b
changeset 1f0996368d6e in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1f0996368d6e
author: cl
date: Tue Oct 15 09:32:02 2013 -0700
Added tag jdk7u51-b03 for changeset 0df316a3b311
changeset 42be8e6266ab in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=42be8e6266ab
author: joehw
date: Tue Oct 22 12:59:33 2013 -0700
8025018: Enhance JAX-P set up
Reviewed-by: alanb, dfuchs, lancea, ahgross
changeset 0655a95d1609 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=0655a95d1609
author: cl
date: Tue Oct 22 22:23:52 2013 -0700
Added tag jdk7u51-b04 for changeset 42be8e6266ab
changeset 13a15fc9b6bf in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=13a15fc9b6bf
author: cl
date: Tue Oct 29 09:09:05 2013 -0700
Added tag jdk7u51-b05 for changeset 0655a95d1609
changeset bbbfbe6d0a9f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=bbbfbe6d0a9f
author: cl
date: Tue Nov 05 10:58:39 2013 -0800
Added tag jdk7u51-b06 for changeset 13a15fc9b6bf
changeset 9736e845a3c1 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9736e845a3c1
author: mfang
date: Thu Nov 07 12:19:09 2013 -0800
8027787: 7u51 l10n resource file translation update 1
Reviewed-by: yhuang
changeset 8e4523e579bf in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8e4523e579bf
author: mfang
date: Thu Nov 07 12:51:00 2013 -0800
Merge
changeset b38271b28253 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b38271b28253
author: cl
date: Tue Nov 12 08:51:45 2013 -0800
Added tag jdk7u51-b07 for changeset 8e4523e579bf
changeset 783ceae9b736 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=783ceae9b736
author: joehw
date: Thu Nov 14 09:47:24 2013 -0800
8027201: Enhance JAX-P set up
Reviewed-by: alanb, dfuchs, lancea, hawtin
changeset 7875c882a751 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7875c882a751
author: cl
date: Tue Nov 19 08:37:07 2013 -0800
Added tag jdk7u51-b08 for changeset 783ceae9b736
changeset 8c288622817f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8c288622817f
author: asaha
date: Wed Nov 27 08:21:53 2013 -0800
Added tag jdk7u51-b09 for changeset 7875c882a751
changeset 394a207d1250 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=394a207d1250
author: coffeys
date: Thu Nov 21 19:36:12 2013 +0000
8028111: XML readers share the same entity expansion counter
Reviewed-by: joehw, robm
changeset 55e8ea7085b7 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=55e8ea7085b7
author: coffeys
date: Tue Nov 26 19:33:19 2013 +0000
8029038: Revise fix for XML readers share the same entity expansion counter
Reviewed-by: joehw, mbankal
changeset 65798d05674d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=65798d05674d
author: asaha
date: Wed Nov 27 11:19:35 2013 -0800
Merge
changeset 70b5691c44d2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=70b5691c44d2
author: katleman
date: Wed Dec 04 10:11:14 2013 -0800
Added tag jdk7u51-b10 for changeset 65798d05674d
changeset 807946db29f4 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=807946db29f4
author: katleman
date: Tue Dec 10 13:16:04 2013 -0800
Added tag jdk7u51-b11 for changeset 70b5691c44d2
changeset 114654a331e2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=114654a331e2
author: katleman
date: Sat Dec 14 11:51:26 2013 -0800
Added tag jdk7u51-b12 for changeset 807946db29f4
changeset b5a83862ed2a in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b5a83862ed2a
author: cl
date: Mon Nov 25 11:02:29 2013 -0800
Added tag jdk7u45-b33 for changeset 056494e83d15
changeset 7fda9b300e07 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7fda9b300e07
author: katleman
date: Fri Dec 06 13:07:32 2013 -0800
Added tag jdk7u45-b34 for changeset b5a83862ed2a
changeset 57466a32e645 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=57466a32e645
author: asaha
date: Tue Dec 17 11:12:54 2013 -0800
Merge
changeset 3161567adae9 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3161567adae9
author: katleman
date: Thu Dec 19 09:01:08 2013 -0800
Added tag jdk7u51-b13 for changeset 114654a331e2
changeset e85ee81daec2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=e85ee81daec2
author: asaha
date: Thu Dec 19 09:33:55 2013 -0800
Merge
changeset 8fe156ad49e2 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8fe156ad49e2
author: andrew
date: Fri Jan 17 20:22:46 2014 +0000
Merge jdk7u51-b31
diffstat:
.hgtags | 30 ++++
.jcheck/conf | 2 -
src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java | 44 ++---
src/com/sun/org/apache/xalan/internal/lib/Extensions.java | 68 ++------
src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 3 +
src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java | 24 ++-
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java | 74 ++++-----
src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java | 2 +
src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 14 +-
src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties | 2 +-
src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java | 6 +-
src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java | 45 ++----
src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java | 2 +
src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java | 13 +-
src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java | 21 +-
src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java | 27 +--
17 files changed, 178 insertions(+), 201 deletions(-)
diffs (truncated from 952 to 500 lines):
diff -r 3c34f244296e -r 8fe156ad49e2 .hgtags
--- a/.hgtags Tue Oct 08 11:12:27 2013 -0700
+++ b/.hgtags Fri Jan 17 20:22:46 2014 +0000
@@ -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
@@ -258,6 +265,7 @@
1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
+14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint
23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10
825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11
560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12
@@ -335,6 +343,7 @@
331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19
5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20
+7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0
d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21
d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22
0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23
@@ -345,6 +354,7 @@
9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30
+5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1
5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31
75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32
ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33
@@ -359,6 +369,7 @@
66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42
c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43
91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60
+135f46e0e653be2631da1da2fd166f2d52c67aa7 icedtea-2.4.2
c500d4ec41ff2117eabfa33e640b6df2f21deb3d jdk7u40-b61
9e3f8ab9d17be6b1a4a097fcc5bc5412013d3e86 jdk7u40-b62
1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
@@ -380,3 +391,22 @@
2586d303503b5bb6fd39dc0ce572d6e858caf41c jdk7u45-b17
4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
+8f220f7b51c715a204e09fa6abf326df791b1f1c icedtea-2.4.3
+44952a12fe8f55371eb317be962b4e93c13a815d icedtea-2.4.4
+3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31
+056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33
+b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34
+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
diff -r 3c34f244296e -r 8fe156ad49e2 .jcheck/conf
--- a/.jcheck/conf Tue Oct 08 11:12:27 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 3c34f244296e -r 8fe156ad49e2 src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
--- a/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Tue Oct 08 11:12:27 2013 -0700
+++ b/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Fri Jan 17 20:22:46 2014 +0000
@@ -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);
}
}
-
}
diff -r 3c34f244296e -r 8fe156ad49e2 src/com/sun/org/apache/xalan/internal/lib/Extensions.java
--- a/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Tue Oct 08 11:12:27 2013 -0700
+++ b/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Fri Jan 17 20:22:46 2014 +0000
@@ -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);
}
}
}
diff -r 3c34f244296e -r 8fe156ad49e2 src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Tue Oct 08 11:12:27 2013 -0700
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Fri Jan 17 20:22:46 2014 +0000
@@ -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);
diff -r 3c34f244296e -r 8fe156ad49e2 src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Tue Oct 08 11:12:27 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Fri Jan 17 20:22:46 2014 +0000
@@ -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),
diff -r 3c34f244296e -r 8fe156ad49e2 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Oct 08 11:12:27 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Fri Jan 17 20:22:46 2014 +0000
@@ -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;
More information about the distro-pkg-dev
mailing list