Mercurial > hg > release > icedtea7-forest-2.4 > jaxp
changeset 759:07be083abb61
Merge
author | asaha |
---|---|
date | Mon, 05 Aug 2013 13:46:58 -0700 |
parents | bf0795a73135 (current diff) 853504c1e317 (diff) |
children | a7b1dcabdebb |
files | .hgtags |
diffstat | 3 files changed, 43 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 05 11:52:35 2013 -0700 +++ b/.hgtags Mon Aug 05 13:46:58 2013 -0700 @@ -350,9 +350,10 @@ ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33 23ba797b9e78231806d837f7fb4f9feef6dcd61a jdk7u40-b34 4056df34b559b904edc9f94a323769f19cf8f426 jdk7u40-b35 +07024f18376ce9597ec8679ebcb9f2efdc5afab0 jdk7u40-b36 +f40f45bd95d4140f691c03132f2ab2c8a0233a8f jdk7u40-b37 1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01 72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02 399c58bf22ad35a3527a286123497615100746b2 jdk7u45-b03 e66ea9257ba8a77fc64f6f2924584b183767d82b jdk7u45-b04 -ae46ee9bbea014ea277b2afbafd5ed1e912f8ce9 jdk7u45-b05 -0000000000000000000000000000000000000000 jdk7u45-b05 +3a6dce39c05c254aba9f3ae57c035bf3facfe8b9 jdk7u45-b05
--- a/THIRD_PARTY_README Mon Aug 05 11:52:35 2013 -0700 +++ b/THIRD_PARTY_README Mon Aug 05 13:46:58 2013 -0700 @@ -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
--- a/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Mon Aug 05 11:52:35 2013 -0700 +++ b/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Mon Aug 05 13:46:58 2013 -0700 @@ -402,6 +402,7 @@ private XMLSecurityManager fSecurityManager; private XMLSecurityPropertyManager fSecurityPropertyMgr; + public JAXPSAXParser() { this(null, null, null); } @@ -420,16 +421,20 @@ fSecurityManager = new XMLSecurityManager(true); try { super.setProperty(SECURITY_MANAGER, fSecurityManager); - } catch (Exception ex) { - //shall not happen + } catch (SAXException e) { + throw new UnsupportedOperationException( + SAXMessageFormatter.formatMessage(fConfiguration.getLocale(), + "property-not-recognized", new Object [] {SECURITY_MANAGER}), e); } } if (fSecurityPropertyMgr == null) { fSecurityPropertyMgr = new XMLSecurityPropertyManager(); try { super.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr); - } catch (Exception ex) { - //shall not happen + } catch (SAXException e) { + throw new UnsupportedOperationException( + SAXMessageFormatter.formatMessage(fConfiguration.getLocale(), + "property-not-recognized", new Object [] {XML_SECURITY_PROPERTY_MANAGER}), e); } } }