/hg/release/icedtea7-forest-2.4/jaxp: 30 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 16 18:41:51 UTC 2014
changeset de5d093cca22 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=de5d093cca22
author: katleman
date: Fri Dec 20 18:53:06 2013 -0800
Added tag jdk7u51-b31 for changeset e85ee81daec2
changeset 47e89524451d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=47e89524451d
author: katleman
date: Thu Dec 26 13:05:04 2013 -0800
Added tag jdk7u51-b30 for changeset 3161567adae9
changeset 5d1c151c6931 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5d1c151c6931
author: asaha
date: Tue Dec 31 08:58:33 2013 -0800
Merge
changeset bb7779a8fc4d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=bb7779a8fc4d
author: asaha
date: Mon Dec 16 12:13:09 2013 -0800
Added tag jdk7u55-b00 for changeset 807946db29f4
changeset 362a62e01eb5 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=362a62e01eb5
author: asaha
date: Mon Dec 16 14:54:05 2013 -0800
Added tag jdk7u55-b01 for changeset bb7779a8fc4d
changeset cc383c0bb24c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=cc383c0bb24c
author: asaha
date: Mon Dec 16 18:51:39 2013 -0800
Merge
changeset 2178f4130d54 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2178f4130d54
author: asaha
date: Fri Dec 20 11:49:36 2013 -0800
Merge
changeset 9e0431568793 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=9e0431568793
author: asaha
date: Fri Dec 20 14:15:03 2013 -0800
Merge
changeset 8275dc4db7f8 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=8275dc4db7f8
author: asaha
date: Fri Dec 20 21:33:49 2013 -0800
Merge
changeset 2f790a3687eb in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=2f790a3687eb
author: katleman
date: Tue Dec 24 14:46:31 2013 -0800
Added tag jdk7u55-b02 for changeset 8275dc4db7f8
changeset 381e73f93a83 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=381e73f93a83
author: asaha
date: Thu Dec 26 15:54:47 2013 -0800
Merge
changeset 7d1d9e4c655d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=7d1d9e4c655d
author: katleman
date: Mon Jan 06 13:57:04 2014 -0800
Added tag jdk7u55-b03 for changeset 381e73f93a83
changeset b196086e5dba in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b196086e5dba
author: katleman
date: Wed Jan 08 13:24:02 2014 -0800
Added tag jdk7u45-b35 for changeset 7fda9b300e07
changeset 1a6c3258ad21 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=1a6c3258ad21
author: asaha
date: Wed Jan 08 14:15:07 2014 -0800
Merge
changeset 6fb45ae3fdfa in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=6fb45ae3fdfa
author: asaha
date: Thu Jan 09 07:57:21 2014 -0800
Merge
changeset c72c57f71c2b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c72c57f71c2b
author: aefimov
date: Mon Jan 13 19:07:53 2014 +0400
8029282: Enhance CharInfo set up
Reviewed-by: joehw
changeset 269625fabc9f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=269625fabc9f
author: katleman
date: Mon Jan 13 16:14:48 2014 -0800
Added tag jdk7u55-b04 for changeset c72c57f71c2b
changeset 5592b0c44617 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=5592b0c44617
author: aefimov
date: Thu Jan 16 12:56:28 2014 +0400
8031330: Refactor ObjectFactory
Reviewed-by: joehw
changeset c59d71409008 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c59d71409008
author: katleman
date: Wed Jan 22 10:06:51 2014 -0800
Added tag jdk7u55-b05 for changeset 5592b0c44617
changeset 125ea54089ad in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=125ea54089ad
author: katleman
date: Tue Jan 28 11:49:39 2014 -0800
Added tag jdk7u55-b06 for changeset c59d71409008
changeset 39337c00cb3c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=39337c00cb3c
author: katleman
date: Tue Feb 04 13:12:02 2014 -0800
Added tag jdk7u55-b07 for changeset 125ea54089ad
changeset 537f4f609132 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=537f4f609132
author: katleman
date: Tue Feb 11 13:11:28 2014 -0800
Added tag jdk7u55-b08 for changeset 39337c00cb3c
changeset 997bdd44d5de in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=997bdd44d5de
author: katleman
date: Tue Feb 18 12:41:27 2014 -0800
Added tag jdk7u55-b09 for changeset 537f4f609132
changeset 606483a43e8b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=606483a43e8b
author: katleman
date: Tue Feb 18 13:36:20 2014 -0800
Added tag jdk7u55-b09 for changeset 997bdd44d5de
changeset f3f02e67d867 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f3f02e67d867
author: katleman
date: Tue Feb 25 12:20:32 2014 -0800
Added tag jdk7u55-b10 for changeset 606483a43e8b
changeset 708a1872f5bb in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=708a1872f5bb
author: katleman
date: Tue Mar 04 12:01:53 2014 -0800
Added tag jdk7u55-b11 for changeset f3f02e67d867
changeset 14719f73596f in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=14719f73596f
author: katleman
date: Tue Mar 11 12:59:44 2014 -0700
Added tag jdk7u55-b12 for changeset 708a1872f5bb
changeset 01f26830f88c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=01f26830f88c
author: katleman
date: Tue Mar 18 12:07:53 2014 -0700
Added tag jdk7u55-b13 for changeset 14719f73596f
changeset 26187a65c765 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=26187a65c765
author: katleman
date: Thu Mar 27 11:23:09 2014 -0700
Added tag jdk7u55-b30 for changeset 01f26830f88c
changeset 481d5d80aada in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=481d5d80aada
author: andrew
date: Wed Apr 16 19:41:05 2014 +0100
Merge jdk7u55-b14
diffstat:
.hgtags | 36 ++
.jcheck/conf | 2 -
src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java | 25 +-
src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java | 2 +-
src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java | 3 +
src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java | 14 +-
src/com/sun/org/apache/xml/internal/serializer/CharInfo.java | 125 ++++-----
src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java | 2 +-
src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java | 2 +-
9 files changed, 116 insertions(+), 95 deletions(-)
diffs (truncated from 502 to 500 lines):
diff -r e85ee81daec2 -r 481d5d80aada .hgtags
--- a/.hgtags Thu Dec 19 09:33:55 2013 -0800
+++ b/.hgtags Wed Apr 16 19:41:05 2014 +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
@@ -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,9 +391,12 @@
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
+7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35
0a8b95184728548be4b20876e05f76e0262e4195 jdk7u51-b00
2450ace952f45202e5a3fd4f6a8356a196fe029e jdk7u51-b01
68def851cc6b17944756f1986734b323d8569571 jdk7u51-b02
@@ -397,3 +411,25 @@
70b5691c44d2830efd4301856e6223fa43894462 jdk7u51-b11
807946db29f42477e8d8390be01c7e27280bc85c jdk7u51-b12
114654a331e2f97a048d7ed43d06d7512e20e2c1 jdk7u51-b13
+8fe156ad49e2db0e5034ffda4649e801b9c315da icedtea-2.4.5
+e0ba4b9a8b91c10bacd0b316b2e04717e0f4662a icedtea-2.4.6pre01
+e0ba4b9a8b91c10bacd0b316b2e04717e0f4662a icedtea-2.4.6
+94b7e8e0d96fee2552fe830d989897a5deabbc9a icedtea-2.4.7
+3161567adae93d12c64b79592bda3046f0c0a22d jdk7u51-b30
+e85ee81daec2ea2fa21bf804d03431b0664c6dff jdk7u51-b31
+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
+01f26830f88cf4f10897416fe1f4f372efcdecf5 jdk7u55-b30
diff -r e85ee81daec2 -r 481d5d80aada .jcheck/conf
--- a/.jcheck/conf Thu Dec 19 09:33:55 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java
--- a/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Wed Apr 16 19:41:05 2014 +0100
@@ -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);
diff -r e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java
--- a/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Wed Apr 16 19:41:05 2014 +0100
@@ -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;
diff -r e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Wed Apr 16 19:41:05 2014 +0100
@@ -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 e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java
--- a/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Wed Apr 16 19:41:05 2014 +0100
@@ -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);
diff -r e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xml/internal/serializer/CharInfo.java
--- a/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java Wed Apr 16 19:41:05 2014 +0100
@@ -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. */
diff -r e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
--- a/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java Wed Apr 16 19:41:05 2014 +0100
@@ -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();
diff -r e85ee81daec2 -r 481d5d80aada src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
--- a/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java Thu Dec 19 09:33:55 2013 -0800
+++ b/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java Wed Apr 16 19:41:05 2014 +0100
@@ -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);
More information about the distro-pkg-dev
mailing list