Mercurial > hg > openjdk > jdk8u > jaxp
changeset 1535:a7f773d06b75 jdk8u152-b03
Merge
author | asaha |
---|---|
date | Mon, 27 Mar 2017 11:37:09 -0700 |
parents | 5358f1745e86 (current diff) 3458b4e2dedd (diff) |
children | 65ec92c434b6 |
files | .hgtags |
diffstat | 8 files changed, 40 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 27 08:22:13 2017 -0700 +++ b/.hgtags Mon Mar 27 11:37:09 2017 -0700 @@ -685,6 +685,18 @@ 77c3d617ae4c28c6e29d51411ab2b2c9eb24683f jdk8u121-b11 f9cb265fd35fc60dccd75075614f8e897af92ab3 jdk8u121-b12 b8d4e47240711ff66f9347483d20c84466d75c89 jdk8u121-b13 +18431a71dfd74ceec494d890cf48f1f5c98be2bf jdk8u131-b00 +62940c1238cd9ce632e03f63d1ffbc84c2ebd18e jdk8u131-b01 +e3a845380bc04fe6b71ee0c08aa4a0345d3bac6a jdk8u131-b02 +d03b00419e74b72d18c2c016363b61f3e1a9704d jdk8u131-b03 +756b7a2f20ccab61fd7d744676bbaa1982170958 jdk8u131-b04 +45e535aa2faa1e776fee307094691c150a4dd367 jdk8u131-b05 +7220c04b9bc6c909cf1f7240942ba9768705ac19 jdk8u131-b06 +76dbaee06f4dccb9ec5b7dcae525117835acbb77 jdk8u131-b07 +1b95863322e42ee5e52f7085c458b217aa39377e jdk8u131-b08 +3e52865f357b57f1a9befb666720ed0e611c9bd6 jdk8u131-b09 +817025cf8b72519b1273d6822d0caf9966946c76 jdk8u131-b10 +c9de18d5c8846ab2a91d6df46efe6b95dd331d01 jdk8u131-b11 2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00 cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01 e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java Mon Mar 27 11:37:09 2017 -0700 @@ -1013,7 +1013,7 @@ "Propriet\u00E0 di sistema org.xml.sax.parser non specificata"}, { ER_PARSER_ARG_CANNOT_BE_NULL, - "L''argomento del parser non deve essere nullo"}, + "L'argomento del parser non deve essere nullo"}, { ER_FEATURE, "Funzione: {0}"},
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Mon Mar 27 11:37:09 2017 -0700 @@ -1,13 +1,14 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -136,7 +137,7 @@ if (DEBUG_START_END_ELEMENT) System.out.println(">>> scanStartElementNS()"); // Note: namespace processing is on by default - fEntityScanner.scanQName(fElementQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fElementQName, NameType.ELEMENTSTART); // REVISIT - [Q] Why do we need this local variable? -- mrglavas String rawname = fElementQName.rawname; if (fBindNamespaces) { @@ -346,7 +347,7 @@ protected void scanStartElementName () throws IOException, XNIException { // Note: namespace processing is on by default - fEntityScanner.scanQName(fElementQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fElementQName, NameType.ELEMENTSTART); // Must skip spaces here because the DTD scanner // would consume them at the end of the external subset. fSawSpace = fEntityScanner.skipSpaces(); @@ -572,7 +573,7 @@ System.out.println(">>> scanAttribute()"); // name - fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTENAME); // equals fEntityScanner.skipSpaces();
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Mon Mar 27 11:37:09 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. */ /* @@ -1222,7 +1222,7 @@ // definitions while (!fEntityScanner.skipChar('>', null)) { - String name = fEntityScanner.scanName(NameType.ATTRIBUTE); + String name = fEntityScanner.scanName(NameType.ATTRIBUTENAME); if (name == null) { reportFatalError("AttNameRequiredInAttDef", new Object[]{elName}); @@ -1366,7 +1366,7 @@ fMarkUpDepth++; do { skipSeparator(false, !scanningInternalSubset()); - String aName = fEntityScanner.scanName(NameType.ATTRIBUTE); + String aName = fEntityScanner.scanName(NameType.ATTRIBUTENAME); if (aName == null) { reportFatalError("MSG_NAME_REQUIRED_IN_NOTATIONTYPE", new Object[]{elName, atName});
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Mon Mar 27 11:37:09 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. */ /* @@ -405,7 +405,7 @@ if (DEBUG_START_END_ELEMENT) System.out.println(this.getClass().toString() +">>> scanAttribute()"); // name - fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTE); + fEntityScanner.scanQName(fAttributeQName, NameType.ATTRIBUTENAME); // equals fEntityScanner.skipSpaces();
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java Mon Mar 27 11:37:09 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2017, 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 @@ -562,6 +562,14 @@ switchToXML11Scanner(); } + if (fEventType == XMLStreamConstants.CHARACTERS || + fEventType == XMLStreamConstants.ENTITY_REFERENCE || + fEventType == XMLStreamConstants.PROCESSING_INSTRUCTION || + fEventType == XMLStreamConstants.COMMENT || + fEventType == XMLStreamConstants.CDATA) { + fEntityScanner.checkNodeCount(fEntityScanner.fCurrentEntity); + } + return fEventType; } catch (IOException ex) { // if this error occured trying to resolve the external DTD subset
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties Mon Mar 27 11:37:09 2017 -0700 @@ -105,7 +105,7 @@ src-element.2.2 = src-element.2.2: poich\u00E9 ''{0}'' contiene l''attributo ''ref'', il suo contenuto deve corrispondere a (annotation?), ma \u00E8 stato trovato ''{1}''. src-element.3 = src-element.3: l''elemento "{0}" ha sia un attributo ''type'' che un elemento figlio "anonymous type". \u00C8 consentito uno solo di questi valori per un elemento. src-import.1.1 = src-import.1.1: l''attributo "{0}" dello spazio di nomi di una voce di informazioni di elemento <import> non deve essere uguale al targetNamespace dello schema in cui esiste. - src-import.1.2 = src-import.1.2: se l''attributo dello spazio di nomi non \u00E8 presente in una voce di informazioni di elemento <import>, lo schema che lo contiene deve avere un targetNamespace. + src-import.1.2 = src-import.1.2: se l'attributo dello spazio di nomi non \u00E8 presente in una voce di informazioni di elemento <import>, lo schema che lo contiene deve avere un targetNamespace. src-import.2 = src-import.2: l''elemento radice del documento "{0}" deve avere lo spazio di nomi denominato ''http://www.w3.org/2001/XMLSchema'' e il nome locale ''schema''. src-import.3.1 = src-import.3.1: l''attributo "{0}" dello spazio di nomi di una voce di informazioni di elemento <import> deve essere uguale all''attributo targetNamespace ''{1}'' del documento importato. src-import.3.2 = src-import.3.2: non esiste alcun attributo dello spazio di nomi nella voce di informazioni di elemento <import>, pertanto il documento importato non pu\u00F2 avere alcun attributo targetNamespace. tuttavia, \u00E8 stato trovato targetNamespace ''{1}'' nel documento importato.
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties Mon Mar 27 08:22:13 2017 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties Mon Mar 27 11:37:09 2017 -0700 @@ -8,7 +8,7 @@ FormatFailed = Si \u00E8 verificato un errore interno durante la formattazione del seguente messaggio:\n # XPointer Framework Error Messages -XPointerProcessingError = XPointerProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell''espressione XPointer. +XPointerProcessingError = XPointerProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell'espressione XPointer. InvalidXPointerToken = InvalidXPointerToken: l''espressione XPointer contiene il token non valido ''{0}''. InvalidXPointerExpression = InvalidXPointerExpression: l''espressione XPointer ''{0}'' non \u00E8 valida. MultipleShortHandPointers = MultipleShortHandPointers: l''espressione XPointer ''{0}'' non \u00E8 valida. Contiene pi\u00F9 puntatori ShortHand. @@ -21,6 +21,6 @@ # XPointer Element Scheme Error Messages InvalidElementSchemeToken = InvalidElementSchemeToken: l''espressione XPointer dello schema element() contiene il token non valido ''{0}''. InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: l''espressione XPointer ''{0}'' dello schema di elemento non \u00E8 valida. -XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell''espressione di schema element() XPointer. +XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: si \u00E8 verificato un errore durante l'elaborazione dell'espressione di schema element() XPointer. InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: lo schema element() contiene un puntatore ShortHand ''{0}'' con NCName non valido. InvalidChildSequenceCharacter = InvalidChildSequenceCharacter: lo schema element() contiene un carattere di sequenza secondaria ''{0}'' non valido.