From 5341e6132f732cb2e161b25a902119454d5ff070 Mon Sep 17 00:00:00 2001 From: asaha Date: Fri, 10 Jul 2015 08:34:20 -0700 Subject: Added tag jdk8u31-b34 for changeset 68f0cd7d60d4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 132ad95..fdde37d 100644 --- a/.hgtags +++ b/.hgtags @@ -355,3 +355,4 @@ f475dbc70345904bda6b520af43955e244292886 jdk8u31-b11 dcc563c9db9ef290a0783378d43a039cd92a08e3 jdk8u31-b31 119f4ae3151f4134a5e62034e66a4c17f524838b jdk8u31-b32 d8a594fd8507343dc23fa18c01b17c96fced47fd jdk8u31-b33 +68f0cd7d60d45df8e4b73a85e31a16aa025d9278 jdk8u31-b34 -- cgit v1.2.3 From 541e6ce038e7e4220c49b4b7baf57fad9433381c Mon Sep 17 00:00:00 2001 From: asaha Date: Tue, 14 Jul 2015 10:53:58 -0700 Subject: Added tag jdk8u71-b00 for changeset 700dc6c62343 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 98535a6..f32d512 100644 --- a/.hgtags +++ b/.hgtags @@ -458,3 +458,4 @@ bd0b41c3c7d4de40c32ee63ec26cd315799a5fbe jdk8u65-b02 c68c94b3f7f95b1406ecbcf13fd3558192485e19 jdk8u65-b03 9f9e85cded9f1891115db7d67d18af223c54f5a7 jdk8u65-b04 977d4ac5561ee94009f70848b1ef7b26230545e0 jdk8u65-b05 +700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00 -- cgit v1.2.3 From 363fa98326f0d4e330d9b1408a35d0bce8f419a0 Mon Sep 17 00:00:00 2001 From: aefimov Date: Wed, 15 Jul 2015 18:40:53 +0300 Subject: 8130078: Document better processing Reviewed-by: dfuchs, lancea, ahgross --- .../xerces/internal/impl/XMLDTDScannerImpl.java | 20 ++++++++++++++++++++ .../xerces/internal/impl/XMLDocumentScannerImpl.java | 7 +++++-- .../xerces/internal/xni/parser/XMLDTDScanner.java | 9 +++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java index 5cbdc01..a54234b 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java @@ -380,6 +380,26 @@ implements XMLDTDScanner, XMLComponent, XMLEntityHandler { } // scanDTDInternalSubset(boolean,boolean,boolean):boolean + /** + * Skip the DTD if javax.xml.stream.supportDTD is false. + * + * @param supportDTD The value of the property javax.xml.stream.supportDTD. + * @return true if DTD is skipped, false otherwise. + * @throws java.io.IOException if i/o error occurs + */ + @Override + public boolean skipDTD(boolean supportDTD) throws IOException { + if (!supportDTD) { + fStringBuffer.clear(); + if (!fEntityScanner.scanData("]", fStringBuffer)) { + fEntityScanner.fCurrentEntity.position--; + } + + return true; + } + return false; + } + // // XMLComponent methods // diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java index c2d58bd..27689e7 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. */ /* @@ -1096,11 +1096,14 @@ public class XMLDocumentScannerImpl again = false; switch (fScannerState) { case SCANNER_STATE_DTD_INTERNAL_DECLS: { + boolean moreToScan = false; + if (!fDTDScanner.skipDTD(fSupportDTD)) { // REVISIT: Should there be a feature for // the "complete" parameter? boolean completeDTD = true; - boolean moreToScan = fDTDScanner.scanDTDInternalSubset(completeDTD, fStandalone, fHasExternalDTD && fLoadExternalDTD); + moreToScan = fDTDScanner.scanDTDInternalSubset(completeDTD, fStandalone, fHasExternalDTD && fLoadExternalDTD); + } Entity entity = fEntityScanner.getCurrentEntity(); if(entity instanceof Entity.ScannedEntity){ fEndPos=((Entity.ScannedEntity)entity).position; diff --git a/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java b/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java index 49dea56..189152d 100644 --- a/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java +++ b/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java @@ -96,5 +96,14 @@ public interface XMLDTDScanner public boolean scanDTDExternalSubset(boolean complete) throws IOException, XNIException; + /** + * Skip the DTD if javax.xml.stream.supportDTD is false. + * @param supportDTD The value of the property javax.xml.stream.supportDTD. + * @return true if DTD is skipped, false otherwise. + * @throws java.io.IOException if i/o error occurs + */ + public boolean skipDTD(boolean supportDTD) + throws IOException; + public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer); } // interface XMLDTDScanner -- cgit v1.2.3 From d15953b6fab921ee59aac00e7e23ba6bfbe65fac Mon Sep 17 00:00:00 2001 From: asaha Date: Thu, 6 Aug 2015 06:55:35 -0700 Subject: Added tag jdk8u51-b32 for changeset 975b01e6be93 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 031b6bc..51a54d7 100644 --- a/.hgtags +++ b/.hgtags @@ -427,3 +427,4 @@ da0ad0f75f08d8fbb4ee4d395e4386a4660b854e jdk8u51-b02 14975d905d764c5a18b60b991b97375d42dcecd7 jdk8u51-b15 050f5654fa19db518b354f06a67e0e1f03284a41 jdk8u51-b16 4519799749671cef69091e354b7cd52496f6d970 jdk8u51-b31 +975b01e6be932672edd527f6efe4b430d7bcf07a jdk8u51-b32 -- cgit v1.2.3 From f0b9673cbcba0c169cd12d0578428dcd726121af Mon Sep 17 00:00:00 2001 From: katleman Date: Wed, 12 Aug 2015 19:44:54 -0700 Subject: Added tag jdk8u60-b31 for changeset 37e7f34c2231 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f05e679..61cecf4 100644 --- a/.hgtags +++ b/.hgtags @@ -456,3 +456,4 @@ c8ea5afd3d53a31b2aae76bc814e7384cae87b87 jdk8u60-b24 7a74fd4791e866c031df3c22cfc19ce71d3d952e jdk8u60-b25 9db1721b527eee3b41ff73fcd36ae052227bbf59 jdk8u60-b26 8f260851e05111c39353a6a4d06e752e7c86ec31 jdk8u60-b27 +37e7f34c2231d99a4ef3eb2c0b1a6899828f11f7 jdk8u60-b31 -- cgit v1.2.3 From 52aa9d91ddcc9efbb86f87c116c64b413c9dcb86 Mon Sep 17 00:00:00 2001 From: aefimov Date: Wed, 2 Sep 2015 16:40:03 +0300 Subject: 8133962: More general limits Reviewed-by: dfuchs, lancea, ahgross --- .../xerces/internal/impl/XML11DocumentScannerImpl.java | 2 +- .../org/apache/xerces/internal/impl/XML11EntityScanner.java | 5 ++++- .../org/apache/xerces/internal/impl/XMLEntityManager.java | 12 ++++++------ .../org/apache/xerces/internal/impl/XMLEntityScanner.java | 5 ++++- src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 2 +- src/com/sun/xml/internal/stream/Entity.java | 8 ++++---- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java index 6f862d0..5276454 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java @@ -332,7 +332,7 @@ public class XML11DocumentScannerImpl new Object[]{entityName}); } } - fEntityManager.startEntity(false, entityName, true); + fEntityManager.startEntity(true, entityName, true); } } } diff --git a/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java index 146aa40..028f6a7 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java @@ -905,7 +905,7 @@ public class XML11EntityScanner } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; - if (fCurrentEntity.reference) { + if (fCurrentEntity.isGE) { checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); } content.setValues(fCurrentEntity.ch, offset, length); @@ -1052,6 +1052,9 @@ public class XML11EntityScanner } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; + if (fCurrentEntity.isGE) { + checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); + } content.setValues(fCurrentEntity.ch, offset, length); // return next character diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java index 44c8398..bf3adc2 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java @@ -1106,7 +1106,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { /** * Starts a named entity. * - * @param reference flag to indicate whether the entity is an Entity Reference. + * @param isGE flag to indicate whether the entity is a General Entity * @param entityName The name of the entity to start. * @param literal True if this entity is started within a literal * value. @@ -1114,7 +1114,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * @throws IOException Thrown on i/o error. * @throws XNIException Thrown by entity handler to signal an error. */ - public void startEntity(boolean reference, String entityName, boolean literal) + public void startEntity(boolean isGE, String entityName, boolean literal) throws IOException, XNIException { // was entity declared? @@ -1238,7 +1238,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { } // start the entity - startEntity(reference, entityName, xmlInputSource, literal, external); + startEntity(isGE, entityName, xmlInputSource, literal, external); } // startEntity(String,boolean) @@ -1287,7 +1287,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * This method can be used to insert an application defined XML * entity stream into the parsing stream. * - * @param reference flag to indicate whether the entity is an Entity Reference. + * @param isGE flag to indicate whether the entity is a General Entity * @param name The name of the entity. * @param xmlInputSource The input source of the entity. * @param literal True if this entity is started within a @@ -1297,12 +1297,12 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver { * @throws IOException Thrown on i/o error. * @throws XNIException Thrown by entity handler to signal an error. */ - public void startEntity(boolean reference, String name, + public void startEntity(boolean isGE, String name, XMLInputSource xmlInputSource, boolean literal, boolean isExternal) throws IOException, XNIException { - String encoding = setupCurrentEntity(reference, name, xmlInputSource, literal, isExternal); + String encoding = setupCurrentEntity(isGE, name, xmlInputSource, literal, isExternal); //when entity expansion limit is set by the Application, we need to //check for the entity expansion limit set by the parser, if number of entity diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java index 4e12d15..1c0eca6 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java @@ -1038,7 +1038,7 @@ public class XMLEntityScanner implements XMLLocator { } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; - if (fCurrentEntity.reference) { + if (fCurrentEntity.isGE) { checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); } @@ -1205,6 +1205,9 @@ public class XMLEntityScanner implements XMLLocator { } int length = fCurrentEntity.position - offset; fCurrentEntity.columnNumber += length - newlines; + if (fCurrentEntity.isGE) { + checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length); + } content.setValues(fCurrentEntity.ch, offset, length); // return next character diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java index 48462a8..fc46488 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java @@ -947,7 +947,7 @@ public abstract class XMLScanner new Object[]{entityName}); } } - fEntityManager.startEntity(false, entityName, true); + fEntityManager.startEntity(true, entityName, true); } } } diff --git a/src/com/sun/xml/internal/stream/Entity.java b/src/com/sun/xml/internal/stream/Entity.java index fb60ca3..9c2a8ad 100644 --- a/src/com/sun/xml/internal/stream/Entity.java +++ b/src/com/sun/xml/internal/stream/Entity.java @@ -344,8 +344,8 @@ public abstract class Entity { // to know that prolog is read public boolean xmlDeclChunkRead = false; - // flag to indicate whether the Entity is an Entity Reference - public boolean reference = false; + // flag to indicate whether the Entity is a General Entity + public boolean isGE = false; /** returns the name of the current encoding * @return current encoding name @@ -391,11 +391,11 @@ public abstract class Entity { // /** Constructs a scanned entity. */ - public ScannedEntity(boolean reference, String name, + public ScannedEntity(boolean isGE, String name, XMLResourceIdentifier entityLocation, InputStream stream, Reader reader, String encoding, boolean literal, boolean mayReadChunks, boolean isExternal) { - this.reference = reference; + this.isGE = isGE; this.name = name ; this.entityLocation = entityLocation; this.stream = stream; -- cgit v1.2.3 From 9e6fafe8d9bd857fac4e1431fccbe807b6ae3ad4 Mon Sep 17 00:00:00 2001 From: aefimov Date: Fri, 11 Sep 2015 02:22:42 +0300 Subject: 8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name Reviewed-by: joehw --- .../sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java index 2eb6e57..11b3241 100644 --- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java @@ -932,9 +932,9 @@ class FunctionCall extends Expression { //Check if FSP and SM - only then proceed with loading if (namespace != null && isSecureProcessing && isExtensionFunctionEnabled - && (namespace.equals(JAVA_EXT_XALAN) - || namespace.equals(JAVA_EXT_XSLTC) - || namespace.equals(JAVA_EXT_XALAN_OLD) + && (namespace.startsWith(JAVA_EXT_XALAN) + || namespace.startsWith(JAVA_EXT_XSLTC) + || namespace.startsWith(JAVA_EXT_XALAN_OLD) || namespace.startsWith(XALAN_CLASSPACKAGE_NAMESPACE))) { _clazz = getXSLTC().loadExternalFunction(_className); } else { -- cgit v1.2.3 From 6cde4fe7f915d21e6d191e63a159aef11ff03229 Mon Sep 17 00:00:00 2001 From: asaha Date: Thu, 17 Sep 2015 11:56:57 -0700 Subject: Added tag jdk8u51-b33 for changeset 59aea4623279 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 51a54d7..7db44aa 100644 --- a/.hgtags +++ b/.hgtags @@ -428,3 +428,4 @@ da0ad0f75f08d8fbb4ee4d395e4386a4660b854e jdk8u51-b02 050f5654fa19db518b354f06a67e0e1f03284a41 jdk8u51-b16 4519799749671cef69091e354b7cd52496f6d970 jdk8u51-b31 975b01e6be932672edd527f6efe4b430d7bcf07a jdk8u51-b32 +59aea46232797f247aab869d751e4b8090eb4789 jdk8u51-b33 -- cgit v1.2.3 From f6cd0b307af7195625b109650c8acd31b5a21166 Mon Sep 17 00:00:00 2001 From: asaha Date: Thu, 17 Sep 2015 12:03:26 -0700 Subject: Added tag jdk8u60-b32 for changeset 393ae594ae7c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 61cecf4..7d5e445 100644 --- a/.hgtags +++ b/.hgtags @@ -457,3 +457,4 @@ c8ea5afd3d53a31b2aae76bc814e7384cae87b87 jdk8u60-b24 9db1721b527eee3b41ff73fcd36ae052227bbf59 jdk8u60-b26 8f260851e05111c39353a6a4d06e752e7c86ec31 jdk8u60-b27 37e7f34c2231d99a4ef3eb2c0b1a6899828f11f7 jdk8u60-b31 +393ae594ae7c3f4a776c976e38fb4598ae1c69fd jdk8u60-b32 -- cgit v1.2.3 From 011db7a81f7291c7aa95c4d2ce67fc655d4f7556 Mon Sep 17 00:00:00 2001 From: asaha Date: Tue, 22 Sep 2015 13:38:42 -0700 Subject: Added tag jdk8u71-b01 for changeset f13e36a4ac81 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8197f9e..9271b35 100644 --- a/.hgtags +++ b/.hgtags @@ -494,3 +494,4 @@ d857d6033bf1499c015ef2a2313f53a3e6491df3 jdk8u66-b12 94b6e3ddc19334578abefbc44a7ec6f9e20a6e24 jdk8u66-b14 25cf8ddfc8bf163211d1dfd79f31765cac58eef5 jdk8u66-b15 700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00 +f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 -- cgit v1.2.3 From cbfa5057d65f2db2b15d64dd346e76536597e41a Mon Sep 17 00:00:00 2001 From: asaha Date: Tue, 29 Sep 2015 11:36:03 -0700 Subject: Added tag jdk8u71-b02 for changeset 90bca51fcdaa --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 78d2037..0b42afd 100644 --- a/.hgtags +++ b/.hgtags @@ -497,3 +497,4 @@ d857d6033bf1499c015ef2a2313f53a3e6491df3 jdk8u66-b12 40ce5a6d733d44d93cbd5c0105a820ad7a7f4754 jdk8u66-b16 700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00 f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 +90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02 -- cgit v1.2.3 From a77a4a77b9dcffb88671b3537eb84f193a59474f Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 12 Oct 2015 12:35:29 -0700 Subject: Added tag jdk8u71-b03 for changeset 33134f35eea3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0b42afd..99f53a9 100644 --- a/.hgtags +++ b/.hgtags @@ -498,3 +498,4 @@ d857d6033bf1499c015ef2a2313f53a3e6491df3 jdk8u66-b12 700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00 f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02 +33134f35eea3fbffd695d24229d7894c7c2cf14f jdk8u71-b03 -- cgit v1.2.3 From b7d035081407f944d31fd192b0f5aff3cdfaf194 Mon Sep 17 00:00:00 2001 From: asaha Date: Wed, 14 Oct 2015 12:07:25 -0700 Subject: Added tag jdk8u66-b31 for changeset 8af7da6c13af --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c7a2234..9d7727b 100644 --- a/.hgtags +++ b/.hgtags @@ -497,3 +497,4 @@ d857d6033bf1499c015ef2a2313f53a3e6491df3 jdk8u66-b12 25cf8ddfc8bf163211d1dfd79f31765cac58eef5 jdk8u66-b15 40ce5a6d733d44d93cbd5c0105a820ad7a7f4754 jdk8u66-b16 fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17 +8af7da6c13af3c95bc9933e6d1e0d83648f6c0ae jdk8u66-b31 -- cgit v1.2.3 From 8b94038f9fbd5a0d1fd8eb92a8af79254a196882 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 19 Oct 2015 16:40:07 -0700 Subject: Added tag jdk8u71-b04 for changeset 28922f863973 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e8559bb..29ae2b8 100644 --- a/.hgtags +++ b/.hgtags @@ -502,3 +502,4 @@ fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17 f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02 33134f35eea3fbffd695d24229d7894c7c2cf14f jdk8u71-b03 +28922f863973b2dc0c87b767685958ec7fc13b97 jdk8u71-b04 -- cgit v1.2.3 From 44fe4e71703f312b5c840c366bb00a2b49c9acf4 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 26 Oct 2015 12:36:01 -0700 Subject: Added tag jdk8u71-b05 for changeset 6c783cdd685f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 29ae2b8..d0cde90 100644 --- a/.hgtags +++ b/.hgtags @@ -503,3 +503,4 @@ f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02 33134f35eea3fbffd695d24229d7894c7c2cf14f jdk8u71-b03 28922f863973b2dc0c87b767685958ec7fc13b97 jdk8u71-b04 +6c783cdd685f6fc8bbc25e4debb07c2096f7b64a jdk8u71-b05 -- cgit v1.2.3 From e291d04a207e3724162b1b80f59b79d2d697f0d9 Mon Sep 17 00:00:00 2001 From: asaha Date: Tue, 27 Oct 2015 13:29:31 -0700 Subject: Added tag jdk8u71-b06 for changeset ae391e3b7256 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d0cde90..cf5bc8c 100644 --- a/.hgtags +++ b/.hgtags @@ -504,3 +504,4 @@ f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 33134f35eea3fbffd695d24229d7894c7c2cf14f jdk8u71-b03 28922f863973b2dc0c87b767685958ec7fc13b97 jdk8u71-b04 6c783cdd685f6fc8bbc25e4debb07c2096f7b64a jdk8u71-b05 +ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 -- cgit v1.2.3 From 0e5bed0d1fe1aef83768c2b9e89955fa83d160a9 Mon Sep 17 00:00:00 2001 From: asaha Date: Wed, 28 Oct 2015 15:42:17 -0700 Subject: Added tag jdk8u72-b06 for changeset 3a3863b12884 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 128cf85..f6f6dc9 100644 --- a/.hgtags +++ b/.hgtags @@ -511,3 +511,4 @@ ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 5b5626716c88646895c4ada9ed1a35b24e7148c8 jdk8u72-b04 1636e47c2d48d92827dac1493d292ebe19a2e108 jdk8u72-b05 +3a3863b12884f6167261f995b5eb0b8c69495f30 jdk8u72-b06 -- cgit v1.2.3 From af413d71c510ee4bf714ae20da1a39931002965c Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 2 Nov 2015 12:22:27 -0800 Subject: Added tag jdk8u71-b07 for changeset 5cadfe102e5c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index cf5bc8c..d9d6f3c 100644 --- a/.hgtags +++ b/.hgtags @@ -505,3 +505,4 @@ f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 28922f863973b2dc0c87b767685958ec7fc13b97 jdk8u71-b04 6c783cdd685f6fc8bbc25e4debb07c2096f7b64a jdk8u71-b05 ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 +5cadfe102e5c7fa1d5ea37991a3e7fc0337e7fab jdk8u71-b07 -- cgit v1.2.3 From d431f7dc8ee96b07268e420ae9c4a545fe105d72 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 2 Nov 2015 13:22:26 -0800 Subject: Added tag jdk8u72-b07 for changeset 8045ef94fd11 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f5cebe4..06f9887 100644 --- a/.hgtags +++ b/.hgtags @@ -513,3 +513,4 @@ fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 5b5626716c88646895c4ada9ed1a35b24e7148c8 jdk8u72-b04 1636e47c2d48d92827dac1493d292ebe19a2e108 jdk8u72-b05 3a3863b12884f6167261f995b5eb0b8c69495f30 jdk8u72-b06 +8045ef94fd11dbda897404de345d1ea1eef52a01 jdk8u72-b07 -- cgit v1.2.3 From 0212e74223e97a8c4e8aef0bf0101dd4230e8304 Mon Sep 17 00:00:00 2001 From: asaha Date: Sun, 8 Nov 2015 10:22:45 -0800 Subject: Added tag jdk8u66-b18 for changeset 4ae0c2d6dd24 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 582dae2..e8903bc 100644 --- a/.hgtags +++ b/.hgtags @@ -492,3 +492,4 @@ d857d6033bf1499c015ef2a2313f53a3e6491df3 jdk8u66-b12 25cf8ddfc8bf163211d1dfd79f31765cac58eef5 jdk8u66-b15 40ce5a6d733d44d93cbd5c0105a820ad7a7f4754 jdk8u66-b16 fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17 +4ae0c2d6dd24931f3f271e645221e5331e351c00 jdk8u66-b18 -- cgit v1.2.3 From 644907385ebce916dc5b81865531337313d80ef9 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 9 Nov 2015 13:14:10 -0800 Subject: Added tag jdk8u71-b08 for changeset 6efaec82e8da --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fb30508..05833fb 100644 --- a/.hgtags +++ b/.hgtags @@ -507,3 +507,4 @@ f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 6c783cdd685f6fc8bbc25e4debb07c2096f7b64a jdk8u71-b05 ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 5cadfe102e5c7fa1d5ea37991a3e7fc0337e7fab jdk8u71-b07 +6efaec82e8da45264718ce9391bc02f196da63a0 jdk8u71-b08 -- cgit v1.2.3 From d450736463e87c132e2e18013d745bccebb6ae23 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 9 Nov 2015 13:53:35 -0800 Subject: Added tag jdk8u72-b08 for changeset be05920afa17 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f8f0792..81108e0 100644 --- a/.hgtags +++ b/.hgtags @@ -516,3 +516,4 @@ fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 1636e47c2d48d92827dac1493d292ebe19a2e108 jdk8u72-b05 3a3863b12884f6167261f995b5eb0b8c69495f30 jdk8u72-b06 8045ef94fd11dbda897404de345d1ea1eef52a01 jdk8u72-b07 +be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 -- cgit v1.2.3 From 45d5823a0f923c6bfa4db20634096ec6540455f0 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 16 Nov 2015 12:11:39 -0800 Subject: Added tag jdk8u71-b09 for changeset 19185d4e0066 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 05833fb..dad5117 100644 --- a/.hgtags +++ b/.hgtags @@ -508,3 +508,4 @@ f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01 ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 5cadfe102e5c7fa1d5ea37991a3e7fc0337e7fab jdk8u71-b07 6efaec82e8da45264718ce9391bc02f196da63a0 jdk8u71-b08 +19185d4e00661de65f3707328b014e3a011f5456 jdk8u71-b09 -- cgit v1.2.3 From eeccbd043ec9aa1f8655b4cd7401b19b444f0495 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 16 Nov 2015 12:30:00 -0800 Subject: Added tag jdk8u72-b09 for changeset 8404d311c133 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fe6deb0..f96d4f4 100644 --- a/.hgtags +++ b/.hgtags @@ -518,3 +518,4 @@ fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 3a3863b12884f6167261f995b5eb0b8c69495f30 jdk8u72-b06 8045ef94fd11dbda897404de345d1ea1eef52a01 jdk8u72-b07 be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 +8404d311c13333d4b2455bb75bf1aa10a7e55bc2 jdk8u72-b09 -- cgit v1.2.3 From 85762150e1c8d1a664aba95c5dd30c73824857a5 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 23 Nov 2015 14:00:36 -0800 Subject: Added tag jdk8u71-b10 for changeset d2d1de379f90 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index dad5117..07a8042 100644 --- a/.hgtags +++ b/.hgtags @@ -509,3 +509,4 @@ ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 5cadfe102e5c7fa1d5ea37991a3e7fc0337e7fab jdk8u71-b07 6efaec82e8da45264718ce9391bc02f196da63a0 jdk8u71-b08 19185d4e00661de65f3707328b014e3a011f5456 jdk8u71-b09 +d2d1de379f90baea494a747bacfddf6b0591089b jdk8u71-b10 -- cgit v1.2.3 From 9e00048e9b2d76c26b085f41762ff1f2da0d97fa Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 23 Nov 2015 22:25:58 -0800 Subject: Added tag jdk8u72-b10 for changeset 619ab54940fc --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index bd29af4..c02866f 100644 --- a/.hgtags +++ b/.hgtags @@ -520,3 +520,4 @@ fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 8045ef94fd11dbda897404de345d1ea1eef52a01 jdk8u72-b07 be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 8404d311c13333d4b2455bb75bf1aa10a7e55bc2 jdk8u72-b09 +619ab54940fc02e32966ceedcbd7726d7b50ee97 jdk8u72-b10 -- cgit v1.2.3 From d7e672d377f928c12bac5cde75b492a88022abec Mon Sep 17 00:00:00 2001 From: asaha Date: Wed, 25 Nov 2015 00:01:18 -0800 Subject: 8143134: L10n resource file translation update Summary: L10n resource file translation update Reviewed-by: naoto Contributed-by: li.jiang@oracle.com --- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 2 +- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java index a02f458..966d0ca 100644 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java @@ -1359,7 +1359,7 @@ public class XSLTErrorResources_de extends ListResourceBundle { "optionE", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionV", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionQC", " [-QC (Stille Musterkonfliktwarnungen)]"}, - { "optionQ", " [-Q (Stiller Modus)]"}, + { "optionQ", " [-Q (Silent-Modus)]"}, { "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionCR", " [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionESCAPE", " [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"}, diff --git a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java index 57f6b13..2ffbbba 100644 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java @@ -1210,7 +1210,7 @@ public class XSLTErrorResources_fr extends ListResourceBundle "Le nom de fonction ne peut pas \u00EAtre NULL."}, { ER_XPATH_RESOLVER_NEGATIVE_ARITY, - "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."}, + "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."}, // Warnings... { WG_FOUND_CURLYBRACE, -- cgit v1.2.3 From be5d225519188a0db6380c7330575a00b01c8a87 Mon Sep 17 00:00:00 2001 From: asaha Date: Wed, 25 Nov 2015 00:13:23 -0800 Subject: 8143132: L10n resource file translation update Summary: L10n resource file translation update Reviewed-by: naoto Contributed-by: li.jiang@oracle.com --- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 2 +- src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java index a02f458..966d0ca 100644 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java @@ -1359,7 +1359,7 @@ public class XSLTErrorResources_de extends ListResourceBundle { "optionE", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionV", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"}, { "optionQC", " [-QC (Stille Musterkonfliktwarnungen)]"}, - { "optionQ", " [-Q (Stiller Modus)]"}, + { "optionQ", " [-Q (Silent-Modus)]"}, { "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionCR", " [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"}, { "optionESCAPE", " [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"}, diff --git a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java index 57f6b13..2ffbbba 100644 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java @@ -1210,7 +1210,7 @@ public class XSLTErrorResources_fr extends ListResourceBundle "Le nom de fonction ne peut pas \u00EAtre NULL."}, { ER_XPATH_RESOLVER_NEGATIVE_ARITY, - "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."}, + "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."}, // Warnings... { WG_FOUND_CURLYBRACE, -- cgit v1.2.3 From ec3d0f7f7bfa4d62908c62be7ee211c93082b7e0 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 30 Nov 2015 10:13:30 -0800 Subject: Added tag jdk8u71-b11 for changeset e71972e92232 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 07a8042..0020530 100644 --- a/.hgtags +++ b/.hgtags @@ -510,3 +510,4 @@ ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 6efaec82e8da45264718ce9391bc02f196da63a0 jdk8u71-b08 19185d4e00661de65f3707328b014e3a011f5456 jdk8u71-b09 d2d1de379f90baea494a747bacfddf6b0591089b jdk8u71-b10 +e71972e92232ad5bb17c79609d75ad3b8062bf10 jdk8u71-b11 -- cgit v1.2.3 From 6bd31d8500471295fdcb1796ee5f192689476d21 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 30 Nov 2015 12:07:47 -0800 Subject: Added tag jdk8u72-b11 for changeset 8cff3169fa7b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9a5fbca..f272bda 100644 --- a/.hgtags +++ b/.hgtags @@ -522,3 +522,4 @@ fb395cc3de779ad4274063c2a1d876194bcfaabf jdk8u72-b03 be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 8404d311c13333d4b2455bb75bf1aa10a7e55bc2 jdk8u72-b09 619ab54940fc02e32966ceedcbd7726d7b50ee97 jdk8u72-b10 +8cff3169fa7b95c47599c1312e4dae97ea5228f3 jdk8u72-b11 -- cgit v1.2.3 From a0b26fb2a7e18a78bed49ce1e19b256e251b8993 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 7 Dec 2015 12:49:46 -0800 Subject: Added tag jdk8u71-b12 for changeset 17f54afcb17f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0020530..6a9e9c8 100644 --- a/.hgtags +++ b/.hgtags @@ -511,3 +511,4 @@ ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 19185d4e00661de65f3707328b014e3a011f5456 jdk8u71-b09 d2d1de379f90baea494a747bacfddf6b0591089b jdk8u71-b10 e71972e92232ad5bb17c79609d75ad3b8062bf10 jdk8u71-b11 +17f54afcb17f19dfa18680814376bbe06ca81e12 jdk8u71-b12 -- cgit v1.2.3 From 2281e0671028427f1497b4573d57a11bb2a26551 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 7 Dec 2015 13:18:02 -0800 Subject: Added tag jdk8u72-b12 for changeset 68b880e0f5de --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 93f46da..518f9ca 100644 --- a/.hgtags +++ b/.hgtags @@ -524,3 +524,4 @@ be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 8404d311c13333d4b2455bb75bf1aa10a7e55bc2 jdk8u72-b09 619ab54940fc02e32966ceedcbd7726d7b50ee97 jdk8u72-b10 8cff3169fa7b95c47599c1312e4dae97ea5228f3 jdk8u72-b11 +68b880e0f5de1d49914790f1a6e5c6e4c3847434 jdk8u72-b12 -- cgit v1.2.3 From 49d33483fe4f95f605bc57df7705d8772923dd0c Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 14 Dec 2015 12:41:19 -0800 Subject: Added tag jdk8u71-b13 for changeset 260ef1c987a2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6a9e9c8..5134bb6 100644 --- a/.hgtags +++ b/.hgtags @@ -512,3 +512,4 @@ ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06 d2d1de379f90baea494a747bacfddf6b0591089b jdk8u71-b10 e71972e92232ad5bb17c79609d75ad3b8062bf10 jdk8u71-b11 17f54afcb17f19dfa18680814376bbe06ca81e12 jdk8u71-b12 +260ef1c987a2d566d7caf7de4f31eb30c144f73b jdk8u71-b13 -- cgit v1.2.3 From fc3b801ae07a2d08166f956cb1e915be638248d8 Mon Sep 17 00:00:00 2001 From: asaha Date: Mon, 14 Dec 2015 13:12:54 -0800 Subject: Added tag jdk8u72-b13 for changeset 58630fde67f4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 213255d..4ef0e00 100644 --- a/.hgtags +++ b/.hgtags @@ -526,3 +526,4 @@ be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08 619ab54940fc02e32966ceedcbd7726d7b50ee97 jdk8u72-b10 8cff3169fa7b95c47599c1312e4dae97ea5228f3 jdk8u72-b11 68b880e0f5de1d49914790f1a6e5c6e4c3847434 jdk8u72-b12 +58630fde67f4ba7b0fbe8509bb0b105f065383a8 jdk8u72-b13 -- cgit v1.2.3