/hg/icedtea7-forest/jaxp: 9 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 25 16:18:53 UTC 2017
changeset a23041fec82b in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=a23041fec82b
author: andrew
date: Wed Aug 16 16:15:09 2017 +0100
Added tag icedtea-2.7.0pre13 for changeset 03c6bf5e7a4d
changeset 008d9fffd739 in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=008d9fffd739
author: andrew
date: Wed May 03 03:39:47 2017 +0100
Added tag jdk7u141-b02 for changeset b4b91a7beb18
changeset 922361b28778 in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=922361b28778
author: aefimov
date: Wed Jul 26 15:09:26 2017 +0100
8172469: Transform Transformer Exceptions
Reviewed-by: joehw
changeset 53caea33a6d1 in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=53caea33a6d1
author: aefimov
date: Thu Apr 06 21:26:31 2017 +0300
8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469
Reviewed-by: joehw, dfuchs
changeset 2b90e2ab84bf in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=2b90e2ab84bf
author: ljiang
date: Tue Jun 06 09:39:00 2017 -0700
8181591: 8u141 L10n resource file update
Reviewed-by: coffeys
changeset 26391fa1d876 in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=26391fa1d876
author: andrew
date: Fri Jul 28 13:17:19 2017 +0100
8185501: Missing import in JAXP code
Summary: DTMManager missing an ObjectFactory import after JDK-8172469
Reviewed-by: andrew
Contributed-by: Michal Vala <mvala at redhat.com>
changeset 57fc772ac86a in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=57fc772ac86a
author: andrew
date: Tue Aug 01 14:12:27 2017 +0100
Added tag jdk7u151-b00 for changeset 26391fa1d876
changeset 9a5675f6421e in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=9a5675f6421e
author: andrew
date: Thu Aug 03 07:27:55 2017 +0100
Added tag jdk7u151-b01 for changeset 57fc772ac86a
changeset 112c9edb3630 in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=112c9edb3630
author: andrew
date: Tue Aug 22 02:03:46 2017 +0100
Merge jdk7u151-b01
diffstat:
.hgtags | 4 +
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties | 2 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties | 4 +-
src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java | 101 --
src/com/sun/org/apache/xml/internal/dtm/DTMException.java | 345 +---------
src/com/sun/org/apache/xml/internal/dtm/DTMManager.java | 42 +-
src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 2 +-
src/javax/xml/transform/TransformerConfigurationException.java | 2 +
src/javax/xml/transform/TransformerException.java | 137 ++-
10 files changed, 107 insertions(+), 534 deletions(-)
diffs (truncated from 956 to 500 lines):
diff -r 03c6bf5e7a4d -r 112c9edb3630 .hgtags
--- a/.hgtags Thu Jul 27 16:57:27 2017 +0100
+++ b/.hgtags Tue Aug 22 02:03:46 2017 +0100
@@ -666,3 +666,7 @@
f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01
b24121efd081d1385be1591e0350bfe736118e71 icedtea-2.7.0pre12
+03c6bf5e7a4d69177c9bc8bb3e8d68656890f790 icedtea-2.7.0pre13
+b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00
+57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Thu Jul 27 16:57:27 2017 +0100
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Tue Aug 22 02:03:46 2017 +0100
@@ -483,7 +483,7 @@
{"ER0000" , "{0}" },
{ ER_NO_CURLYBRACE,
- "Fel: Uttryck kan inte inneh\u00E5lla '{'"},
+ "Fel: Uttryck f\u00E5r inte inneh\u00E5lla '{'"},
{ ER_ILLEGAL_ATTRIBUTE ,
"{0} har ett otill\u00E5tet attribut: {1}"},
diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Thu Jul 27 16:57:27 2017 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Tue Aug 22 02:03:46 2017 +0100
@@ -33,4 +33,4 @@
# Messages from erroneous set-up
IncompatibleNamespaceContext = Typ av NamespaceContext \u00E4r inkompatibel med XInclude; det kr\u00E4vs en instans av XIncludeNamespaceSupport
-ExpandedSystemId = Kunde inte ut\u00F6ka system-ID:t f\u00F6r inkluderad resurs
+ExpandedSystemId = Kunde inte ut\u00F6ka system-id:t f\u00F6r inkluderad resurs
diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Thu Jul 27 16:57:27 2017 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Tue Aug 22 02:03:46 2017 +0100
@@ -80,7 +80,7 @@
cvc-pattern-valid = cvc-pattern-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt m\u00F6nster ''{1}'' f\u00F6r typ ''{2}''.
cvc-totalDigits-valid = cvc-totalDigits-valid: V\u00E4rdet ''{0}'' har {1} siffror, men det totala antalet siffror \u00E4r begr\u00E4nsat till {2}.
cvc-type.2 = cvc-type.2: Typdefinitionen kan inte vara abstrakt f\u00F6r elementet {0}.
- cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och kan inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''.
+ cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''.
cvc-type.3.1.2 = cvc-type.3.1.2: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla [underordnade] med elementinformation.
cvc-type.3.1.3 = cvc-type.3.1.3: V\u00E4rdet ''{1}'' i elementet ''{0}'' \u00E4r ogiltigt.
@@ -251,7 +251,7 @@
rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna.
# We're using sch-props-correct.2 instead of the old src-redefine.1
# src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''.
- sch-props-correct.2 = sch-props-correct.2: Ett schema kan inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''.
+ sch-props-correct.2 = sch-props-correct.2: Ett schema f\u00E5r inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''.
st-props-correct.2 = st-props-correct.2: Cirkul\u00E4ra definitioner har identifierats f\u00F6r enkel typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel.
st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r '{'slutgiltigt'}' i '{'bastypdefinitionen'}', ''{1}'', f\u00F6rbjuder h\u00E4rledning med begr\u00E4nsning.
totalDigits-valid-restriction = totalDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''totalDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad.
diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
--- a/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java Thu Jul 27 16:57:27 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/*
- * Copyright 1999-2004 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * $Id: DTMConfigurationException.java,v 1.2.4.1 2005/09/15 08:14:52 suresh_emailid Exp $
- */
-package com.sun.org.apache.xml.internal.dtm;
-
-import javax.xml.transform.SourceLocator;
-
-/**
- * Indicates a serious configuration error.
- */
-public class DTMConfigurationException extends DTMException {
- static final long serialVersionUID = -4607874078818418046L;
-
- /**
- * Create a new <code>DTMConfigurationException</code> with no
- * detail mesage.
- */
- public DTMConfigurationException() {
- super("Configuration Error");
- }
-
- /**
- * Create a new <code>DTMConfigurationException</code> with
- * the <code>String </code> specified as an error message.
- *
- * @param msg The error message for the exception.
- */
- public DTMConfigurationException(String msg) {
- super(msg);
- }
-
- /**
- * Create a new <code>DTMConfigurationException</code> with a
- * given <code>Exception</code> base cause of the error.
- *
- * @param e The exception to be encapsulated in a
- * DTMConfigurationException.
- */
- public DTMConfigurationException(Throwable e) {
- super(e);
- }
-
- /**
- * Create a new <code>DTMConfigurationException</code> with the
- * given <code>Exception</code> base cause and detail message.
- *
- * @param msg The detail message.
- * @param e The exception to be wrapped in a DTMConfigurationException
- */
- public DTMConfigurationException(String msg, Throwable e) {
- super(msg, e);
- }
-
- /**
- * Create a new DTMConfigurationException from a message and a Locator.
- *
- * <p>This constructor is especially useful when an application is
- * creating its own exception from within a DocumentHandler
- * callback.</p>
- *
- * @param message The error or warning message.
- * @param locator The locator object for the error or warning.
- */
- public DTMConfigurationException(String message,
- SourceLocator locator) {
- super(message, locator);
- }
-
- /**
- * Wrap an existing exception in a DTMConfigurationException.
- *
- * @param message The error or warning message, or null to
- * use the message from the embedded exception.
- * @param locator The locator object for the error or warning.
- * @param e Any exception.
- */
- public DTMConfigurationException(String message,
- SourceLocator locator,
- Throwable e) {
- super(message, locator, e);
- }
-}
diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xml/internal/dtm/DTMException.java
--- a/src/com/sun/org/apache/xml/internal/dtm/DTMException.java Thu Jul 27 16:57:27 2017 +0100
+++ b/src/com/sun/org/apache/xml/internal/dtm/DTMException.java Tue Aug 22 02:03:46 2017 +0100
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 1999-2004 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
*
@@ -17,129 +17,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * $Id: DTMException.java,v 1.3 2005/09/28 13:48:50 pvedula Exp $
- */
package com.sun.org.apache.xml.internal.dtm;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.xml.transform.SourceLocator;
-
-import com.sun.org.apache.xml.internal.res.XMLErrorResources;
-import com.sun.org.apache.xml.internal.res.XMLMessages;
-
-
/**
- * This class specifies an exceptional condition that occured
+ * This class specifies an exceptional condition that occurred
* in the DTM module.
*/
public class DTMException extends RuntimeException {
static final long serialVersionUID = -775576419181334734L;
- /** Field locator specifies where the error occured.
- * @serial */
- SourceLocator locator;
-
- /**
- * Method getLocator retrieves an instance of a SourceLocator
- * object that specifies where an error occured.
- *
- * @return A SourceLocator object, or null if none was specified.
- */
- public SourceLocator getLocator() {
- return locator;
- }
-
- /**
- * Method setLocator sets an instance of a SourceLocator
- * object that specifies where an error occured.
- *
- * @param location A SourceLocator object, or null to clear the location.
- */
- public void setLocator(SourceLocator location) {
- locator = location;
- }
-
- /** Field containedException specifies a wrapped exception. May be null.
- * @serial */
- Throwable containedException;
-
- /**
- * This method retrieves an exception that this exception wraps.
- *
- * @return An Throwable object, or null.
- * @see #getCause
- */
- public Throwable getException() {
- return containedException;
- }
-
- /**
- * Returns the cause of this throwable or <code>null</code> if the
- * cause is nonexistent or unknown. (The cause is the throwable that
- * caused this throwable to get thrown.)
- */
- public Throwable getCause() {
-
- return ((containedException == this)
- ? null
- : containedException);
- }
-
- /**
- * Initializes the <i>cause</i> of this throwable to the specified value.
- * (The cause is the throwable that caused this throwable to get thrown.)
- *
- * <p>This method can be called at most once. It is generally called from
- * within the constructor, or immediately after creating the
- * throwable. If this throwable was created
- * with {@link #DTMException(Throwable)} or
- * {@link #DTMException(String,Throwable)}, this method cannot be called
- * even once.
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @return a reference to this <code>Throwable</code> instance.
- * @throws IllegalArgumentException if <code>cause</code> is this
- * throwable. (A throwable cannot
- * be its own cause.)
- * @throws IllegalStateException if this throwable was
- * created with {@link #DTMException(Throwable)} or
- * {@link #DTMException(String,Throwable)}, or this method has already
- * been called on this throwable.
- */
- public synchronized Throwable initCause(Throwable cause) {
-
- if ((this.containedException == null) && (cause != null)) {
- throw new IllegalStateException(XMLMessages.createXMLMessage(XMLErrorResources.ER_CANNOT_OVERWRITE_CAUSE, null)); //"Can't overwrite cause");
- }
-
- if (cause == this) {
- throw new IllegalArgumentException(
- XMLMessages.createXMLMessage(XMLErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED, null)); //"Self-causation not permitted");
- }
-
- this.containedException = cause;
-
- return this;
- }
-
/**
* Create a new DTMException.
*
* @param message The error or warning message.
*/
public DTMException(String message) {
-
super(message);
-
- this.containedException = null;
- this.locator = null;
}
/**
@@ -148,11 +41,7 @@
* @param e The exception to be wrapped.
*/
public DTMException(Throwable e) {
-
- super(e.getMessage());
-
- this.containedException = e;
- this.locator = null;
+ super(e);
}
/**
@@ -166,220 +55,6 @@
* @param e Any exception
*/
public DTMException(String message, Throwable e) {
-
- super(((message == null) || (message.length() == 0))
- ? e.getMessage()
- : message);
-
- this.containedException = e;
- this.locator = null;
- }
-
- /**
- * Create a new DTMException from a message and a Locator.
- *
- * <p>This constructor is especially useful when an application is
- * creating its own exception from within a DocumentHandler
- * callback.</p>
- *
- * @param message The error or warning message.
- * @param locator The locator object for the error or warning.
- */
- public DTMException(String message, SourceLocator locator) {
-
- super(message);
-
- this.containedException = null;
- this.locator = locator;
- }
-
- /**
- * Wrap an existing exception in a DTMException.
- *
- * @param message The error or warning message, or null to
- * use the message from the embedded exception.
- * @param locator The locator object for the error or warning.
- * @param e Any exception
- */
- public DTMException(String message, SourceLocator locator,
- Throwable e) {
-
- super(message);
-
- this.containedException = e;
- this.locator = locator;
- }
-
- /**
- * Get the error message with location information
- * appended.
- */
- public String getMessageAndLocation() {
-
- StringBuffer sbuffer = new StringBuffer();
- String message = super.getMessage();
-
- if (null != message) {
- sbuffer.append(message);
- }
-
- if (null != locator) {
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
- }
-
- return sbuffer.toString();
- }
-
- /**
- * Get the location information as a string.
- *
- * @return A string with location info, or null
- * if there is no location information.
- */
- public String getLocationAsString() {
-
- if (null != locator) {
- StringBuffer sbuffer = new StringBuffer();
- String systemID = locator.getSystemId();
- int line = locator.getLineNumber();
- int column = locator.getColumnNumber();
-
- if (null != systemID) {
- sbuffer.append("; SystemID: ");
- sbuffer.append(systemID);
- }
-
- if (0 != line) {
- sbuffer.append("; Line#: ");
- sbuffer.append(line);
- }
-
- if (0 != column) {
- sbuffer.append("; Column#: ");
- sbuffer.append(column);
- }
-
- return sbuffer.toString();
- } else {
- return null;
- }
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- */
- public void printStackTrace() {
- printStackTrace(new java.io.PrintWriter(System.err, true));
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- * @param s The stream where the dump will be sent to.
- */
- public void printStackTrace(java.io.PrintStream s) {
- printStackTrace(new java.io.PrintWriter(s));
- }
-
- /**
- * Print the the trace of methods from where the error
- * originated. This will trace all nested exception
- * objects, as well as this object.
- * @param s The writer where the dump will be sent to.
- */
- public void printStackTrace(java.io.PrintWriter s) {
-
- if (s == null) {
- s = new java.io.PrintWriter(System.err, true);
- }
-
- try {
- String locInfo = getLocationAsString();
-
- if (null != locInfo) {
- s.println(locInfo);
- }
-
- super.printStackTrace(s);
- } catch (Throwable e) {}
-
- boolean isJdk14OrHigher = false;
- try {
- Throwable.class.getMethod("getCause", (Class[]) null);
- isJdk14OrHigher = true;
- } catch (NoSuchMethodException nsme) {
- // do nothing
- }
-
- // The printStackTrace method of the Throwable class in jdk 1.4
- // and higher will include the cause when printing the backtrace.
- // The following code is only required when using jdk 1.3 or lower
- if (!isJdk14OrHigher) {
- Throwable exception = getException();
More information about the distro-pkg-dev
mailing list