hg: valhalla/valhalla/jaxp: Automatic merge with default

stanislav.smirnov at oracle.com stanislav.smirnov at oracle.com
Thu Aug 10 12:06:05 UTC 2017


Changeset: 42292d30e311
Author:    stsmirno
Date:      2017-08-10 04:49 -0700
URL:       http://hg.openjdk.java.net/valhalla/valhalla/jaxp/rev/42292d30e311

Automatic merge with default

- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMHelper.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMOrder.java
- src/java.xml/share/classes/javax/xml/catalog/package.html
- src/java.xml/share/classes/javax/xml/datatype/package.html
- src/java.xml/share/classes/javax/xml/namespace/package.html
- src/java.xml/share/classes/javax/xml/parsers/package.html
- src/java.xml/share/classes/javax/xml/transform/dom/package.html
- src/java.xml/share/classes/javax/xml/transform/package.html
- src/java.xml/share/classes/javax/xml/transform/sax/package.html
- src/java.xml/share/classes/javax/xml/transform/stax/package.html
- src/java.xml/share/classes/javax/xml/transform/stream/package.html
- src/java.xml/share/classes/javax/xml/validation/package.html
- src/java.xml/share/classes/javax/xml/xpath/package.html
- src/java.xml/share/classes/org/w3c/dom/package.html
- src/java.xml/share/classes/org/w3c/dom/ranges/package.html
- src/java.xml/share/classes/org/xml/sax/ext/package.html
- src/java.xml/share/classes/org/xml/sax/helpers/package.html
- src/java.xml/share/classes/org/xml/sax/package.html
- test/javax/xml/jaxp/libs/jdk/testlibrary/Asserts.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/CompilerUtils.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/JDKToolFinder.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/JDKToolLauncher.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/OutputAnalyzer.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/OutputBuffer.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/Platform.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/ProcessTools.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/README.txt
- test/javax/xml/jaxp/libs/jdk/testlibrary/StreamPumper.java
- test/javax/xml/jaxp/libs/jdk/testlibrary/Utils.java



More information about the valhalla-dev mailing list