Merge

jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java

@@ -1,13 +1,14 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  */
+
 /*
- * Copyright 2001-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,9 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * $Id: TransletOutput.java,v 1.2.4.1 2005/09/05 09:19:44 pvedula Exp $
- */
 
 package com.sun.org.apache.xalan.internal.xsltc.compiler;
 
@@ -35,6 +33,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.util.StringType;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
+import jdk.xml.internal.JdkXmlFeatures;
 
 /**
  * @author Morten Jorgensen
@@ -103,8 +102,10 @@ final class TransletOutput extends Instruction {
         final InstructionList il = methodGen.getInstructionList();
         final boolean isSecureProcessing = classGen.getParser().getXSLTC()
                                            .isSecureProcessing();
+        final boolean isExtensionFunctionEnabled = classGen.getParser().getXSLTC()
+                .getFeature(JdkXmlFeatures.XmlFeature.ENABLE_EXTENSION_FUNCTION);
 
-        if (isSecureProcessing) {
+        if (isSecureProcessing && !isExtensionFunctionEnabled) {
             int index = cpg.addMethodref(BASIS_LIBRARY_CLASS,
                                          "unallowed_extension_elementF",
                                          "(Ljava/lang/String;)V");

jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java

@@ -111,6 +111,9 @@ public abstract class AbstractTranslet implements Translet {
 
     private boolean _useServicesMechanism;
 
+    // The OutputStream for redirect function
+    private FileOutputStream output = null;
+
     /**
      * protocols allowed for external references set by the stylesheet processing instruction, Document() function, Import and Include element.
      */
@@ -567,9 +570,10 @@ public abstract class AbstractTranslet implements Translet {
                dir.mkdirs();
             }
 
+            output = new FileOutputStream(filename, append);
             factory.setEncoding(_encoding);
             factory.setOutputMethod(_method);
-            factory.setOutputStream(new BufferedOutputStream(new FileOutputStream(filename, append)));
+            factory.setOutputStream(new BufferedOutputStream(output));
             factory.setOutputType(TransletOutputHandlerFactory.STREAM);
 
             final SerializationHandler handler
