/hg/release/icedtea7-forest-2.4/jaxp: 24 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 21 06:26:05 PDT 2013
changeset 4056df34b559 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4056df34b559
author: katleman
date: Wed Jul 17 11:09:22 2013 -0700
Added tag jdk7u40-b34 for changeset 23ba797b9e78
changeset b9d1d855a8fa in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=b9d1d855a8fa
author: katleman
date: Wed Jul 24 14:45:02 2013 -0700
Added tag jdk7u40-b35 for changeset 4056df34b559
changeset 19b243d00f77 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=19b243d00f77
author: asaha
date: Thu Apr 11 10:34:35 2013 -0700
Merge
changeset 936d94ee4fbb in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=936d94ee4fbb
author: katleman
date: Wed May 01 14:52:24 2013 -0700
Added tag jdk7u21-b31 for changeset 19b243d00f77
changeset a27a39484964 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a27a39484964
author: asaha
date: Thu Jun 06 13:20:00 2013 -0700
Merge
changeset 3b3f67de012b in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=3b3f67de012b
author: katleman
date: Tue May 28 10:36:30 2013 -0700
Added tag jdk7u21-b50 for changeset a320a590b4ca
changeset 35710c8bd73d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=35710c8bd73d
author: asaha
date: Thu Jun 06 22:22:24 2013 -0700
Merge
changeset c02dbd8fd8ca in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c02dbd8fd8ca
author: katleman
date: Tue Jun 11 17:49:05 2013 -0700
Added tag jdk7u25-b31 for changeset 35710c8bd73d
changeset ebe5d88948e9 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=ebe5d88948e9
author: katleman
date: Tue Jun 18 11:15:04 2013 -0700
Added tag jdk7u25-b33 for changeset c02dbd8fd8ca
changeset fdfab0b74b2d in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=fdfab0b74b2d
author: asaha
date: Tue Jul 16 15:30:49 2013 -0700
Merge
changeset 4be5a82783d8 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=4be5a82783d8
author: katleman
date: Thu Jul 18 20:46:40 2013 -0700
Added tag jdk7u25-b34 for changeset ebe5d88948e9
changeset 41ed89370291 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=41ed89370291
author: asaha
date: Fri Jul 19 22:18:58 2013 -0700
Merge
changeset 41dad9bdff95 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=41dad9bdff95
author: asaha
date: Tue Jul 23 20:41:26 2013 -0700
Merge
changeset 651037d8a713 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=651037d8a713
author: asaha
date: Wed Jul 24 18:59:41 2013 -0700
Merge
changeset 704518b26725 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=704518b26725
author: jeff
date: Thu Jul 25 12:30:27 2013 -0700
8014850: Third Party License Readme updates for 7u40
Reviewed-by: lana, tbell
changeset c83e85b19f60 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=c83e85b19f60
author: lana
date: Thu Jul 25 14:12:54 2013 -0700
Merge
changeset 07024f18376c in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=07024f18376c
author: joehw
date: Thu Jul 25 18:10:49 2013 -0700
8021148: Regression in SAXParserImpl in 7u40 b34 (NPE)
Reviewed-by: chegar, lancea, dfuchs
changeset f40f45bd95d4 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=f40f45bd95d4
author: cl
date: Wed Jul 31 21:27:16 2013 -0700
Added tag jdk7u40-b36 for changeset 07024f18376c
changeset 680bf140cdd5 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=680bf140cdd5
author: asaha
date: Fri Aug 02 13:10:43 2013 -0700
Added tag jdk7u40-b37 for changeset f40f45bd95d4
changeset aa1a36b918b8 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=aa1a36b918b8
author: asaha
date: Wed Aug 07 12:09:31 2013 -0700
Added tag jdk7u40-b38 for changeset 680bf140cdd5
changeset a9f9a58b21cc in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=a9f9a58b21cc
author: joehw
date: Fri Aug 09 13:57:37 2013 -0700
8022548: SPECJVM2008 has errors introduced in 7u40-b34
Reviewed-by: chegar, lancea
changeset 322af0a5cdce in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=322af0a5cdce
author: lana
date: Fri Aug 09 14:39:43 2013 -0700
Merge
changeset 6ea57bdf6030 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=6ea57bdf6030
author: katleman
date: Mon Aug 12 12:07:40 2013 -0700
Added tag jdk7u40-b39 for changeset 322af0a5cdce
changeset 90b1dbd6baf6 in /hg/release/icedtea7-forest-2.4/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp?cmd=changeset;node=90b1dbd6baf6
author: andrew
date: Wed Aug 21 14:21:20 2013 +0100
Merge jdk7u40-b40
diffstat:
.hgtags | 21 +++++
.jcheck/conf | 2 -
THIRD_PARTY_README | 33 ++++++++-
src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java | 37 +++++++--
src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java | 9 ++-
src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java | 9 ++-
src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java | 12 ++-
7 files changed, 104 insertions(+), 19 deletions(-)
diffs (375 lines):
diff -r 23ba797b9e78 -r 90b1dbd6baf6 .hgtags
--- a/.hgtags Tue Jul 16 11:03:40 2013 -0700
+++ b/.hgtags Wed Aug 21 14:21:20 2013 +0100
@@ -50,6 +50,7 @@
feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -123,6 +126,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
@@ -141,6 +145,7 @@
0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
@@ -157,6 +162,7 @@
7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
@@ -191,6 +197,7 @@
94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -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
@@ -288,7 +296,9 @@
bf2d62ea518d5e4130e442e07705e7a50b821ad9 jdk7u21-b10
3e0e331bdfb8f3adfd0cc78118e0ac588e73a2b5 jdk7u21-b11
980fe893d8fd86d8aee14771167b6e0ac75fa208 jdk7u21-b30
+a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b50
a320a590b4cac6eeff53829bde520ef46880b006 jdk7u21-b12
+19b243d00f7740072d051d3fb531f01083cbe999 jdk7u21-b31
5704dc942da676677a820d16c9a08fc6cad5b3bb jdk7u25-b01
f9c1fe7cd1194e785807f07005369631b35b28d8 jdk7u25-b02
fe858d7d6a13829d0ef0a1f762bd0e769cd24fa1 jdk7u25-b03
@@ -304,6 +314,9 @@
83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13
68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14
503f75b55b34ae22f43b2992b1e56c96e35a60de jdk7u25-b15
+35710c8bd73dbfdd4805e8b3c506f500daf553c7 jdk7u25-b31
+c02dbd8fd8ca142e3987537f7ac43da361fcf9d4 jdk7u25-b33
+ebe5d88948e9f2fd707c808eceb9343f4f32e122 jdk7u25-b34
8c35f2344beeb42e85d718e95813e6fdc2f0a605 jdk7u25-b30
9cebeb3118aca6e356f80a37ac38088ddcc8fb73 jdk7u25-b16
0d4cfe518086198516e6729fc28b161f66524a66 jdk7u25-b32
@@ -314,6 +327,7 @@
331e489ecb7b19fa98c60324f7ce5d168284a8c8 jdk7u14-b19
c3c9f04cf10c2fe576b208f6a8ca3777b1d31145 jdk7u14-b19
5e1fee011646b4a3ff29b7b9cdc208e0a0577cb4 jdk7u14-b20
+7f04ed6cb0c382a16c2ffaad05c6122482e03b2e icedtea-2.4.0
d1c8bb1cbc9183fc994b5fedf26886ceda0d59f9 jdk7u14-b21
d1c6afebdfe28eb07eb2d03a6911a0f33b619165 jdk7u14-b22
0e4c549d3635122145ac88bad7b98716976ca49e jdk7u40-b23
@@ -324,6 +338,13 @@
9186b6efd2b2eafa7fee5be1b043f59f25db12a6 jdk7u40-b28
740942c76fb668a04bf89feccf069f6958651d54 jdk7u40-b29
09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30
+5be6b670d08bb0464e0e259ef77fca6adba24b05 icedtea-2.4.1
5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31
75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32
ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33
+23ba797b9e78231806d837f7fb4f9feef6dcd61a jdk7u40-b34
+4056df34b559b904edc9f94a323769f19cf8f426 jdk7u40-b35
+07024f18376ce9597ec8679ebcb9f2efdc5afab0 jdk7u40-b36
+f40f45bd95d4140f691c03132f2ab2c8a0233a8f jdk7u40-b37
+680bf140cdd58e7878318ecafc41c9db47ebfacd jdk7u40-b38
+322af0a5cdce6cad8421a73c1b9af345361dfba0 jdk7u40-b39
diff -r 23ba797b9e78 -r 90b1dbd6baf6 .jcheck/conf
--- a/.jcheck/conf Tue Jul 16 11:03:40 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 23ba797b9e78 -r 90b1dbd6baf6 THIRD_PARTY_README
--- a/THIRD_PARTY_README Tue Jul 16 11:03:40 2013 -0700
+++ b/THIRD_PARTY_README Wed Aug 21 14:21:20 2013 +0100
@@ -1912,6 +1912,35 @@
-------------------------------------------------------------------------------
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
%% Portions licensed from Taligent, Inc.
-------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
%% This notice is provided with respect to the following which is
included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
- Apache Derby 10.8.1.2 [included with JDK 7 only]
+ Apache Derby 10.8.3.0 [included with JDK 7 only]
Apache Jakarta BCEL 5.2
Apache Jakarta Regexp 1.4
Apache Santuario XMLSec-Java 1.4.2
Apache Xalan-Java 2.7.1
- Apache Xerces2 Java 2.10.0
+ Apache Xerces2 Java 2.11.0
Apache XML Resolver 1.1
diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Tue Jul 16 11:03:40 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Wed Aug 21 14:21:20 2013 +0100
@@ -112,7 +112,7 @@
/** Initial EntityResolver */
private final EntityResolver fInitEntityResolver;
- private XMLSecurityPropertyManager fSecurityPropertyMgr;
+ private final XMLSecurityPropertyManager fSecurityPropertyMgr;
/**
* Create a SAX parser with the associated features
@@ -130,8 +130,10 @@
SAXParserImpl(SAXParserFactoryImpl spf, Hashtable features, boolean secureProcessing)
throws SAXException
{
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+
// Instantiate a SAXParser directly and not through SAX so that we use the right ClassLoader
- xmlReader = new JAXPSAXParser(this);
+ xmlReader = new JAXPSAXParser(this, fSecurityPropertyMgr);
// JAXP "namespaceAware" == SAX Namespaces feature
// Note: there is a compatibility problem here with default values:
@@ -150,7 +152,6 @@
xmlReader.setFeature0(XINCLUDE_FEATURE, true);
}
- fSecurityPropertyMgr = new XMLSecurityPropertyManager();
xmlReader.setProperty0(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
// If the secure processing feature is on set a security manager.
@@ -397,14 +398,32 @@
private final HashMap fInitFeatures = new HashMap();
private final HashMap fInitProperties = new HashMap();
private final SAXParserImpl fSAXParser;
+ private XMLSecurityPropertyManager fSecurityPropertyMgr;
+
public JAXPSAXParser() {
- this(null);
+ this(null, null);
}
- JAXPSAXParser(SAXParserImpl saxParser) {
+ JAXPSAXParser(SAXParserImpl saxParser, XMLSecurityPropertyManager spm) {
super();
fSAXParser = saxParser;
+ fSecurityPropertyMgr = spm;
+
+ /**
+ * This class may be used directly. So initialize the security manager if
+ * it is null.
+ */
+ if (fSecurityPropertyMgr == null) {
+ fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+ try {
+ super.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
+ } catch (SAXException e) {
+ throw new UnsupportedOperationException(
+ SAXMessageFormatter.formatMessage(fConfiguration.getLocale(),
+ "property-not-recognized", new Object [] {SECURITY_MANAGER}), e);
+ }
+ }
}
/**
@@ -542,9 +561,9 @@
setSchemaValidatorProperty(name, value);
}
/** Check to see if the property is managed by the property manager **/
- int index = fSAXParser.fSecurityPropertyMgr.getIndex(name);
+ int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
if (index > -1) {
- fSAXParser.fSecurityPropertyMgr.setValue(index,
+ fSecurityPropertyMgr.setValue(index,
XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
} else {
if (!fInitProperties.containsKey(name)) {
@@ -564,9 +583,9 @@
// JAXP 1.2 support
return fSAXParser.schemaLanguage;
}
- int index = fSAXParser.fSecurityPropertyMgr.getIndex(name);
+ int index = (fSecurityPropertyMgr != null) ? fSecurityPropertyMgr.getIndex(name) : -1;
if (index > -1) {
- return fSAXParser.fSecurityPropertyMgr.getValueByIndex(index);
+ return fSecurityPropertyMgr.getValueByIndex(index);
}
return super.getProperty(name);
diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
--- a/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Tue Jul 16 11:03:40 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java Wed Aug 21 14:21:20 2013 +0100
@@ -38,6 +38,7 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLLocator;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -184,6 +185,10 @@
protected static final String LOCALE =
Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
+ /** Property identifier: Security property manager. */
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
// debugging
/** Set to true and recompile to print exception stack trace. */
@@ -328,7 +333,8 @@
VALIDATION_MANAGER,
JAXP_SCHEMA_SOURCE,
JAXP_SCHEMA_LANGUAGE,
- LOCALE
+ LOCALE,
+ XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
@@ -406,6 +412,7 @@
// REVISIT: What is the right thing to do? -Ac
}
+ setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
} // <init>(SymbolTable,XMLGrammarPool)
//
diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
--- a/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Tue Jul 16 11:03:40 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java Wed Aug 21 14:21:20 2013 +0100
@@ -36,6 +36,7 @@
import com.sun.org.apache.xerces.internal.util.PropertyState;
import com.sun.org.apache.xerces.internal.util.Status;
import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
import com.sun.org.apache.xerces.internal.xni.XMLLocator;
import com.sun.org.apache.xerces.internal.xni.XNIException;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -157,6 +158,10 @@
protected static final String LOCALE =
Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
+ /** Property identifier: Security property manager. */
+ protected static final String XML_SECURITY_PROPERTY_MANAGER =
+ Constants.XML_SECURITY_PROPERTY_MANAGER;
+
// debugging
/** Set to true and recompile to print exception stack trace. */
@@ -310,7 +315,8 @@
XMLGRAMMAR_POOL,
DATATYPE_VALIDATOR_FACTORY,
VALIDATION_MANAGER,
- LOCALE
+ LOCALE,
+ XML_SECURITY_PROPERTY_MANAGER
};
addRecognizedProperties(recognizedProperties);
@@ -367,6 +373,7 @@
// REVISIT: What is the right thing to do? -Ac
}
+ setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
} // <init>(SymbolTable,XMLGrammarPool)
//
diff -r 23ba797b9e78 -r 90b1dbd6baf6 src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
--- a/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Tue Jul 16 11:03:40 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java Wed Aug 21 14:21:20 2013 +0100
@@ -76,6 +76,7 @@
XMLGRAMMAR_POOL,
};
+ XMLSecurityPropertyManager securityPropertyManager;
//
// Constructors
//
@@ -129,16 +130,19 @@
*/
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
- XMLSecurityPropertyManager spm = new XMLSecurityPropertyManager();
- int index = spm.getIndex(name);
+ if (securityPropertyManager == null) {
+ securityPropertyManager = new XMLSecurityPropertyManager();
+ }
+ int index = securityPropertyManager.getIndex(name);
+
if (index > -1) {
/**
* this is a direct call to this parser, not a subclass since
* internally the support of this property is done through
* XMLSecurityPropertyManager
*/
- spm.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
- super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, spm);
+ securityPropertyManager.setValue(index, XMLSecurityPropertyManager.State.APIPROPERTY, (String)value);
+ super.setProperty(Constants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
} else {
super.setProperty(name, value);
}
More information about the distro-pkg-dev
mailing list