Mercurial > hg > icedtea8-forest > jaxws
changeset 1726:f824de94c42e icedtea-3.10.0pre00 icedtea-3.9.0
Merge jdk8u181-b13
author | andrew |
---|---|
date | Wed, 05 Sep 2018 17:17:36 +0100 |
parents | 1670bdd974e2 (current diff) 2a12eb329cb9 (diff) |
children | f513ccead25f |
files | .hgtags |
diffstat | 5 files changed, 217 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 03 20:38:46 2018 +0100 +++ b/.hgtags Wed Sep 05 17:17:36 2018 +0100 @@ -868,6 +868,7 @@ b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u171-b00 25e6ecbfeb092b43c2a04014fe8f1bf03e005c63 jdk8u171-b01 294248d232cf45819af0d15000b0e172953f3fa9 jdk8u171-b02 +2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u181-b00 2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03 068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04 8479be9da1fa9572a36adcfce19bd36579c9c37c jdk8u171-b05 @@ -893,3 +894,17 @@ fc695409c23dca5cb6c0ebe22ee48100fe7aa893 jdk8u172-b09 7287e0008d111fdd1c259432f4883bb859d84221 jdk8u172-b10 10aadc3f09474a50a5d40c6cc2867fc7f4d92f95 icedtea-3.9.0pre02 +980c4675006fb42ef630d3020f502635bd8811e3 jdk8u172-b11 +878ad885b1cf41de2bdcf143f15edc10c0238920 jdk8u181-b01 +7a978c1e3ac0f8ef05c4b1ca3526db204f978f2e jdk8u181-b02 +291ef420de8c8c5eb6c7004dd99c41d150f59696 jdk8u181-b03 +711ace1c558d14a086481048254bab4821489533 jdk8u181-b04 +09b083e0759c73cd8c3aae6940c9ffb890e66b80 jdk8u181-b05 +49f87757336025a7caa1b9b5100358fe67ef17ab jdk8u181-b06 +9582f56dddd1c696234f43ecb5a8634a7f9f801c jdk8u181-b07 +1bb2d70147a0b1449136e49c256c257f405688bb jdk8u181-b08 +e92ee3b672446b6e9dfbc9a54495ab3fd0bc0021 jdk8u181-b09 +cc55da2f27700b75f83b0501660cff4e63ad27d9 jdk8u181-b10 +1ce36a1fca8d437720b014c0123ce87ff89131ab jdk8u181-b11 +0e8e98ee9f488e885295d4a4fa2f38ab2e123c77 jdk8u181-b12 +53bfabba0febe143d6df8c607c3fb1b37c7abd05 jdk8u181-b31
--- a/THIRD_PARTY_README Mon Sep 03 20:38:46 2018 +0100 +++ b/THIRD_PARTY_README Wed Sep 05 17:17:36 2018 +0100 @@ -181,6 +181,192 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to DejaVu fonts v2.34, which may be +included with JRE 8, and JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated documentation +files (the "Font Software"), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit persons +to whom the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the +fonts are renamed to names not containing either the words "Bitstream" +or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts or +Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT +OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN +THE FONT SOFTWARE. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the GNOME Foundation or +Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by the American Mathematical Society. This is not meant to restrict +in any way the legitimate use of the fonts, such as (but not limited to) +electronic distribution of documents containing these fonts, inclusion of +these fonts into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% This notice is provided with respect to Document Object Model (DOM) Level 2 & 3, which may be included with JRE 8, JDK 8, and OpenJDK 8.
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java Mon Sep 03 20:38:46 2018 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java Wed Sep 05 17:17:36 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamWriter; import com.sun.xml.internal.bind.marshaller.CharacterEscapeHandler; +import com.sun.xml.internal.bind.marshaller.NoEscapeHandler; import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; @@ -71,7 +72,7 @@ } CharacterEscapeHandler xmlStreamEscapeHandler = escapeHandler != null ? - escapeHandler : NewLineEscapeHandler.theInstance; + escapeHandler : NoEscapeHandler.theInstance; // otherwise the normal writer. return new XMLStreamWriterOutput(out, xmlStreamEscapeHandler); @@ -217,45 +218,6 @@ } } - - /** - * Performs character escaping only for new lines. - */ - private static class NewLineEscapeHandler implements CharacterEscapeHandler { - - public static final NewLineEscapeHandler theInstance = new NewLineEscapeHandler(); - - @Override - public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException { - int limit = start+length; - int lastEscaped = start; - - for (int i = start; i < limit; i++) { - char c = ch[i]; - if (c == '\r' || c == '\n') { - if (i != lastEscaped) { - out.write(ch, lastEscaped, i - lastEscaped); - } - lastEscaped = i + 1; - if (out instanceof XmlStreamOutWriterAdapter) { - try { - ((XmlStreamOutWriterAdapter)out).writeEntityRef("#x" + Integer.toHexString(c)); - } catch (XMLStreamException e) { - throw new IOException("Error writing xml stream", e); - } - } else { - out.write("&#x"); - out.write(Integer.toHexString(c)); - out.write(';'); - } - } - } - if (lastEscaped != limit) { - out.write(ch, lastEscaped, length - lastEscaped); - } - } - } - private static final class XmlStreamOutWriterAdapter extends Writer { private final XMLStreamWriter writer;
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java Mon Sep 03 20:38:46 2018 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java Wed Sep 05 17:17:36 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -386,7 +386,7 @@ } - private static class HasEncodingWriter extends XMLStreamWriterFilter implements HasEncoding { + public static class HasEncodingWriter extends XMLStreamWriterFilter implements HasEncoding { private final String encoding; HasEncodingWriter(XMLStreamWriter writer, String encoding) { @@ -399,7 +399,7 @@ return encoding; } - XMLStreamWriter getWriter() { + public XMLStreamWriter getWriter() { return writer; } }
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java Mon Sep 03 20:38:46 2018 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java Wed Sep 05 17:17:36 2018 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ package com.sun.xml.internal.ws.streaming; import com.sun.istack.internal.Nullable; +import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory; import com.sun.xml.internal.ws.encoding.HasEncoding; import com.sun.xml.internal.ws.encoding.SOAPBindingCodec; @@ -57,9 +58,15 @@ public static @Nullable OutputStream getOutputStream(XMLStreamWriter writer) throws XMLStreamException { Object obj = null; + XMLStreamWriter xmlStreamWriter = + writer instanceof XMLStreamWriterFactory.HasEncodingWriter ? + ((XMLStreamWriterFactory.HasEncodingWriter) writer).getWriter() + : writer; + + // Hack for JDK6's SJSXP - if (writer instanceof Map) { - obj = ((Map) writer).get("sjsxp-outputstream"); + if (xmlStreamWriter instanceof Map) { + obj = ((Map) xmlStreamWriter).get("sjsxp-outputstream"); } // woodstox