@@ -594,6 +598,9 @@ public abstract class AbstractTranslet implements Translet {
         try {
             handler.endDocument();
             handler.close();
+            if (output != null) {
+                output.close();
+            }
         }
         catch (Exception e) {
             // what can you do?

jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java

@@ -1072,4 +1072,3 @@ public abstract class XMLGregorianCalendar
     @Override
     public abstract Object clone();
 }
-

jaxp/src/java.xml/share/classes/module-info.java

@@ -92,4 +92,3 @@ module java.xml {
     uses javax.xml.xpath.XPathFactory;
     uses org.xml.sax.XMLReader;
 }
-

jaxp/src/jdk.xml.dom/share/classes/module-info.java

@@ -30,4 +30,3 @@ module jdk.xml.dom {
     exports org.w3c.dom.stylesheets;
     exports org.w3c.dom.xpath;
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java

@@ -587,4 +587,3 @@ public class DurationTest {
     private final BigInteger one = BigInteger.ONE;
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java

@@ -77,4 +77,3 @@ public class FactoryNewInstanceTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java

@@ -358,4 +358,3 @@ public class XMLGregorianCalendarTest {
     private final int undef = DatatypeConstants.FIELD_UNDEFINED;
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java

@@ -105,5 +105,3 @@ public class DBFNamespaceTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java

@@ -531,5 +531,3 @@ public class DocumentBuilderFactoryTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java

@@ -157,5 +157,3 @@ public class DocumentBuilderImpl01 implements EntityResolver {
             return null;
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java

@@ -86,5 +86,3 @@ public class FactoryConfErrorTest {
         DocumentBuilderFactory.newInstance();
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java

@@ -78,5 +78,3 @@ public class SAXFactoryNewInstanceTest {
     }
 
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java

@@ -229,5 +229,3 @@ public class SAXParserFactTest {
         assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java

@@ -502,5 +502,3 @@ public class SAXParserTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java

@@ -269,5 +269,3 @@ public class SAXParserTest02 {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java

@@ -116,5 +116,3 @@ public class SAXParserTest03 {
     }
 
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java

@@ -82,4 +82,3 @@ public class XMLEventFactoryNewInstanceTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java

@@ -82,4 +82,3 @@ public class XMLInputFactoryNewInstanceTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java

@@ -67,5 +67,3 @@ public class Bug6384418Test {
     }
 
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java

@@ -118,5 +118,3 @@ public class DOMResultTest {
                 writeNodes(kids.item(i), bWriter);
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java

@@ -104,5 +104,3 @@ public class ErrorListenerTest implements ErrorListener {
         this.status = ListenerStatus.FATAL;
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java

@@ -105,5 +105,3 @@ public class SAXSourceTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java

@@ -431,5 +431,3 @@ public class SAXTFactoryTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java

@@ -106,5 +106,3 @@ public class StreamResultTest {
         });
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java

@@ -239,5 +239,3 @@ public class TfClearParamTest {
         assertNull(transformer.getParameter(LONG_PARAM_NAME));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java

@@ -384,5 +384,3 @@ public class TransformTest {
     private Document xmlDoc;
 
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java

@@ -105,5 +105,3 @@ public class TransformerExcpTest {
         assertNotNull(te.initCause(null));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java

@@ -141,5 +141,3 @@ public class TransformerFactoryTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java

@@ -207,5 +207,3 @@ class MyErrorListener implements ErrorListener {
         System.out.println(" In fatal");
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java

@@ -85,5 +85,3 @@ public class TransformerTest02 {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java

@@ -94,5 +94,3 @@ public class TransformerTest03 {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java

@@ -262,5 +262,3 @@ public class URIResolverTest implements URIResolver {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java

@@ -54,5 +54,3 @@ public class TFCErrorTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java

@@ -404,4 +404,3 @@ public class SchemaFactoryTest {
     private Document xsdDoc2;
     private byte[] xml;
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java

@@ -95,4 +95,3 @@ public class TypeInfoProviderTest {
 
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java

@@ -148,4 +148,3 @@ public class ValidatorHandlerTest {
     private Schema schema;
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java

@@ -209,4 +209,3 @@ public class ValidatorTest {
     private Document xmlDoc;
 
 }
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java

@@ -491,5 +491,3 @@ public class XPathExpressionTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java

@@ -218,5 +218,3 @@ public class XPathFactoryTest {
         assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java

@@ -82,5 +82,3 @@ public class XPathFunctionResolverTest {
         assertEquals(xpath.evaluate(null, "5"), "2");
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java

@@ -757,5 +757,3 @@ public class XPathTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java

@@ -151,4 +151,3 @@ public class AttrTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java

@@ -48,4 +48,3 @@ public class CommentTest extends AbstractCharacterDataTest {
         return document.createComment(text);
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java

@@ -175,4 +175,3 @@ public class DocumentTest {
         doc.createElement("!nc$%^*(!");
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java

@@ -92,4 +92,3 @@ public class DocumentTypeTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java

@@ -129,4 +129,3 @@ public class DomImplementationTest {
         assertEquals(documentType.getName(), name);
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java

@@ -255,4 +255,3 @@ public class ElementTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java

@@ -61,4 +61,3 @@ public class EntityChildTest {
         assertEquals(nl.getLength(), 3);
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java

@@ -121,4 +121,3 @@ public class NamedNodeMapTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java

@@ -64,4 +64,3 @@ public class NodeListTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java

@@ -211,4 +211,3 @@ public class NodeTest {
         transformer.transform(domSource, streamResult);
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java

@@ -74,4 +74,3 @@ public class NotationTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java

@@ -54,4 +54,3 @@ public class PITest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java

@@ -74,4 +74,3 @@ public class TextTest extends AbstractCharacterDataTest {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java

@@ -140,4 +140,3 @@ public class TypeInfoTest {
 
 
 }
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java

@@ -202,5 +202,3 @@ public class AttrImplTest {
         attr.removeAttribute(1);
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java

@@ -74,5 +74,3 @@ public class AttributesNSTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java

@@ -76,5 +76,3 @@ public class AttributesTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java

@@ -264,5 +264,3 @@ class MyContentHandler extends XMLFilterImpl implements AutoCloseable {
             bWriter.close();
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java

@@ -272,5 +272,3 @@ class MyDefaultHandler extends DefaultHandler {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java

@@ -135,5 +135,3 @@ class MyErrorHandler extends XMLFilterImpl implements AutoCloseable {
         bWriter.close();
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java

@@ -131,5 +131,3 @@ public class NSSupportTest {
         assertNull(support.getURI(DC_PREFIX));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java

@@ -168,5 +168,3 @@ public class NSTableTest {
         assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java

@@ -265,5 +265,3 @@ public class ParserAdapterTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java

@@ -143,5 +143,3 @@ class MyEntityResolver extends XMLFilterImpl implements AutoCloseable {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java

@@ -107,5 +107,3 @@ public class SAXParserNSTableTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java

@@ -285,5 +285,3 @@ class MyXMLFilter extends XMLFilterImpl implements AutoCloseable {
             bWriter.close();
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java

@@ -246,5 +246,3 @@ public class XMLFilterTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java

@@ -112,5 +112,3 @@ public class XMLReaderAdapterTest {
         }
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java

@@ -76,5 +76,3 @@ public class XMLReaderFactoryTest {
         XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD");
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java

@@ -131,5 +131,3 @@ public class XMLReaderNSTableTest {
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java

@@ -671,5 +671,3 @@ class MyDeclHandler implements DeclHandler {
     public void internalEntityDecl(String name, String value) {
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java

@@ -145,4 +145,3 @@ public class AstroTest {
         }
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java

@@ -182,4 +182,3 @@ public class DocumentLSTest {
         return dbf.newDocumentBuilder();
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java

@@ -89,4 +89,3 @@ public class NamespaceContextTest {
         assertEquals(QName.valueOf(qname.toString()), qname);
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java

@@ -48,4 +48,3 @@ public class SAX201Test {
         reader.setDTDHandler(null); // SAX 2.0.1 allows
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java

@@ -76,4 +76,3 @@ public class SchemaValidationTest {
         return spf.newSAXParser();
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java

@@ -171,4 +171,3 @@ public class XPathAPITest {
         return new InputSource(filenameToURL(ASTROCAT));
     }
 }
-

jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java

@@ -366,5 +366,3 @@ public class AuctionController {
         assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java

@@ -371,5 +371,3 @@ public class AuctionItemRepository {
         assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java

@@ -304,5 +304,3 @@ public class UserController {
         assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
-
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java

@@ -64,4 +64,3 @@ public class Bug4511326 {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java

@@ -90,4 +90,3 @@ public class Bug4512806 {
 
 
 }
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java

@@ -62,4 +62,3 @@ public class Bug4515047 {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java

@@ -128,4 +128,3 @@ public class Bug4515660 {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java

@@ -81,4 +81,3 @@ public class Bug4693341 {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java

@@ -81,4 +81,3 @@ public class Bug4848653 {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java

@@ -247,4 +247,3 @@ public class Bug4858685 {
 
     }
 }
-

jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java

@@ -24,4 +24,4 @@
 module test {
     requires java.xml;
     exports test;
-}
+}

jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java

@@ -31,4 +31,4 @@ module xmlprovider1 {
     provides javax.xml.transform.TransformerFactory with xp1.TransformerFactoryImpl;
     provides javax.xml.validation.SchemaFactory with xp1.SchemaFactoryImpl;
     provides javax.xml.xpath.XPathFactory with xp1.XPathFactoryImpl;
-}
+}

jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java

@@ -27,4 +27,4 @@ module xmlprovider2 {
     provides javax.xml.datatype.DatatypeFactory with xp2.DatatypeFactoryImpl;
     provides javax.xml.stream.XMLEventFactory with xp2.XMLEventFactoryImpl;
     provides org.xml.sax.XMLReader with xp2.XMLReaderImpl;
-}
+}

jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java

@@ -75,4 +75,3 @@ public class Bug6350682 {
         }
     }
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java

@@ -68,4 +68,3 @@ public class Bug6723276Test {
     }
 
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java

@@ -486,4 +486,3 @@ public class Bug6941169Test {
         return document;
     }
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java

@@ -114,4 +114,3 @@ public class Bug7143711Test {
         }
     }
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/Sources.java

@@ -213,4 +213,3 @@ public class Sources {
         return r;
     }
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java

@@ -56,4 +56,3 @@ public class TestSAXDriver extends SAXParserImpl.JAXPSAXParser {
 
     private static final String ENT_EXP_LIMIT_PROP = "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit";
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java

@@ -105,4 +105,3 @@ public class TransformationWarningsTest extends WarningsTestBase {
             + "</xsl:stylesheet>";
     private static final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root></root>";
 }
-

jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java

@@ -85,4 +85,3 @@ public class ValidationWarningsTest extends WarningsTestBase {
     private static final String xml = "<?xml version='1.0'?><test>Element</test>";
 
 }
-