--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java	2015-01-09 15:41:17.437086945 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java	2015-01-09 15:41:17.358086822 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -23,64 +23,59 @@
 
 package javax.xml.parsers.ptests;
 
-import static jaxp.library.JAXPTestUtilities.FILE_SEP;
 import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
-
 import java.io.File;
-import java.io.IOException;
-
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
+import static javax.xml.parsers.ptests.ParserTestConst.GOLDEN_DIR;
+import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXResult;
-
+import jaxp.library.JAXPFileBaseTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 /**
  * This tests DocumentBuilderFactory for namespace processing and no-namespace
  * processing.
  */
-public class DBFNamespaceTest {
+public class DBFNamespaceTest extends JAXPFileBaseTest {
 
     /**
      * Provide input for the cases that supporting namespace or not.
+     * @return a two-dimensional array contains factory, output file name and
+     *         golden validate file name.
      */
     @DataProvider(name = "input-provider")
     public Object[][] getInput() {
         DocumentBuilderFactory dbf1 = DocumentBuilderFactory.newInstance();
-        String outputfile1 = USER_DIR + FILE_SEP + "dbfnstest01.out";
-        String goldfile1 = TestUtils.GOLDEN_DIR + FILE_SEP + "dbfnstest01GF.out";
+        String outputfile1 = USER_DIR + "dbfnstest01.out";
+        String goldfile1 = GOLDEN_DIR + "dbfnstest01GF.out";
 
         DocumentBuilderFactory dbf2 = DocumentBuilderFactory.newInstance();
         dbf2.setNamespaceAware(true);
-        String outputfile2 = USER_DIR + FILE_SEP + "dbfnstest02.out";
-        String goldfile2 = TestUtils.GOLDEN_DIR + FILE_SEP + "dbfnstest02GF.out";
+        String outputfile2 = USER_DIR + "dbfnstest02.out";
+        String goldfile2 = GOLDEN_DIR + "dbfnstest02GF.out";
         return new Object[][] { { dbf1, outputfile1, goldfile1 }, { dbf2, outputfile2, goldfile2 } };
     }
 
     /**
      * Test to parse and transform a document without supporting namespace and
      * with supporting namespace.
+     * @param dbf a Document Builder factory for creating document object.
+     * @param outputfile output file name.
+     * @param goldfile golden validate file name.
+     * @throws Exception If any errors occur.
      */
     @Test(dataProvider = "input-provider")
-    public void testNamespaceTest(DocumentBuilderFactory dbf, String outputfile, String goldfile) {
-        try {
-            Document doc = dbf.newDocumentBuilder().parse(new File(TestUtils.XML_DIR, "namespace1.xml"));
-            dummyTransform(doc, outputfile);
-            assertTrue(compareWithGold(goldfile, outputfile));
-        } catch (SAXException | IOException | ParserConfigurationException | TransformerFactoryConfigurationError | TransformerException e) {
-            failUnexpected(e);
-        }
+    public void testNamespaceTest(DocumentBuilderFactory dbf, String outputfile, 
+            String goldfile) throws Exception {
+        Document doc = dbf.newDocumentBuilder().parse(new File(XML_DIR, "namespace1.xml"));
+        dummyTransform(doc, outputfile);
+        assertTrue(compareWithGold(goldfile, outputfile));
     }
 
     /**
@@ -89,16 +84,14 @@
      * not chosen, namespaceURI in callbacks should be an empty string otherwise
      * it should be namespaceURI.
      *
-     * @throws TransformerFactoryConfigurationError
-     * @throws TransformerException
-     * @throws IOException
+     * @throws Exception If any errors occur.
      */
-    private void dummyTransform(Document document, String fileName) throws TransformerFactoryConfigurationError, TransformerException, IOException {
+    private void dummyTransform(Document document, String fileName)
+            throws Exception {
         DOMSource domSource = new DOMSource(document);
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        File file = new File(fileName);
-        System.out.println("The fileName is " + file.getAbsolutePath());
-        transformer.transform(domSource, new SAXResult(MyCHandler.newInstance(file)));
+        try(MyCHandler chandler = MyCHandler.newInstance(new File(fileName))) {
+            TransformerFactory.newInstance().newTransformer().
+                transform(domSource, new SAXResult(chandler));
+        }
     }
-
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java	2015-01-09 15:41:17.790087495 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java	2015-01-09 15:41:17.712087373 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -24,33 +24,32 @@
 package javax.xml.parsers.ptests;
 
 import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertFalse;
-
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
-
+import java.io.FilePermission;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
+import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
+import static org.testng.Assert.assertNotNull;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.w3c.dom.Document;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * This checks for the methods of DocumentBuilder
  */
-public class DocumentBuilderImpl01 implements EntityResolver {
-
+public class DocumentBuilderImpl01 extends JAXPFileReadOnlyBaseTest 
+            implements EntityResolver {
     /**
      * Provide DocumentBuilder.
      *
-     * @throws ParserConfigurationException
+     * @return data provider has single DocumentBuilder.
+     * @throws ParserConfigurationException if a DocumentBuilder cannot be 
+     *         created which satisfies the configuration requested.
      */
     @DataProvider(name = "builder-provider")
     public Object[][] getBuilder() throws ParserConfigurationException {
@@ -60,17 +59,18 @@
     }
 
     /**
-     * Testcase to test the default functionality of isValidation method. Expect
+     * Test the default functionality of isValidation method. Expect
      * to return false because not setting the validation.
+     * @param docBuilder document builder instance.
      */
     @Test(dataProvider = "builder-provider")
     public void testCheckDocumentBuilderImpl01(DocumentBuilder docBuilder) {
         assertFalse(docBuilder.isValidating());
-
     }
 
     /**
-     * Testcase to test the default functionality of isNamespaceAware method.
+     * Test the default functionality of isNamespaceAware method.
+     * @param docBuilder document builder instance.
      */
     @Test(dataProvider = "builder-provider")
     public void testCheckDocumentBuilderImpl02(DocumentBuilder docBuilder) {
@@ -78,51 +78,71 @@
     }
 
     /**
-     * Testcase to test the parse(InputStream).
-     */
-    @Test(dataProvider = "builder-provider")
-    public void testCheckDocumentBuilderImpl04(DocumentBuilder docBuilder) {
-        try {
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderImpl01.xml")));
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+     * Test the parse(InputStream).
+     * @param docBuilder document builder instance.
+     * @throws Exception If any errors occur.
+     */
+    @Test(groups = {"readLocalFiles"}, dataProvider = "builder-provider")
+    public void testCheckDocumentBuilderImpl04(DocumentBuilder docBuilder) 
+            throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(XML_DIR, 
+                "DocumentBuilderImpl01.xml"))) {
+            assertNotNull(docBuilder.parse(fis));
         }
     }
 
     /**
-     * Testcase to test the parse(File).
-     */
-    @Test(dataProvider = "builder-provider")
-    public void testCheckDocumentBuilderImpl05(DocumentBuilder docBuilder) {
-        try {
-            Document doc = docBuilder.parse(new File(TestUtils.XML_DIR, "DocumentBuilderImpl01.xml"));
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+     * Test the parse(File).
+     * 
+     * @param docBuilder document builder instance.
+     * @throws Exception If any errors occur.
+     */
+    @Test(groups = {"readLocalFiles"}, dataProvider = "builder-provider")
+    public void testCheckDocumentBuilderImpl05(DocumentBuilder docBuilder) 
+            throws Exception {
+        assertNotNull(docBuilder.parse(new File(XML_DIR,
+                "DocumentBuilderImpl01.xml")));
     }
 
     /**
-     * Testcase to test the parse(InputStream,systemId).
-     */
-    @Test(dataProvider = "builder-provider")
-    public void testCheckDocumentBuilderImpl06(DocumentBuilder docBuilder) {
-        try {
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderImpl02.xml")), new File(TestUtils.XML_DIR).toURI()
-                    .toASCIIString() + FILE_SEP);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+     * Test the parse(InputStream,systemId).
+     * @param docBuilder document builder instance.
+     * @throws Exception If any errors occur.
+     */
+    @Test(groups = {"readLocalFiles"}, dataProvider = "builder-provider")
+    public void testCheckDocumentBuilderImpl06(DocumentBuilder docBuilder)
+            throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "../-",
+                "read"));
+        try (FileInputStream fis = new FileInputStream(new File(XML_DIR, 
+                "DocumentBuilderImpl02.xml"))) {
+            assertNotNull(docBuilder.parse(fis, new File(XML_DIR).toURI()
+                    .toASCIIString() + FILE_SEP));
         }
     }
 
     /**
-     * Testcase to test the setEntityResolver.
+     * Test the setEntityResolver.
+     * @param docBuilder document builder instance.
      */
     @Test(dataProvider = "builder-provider")
     public void testCheckDocumentBuilderImpl07(DocumentBuilder docBuilder) {
         docBuilder.setEntityResolver(this);
-        resolveEntity("publicId", "http://www.myhost.com/today");
+        assertNotNull(resolveEntity("publicId", "http://www.myhost.com/today"));
     }
 
+    /**
+     * Allow the application to resolve external entities.
+     * 
+     * @param publicId The public identifier of the external entity
+     *        being referenced, or null if none was supplied.
+     * @param systemId The system identifier of the external entity
+     *        being referenced.
+     * @return An InputSource object describing the new input source,
+     *         or null to request that the parser open a regular
+     *         URI connection to the system identifier. 
+     */
+    @Override
     public InputSource resolveEntity(String publicId, String systemId) {
         if (systemId.equals("http://www.myhost.com/today"))
             return new InputSource(systemId);
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java	2015-01-09 15:41:18.243088201 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java	2015-01-09 15:41:18.166088081 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -26,6 +26,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPBaseTest;
 
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -35,7 +36,7 @@
  * Class containing the test cases for SAXParserFactory/DocumentBuilderFactory
  * newInstance methods.
  */
-public class FactoryConfErrorTest {
+public class FactoryConfErrorTest extends JAXPBaseTest {
 
     /**
      * Set properties DocumentBuilderFactory and SAXParserFactory to invalid
@@ -43,8 +44,8 @@
      */
     @BeforeTest
     public void setup() {
-        System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "xx");
-        System.setProperty("javax.xml.parsers.SAXParserFactory", "xx");
+        setSystemProperty("javax.xml.parsers.DocumentBuilderFactory", "xx");
+        setSystemProperty("javax.xml.parsers.SAXParserFactory", "xx");
     }
 
     /**
@@ -53,8 +54,8 @@
      */
     @AfterTest
     public void cleanup() {
-        System.clearProperty("javax.xml.parsers.DocumentBuilderFactory");
-        System.clearProperty("javax.xml.parsers.SAXParserFactory");
+        setSystemProperty("javax.xml.parsers.DocumentBuilderFactory", null);
+        setSystemProperty("javax.xml.parsers.SAXParserFactory", null);
     }
 
     /**
@@ -67,7 +68,7 @@
     }
 
     /**
-     * To test exeception thrown if javax.xml.parsers.DocumentBuilderFactory is
+     * To test exception thrown if javax.xml.parsers.DocumentBuilderFactory is
      * invalid.
      */
     @Test(expectedExceptions = FactoryConfigurationError.class)
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java	2015-01-09 15:41:18.605088765 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java	2015-01-09 15:41:18.528088645 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -22,24 +22,16 @@
  */
 
 package javax.xml.parsers.ptests;
-
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
+import jaxp.library.JAXPBaseTest;
 import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 
 /**
- * Class containing the test cases for SAXParserFactory API
+ * Class containing the test cases for SAXParserFactory API.
  */
-public class SAXParserFactTest {
+public class SAXParserFactTest extends JAXPBaseTest {
 
     private static final String NAMESPACES = "http://xml.org/sax/features/namespaces";
     private static final String NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
@@ -49,20 +41,17 @@
     private static final String EXTERNAL_P_ENTITIES = "http://xml.org/sax/features/external-parameter-entities";
 
     /**
-     * Testcase to test if newSAXParser() method returns SAXParser.
+     * Test if newSAXParser() method returns SAXParser.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testParser01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            SAXParser saxparser = spf.newSAXParser();
-        } catch (ParserConfigurationException | SAXException e) {
-            failUnexpected(e);
-        }
+    public void testParser01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.newSAXParser();
     }
 
     /**
-     * Testcase to test the default functionality (No validation) of the parser.
+     * Test the default functionality (No validation) of the parser.
      */
     @Test
     public void testValidate01() {
@@ -71,7 +60,7 @@
     }
 
     /**
-     * Testcase to test the functionality of setValidating and isvalidating
+     * Test the functionality of setValidating and isvalidating
      * methods.
      */
     @Test
@@ -82,7 +71,7 @@
     }
 
     /**
-     * Parser should not be namespaceaware by default.
+     * Parser should not be namespace-aware by default.
      */
     @Test
     public void testNamespace01() {
@@ -91,7 +80,7 @@
     }
 
     /**
-     * Testcase to test the functionality of setNamespaceAware and
+     * Test the functionality of setNamespaceAware and
      * isNamespaceAware methods.
      */
     @Test
@@ -102,167 +91,132 @@
     }
 
     /**
-     * Testcase to test the functionality of setNamespaceAware and getFeature()
+     * Test the functionality of setNamespaceAware and getFeature()
      * methods for namespaces property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertFalse(spf.getFeature(NAMESPACES));
+    public void testFeature01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertFalse(spf.getFeature(NAMESPACES));
 
-            spf.setNamespaceAware(true);
-            assertTrue(spf.getFeature(NAMESPACES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
+        spf.setNamespaceAware(true);
+        assertTrue(spf.getFeature(NAMESPACES));
     }
 
     /**
-     * Testcase to test the functionality of setFeature and getFeature methods
+     * Test the functionality of setFeature and getFeature methods
      * for namespaces property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
+    public void testFeature02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
 
-            spf.setFeature(NAMESPACES, true);
-            assertTrue(spf.getFeature(NAMESPACES));
+        spf.setFeature(NAMESPACES, true);
+        assertTrue(spf.getFeature(NAMESPACES));
 
-            spf.setFeature(NAMESPACES, false);
-            assertFalse(spf.getFeature(NAMESPACES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
+        spf.setFeature(NAMESPACES, false);
+        assertFalse(spf.getFeature(NAMESPACES));
     }
 
     /**
-     * Testcase to test the functionality of setFeature and getFeature methods
+     * Test the functionality of setFeature and getFeature methods
      * for namespace-prefixes property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature03() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
+    public void testFeature03() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
 
-            spf.setFeature(NAMESPACE_PREFIXES, true);
-            assertTrue(spf.getFeature(NAMESPACE_PREFIXES));
+        spf.setFeature(NAMESPACE_PREFIXES, true);
+        assertTrue(spf.getFeature(NAMESPACE_PREFIXES));
 
-            spf.setFeature(NAMESPACE_PREFIXES, false);
-            assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
+        spf.setFeature(NAMESPACE_PREFIXES, false);
+        assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
-     * Testcase to test the functionality of getFeature method for
+     * Test the functionality of getFeature method for
      * string-interning property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature04() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertTrue(spf.getFeature(STRING_INTERNING));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
+    public void testFeature04() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertTrue(spf.getFeature(STRING_INTERNING));
     }
 
     /**
-     * Testcase to test the functionality of getFeature and setValidating
+     * Test the functionality of getFeature and setValidating
      * methods for validation property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature05() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertFalse(spf.getFeature(VALIDATION));
-            spf.setValidating(true);
-            assertTrue(spf.getFeature(VALIDATION));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
-
+    public void testFeature05() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertFalse(spf.getFeature(VALIDATION));
+        spf.setValidating(true);
+        assertTrue(spf.getFeature(VALIDATION));
     }
 
     /**
-     * Testcase to test the functionality of setFeature and getFeature methods
+     * Test the functionality of setFeature and getFeature methods
      * for validation property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature06() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-
-            spf.setFeature(VALIDATION, true);
-            assertTrue(spf.getFeature(VALIDATION));
-
-            spf.setFeature(VALIDATION, false);
-            assertFalse(spf.getFeature(VALIDATION));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
-
+    public void testFeature06() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setFeature(VALIDATION, true);
+        assertTrue(spf.getFeature(VALIDATION));
+        spf.setFeature(VALIDATION, false);
+        assertFalse(spf.getFeature(VALIDATION));
     }
 
     /**
-     * Testcase to test the functionality of getFeature method for
+     * Test the functionality of getFeature method for
      * external-general-entities property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature07() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertTrue(spf.getFeature(EXTERNAL_G_ENTITIES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
-
+    public void testFeature07() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertTrue(spf.getFeature(EXTERNAL_G_ENTITIES));
     }
 
     /**
-     * Testcase to test the functionality of setFeature and getFeature methods
+     * Test the functionality of setFeature and getFeature methods
      * for external-general-entities property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature08() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setFeature(EXTERNAL_G_ENTITIES, false);
-            assertFalse(spf.getFeature(EXTERNAL_G_ENTITIES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
+    public void testFeature08() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setFeature(EXTERNAL_G_ENTITIES, false);
+        assertFalse(spf.getFeature(EXTERNAL_G_ENTITIES));
     }
 
     /**
-     * Testcase to test the functionality of getFeature method for
+     * Test the functionality of getFeature method for
      * external-parameter-entities property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature09() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertTrue(spf.getFeature(EXTERNAL_P_ENTITIES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
+    public void testFeature09() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertTrue(spf.getFeature(EXTERNAL_P_ENTITIES));
     }
 
     /**
-     * Testcase to test the functionality of setFeature method for
+     * Test the functionality of setFeature method for
      * external-parameter-entitie property.
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testFeature10() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setFeature(EXTERNAL_P_ENTITIES, false);
-        } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) {
-            failUnexpected(e);
-        }
-
+    public void testFeature10() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setFeature(EXTERNAL_P_ENTITIES, false);
+        assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES));
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java	2015-01-09 15:41:19.068089487 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java	2015-01-09 15:41:18.993089370 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -23,16 +23,14 @@
 
 package javax.xml.parsers.ptests;
 
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FilePermission;
 import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
+import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.xml.sax.HandlerBase;
@@ -43,16 +41,15 @@
 /**
  * Class contains the test cases for SAXParser API
  */
-public class SAXParserTest {
-
+public class SAXParserTest extends JAXPFileReadOnlyBaseTest {
     /**
      * Provide SAXParser.
      *
-     * @throws SAXException
-     * @throws ParserConfigurationException
+     * @return a data provider contains a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
     @DataProvider(name = "parser-provider")
-    public Object[][] getParser() throws ParserConfigurationException, SAXException {
+    public Object[][] getParser() throws Exception {
         SAXParserFactory spf = SAXParserFactory.newInstance();
         SAXParser saxparser = spf.newSAXParser();
         return new Object[][] { { saxparser } };
@@ -62,498 +59,454 @@
      * Test case with FileInputStream null, parsing should fail and throw
      * IllegalArgumentException.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse01(SAXParser saxparser) throws IllegalArgumentException {
-        try {
-            FileInputStream instream = null;
-            HandlerBase handler = new HandlerBase();
-            saxparser.parse(instream, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse01(SAXParser saxparser) throws Exception {
+        FileInputStream instream = null;
+        saxparser.parse(instream, new HandlerBase());
     }
 
     /**
-     * Testcase with an error in xml file, parsing should fail and throw
-     * SAXException.
+     * Test with by setting URI as null, parsing should fail and throw
+     * IllegalArgumentException.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse02(SAXParser saxparser) throws SAXException {
-        try {
-            HandlerBase handler = new HandlerBase();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "invalid.xml"));
-            saxparser.parse(instream, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse02(SAXParser saxparser) throws Exception {
+        String uri = null;
+        saxparser.parse(uri, new HandlerBase());
     }
 
     /**
-     * Testcase with a valid in xml file, parser should parse the xml document.
+     * Test with non-existence URI, parsing should fail and throw IOException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse03(SAXParser saxparser) {
+    @Test(expectedExceptions = { SAXException.class }, 
+            dataProvider = "parser-provider")
+    public void testParse03(SAXParser saxparser) throws Exception {
+        String workingDir = getSystemProperty("user.dir");
+        setPermissions(new FilePermission(workingDir, "read"));
         try {
-            HandlerBase handler = new HandlerBase();
-            saxparser.parse(new File(TestUtils.XML_DIR, "parsertest.xml"), handler);
-        } catch (IOException | SAXException e) {
-            failUnexpected(e);
+            saxparser.parse("", new HandlerBase());
+        } finally {
+            setPermissions();
         }
     }
 
     /**
-     * Testcase with valid input stream, parser should parse the xml document
-     * successfully.
+     * Test with File null, parsing should fail and throw
+     * IllegalArgumentException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse04(SAXParser saxparser) {
-        try {
-            HandlerBase handler = new HandlerBase();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "correct.xml"));
-            saxparser.parse(instream, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse04(SAXParser saxparser) throws Exception {
+        File file = null;
+        saxparser.parse(file, new HandlerBase());
     }
 
     /**
-     * Testcase with valid input source, parser should parse the xml document
-     * successfully.
+     * Test with empty string as File, parsing should fail and throw
+     * SAXException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse05(SAXParser saxparser) {
+    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
+    public void testParse05(SAXParser saxparser) throws Exception {
+        String workingDir = getSystemProperty("user.dir");
+        setPermissions(new FilePermission(workingDir, "read"));
         try {
-            HandlerBase handler = new HandlerBase();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "parsertest.xml"));
-            saxparser.parse(instream, handler, new File(TestUtils.XML_DIR).toURI().toASCIIString());
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+            saxparser.parse(new File(""), new HandlerBase());
+        } finally {
+            setPermissions();
         }
     }
 
     /**
-     * Testcase with uri null, parsing should fail and throw
+     * Test with input source null, parsing should fail and throw
      * IllegalArgumentException.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse07(SAXParser saxparser) throws IllegalArgumentException {
-        try {
-            String uri = null;
-            HandlerBase handler = new HandlerBase();
-            saxparser.parse(uri, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse06(SAXParser saxparser) throws Exception {
+        InputSource is = null;
+        saxparser.parse(is, new HandlerBase());
     }
 
     /**
-     * Testcase with non-existant uri, parsing should fail and throw
-     * IOException.
+     * Test with FileInputStream null, parsing should fail and throw
+     * IllegalArgumentException.
      *
-     * @throws SAXException
-     * @throws IOException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = { SAXException.class, IOException.class }, dataProvider = "parser-provider")
-    public void testParse08(SAXParser saxparser) throws SAXException, IOException {
-        String uri = " ";
-
-        HandlerBase handler = new HandlerBase();
-        saxparser.parse(uri, handler);
-
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse07(SAXParser saxparser) throws Exception {
+        FileInputStream instream = null;
+        saxparser.parse(instream, new DefaultHandler());
     }
 
     /**
-     * Testcase with proper uri, parser should parse successfully.
+     * Test with URI null, parsing should fail and throw
+     * IllegalArgumentException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse09(SAXParser saxparser) {
-        try {
-            File file = new File(TestUtils.XML_DIR, "correct.xml");
-            HandlerBase handler = new HandlerBase();
-            saxparser.parse(file.toURI().toASCIIString(), handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse08(SAXParser saxparser) throws Exception {
+        String uri = null;
+        saxparser.parse(uri, new DefaultHandler());
     }
 
     /**
-     * Testcase with File null, parsing should fail and throw
-     * IllegalArgumentException.
+     * Test with non-existence URI, parsing should fail and throw
+     * SAXException or IOException.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse10(SAXParser saxparser) throws IllegalArgumentException {
+    @Test(expectedExceptions = { SAXException.class, IOException.class }, 
+            dataProvider = "parser-provider")
+    public void testParse09(SAXParser saxparser) throws Exception {
+        String workingDir = getSystemProperty("user.dir");
+        setPermissions(new FilePermission(workingDir + "/../-", "read"));
+        String uri = " ";
         try {
-            File file = null;
-            HandlerBase handler = new HandlerBase();
-            saxparser.parse(file, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+            saxparser.parse(uri, new DefaultHandler());
+        } finally {
+            setPermissions();
         }
     }
 
     /**
-     * Testcase with empty string as File, parsing should fail and throw
+     * Test with empty string as File, parsing should fail and throw
      * SAXException.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse11(SAXParser saxparser) throws SAXException {
+    public void testParse10(SAXParser saxparser) throws Exception {
+        String workingDir = getSystemProperty("user.dir");
+        setPermissions(new FilePermission(workingDir, "read"));
+        File file = new File("");
         try {
-            HandlerBase handler = new HandlerBase();
-            File file = new File("");
-            saxparser.parse(file, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
+            saxparser.parse(file, new DefaultHandler());
+        } finally {
+            setPermissions();
         }
     }
 
     /**
-     * Testcase with xml file that has errors parsing should fail and throw
-     * SAXException.
+     * Test with File null, parsing should fail and throw
+     * IllegalArgumentException.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse12(SAXParser saxparser) throws SAXException {
-        try {
-            HandlerBase handler = new HandlerBase();
-            File file = new File(TestUtils.XML_DIR, "valid.xml");
-            saxparser.parse(file, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse11(SAXParser saxparser) throws Exception {
+        saxparser.parse((File) null, new DefaultHandler());
     }
 
     /**
-     * Testcase with xml file that has no errors Parser should successfully
-     * parse the xml document.
+     * Test with input source null, parsing should fail and throw
+     * IllegalArgumentException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse13(SAXParser saxparser) {
-        try {
-            HandlerBase handler = new HandlerBase();
-            File file = new File(TestUtils.XML_DIR, "correct.xml");
-            saxparser.parse(file, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
-
+    @Test(expectedExceptions = IllegalArgumentException.class,
+            dataProvider = "parser-provider")
+    public void testParse12(SAXParser saxparser) throws Exception {
+        InputSource is = null;
+        saxparser.parse(is, new DefaultHandler());
     }
 
     /**
-     * Testcase with input source null, parsing should fail and throw
-     * IllegalArgumentException.
+     * Test with an error in XML file, parsing should fail and throw
+     * SAXException.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse14(SAXParser saxparser) throws IllegalArgumentException {
-        try {
-            InputSource is = null;
-            HandlerBase handler = new HandlerBase();
-            saxparser.parse(is, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class,
+            dataProvider = "parser-provider")
+    public void testParse13(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(new File(
+                XML_DIR, "invalid.xml"))) {
+            saxparser.parse(instream, new HandlerBase());
         }
     }
 
     /**
-     * Testcase with input source attached an invaild xml, parsing should fail
-     * and throw SAXException.
+     * Test with a valid in XML file, parser should parse the XML document.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse15(SAXParser saxparser) throws SAXException {
-        try {
-            HandlerBase handler = new HandlerBase();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "invalid.xml"));
-            InputSource is = new InputSource(instream);
-            saxparser.parse(is, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse14(SAXParser saxparser) throws Exception {
+        saxparser.parse(new File(XML_DIR, "parsertest.xml"), 
+                new HandlerBase());
     }
 
     /**
-     * Testcase with input source attached an vaild xml, parser should
-     * successfully parse the xml document.
+     * Test with valid input stream, parser should parse the XML document
+     * successfully.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse16(SAXParser saxparser) {
-        try {
-            HandlerBase handler = new HandlerBase();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "correct.xml"));
-            InputSource is = new InputSource(instream);
-            saxparser.parse(is, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse15(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(new File(XML_DIR, 
+                "correct.xml"))) {
+            saxparser.parse(instream, new HandlerBase());
+        } 
     }
 
     /**
-     * Testcase with FileInputStream null, parsing should fail and throw
-     * IllegalArgumentException.
+     * Test with valid input source, parser should parse the XML document
+     * successfully.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse17(SAXParser saxparser) throws IllegalArgumentException {
-        try {
-            FileInputStream instream = null;
-            DefaultHandler handler = new DefaultHandler();
-            saxparser.parse(instream, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse16(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(
+                new File(XML_DIR, "parsertest.xml"))) {
+            saxparser.parse(instream, new HandlerBase(), 
+                    new File(XML_DIR).toURI().toASCIIString());
         }
     }
 
     /**
-     * Testcase with an error in xml file, parsing should fail and throw
-     * SAXException.
+     * Test with proper URI, parser should parse successfully.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse18(SAXParser saxparser) throws SAXException {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "invalid.xml"));
-            saxparser.parse(instream, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse17(SAXParser saxparser) throws Exception {
+        File file = new File(XML_DIR, "correct.xml");
+        saxparser.parse(file.toURI().toASCIIString(), new HandlerBase());
     }
 
     /**
-     * Testcase with valid input stream, parser should parse the xml document
-     * successfully.
+     * Test with XML file that has errors parsing should fail and throw
+     * SAXException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse19(SAXParser saxparser) {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            saxparser.parse(new File(TestUtils.XML_DIR, "parsertest.xml"), handler);
-        } catch (IOException | SAXException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class,
+            dataProvider = "parser-provider")
+    public void testParse18(SAXParser saxparser) throws Exception {
+        saxparser.parse(new File(XML_DIR, "valid.xml"), new HandlerBase());
     }
 
     /**
-     * Testcase with valid input stream, parser should parse the xml document
-     * successfully.
+     * Test with XML file that has no errors Parser should successfully
+     * parse the XML document.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse20(SAXParser saxparser) {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "correct.xml"));
-            saxparser.parse(instream, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse19(SAXParser saxparser) throws Exception {
+        saxparser.parse(new File(XML_DIR, "correct.xml"), new HandlerBase());
     }
 
     /**
-     * Testcase with valid input source, parser should parse the xml document
-     * successfully.
+     * Test with input source attached an invalid XML, parsing should fail
+     * and throw SAXException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse21(SAXParser saxparser) {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "parsertest.xml"));
-            saxparser.parse(instream, handler, new File(TestUtils.XML_DIR).toURI().toASCIIString());
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class,
+            dataProvider = "parser-provider")
+    public void testParse20(SAXParser saxparser) throws Exception {
+        try(FileInputStream instream = new FileInputStream(new File(XML_DIR, 
+                "invalid.xml"))) {
+            saxparser.parse(new InputSource(instream), new HandlerBase());
         }
-
     }
 
     /**
-     * Testcase with uri null, parsing should fail and throw
-     * IllegalArgumentException.
+     * Test with input source attached an valid XML, parser should
+     * successfully parse the XML document.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse23(SAXParser saxparser) throws IllegalArgumentException {
-        try {
-            String uri = null;
-            DefaultHandler handler = new DefaultHandler();
-            saxparser.parse(uri, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse21(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(new File(XML_DIR, 
+                "correct.xml"))) {
+            saxparser.parse(new InputSource(instream), new HandlerBase());
         }
     }
 
     /**
-     * Testcase with non-existant uri, parsing should fail and throw
-     * SAXException or IOException.
+     * Test with an error in xml file, parsing should fail and throw
+     * SAXException.
      *
-     * @throws SAXException
-     * @throws IOException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = { SAXException.class, IOException.class }, dataProvider = "parser-provider")
-    public void testParse24(SAXParser saxparser) throws SAXException, IOException {
-        String uri = " ";
-        DefaultHandler handler = new DefaultHandler();
-        saxparser.parse(uri, handler);
-
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class,
+            dataProvider = "parser-provider")
+    public void testParse22(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(
+                new File(XML_DIR, "invalid.xml"))) {
+            saxparser.parse(instream, new DefaultHandler());
+        }
     }
 
     /**
-     * Testcase with proper uri, parser should parse successfully.
+     * Test with valid input stream, parser should parse the XML document
+     * successfully.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse25(SAXParser saxparser) {
-        try {
-            File file = new File(TestUtils.XML_DIR, "correct.xml");
-
-            DefaultHandler handler = new DefaultHandler();
-            saxparser.parse(file.toURI().toASCIIString(), handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse23(SAXParser saxparser) throws Exception {
+        DefaultHandler handler = new DefaultHandler();
+        saxparser.parse(new File(XML_DIR, "parsertest.xml"), handler);
     }
 
     /**
-     * Testcase with File null, parsing should fail and throw
-     * IllegalArgumentException.
+     * Test with valid input stream, parser should parse the XML document
+     * successfully.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse26(SAXParser saxparser) throws IllegalArgumentException {
-        try {
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse24(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(new File(XML_DIR, 
+                "correct.xml"))) {
             DefaultHandler handler = new DefaultHandler();
-            saxparser.parse((File) null, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+            saxparser.parse(instream, handler);
         }
     }
 
     /**
-     * Testcase with empty string as File, parsing should fail and throw
-     * SAXException.
+     * Test with valid input source, parser should parse the XML document
+     * successfully.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse27(SAXParser saxparser) throws SAXException {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            File file = new File("");
-            saxparser.parse(file, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse25(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(
+                new File(XML_DIR, "parsertest.xml"))) {
+            saxparser.parse(instream, new DefaultHandler(), 
+                new File(XML_DIR).toURI().toASCIIString());
         }
     }
 
     /**
-     * Testcase with xml file that has errors, parsing should fail and throw
-     * SAXException.
+     * Test with proper URI, parser should parse successfully.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse28(SAXParser saxparser) throws SAXException {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            File file = new File(TestUtils.XML_DIR, "valid.xml");
-            saxparser.parse(file, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse26(SAXParser saxparser) throws Exception {
+        File file = new File(XML_DIR, "correct.xml");
+        saxparser.parse(file.toURI().toASCIIString(), new DefaultHandler());
     }
 
     /**
-     * Testcase with xml file that has no errors, parser should successfully
-     * parse the xml document.
+     * Test with XML file that has errors, parsing should fail and throw
+     * SAXException.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse29(SAXParser saxparser) {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            File file = new File(TestUtils.XML_DIR, "correct.xml");
-            saxparser.parse(file, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class,
+            dataProvider = "parser-provider")
+    public void testParse27(SAXParser saxparser) throws Exception {
+        saxparser.parse(new File(XML_DIR, "valid.xml"), new DefaultHandler());
     }
 
     /**
-     * Testcase with input source null, parsing should fail and throw
-     * IllegalArgumentException.
+     * Test with XML file that has no errors, parser should successfully
+     * parse the XML document.
      *
-     * @throws IllegalArgumentException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class, dataProvider = "parser-provider")
-    public void testParse30(SAXParser saxparser) throws IllegalArgumentException {
-        try {
-            InputSource is = null;
-            DefaultHandler handler = new DefaultHandler();
-            saxparser.parse(is, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse28(SAXParser saxparser) throws Exception {
+        saxparser.parse(new File(XML_DIR, "correct.xml"), new DefaultHandler());
     }
 
     /**
-     * Testcase with an invalid xml file, parser should throw SAXException.
+     * Test with an invalid XML file, parser should throw SAXException.
      *
-     * @throws SAXException
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider")
-    public void testParse31(SAXParser saxparser) throws SAXException {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "invalid.xml"));
-            InputSource is = new InputSource(instream);
-            saxparser.parse(is, handler);
-        } catch (IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, 
+            dataProvider = "parser-provider")
+    public void testParse29(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(
+                new File(XML_DIR, "invalid.xml"))) {
+            saxparser.parse(new InputSource(instream), new DefaultHandler());
         }
     }
 
     /**
-     * Test case to parse an xml file that not use namespaces.
+     * Test case to parse an XML file that not use namespaces.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "parser-provider")
-    public void testParse32(SAXParser saxparser) {
-        try {
-            DefaultHandler handler = new DefaultHandler();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "correct.xml"));
-            InputSource is = new InputSource(instream);
-            saxparser.parse(is, handler);
-        } catch (SAXException | IOException e) {
-            failUnexpected(e);
+    @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider")
+    public void testParse30(SAXParser saxparser) throws Exception {
+        try (FileInputStream instream = new FileInputStream(
+                new File(XML_DIR, "correct.xml"))) {
+            saxparser.parse(new InputSource(instream), new DefaultHandler());
         }
     }
 
     /**
-     * Test case to parse an xml file that uses namespaces.
+     * Test case to parse an XML file that uses namespaces.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testParse33() {
-        try {
+    @Test(groups = {"readLocalFiles"})
+    public void testParse31() throws Exception {
+        try (FileInputStream instream = new FileInputStream(
+                new File(XML_DIR, "ns4.xml"))) {
             SAXParserFactory spf = SAXParserFactory.newInstance();
             spf.setNamespaceAware(true);
-            SAXParser saxparser = spf.newSAXParser();
-            HandlerBase handler = new HandlerBase();
-            FileInputStream instream = new FileInputStream(new File(TestUtils.XML_DIR, "ns4.xml"));
-            saxparser.parse(instream, handler);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
+            spf.newSAXParser().parse(instream, new HandlerBase());
         }
     }
-}
+}
\ No newline at end of file
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java	2015-01-09 15:41:19.425090043 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java	2015-01-09 15:41:19.348089923 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -23,260 +23,239 @@
 
 package javax.xml.parsers.ptests;
 
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
+import jaxp.library.JAXPBaseTest;
+import static org.testng.Assert.assertNotNull;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.xml.sax.Parser;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
 import org.xml.sax.ext.DeclHandler;
 import org.xml.sax.ext.LexicalHandler;
 
 /**
  * Class contains the test cases for SAXParser API
  */
-public class SAXParserTest02 {
-    final String DOM_NODE = "http://xml.org/sax/properties/dom-node";
-    final String XML_STRING = "http://xml.org/sax/properties/xml-string";
-    final String DECL_HANDLER = "http://xml.org/sax/properties/declaration-handler";
-    final String LEXICAL_HANDLER = "http://xml.org/sax/properties/lexical-handler";
+public class SAXParserTest02 extends JAXPBaseTest {
+    private static final String DOM_NODE = "http://xml.org/sax/properties/dom-node";
+    private static final String XML_STRING = "http://xml.org/sax/properties/xml-string";
+    private static final String DECL_HANDLER = "http://xml.org/sax/properties/declaration-handler";
+    private static final String LEXICAL_HANDLER = "http://xml.org/sax/properties/lexical-handler";
 
     /**
      * Provide SAXParser.
-     *
-     * @throws SAXException
-     * @throws ParserConfigurationException
+     * 
+     * @return a data provider contains a SAXParser instance.
+     * @throws Exception If any errors occur.
      */
     @DataProvider(name = "parser-provider")
-    public Object[][] getParser() throws ParserConfigurationException, SAXException {
+    public Object[][] getParser() throws Exception {
         SAXParserFactory spf = SAXParserFactory.newInstance();
         SAXParser saxparser = spf.newSAXParser();
         return new Object[][] { { saxparser } };
     }
 
     /**
-     * Testcase to test the default functionality (No validation) of the parser.
+     * Test to test the default functionality (No validation) of the parser.
+     * 
+     * @param saxparser a SAXParser instance.
      */
     @Test(dataProvider = "parser-provider")
     public void testValidate01(SAXParser saxparser) {
-        try {
-            assertFalse(saxparser.isValidating());
-        } catch (FactoryConfigurationError e) {
-            failUnexpected(e);
-        }
-
+        assertFalse(saxparser.isValidating());
     }
 
     /**
-     * Testcase to test the functionality of setValidating and isvalidating
+     * Test to test the functionality of setValidating and isValidating
      * methods.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testValidate02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setValidating(true);
-            spf.newSAXParser();
-            assertTrue(spf.isValidating());
-        } catch (FactoryConfigurationError | ParserConfigurationException | SAXException e) {
-            failUnexpected(e);
-        }
-
+    public void testValidate02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setValidating(true);
+        spf.newSAXParser();
+        assertTrue(spf.isValidating());
     }
 
     /**
-     * Test case to test isNamespaceAware() method. By default, namespaces are
+     * Test isNamespaceAware() method. By default, namespaces are
      * not supported.
+     * 
+     * @param saxparser a SAXParser instance.
      */
     @Test(dataProvider = "parser-provider")
     public void testNamespace01(SAXParser saxparser) {
-        try {
-            assertFalse(saxparser.isNamespaceAware());
-        } catch (FactoryConfigurationError e) {
-            failUnexpected(e);
-        }
-
+        assertFalse(saxparser.isNamespaceAware());
     }
 
     /**
      * Test case to test setnamespaceAware() method.
+     *
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testNamespace02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxparser = spf.newSAXParser();
-            assertTrue(saxparser.isNamespaceAware());
-        } catch (FactoryConfigurationError | ParserConfigurationException | SAXException e) {
-            failUnexpected(e);
-        }
-
+    public void testNamespace02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        SAXParser saxparser = spf.newSAXParser();
+        assertTrue(saxparser.isNamespaceAware());
     }
 
     /**
      * Test case to test if the getParser() method returns instance of Parser.
+     * 
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
     @Test(dataProvider = "parser-provider")
-    public void testParser01(SAXParser saxparser) {
-        try {
-            Parser parser = saxparser.getParser();
-        } catch (FactoryConfigurationError | SAXException e) {
-            failUnexpected(e);
-        }
-
+    public void testParser01(SAXParser saxparser) throws SAXException {
+        assertNotNull(saxparser.getParser());
     }
 
     /**
      * Test case to test if the getXMLReader() method returns instance of
      * XMLReader.
+     * 
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
     @Test(dataProvider = "parser-provider")
-    public void testXmlReader01(SAXParser saxparser) {
-        try {
-            XMLReader xmlReader = saxparser.getXMLReader();
-        } catch (FactoryConfigurationError | SAXException e) {
-            failUnexpected(e);
-        }
+    public void testXmlReader01(SAXParser saxparser) throws SAXException {
+        assertNotNull(saxparser.getXMLReader());
     }
 
     /**
      * Test whether the xml-string property is not supported.
      *
-     * @throws SAXNotSupportedException
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
-    @Test(expectedExceptions = SAXNotSupportedException.class, dataProvider = "parser-provider")
-    public void testProperty01(SAXParser saxparser) throws SAXNotSupportedException {
-        try {
-            Object object = saxparser.getProperty(XML_STRING);
-        } catch (SAXNotRecognizedException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = SAXNotSupportedException.class, 
+            dataProvider = "parser-provider")
+    public void testProperty01(SAXParser saxparser) throws SAXException {
+        saxparser.getProperty(XML_STRING);
     }
 
     /**
      * Test whether the dom-node property is not supported.
      *
-     * @throws SAXNotSupportedException
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
-    @Test(expectedExceptions = SAXNotSupportedException.class, dataProvider = "parser-provider")
-    public void testProperty02(SAXParser saxparser) throws SAXNotSupportedException {
-        try {
-            Object object = saxparser.getProperty(DOM_NODE);
-        } catch (SAXNotRecognizedException e) {
-            failUnexpected(e);
-        }
+    @Test(expectedExceptions = SAXNotSupportedException.class,
+            dataProvider = "parser-provider")
+    public void testProperty02(SAXParser saxparser) throws SAXException {
+        saxparser.getProperty(DOM_NODE);
     }
 
     /**
      * Test the default lexical-handler not exists.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
     @Test(dataProvider = "parser-provider")
-    public void testProperty03(SAXParser saxparser) {
-        try {
-            assertNull(saxparser.getProperty(LEXICAL_HANDLER));
-        } catch (SAXException e) {
-            failUnexpected(e);
-        }
-
+    public void testProperty03(SAXParser saxparser) throws SAXException {
+        assertNull(saxparser.getProperty(LEXICAL_HANDLER));
     }
 
     /**
      * Test the default declaration-handler not exists.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
     @Test(dataProvider = "parser-provider")
-    public void testProperty04(SAXParser saxparser) {
-
-        try {
-            assertNull(saxparser.getProperty(DECL_HANDLER));
-        } catch (SAXException e) {
-            failUnexpected(e);
-        }
+    public void testProperty04(SAXParser saxparser) throws SAXException {
+        assertNull(saxparser.getProperty(DECL_HANDLER));
     }
 
     /**
      * Test to set and get the lexical-handler.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
     @Test(dataProvider = "parser-provider")
-    public void testProperty05(SAXParser saxparser) {
-        try {
-            MyLexicalHandler myLexicalHandler = new MyLexicalHandler();
-            saxparser.setProperty(LEXICAL_HANDLER, myLexicalHandler);
-            Object object = saxparser.getProperty(LEXICAL_HANDLER);
-            assertTrue(object instanceof LexicalHandler);
-        } catch (SAXException e) {
-            failUnexpected(e);
-        }
+    public void testProperty05(SAXParser saxparser) throws SAXException {
+        MyLexicalHandler myLexicalHandler = new MyLexicalHandler();
+        saxparser.setProperty(LEXICAL_HANDLER, myLexicalHandler);
+        assertTrue(saxparser.getProperty(LEXICAL_HANDLER) instanceof LexicalHandler);
     }
 
     /**
      * Test to set and get the declaration-handler.
+     *
+     * @param saxparser a SAXParser instance.
+     * @throws SAXException If any parse errors occur.
      */
     @Test(dataProvider = "parser-provider")
-    public void testProperty06(SAXParser saxparser) {
-        try {
-            MyDeclHandler myDeclHandler = new MyDeclHandler();
-            saxparser.setProperty(DECL_HANDLER, myDeclHandler);
-            Object object = saxparser.getProperty(DECL_HANDLER);
-            assertTrue(object instanceof DeclHandler);
-        } catch (SAXException e) {
-            failUnexpected(e);
-        }
-
+    public void testProperty06(SAXParser saxparser) throws SAXException {
+        MyDeclHandler myDeclHandler = new MyDeclHandler();
+        saxparser.setProperty(DECL_HANDLER, myDeclHandler);
+        assertTrue(saxparser.getProperty(DECL_HANDLER) instanceof DeclHandler);
     }
 
     /**
-     * Customized LexicalHandler used for test.
+     * Customized LexicalHandler used for test. An empty implementation for 
+     * LexicalHandler.
      */
     private class MyLexicalHandler implements LexicalHandler {
 
+        @Override
         public void comment(char[] ch, int start, int length) {
         }
 
+        @Override
         public void endCDATA() {
         }
 
+        @Override
         public void endDTD() {
         }
 
+        @Override
         public void endEntity(String name) {
         }
 
+        @Override
         public void startCDATA() {
         }
 
+        @Override
         public void startDTD(String name, String publicId, String systemId) {
         }
 
+        @Override
         public void startEntity(String name) {
         }
     }
 
     /**
-     * Customized DeclHandler used for test.
+     * Customized DeclHandler used for test. An empty implementation for 
+     * DeclHandler. 
      */
     private class MyDeclHandler implements DeclHandler {
 
+        @Override
         public void attributeDecl(String eName, String aName, String type, String valueDefault, String value) {
         }
 
+        @Override
         public void elementDecl(String name, String model) {
         }
 
+        @Override
         public void externalEntityDecl(String name, String publicId, String systemId) {
         }
 
+        @Override
         public void internalEntityDecl(String name, String value) {
         }
     }
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java	2015-01-09 15:41:19.780090596 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java	2015-01-09 15:41:19.703090476 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -23,17 +23,17 @@
 
 package javax.xml.parsers.ptests;
 
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-
 import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
+import java.io.FilePermission;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
+import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
+import static org.testng.Assert.fail;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -41,68 +41,70 @@
 /**
  * Class contains the test cases for SAXParser API
  */
-public class SAXParserTest03 {
+public class SAXParserTest03 extends JAXPFileReadOnlyBaseTest {
 
     /**
      * Provide SAXParserFactory.
      *
-     * @throws Exception
+     * @return a dimensional contains.
      */
     @DataProvider(name = "input-provider")
     public Object[][] getFactory() {
         SAXParserFactory spf = SAXParserFactory.newInstance();
         spf.setValidating(true);
-        MyErrorHandler handler = MyErrorHandler.newInstance();
-        return new Object[][] { { spf, handler } };
+        return new Object[][] { { spf, MyErrorHandler.newInstance() } };
     }
 
     /**
      * parsertest.xml holds a valid document. This method tests the validating
      * parser.
+     * 
+     * @param spf a Parser factory.
+     * @param handler an error handler for capturing events.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "input-provider")
-    public void testParseValidate01(SAXParserFactory spf, MyErrorHandler handler) {
-        try {
-            SAXParser saxparser = spf.newSAXParser();
-            saxparser.parse(new File(TestUtils.XML_DIR, "parsertest.xml"), handler);
-            assertFalse(handler.errorOccured);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    @Test(groups = {"readLocalFiles"}, dataProvider = "input-provider")
+    public void testParseValidate01(SAXParserFactory spf, MyErrorHandler handler) 
+            throws Exception {
+            spf.newSAXParser().parse(new File(XML_DIR, "parsertest.xml"), handler);
+            assertFalse(handler.isErrorOccured());
     }
 
     /**
      * validns.xml holds a valid document with XML namespaces in it. This method
      * tests the Validating parser with namespace processing on.
+     * 
+     * @param spf a Parser factory.
+     * @param handler an error handler for capturing events.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "input-provider")
-    public void testParseValidate02(SAXParserFactory spf, MyErrorHandler handler) {
-        try {
+    @Test(groups = {"readLocalFiles"}, dataProvider = "input-provider")
+    public void testParseValidate02(SAXParserFactory spf, MyErrorHandler handler) 
+            throws Exception {
             spf.setNamespaceAware(true);
-            SAXParser saxparser = spf.newSAXParser();
-            saxparser.parse(new File(TestUtils.XML_DIR, "validns.xml"), handler);
-            assertFalse(handler.errorOccured);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+            spf.newSAXParser().parse(new File(XML_DIR, "validns.xml"), handler);
+            assertFalse(handler.isErrorOccured());
     }
 
     /**
      * invalidns.xml holds an invalid document with XML namespaces in it. This
      * method tests the validating parser with namespace processing on. It
      * should throw validation error.
+     * 
+     * @param spf a Parser factory.
+     * @param handler an error handler for capturing events.
+     * @throws Exception If any errors occur.
      */
-    @Test(dataProvider = "input-provider")
-    public void testParseValidate03(SAXParserFactory spf, MyErrorHandler handler) {
+    @Test(groups = {"readLocalFiles"}, dataProvider = "input-provider")
+    public void testParseValidate03(SAXParserFactory spf, MyErrorHandler handler) 
+            throws Exception {
         try {
             spf.setNamespaceAware(true);
             SAXParser saxparser = spf.newSAXParser();
-            saxparser.parse(new File(TestUtils.XML_DIR, "invalidns.xml"), handler);
-            failUnexpected(new RuntimeException());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            if (e instanceof SAXException) {
-                assertTrue(handler.errorOccured);
-            }
+            saxparser.parse(new File(XML_DIR, "invalidns.xml"), handler);
+            fail("Expecting SAXException here");
+        } catch (SAXException e) {
+            assertTrue(handler.isErrorOccured());
         }
     }
 
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java	2015-01-09 15:41:20.120091126 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java	2015-01-09 15:41:20.043091006 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,12 +24,14 @@
 package javax.xml.transform.ptests;
 
 import java.io.File;
+import java.io.FilePermission;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import org.testng.annotations.Test;
@@ -37,7 +39,7 @@
 /**
  * Class containing the test cases for ErrorListener interface
  */
-public class ErrorListenerTest implements ErrorListener {
+public class ErrorListenerTest extends JAXPBaseTest implements ErrorListener {
     /**
      * Define ErrorListener's status.
      */
@@ -58,9 +60,10 @@
         try {
             TransformerFactory tfactory = TransformerFactory.newInstance();
             tfactory.setErrorListener (listener);
+            setPermissions(new FilePermission(XML_DIR + "invalid.xsl", "read"));
             tfactory.newTransformer(new StreamSource(
                                         new File(XML_DIR + "invalid.xsl")));
-            fail("We expect an Exception here");
+            fail("Expect TransformerConfigurationException here");
         } catch (TransformerConfigurationException ex) {
             assertEquals(listener.status, ListenerStatus.FATAL);
         }
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java	2015-01-09 15:41:20.457091652 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java	2015-01-09 15:41:20.381091533 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,11 +24,8 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
@@ -36,21 +33,20 @@
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * Class containing the test cases for SAXParserFactory API
  */
-public class TfClearParamTest {
+public class TfClearParamTest extends JAXPFileReadOnlyBaseTest {
     /**
-     * Test xslt file.
+     * Test style-sheet file name.
      */
     private final String XSL_FILE = XML_DIR + "cities.xsl";
 
@@ -72,193 +68,164 @@
     /**
      * Obtains transformer's parameter with the same name that set before. Value
      * should be same as set one.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
      */
     @Test
-    public void clear01() {
-        try {
-            Transformer transformer = TransformerFactory.newInstance().newTransformer();
-            transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
-            assertEquals(transformer.getParameter(LONG_PARAM_NAME).toString(), PARAM_VALUE);
-        } catch (TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        }
-
+    public void clear01() throws TransformerConfigurationException {
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
+        assertEquals(transformer.getParameter(LONG_PARAM_NAME).toString(), PARAM_VALUE);
     }
 
     /**
      * Obtains transformer's parameter with the a name that wasn't set before.
      * Null is expected.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
      */
     @Test
-    public void clear02() {
-        try {
-            Transformer transformer = TransformerFactory.newInstance().newTransformer();
-            transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
-            transformer.clearParameters();
-            assertNull(transformer.getParameter(LONG_PARAM_NAME));
-        } catch (TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
+    public void clear02() throws TransformerConfigurationException {
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
+        transformer.clearParameters();
+        assertNull(transformer.getParameter(LONG_PARAM_NAME));
+    }
+
+    /**
+     * Obtains transformer's parameter with a short name that set before. Value
+     * should be same as set one.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
+     */
+    @Test
+    public void clear03() throws TransformerConfigurationException {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        Transformer transformer = tfactory.newTransformer();
+
+        transformer.setParameter(SHORT_PARAM_NAME, PARAM_VALUE);
+        assertEquals(transformer.getParameter(SHORT_PARAM_NAME).toString(), PARAM_VALUE);
+    }
+
+    /**
+     * Obtains transformer's parameter with a short name that set with an integer
+     * object before. Value should be same as the set integer object.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
+     */
+    @Test
+    public void clear04() throws TransformerConfigurationException {
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+
+        int intObject = 5;
+        transformer.setParameter(SHORT_PARAM_NAME, intObject);
+        assertEquals(transformer.getParameter(SHORT_PARAM_NAME), intObject);
     }
 
     /**
      * Obtains transformer's parameter whose initiated with a stream source with
      * the a name that set before. Value should be same as set one.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
      */
-    @Test
-    public void clear03() {
-        try {
-            Transformer transformer = TransformerFactory.newInstance().
-                    newTransformer(new StreamSource(new File(XSL_FILE)));
+    @Test (groups = {"readLocalFiles"})
+    public void clear05() throws TransformerConfigurationException {
+        Transformer transformer = TransformerFactory.newInstance().
+                newTransformer(new StreamSource(new File(XSL_FILE)));
 
-            transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
-            assertEquals(transformer.getParameter(LONG_PARAM_NAME), PARAM_VALUE);
-        } catch (TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
+        transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
+        assertEquals(transformer.getParameter(LONG_PARAM_NAME), PARAM_VALUE);
     }
 
     /**
      * Obtains transformer's parameter whose initiated with a stream source with
      * the a name that wasn't set before. Null is expected.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
      */
-    @Test
-    public void clear04() {
-        try {
-            Transformer transformer = TransformerFactory.newInstance().
-                    newTransformer(new StreamSource(new File(XSL_FILE)));
-            transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
-            transformer.clearParameters();
-            assertNull(transformer.getParameter(LONG_PARAM_NAME));
-        } catch (TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
-
+    @Test (groups = {"readLocalFiles"})
+    public void clear06() throws TransformerConfigurationException {
+        Transformer transformer = TransformerFactory.newInstance().
+                newTransformer(new StreamSource(new File(XSL_FILE)));
+        transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
+        transformer.clearParameters();
+        assertNull(transformer.getParameter(LONG_PARAM_NAME));
     }
 
     /**
      * Obtains transformer's parameter whose initiated with a sax source with
      * the a name that set before. Value should be same as set one.
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void clear05() {
-        try {
-            InputSource is = new InputSource(new FileInputStream(XSL_FILE));
+    @Test (groups = {"readLocalFiles"})
+    public void clear07() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XSL_FILE)) {
             SAXSource saxSource = new SAXSource();
-            saxSource.setInputSource(is);
+            saxSource.setInputSource(new InputSource(fis));
 
             Transformer transformer = TransformerFactory.newInstance().newTransformer(saxSource);
-
             transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
             assertEquals(transformer.getParameter(LONG_PARAM_NAME), PARAM_VALUE);
-        } catch (FileNotFoundException | TransformerConfigurationException ex){
-            failUnexpected(ex);
         }
     }
 
     /**
      * Obtains transformer's parameter whose initiated with a sax source with
      * the a name that wasn't set before. Null is expected.
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void clear06() {
-        try {
-            InputSource is = new InputSource(new FileInputStream(XSL_FILE));
+    @Test (groups = {"readLocalFiles"})
+    public void clear08() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XSL_FILE)) {
             SAXSource saxSource = new SAXSource();
-            saxSource.setInputSource(is);
+            saxSource.setInputSource(new InputSource(fis));
 
             Transformer transformer = TransformerFactory.newInstance().newTransformer(saxSource);
-
             transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
             transformer.clearParameters();
             assertNull(transformer.getParameter(LONG_PARAM_NAME));
-        } catch (FileNotFoundException | TransformerConfigurationException ex){
-            failUnexpected(ex);
         }
     }
 
     /**
      * Obtains transformer's parameter whose initiated with a dom source with
      * the a name that set before. Value should be same as set one.
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void clear07() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(XSL_FILE));
-            DOMSource domSource = new DOMSource((Node)document);
+    @Test (groups = {"readLocalFiles"})
+    public void clear09() throws Exception {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(XSL_FILE));
+        DOMSource domSource = new DOMSource((Node)document);
 
-            Transformer transformer = tfactory.newTransformer(domSource);
+        Transformer transformer = tfactory.newTransformer(domSource);
 
-            transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
-            assertEquals(transformer.getParameter(LONG_PARAM_NAME), PARAM_VALUE);
-        } catch (IOException | ParserConfigurationException
-                | TransformerConfigurationException | SAXException ex){
-            failUnexpected(ex);
-        }
+        transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
+        assertEquals(transformer.getParameter(LONG_PARAM_NAME), PARAM_VALUE);
     }
 
     /**
      * Obtains transformer's parameter whose initiated with a dom source with
      * the a name that wasn't set before. Null is expected.
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void clear08() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(XSL_FILE));
-            DOMSource domSource = new DOMSource((Node)document);
-
-            Transformer transformer = tfactory.newTransformer(domSource);
-            transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
-            transformer.clearParameters();
-            assertNull(transformer.getParameter(LONG_PARAM_NAME));
-        } catch (IOException | ParserConfigurationException
-                | TransformerConfigurationException | SAXException ex){
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Obtains transformer's parameter with a short name that set before. Value
-     * should be same as set one.
-     */
-    @Test
-    public void clear09() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-            Transformer transformer = tfactory.newTransformer();
-
-            transformer.setParameter(SHORT_PARAM_NAME, PARAM_VALUE);
-            assertEquals(transformer.getParameter(SHORT_PARAM_NAME).toString(), PARAM_VALUE);
-        } catch (TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Obtains transformer's parameter with a short name that set with an integer
-     * object before. Value should be same as the set integer object.
-     */
-    @Test
-    public void clear10() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-            Transformer transformer = tfactory.newTransformer();
-
-            int intObject = 5;
-            transformer.setParameter(SHORT_PARAM_NAME, intObject);
-            assertEquals(transformer.getParameter(SHORT_PARAM_NAME), intObject);
-        } catch (TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
+    @Test (groups = {"readLocalFiles"})
+    public void clear10() throws Exception {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(XSL_FILE));
+        DOMSource domSource = new DOMSource((Node)document);
+
+        Transformer transformer = tfactory.newTransformer(domSource);
+        transformer.setParameter(LONG_PARAM_NAME, PARAM_VALUE);
+        transformer.clearParameters();
+        assertNull(transformer.getParameter(LONG_PARAM_NAME));
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java	2015-01-09 15:41:20.811092203 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java	2015-01-09 15:41:20.734092083 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,12 +23,14 @@
 package javax.xml.transform.ptests;
 
 import java.io.File;
+import java.io.FilePermission;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
@@ -38,13 +40,14 @@
 /**
  *  Basic test for TransformerException specification.
  */
-public class TransformerExcpTest {
+public class TransformerExcpTest extends JAXPBaseTest {
     /**
-     * Transform an unformatted xslt file. TransformerException is thrown.
+     * Transform an unformatted style-sheet file. TransformerException is thrown.
      */
     @Test
     public void tfexception() {
         try {
+            setPermissions(new FilePermission(XML_DIR  + "-", "read"));
             // invalid.xsl has well-formedness error. Therefore transform throws
             // TransformerException
             StreamSource streamSource
@@ -60,6 +63,8 @@
             assertNotNull(e.getException());
             assertNull(e.getLocationAsString());
             assertEquals(e.getMessageAndLocation(),e.getMessage());
+        } finally {
+            setPermissions();
         }
     }
 
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java	2015-01-09 15:41:21.165092755 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java	2015-01-09 15:41:21.087092633 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,39 +24,35 @@
 
 import java.io.*;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import javax.xml.parsers.*;
 import javax.xml.transform.*;
 import javax.xml.transform.dom.*;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
 import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.stream.*;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 import org.w3c.dom.*;
-import org.xml.sax.SAXException;
 
 /**
  * Class containing the test cases for TransformerFactory API's
  * getAssociatedStyleSheet method.
  */
-public class TransformerFactoryTest {
+public class TransformerFactoryTest extends JAXPFileBaseTest {
     /**
      * This test case checks for the getAssociatedStylesheet method
      * of TransformerFactory.
      * The style sheet returned is then copied to an tfactory01.out
-     * It will then be verified to see if it matches the golden files
+     * It will then be verified to see if it matches the golden files.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void tfactory01() {
-        String outputFile = CLASS_DIR + "tfactory01.out";
+    public void tfactory01() throws Exception {
+        String outputFile = USER_DIR + "tfactory01.out";
         String goldFile = GOLDEN_DIR + "tfactory01GF.out";
         String xmlFile = XML_DIR + "TransformerFactoryTest.xml";
         String xmlURI = "file:///" + XML_DIR;
@@ -76,10 +72,7 @@
                                            "Modern", null);
             Transformer t = tFactory.newTransformer();
             t.transform(s, streamResult);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException | ParserConfigurationException
-                | TransformerException | SAXException ex) {
-            failUnexpected(ex);
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java	2015-01-09 15:41:21.594093423 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java	2015-01-09 15:41:21.516093302 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,12 +24,9 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Properties;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -39,150 +36,132 @@
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * Basic test cases for Transformer API
  */
-public class TransformerTest {
+public class TransformerTest extends JAXPFileReadOnlyBaseTest {
     /**
      * XSLT file serves every test method.
      */
     private final static String TEST_XSL = XML_DIR + "cities.xsl";
 
     /**
-     * This tests if newTransformer(StreamSource) method returns Transformer
-     */
-    @Test
-    public void transformer01() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-            StreamSource streamSource = new StreamSource(
-                                        new File(TEST_XSL));
-            Transformer transformer = tfactory.newTransformer(streamSource);
-            assertNotNull(transformer);
-        } catch (TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
+     * This tests if newTransformer(StreamSource) method returns Transformer.
+     * @throws TransformerConfigurationException If for some reason the
+     *         TransformerHandler can not be created.
+     */
+    @Test (groups = {"readLocalFiles"})
+    public void transformer01() throws TransformerConfigurationException {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        StreamSource streamSource = new StreamSource(
+                                    new File(TEST_XSL));
+        Transformer transformer = tfactory.newTransformer(streamSource);
+        assertNotNull(transformer);
     }
 
     /**
-     * This tests if newTransformer(SAXSource) method returns Transformer
-     */
-    @Test
-    public void transformer02() {
-        try {
+     * This tests if newTransformer(SAXSource) method returns Transformer.
+     * @throws Exception If any errors occur.
+     */
+    @Test (groups = {"readLocalFiles"})
+    public void transformer02() throws Exception {
+        try (FileInputStream fis = new FileInputStream(TEST_XSL)) {
             TransformerFactory tfactory = TransformerFactory.newInstance();
-            InputSource is = new InputSource(
-                        new FileInputStream(TEST_XSL));
-            SAXSource saxSource = new SAXSource(is);
+            SAXSource saxSource = new SAXSource(new InputSource(fis));
             Transformer transformer = tfactory.newTransformer(saxSource);
             assertNotNull(transformer);
-        } catch (TransformerConfigurationException | FileNotFoundException ex){
-            failUnexpected(ex);
         }
     }
 
     /**
-     * This tests if newTransformer(DOMSource) method returns Transformer
-     */
-    @Test
-    public void transformer03() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
+     * This tests if newTransformer(DOMSource) method returns Transformer.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test (groups = {"readLocalFiles"})
+    public void transformer03() throws Exception {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(TEST_XSL));
+        DOMSource domSource = new DOMSource(document);
+
+        Transformer transformer = tfactory.newTransformer(domSource);
+        assertNotNull(transformer);
+    }
+
+    /**
+     * This tests set/get ErrorListener methods of Transformer.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test (groups = {"readLocalFiles"})
+    public void transformer04() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(TEST_XSL));
+        DOMSource domSource = new DOMSource(document);
+
+        Transformer transformer = TransformerFactory.newInstance()
+                .newTransformer(domSource);
+        transformer.setErrorListener(new MyErrorListener());
+        assertNotNull(transformer.getErrorListener());
+        assertTrue(transformer.getErrorListener() instanceof MyErrorListener);
+    }
+
+    /**
+     * This tests getOutputProperties() method of Transformer.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test (groups = {"readLocalFiles"})
+    public void transformer05() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(TEST_XSL));
+        DOMSource domSource = new DOMSource(document);
+
+        Transformer transformer = TransformerFactory.newInstance().
+                newTransformer(domSource);
+        Properties prop = transformer.getOutputProperties();
+
+        assertEquals(prop.getProperty("indent"), "yes");
+        assertEquals(prop.getProperty("method"), "xml");
+        assertEquals(prop.getProperty("encoding"), "UTF-8");
+        assertEquals(prop.getProperty("standalone"), "no");
+        assertEquals(prop.getProperty("version"), "1.0");
+        assertEquals(prop.getProperty("omit-xml-declaration"), "no");
+    }
+
+    /**
+     * This tests getOutputProperty() method of Transformer.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test (groups = {"readLocalFiles"})
+    public void transformer06() throws Exception {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(TEST_XSL));
+        DOMSource domSource = new DOMSource(document);
 
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(TEST_XSL));
-            DOMSource domSource = new DOMSource(document);
-
-            Transformer transformer = tfactory.newTransformer(domSource);
-            assertNotNull(transformer);
-        } catch (TransformerConfigurationException | IOException
-                | ParserConfigurationException | SAXException ex){
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * This tests set/get ErrorListener methods of Transformer
-     */
-    @Test
-    public void transformer04() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(TEST_XSL));
-            DOMSource domSource = new DOMSource(document);
-
-            Transformer transformer = TransformerFactory.newInstance()
-                    .newTransformer(domSource);
-            transformer.setErrorListener(new MyErrorListener());
-            assertNotNull(transformer.getErrorListener());
-            assertTrue(transformer.getErrorListener() instanceof MyErrorListener);
-        } catch (IOException | IllegalArgumentException | ParserConfigurationException
-                | TransformerConfigurationException | SAXException ex){
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * This tests getOutputProperties() method of Transformer
-     */
-    @Test
-    public void transformer05() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(TEST_XSL));
-            DOMSource domSource = new DOMSource(document);
-
-            Transformer transformer = TransformerFactory.newInstance().
-                    newTransformer(domSource);
-            Properties prop = transformer.getOutputProperties();
-
-            assertEquals(prop.getProperty("indent"), "yes");
-            assertEquals(prop.getProperty("method"), "xml");
-            assertEquals(prop.getProperty("encoding"), "UTF-8");
-            assertEquals(prop.getProperty("standalone"), "no");
-            assertEquals(prop.getProperty("version"), "1.0");
-            assertEquals(prop.getProperty("omit-xml-declaration"), "no");
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * This tests getOutputProperty() method of Transformer
-     */
-    @Test
-    public void transformer06() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(TEST_XSL));
-            DOMSource domSource = new DOMSource(document);
-
-            Transformer transformer = tfactory.newTransformer(domSource);
-            assertEquals(transformer.getOutputProperty("method"), "xml");
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerConfigurationException | IllegalArgumentException ex){
-            failUnexpected(ex);
-        }
+        Transformer transformer = tfactory.newTransformer(domSource);
+        assertEquals(transformer.getOutputProperty("method"), "xml");
     }
 }
 
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java	2015-01-09 15:41:21.940093963 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java	2015-01-09 15:41:21.862093841 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -25,42 +25,34 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
 import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 
 /**
  * Here a transformer is created using DOMSource. Some specific output property
  * is set on transformer. Then transform(StreamSource, StreamResult) is tested.
  */
-public class TransformerTest02 {
+public class TransformerTest02 extends JAXPFileBaseTest {
     /**
      * Unit test for transform(StreamSource, StreamResult).
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "transformer02.out";
+    public void testcase01() throws Exception {
+        String outputFile = USER_DIR + "transformer02.out";
         String goldFile = GOLDEN_DIR + "transformer02GF.out";
         String xsltFile = XML_DIR + "cities.xsl";
         String xmlFile = XML_DIR + "cities.xml";
@@ -69,9 +61,8 @@
                 FileOutputStream fos = new FileOutputStream(outputFile)) {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(xsltFile));
-            DOMSource domSource = new DOMSource(document);
+            DOMSource domSource = new DOMSource(dbf.newDocumentBuilder().
+                    parse(new File(xsltFile)));
 
             Transformer transformer = TransformerFactory.newInstance().
                     newTransformer(domSource);
@@ -79,20 +70,8 @@
             StreamResult streamResult = new StreamResult(fos);
 
             transformer.setOutputProperty("indent", "no");
-            transformer.transform( streamSource, streamResult);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException | IllegalArgumentException
-                | ParserConfigurationException | TransformerException
-                | SAXException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
+            transformer.transform(streamSource, streamResult);
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java	2015-01-09 15:41:22.294094514 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java	2015-01-09 15:41:22.218094396 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -25,30 +25,20 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Properties;
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
 import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
 import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 /**
  * Here Properties Object is populated with required properties.A transformer
@@ -56,13 +46,15 @@
  * for transformer. Then transform(StreamSource, StreamResult) is used for
  * transformation. This tests the setOutputProperties() method.
  */
-public class TransformerTest03 {
+public class TransformerTest03 extends JAXPFileBaseTest {
     /**
      * Test for Transformer.setOutputProperties method.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "transformer03.out";
+    public void testcase01() throws Exception {
+        String outputFile = USER_DIR + "transformer03.out";
         String goldFile = GOLDEN_DIR + "transformer03GF.out";
         String xsltFile = XML_DIR + "cities.xsl";
         String xmlFile = XML_DIR + "cities.xml";
@@ -81,29 +73,14 @@
 
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(xsltFile));
-            DOMSource domSource = new DOMSource(document);
+            DOMSource domSource = new DOMSource(dbf.newDocumentBuilder().
+                    parse(new File(xsltFile)));
 
             Transformer transformer = TransformerFactory.newInstance().
                     newTransformer(domSource);
-            StreamSource streamSource = new StreamSource(fis);
-            StreamResult streamResult = new StreamResult(fos);
-
             transformer.setOutputProperties(properties);
-            transformer.transform( streamSource, streamResult);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException
-                | IOException | TransformerException ex){
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
+            transformer.transform(new StreamSource(fis), new StreamResult(fos));
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java	2015-01-09 15:41:22.647095064 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java	2015-01-09 15:41:22.572094948 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -24,15 +24,10 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.dom.DOMSource;
@@ -40,18 +35,17 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileBaseTest;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * URIResolver should be invoked when transform happens.
  */
-public class URIResolverTest implements URIResolver {
+public class URIResolverTest extends JAXPFileBaseTest implements URIResolver {
     /**
      * System ID constant.
      */
@@ -72,9 +66,8 @@
      */
     private final static String XSL_TEMP_FILE = "temp/cities.xsl";
 
-
     /**
-     * expected Href.
+     * expected HREF.
      */
     private final String validateHref;
 
@@ -82,6 +75,14 @@
      * expected Base URI.
      */
     private final String validateBase;
+    
+    /**
+     * Default constructor for testng invocation.
+     */
+    public URIResolverTest(){
+        validateHref = null;
+        validateBase = null;
+    }
 
     /**
      * Constructor for setting expected Href and expected Base URI.
@@ -110,166 +111,144 @@
 
     /**
      * This is to test the URIResolver.resolve() method when a transformer is
-     * created using StreamSource. xsl file has xsl:include in it
+     * created using StreamSource. style-sheet file has xsl:include in it.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void resolver01() {
-        try {
+    @Test (groups = {"readLocalFiles"})
+    public static void resolver01() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XSL_INCLUDE_FILE)) {
             TransformerFactory tfactory = TransformerFactory.newInstance();
             URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
             tfactory.setURIResolver(resolver);
 
-            StreamSource streamSource = new StreamSource(new FileInputStream(XSL_INCLUDE_FILE));
+            StreamSource streamSource = new StreamSource(fis);
             streamSource.setSystemId(SYSTEM_ID);
-
-            Transformer transformer = tfactory.newTransformer(streamSource);
-        } catch (FileNotFoundException | TransformerConfigurationException ex){
-            failUnexpected(ex);
+            assertNotNull(tfactory.newTransformer(streamSource));
         }
     }
 
     /**
      * This is to test the URIResolver.resolve() method when a transformer is
-     * created using DOMSource. xsl file has xsl:include in it
+     * created using DOMSource. style-sheet file has xsl:include in it.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void resolver02() {
-        try {
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-            URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
-            tfactory.setURIResolver(resolver);
+    @Test (groups = {"readLocalFiles"})
+    public static void resolver02() throws Exception {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
+        tfactory.setURIResolver(resolver);
 
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(XSL_INCLUDE_FILE);
-            DOMSource domSource = new DOMSource(document, SYSTEM_ID);
-
-            Transformer transformer = tfactory.newTransformer(domSource);
-        } catch (IOException | ParserConfigurationException
-                | TransformerConfigurationException | SAXException ex){
-            failUnexpected(ex);
-        }
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(XSL_INCLUDE_FILE);
+        DOMSource domSource = new DOMSource(document, SYSTEM_ID);
+
+        assertNotNull(tfactory.newTransformer(domSource));
     }
 
     /**
      * This is to test the URIResolver.resolve() method when a transformer is
-     * created using SAXSource. xsl file has xsl:include in it
+     * created using SAXSource. style-sheet file has xsl:include in it.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void resolver03() {
-        try {
+    @Test (groups = {"readLocalFiles"})
+    public static void resolver03() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XSL_INCLUDE_FILE)){
             URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
             TransformerFactory tfactory = TransformerFactory.newInstance();
             tfactory.setURIResolver(resolver);
-            InputSource is = new InputSource(new FileInputStream(XSL_INCLUDE_FILE));
+            InputSource is = new InputSource(fis);
             is.setSystemId(SYSTEM_ID);
             SAXSource saxSource = new SAXSource(is);
-
-            Transformer transformer = tfactory.newTransformer(saxSource);
-        } catch (FileNotFoundException |  TransformerConfigurationException ex){
-            failUnexpected(ex);
+            assertNotNull(tfactory.newTransformer(saxSource));
         }
     }
 
     /**
      * This is to test the URIResolver.resolve() method when a transformer is
-     * created using StreamSource. xsl file has xsl:import in it
+     * created using StreamSource. style-sheet file has xsl:import in it.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void resolver04() {
-        try {
+    @Test (groups = {"readLocalFiles"})
+    public static void resolver04() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XSL_IMPORT_FILE)) {
             URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
             TransformerFactory tfactory = TransformerFactory.newInstance();
             tfactory.setURIResolver(resolver);
-
-            StreamSource streamSource = new StreamSource(new FileInputStream(XSL_IMPORT_FILE));
+            StreamSource streamSource = new StreamSource(fis);
             streamSource.setSystemId(SYSTEM_ID);
-
-            Transformer transformer = tfactory.newTransformer(streamSource);
-        } catch (FileNotFoundException | TransformerConfigurationException ex){
-            failUnexpected(ex);
+            assertNotNull(tfactory.newTransformer(streamSource));
         }
     }
 
     /**
      * This is to test the URIResolver.resolve() method when a transformer is
-     * created using DOMSource. xsl file has xsl:import in it
+     * created using DOMSource. style-sheet file has xsl:import in it.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void resolver05() {
-        try {
-            URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-            tfactory.setURIResolver(resolver);
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new File(XSL_IMPORT_FILE));
-            DOMSource domSource = new DOMSource(document, SYSTEM_ID);
-
-            Transformer transformer = tfactory.newTransformer(domSource);
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerConfigurationException ex){
-            failUnexpected(ex);
-        }
-
+    @Test (groups = {"readLocalFiles"})
+    public static void resolver05() throws Exception {
+        URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        tfactory.setURIResolver(resolver);
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document document = db.parse(new File(XSL_IMPORT_FILE));
+        DOMSource domSource = new DOMSource(document, SYSTEM_ID);
+        assertNotNull(tfactory.newTransformer(domSource));
     }
 
     /**
      * This is to test the URIResolver.resolve() method when a transformer is
-     * created using SAXSource. xsl file has xsl:import in it
+     * created using SAXSource. style-sheet file has xsl:import in it.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void resolver06() {
-        try {
+    @Test (groups = {"readLocalFiles"})
+    public static void resolver06() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XSL_IMPORT_FILE)){
             URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID);
             TransformerFactory tfactory = TransformerFactory.newInstance();
             tfactory.setURIResolver(resolver);
-
-            InputSource is = new InputSource(new FileInputStream(XSL_IMPORT_FILE));
+            InputSource is = new InputSource(fis);
             is.setSystemId(SYSTEM_ID);
             SAXSource saxSource = new SAXSource(is);
-
-            Transformer transformer = tfactory.newTransformer(saxSource);
-        } catch (FileNotFoundException | TransformerConfigurationException ex){
-            failUnexpected(ex);
+            assertNotNull(tfactory.newTransformer(saxSource));
         }
-
     }
 
     /**
      * This is to test the URIResolver.resolve() method when there is an error
      * in the file.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public static void docResolver01() {
-        try {
+    @Test (groups = {"readLocalFiles"})
+    public static void docResolver01() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XML_DIR + "doctest.xsl")) {
             URIResolverTest resolver = new URIResolverTest("temp/colors.xml", SYSTEM_ID);
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-
-            StreamSource streamSource = new StreamSource(
-                    new FileInputStream(XML_DIR + FILE_SEP + "doctest.xsl"));
+            StreamSource streamSource = new StreamSource(fis);
             streamSource.setSystemId(SYSTEM_ID);
-            System.err.println(streamSource.getSystemId());
 
-            Transformer transformer = tfactory.newTransformer(streamSource);
+            Transformer transformer = TransformerFactory.newInstance().newTransformer(streamSource);
             transformer.setURIResolver(resolver);
 
-            File f = new File(XML_DIR + FILE_SEP + "myFake.xml");
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(f);
+            File f = new File(XML_DIR + "myFake.xml");
+            Document document = DocumentBuilderFactory.newInstance().
+                    newDocumentBuilder().parse(f);
 
             // Use a Transformer for output
             DOMSource source = new DOMSource(document);
-            System.err.println("Ignore the following output -- just dumping it here");
             StreamResult result = new StreamResult(System.err);
+            // No exception is expected because resolver resolve wrong URI. 
             transformer.transform(source, result);
-        } catch (IOException | ParserConfigurationException | SAXException
-                | TransformerException ex) {
-            failUnexpected(ex);
         }
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java	2015-01-09 15:41:22.989095598 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java	2015-01-09 15:41:22.914095481 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,19 +23,22 @@
 package javax.xml.transform.ptests.othervm;
 
 import javax.xml.transform.*;
+import jaxp.library.JAXPBaseTest;
+import static org.testng.Assert.fail;
 import org.testng.annotations.Test;
 
 /**
  * Negative test for set invalid TransformerFactory property.
  */
-public class TFCErrorTest{
+public class TFCErrorTest  extends JAXPBaseTest {
     @Test(expectedExceptions = ClassNotFoundException.class)
     public void tfce01() throws Exception {
         try{
-            System.setProperty("javax.xml.transform.TransformerFactory","xx");
-            TransformerFactory tFactory = TransformerFactory.newInstance();
-        } catch (TransformerFactoryConfigurationError error) {
-            throw error.getException();
+            setSystemProperty("javax.xml.transform.TransformerFactory","xx");
+            TransformerFactory.newInstance();
+            fail("Expect TransformerFactoryConfigurationError here");
+        } catch (TransformerFactoryConfigurationError expected) {
+            throw expected.getException();
         }
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java	2015-01-09 15:41:23.352096163 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java	2015-01-09 15:41:23.271096037 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,7 +23,7 @@
 
 package javax.xml.xpath.ptests;
 
-import java.io.IOException;
+import java.io.FilePermission;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -31,7 +31,6 @@
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPath;
 import static javax.xml.xpath.XPathConstants.BOOLEAN;
 import static javax.xml.xpath.XPathConstants.NODE;
@@ -41,7 +40,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import static javax.xml.xpath.ptests.XPathTestConst.XML_DIR;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static org.testng.Assert.assertEquals;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -49,12 +48,11 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * Class containing the test cases for XPathExpression API.
  */
-public class XPathExpressionTest {
+public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest {
     /**
      * Document object for testing XML file.
      */
@@ -87,13 +85,11 @@
 
     /**
      * Create Document object and XPath object for every time
-     * @throws ParserConfigurationException If the factory class cannot be
-     *                                      loaded, instantiated
-     * @throws SAXException If any parse errors occur.
-     * @throws IOException If operation on xml file failed.
+     * @throws Exception If any errors occur.
      */
     @BeforeTest
-    public void setup() throws ParserConfigurationException, SAXException, IOException {
+    public void setup() throws Exception {
+        setPermissions(new FilePermission(XML_PATH.toFile().toString(), "read"));
         document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(XML_PATH.toFile());
         xpath = XPathFactory.newInstance().newXPath();
     }
@@ -101,343 +97,303 @@
     /**
      * Test for evaluate(java.lang.Object item,QName returnType)throws
      * XPathExpressionException.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression01() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_A).
-                    evaluate(document, STRING), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression01() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_A).
+                evaluate(document, STRING), "6");
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) throws NPE if input
      * source is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression02() {
-        try {
-            xpath.compile(EXPRESSION_NAME_A).evaluate(null, STRING);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression02() throws XPathExpressionException {
+        xpath.compile(EXPRESSION_NAME_A).evaluate(null, STRING);
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) throws NPE if returnType
      * is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression03() {
-        try {
-            xpath.compile(EXPRESSION_NAME_A).evaluate(document, null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression03() throws XPathExpressionException {
+        xpath.compile(EXPRESSION_NAME_A).evaluate(document, null);
     }
 
     /**
      * Test for method evaluate(java.lang.Object item,QName returnType).If a
      * request is made to evaluate the expression in the absence of a context
      * item, simple expressions, such as "1+1", can be evaluated.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression04() {
-        try {
-            assertEquals(xpath.compile("1+1").evaluate(document, STRING), "2");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression04() throws XPathExpressionException {
+        assertEquals(xpath.compile("1+1").evaluate(document, STRING), "2");
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) throws IAE If returnType
      * is not one of the types defined in XPathConstants.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testCheckXPathExpression05() {
-        try {
-            xpath.compile(EXPRESSION_NAME_A).evaluate(document, TEST_QNAME);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression05() throws XPathExpressionException {
+        xpath.compile(EXPRESSION_NAME_A).evaluate(document, TEST_QNAME);
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) return correct boolean
      * value if returnType is Boolean.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression06() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_A).
+    public void testCheckXPathExpression06() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_A).
                 evaluate(document, BOOLEAN), true);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) return correct boolean
      * value if returnType is Boolean.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression07() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_B).
-                evaluate(document, BOOLEAN), false);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression07() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_B).
+            evaluate(document, BOOLEAN), false);
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) return correct number
      * value when return type is Double.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression08() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_A).
-                evaluate(document, NUMBER), 6d);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression08() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_A).
+            evaluate(document, NUMBER), 6d);
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) evaluate an attribute
      * value which returnType is Node.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression09() {
-        try {
-            Attr attr = (Attr) xpath.compile(EXPRESSION_NAME_A).
-                    evaluate(document, NODE);
-            assertEquals(attr.getValue(), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression09() throws XPathExpressionException {
+        Attr attr = (Attr) xpath.compile(EXPRESSION_NAME_A).
+                evaluate(document, NODE);
+        assertEquals(attr.getValue(), "6");
     }
 
     /**
      * evaluate(java.lang.Object item,QName returnType) evaluate an attribute
      * value which returnType is NodeList.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression10() {
-        try {
-            NodeList nodeList = (NodeList) xpath.compile(EXPRESSION_NAME_A).
-                    evaluate(document, NODESET);
-            Attr attr = (Attr) nodeList.item(0);
-            assertEquals(attr.getValue(), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression10() throws XPathExpressionException {
+        NodeList nodeList = (NodeList) xpath.compile(EXPRESSION_NAME_A).
+                evaluate(document, NODESET);
+        Attr attr = (Attr) nodeList.item(0);
+        assertEquals(attr.getValue(), "6");
     }
 
     /**
      * Test for evaluate(java.lang.Object item) when returnType is left off of
      * the XPath.evaluate method, all expressions are evaluated to a String
      * value.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression11() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_A).evaluate(document), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression11() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_A).evaluate(document), "6");
     }
 
     /**
      * evaluate(java.lang.Object item) throws NPE if expression is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression12() {
-        try {
-            xpath.compile(null).evaluate(document);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression12() throws XPathExpressionException {
+        xpath.compile(null).evaluate(document);
     }
 
     /**
      * evaluate(java.lang.Object item) when a request is made to evaluate the
      * expression in the absence of a context item, simple expressions, such as
      * "1+1", can be evaluated.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathExpression13() {
-        try {
-            assertEquals(xpath.compile("1+1").evaluate(document), "2");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression13() throws XPathExpressionException {
+        assertEquals(xpath.compile("1+1").evaluate(document), "2");
     }
 
     /**
      * evaluate(java.lang.Object item) throws NPE if document is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression14() {
-        try {
-            xpath.compile(EXPRESSION_NAME_A).evaluate(null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression14() throws XPathExpressionException {
+        xpath.compile(EXPRESSION_NAME_A).evaluate(null);
     }
 
     /**
      * valuate(InputSource source) return a string value if return type is
      * String.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression15() {
+    @Test (groups = {"readLocalFiles"})
+    public void testCheckXPathExpression15() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.compile(EXPRESSION_NAME_A).
                     evaluate(new InputSource(is)), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source) throws NPE if input source is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression16() {
-        try {
-            xpath.compile(EXPRESSION_NAME_A).evaluate(null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression16() throws XPathExpressionException {
+        xpath.compile(EXPRESSION_NAME_A).evaluate(null);
     }
 
     /**
-     * evaluate(InputSource source) throws NPE if expression is null
+     * evaluate(InputSource source) throws NPE if expression is null.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression17() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void testCheckXPathExpression17() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile(null).evaluate(new InputSource(is));
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source) throws XPathExpressionException if
      * returnType is String junk characters.
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPathExpression18() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPathExpression18() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile("-*&").evaluate(new InputSource(is));
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source) throws XPathExpressionException if
      * expression is a blank string " ".
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPathExpression19() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPathExpression19() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile(" ").evaluate(new InputSource(is));
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * Test for evaluate(InputSource source,QName returnType) returns a string
      * value if returnType is String.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression20() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPathExpression20() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.compile(EXPRESSION_NAME_A).
                 evaluate(new InputSource(is), STRING), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) throws NPE if source is
      * null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression21() {
-        try {
-            xpath.compile(EXPRESSION_NAME_A).evaluate(null, STRING);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathExpression21() throws XPathExpressionException {
+        xpath.compile(EXPRESSION_NAME_A).evaluate(null, STRING);
     }
 
     /**
      * evaluate(InputSource source,QName returnType) throws NPE if expression is
      * null.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression22() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void testCheckXPathExpression22() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile(null).evaluate(new InputSource(is), STRING);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) throws NPE if returnType is
      * null.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathExpression23() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void testCheckXPathExpression23() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile(EXPRESSION_NAME_A).evaluate(new InputSource(is), null);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) throws
      * XPathExpressionException if expression is junk characters.
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPathExpression24() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPathExpression24() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile("-*&").evaluate(new InputSource(is), STRING);
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) throws
      * XPathExpressionException if expression is blank " ".
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPathExpression25() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPathExpression25() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile(" ").evaluate(new InputSource(is), STRING);
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
@@ -445,85 +401,85 @@
      * evaluate(InputSource source,QName returnType) throws
      * IllegalArgumentException if returnType is not one of the types defined
      * in XPathConstants.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testCheckXPathExpression26() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = IllegalArgumentException.class)
+    public void testCheckXPathExpression26() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.compile(EXPRESSION_NAME_A).evaluate(new InputSource(is), TEST_QNAME);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) return a correct boolean
      * value if returnType is Boolean.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression27() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPathExpression27() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.compile(EXPRESSION_NAME_A).
                 evaluate(new InputSource(is), BOOLEAN), true);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) return a correct boolean
      * value if returnType is Boolean.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression28() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPathExpression28() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.compile(EXPRESSION_NAME_B).
                 evaluate(new InputSource(is), BOOLEAN), false);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * evaluate(InputSource source,QName returnType) return a correct number
      * value if returnType is Number.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression29() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPathExpression29() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.compile(EXPRESSION_NAME_A).
                 evaluate(new InputSource(is), NUMBER), 6d);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * Test for evaluate(InputSource source,QName returnType) returns a node if
      * returnType is Node.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression30() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPathExpression30() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             Attr attr = (Attr) xpath.compile(EXPRESSION_NAME_A).
                 evaluate(new InputSource(is), NODE);
             assertEquals(attr.getValue(), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * Test for evaluate(InputSource source,QName returnType) return a node list
      * if returnType is NodeList.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPathExpression31() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPathExpression31() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             NodeList nodeList = (NodeList) xpath.compile(EXPRESSION_NAME_A).
                 evaluate(new InputSource(is), NODESET);
             assertEquals(((Attr) nodeList.item(0)).getValue(), "6");
-        } catch (XPathExpressionException | IOException  ex) {
-            failUnexpected(ex);
         }
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java	2015-01-09 15:41:23.707096717 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java	2015-01-09 15:41:23.632096600 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,14 +26,14 @@
 import static javax.xml.xpath.XPathConstants.DOM_OBJECT_MODEL;
 import javax.xml.xpath.XPathFactory;
 import javax.xml.xpath.XPathFactoryConfigurationException;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPBaseTest;
 import static org.testng.AssertJUnit.assertNotNull;
 import org.testng.annotations.Test;
 
 /**
  * Class containing the test cases for XPathFactory API.
  */
-public class XPathFactoryTest {
+public class XPathFactoryTest extends JAXPBaseTest {
     /**
      * Valid URL for creating a XPath factory.
      */
@@ -54,21 +54,21 @@
 
     /**
      * XPathFactory.newInstance(String uri) throws NPE if uri is null.
+     * 
+     * @throws XPathFactoryConfigurationException If the specified object model
+    *          is unavailable, or if there is a configuration error.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    private void testCheckXPathFactory02() {
-        try {
-            XPathFactory.newInstance(null);
-        } catch (XPathFactoryConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathFactory02() throws XPathFactoryConfigurationException {
+        XPathFactory.newInstance(null);
     }
 
     /**
      * XPathFactory.newInstance(String uri) throws XPFCE if uri is just a blank
      * string.
      *
-     * @throws XPathFactoryConfigurationException
+     * @throws XPathFactoryConfigurationException If the specified object model
+    *          is unavailable, or if there is a configuration error.
      */
     @Test(expectedExceptions = XPathFactoryConfigurationException.class)
     public void testCheckXPathFactory03() throws XPathFactoryConfigurationException {
@@ -78,21 +78,21 @@
     /**
      * Test for constructor - XPathFactory.newInstance(String uri) with valid
      * url - "http://java.sun.com/jaxp/xpath/dom".
+     * 
+     * @throws XPathFactoryConfigurationException If the specified object model
+    *          is unavailable, or if there is a configuration error.
      */
     @Test
-    public void testCheckXPathFactory04() {
-        try {
-            assertNotNull(XPathFactory.newInstance(VALID_URL));
-        } catch (XPathFactoryConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathFactory04() throws XPathFactoryConfigurationException {
+        assertNotNull(XPathFactory.newInstance(VALID_URL));
     }
 
     /**
      * Test for constructor - XPathFactory.newInstance(String uri) with invalid
      * url - "http://java.sun.com/jaxp/xpath/dom1".
      *
-     * @throws XPathFactoryConfigurationException
+     * @throws XPathFactoryConfigurationException If the specified object model
+    *          is unavailable, or if there is a configuration error.
      */
     @Test(expectedExceptions = XPathFactoryConfigurationException.class)
     public void testCheckXPathFactory05() throws XPathFactoryConfigurationException {
@@ -112,26 +112,24 @@
      * Test for constructor - XPathFactory.newInstance(String uri) with valid
      * url - "http://java.sun.com/jaxp/xpath/dom" and creating XPath with
      * newXPath().
+     *
+     * @throws XPathFactoryConfigurationException If the specified object model
+    *          is unavailable, or if there is a configuration error.
      */
     @Test
-    public void testCheckXPathFactory07() {
-        try {
-            assertNotNull(XPathFactory.newInstance(VALID_URL).newXPath());
-        } catch (XPathFactoryConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathFactory07() throws XPathFactoryConfigurationException {
+        assertNotNull(XPathFactory.newInstance(VALID_URL).newXPath());
     }
 
     /**
      * Test for constructor - XPathFactory.newInstance(String uri) with valid
      * uri - DOM_OBJECT_MODEL.toString().
+     *
+     * @throws XPathFactoryConfigurationException If the specified object model
+    *          is unavailable, or if there is a configuration error.
      */
     @Test
-    public void testCheckXPathFactory08() {
-        try {
-            assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
-        } catch (XPathFactoryConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathFactory08() throws XPathFactoryConfigurationException {
+        assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	2015-01-09 15:41:24.055097259 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	2015-01-09 15:41:23.979097141 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,7 +26,7 @@
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertEquals;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -34,7 +34,7 @@
 /**
  * Class containing the test cases for XPathFunctionResolver.
  */
-public class XPathFunctionResolverTest {
+public class XPathFunctionResolverTest extends JAXPBaseTest {
     /**
      * A XPath for evaluation environment and expressions.
      */
@@ -54,26 +54,22 @@
     /**
      * Test for resolveFunction(QName functionName,int arity). evaluate will
      * continue as long as functionName is meaningful.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPathFunctionResolver01() {
-        try {
-            assertEquals(xpath.evaluate("round(1.7)", (Object)null), "2");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathFunctionResolver01() throws XPathExpressionException {
+        assertEquals(xpath.evaluate("round(1.7)", (Object)null), "2");
     }
 
     /**
      * Test for resolveFunction(QName functionName,int arity); evaluate throws
      * NPE if functionName  is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPathFunctionResolver02() {
-        try {
-            assertEquals(xpath.evaluate(null, "5"), "2");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPathFunctionResolver02() throws XPathExpressionException {
+        assertEquals(xpath.evaluate(null, "5"), "2");
     }
 }
--- old/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java	2015-01-09 15:41:24.433097848 -0800
+++ new/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java	2015-01-09 15:41:24.355097727 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,7 +23,7 @@
 
 package javax.xml.xpath.ptests;
 
-import java.io.IOException;
+import java.io.FilePermission;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -33,7 +33,6 @@
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPath;
 import static javax.xml.xpath.XPathConstants.BOOLEAN;
 import static javax.xml.xpath.XPathConstants.NODE;
@@ -43,7 +42,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import static javax.xml.xpath.ptests.XPathTestConst.XML_DIR;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
@@ -53,12 +52,11 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * Class containing the test cases for XPath API.
  */
-public class XPathTest {
+public class XPathTest extends JAXPFileReadOnlyBaseTest {
     /**
      * Document object for testing XML file.
      */
@@ -91,13 +89,11 @@
 
     /**
      * Create Document object and XPath object for every time
-     * @throws ParserConfigurationException If the factory class cannot be
-     *                                      loaded, instantiated
-     * @throws SAXException If any parse errors occur.
-     * @throws IOException If operation on xml file failed.
+     * @throws Exception If any errors occur.
      */
     @BeforeTest
-    public void setup() throws ParserConfigurationException, SAXException, IOException {
+    public void setup() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "-", "read"));
         document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(XML_PATH.toFile());
         xpath = XPathFactory.newInstance().newXPath();
     }
@@ -105,62 +101,54 @@
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item, QName returnType) which return type is String.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath01() {
-        try {
-            assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document, STRING), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath01() throws XPathExpressionException {
+        assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document, STRING), "6");
     }
 
 
     /**
      * Test for XPath.compile(java.lang.String expression) and then
      * evaluate(java.lang.Object item, QName returnType).
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath02() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_A).evaluate(document, STRING), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath02() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_A).evaluate(document, STRING), "6");
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item) when the third argument is left off of the XPath.evaluate method,
      * all expressions are evaluated to a String value.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath03() {
-        try {
-            assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath03() throws XPathExpressionException {
+        assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document), "6");
     }
 
     /**
      * Test for XPath.compile(java.lang.String expression). If expression is
      * null, should throw NPE.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath04() {
-        try {
-            xpath.compile(null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath04() throws XPathExpressionException {
+        xpath.compile(null);
     }
 
     /**
      * Test for XPath.compile(java.lang.String expression). If expression cannot
      * be compiled junk characters, should throw XPathExpressionException.
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = XPathExpressionException.class)
     public void testCheckXPath05() throws XPathExpressionException {
@@ -170,8 +158,8 @@
     /**
      * Test for XPath.compile(java.lang.String expression). If expression is
      * blank, should throw XPathExpressionException
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = XPathExpressionException.class)
     public void testCheckXPath06() throws XPathExpressionException {
@@ -181,55 +169,46 @@
     /**
      * Test for XPath.compile(java.lang.String expression). The expression
      * cannot be evaluated as this does not exist.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath07() {
-        try {
-            assertEquals(xpath.compile(EXPRESSION_NAME_B).evaluate(document, STRING), "");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
-
+    public void testCheckXPath07() throws XPathExpressionException {
+        assertEquals(xpath.compile(EXPRESSION_NAME_B).evaluate(document, STRING), "");
     }
 
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
-     * item, QName returnType). If String expression is null, should throw NPE
+     * item, QName returnType). If String expression is null, should throw NPE.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath08() {
-        try {
-            xpath.evaluate(null, document, STRING);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath08() throws XPathExpressionException {
+        xpath.evaluate(null, document, STRING);
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item, QName returnType). If item is null, should throw NPE.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath09() {
-        try {
-            xpath.evaluate(EXPRESSION_NAME_A, null, STRING);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath09() throws XPathExpressionException {
+        xpath.evaluate(EXPRESSION_NAME_A, null, STRING);
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item, QName returnType). If returnType is null, should throw NPE.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath10() {
-        try {
-            xpath.evaluate(EXPRESSION_NAME_A, document, null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath10() throws XPathExpressionException {
+        xpath.evaluate(EXPRESSION_NAME_A, document, null);
     }
 
     /**
@@ -237,23 +216,20 @@
      * item, QName returnType). If a request is made to evaluate the expression
      * in the absence of a context item, simple expressions, such as "1+1", can
      * be evaluated.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath11() {
-        try {
-            assertEquals(xpath.evaluate("1+1", document, STRING), "2");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath11() throws XPathExpressionException {
+        assertEquals(xpath.evaluate("1+1", document, STRING), "2");
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, java.lang.Object item, QName
      * returnType) throws XPathExpressionException if expression is a empty
      * string "".
-     * .
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = XPathExpressionException.class)
     public void testCheckXPath12() throws XPathExpressionException {
@@ -264,161 +240,141 @@
      * XPath.evaluate(java.lang.String expression, java.lang.Object item, QName
      * returnType) throws IllegalArgumentException if returnType is not one of
      * the types defined in XPathConstants.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testCheckXPath13() {
-        try {
-            xpath.evaluate(EXPRESSION_NAME_A, document, TEST_QNAME);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath13() throws XPathExpressionException {
+        xpath.evaluate(EXPRESSION_NAME_A, document, TEST_QNAME);
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, java.lang.Object item, QName
      * returnType) returns correct boolean value if returnType is Boolean.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath14() {
-        try {
-            assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document, BOOLEAN), true);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath14() throws XPathExpressionException {
+        assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document, BOOLEAN), true);
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, java.lang.Object item, QName
      * returnType) returns false as  expression is not successful in evaluating
      * to any result if returnType is Boolean.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath15() {
-        try {
-            assertEquals(xpath.evaluate(EXPRESSION_NAME_B, document, BOOLEAN), false);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath15() throws XPathExpressionException {
+        assertEquals(xpath.evaluate(EXPRESSION_NAME_B, document, BOOLEAN), false);
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, java.lang.Object item, QName
      * returnType) returns correct number value if return type is Number.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath16() {
-        try {
-            assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document, NUMBER), 6d);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath16() throws XPathExpressionException {
+        assertEquals(xpath.evaluate(EXPRESSION_NAME_A, document, NUMBER), 6d);
     }
 
 
     /**
      * XPath.evaluate(java.lang.String expression, java.lang.Object item, QName
      * returnType) returns correct string value if return type is Node.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath17() {
-        try {
-            assertEquals(((Attr)xpath.evaluate(EXPRESSION_NAME_A, document, NODE)).getValue(), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath17() throws XPathExpressionException {
+        assertEquals(((Attr)xpath.evaluate(EXPRESSION_NAME_A, document, NODE)).getValue(), "6");
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item, QName returnType). If return type is NodeList,the evaluated value
      * equals to "6" as expected.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath18() {
-        try {
-            NodeList nodeList = (NodeList)xpath.evaluate(EXPRESSION_NAME_A, document, NODESET);
-            assertEquals(((Attr) nodeList.item(0)).getValue(), "6");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath18() throws XPathExpressionException {
+        NodeList nodeList = (NodeList)xpath.evaluate(EXPRESSION_NAME_A, document, NODESET);
+        assertEquals(((Attr) nodeList.item(0)).getValue(), "6");
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item). If expression is null, should throw NPE.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath19() {
-        try {
-            xpath.evaluate(null, document);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath19() throws XPathExpressionException {
+        xpath.evaluate(null, document);
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, java.lang.Object
      * item). If a request is made to evaluate the expression in the absence of
      * a context item, simple expressions, such as "1+1", can be evaluated.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test
-    public void testCheckXPath20() {
-        try {
-            assertEquals(xpath.evaluate("1+1", document), "2");
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath20() throws XPathExpressionException {
+        assertEquals(xpath.evaluate("1+1", document), "2");
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, java.lang.Object item) throws
      * NPE if InputSource is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath21() {
-        try {
-            xpath.evaluate(EXPRESSION_NAME_A, null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath21() throws XPathExpressionException {
+        xpath.evaluate(EXPRESSION_NAME_A, null);
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source) return
      * correct value by looking for Node.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath22() {
+    @Test (groups = {"readLocalFiles"})
+    public void testCheckXPath22() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is)), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source) throws
      * NPE if InputSource is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath23() {
-        try {
-            xpath.evaluate(EXPRESSION_NAME_A, null);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath23() throws XPathExpressionException {
+        xpath.evaluate(EXPRESSION_NAME_A, null);
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source) throws
      * NPE if String expression is null.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath24() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void testCheckXPath24() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate(null, new InputSource(is));
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
@@ -426,112 +382,102 @@
      * Test for XPath.evaluate(java.lang.String expression, InputSource source).
      * If expression is junk characters, expression cannot be evaluated, should
      * throw XPathExpressionException.
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPath25() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPath25() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate("-*&", new InputSource(is));
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source) throws
      * XPathExpressionException if expression is blank " ".
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPath26() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPath26() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate(" ", new InputSource(is));
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source, QName
      * returnType) returns correct string value which return type is String.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath27() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath27() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), STRING), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source, QName
      * returnType) throws NPE if source is null.
+     * 
+     * @throws XPathExpressionException If the expression cannot be evaluated.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath28() {
-        try {
-            xpath.evaluate(EXPRESSION_NAME_A, null, STRING);
-        } catch (XPathExpressionException ex) {
-            failUnexpected(ex);
-        }
+    public void testCheckXPath28() throws XPathExpressionException {
+        xpath.evaluate(EXPRESSION_NAME_A, null, STRING);
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source, QName
      * returnType) throws NPE if expression is null.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath29() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void testCheckXPath29() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate(null, new InputSource(is), STRING);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source,
-     * QName returnType) throws NPE if returnType is null .
+     * QName returnType) throws NPE if returnType is null.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void testCheckXPath30() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void testCheckXPath30() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), null);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source, QName
      * returnType) throws XPathExpressionException if expression is junk characters.
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPath31() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPath31() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate("-*&", new InputSource(is), STRING);
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source, QName
      * returnType) throws XPathExpressionException if expression is blank " ".
-     *
-     * @throws XPathExpressionException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = XPathExpressionException.class)
-    public void testCheckXPath32() throws XPathExpressionException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class)
+    public void testCheckXPath32() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate(" ", new InputSource(is), STRING);
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
@@ -539,84 +485,84 @@
      * XPath.evaluate(java.lang.String expression, InputSource source,
      * QName returnType) throws IllegalArgumentException if returnType is not
      * one of the types defined in XPathConstants.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testCheckXPath33() {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = IllegalArgumentException.class)
+    public void testCheckXPath33() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), TEST_QNAME);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source,
      * QName returnType) return correct boolean value if return type is Boolean.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath34() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath34() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is),
                 BOOLEAN), true);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source,
      * QName returnType) return correct boolean value if return type is Boolean.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath35() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath35() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_B, new InputSource(is),
                 BOOLEAN), false);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source,
      * QName returnType) return correct number value if return type is Number.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath36() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath36() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is),
                 NUMBER), 6d);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource source,
      * QName returnType) return correct string value if return type is Node.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath37() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath37() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(((Attr)xpath.evaluate(EXPRESSION_NAME_A,
                 new InputSource(is), NODE)).getValue(), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * Test for XPath.evaluate(java.lang.String expression, InputSource source,
      * QName returnType) which return type is NodeList.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath38() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath38() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             NodeList nodeList = (NodeList)xpath.evaluate(EXPRESSION_NAME_A,
                 new InputSource(is), NODESET);
             assertEquals(((Attr) nodeList.item(0)).getValue(), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
@@ -624,57 +570,57 @@
      * Test for XPath.evaluate(java.lang.String expression, InputSource iSource,
      * QName returnType). If return type is Boolean, should return false as
      * expression is not successful in evaluating to any result.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath52() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath52() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_B, new InputSource(is),
                 BOOLEAN), false);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource iSource, QName
      * returnType) returns correct number value which return type is Number.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath53() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath53() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is),
                 NUMBER), 6d);
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource iSource, QName
      * returnType) returns a node value if returnType is Node.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath54() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath54() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             assertEquals(((Attr)xpath.evaluate(EXPRESSION_NAME_A,
                 new InputSource(is), NODE)).getValue(), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * XPath.evaluate(java.lang.String expression, InputSource iSource, QName
      * returnType) returns a node list if returnType is NodeList.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckXPath55() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckXPath55() throws Exception {
         try (InputStream is = Files.newInputStream(XML_PATH)) {
             NodeList nodeList = (NodeList)xpath.evaluate(EXPRESSION_NAME_A,
                 new InputSource(is), NODESET);
             assertEquals(((Attr) nodeList.item(0)).getValue(), "6");
-        } catch (XPathExpressionException | IOException ex) {
-            failUnexpected(ex);
         }
     }
 
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java	2015-01-09 15:41:24.807098431 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java	2015-01-09 15:41:24.722098299 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -22,6 +22,7 @@
  */
 package org.xml.sax.ptests;
 
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import org.testng.annotations.Test;
@@ -30,7 +31,7 @@
 /**
  * Class containing the test cases for AttributesImpl API.
  */
-public class AttrImplTest {
+public class AttrImplTest extends JAXPBaseTest {
     private static final String CAR_URI = "http://www.cars.com/xml";
 
     private static final String CAR_LOCALNAME = "part";
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java	2015-01-09 15:41:25.168098994 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java	2015-01-09 15:41:25.091098874 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,20 +23,13 @@
 package org.xml.sax.ptests;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -45,39 +38,29 @@
  * ContentHandler has Attributes as one of its arguments. Attributes
  * pertaining to an element are taken into this argument and various methods
  * of Attributes interfaces are tested. This program uses Namespace processing
- * with namespaces in xml file. This program does not use Validation
+ * with namespaces in XML file. This program does not use Validation
  */
-public class AttributesNSTest {
+public class AttributesNSTest extends JAXPFileBaseTest {
     /**
      * Test for Attribute Interface's setter/getter.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "AttributesNS.out";
+    public void testcase01() throws Exception {
+        String outputFile = USER_DIR + "AttributesNS.out";
         String goldFile = GOLDEN_DIR + "AttributesNSGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            // http://www.saxproject.com/?selected=namespaces namespace-prefixes
-            //set to false to supress xmlns attributes
-            spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
-                                        false);
-            SAXParser saxParser = spf.newSAXParser();
-            MyAttrCHandler myAttrCHandler = new MyAttrCHandler(outputFile);
-            saxParser.parse(new File(xmlFile), myAttrCHandler);
-            myAttrCHandler.flushAndClose();
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException | ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        // http://www.saxproject.com/?selected=namespaces namespace-prefixes
+        //set to false to supress xmlns attributes
+        spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
+                                    false);
+        SAXParser saxParser = spf.newSAXParser();
+        MyAttrCHandler myAttrCHandler = new MyAttrCHandler(outputFile);
+        saxParser.parse(new File(xmlFile), myAttrCHandler);
+        myAttrCHandler.flushAndClose();
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java	2015-01-09 15:41:25.511099529 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java	2015-01-09 15:41:25.436099412 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,20 +23,13 @@
 package org.xml.sax.ptests;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -48,37 +41,28 @@
  * This program uses Namespace processing without any namepsaces in xml file.
  * This program uses Validation
  */
-public class AttributesTest {
+public class AttributesTest extends JAXPFileBaseTest {
     /**
      * Unit test for Attributes interface. Prints all attributes into output
      * file. Check it with golden file.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "Attributes.out";
+    public void testcase01() throws Exception {
+        String outputFile = USER_DIR + "Attributes.out";
         String goldFile = GOLDEN_DIR + "AttributesGF.out";
         String xmlFile = XML_DIR + "family.xml";
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
-                                        true);
-            spf.setValidating(true);
-            SAXParser saxParser = spf.newSAXParser();
-            MyAttrCHandler myAttrCHandler = new MyAttrCHandler(outputFile);
-            saxParser.parse(new File(xmlFile), myAttrCHandler);
-            myAttrCHandler.flushAndClose();
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException | ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
+
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
+                                    true);
+        spf.setValidating(true);
+        SAXParser saxParser = spf.newSAXParser();
+        MyAttrCHandler myAttrCHandler = new MyAttrCHandler(outputFile);
+        saxParser.parse(new File(xmlFile), myAttrCHandler);
+        myAttrCHandler.flushAndClose();
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java	2015-01-09 15:41:25.859100071 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java	2015-01-09 15:41:25.782099951 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,24 +26,18 @@
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLFilterImpl;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -52,43 +46,34 @@
  * transverses XML and print all visited node  when XMLreader parses XML. Test
  * verifies output is same as the golden file.
  */
-public class ContentHandlerTest {
+public class ContentHandlerTest extends JAXPFileBaseTest {
     /**
      * Content event handler visit all nodes to print to output file.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "Content.out";
+    public void testcase01() throws Exception {
+        String outputFile = USER_DIR + "Content.out";
         String goldFile = GOLDEN_DIR + "ContentGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
 
-        try(FileInputStream instream = new FileInputStream(xmlFile)) {
+        try(FileInputStream instream = new FileInputStream(xmlFile);
+                MyContentHandler cHandler = new MyContentHandler(outputFile)) {
             SAXParserFactory spf = SAXParserFactory.newInstance();
             spf.setNamespaceAware(true);
             XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-            ContentHandler cHandler = new MyContentHandler(outputFile);
             xmlReader.setContentHandler(cHandler);
-            InputSource is = new InputSource(instream);
-            xmlReader.parse(is);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch( IOException | SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
+            xmlReader.parse(new InputSource(instream));
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
 
 /**
  * A content write out handler.
  */
-class MyContentHandler extends XMLFilterImpl {
+class MyContentHandler extends XMLFilterImpl implements AutoCloseable {
     /**
      * Prefix to every exception.
      */
@@ -258,4 +243,14 @@
             throw new SAXException(WRITE_ERROR, ex);
         }
     }
+
+    /**
+     * Close the writer if it's initiated.
+     * @throws IOException if any IO error when close buffered writer.
+     */
+    @Override
+    public void close() throws IOException {
+        if (bWriter != null)
+            bWriter.close();
+    }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java	2015-01-09 15:41:26.201100604 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java	2015-01-09 15:41:26.126100487 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,15 +26,11 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
@@ -42,7 +38,6 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -50,46 +45,32 @@
  * XMLReader parse XML with default handler that transverses XML and
  * print all visited node. Test verifies output is same as the golden file.
  */
-public class DefaultHandlerTest {
+public class DefaultHandlerTest extends JAXPFileBaseTest {
     /**
      * Test default handler that transverses XML and  print all visited node.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testDefaultHandler() {
-        String outputFile = CLASS_DIR + "DefaultHandler.out";
+    public void testDefaultHandler() throws Exception {
+        String outputFile = USER_DIR + "DefaultHandler.out";
         String goldFile = GOLDEN_DIR + "DefaultHandlerGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
 
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxparser = spf.newSAXParser();
-
-            MyDefaultHandler handler = new MyDefaultHandler(outputFile);
-            File file = new File(xmlFile);
-            String Absolutepath = file.getAbsolutePath();
-            String newAbsolutePath = Absolutepath;
-            if (File.separatorChar == '\\')
-                    newAbsolutePath = Absolutepath.replace('\\', '/');
-            String uri = "file:///" + newAbsolutePath;
-            saxparser.parse(uri, handler);
-        } catch (IOException | ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
-        // Need close the output file before we compare it with golden file.
-        try {
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        SAXParser saxparser = spf.newSAXParser();
+
+        MyDefaultHandler handler = new MyDefaultHandler(outputFile);
+        File file = new File(xmlFile);
+        String Absolutepath = file.getAbsolutePath();
+        String newAbsolutePath = Absolutepath;
+        if (File.separatorChar == '\\')
+                newAbsolutePath = Absolutepath.replace('\\', '/');
+        saxparser.parse("file:///" + newAbsolutePath, handler);
+
+        assertTrue(compareWithGold(goldFile, outputFile));
+
     }
 }
 
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java	2015-01-09 15:41:26.552101151 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java	2015-01-09 15:41:26.475101031 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,23 +26,19 @@
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLFilterImpl;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -50,14 +46,16 @@
  * ErrorHandler unit test. Set a ErrorHandle to XMLReader. Capture fatal error
  * events in ErrorHandler.
  */
-public class EHFatalTest {
+public class EHFatalTest extends JAXPFileBaseTest {
     /**
      * Error Handler to capture all error events to output file. Verifies the
      * output file is same as golden file.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testEHFatal() {
-        String outputFile = CLASS_DIR + "EHFatal.out";
+    public void testEHFatal() throws Exception {
+        String outputFile = USER_DIR + "EHFatal.out";
         String goldFile = GOLDEN_DIR + "EHFatalGF.out";
         String xmlFile = XML_DIR + "invalid.xml";
 
@@ -68,25 +66,12 @@
             xmlReader.setErrorHandler(eHandler);
             InputSource is = new InputSource(instream);
             xmlReader.parse(is);
-        } catch (IOException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        } catch (SAXException ex) {
-            System.out.println("This is expected:" + ex);
+            fail("Parse should throw SAXException");
+        } catch (SAXException expected) {
+            // This is expected.
         }
         // Need close the output file before we compare it with golden file.
-        try {
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
 
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java	2015-01-09 15:41:26.902101697 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java	2015-01-09 15:41:26.826101578 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,6 +23,7 @@
 package org.xml.sax.ptests;
 
 import java.util.Enumeration;
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import org.testng.annotations.Test;
@@ -31,7 +32,7 @@
 /**
  * Unit test cases for NamespaceSupport API
  */
-public class NSSupportTest {
+public class NSSupportTest extends JAXPBaseTest {
     /**
      * Empty prefix name.
      */
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java	2015-01-09 15:41:27.247102235 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java	2015-01-09 15:41:27.168102112 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,10 +23,8 @@
 package org.xml.sax.ptests;
 
 import java.io.FileInputStream;
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
@@ -35,7 +33,6 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.ParserAdapter;
 import org.xml.sax.helpers.XMLFilterImpl;
@@ -47,7 +44,7 @@
  * Unit test cases for ParserAdapter API. By default the only features recognized
  * are namespaces and namespace-prefixes.
  */
-public class ParserAdapterTest {
+public class ParserAdapterTest extends JAXPFileReadOnlyBaseTest {
     /**
      * namespaces feature name.
      */
@@ -67,10 +64,9 @@
 
     /**
      * Initiate ParserAdapter.
-     * @throws ParserConfigurationException
-     * @throws SAXException
+     * @throws Exception If any errors occur.
      */
-    ParserAdapterTest() throws ParserConfigurationException, SAXException {
+    ParserAdapterTest() throws Exception {
         SAXParserFactory spf = SAXParserFactory.newInstance();
         XMLReader xmlReader = spf.newSAXParser().getXMLReader();
         XMLReaderAdapter xmlReaderAdapter = new XMLReaderAdapter(xmlReader);
@@ -151,129 +147,111 @@
 
     /**
      * parserAdapter.getFeature(NAMESPACES) returns true be default.
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test
-    public void getFeature01() {
-        try {
-           assertTrue(parserAdapter.getFeature(NAMESPACES));
-        } catch (SAXNotRecognizedException | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void getFeature01() throws Exception {
+        assertTrue(parserAdapter.getFeature(NAMESPACES));
     }
 
     /**
      * parserAdapter.getFeature(NAMESPACE_PREFIXES) returns true be default.
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test
-    public void getFeature02() {
-        try {
-           assertFalse(parserAdapter.getFeature(NAMESPACE_PREFIXES));
-        } catch (SAXNotRecognizedException | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void getFeature02() throws Exception {
+        assertFalse(parserAdapter.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * SAXNotRecognizedException thrown when feature name is not known one.
-     * @throws org.xml.sax.SAXNotRecognizedException expected Exception
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXNotRecognizedException.class)
-    public void getFeature03() throws SAXNotRecognizedException {
-        try {
-            parserAdapter.getFeature("no-meaning-feature");
-        } catch (SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void getFeature03() throws Exception {
+        parserAdapter.getFeature("no-meaning-feature");
     }
 
     /**
      * Obtain getFeature after it's set returns set value.
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test
-    public void setFeature01() {
-        try {
-           parserAdapter.setFeature(NAMESPACES, false);
-           assertFalse(parserAdapter.getFeature(NAMESPACES));
-        } catch (SAXNotRecognizedException | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void setFeature01() throws Exception {
+        parserAdapter.setFeature(NAMESPACES, false);
+        assertFalse(parserAdapter.getFeature(NAMESPACES));
     }
 
     /**
      * Obtain getFeature after it's set returns set value.
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test
-    public void setFeature02() {
-        try {
-           parserAdapter.setFeature(NAMESPACE_PREFIXES, false);
-           assertFalse(parserAdapter.getFeature(NAMESPACE_PREFIXES));
-        } catch (SAXNotRecognizedException | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void setFeature02() throws Exception {
+        parserAdapter.setFeature(NAMESPACE_PREFIXES, false);
+        assertFalse(parserAdapter.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * Obtain getFeature after it's set returns set value.
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test
-    public void setFeature03() {
-        try {
-           parserAdapter.setFeature(NAMESPACES, true);
-           assertTrue(parserAdapter.getFeature(NAMESPACES));
-        } catch (SAXNotRecognizedException | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void setFeature03() throws Exception {
+        parserAdapter.setFeature(NAMESPACES, true);
+        assertTrue(parserAdapter.getFeature(NAMESPACES));
     }
 
     /**
      * Obtain getFeature after it's set returns set value.
+     * 
+     * @exception Exception If any errors occur.
      */
     @Test
-    public void setFeature04() {
-        try {
-           parserAdapter.setFeature(NAMESPACE_PREFIXES, true);
-           assertTrue(parserAdapter.getFeature(NAMESPACE_PREFIXES));
-        } catch (SAXNotRecognizedException | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
+    public void setFeature04() throws Exception {
+        parserAdapter.setFeature(NAMESPACE_PREFIXES, true);
+        assertTrue(parserAdapter.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
-     * NPE expected when parsing a null object by ParserAdapter.
+     * NPE expected when parsing a null object by ParserAdapter. 
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void parse01() {
-        try {
-            parserAdapter.parse((InputSource)null);
-        } catch (IOException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void parse01() throws Exception {
+        parserAdapter.parse((InputSource)null);
     }
 
     /**
      * SAXException expected when parsing a wrong-formatter XML with ParserAdapter.
-     * @throws org.xml.sax.SAXException
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class)
-    public void parse02() throws SAXException {
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class)
+    public void parse02() throws Exception {
         try(FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")) {
             InputSource is = new InputSource(fis);
             parserAdapter.parse(is);
-        } catch (IOException ex) {
-            failUnexpected(ex);
         }
     }
 
     /**
      * Parse a well-formatter XML with ParserAdapter.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void parse03() {
+    @Test(groups = {"readLocalFiles"})
+    public void parse03() throws Exception {
         try(FileInputStream fis = new FileInputStream(XML_DIR + "correct.xml")) {
             InputSource is = new InputSource(fis);
             parserAdapter.parse(is);
-        } catch (IOException | SAXException ex) {
-            failUnexpected(ex);
         }
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java	2015-01-09 15:41:27.598102782 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java	2015-01-09 15:41:27.520102660 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,21 +26,16 @@
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLFilterImpl;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -48,12 +43,14 @@
  * Entity resolver should be invoked in XML parse. This test verifies parsing
  * process by checking the output with golden file.
  */
-public class ResolverTest {
+public class ResolverTest extends JAXPFileBaseTest {
     /**
-     * Unit test for entityResolver setter.
+     * Unit test for entityResolver setter. 
+     * 
+     * @throws Exception If any errors occur.
      */
-    public void testResolver() {
-        String outputFile = CLASS_DIR + "EntityResolver.out";
+    public void testResolver() throws Exception {
+        String outputFile = USER_DIR + "EntityResolver.out";
         String goldFile = GOLDEN_DIR + "EntityResolverGF.out";
         String xmlFile = XML_DIR + "publish.xml";
 
@@ -64,23 +61,8 @@
             xmlReader.setEntityResolver(eResolver);
             InputSource is = new InputSource(instream);
             xmlReader.parse(is);
-        } catch(IOException | SAXException | ParserConfigurationException ex ) {
-            failUnexpected(ex);
-        }
-        // Need close the output file before we compare it with golden file.
-        try {
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
+        } 
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
 
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java	2015-01-09 15:41:27.999103407 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java	2015-01-09 15:41:27.916103278 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,20 +23,12 @@
 package org.xml.sax.ptests;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -44,91 +36,64 @@
  * This class contains the testcases to test SAXParser with regard to
  * Namespace Table defined at http://www.megginson.com/SAX/Java/namespaces.html
  */
-public class SAXParserNSTableTest {
+public class SAXParserNSTableTest extends JAXPFileBaseTest {
     /**
      * namespace processing is enabled. namespace-prefix is also is enabled.
      * So it is a True-True combination.
-     * The test is to test SAXParser with these conditions
+     * The test is to test SAXParser with these conditions.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testWithTrueTrue() {
-        String outputFile = CLASS_DIR + "SPNSTableTT.out";
+    public void testWithTrueTrue() throws Exception {
+        String outputFile = USER_DIR + "SPNSTableTT.out";
         String goldFile = GOLDEN_DIR + "NSTableTTGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
-                                        true);
-
-            SAXParser saxParser = spf.newSAXParser();
-            saxParser.parse(new File(xmlFile), new MyNSContentHandler(outputFile));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
+                                    true);
+        try (MyNSContentHandler handler = new MyNSContentHandler(outputFile)) {
+            spf.newSAXParser().parse(new File(xmlFile), handler);
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
+ 
     }
     /**
      * namespace processing is enabled. Hence namespace-prefix is
-     * expected to be automaically off. So it is a True-False combination.
-     * The test is to test SAXParser with these conditions
+     * expected to be automatically off. So it is a True-False combination.
+     * The test is to test SAXParser with these conditions.
+     * 
+     * @throws Exception If any errors occur.
      */
-    public void testWithTrueFalse() {
-        String outputFile = CLASS_DIR + "SPNSTableTF.out";
+    public void testWithTrueFalse() throws Exception {
+        String outputFile = USER_DIR + "SPNSTableTF.out";
         String goldFile = GOLDEN_DIR + "NSTableTFGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-            saxParser.parse(new File(xmlFile), new MyNSContentHandler(outputFile));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        try (MyNSContentHandler handler = new MyNSContentHandler(outputFile)) {
+            spf.newSAXParser().parse(new File(xmlFile), handler);
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 
     /**
      * namespace processing is not enabled. Hence namespace-prefix is
-     * expected to be automaically on. So it is a False-True combination.
-     * The test is to test SAXParser with these conditions
+     * expected to be automatically on. So it is a False-True combination.
+     * The test is to test SAXParser with these conditions.
+     * 
+     * @throws Exception If any errors occur.
      */
-    public void testWithFalseTrue() {
-        String outputFile = CLASS_DIR + "SPNSTableFT.out";
+    public void testWithFalseTrue() throws Exception {
+        String outputFile = USER_DIR + "SPNSTableFT.out";
         String goldFile = GOLDEN_DIR + "NSTableFTGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-            saxParser.parse(new File(xmlFile), new MyNSContentHandler(outputFile));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        try (MyNSContentHandler handler = new MyNSContentHandler(outputFile)) {
+            spf.newSAXParser().parse(new File(xmlFile), handler);
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java	2015-01-09 15:41:28.357103965 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java	2015-01-09 15:41:28.283103850 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -26,14 +26,10 @@
 import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -42,7 +38,6 @@
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLFilterImpl;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -50,45 +45,34 @@
  * Set parent of XMLFilter to XMLReader. Parsing on XML file will invoke XMLFilter
  * to write to output file. Test verifies output is same as the golden file.
  */
-public class XMLFilterCBTest {
-    public void testXMLFilterCB() {
-        String outputFile = CLASS_DIR + "XMLFilter.out";
+public class XMLFilterCBTest extends JAXPFileBaseTest {
+    /**
+     * Test XMLFilter working with XML reader.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    public void testXMLFilterCB() throws Exception {
+        String outputFile = USER_DIR + "XMLFilter.out";
         String goldFile = GOLDEN_DIR + "XMLFilterGF.out";
         String xmlFile = XML_DIR + "namespace1.xml";
 
-        try (FileInputStream fis = new FileInputStream(xmlFile)){
+        try (FileInputStream fis = new FileInputStream(xmlFile);
+                MyXMLFilter myXmlFilter = new MyXMLFilter(outputFile)){
             SAXParserFactory spf = SAXParserFactory.newInstance();
             spf.setNamespaceAware(true);
             XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-
-            MyXMLFilter myXmlFilter = new MyXMLFilter(outputFile);
             myXmlFilter.setParent(xmlReader);
-            InputSource is = new InputSource(fis);
-            myXmlFilter.parse(is);
-        } catch( SAXException | IOException | ParserConfigurationException ex) {
-            failUnexpected(ex);
+            myXmlFilter.parse(new InputSource(fis));
         }
         // Need close the output file before we compare it with golden file.
-        try {
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
 
 /**
  * Writer XMLFiler which write all tags to output file when event happens.
  */
-class MyXMLFilter extends XMLFilterImpl{
+class MyXMLFilter extends XMLFilterImpl implements AutoCloseable {
     /**
      * FileWriter to write string to output file.
      */
@@ -278,4 +262,14 @@
             throw new SAXException(ex);
         }
     }
+
+    /**
+     * Close writer handler.
+     * @throws IOException if any I/O error when close writer handler. 
+     */
+    @Override
+    public void close() throws IOException {
+        if (bWriter != null)
+            bWriter.close();
+    }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java	2015-01-09 15:41:28.706104509 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java	2015-01-09 15:41:28.629104389 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,18 +23,14 @@
 package org.xml.sax.ptests;
 
 import java.io.FileInputStream;
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLFilterImpl;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
@@ -42,7 +38,7 @@
 /**
  * Unit test for XMLFilter.
  */
-public class XMLFilterTest {
+public class XMLFilterTest extends JAXPFileReadOnlyBaseTest {
     /**
      * name spaces constant.
      */
@@ -129,139 +125,114 @@
 
     /**
      * By default true is expected get namespaces feature.
-     * @throws SAXException
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void getFeature01() throws SAXException {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlFilter.setParent(xmlReader);
-            assertTrue(xmlFilter.getFeature(NAMESPACES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void getFeature01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlFilter.setParent(xmlReader);
+        assertTrue(xmlFilter.getFeature(NAMESPACES));
     }
 
     /**
      * By default false is expected get namespaces-prefix feature.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void getFeature02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlFilter.setParent(xmlReader);
-            assertFalse(xmlFilter.getFeature(NAMESPACE_PREFIXES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void getFeature02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlFilter.setParent(spf.newSAXParser().getXMLReader());
+        assertFalse(xmlFilter.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * SAXNotRecognizedException is expected when get a feature by an invalid
      * feature name.
-     * @throws org.xml.sax.SAXNotRecognizedException If the feature
-     *            value can't be assigned or retrieved from the parent.
-     * @throws org.xml.sax.SAXNotSupportedException When the
-     *            parent recognizes the feature name but
-     *            cannot determine its value at this time.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXNotRecognizedException.class)
-    public void getFeature03() throws SAXNotRecognizedException,
-           SAXNotSupportedException {
+    public void getFeature03() throws Exception {
         new XMLFilterImpl().getFeature("no-meaning-feature");
     }
 
     /**
      * Set namespaces feature to a value to XMLFilter. it's expected same when
      * obtain it again.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void setFeature01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlFilter.setParent(xmlReader);
-            xmlFilter.setFeature(NAMESPACES, false);
-            assertFalse(xmlFilter.getFeature(NAMESPACES));
-            xmlFilter.setFeature(NAMESPACES, true);
-            assertTrue(xmlFilter.getFeature(NAMESPACES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void setFeature01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlFilter.setParent(spf.newSAXParser().getXMLReader());
+        xmlFilter.setFeature(NAMESPACES, false);
+        assertFalse(xmlFilter.getFeature(NAMESPACES));
+        xmlFilter.setFeature(NAMESPACES, true);
+        assertTrue(xmlFilter.getFeature(NAMESPACES));
     }
 
     /**
      * Set namespaces-prefix feature to a value to XMLFilter. it's expected same
      * when obtain it again.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void setFeature02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlFilter.setParent(xmlReader);
-            xmlFilter.setFeature(NAMESPACE_PREFIXES, false);
-            assertFalse(xmlFilter.getFeature(NAMESPACE_PREFIXES));
-            xmlFilter.setFeature(NAMESPACE_PREFIXES, true);
-            assertTrue(xmlFilter.getFeature(NAMESPACE_PREFIXES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void setFeature02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlFilter.setParent(spf.newSAXParser().getXMLReader());
+        xmlFilter.setFeature(NAMESPACE_PREFIXES, false);
+        assertFalse(xmlFilter.getFeature(NAMESPACE_PREFIXES));
+        xmlFilter.setFeature(NAMESPACE_PREFIXES, true);
+        assertTrue(xmlFilter.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * NullPointerException is expected when parse a null InputSource.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void parse01() {
-        try {
-            new XMLFilterImpl().parse((InputSource)null);
-        } catch (IOException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void parse01() throws Exception {
+        new XMLFilterImpl().parse((InputSource)null);
     }
 
     /**
      * SAXException is expected when parsing a invalid formatted XML file.
-     * @throws org.xml.sax.SAXException when parse a incorrect formatted XML
-     * file.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void parse02() throws SAXException {
-        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void parse02() throws Exception {
         try(FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")) {
-            InputSource is = new InputSource(fis);
-            xmlFilter.parse(is);
-        } catch (IOException ex) {
-            failUnexpected(ex);
-        }
+            new XMLFilterImpl().parse(new InputSource(fis));
+        } 
     }
 
     /**
      * No exception when parse a normal XML file.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = NullPointerException.class)
-    public void parse03() {
-        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class)
+    public void parse03() throws Exception {
         try(FileInputStream fis = new FileInputStream(XML_DIR + "correct2.xml")) {
-            InputSource is = new InputSource(fis);
-            xmlFilter.parse(is);
-        } catch (IOException | SAXException ex) {
-            failUnexpected(ex);
+            new XMLFilterImpl().parse(new InputSource(fis));
         }
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java	2015-01-09 15:41:29.112105142 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java	2015-01-09 15:41:28.995104960 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,10 +23,9 @@
 package org.xml.sax.ptests;
 
 import java.io.FileInputStream;
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
+import java.io.FilePermission;
 import javax.xml.parsers.SAXParserFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
@@ -40,7 +39,7 @@
 /**
  * Class containing the test cases for XMLReaderAdapter API
  */
-public class XMLReaderAdapterTest {
+public class XMLReaderAdapterTest extends JAXPBaseTest {
     /**
      * http://xml.org/sax/features/namespace-prefixes property name.
      */
@@ -58,60 +57,51 @@
     }
 
     /**
-     * To test the constructor that uses XMLReader
+     * To test the constructor that uses XMLReader.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void constructor02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-
-            assertNotNull(new XMLReaderAdapter(xmlReader));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void constructor02() throws Exception {
+        XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        assertNotNull(new XMLReaderAdapter(xmlReader));
     }
 
     /**
      * To test the parse method. The specification says that this method
      * will throw an exception if the embedded XMLReader does not support
      * the http://xml.org/sax/features/namespace-prefixes property.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void nsfeature01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-            if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
-                xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
-            }
-
-            assertTrue(xmlReader.getFeature(NM_PREFIXES_PROPERTY));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
+    public void nsfeature01() throws Exception {
+        XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
+            xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
         }
+        assertTrue(xmlReader.getFeature(NM_PREFIXES_PROPERTY));
     }
 
     /**
      * To test the parse method. The specification says that this method
      * will throw an exception if the embedded XMLReader does not support
      * the http://xml.org/sax/features/namespace-prefixes property.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void parse01() {
+    public void parse01() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"));
         try (FileInputStream fis = new FileInputStream(XML_DIR + "namespace1.xml")) {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+            XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
             if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
                 xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
             }
             XMLReaderAdapter xmlRA = new XMLReaderAdapter(xmlReader);
-
-            InputSource is = new InputSource(fis);
             xmlRA.setDocumentHandler(new HandlerBase());
-            xmlRA.parse(is);
-        } catch (IOException | SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
+            xmlRA.parse(new InputSource(fis));
         }
+        setPermissions();
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java	2015-01-09 15:41:29.478105713 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java	2015-01-09 15:41:29.400105591 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -22,6 +22,7 @@
  */
 package org.xml.sax.ptests;
 
+import jaxp.library.JAXPBaseTest;
 import static org.testng.Assert.assertNotNull;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -30,7 +31,7 @@
 /**
  * Unit test for XMLReaderFactory.createXMLReader API.
  */
-public class XMLReaderFactoryTest {
+public class XMLReaderFactoryTest extends JAXPBaseTest {
     /**
      * No exception expected when create XMLReader by default.
      * @throws org.xml.sax.SAXException when xml reader creation failed.
@@ -48,12 +49,7 @@
      */
     @Test
     public void createReader02() throws SAXException {
-        //Disable this test because this is only work for apache implementation.
-        /*System.setProperty("org.xml.sax.driver",
-            "org.apache.xerces.parsers.SAXParser");
-        assertNotNull(XMLReaderFactory.
-            createXMLReader("org.apache.xerces.parsers.SAXParser"));*/
-        System.setProperty("org.xml.sax.driver",
+        setSystemProperty("org.xml.sax.driver",
             "com.sun.org.apache.xerces.internal.parsers.SAXParser");
         assertNotNull(XMLReaderFactory.
             createXMLReader("com.sun.org.apache.xerces.internal.parsers.SAXParser"));
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java	2015-01-09 15:41:29.832106265 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java	2015-01-09 15:41:29.757106148 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,17 +23,14 @@
 package org.xml.sax.ptests;
 
 import java.io.FileInputStream;
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertTrue;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
-import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
 import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
 import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
 
@@ -41,7 +38,7 @@
   * Namespace Table defined at
   * http://www.megginson.com/SAX/Java/namespaces.html
   */
-public class XMLReaderNSTableTest {
+public class XMLReaderNSTableTest extends JAXPFileBaseTest {
     /**
      * XML file that used to be parsed.
      */
@@ -55,71 +52,70 @@
     /**
      * namespace processing is enabled. namespace-prefix is also is enabled.
      * So it is a True-True combination.
-     * The test is to test XMLReader with these conditions
+     * The test is to test XMLReader with these conditions.
+     * 
+     * @throws Exception If any errors occur.
      */
-    public void testWithTrueTrue() {
-        String outputFile = CLASS_DIR + "XRNSTableTT.out";
+    public void testWithTrueTrue() throws Exception {
+        String outputFile = USER_DIR + "XRNSTableTT.out";
         String goldFile = GOLDEN_DIR + "NSTableTTGF.out";
-
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-
-            XMLReader xmlReader = saxParser.getXMLReader();
-            xmlReader.setFeature(NAMESPACE_PREFIXES, true);
-
-            xmlReader.setContentHandler(new MyNSContentHandler(outputFile));
-            xmlReader.parse(new InputSource(new FileInputStream(xmlFile)));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
+        
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setFeature(NAMESPACE_PREFIXES, true);
+
+        try (FileInputStream fis = new FileInputStream(xmlFile);
+            MyNSContentHandler handler = new MyNSContentHandler(outputFile);) {
+            xmlReader.setContentHandler(handler);
+            xmlReader.parse(new InputSource(fis));
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 
     /**
      * Namespace processing is enabled. Hence namespace-prefix is
-     * expected to be automaically off. So it is a True-False combination.
-     * The test is to test XMLReader with these conditions
+     * expected to be automatically off. So it is a True-False combination.
+     * The test is to test XMLReader with these conditions.
+     * 
+     * @throws Exception If any errors occur.
      */
-    public void testWithTrueFalse() {
-        String outputFile = CLASS_DIR + "XRNSTableTF.out";
+    public void testWithTrueFalse() throws Exception {
+        String outputFile = USER_DIR + "XRNSTableTF.out";
         String goldFile = GOLDEN_DIR + "NSTableTFGF.out";
 
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-            XMLReader xmlReader = saxParser.getXMLReader();
-
-            xmlReader.setContentHandler(new MyNSContentHandler(outputFile));
-            xmlReader.parse(new InputSource(new FileInputStream(xmlFile)));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        SAXParser saxParser = spf.newSAXParser();
+        XMLReader xmlReader = saxParser.getXMLReader();
+
+        try (FileInputStream fis = new FileInputStream(xmlFile);
+            MyNSContentHandler handler = new MyNSContentHandler(outputFile)) {
+            xmlReader.setContentHandler(handler);
+            xmlReader.parse(new InputSource(fis));   
         }
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 
     /**
      * namespace processing is not enabled. Hence namespace-prefix is
      * expected to be automaically on. So it is a False-True combination.
-     * The test is to test XMLReader with these conditions
+     * The test is to test XMLReader with these conditions.
+     * 
+     * @throws Exception If any errors occur.
      */
-    public void testWithFalseTrue() {
-        String outputFile = CLASS_DIR + "XRNSTableFT.out";
+    public void testWithFalseTrue()throws Exception {
+        String outputFile = USER_DIR + "XRNSTableFT.out";
         String goldFile = GOLDEN_DIR + "NSTableFTGF.out";
-
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-            XMLReader xmlReader = saxParser.getXMLReader();
-
-            xmlReader.setContentHandler(new MyNSContentHandler(outputFile));
-            xmlReader.parse(new InputSource(new FileInputStream(xmlFile)));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
-        }
+        
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        try (FileInputStream fis = new FileInputStream(xmlFile);
+            MyNSContentHandler handler = new MyNSContentHandler(outputFile)) {
+            xmlReader.setContentHandler(handler);
+            xmlReader.parse(new InputSource(fis));
+        } 
+        assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java	2015-01-09 15:41:30.183106812 -0800
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java	2015-01-09 15:41:30.107106693 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,10 +23,9 @@
 package org.xml.sax.ptests;
 
 import java.io.FileInputStream;
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
@@ -45,42 +44,43 @@
 /**
  * Class containing the test cases for SAXParser API
  */
-public class XMLReaderTest {
+public class XMLReaderTest extends JAXPFileReadOnlyBaseTest {
+
     /**
      * XML namespaces.
      */
-    private static final String NAMESPACES =
-                "http://xml.org/sax/features/namespaces";
+    private static final String NAMESPACES
+            = "http://xml.org/sax/features/namespaces";
 
     /**
      * XML namespaces prefixes.
      */
-    private static final String NAMESPACE_PREFIXES =
-                "http://xml.org/sax/features/namespace-prefixes";
+    private static final String NAMESPACE_PREFIXES
+            = "http://xml.org/sax/features/namespace-prefixes";
 
     /**
      * A string intern name.
      */
-    private static final String STRING_INTERNING =
-                "http://xml.org/sax/features/string-interning";
+    private static final String STRING_INTERNING
+            = "http://xml.org/sax/features/string-interning";
 
     /**
      * Validation name.
      */
-    private static final String VALIDATION =
-                "http://xml.org/sax/features/validation";
+    private static final String VALIDATION
+            = "http://xml.org/sax/features/validation";
 
     /**
      * A general external entities name
      */
-    private static final String EXTERNAL_G_ENTITIES =
-                "http://xml.org/sax/features/external-general-entities";
+    private static final String EXTERNAL_G_ENTITIES
+            = "http://xml.org/sax/features/external-general-entities";
 
     /**
      * A external parameter entities name
      */
-    private static final String EXTERNAL_P_ENTITIES =
-                "http://xml.org/sax/features/external-parameter-entities";
+    private static final String EXTERNAL_P_ENTITIES
+            = "http://xml.org/sax/features/external-parameter-entities";
 
     /**
      * XML DOM node name.
@@ -95,526 +95,444 @@
     /**
      * Declare handler name
      */
-    private static final String DECL_HANDLER =
-                        "http://xml.org/sax/properties/declaration-handler";
+    private static final String DECL_HANDLER
+            = "http://xml.org/sax/properties/declaration-handler";
 
     /**
      * Lexical handler name
      */
-    private static final String LEXICAL_HANDLER =
-                        "http://xml.org/sax/properties/lexical-handler";
+    private static final String LEXICAL_HANDLER
+            = "http://xml.org/sax/properties/lexical-handler";
 
     /**
      * According to the SAX2 specs, All XMLReaders are required to recognize the
-     * http://xml.org/sax/features/namespaces feature names.
-     * This test case is to test this.
+     * http://xml.org/sax/features/namespaces feature names. This test case is
+     * to test this.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureNS01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertFalse(xmlReader.getFeature(NAMESPACES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNS01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertFalse(xmlReader.getFeature(NAMESPACES));
     }
 
     /**
      * According to the SAX2 specs, All XMLReaders are required to recognize the
-     * http://xml.org/sax/features/namespaces feature names.
-     * This test case is to test this.
+     * http://xml.org/sax/features/namespaces feature names. This test case is
+     * to test this.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureNS02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertTrue(xmlReader.getFeature(NAMESPACES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNS02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertTrue(xmlReader.getFeature(NAMESPACES));
     }
 
     /**
      * Obtain http://xml.org/sax/features/namespaces feature name after it's
      * just set. Expect it's same as set value.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureNS03() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setFeature(NAMESPACES, true);
-            assertTrue(xmlReader.getFeature(NAMESPACES));
-            xmlReader.setFeature(NAMESPACES, false);
-            assertFalse(xmlReader.getFeature(NAMESPACES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNS03() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setFeature(NAMESPACES, true);
+        assertTrue(xmlReader.getFeature(NAMESPACES));
+        xmlReader.setFeature(NAMESPACES, false);
+        assertFalse(xmlReader.getFeature(NAMESPACES));
     }
 
     /**
      * According to the SAX2 specs, All XMLReaders are required to recognize the
-     * http://xml.org/sax/features/namespace-prefixes feature names.
-     * This test case is to test this.
+     * http://xml.org/sax/features/namespace-prefixes feature names. This test
+     * case is to test this.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureNSP01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
-
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNSP01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * According to the SAX2 specs, All XMLReaders are required to recognize the
-     * http://xml.org/sax/features/namespace-prefixes feature names.
-     * This test case is to test this.
+     * http://xml.org/sax/features/namespace-prefixes feature names. This test
+     * case is to test this.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureNSP02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNSP02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * Obtain http://xml.org/sax/features/namespaces-prefixes feature name after
      * it's just set. Expect it's same as set value.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureNSP03() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setFeature(NAMESPACE_PREFIXES, true);
-            assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
-            xmlReader.setFeature(NAMESPACE_PREFIXES, false);
-            assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNSP03() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setFeature(NAMESPACE_PREFIXES, true);
+        assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
+        xmlReader.setFeature(NAMESPACE_PREFIXES, false);
+        assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
     }
 
     /**
      * getFeature returns true if a feature has not been preset when namespace
      * awareness is set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureSI01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertTrue(xmlReader.getFeature(STRING_INTERNING));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureSI01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertTrue(xmlReader.getFeature(STRING_INTERNING));
     }
 
     /**
      * getFeature with validation feature name returns the value that
      * setValidation set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureV01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertFalse(spf.newSAXParser().getXMLReader().getFeature(VALIDATION));
-            spf.setValidating(true);
-            assertTrue(spf.newSAXParser().getXMLReader().getFeature(VALIDATION));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureV01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertFalse(spf.newSAXParser().getXMLReader().getFeature(VALIDATION));
+        spf.setValidating(true);
+        assertTrue(spf.newSAXParser().getXMLReader().getFeature(VALIDATION));
     }
 
     /**
-     * getFeature returns the value that a feature has been preset as  when
+     * getFeature returns the value that a feature has been preset as when
      * namespace awareness is set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureV02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-
-            xmlReader.setFeature(VALIDATION, true);
-            assertTrue(xmlReader.getFeature(VALIDATION));
-
-            xmlReader.setFeature(VALIDATION, false);
-            assertFalse(xmlReader.getFeature(VALIDATION));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureV02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+
+        xmlReader.setFeature(VALIDATION, true);
+        assertTrue(xmlReader.getFeature(VALIDATION));
+        xmlReader.setFeature(VALIDATION, false);
+        assertFalse(xmlReader.getFeature(VALIDATION));
     }
 
     /**
      * getFeature returns true if a feature has not been preset when namespace
      * awareness is set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureEGE01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertTrue(xmlReader.getFeature(EXTERNAL_G_ENTITIES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureEGE01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertTrue(xmlReader.getFeature(EXTERNAL_G_ENTITIES));
     }
 
     /**
-     * getFeature returns false if a feature has been preset as false  when
+     * getFeature returns false if a feature has been preset as false when
      * namespace awareness is set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureEGE02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setFeature(EXTERNAL_G_ENTITIES, false);
-            assertFalse(xmlReader.getFeature(EXTERNAL_G_ENTITIES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureEGE02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setFeature(EXTERNAL_G_ENTITIES, false);
+        assertFalse(xmlReader.getFeature(EXTERNAL_G_ENTITIES));
     }
 
     /**
      * getFeature returns true if a feature has not been preset when namespace
      * awareness is set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureEPE01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertTrue(xmlReader.getFeature(EXTERNAL_P_ENTITIES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureEPE01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertTrue(xmlReader.getFeature(EXTERNAL_P_ENTITIES));
     }
 
     /**
-     * getFeature returns false if a feature has been preset as false  when
+     * getFeature returns false if a feature has been preset as false when
      * namespace awareness is set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void featureEPE02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-            xmlReader.setFeature(EXTERNAL_P_ENTITIES, false);
-            assertFalse(xmlReader.getFeature(EXTERNAL_P_ENTITIES));
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureEPE02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setFeature(EXTERNAL_P_ENTITIES, false);
+        assertFalse(xmlReader.getFeature(EXTERNAL_P_ENTITIES));
     }
 
     /**
      * getFeature with a unknown feature name throws SAXNotRecognizedException.
-     * @throws SAXNotRecognizedException If the feature value can't be assigned
-     *                                   or retrieved.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXNotRecognizedException.class)
-    public void featureNE01() throws SAXNotRecognizedException  {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            boolean noMeaningFeature = xmlReader.getFeature("no-meaning-feature");
-        } catch(SAXNotRecognizedException ex) {
-            throw ex;
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void featureNE01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.newSAXParser().getXMLReader().getFeature("no-meaning-feature");
     }
 
     /**
      * No exception expected when set entity resolver as simple entity resolver.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void entity01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlReader.setEntityResolver(xmlFilter);
-            assertNotNull(xmlReader.getEntityResolver());
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void entity01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlReader.setEntityResolver(xmlFilter);
+        assertEquals(xmlReader.getEntityResolver(), xmlFilter);
     }
 
     /**
      * No NPE expected when set entity resolver as null.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void entity02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setEntityResolver(null);
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void entity02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.newSAXParser().getXMLReader().setEntityResolver(null);
     }
 
     /**
      * No exception expected when set DTD handler as simple DTD handler.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void dtdhandler01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlReader.setDTDHandler(xmlFilter);
-            assertNotNull(xmlReader.getDTDHandler());
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void dtdhandler01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlReader.setDTDHandler(xmlFilter);
+        assertEquals(xmlReader.getDTDHandler(), xmlFilter);
     }
 
     /**
      * No NPE expected when set DTD handler as null.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void dtdhandler02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setDTDHandler(null);
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void dtdhandler02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.newSAXParser().getXMLReader().setDTDHandler(null);
     }
 
     /**
      * No exception expected when set content handler as simple content handler.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void contenthandler01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            XMLFilterImpl xmlFilter = new XMLFilterImpl();
-            xmlReader.setContentHandler(xmlFilter);
-            assertNotNull(xmlReader.getContentHandler());
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void contenthandler01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        XMLFilterImpl xmlFilter = new XMLFilterImpl();
+        xmlReader.setContentHandler(xmlFilter);
+        assertEquals(xmlReader.getContentHandler(), xmlFilter);
     }
 
     /**
      * No NPE expected when set content handler as null.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void contenthandler02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setContentHandler(null);
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void contenthandler02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.newSAXParser().getXMLReader().setContentHandler(null);
     }
 
     /**
      * No exception expected when set content handler as simple error handler.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void errorhandler01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setErrorHandler(new XMLFilterImpl());
-            assertNotNull(xmlReader.getErrorHandler());
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void errorhandler01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setErrorHandler(new XMLFilterImpl());
+        assertNotNull(xmlReader.getErrorHandler());
     }
 
     /**
      * No NPE expected when set error handler as null.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void errorhandler02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.setErrorHandler(null);
-        } catch (SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        }
+    public void errorhandler02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.setErrorHandler(null);
     }
 
     /**
      * Parse a null input source throw NPE.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public void parse01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.parse((InputSource)null);
-        } catch (SAXException | ParserConfigurationException | IOException ex) {
-            failUnexpected(ex);
-        }
+    public void parse01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.newSAXParser().getXMLReader().parse((InputSource) null);
     }
 
     /**
      * Unit test for parse a error-formatted file. SAXException is expected.
-     * @throws org.xml.sax.SAXException parsing failed.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test(expectedExceptions = SAXException.class)
-    public void parse02() throws SAXException {
-        try (FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")){
+    @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class)
+    public void parse02() throws Exception {
+        try (FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")) {
             SAXParserFactory spf = SAXParserFactory.newInstance();
             spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            InputSource is = new InputSource(fis);
-            xmlReader.parse(is);
-        } catch (ParserConfigurationException | IOException ex) {
-            failUnexpected(ex);
+            spf.newSAXParser().getXMLReader().parse(new InputSource(fis));
         }
     }
 
     /**
      * Unit test for parse a well-formatted file. No exception is expected.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void parse03(){
+    @Test(groups = {"readLocalFiles"})
+    public void parse03() throws Exception {
         try (FileInputStream fis = new FileInputStream(XML_DIR + "correct2.xml")) {
             SAXParserFactory spf = SAXParserFactory.newInstance();
             spf.setNamespaceAware(true);
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            InputSource is = new InputSource(fis);
-            xmlReader.parse(is);
-        } catch (IOException | SAXException | ParserConfigurationException ex) {
-            failUnexpected(ex);
+            spf.newSAXParser().getXMLReader().parse(new InputSource(fis));
         }
     }
 
     /**
-     * Modified by IBM
-     * Xerces does not support this feature and it is not mandatory
-     * @throws org.xml.sax.SAXNotSupportedException
+     * Modified by IBM Xerces does not support this feature and it is not
+     * mandatory.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXNotSupportedException.class)
-    public void xrProperty01() throws SAXNotSupportedException  {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            xmlReader.getProperty(XML_STRING);
-        } catch(SAXNotSupportedException ex) {
-            throw ex;
-        } catch (SAXException | ParserConfigurationException ex){
-            failUnexpected(ex);
-        }
+    public void xrProperty01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        xmlReader.getProperty(XML_STRING);
     }
 
     /**
      * SAXNotSupportedException thrown if property name is known but no value
      * assigned to this property.
-     * @throws org.xml.sax.SAXNotSupportedException when XMLReader recognizes
-     * the property name but cannot determine its value at this time.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXNotSupportedException.class)
-    public void xrProperty02() throws SAXNotSupportedException {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertNull(xmlReader.getProperty(DOM_NODE));
-        } catch (SAXNotSupportedException ex) {
-            throw ex;
-        } catch (SAXException | ParserConfigurationException ex){
-            failUnexpected(ex);
-        }
+    public void xrProperty02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertNull(xmlReader.getProperty(DOM_NODE));
     }
 
-
     /**
      * XMLReader.getProperty returns null if LEXICAL_HANDLER wasn't set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void xrProperty03() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertNull(xmlReader.getProperty(LEXICAL_HANDLER));
-        } catch (SAXException | ParserConfigurationException ex){
-            failUnexpected(ex);
-        }
+    public void xrProperty03() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertNull(xmlReader.getProperty(LEXICAL_HANDLER));
     }
 
     /**
      * XMLReader.getProperty returns null if DECL_HANDLER wasn't set.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void xrProperty04() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            assertNull(xmlReader.getProperty(DECL_HANDLER));
-        } catch (SAXException | ParserConfigurationException ex){
-            failUnexpected(ex);
-        }
+    public void xrProperty04() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertNull(xmlReader.getProperty(DECL_HANDLER));
     }
 
     /**
      * XMLReader.setProperty/getProperty for LEXICAL_HANDLER unit test.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void xrProperty05() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            MyLexicalHandler myLexicalHandler = new MyLexicalHandler();
-            xmlReader.setProperty(LEXICAL_HANDLER, myLexicalHandler);
-            assertNotNull(xmlReader.getProperty(LEXICAL_HANDLER));
-        } catch (SAXException | ParserConfigurationException ex){
-            failUnexpected(ex);
-        }
+    public void xrProperty05() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        MyLexicalHandler myLexicalHandler = new MyLexicalHandler();
+        xmlReader.setProperty(LEXICAL_HANDLER, myLexicalHandler);
+        assertNotNull(xmlReader.getProperty(LEXICAL_HANDLER));
     }
 
     /**
      * XMLReader.setProperty/getProperty for DECL_HANDLER unit test.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void xrProperty06() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            XMLReader xmlReader =  spf.newSAXParser().getXMLReader();
-            MyDeclHandler myDeclHandler = new MyDeclHandler();
-            xmlReader.setProperty(DECL_HANDLER, myDeclHandler);
-            assertNotNull(xmlReader.getProperty(DECL_HANDLER));
-        } catch (ParserConfigurationException | SAXException ex){
-            failUnexpected(ex);
-        }
+    public void xrProperty06() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        MyDeclHandler myDeclHandler = new MyDeclHandler();
+        xmlReader.setProperty(DECL_HANDLER, myDeclHandler);
+        assertNotNull(xmlReader.getProperty(DECL_HANDLER));
     }
 }
 
@@ -622,6 +540,7 @@
  * Simple LexicalHandler that skips every lexical event.
  */
 class MyLexicalHandler implements LexicalHandler {
+
     /**
      * Report an XML comment anywhere in the document.
      *
@@ -667,8 +586,10 @@
      * Report the start of DTD declarations, if any.
      *
      * @param name The document type name.
-     * @param publicId The declared public identifier for the external DTD subset.
-     * @param systemId The declared system identifier for the external DTD subset.
+     * @param publicId The declared public identifier for the external DTD
+     * subset.
+     * @param systemId The declared system identifier for the external DTD
+     * subset.
      */
     @Override
     public void startDTD(String name, String publicId, String systemId) {
@@ -688,16 +609,17 @@
  * Simple DeclHandler that skips every DTD declaration event.
  */
 class MyDeclHandler implements DeclHandler {
+
     /**
      * Report an attribute type declaration.
+     *
      * @param eName The name of the associated element.
      * @param aName The name of the attribute.
      * @param type A string representing the attribute type.
      * @param mode A string representing the attribute defaulting mode
-     *        ("#IMPLIED", "#REQUIRED", or "#FIXED") or null if
-     *        none of these applies.
-     * @param value A string representing the attribute's default value,
-     *        or null if there is none.
+     * ("#IMPLIED", "#REQUIRED", or "#FIXED") or null if none of these applies.
+     * @param value A string representing the attribute's default value, or null
+     * if there is none.
      */
     @Override
     public void attributeDecl(String eName, String aName, String type,
@@ -706,6 +628,7 @@
 
     /**
      * Report an element type declaration.
+     *
      * @param name The element type name.
      * @param model The content model as a normalized string.
      */
@@ -715,10 +638,11 @@
 
     /**
      * Report a parsed external entity declaration.
-     * @param name The name of the entity.  If it is a parameter
-     *        entity, the name will begin with '%'.
-     * @param publicId The entity's public identifier, or null if none
-     *        was given.
+     *
+     * @param name The name of the entity. If it is a parameter entity, the name
+     * will begin with '%'.
+     * @param publicId The entity's public identifier, or null if none was
+     * given.
      * @param systemId The entity's system identifier.
      */
     @Override
@@ -728,8 +652,9 @@
 
     /**
      * Report an internal entity declaration.
-     * @param name The name of the entity.  If it is a parameter
-     *        entity, the name will begin with '%'.
+     *
+     * @param name The name of the entity. If it is a parameter entity, the name
+     * will begin with '%'.
      * @param value The replacement text of the entity.
      */
     @Override
--- old/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java	2015-01-09 15:41:30.544107375 -0800
+++ new/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java	2015-01-09 15:41:30.467107255 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -27,23 +27,18 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.nio.file.Paths;
 import java.util.GregorianCalendar;
 import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
-
-import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.dom.DOMResult;
@@ -51,8 +46,8 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
 import static jaxp.library.JAXPTestUtilities.bomStream;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMConfiguration;
@@ -63,173 +58,160 @@
 import org.w3c.dom.bootstrap.DOMImplementationRegistry;
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSSerializer;
-import org.xml.sax.SAXException;
 import static test.auctionportal.HiBidConstants.PORTAL_ACCOUNT_NS;
 import static test.auctionportal.HiBidConstants.XML_DIR;
 
 /**
  * This is the user controller  class for the Auction portal HiBid.com.
  */
-public class AuctionController {
+public class AuctionController extends JAXPFileReadOnlyBaseTest {
     /**
      * Check for DOMErrorHandler handling DOMError. Before fix of bug 4890927
      * DOMConfiguration.setParameter("well-formed",true) throws an exception.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCreateNewItem2Sell() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCreateNewItem2Sell() throws Exception {
         String xmlFile = XML_DIR + "novelsInvalid.xml";
 
-        try {
-            Document document = DocumentBuilderFactory.newInstance()
-                    .newDocumentBuilder().parse(xmlFile);
-
-            document.getDomConfig().setParameter("well-formed", true);
-
-            DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
-            DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
-            MyDOMOutput domOutput = new MyDOMOutput();
-            domOutput.setByteStream(System.out);
-            LSSerializer writer = impl.createLSSerializer();
-            writer.write(document, domOutput);
-        } catch (ParserConfigurationException | SAXException | IOException
-                | ClassNotFoundException | InstantiationException
-                | IllegalAccessException | ClassCastException e) {
-            failUnexpected(e);
-        }
+        Document document = DocumentBuilderFactory.newInstance()
+                .newDocumentBuilder().parse(xmlFile);
+
+        document.getDomConfig().setParameter("well-formed", true);
+
+        DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
+        DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
+        MyDOMOutput domOutput = new MyDOMOutput();
+        domOutput.setByteStream(System.out);
+        LSSerializer writer = impl.createLSSerializer();
+        writer.write(document, domOutput);
     }
 
     /**
      * Check for DOMErrorHandler handling DOMError. Before fix of bug 4896132
      * test throws DOM Level 1 node error.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCreateNewItem2SellRetry() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCreateNewItem2SellRetry() throws Exception  {
         String xmlFile = XML_DIR + "accountInfo.xml";
 
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            Document document = dbf.newDocumentBuilder().parse(xmlFile);
-
-            DOMConfiguration domConfig = document.getDomConfig();
-            MyDOMErrorHandler errHandler = new MyDOMErrorHandler();
-            domConfig.setParameter("error-handler", errHandler);
-
-            DOMImplementationLS impl =
-                 (DOMImplementationLS) DOMImplementationRegistry.newInstance()
-                         .getDOMImplementation("LS");
-            LSSerializer writer = impl.createLSSerializer();
-            MyDOMOutput domoutput = new MyDOMOutput();
-
-            domoutput.setByteStream(System.out);
-            writer.write(document, domoutput);
-
-            document.normalizeDocument();
-            writer.write(document, domoutput);
-            assertFalse(errHandler.isError());
-        } catch (ParserConfigurationException | SAXException | IOException
-                | ClassNotFoundException | InstantiationException
-                | IllegalAccessException | ClassCastException e) {
-            failUnexpected(e);
-        }
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        Document document = dbf.newDocumentBuilder().parse(xmlFile);
+
+        DOMConfiguration domConfig = document.getDomConfig();
+        MyDOMErrorHandler errHandler = new MyDOMErrorHandler();
+        domConfig.setParameter("error-handler", errHandler);
+
+        DOMImplementationLS impl =
+             (DOMImplementationLS) DOMImplementationRegistry.newInstance()
+                     .getDOMImplementation("LS");
+        LSSerializer writer = impl.createLSSerializer();
+        MyDOMOutput domoutput = new MyDOMOutput();
+
+        domoutput.setByteStream(System.out);
+        writer.write(document, domoutput);
+
+        document.normalizeDocument();
+        writer.write(document, domoutput);
+        assertFalse(errHandler.isError());
     }
 
     /**
      * Check if setting the attribute to be of type ID works. This will affect
      * the Attr.isID method according to the spec.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCreateID() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCreateID() throws Exception {
         String xmlFile = XML_DIR + "accountInfo.xml";
 
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
 
-            Document document = dbf.newDocumentBuilder().parse(xmlFile);
-            Element account = (Element)document
-                .getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Account").item(0);
-
-            account.setIdAttributeNS(PORTAL_ACCOUNT_NS, "accountID", true);
-            Attr aID = account.getAttributeNodeNS(PORTAL_ACCOUNT_NS, "accountID");
-            assertTrue(aID.isId());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+        Document document = dbf.newDocumentBuilder().parse(xmlFile);
+        Element account = (Element)document
+            .getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Account").item(0);
+
+        account.setIdAttributeNS(PORTAL_ACCOUNT_NS, "accountID", true);
+        Attr aID = account.getAttributeNodeNS(PORTAL_ACCOUNT_NS, "accountID");
+        assertTrue(aID.isId());
     }
 
     /**
      * Check the user data on the node.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testCheckingUserData() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckingUserData() throws Exception {
         String xmlFile = XML_DIR + "accountInfo.xml";
 
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
 
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document document = docBuilder.parse(xmlFile);
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        Document document = docBuilder.parse(xmlFile);
 
-            Element account = (Element)document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Account").item(0);
-            assertEquals(account.getNodeName(), "acc:Account");
-            Element firstName = (Element) document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "FirstName").item(0);
-            assertEquals(firstName.getNodeName(), "FirstName");
-
-            Document doc1 = docBuilder.newDocument();
-            Element someName = doc1.createElement("newelem");
-
-            someName.setUserData("mykey", "dd",
-                (operation, key,  data, src,  dst) ->  {
-                    System.err.println("In UserDataHandler" + key);
-                    System.out.println("In UserDataHandler");
-                });
-            Element impAccount = (Element)document.importNode(someName, true);
-            assertEquals(impAccount.getNodeName(), "newelem");
-            document.normalizeDocument();
-            String data = (someName.getUserData("mykey")).toString();
-            assertEquals(data, "dd");
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+        Element account = (Element)document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Account").item(0);
+        assertEquals(account.getNodeName(), "acc:Account");
+        Element firstName = (Element) document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "FirstName").item(0);
+        assertEquals(firstName.getNodeName(), "FirstName");
+
+        Document doc1 = docBuilder.newDocument();
+        Element someName = doc1.createElement("newelem");
+
+        someName.setUserData("mykey", "dd",
+            (operation, key,  data, src,  dst) ->  {
+                System.err.println("In UserDataHandler" + key);
+                System.out.println("In UserDataHandler");
+            });
+        Element impAccount = (Element)document.importNode(someName, true);
+        assertEquals(impAccount.getNodeName(), "newelem");
+        document.normalizeDocument();
+        String data = (someName.getUserData("mykey")).toString();
+        assertEquals(data, "dd");
     }
 
 
     /**
      * Check the UTF-16 XMLEncoding xml file.
+     * 
+     * @throws Exception If any errors occur.
      * @see <a href="content/movies.xml">movies.xml</a>
      */
-    @Test
-    public void testCheckingEncoding() {
+    @Test(groups = {"readLocalFiles"})
+    public void testCheckingEncoding() throws Exception {
         // Note since movies.xml is UTF-16 encoding. We're not using stanard XML
         // file suffix.
         String xmlFile = XML_DIR + "movies.xml.data";
 
-        //try (FileInputStream is = new FileInputStream(xmlFile)) {
-        try {
+        try (InputStream source = bomStream("UTF-16", xmlFile)) {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             dbf.setNamespaceAware(true);
-            InputStream source = bomStream("UTF-16", xmlFile);
             Document document = dbf.newDocumentBuilder().parse(source);
             assertEquals(document.getXmlEncoding(), "UTF-16");
             assertEquals(document.getXmlStandalone(), true);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
         }
     }
 
     /**
      * Check validation API features. A schema which is including in Bug 4909119
      * used to be testing for the functionalities.
+     * 
+     * @throws Exception If any errors occur.
      * @see <a href="content/userDetails.xsd">userDetails.xsd</a>
      */
-    @Test
-    public void testGetOwnerInfo() {
+    @Test(groups = {"readLocalFiles"})
+    public void testGetOwnerInfo() throws Exception {
         String schemaFile = XML_DIR + "userDetails.xsd";
         String xmlFile = XML_DIR + "userDetails.xml";
-
-        try {
+        
+        try(FileInputStream fis = new FileInputStream(xmlFile)) {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             dbf.setNamespaceAware(true);
             dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
@@ -244,27 +226,27 @@
             DocumentBuilder docBuilder = dbf.newDocumentBuilder();
             docBuilder.setErrorHandler(eh);
 
-            Document document = docBuilder.parse(new FileInputStream(xmlFile));
+            Document document = docBuilder.parse(fis);
             DOMResult dResult = new DOMResult();
             DOMSource domSource = new DOMSource(document);
             validator.validate(domSource, dResult);
             assertFalse(eh.isAnyError());
-        } catch (SAXException | ParserConfigurationException | IOException e) {
-            failUnexpected(e);
         }
     }
 
     /**
      * Check grammar caching with imported schemas.
+     * 
+     * @throws Exception If any errors occur.
      * @see <a href="content/coins.xsd">coins.xsd</a>
      * @see <a href="content/coinsImportMe.xsd">coinsImportMe.xsd</a>
      */
-    @Test
-    public void testGetOwnerItemList() {
+    @Test(groups = {"readLocalFiles"})
+    public void testGetOwnerItemList() throws Exception {
         String xsdFile = XML_DIR + "coins.xsd";
         String xmlFile = XML_DIR + "coins.xml";
 
-        try {
+        try(FileInputStream fis = new FileInputStream(xmlFile)) {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             dbf.setNamespaceAware(true);
             dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
@@ -278,11 +260,9 @@
             validator.setErrorHandler(eh);
 
             DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document document = docBuilder.parse(new FileInputStream(xmlFile));
+            Document document = docBuilder.parse(fis);
             validator.validate(new DOMSource(document), new DOMResult());
             assertFalse(eh.isAnyError());
-        } catch (SAXException | ParserConfigurationException | IOException e) {
-            failUnexpected(e);
         }
     }
 
@@ -291,96 +271,88 @@
      * Check for the same imported schemas but will use SAXParserFactory and try
      * parsing using the SAXParser. SCHEMA_SOURCE attribute is using for this
      * test.
+     * 
+     * @throws Exception If any errors occur.
      * @see <a href="content/coins.xsd">coins.xsd</a>
      * @see <a href="content/coinsImportMe.xsd">coinsImportMe.xsd</a>
      */
 
-    @Test
-    public void testGetOwnerItemList1() {
+    @Test(groups = {"readLocalFiles"})
+    public void testGetOwnerItemList1() throws Exception {
         String xsdFile = XML_DIR + "coins.xsd";
         String xmlFile = XML_DIR + "coins.xml";
-
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setValidating(true);
-
-            SAXParser sp = spf.newSAXParser();
-            sp.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
-            sp.setProperty(JAXP_SCHEMA_SOURCE, xsdFile);
-
-            MyErrorHandler eh = new MyErrorHandler();
-            sp.parse(new File(xmlFile), eh);
-            assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.setValidating(true);
+
+        SAXParser sp = spf.newSAXParser();
+        sp.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
+        sp.setProperty(JAXP_SCHEMA_SOURCE, xsdFile);
+
+        MyErrorHandler eh = new MyErrorHandler();
+        sp.parse(new File(xmlFile), eh);
+        assertFalse(eh.isAnyError());
     }
 
     /**
      * Check usage of javax.xml.datatype.Duration class.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testGetItemDuration() {
+    @Test(groups = {"readLocalFiles"})
+    public void testGetItemDuration() throws Exception {
         String xmlFile = XML_DIR + "itemsDuration.xml";
 
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            Document document = dbf.newDocumentBuilder().parse(xmlFile);
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        Document document = dbf.newDocumentBuilder().parse(xmlFile);
 
-            Element durationElement = (Element) document.getElementsByTagName("sellDuration").item(0);
+        Element durationElement = (Element) document.getElementsByTagName("sellDuration").item(0);
 
-            NodeList childList = durationElement.getChildNodes();
+        NodeList childList = durationElement.getChildNodes();
 
-            for (int i = 0; i < childList.getLength(); i++) {
-                System.out.println("child " + i + childList.item(i));
-            }
-
-            Duration duration = DatatypeFactory.newInstance().newDuration("P365D");
-            Duration sellDuration = DatatypeFactory.newInstance().newDuration(childList.item(0).getNodeValue());
-            assertFalse(sellDuration.isShorterThan(duration));
-            assertFalse(sellDuration.isLongerThan(duration));
-            assertEquals(sellDuration.getField(DatatypeConstants.DAYS), BigInteger.valueOf(365));
-            assertEquals(sellDuration.normalizeWith(new GregorianCalendar(1999, 2, 22)), duration);
-
-            Duration myDuration = sellDuration.add(duration);
-            assertEquals(myDuration.normalizeWith(new GregorianCalendar(2003, 2, 22)),
-                    DatatypeFactory.newInstance().newDuration("P730D"));
-        } catch (ParserConfigurationException | DatatypeConfigurationException
-                | SAXException | IOException e) {
-            failUnexpected(e);
+        for (int i = 0; i < childList.getLength(); i++) {
+            System.out.println("child " + i + childList.item(i));
         }
+
+        Duration duration = DatatypeFactory.newInstance().newDuration("P365D");
+        Duration sellDuration = DatatypeFactory.newInstance().newDuration(childList.item(0).getNodeValue());
+        assertFalse(sellDuration.isShorterThan(duration));
+        assertFalse(sellDuration.isLongerThan(duration));
+        assertEquals(sellDuration.getField(DatatypeConstants.DAYS), BigInteger.valueOf(365));
+        assertEquals(sellDuration.normalizeWith(new GregorianCalendar(1999, 2, 22)), duration);
+
+        Duration myDuration = sellDuration.add(duration);
+        assertEquals(myDuration.normalizeWith(new GregorianCalendar(2003, 2, 22)),
+                DatatypeFactory.newInstance().newDuration("P730D"));
     }
 
     /**
      * Check usage of TypeInfo interface introduced in DOM L3.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testGetTypeInfo() {
+    @Test(groups = {"readLocalFiles"})
+    public void testGetTypeInfo() throws Exception {
         String xmlFile = XML_DIR + "accountInfo.xml";
 
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            dbf.setValidating(true);
-            dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
-
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            docBuilder.setErrorHandler(new MyErrorHandler());
-
-            Document document = docBuilder.parse(xmlFile);
-            Element userId = (Element)document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "UserID").item(0);
-            TypeInfo typeInfo = userId.getSchemaTypeInfo();
-            assertTrue(typeInfo.getTypeName().equals("nonNegativeInteger"));
-            assertTrue(typeInfo.getTypeNamespace().equals(W3C_XML_SCHEMA_NS_URI));
-
-            Element role = (Element)document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Role").item(0);
-            TypeInfo roletypeInfo = role.getSchemaTypeInfo();
-            assertTrue(roletypeInfo.getTypeName().equals("BuyOrSell"));
-            assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+        dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
+
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        docBuilder.setErrorHandler(new MyErrorHandler());
+
+        Document document = docBuilder.parse(xmlFile);
+        Element userId = (Element)document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "UserID").item(0);
+        TypeInfo typeInfo = userId.getSchemaTypeInfo();
+        assertTrue(typeInfo.getTypeName().equals("nonNegativeInteger"));
+        assertTrue(typeInfo.getTypeNamespace().equals(W3C_XML_SCHEMA_NS_URI));
+
+        Element role = (Element)document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Role").item(0);
+        TypeInfo roletypeInfo = role.getSchemaTypeInfo();
+        assertTrue(roletypeInfo.getTypeName().equals("BuyOrSell"));
+        assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
     }
 }
--- old/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java	2015-01-09 15:41:30.905107937 -0800
+++ new/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java	2015-01-09 15:41:30.828107817 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -30,39 +30,31 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.FilePermission;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import static javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING;
 import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareDocumentWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertFalse;
-
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
-import static test.auctionportal.HiBidConstants.CLASS_DIR;
 import static test.auctionportal.HiBidConstants.GOLDEN_DIR;
 import static test.auctionportal.HiBidConstants.XML_DIR;
 
 /**
  * This is a test class for the Auction portal HiBid.com.
  */
-public class AuctionItemRepository {
+public class AuctionItemRepository extends JAXPFileBaseTest {
     /**
      * XML file for parsing.
      */
@@ -78,94 +70,92 @@
      * document that has more than two levels of entity expansion is parsed or
      * not. Previous system property was changed to jdk.xml.entityExpansionLimit
      * see http://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testEntityExpansionSAXPos() {
-        try {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            // Secure processing will limit XML processing to conform to
-            // implementation limits.
-            factory.setFeature(FEATURE_SECURE_PROCESSING, true);
-            // Set entityExpansionLimit as 2 should expect fatalError
-            System.setProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(128000));
-            SAXParser parser = factory.newSAXParser();
-
-            MyErrorHandler fatalHandler = new MyErrorHandler();
-            parser.parse(new File(ENTITY_XML), fatalHandler);
-            assertFalse(fatalHandler.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    public void testEntityExpansionSAXPos() throws Exception { 
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        // Secure processing will limit XML processing to conform to
+        // implementation limits.
+        factory.setFeature(FEATURE_SECURE_PROCESSING, true);
+        // Set entityExpansionLimit as 2 should expect fatalError
+        setSystemProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(128000));
+        SAXParser parser = factory.newSAXParser();
+
+        MyErrorHandler fatalHandler = new MyErrorHandler();
+        setPermissions(new FilePermission(ENTITY_XML, "read"));
+        parser.parse(new File(ENTITY_XML), fatalHandler);
+        assertFalse(fatalHandler.isAnyError());
     }
     /**
      * Setting the EntityExpansion Limit to 2 and checks if the XML
      * document that has more than two levels of entity expansion is parsed or
      * not. Previous system property was changed to jdk.xml.entityExpansionLimit
      * see http://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXParseException.class)
-    public void testEntityExpansionSAXNeg() throws SAXParseException {
-        //
-        try {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            // Secure processing will limit XML processing to conform to
-            // implementation limits.
-            factory.setFeature(FEATURE_SECURE_PROCESSING, true);
-            // Set entityExpansionLimit as 2 should expect SAXParseException
-            System.setProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(2));
-            SAXParser parser = factory.newSAXParser();
-
-            MyErrorHandler fatalHandler = new MyErrorHandler();
-            parser.parse(new File(ENTITY_XML), fatalHandler);
-        } catch (SAXParseException e) {
-            throw e;
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+    public void testEntityExpansionSAXNeg() throws Exception {
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        // Secure processing will limit XML processing to conform to
+        // implementation limits.
+        factory.setFeature(FEATURE_SECURE_PROCESSING, true);
+        // Set entityExpansionLimit as 2 should expect SAXParseException.
+        setSystemProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(2)); 
+
+        SAXParser parser = factory.newSAXParser();
+        MyErrorHandler fatalHandler = new MyErrorHandler();
+        setPermissions(new FilePermission(ENTITY_XML, "read"));
+        parser.parse(new File(ENTITY_XML), fatalHandler);
     }
 
     /**
      * Testing set MaxOccursLimit to 10000 in the secure processing enabled for
      * SAXParserFactory.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testMaxOccurLimitPos() {
+    public void testMaxOccurLimitPos() throws Exception {
         String schema_file = XML_DIR + "toys.xsd";
         String xml_file = XML_DIR + "toys.xml";
-
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setValidating(true);
+        factory.setFeature(FEATURE_SECURE_PROCESSING, true);
+        setSystemProperty(SP_MAX_OCCUR_LIMIT, String.valueOf(10000));
+        SAXParser parser = factory.newSAXParser();
+        parser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
+        setPermissions(new FilePermission(XML_DIR + "-", "read"));
+        parser.setProperty(JAXP_SCHEMA_SOURCE, new File(schema_file));
         try (InputStream is = new FileInputStream(xml_file)) {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            factory.setValidating(true);
-            factory.setFeature(FEATURE_SECURE_PROCESSING, true);
-            System.setProperty(SP_MAX_OCCUR_LIMIT, String.valueOf(10000));
-            SAXParser parser = factory.newSAXParser();
-            parser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
-            parser.setProperty(JAXP_SCHEMA_SOURCE, new File(schema_file));
             MyErrorHandler eh = new MyErrorHandler();
             parser.parse(is, eh);
             assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
         }
     }
 
     /**
      * Use a DocumentBuilder to create a DOM object and see if Secure Processing
      * feature affects the entity expansion.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testEntityExpansionDOMPos()  {
+    public void testEntityExpansionDOMPos() throws Exception  {
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setFeature(FEATURE_SECURE_PROCESSING, true);
+        setSystemProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(10000));
+        DocumentBuilder dBuilder = dfactory.newDocumentBuilder();
+        MyErrorHandler eh = new MyErrorHandler();
+        dBuilder.setErrorHandler(eh);
         try {
-            DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
-            dfactory.setFeature(FEATURE_SECURE_PROCESSING, true);
-            System.setProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(10000));
-            DocumentBuilder dBuilder = dfactory.newDocumentBuilder();
-            MyErrorHandler eh = new MyErrorHandler();
-            dBuilder.setErrorHandler(eh);
+            setPermissions(new FilePermission(ENTITY_XML, "read"));
             dBuilder.parse(ENTITY_XML);
             assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
+        } finally {
+            setPermissions();
         }
     }
 
@@ -173,310 +163,209 @@
      * Use a DocumentBuilder to create a DOM object and see how does the Secure
      * Processing feature and entityExpansionLimit value affects output.
      * Negative test that when entityExpansionLimit is too small.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = SAXParseException.class)
-    public void testEntityExpansionDOMNeg() throws SAXParseException {
-        try {
-            DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
-            dfactory.setFeature(FEATURE_SECURE_PROCESSING, true);
-            System.setProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(2));
-            DocumentBuilder dBuilder = dfactory.newDocumentBuilder();
-            MyErrorHandler eh = new MyErrorHandler();
-            dBuilder.setErrorHandler(eh);
-            dBuilder.parse(ENTITY_XML);
-        } catch (SAXParseException e) {
-            throw e;
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
+    public void testEntityExpansionDOMNeg() throws Exception {
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setFeature(FEATURE_SECURE_PROCESSING, true);
+        setSystemProperty(SP_ENTITY_EXPANSION_LIMIT, String.valueOf(2));
+        DocumentBuilder dBuilder = dfactory.newDocumentBuilder();
+        MyErrorHandler eh = new MyErrorHandler();
+        dBuilder.setErrorHandler(eh);
+        setPermissions(new FilePermission(ENTITY_XML, "read"));
+        dBuilder.parse(ENTITY_XML);
     }
 
     /**
      * Test xi:include with a SAXParserFactory.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXIncludeSAXPos() {
-        String resultFile = CLASS_DIR + "doc_xinclude.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXIncludeSAXPos() throws Exception {
+        String resultFile = USER_DIR + "doc_xinclude.out";
         String goldFile = GOLDEN_DIR + "doc_xincludeGold.xml";
         String xmlFile = XML_DIR + "doc_xinclude.xml";
-
-        try {
-            try(FileOutputStream fos = new FileOutputStream(resultFile)) {
-                XInclHandler xh = new XInclHandler(fos, null);
-                SAXParserFactory spf = SAXParserFactory.newInstance();
-                spf.setNamespaceAware(true);
-                spf.setXIncludeAware(true);
-                spf.setFeature(FEATURE_NAME, true);
-                spf.newSAXParser().parse(new File(xmlFile), xh);
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        
+        try(FileOutputStream fos = new FileOutputStream(resultFile)) {
+            XInclHandler xh = new XInclHandler(fos, null);
+            SAXParserFactory spf = SAXParserFactory.newInstance();
+            spf.setNamespaceAware(true);
+            spf.setXIncludeAware(true);
+            spf.setFeature(FEATURE_NAME, true);
+            spf.newSAXParser().parse(new File(xmlFile), xh);
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test the simple case of including a document using xi:include using a
      * DocumentBuilder.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXIncludeDOMPos() {
-        String resultFile = CLASS_DIR + "doc_xincludeDOM.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXIncludeDOMPos() throws Exception {
+        String resultFile = USER_DIR + "doc_xincludeDOM.out";
         String goldFile = GOLDEN_DIR + "doc_xincludeGold.xml";
         String xmlFile = XML_DIR + "doc_xinclude.xml";
-        try {
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setXIncludeAware(true);
-                dbf.setNamespaceAware(true);
-
-                Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
-                doc.setXmlStandalone(true);
-
-                TransformerFactory.newInstance().newTransformer().
-                        transform(new DOMSource(doc), new StreamResult(fos));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setXIncludeAware(true);
+            dbf.setNamespaceAware(true);
+            Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
+            doc.setXmlStandalone(true);
+            TransformerFactory.newInstance().newTransformer().
+                    transform(new DOMSource(doc), new StreamResult(fos));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test the simple case of including a document using xi:include within a
      * xi:fallback using a DocumentBuilder.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXIncludeFallbackDOMPos() {
-        String resultFile = CLASS_DIR + "doc_fallbackDOM.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXIncludeFallbackDOMPos() throws Exception {
+        String resultFile = USER_DIR + "doc_fallbackDOM.out";
         String goldFile = GOLDEN_DIR + "doc_fallbackGold.xml";
         String xmlFile = XML_DIR + "doc_fallback.xml";
-        try{
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setXIncludeAware(true);
-                dbf.setNamespaceAware(true);
-
-                Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
-                doc.setXmlStandalone(true);
-                TransformerFactory.newInstance().newTransformer()
-                        .transform(new DOMSource(doc), new StreamResult(fos));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setXIncludeAware(true);
+            dbf.setNamespaceAware(true);
+
+            Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
+            doc.setXmlStandalone(true);
+            TransformerFactory.newInstance().newTransformer()
+                    .transform(new DOMSource(doc), new StreamResult(fos));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test for xi:fallback where the fall back text is parsed as text. This
      * test uses a nested xi:include for the fallback test.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXIncludeFallbackTextPos() {
-        String resultFile = CLASS_DIR + "doc_fallback_text.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXIncludeFallbackTextPos() throws Exception {
+        String resultFile = USER_DIR + "doc_fallback_text.out";
         String goldFile = GOLDEN_DIR + "doc_fallback_textGold.xml";
         String xmlFile = XML_DIR + "doc_fallback_text.xml";
-
-        try{
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setXIncludeAware(true);
-                dbf.setNamespaceAware(true);
-
-                Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
-                doc.setXmlStandalone(true);
-                TransformerFactory.newInstance().newTransformer()
-                        .transform(new DOMSource(doc), new StreamResult(fos));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setXIncludeAware(true);
+            dbf.setNamespaceAware(true);
+
+            Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
+            doc.setXmlStandalone(true);
+            TransformerFactory.newInstance().newTransformer()
+                    .transform(new DOMSource(doc), new StreamResult(fos));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test the XPointer element() framework with XInclude.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXpointerElementPos() {
-        String resultFile = CLASS_DIR + "doc_xpointer_element.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXpointerElementPos() throws Exception {
+        String resultFile = USER_DIR + "doc_xpointer_element.out";
         String goldFile = GOLDEN_DIR + "doc_xpointerGold.xml";
         String xmlFile = XML_DIR + "doc_xpointer_element.xml";
-
-        try{
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setXIncludeAware(true);
-                dbf.setNamespaceAware(true);
-
-                DocumentBuilder db = dbf.newDocumentBuilder();
-
-                TransformerFactory.newInstance().newTransformer()
-                        .transform(new DOMSource(db.parse(new File(xmlFile))),
-                                new StreamResult(fos));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setXIncludeAware(true);
+            dbf.setNamespaceAware(true);
+
+            DocumentBuilder db = dbf.newDocumentBuilder();
+
+            TransformerFactory.newInstance().newTransformer()
+                    .transform(new DOMSource(db.parse(new File(xmlFile))),
+                            new StreamResult(fos));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test the XPointer framework with a SAX object.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXPointerPos() {
-        String resultFile = CLASS_DIR + "doc_xpointer.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXPointerPos() throws Exception {
+        String resultFile = USER_DIR + "doc_xpointer.out";
         String goldFile = GOLDEN_DIR + "doc_xpointerGold.xml";
         String xmlFile = XML_DIR + "doc_xpointer.xml";
-
-        try{
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                SAXParserFactory spf = SAXParserFactory.newInstance();
-                spf.setNamespaceAware(true);
-                spf.setXIncludeAware(true);
-                spf.setFeature(FEATURE_NAME, true);
-                // parse the file
-                spf.newSAXParser().parse(new File(xmlFile), new XInclHandler(fos, null));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+  
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            SAXParserFactory spf = SAXParserFactory.newInstance();
+            spf.setNamespaceAware(true);
+            spf.setXIncludeAware(true);
+            spf.setFeature(FEATURE_NAME, true);
+            // parse the file
+            spf.newSAXParser().parse(new File(xmlFile), new XInclHandler(fos, null));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test if xi:include may reference the doc containing the include if the
      * parse type is text.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXIncludeLoopPos() {
-        String resultFile = CLASS_DIR + "doc_xinc_loops.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXIncludeLoopPos() throws Exception {
+        String resultFile = USER_DIR + "doc_xinc_loops.out";
         String goldFile = GOLDEN_DIR + "doc_xinc_loopGold.xml";
         String xmlFile = XML_DIR + "doc_xinc_loops.xml";
 
-        try{
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setXIncludeAware(true);
-                dbf.setNamespaceAware(true);
-                DocumentBuilder db = dbf.newDocumentBuilder();
-                Document doc = db.parse(new File(xmlFile));
-                doc.normalizeDocument();
-                doc.setXmlStandalone(true);
-
-                TransformerFactory.newInstance().newTransformer()
-                        .transform(new DOMSource(doc), new StreamResult(fos));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setXIncludeAware(true);
+            dbf.setNamespaceAware(true);
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.parse(new File(xmlFile));
+            doc.normalizeDocument();
+            doc.setXmlStandalone(true);
+
+            TransformerFactory.newInstance().newTransformer()
+                    .transform(new DOMSource(doc), new StreamResult(fos));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 
     /**
      * Test if two non nested xi:include elements can include the same document
      * with an xi:include statement.
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testXIncludeNestedPos() {
-        String resultFile = CLASS_DIR + "schedule.out";
+    @Test(groups = {"readWriteLocalFiles"})
+    public void testXIncludeNestedPos() throws Exception {
+        String resultFile = USER_DIR + "schedule.out";
         String goldFile = GOLDEN_DIR + "scheduleGold.xml";
         String xmlFile = XML_DIR + "schedule.xml";
-
-        try{
-            try (FileOutputStream fos = new FileOutputStream(resultFile)) {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setXIncludeAware(true);
-                dbf.setNamespaceAware(true);
-
-                Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
-                doc.setXmlStandalone(true);
-                TransformerFactory.newInstance().newTransformer()
-                        .transform(new DOMSource(doc), new StreamResult(fos));
-            }
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ParserConfigurationException | SAXException | IOException
-                | TransformerException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
+        
+        try (FileOutputStream fos = new FileOutputStream(resultFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setXIncludeAware(true);
+            dbf.setNamespaceAware(true);
+
+            Document doc = dbf.newDocumentBuilder().parse(new File(xmlFile));
+            doc.setXmlStandalone(true);
+            TransformerFactory.newInstance().newTransformer()
+                    .transform(new DOMSource(doc), new StreamResult(fos));
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
--- old/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java	2015-01-09 15:41:31.265108499 -0800
+++ new/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java	2015-01-09 15:41:31.190108382 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -25,21 +25,17 @@
 import static com.sun.org.apache.xerces.internal.jaxp.JAXPConstants.JAXP_SCHEMA_LANGUAGE;
 import static org.testng.Assert.assertFalse;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
 import static jaxp.library.JAXPTestUtilities.compareDocumentWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
-
 import org.testng.annotations.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -50,8 +46,6 @@
 import org.w3c.dom.ls.DOMImplementationLS;
 import org.w3c.dom.ls.LSParser;
 import org.w3c.dom.ls.LSSerializer;
-import org.xml.sax.SAXException;
-import static test.auctionportal.HiBidConstants.CLASS_DIR;
 import static test.auctionportal.HiBidConstants.GOLDEN_DIR;
 import static test.auctionportal.HiBidConstants.PORTAL_ACCOUNT_NS;
 import static test.auctionportal.HiBidConstants.XML_DIR;
@@ -59,141 +53,127 @@
 /**
  * This is the user controller class for the Auction portal HiBid.com.
  */
-public class UserController {
+public class UserController extends JAXPFileBaseTest {
     /**
      * Checking when creating an XML document using DOM Level 2 validating
      * it without having a schema source or a schema location It must throw a
      * sax parse exception.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testCreateNewUser() {
-        String resultFile = CLASS_DIR + "accountInfoOut.xml";
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            dbf.setValidating(true);
-
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            MyErrorHandler eh = new MyErrorHandler();
-            docBuilder.setErrorHandler(eh);
-
-            Document document = docBuilder.newDocument();
-
-            Element account = document.createElementNS(PORTAL_ACCOUNT_NS, "acc:Account");
-            Attr accountID = document.createAttributeNS(PORTAL_ACCOUNT_NS, "acc:accountID");
-            account.setAttributeNode(accountID);
-
-            account.appendChild(document.createElement("FirstName"));
-            account.appendChild(document.createElementNS(PORTAL_ACCOUNT_NS, "acc:LastName"));
-            account.appendChild(document.createElement("UserID"));
-
-            DOMImplementationLS impl
-                    = (DOMImplementationLS) DOMImplementationRegistry
-                            .newInstance().getDOMImplementation("LS");
-            LSSerializer writer = impl.createLSSerializer();
-            LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
-            FileOutputStream output = new FileOutputStream(resultFile);
+    public void testCreateNewUser() throws Exception {
+        String resultFile = USER_DIR + "accountInfoOut.xml";
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        MyErrorHandler eh = new MyErrorHandler();
+        docBuilder.setErrorHandler(eh);
+
+        Document document = docBuilder.newDocument();
+
+        Element account = document.createElementNS(PORTAL_ACCOUNT_NS, "acc:Account");
+        Attr accountID = document.createAttributeNS(PORTAL_ACCOUNT_NS, "acc:accountID");
+        account.setAttributeNode(accountID);
+
+        account.appendChild(document.createElement("FirstName"));
+        account.appendChild(document.createElementNS(PORTAL_ACCOUNT_NS, "acc:LastName"));
+        account.appendChild(document.createElement("UserID"));
+
+        DOMImplementationLS impl
+                = (DOMImplementationLS) DOMImplementationRegistry
+                        .newInstance().getDOMImplementation("LS");
+        LSSerializer writer = impl.createLSSerializer();
+        LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
+        try(FileOutputStream output = new FileOutputStream(resultFile)) {
             MyDOMOutput domOutput = new MyDOMOutput();
-
             domOutput.setByteStream(output);
             writer.write(account, domOutput);
             docBuilder.parse(resultFile);
-
-            assertTrue(eh.isAnyError());
-        } catch (ParserConfigurationException | ClassNotFoundException |
-                InstantiationException | IllegalAccessException
-                | ClassCastException | SAXException | IOException e) {
-            failUnexpected(e);
         }
+        assertTrue(eh.isAnyError());
     }
 
     /**
      * Checking conflicting namespaces and use renameNode and normalizeDocument.
      * @see <a href="content/accountInfo.xml">accountInfo.xml</a>
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testAddUser() {
-        String resultFile = CLASS_DIR + "accountRole.out";
+    public void testAddUser() throws Exception {
+        String resultFile = USER_DIR + "accountRole.out";
         String xmlFile = XML_DIR + "accountInfo.xml";
-
-        try {
-            // Copy schema for outputfile
-            Files.copy(Paths.get(XML_DIR, "accountInfo.xsd"),
-                    Paths.get(CLASS_DIR, "accountInfo.xsd"),
-                    StandardCopyOption.REPLACE_EXISTING);
-            MyErrorHandler eh = new MyErrorHandler();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-
-            dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
-            dbf.setNamespaceAware(true);
-            dbf.setValidating(true);
-
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            docBuilder.setErrorHandler(eh);
-
-            Document document = docBuilder.parse(xmlFile);
-            Element sell = (Element) document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Sell").item(0);
-            Element role = (Element) sell.getParentNode();
-
-            Element buy = (Element) document.renameNode(sell, PORTAL_ACCOUNT_NS, "acc:Buy");
-            role.appendChild(buy);
-
-            DOMImplementationLS impl
-                    = (DOMImplementationLS) DOMImplementationRegistry
-                            .newInstance().getDOMImplementation("LS");
-            LSSerializer writer = impl.createLSSerializer();
+        
+        // Copy schema for outputfile
+        Files.copy(Paths.get(XML_DIR, "accountInfo.xsd"),
+                Paths.get(USER_DIR, "accountInfo.xsd"),
+                StandardCopyOption.REPLACE_EXISTING);
+        MyErrorHandler eh = new MyErrorHandler();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+
+        dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        docBuilder.setErrorHandler(eh);
+
+        Document document = docBuilder.parse(xmlFile);
+        Element sell = (Element) document.getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Sell").item(0);
+        Element role = (Element) sell.getParentNode();
+
+        Element buy = (Element) document.renameNode(sell, PORTAL_ACCOUNT_NS, "acc:Buy");
+        role.appendChild(buy);
+
+        DOMImplementationLS impl
+                = (DOMImplementationLS) DOMImplementationRegistry
+                        .newInstance().getDOMImplementation("LS");
+        LSSerializer writer = impl.createLSSerializer();
 
 
-            try(FileOutputStream output = new FileOutputStream(resultFile)) {
-                MyDOMOutput mydomoutput = new MyDOMOutput();
-                mydomoutput.setByteStream(output);
-                writer.write(document, mydomoutput);
-            }
-
-            docBuilder.parse(resultFile);
-            assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException
-                | ClassNotFoundException | InstantiationException
-                | IllegalAccessException | ClassCastException e) {
-            failUnexpected(e);
+        try(FileOutputStream output = new FileOutputStream(resultFile)) {
+            MyDOMOutput mydomoutput = new MyDOMOutput();
+            mydomoutput.setByteStream(output);
+            writer.write(document, mydomoutput);
         }
+
+        docBuilder.parse(resultFile);
+        assertFalse(eh.isAnyError());
     }
 
     /**
      * Checking Text content in XML file.
      * @see <a href="content/accountInfo.xml">accountInfo.xml</a>
+     * 
+     * @throws Exception If any errors occur.
      */
-    @Test
-    public void testMoreUserInfo() {
+    @Test(groups = {"readLocalFiles"})
+    public void testMoreUserInfo() throws Exception {
         String xmlFile = XML_DIR + "accountInfo.xml";
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 
-        try {
-            System.out.println("Checking additional user info");
+        dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        MyErrorHandler eh = new MyErrorHandler();
+        docBuilder.setErrorHandler(eh);
+
+        Document document = docBuilder.parse(xmlFile);
+        Element account = (Element)document
+                .getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Account").item(0);
+        String textContent = account.getTextContent();
+        assertTrue(textContent.trim().regionMatches(0, "Rachel", 0, 6));
+        assertEquals(textContent, "RachelGreen744");
 
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        Attr accountID = account.getAttributeNodeNS(PORTAL_ACCOUNT_NS, "accountID");
+        assertTrue(accountID.getTextContent().trim().equals("1"));
 
-            dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
-            dbf.setNamespaceAware(true);
-            dbf.setValidating(true);
-
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            MyErrorHandler eh = new MyErrorHandler();
-            docBuilder.setErrorHandler(eh);
-
-            Document document = docBuilder.parse(xmlFile);
-            Element account = (Element)document
-                    .getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "Account").item(0);
-            String textContent = account.getTextContent();
-            assertTrue(textContent.trim().regionMatches(0, "Rachel", 0, 6));
-            assertEquals(textContent, "RachelGreen744");
-
-            Attr accountID = account.getAttributeNodeNS(PORTAL_ACCOUNT_NS, "accountID");
-            assertTrue(accountID.getTextContent().trim().equals("1"));
-
-            assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+        assertFalse(eh.isAnyError());
     }
 
     /**
@@ -204,83 +184,73 @@
      * into an XML file which is validated by the schema This covers Row 5
      * for the table
      * http://javaweb.sfbay/~jsuttor/JSR206/jsr-206-html/ch03s05.html. Filed
-     * bug 4893745 because there was a difference in behavior
+     * bug 4893745 because there was a difference in behavior.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testCreateUserAccount() {
-        System.out.println("Creating user account");
+    public void testCreateUserAccount() throws Exception {
         String userXmlFile = XML_DIR + "userInfo.xml";
         String accountXmlFile = XML_DIR + "accountInfo.xml";
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        MyErrorHandler eh = new MyErrorHandler();
+        docBuilder.setErrorHandler(eh);
+
+        Document document = docBuilder.parse(userXmlFile);
+        Element user = (Element) document.getElementsByTagName("FirstName").item(0);
+        // Set schema after parsing userInfo.xml. Otherwise it will conflict
+        // with DTD validation.
+        dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
+        DocumentBuilder docBuilder1 = dbf.newDocumentBuilder();
+        docBuilder1.setErrorHandler(eh);
+        Document accDocument = docBuilder1.parse(accountXmlFile);
+
+        Element firstName = (Element) accDocument
+                .getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "FirstName").item(0);
+        Element adoptedAccount = (Element) accDocument.adoptNode(user);
+
+        Element parent = (Element) firstName.getParentNode();
+        parent.replaceChild(adoptedAccount, firstName);
+
+        DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
+        DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
+        LSSerializer writer = impl.createLSSerializer();
 
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            dbf.setValidating(true);
-
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            MyErrorHandler eh = new MyErrorHandler();
-            docBuilder.setErrorHandler(eh);
-
-            Document document = docBuilder.parse(userXmlFile);
-            Element user = (Element) document.getElementsByTagName("FirstName").item(0);
-            // Set schema after parsing userInfo.xml. Otherwise it will conflict
-            // with DTD validation.
-            dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI);
-            DocumentBuilder docBuilder1 = dbf.newDocumentBuilder();
-            docBuilder1.setErrorHandler(eh);
-            Document accDocument = docBuilder1.parse(accountXmlFile);
-
-            Element firstName = (Element) accDocument
-                    .getElementsByTagNameNS(PORTAL_ACCOUNT_NS, "FirstName").item(0);
-            Element adoptedAccount = (Element) accDocument.adoptNode(user);
+        MyDOMOutput mydomoutput = new MyDOMOutput();
+        mydomoutput.setByteStream(System.out);
 
-            Element parent = (Element) firstName.getParentNode();
-            parent.replaceChild(adoptedAccount, firstName);
+        writer.write(document, mydomoutput);
+        writer.write(accDocument, mydomoutput);
 
-            DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
-            DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
-            LSSerializer writer = impl.createLSSerializer();
-
-            MyDOMOutput mydomoutput = new MyDOMOutput();
-            mydomoutput.setByteStream(System.out);
-
-            writer.write(document, mydomoutput);
-            writer.write(accDocument, mydomoutput);
-
-            assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException
-                | ClassNotFoundException | InstantiationException
-                | IllegalAccessException | ClassCastException e) {
-            failUnexpected(e);
-        }
+        assertFalse(eh.isAnyError());
     }
 
     /**
      * Checking for Row 8 from the schema table when setting the schemaSource
      * without the schemaLanguage must report an error.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testUserError() throws IllegalArgumentException {
-        System.out.println("Creating an error in user account");
-
+    public void testUserError() throws Exception {
         String xmlFile = XML_DIR + "userInfo.xml";
         String schema = "http://java.sun.com/xml/jaxp/properties/schemaSource";
         String schemaValue = "http://dummy.com/dummy.xsd";
-
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            dbf.setValidating(true);
-            dbf.setAttribute(schema, schemaValue);
-
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            MyErrorHandler eh = new MyErrorHandler();
-            docBuilder.setErrorHandler(eh);
-            Document document = docBuilder.parse(xmlFile);
-            assertFalse(eh.isAnyError());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
+        
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+        dbf.setAttribute(schema, schemaValue);
+
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        MyErrorHandler eh = new MyErrorHandler();
+        docBuilder.setErrorHandler(eh);
+        docBuilder.parse(xmlFile);
+        assertFalse(eh.isAnyError());
     }
 
     /**
@@ -288,10 +258,12 @@
      * @see <a href="content/screenName.xml">screenName.xml</a> has prefix of
      * userName is bound to "http://hibid.com/user" namespace normalization
      * will create a namespace of prefix us and attach userEmail.
+     * 
+     * @throws Exception If any errors occur.
      */
     @Test
-    public void testCheckScreenNameExists() {
-        String resultFile = CLASS_DIR + "screenName.out";
+    public void testCheckScreenNameExists() throws Exception {
+        String resultFile = USER_DIR + "screenName.out";
         String xmlFile = XML_DIR + "screenName.xml";
         String goldFile = GOLDEN_DIR + "screenNameGold.xml";
 
@@ -318,21 +290,7 @@
             MyDOMOutput domoutput = new MyDOMOutput();
             domoutput.setByteStream(output);
             writer.write(document, domoutput);
-
-            assertTrue(compareDocumentWithGold(goldFile, resultFile));
-        } catch (ClassNotFoundException | InstantiationException
-                | IllegalAccessException | ClassCastException | IOException
-                | ParserConfigurationException | SAXException e) {
-            failUnexpected(e);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if (Files.exists(resultPath)) {
-                    Files.delete(resultPath);
-                }
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
         }
+        assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
--- old/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/MyContentHandler.java	2015-01-09 15:41:31.604109027 -0800
+++ new/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/MyContentHandler.java	2015-01-09 15:41:31.529108910 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
--- old/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/TransformerTestConst.java	2015-01-09 15:41:31.933109540 -0800
+++ new/test/javax/xml/jaxp/libs/javax/xml/transform/ptests/TransformerTestConst.java	2015-01-09 15:41:31.856109420 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,40 +23,22 @@
 package javax.xml.transform.ptests;
 
 import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
 
 /**
  * This is the Base test class provide basic support for JAXP functional test
  */
 public class TransformerTestConst {
     /**
-     * Current test directory.
+     * XML source file directory.
      */
-    public static final String CLASS_DIR
-            = System.getProperty("test.classes", ".") + FILE_SEP;
+    public static final String XML_DIR = getPathByClassName(TransformerTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles"); 
 
+    
     /**
-     * Package name that separates by slash.
+     * Golden validation files directory.
      */
-    public static final String PACKAGE_NAME = FILE_SEP +
-            TransformerTestConst.class.getPackage().getName().replaceAll("[.]", FILE_SEP);
-
-    /**
-     * Test base directory. Every package has its own test package directory.
-     */
-    public static final String BASE_DIR
-            = System.getProperty("test.src", USER_DIR).replaceAll("\\" + System.getProperty("file.separator"), "/")
-                + PACKAGE_NAME + FILE_SEP + "..";
-
-    /**
-     * Source XML file directory.
-     */
-    public static final String XML_DIR = BASE_DIR + FILE_SEP + "xmlfiles" + FILE_SEP;
-
-    /**
-     * Golden output file directory. We pre-define all expected output in golden
-     * output file. Test verifies whether the standard output is same as content
-     * of golden file.
-     */
-    public static final String GOLDEN_DIR = XML_DIR + FILE_SEP + "out" + FILE_SEP;
+    public static final String GOLDEN_DIR = getPathByClassName(TransformerTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles" + FILE_SEP + "out");
 }
--- old/test/javax/xml/jaxp/libs/javax/xml/xpath/ptests/XPathTestConst.java	2015-01-09 15:41:32.289110095 -0800
+++ new/test/javax/xml/jaxp/libs/javax/xml/xpath/ptests/XPathTestConst.java	2015-01-09 15:41:32.213109977 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,27 +23,15 @@
 package javax.xml.xpath.ptests;
 
 import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
 
 /**
  * This is the Base test class provide basic support for XPath functional test
  */
 public class XPathTestConst {
     /**
-     * Package name that separates by slash.
+     * XML source file directory.
      */
-    public static final String PACKAGE_NAME = FILE_SEP +
-            XPathTestConst.class.getPackage().getName().replaceAll("[.]", FILE_SEP);
-
-    /**
-     * Test base directory. Every package has its own test package directory.
-     */
-    public static final String BASE_DIR
-            = System.getProperty("test.src", USER_DIR).replaceAll("\\" + System.getProperty("file.separator"), "/")
-                + PACKAGE_NAME + FILE_SEP + "..";
-
-    /**
-     * Source XML file directory.
-     */
-    public static final String XML_DIR = BASE_DIR + FILE_SEP + "xmlfiles" + FILE_SEP;
+    public static final String XML_DIR = getPathByClassName(XPathTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles");
 }
--- old/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java	2015-01-09 15:41:32.659110672 -0800
+++ new/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java	2015-01-09 15:41:32.551110504 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -23,21 +23,34 @@
 package jaxp.library;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import static org.testng.Assert.fail;
 import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
 /**
@@ -59,16 +72,19 @@
      * Windows platform.
      */
     public static final String FILE_SEP = "/";
-
+    
     /**
-     * User home.
+     * Current test directory.
      */
-    public static final String USER_DIR = System.getProperty("user.dir", ".");
+    public static final String USER_DIR =
+            System.getProperty("user.dir", ".") + FILE_SEP;;
 
     /**
-     * TEMP file directory.
+     * A map storing every test's current test file pointer. File number should 
+     * be incremental and it's a thread-safe reading on this file number.
      */
-    public static final String TEMP_DIR = System.getProperty("java.io.tmpdir", ".");
+    private static final ConcurrentHashMap<Class, Integer> currentFileNumber
+                = new ConcurrentHashMap<>();
 
     /**
      * BOM table for storing BOM header.
@@ -88,36 +104,84 @@
 
     /**
      * Compare contents of golden file with test output file line by line.
-     * return true if they're identical.
+     * return true if they're identical. 
      * @param goldfile Golden output file name
      * @param outputfile Test output file name
      * @return true if two files are identical.
      *         false if two files are not identical.
-     * @throws IOException if an I/O error occurs reading from the file or a
-     *         malformed or unmappable byte sequence is read
+     * @throws IOException if an I/O error occurs reading from the file or a 
+     *         malformed or unmappable byte sequence is read. 
      */
     public static boolean compareWithGold(String goldfile, String outputfile)
             throws IOException {
+        return compareWithGold(goldfile, outputfile, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Compare contents of golden file with test output file line by line.
+     * return true if they're identical. 
+     * @param goldfile Golden output file name.
+     * @param outputfile Test output file name.
+     * @param cs the charset to use for decoding.
+     * @return true if two files are identical.
+     *         false if two files are not identical.
+     * @throws IOException if an I/O error occurs reading from the file or a 
+     *         malformed or unmappable byte sequence is read. 
+     */
+    public static boolean compareWithGold(String goldfile, String outputfile,
+             Charset cs) throws IOException {
         return Files.readAllLines(Paths.get(goldfile)).
-                equals(Files.readAllLines(Paths.get(outputfile)));
+                equals(Files.readAllLines(Paths.get(outputfile), cs));
+    }
+
+    /**
+     * Compare contents of golden file with test output list line by line.
+     * return true if they're identical. 
+     * @param goldfile Golden output file name.
+     * @param lines test output list.
+     * @return true if file's content is identical to given list.
+     *         false if file's content is not identical to given list.
+     * @throws IOException if an I/O error occurs reading from the file or a 
+     *         malformed or unmappable byte sequence is read  
+     */
+    public static boolean compareLinesWithGold(String goldfile, List<String> lines)
+            throws IOException {
+        return Files.readAllLines(Paths.get(goldfile)).equals(lines);
+    }
+ 
+    /**
+     * Compare contents of golden file with a test output string.
+     * return true if they're identical. 
+     * @param goldfile Golden output file name.
+     * @param string test string.
+     * @return true if file's content is identical to given string.
+     *         false if file's content is not identical to given string.
+     * @throws IOException if an I/O error occurs reading from the file or a 
+     *         malformed or unmappable byte sequence is read  
+     */
+    public static boolean compareStringWithGold(String goldfile, String string)
+            throws IOException {
+        return Files.readAllLines(Paths.get(goldfile)).stream().collect(
+                Collectors.joining(System.getProperty("line.separator")))
+                .equals(string);
     }
 
     /**
      * Compare contents of golden file with test output file by their document
-     * representation.
-     * Here we ignore the white space and comments. return true if they're
-     * lexical identical.
+     * representation. 
+     * Here we ignore the white space and comments. return true if they're  
+     * lexical identical. 
      * @param goldfile Golden output file name.
      * @param resultFile Test output file name.
      * @return true if two file's document representation are identical.
      *         false if two file's document representation are not identical.
-     * @throws javax.xml.parsers.ParserConfigurationException if the
+     * @throws javax.xml.parsers.ParserConfigurationException if the 
      *         implementation is not available or cannot be instantiated.
      * @throws SAXException If any parse errors occur.
-     * @throws IOException if an I/O error occurs reading from the file or a
-     *         malformed or unmappable byte sequence is read .
+     * @throws IOException if an I/O error occurs reading from the file or a 
+     *         malformed or unmappable byte sequence is read . 
      */
-    public static boolean compareDocumentWithGold(String goldfile, String resultFile)
+    public static boolean compareDocumentWithGold(String goldfile, String resultFile) 
             throws ParserConfigurationException, SAXException, IOException {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
@@ -132,19 +196,48 @@
         resultD.normalizeDocument();
         return goldD.isEqualNode(resultD);
     }
+
     /**
-     * Convert stream to ByteArrayInputStream by given character set.
+     * Compare contents of golden file with the serialization represent by given
+     * DOM node. 
+     * Here we ignore the white space and comments. return true if they're  
+     * lexical identical. 
+     * @param goldfile Golden output file name.
+     * @param node A DOM node instance.
+     * @return true if file's content is identical to given node's serialization 
+     *         represent.
+     *         false if file's content is not identical to given node's  
+     *         serialization represent.
+     * @throws TransformerException If an unrecoverable error occurs during the 
+     *         course of the transformation..
+     * @throws IOException if an I/O error occurs reading from the file or a 
+     *         malformed or unmappable byte sequence is read . 
+     */
+    public static boolean compareSerializeDOMWithGold(String goldfile, Node node) 
+            throws TransformerException, IOException {
+        TransformerFactory factory = TransformerFactory.newInstance();
+        // Use identity transformer to serialize
+        Transformer identityTransformer = factory.newTransformer();
+        StringWriter sw = new StringWriter();
+        StreamResult streamResult = new StreamResult(sw);
+        DOMSource nodeSource = new DOMSource(node);
+        identityTransformer.transform(nodeSource, streamResult);
+        return compareStringWithGold(goldfile, sw.toString());
+    }
+
+    /**
+     * Convert stream to ByteArrayInputStream by given character set. 
      * @param charset target character set.
      * @param file a file that contains no BOM head content.
      * @return a ByteArrayInputStream contains BOM heads and bytes in original
      *         stream
-     * @throws IOException I/O operation failed or unsupported character set.
+     * @throws IOException I/O operation failed or unsupported character set. 
      */
     public static InputStream bomStream(String charset, String file)
             throws IOException {
         String localCharset = charset;
         if (charset.equals("UTF-16") || charset.equals("UTF-32")) {
-            localCharset
+            localCharset 
                 += ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN ? "BE" : "LE";
         }
         if (!bom.containsKey(localCharset))
@@ -158,10 +251,40 @@
         bb.put(content);
         return new ByteArrayInputStream(bb.array());
     }
+    
+   /**
+     * Worker method to detect common absolute URLs.
+     *
+     * @param s String path\filename or URL (or any, really)
+     * @return true if s starts with a common URI scheme (namely
+     * the ones found in the examples of RFC2396); false otherwise
+     */
+    protected static boolean isCommonURL(String s) {
+        if (null == s)
+            return false;
+        return Pattern.compile("^(file:|http:|ftp:|gopher:|mailto:|news:|telnet:)")
+                .matcher(s).matches();
+    }
+
+    /**
+     * Utility method to translate a String filename to URL.
+     *
+     * If the name starts with a common URI scheme (namely the ones
+     * found in the examples of RFC2396), then simply return the
+     * name as-is (the assumption is that it's already a URL).
+     * Otherwise we attempt (cheaply) to convert to a file:/ URL.
+     *
+     * @param filename local path/filename of a file.
+     * @return a file:/ URL if filename represent a file, the same string if 
+     *         it appears to already be a URL.
+     */
+    public static String filenameToURL(String filename) {
+        return Paths.get(filename).toUri().toASCIIString();
+    }
 
     /**
      * Prints error message if an exception is thrown
-     * @param ex The exception is thrown by test.
+     * @param ex The exception is thrown by test. 
      */
     public static void failUnexpected(Throwable ex) {
         fail(ERROR_MSG_HEADER, ex);
@@ -169,10 +292,44 @@
 
     /**
      * Prints error message if an exception is thrown when clean up a file.
-     * @param ex The exception is thrown in cleaning up a file.
-     * @param name Cleaning up file name.
+     * @param ex The exception is thrown in cleaning up a file. 
+     * @param name Cleaning up file name. 
      */
     public static void failCleanup(IOException ex, String name) {
         fail(String.format(ERROR_MSG_CLEANUP, name), ex);
     }
+ 
+    /**
+     * Retrieve next test output file name. This method is a thread-safe method.
+     * @param clazz test class.
+     * @return next test output file name.
+     */
+    public static String getNextFile(Class clazz) {
+        int nextNumber = currentFileNumber.contains(clazz) 
+                ? currentFileNumber.get(clazz) + 1 : 1;
+        Integer i = currentFileNumber.putIfAbsent(clazz, nextNumber);
+        if (i != null && i != nextNumber) {
+            do {
+                nextNumber = currentFileNumber.get(clazz) + 1;
+            } while (currentFileNumber.replace(clazz, nextNumber -1, nextNumber));
+        }
+        return USER_DIR + clazz.getName() + nextNumber + ".out";
+    }
+    
+    /**
+     * Acquire a full path string by given class name and relative path string.
+     * @param clazz Class name for the test. 
+     * @param relativeDir relative path between java source file and expected
+     *        path.
+     * @return a string represents the full path of accessing path.  
+     */
+    public static String getPathByClassName(Class clazz, String relativeDir) {
+        String packageName = FILE_SEP + 
+                clazz.getPackage().getName().replaceAll("[.]", FILE_SEP);
+        String javaSourcePath = System.getProperty("test.src").replaceAll("\\" + File.separator, FILE_SEP)
+                + packageName + FILE_SEP;
+        String normalizedPath = Paths.get(javaSourcePath, relativeDir).normalize().
+                toAbsolutePath().toString();
+        return normalizedPath.replace("\\", FILE_SEP) + FILE_SEP;
+    }
 }
--- old/test/javax/xml/jaxp/libs/org/xml/sax/ptests/SAXTestConst.java	2015-01-09 15:41:33.012111223 -0800
+++ new/test/javax/xml/jaxp/libs/org/xml/sax/ptests/SAXTestConst.java	2015-01-09 15:41:32.935111102 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -23,7 +23,7 @@
 package org.xml.sax.ptests;
 
 import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
 
 /**
  * This is the Base test class provide basic support for JAXP SAX functional
@@ -32,33 +32,15 @@
  */
 public class SAXTestConst {
     /**
-     * Current test directory.
+     * XML source file directory.
      */
-    public static final String CLASS_DIR
-            = System.getProperty("test.classes", ".") + FILE_SEP;
+    public static final String XML_DIR = getPathByClassName(SAXTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles"); 
 
+    
     /**
-     * Package name that separates by slash.
+     * Golden validation files directory.
      */
-    public static final String PACKAGE_NAME = FILE_SEP +
-            SAXTestConst.class.getPackage().getName().replaceAll("[.]", FILE_SEP);
-
-    /**
-     * Test base directory. Every package has its own test package directory.
-     */
-    public static final String BASE_DIR
-            = System.getProperty("test.src", USER_DIR).replaceAll("\\" + System.getProperty("file.separator"), "/")
-                + PACKAGE_NAME + FILE_SEP + "..";
-
-    /**
-     * Source XML file directory.
-     */
-    public static final String XML_DIR = BASE_DIR + FILE_SEP + "xmlfiles" + FILE_SEP;
-
-    /**
-     * Golden output file directory. We pre-define all expected output in golden
-     * output file. Test verifies whether the standard output is same as content
-     * of golden file.
-     */
-    public static final String GOLDEN_DIR = XML_DIR + FILE_SEP + "out" + FILE_SEP;
+    public static final String GOLDEN_DIR = getPathByClassName(SAXTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles" + FILE_SEP + "out");
 }
--- old/test/javax/xml/jaxp/libs/test/auctionportal/HiBidConstants.java	2015-01-09 15:41:33.360111765 -0800
+++ new/test/javax/xml/jaxp/libs/test/auctionportal/HiBidConstants.java	2015-01-09 15:41:33.283111645 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -22,44 +22,21 @@
  */
 package test.auctionportal;
 
-import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
 
 /**
  * This is the Base test class provide basic support for Auction portal test.
  */
 public class HiBidConstants {
     /**
-     * Current test directory.
+     * XML source file directory.
      */
-    public static final String CLASS_DIR
-            = System.getProperty("test.classes", ".") + FILE_SEP;
+    public static final String XML_DIR = getPathByClassName(HiBidConstants.class, "content"); 
 
     /**
-     * Package name that separates by slash.
+     * Golden validation files directory.
      */
-    public static final String PACKAGE_NAME = FILE_SEP +
-            HiBidConstants.class.getPackage().getName().replaceAll("[.]", FILE_SEP);
-
-
-    /**
-     * Java source directory.
-     */
-    public static final String SRC_DIR = System.getProperty("test.src", USER_DIR)
-            .replaceAll("\\" + System.getProperty("file.separator"), "/")
-                + PACKAGE_NAME + FILE_SEP;
-
-    /**
-     * Source XML file directory.
-     */
-    public static final String XML_DIR = SRC_DIR + "content" + FILE_SEP;
-
-    /**
-     * Golden output file directory.
-     * We pre-define all expected output in golden output file.  Test verifies
-     * whether the standard output is same as content of golden file.
-     */
-    public static final String GOLDEN_DIR = SRC_DIR + "golden" + FILE_SEP;
+    public static final String GOLDEN_DIR = getPathByClassName(HiBidConstants.class, "golden");
 
     /**
      * Name space for account operation.
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactory01.java	2015-01-09 15:41:33.742112361 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,451 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javax.xml.parsers.ptests;
-
-import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * This checks the methods of DocumentBuilderFactoryImpl
- */
-public class DocumentBuilderFactory01 {
-    /**
-     * Testcase to test the default functionality of schema support method.
-     */
-    @Test
-    public void testCheckSchemaSupport1() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setValidating(true);
-            dbf.setNamespaceAware(true);
-            dbf.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "test.xml"));
-            assertFalse(eh.errorOccured);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the default functionality of schema support method. In
-     * this case the schema source property is set.
-     */
-    @Test
-    public void testCheckSchemaSupport2() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setValidating(true);
-            dbf.setNamespaceAware(true);
-            dbf.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
-            dbf.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", new InputSource(new FileInputStream(
-                    new File(TestUtils.XML_DIR, "test.xsd"))));
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "test1.xml"));
-            assertFalse(eh.errorOccured);
-        } catch (IllegalArgumentException | ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
-
-    }
-
-    /**
-     * Testcase to test the default functionality of schema support method. In
-     * this case the schema source property is set.
-     */
-    @Test
-    public void testCheckSchemaSupport3() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setValidating(true);
-            spf.setNamespaceAware(true);
-            SAXParser sp = spf.newSAXParser();
-            sp.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
-            sp.setProperty("http://java.sun.com/xml/jaxp/properties/schemaSource",
-                    new InputSource(new FileInputStream(new File(TestUtils.XML_DIR, "test.xsd"))));
-            DefaultHandler dh = new DefaultHandler();
-            sp.parse(new File(TestUtils.XML_DIR, "test1.xml"), dh);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the default functionality of newInstance method. To test
-     * the isCoalescing method and setCoalescing This checks to see if the CDATA
-     * and text nodes got combined In that case it will print "&lt;xml&gt;This
-     * is not parsed&lt;/xml&gt; yet".
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory02() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setCoalescing(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new File(TestUtils.XML_DIR, "DocumentBuilderFactory01.xml"));
-            Element e = (Element) doc.getElementsByTagName("html").item(0);
-            NodeList nl = e.getChildNodes();
-            assertEquals(nl.item(0).getNodeValue().trim(), "<xml>This is not parsed</xml> yet");
-        } catch (IOException | SAXException | ParserConfigurationException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the isIgnoringComments. By default it is false.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory03() {
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        assertFalse(dbf.isIgnoringComments());
-    }
-
-    /**
-     * Testcase to test the isValidating. By default it is false, set it to true
-     * and then use a document which is not valid. It should throw a warning or
-     * an error at least. The test passes in case retval 0 is set in the error
-     * method .
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory04() {
-        try {
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setValidating(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "DocumentBuilderFactory05.xml"));
-            assertTrue(eh.errorOccured);
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the setValidating. By default it is false, use a
-     * document which is not valid. It should not throw a warning or an error.
-     * The test passes in case the retval equals 1 .
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory16() {
-        try {
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "DocumentBuilderFactory05.xml"));
-            assertFalse(eh.errorOccured);
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-
-    }
-
-    /**
-     * Testcase to test the setValidating. By default it is false, use a
-     * document which is valid. It should not throw a warning or an error. The
-     * test passes in case the retval equals 1.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory17() {
-        try {
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "DocumentBuilderFactory04.xml"));
-            assertFalse(eh.errorOccured);
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-
-    }
-
-    /**
-     * To test the isExpandEntityReferences. By default it is true.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory05() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderFactory02.xml")));
-            Element e = (Element) doc.getElementsByTagName("title").item(0);
-            NodeList nl = e.getChildNodes();
-            assertTrue(dbf.isExpandEntityReferences());
-            assertEquals(nl.item(0).getNodeValue().trim().charAt(0), 'W');
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the default functionality of setValidating method. The
-     * xml file has a DTD which has namespaces defined. The parser takes care to
-     * check if the namespaces using elements and defined attributes are there
-     * or not.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory06() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setValidating(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "DocumentBuilderFactory04.xml"));
-            assertTrue(doc instanceof Document);
-            assertFalse(eh.errorOccured);
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-
-    }
-
-    /**
-     * Testcase to test the setExpandEntityReferences.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory07() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setExpandEntityReferences(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderFactory02.xml")));
-            Element e = (Element) doc.getElementsByTagName("title").item(0);
-            NodeList nl = e.getChildNodes();
-            assertTrue(dbf.isExpandEntityReferences());
-            assertEquals(nl.item(0).getNodeValue().trim().charAt(0), 'W');
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the setExpandEntityReferences.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory08() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setExpandEntityReferences(false);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderFactory02.xml")));
-            Element e = (Element) doc.getElementsByTagName("title").item(0);
-            NodeList nl = e.getChildNodes();
-            assertNull(nl.item(0).getNodeValue());
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the setIgnoringComments. By default it is set to false.
-     * explicitly setting it to false, it recognizes the comment which is in
-     * Element Node Hence the Element's child node is not null.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory09() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setIgnoringComments(false);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderFactory07.xml")));
-            Element e = (Element) doc.getElementsByTagName("body").item(0);
-            NodeList nl = e.getChildNodes();
-            assertNotNull(nl.item(0).getNodeValue());
-        } catch (ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-
-    }
-
-    /**
-     * This tests for the parse(InputSource).
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory10() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new InputSource(new BufferedReader(new FileReader(new File(TestUtils.XML_DIR, "DocumentBuilderFactory07.xml")))));
-            assertTrue(doc instanceof Document);
-        } catch (IllegalArgumentException | ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * This tests for the parse InputStream with SystemID as a second parameter.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory11() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "dbf10import.xsl")), new File(TestUtils.XML_DIR).toURI()
-                    .toASCIIString());
-            assertTrue(doc instanceof Document);
-        } catch (IllegalArgumentException | ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * This tests for the parse InputStream with empty SystemID as a second
-     * parameter.
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory12() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "dbf10import.xsl")), " ");
-            assertTrue(doc instanceof Document);
-        } catch (IllegalArgumentException | ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * This tests for the parse(uri).
-     */
-    @Test
-    public void testCheckDocumentBuilderFactory13() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new File(TestUtils.XML_DIR + FILE_SEP + "dbf10import.xsl").toURI().toASCIIString());
-            assertTrue(doc instanceof Document);
-        } catch (IllegalArgumentException | ParserConfigurationException | IOException | SAXException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * This tests for the parse (uri) with empty string as parameter should
-     * throw Sax Exception.
-     *
-     * @throws SAXException
-     *             If any parse errors occur.
-     */
-    @Test(expectedExceptions = SAXException.class)
-    public void testCheckDocumentBuilderFactory14() throws SAXException {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            docBuilder.parse("");
-        } catch (ParserConfigurationException | IOException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * This tests for the parse (uri) with null uri as parameter should throw
-     * IllegalArgumentException.
-     *
-     */
-    @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testCheckDocumentBuilderFactory15() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            String uri = null;
-            docBuilder.parse(uri);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
-    }
-
-    /**
-     * Testcase to test the setIgnoringComments. By default it is set to false,
-     * setting this to true, It does not recognize the comment, Here the
-     * nodelist has a length 0 because the ignoring comments is true.
-     */
-    @Test
-    public void testCheckIgnoringComments() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setIgnoringComments(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderFactory08.xml")));
-            Element e = (Element) doc.getElementsByTagName("body").item(0);
-            NodeList nl = e.getChildNodes();
-            assertEquals(nl.getLength(), 0);
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
-
-    }
-
-    /**
-     * Testcase to test the default behaviour of setIgnoringComments. By default
-     * it is set to false, this is similar to case 9 but not setIgnoringComments
-     * explicitly, it does not recognize the comment.
-     */
-    @Test
-    public void testCheckIgnoringComments1() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document doc = docBuilder.parse(new FileInputStream(new File(TestUtils.XML_DIR, "DocumentBuilderFactory07.xml")));
-            Element e = (Element) doc.getElementsByTagName("body").item(0);
-            NodeList nl = e.getChildNodes();
-            assertFalse(dbf.isIgnoringComments());
-            assertNotNull(nl.item(0).getNodeValue());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            failUnexpected(e);
-        }
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java	2015-01-09 15:41:33.621112172 -0800
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 1999, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.xml.parsers.ptests;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilePermission;
+import java.io.FileReader;
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import static javax.xml.parsers.ptests.ParserTestConst.GOLDEN_DIR;
+import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * This checks the methods of DocumentBuilderFactoryImpl.
+ */
+public class DocumentBuilderFactoryTest extends JAXPFileBaseTest {
+    /**
+     * Test the default functionality of schema support method.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckSchemaSupport1() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setValidating(true);
+        dbf.setNamespaceAware(true);
+        dbf.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", 
+                W3C_XML_SCHEMA_NS_URI);
+        MyErrorHandler eh = MyErrorHandler.newInstance();
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        db.setErrorHandler(eh);
+        db.parse(new File(XML_DIR, "test.xml"));
+        assertFalse(eh.isErrorOccured());
+    }
+
+    /**
+     * Test the default functionality of schema support method. In
+     * this case the schema source property is set.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckSchemaSupport2() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "test.xsd"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setValidating(true);
+            dbf.setNamespaceAware(true);
+            dbf.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", 
+                    W3C_XML_SCHEMA_NS_URI);
+            dbf.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", 
+                    new InputSource(fis));
+            MyErrorHandler eh = MyErrorHandler.newInstance();
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            db.setErrorHandler(eh);
+            db.parse(new File(XML_DIR, "test1.xml"));
+            assertFalse(eh.isErrorOccured());
+        }
+    }
+
+    /**
+     * Test the default functionality of schema support method. In
+     * this case the schema source property is set.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckSchemaSupport3() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "test.xsd"))) {
+            SAXParserFactory spf = SAXParserFactory.newInstance();
+            spf.setNamespaceAware(true);
+            spf.setValidating(true);
+            spf.setNamespaceAware(true);
+            SAXParser sp = spf.newSAXParser();
+            sp.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", 
+                    W3C_XML_SCHEMA_NS_URI);
+            sp.setProperty("http://java.sun.com/xml/jaxp/properties/schemaSource",
+                    new InputSource(fis));
+            DefaultHandler dh = new DefaultHandler();
+            // Not expect any unrecoverable error here.
+            sp.parse(new File(XML_DIR, "test1.xml"), dh);
+        }
+    }
+
+    /**
+     * Test the default functionality of newInstance method. To test
+     * the isCoalescing method and setCoalescing This checks to see if the CDATA
+     * and text nodes got combined In that case it will print "&lt;xml&gt;This
+     * is not parsed&lt;/xml&gt; yet".
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory02() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setCoalescing(true);
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        Document doc = docBuilder.parse(new File(XML_DIR, "DocumentBuilderFactory01.xml"));
+        Element e = (Element) doc.getElementsByTagName("html").item(0);
+        NodeList nl = e.getChildNodes();
+        assertEquals(nl.getLength(), 1);
+    }
+
+    /**
+     * Test the isIgnoringComments. By default it is false.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory03() {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        assertFalse(dbf.isIgnoringComments());
+    }
+
+    /**
+     * Test the isValidating. By default it is false, set it to true and then 
+     * use a document which is not valid. It should throw a warning or
+     * an error at least. The test passes in case retval 0 is set in the error
+     * method .
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory04() throws Exception {
+        MyErrorHandler eh = MyErrorHandler.newInstance();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setValidating(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        db.setErrorHandler(eh);
+        db.parse(new File(XML_DIR, "DocumentBuilderFactory05.xml"));
+        assertTrue(eh.isErrorOccured());
+    }
+
+    /**
+     * Test the setValidating. By default it is false, use a
+     * document which is not valid. It should not throw a warning or an error.
+     * The test passes in case the return value equals 1.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory16() throws Exception {
+        MyErrorHandler eh = MyErrorHandler.newInstance();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        db.setErrorHandler(eh);
+        db.parse(new File(XML_DIR, "DocumentBuilderFactory05.xml"));
+        assertFalse(eh.isErrorOccured());
+    }
+
+    /**
+     * Test the setValidating. By default it is false, use a
+     * document which is valid. It should not throw a warning or an error. The
+     * test passes in case the return value equals 1.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory17() throws Exception {
+        MyErrorHandler eh = MyErrorHandler.newInstance();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        db.setErrorHandler(eh);
+        db.parse(new File(XML_DIR, "DocumentBuilderFactory04.xml"));
+        assertFalse(eh.isErrorOccured());
+    }
+
+    /**
+     * Test the isExpandEntityReferences. By default it is true.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory05() throws Exception {
+        try(FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "DocumentBuilderFactory02.xml"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis);
+            Element e = (Element) doc.getElementsByTagName("title").item(0);
+            NodeList nl = e.getChildNodes();
+            assertTrue(dbf.isExpandEntityReferences());
+            assertEquals(nl.item(0).getNodeValue().trim().charAt(0), 'W');
+        }
+    }
+
+    /**
+     * Test the default functionality of setValidating method. The
+     * XML file has a DTD which has namespaces defined. The parser takes care to
+     * check if the namespaces using elements and defined attributes are there
+     * or not.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory06() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setValidating(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        MyErrorHandler eh = MyErrorHandler.newInstance();
+        db.setErrorHandler(eh);
+        Document doc = db.parse(new File(XML_DIR, "DocumentBuilderFactory04.xml"));
+        assertTrue(doc instanceof Document);
+        assertFalse(eh.isErrorOccured());
+    }
+
+    /**
+     * Test the setExpandEntityReferences.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory07() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "DocumentBuilderFactory02.xml"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setExpandEntityReferences(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis);
+            Element e = (Element) doc.getElementsByTagName("title").item(0);
+            NodeList nl = e.getChildNodes();
+            assertTrue(dbf.isExpandEntityReferences());
+            assertEquals(nl.item(0).getNodeValue().trim().charAt(0), 'W');
+        } 
+    }
+
+    /**
+     * Test the setExpandEntityReferences.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory08() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "DocumentBuilderFactory02.xml"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setExpandEntityReferences(false);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis);
+            Element e = (Element) doc.getElementsByTagName("title").item(0);
+            NodeList nl = e.getChildNodes();
+            assertNull(nl.item(0).getNodeValue());
+        }
+    }
+
+    /**
+     * Test the setIgnoringComments. By default it is set to false.
+     * explicitly setting it to false, it recognizes the comment which is in
+     * Element Node Hence the Element's child node is not null.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory09() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "DocumentBuilderFactory07.xml"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setIgnoringComments(false);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis);
+            Element e = (Element) doc.getElementsByTagName("body").item(0);
+            NodeList nl = e.getChildNodes();
+            assertNotNull(nl.item(0).getNodeValue());
+        }
+    }
+
+    /**
+     * This tests for the parse(InputSource).
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory10() throws Exception {
+        try (BufferedReader br = new BufferedReader(new FileReader(new File(
+                XML_DIR, "DocumentBuilderFactory07.xml")))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(new InputSource(br));
+            assertNotNull(doc);
+        } 
+    }
+
+    /**
+     * This tests for the parse InputStream with SystemID as a second parameter.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory11() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "dbf10import.xsl"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis, new File(XML_DIR).toURI()
+                    .toASCIIString());
+            assertNotNull(doc);
+        }
+    }
+
+    /**
+     * This tests for the parse InputStream with empty SystemID as a second
+     * parameter.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory12() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "dbf10import.xsl"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis, " ");
+            assertNotNull(doc);
+        }
+    }
+
+    /**
+     * This tests for the parse(uri).
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckDocumentBuilderFactory13() throws Exception {
+        // Accesing default working directory.
+        String workingDir = getSystemProperty("user.dir");
+        setPermissions(new FilePermission(workingDir + "/*", "read"));
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        Document doc = docBuilder.parse(new File(XML_DIR + "dbf10import.xsl")
+                .toURI().toASCIIString());
+        assertNotNull(doc);  
+    }
+
+    /**
+     * This tests for the parse(uri) with empty string as parameter should
+     * throw Sax Exception.
+     * @throws Exception If any errors occur.
+     */
+    @Test(expectedExceptions = SAXException.class)
+    public void testCheckDocumentBuilderFactory14() throws Exception {
+        // Accesing default working directory.  
+        String workingDir = getSystemProperty("user.dir");
+        setPermissions(new FilePermission(workingDir, "read"));
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        docBuilder.parse("");
+    }
+
+    /**
+     * This tests for the parse (uri) with null uri as parameter should throw
+     * IllegalArgumentException.
+     * @throws Exception If any errors occur.
+     *
+     */
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testCheckDocumentBuilderFactory15() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        String uri = null;
+        docBuilder.parse(uri);
+    }
+
+    /**
+     * Test the setIgnoringComments. By default it is set to false,
+     * setting this to true, It does not recognize the comment, Here the
+     * nodelist has a length 0 because the ignoring comments is true.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckIgnoringComments() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "DocumentBuilderFactory08.xml"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setIgnoringComments(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis);
+            Element e = (Element) doc.getElementsByTagName("body").item(0);
+            NodeList nl = e.getChildNodes();
+            assertEquals(nl.getLength(), 0);
+        }
+    }
+
+    /**
+     * Test the default behaviour of setIgnoringComments. By default
+     * it is set to false, this is similar to case 9 but not setIgnoringComments
+     * explicitly, it does not recognize the comment.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckIgnoringComments1() throws Exception {
+        try (FileInputStream fis = new FileInputStream(new File(
+                XML_DIR, "DocumentBuilderFactory07.xml"))) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document doc = docBuilder.parse(fis);
+            Element e = (Element) doc.getElementsByTagName("body").item(0);
+            NodeList nl = e.getChildNodes();
+            assertFalse(dbf.isIgnoringComments());
+            assertNotNull(nl.item(0).getNodeValue());
+        }
+    }
+
+    /**
+     * Test for the isIgnoringElementContentWhitespace and the
+     * setIgnoringElementContentWhitespace. The xml file has all kinds of
+     * whitespace,tab and newline characters, it uses the MyNSContentHandler
+     * which does not invoke the characters callback when this
+     * setIgnoringElementContentWhitespace is set to true.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCheckElementContentWhitespace() throws Exception {
+        String goldFile = GOLDEN_DIR + "dbfactory02GF.out";
+        String outputFile = USER_DIR + "dbfactory02.out";
+        MyErrorHandler eh = MyErrorHandler.newInstance();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setValidating(true);
+        assertFalse(dbf.isIgnoringElementContentWhitespace());
+        dbf.setIgnoringElementContentWhitespace(true);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        db.setErrorHandler(eh);
+        Document doc = db.parse(new File(XML_DIR, "DocumentBuilderFactory06.xml"));
+        assertFalse(eh.isErrorOccured());
+        DOMSource domSource = new DOMSource(doc);
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        Transformer transformer = tfactory.newTransformer();
+        SAXResult saxResult = new SAXResult();
+        try(MyCHandler handler = MyCHandler.newInstance(new File(outputFile))) {
+            saxResult.setHandler(handler);
+            transformer.transform(domSource, saxResult);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+}
\ No newline at end of file
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest01.java	2015-01-09 15:41:34.118112947 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javax.xml.transform.ptests;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.w3c.dom.Attr;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * DOM parse on test file to be compared with golden output file. No Exception
- * is expected.
- */
-public class DOMResultTest01 {
-    /**
-     * Unit test for simple DOM parsing.
-     */
-    @Test
-    public void testcase01() {
-        String resultFile = CLASS_DIR  + "domresult01.out";
-        String goldFile = GOLDEN_DIR  + "domresult01GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory) TransformerFactory.newInstance();
-            SAXSource saxSource = new SAXSource(new InputSource(xsltFile));
-            TransformerHandler handler
-                    = saxTFactory.newTransformerHandler(saxSource);
-
-            DOMResult result = new DOMResult();
-
-            handler.setResult(result);
-            reader.setContentHandler(handler);
-            reader.parse(xmlFile);
-
-            Node node = result.getNode();
-            try (BufferedWriter writer = new BufferedWriter(new FileWriter(resultFile))) {
-                writeNodes(node, writer);
-            }
-            assertTrue(compareWithGold(goldFile, resultFile));
-        } catch (SAXException | TransformerConfigurationException
-                | IllegalArgumentException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path resultPath = Paths.get(resultFile);
-                if(Files.exists(resultPath))
-                    Files.delete(resultPath);
-            } catch (IOException ex) {
-                failCleanup(ex, resultFile);
-            }
-        }
-    }
-
-    /**
-     * Prints all node names, attributes to file
-     * @param node a node that need to be recursively access.
-     * @param bWriter file writer.
-     * @throws IOException if writing file failed.
-     */
-    private void writeNodes(Node node, BufferedWriter bWriter) throws IOException {
-        String str = "Node: " + node.getNodeName();
-        bWriter.write( str, 0,str.length());
-        bWriter.newLine();
-
-        NamedNodeMap nnm = node.getAttributes();
-        if (nnm != null && nnm.getLength() > 0)
-            for (int i=0; i<nnm.getLength(); i++) {
-                str = "AttributeName:" + ((Attr) nnm.item(i)).getName() +
-                      ", AttributeValue:" +((Attr) nnm.item(i)).getValue();
-                bWriter.write( str, 0,str.length());
-                bWriter.newLine();
-            }
-
-        NodeList kids = node.getChildNodes();
-        if (kids != null)
-            for (int i=0; i<kids.getLength(); i++)
-                writeNodes(kids.item(i), bWriter);
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java	2015-01-09 15:41:34.003112767 -0800
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.xml.transform.ptests;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
+import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+/**
+ * DOM parse on test file to be compared with golden output file. No Exception
+ * is expected.
+ */
+public class DOMResultTest extends JAXPFileBaseTest {
+    /**
+     * Unit test for simple DOM parsing.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase01() throws Exception {
+        String resultFile = USER_DIR  + "domresult01.out";
+        String goldFile = GOLDEN_DIR  + "domresult01GF.out";
+        String xsltFile = XML_DIR + "cities.xsl";
+        String xmlFile = XML_DIR + "cities.xml";
+
+        XMLReader reader = XMLReaderFactory.createXMLReader();
+        SAXTransformerFactory saxTFactory
+                = (SAXTransformerFactory) TransformerFactory.newInstance();
+        SAXSource saxSource = new SAXSource(new InputSource(xsltFile));
+        TransformerHandler handler
+                = saxTFactory.newTransformerHandler(saxSource);
+
+        DOMResult result = new DOMResult();
+
+        handler.setResult(result);
+        reader.setContentHandler(handler);
+        reader.parse(xmlFile);
+
+        Node node = result.getNode();
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(resultFile))) {
+            writeNodes(node, writer);
+        }
+        assertTrue(compareWithGold(goldFile, resultFile));
+    }
+
+    /**
+     * Prints all node names, attributes to file
+     * @param node a node that need to be recursively access.
+     * @param bWriter file writer.
+     * @throws IOException if writing file failed.
+     */
+    private void writeNodes(Node node, BufferedWriter bWriter) throws IOException {
+        String str = "Node: " + node.getNodeName();
+        bWriter.write( str, 0,str.length());
+        bWriter.newLine();
+
+        NamedNodeMap nnm = node.getAttributes();
+        if (nnm != null && nnm.getLength() > 0)
+            for (int i=0; i<nnm.getLength(); i++) {
+                str = "AttributeName:" + ((Attr) nnm.item(i)).getName() +
+                      ", AttributeValue:" +((Attr) nnm.item(i)).getValue();
+                bWriter.write( str, 0,str.length());
+                bWriter.newLine();
+            }
+
+        NodeList kids = node.getChildNodes();
+        if (kids != null)
+            for (int i=0; i<kids.getLength(); i++)
+                writeNodes(kids.item(i), bWriter);
+    }
+}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest01.java	2015-01-09 15:41:34.476113505 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-/**
- * Unit test for SAXSource sourceToInputSource API.
- */
-public class SAXSourceTest01 {
-    /**
-     * Test file name
-     */
-    private final String TEST_FILE = XML_DIR + "cities.xsl";
-
-    /**
-     * Test obtaining a SAX InputSource object from a Source object.
-     */
-    @Test
-    public void source2inputsource01() {
-        try {
-            StreamSource streamSource = new StreamSource (
-                                new FileInputStream (TEST_FILE));
-            assertNotNull(SAXSource.sourceToInputSource(streamSource));
-        } catch (FileNotFoundException ex) {
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * This test case tries to get InputSource from DOMSource using
-     * sourceToInputSource method. It is not possible and hence null is
-     * expected. This is a negative test case
-     */
-    @Test
-    public void source2inputsource02() {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            dbf.newDocumentBuilder().parse(new File(TEST_FILE));
-            assertNull(SAXSource.sourceToInputSource(new DOMSource(null)));
-        } catch (ParserConfigurationException | SAXException | IOException ex) {
-            failUnexpected(ex);
-        }
-
-    }
-
-    /**
-     * This test case tries to get InputSource from SAXSource using
-     * sourceToInputSource method. This will also check if the systemId
-     * remained the same. This is a positive test case.
-     */
-    @Test
-    public void source2inputsource03() {
-        String SYSTEM_ID = "file:///" + XML_DIR;
-        try {
-            SAXSource saxSource =
-                    new SAXSource(new InputSource(new FileInputStream(TEST_FILE)));
-            saxSource.setSystemId(SYSTEM_ID);
-            assertEquals(SAXSource.sourceToInputSource(saxSource).getSystemId(),
-                    SYSTEM_ID);
-        } catch (FileNotFoundException ex) {
-            failUnexpected(ex);
-        }
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java	2015-01-09 15:41:34.361113326 -0800
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.xml.transform.ptests;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.dom.DOMSource;
+import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileReadOnlyBaseTest;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import org.testng.annotations.Test;
+import org.xml.sax.InputSource;
+
+
+/**
+ * Unit test for SAXSource sourceToInputSource API.
+ */
+public class SAXSourceTest extends JAXPFileReadOnlyBaseTest {
+    /**
+     * Test style-sheet file name
+     */
+    private final String TEST_FILE = XML_DIR + "cities.xsl";
+
+    /**
+     * Test obtaining a SAX InputSource object from a Source object.
+     * 
+     * @throws IOException reading file error.
+     */
+    @Test(groups = {"readLocalFiles"})
+    public void source2inputsource01() throws IOException {
+        try (FileInputStream fis = new FileInputStream(TEST_FILE)) {
+            StreamSource streamSource = new StreamSource(fis);
+            assertNotNull(SAXSource.sourceToInputSource(streamSource));
+        }
+    }
+
+    /**
+     * This test case tries to get InputSource from DOMSource using
+     * sourceToInputSource method. It is not possible and hence null is
+     * expected. This is a negative test case,
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test(groups = {"readLocalFiles"})
+    public void source2inputsource02() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.newDocumentBuilder().parse(new File(TEST_FILE));
+        assertNull(SAXSource.sourceToInputSource(new DOMSource(null)));
+    }
+
+    /**
+     * This test case tries to get InputSource from SAXSource using
+     * sourceToInputSource method. This will also check if the systemId
+     * remained the same. This is a positive test case.
+     * 
+     * @throws IOException reading file error.
+     */
+    @Test(groups = {"readLocalFiles"})
+    public void source2inputsource03() throws IOException {
+        String SYSTEM_ID = "file:///" + XML_DIR;
+        try (FileInputStream fis = new FileInputStream(TEST_FILE)) {
+            SAXSource saxSource =
+                    new SAXSource(new InputSource(fis));
+            saxSource.setSystemId(SYSTEM_ID);
+            assertEquals(SAXSource.sourceToInputSource(saxSource).getSystemId(),
+                    SYSTEM_ID);
+        }
+    }
+}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest001.java	2015-01-09 15:41:34.867114115 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javax.xml.transform.ptests;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test newTransformerhandler() method which takes StreamSource as argument can
- * be set to XMLReader.
- */
-public class SAXTFactoryTest001 {
-    /**
-     * SAXTFactory.newTransformerhandler() method which takes SAXSource as
-     * argument can be set to XMLReader. SAXSource has input XML file as its
-     * input source. XMLReader has a transformer handler which write out the
-     * result to output file. Test verifies output file is same as golden file.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf001.out";
-        String goldFile = GOLDEN_DIR + "saxtf001GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory) TransformerFactory.newInstance();
-            TransformerHandler handler = saxTFactory.newTransformerHandler(
-                    new StreamSource(xsltFile));
-            Result result = new StreamResult(fos);
-            handler.setResult(result);
-            reader.setContentHandler(handler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | TransformerConfigurationException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java	2015-01-09 15:41:34.734113907 -0800
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.xml.transform.ptests;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
+import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+/**
+ * Test newTransformerhandler() method which takes StreamSource as argument can
+ * be set to XMLReader.
+ */
+public class SAXTFactoryTest extends JAXPFileBaseTest {
+    /**
+     * Test style-sheet file.
+     */
+    private static final String XSLT_FILE = XML_DIR + "cities.xsl";
+
+    /**
+     * Test style-sheet file.
+     */
+    private static final String XSLT_INCL_FILE = XML_DIR + "citiesinclude.xsl"; 
+
+    /**
+     * Test XML file.
+     */
+    private static final String XML_FILE = XML_DIR + "cities.xml";
+
+    /**
+     * SAXTFactory.newTransformerhandler() method which takes SAXSource as
+     * argument can be set to XMLReader. SAXSource has input XML file as its
+     * input source. XMLReader has a transformer handler which write out the
+     * result to output file. Test verifies output file is same as golden file.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase01() throws Exception {
+        String outputFile = USER_DIR + "saxtf001.out";
+        String goldFile = GOLDEN_DIR + "saxtf001GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory) TransformerFactory.newInstance();
+            TransformerHandler handler = saxTFactory.newTransformerHandler(new StreamSource(XSLT_FILE));
+            Result result = new StreamResult(fos);
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }    
+
+    /**
+     * SAXTFactory.newTransformerhandler() method which takes SAXSource as
+     * argument can be set to XMLReader. SAXSource has input XML file as its
+     * input source. XMLReader has a content handler which write out the result
+     * to output file. Test verifies output file is same as golden file.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase02() throws Exception {
+        String outputFile = USER_DIR + "saxtf002.out";
+        String goldFile = GOLDEN_DIR + "saxtf002GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile);
+                FileInputStream fis = new FileInputStream(XSLT_FILE)) {
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory) TransformerFactory.newInstance();
+            SAXSource ss = new SAXSource();
+            ss.setInputSource(new InputSource(fis));
+
+            TransformerHandler handler = saxTFactory.newTransformerHandler(ss);
+            Result result = new StreamResult(fos);
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Unit test for newTransformerhandler(Source). DcoumentBuilderFactory is
+     * namespace awareness, DocumentBuilder parse xslt file as DOMSource.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase03() throws Exception {
+        String outputFile = USER_DIR + "saxtf003.out";
+        String goldFile = GOLDEN_DIR + "saxtf003GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document document = docBuilder.parse(new File(XSLT_FILE));
+            Node node = (Node)document;
+            DOMSource domSource= new DOMSource(node);
+
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory)TransformerFactory.newInstance();
+            TransformerHandler handler =
+                        saxTFactory.newTransformerHandler(domSource);
+            Result result = new StreamResult(fos);
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Negative test for newTransformerHandler when relative URI is in XML file.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test(expectedExceptions = TransformerConfigurationException.class)
+    public void transformerHandlerTest04() throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        Document document = docBuilder.parse(new File(XSLT_INCL_FILE));
+        DOMSource domSource= new DOMSource(document);
+        SAXTransformerFactory saxTFactory
+                = (SAXTransformerFactory)TransformerFactory.newInstance();
+        saxTFactory.newTransformerHandler(domSource);
+    }
+
+    /**
+     * Unit test for XMLReader parsing when relative URI is used in xsl file and
+     * SystemId was set.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase05() throws Exception {
+        String outputFile = USER_DIR + "saxtf005.out";
+        String goldFile = GOLDEN_DIR + "saxtf005GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory)TransformerFactory.newInstance();
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Document document = docBuilder.parse(new File(XSLT_INCL_FILE));
+            Node node = (Node)document;
+            DOMSource domSource= new DOMSource(node);
+
+            domSource.setSystemId("file:///" + XML_DIR);
+
+            TransformerHandler handler =
+                        saxTFactory.newTransformerHandler(domSource);
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Unit test newTransformerHandler with a DOMSource.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase06() throws Exception {
+        String outputFile = USER_DIR + "saxtf006.out";
+        String goldFile = GOLDEN_DIR + "saxtf006GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory)TransformerFactory.newInstance();
+
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Node node = (Node)docBuilder.parse(new File(XSLT_INCL_FILE));
+
+            DOMSource domSource = new DOMSource(node, "file:///" + XML_DIR);
+            TransformerHandler handler =
+                        saxTFactory.newTransformerHandler(domSource);
+
+            Result result = new StreamResult(fos);
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Test newTransformerHandler with a Template Handler.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    public void testcase08() throws Exception {
+        String outputFile = USER_DIR + "saxtf008.out";
+        String goldFile = GOLDEN_DIR + "saxtf008GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory)TransformerFactory.newInstance();
+
+            TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
+            reader.setContentHandler(thandler);
+            reader.parse(XSLT_FILE);
+            TransformerHandler tfhandler
+                    = saxTFactory.newTransformerHandler(thandler.getTemplates());
+
+            Result result = new StreamResult(fos);
+            tfhandler.setResult(result);
+
+            reader.setContentHandler(tfhandler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Test newTransformerHandler with a Template Handler along with a relative
+     * URI in the style-sheet file.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase09() throws Exception {
+        String outputFile = USER_DIR + "saxtf009.out";
+        String goldFile = GOLDEN_DIR + "saxtf009GF.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory)TransformerFactory.newInstance();
+
+            TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
+            thandler.setSystemId("file:///" + XML_DIR);
+            reader.setContentHandler(thandler);
+            reader.parse(XSLT_INCL_FILE);
+            TransformerHandler tfhandler=
+                saxTFactory.newTransformerHandler(thandler.getTemplates());
+            Result result = new StreamResult(fos);
+            tfhandler.setResult(result);
+            reader.setContentHandler(tfhandler);
+            reader.parse(XML_FILE);
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Unit test for contentHandler setter/getter along reader as handler's
+     * parent.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase10() throws Exception {
+        String outputFile = USER_DIR + "saxtf010.out";
+        String goldFile = GOLDEN_DIR + "saxtf010GF.out";
+        // The transformer will use a SAX parser as it's reader.
+        XMLReader reader = XMLReaderFactory.createXMLReader();
+        SAXTransformerFactory saxTFactory
+                = (SAXTransformerFactory)TransformerFactory.newInstance();
+        XMLFilter filter =
+            saxTFactory.newXMLFilter(new StreamSource(XSLT_FILE));
+        filter.setParent(reader);
+        filter.setContentHandler(new MyContentHandler(outputFile));
+
+        // Now, when you call transformer.parse, it will set itself as
+        // the content handler for the parser object (it's "parent"), and
+        // will then call the parse method on the parser.
+        filter.parse(new InputSource(XML_FILE));
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Unit test for contentHandler setter/getter with parent.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase11() throws Exception {
+        String outputFile = USER_DIR + "saxtf011.out";
+        String goldFile = GOLDEN_DIR + "saxtf011GF.out";
+        // The transformer will use a SAX parser as it's reader.
+        XMLReader reader = XMLReaderFactory.createXMLReader();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+        Document document = docBuilder.parse(new File(XSLT_FILE));
+        Node node = (Node)document;
+        DOMSource domSource= new DOMSource(node);
+
+        SAXTransformerFactory saxTFactory
+                = (SAXTransformerFactory)TransformerFactory.newInstance();
+        XMLFilter filter = saxTFactory.newXMLFilter(domSource);
+
+        filter.setParent(reader);
+        filter.setContentHandler(new MyContentHandler(outputFile));
+
+        // Now, when you call transformer.parse, it will set itself as
+        // the content handler for the parser object (it's "parent"), and
+        // will then call the parse method on the parser.
+        filter.parse(new InputSource(XML_FILE));
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Unit test for contentHandler setter/getter.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase12() throws Exception {
+        String outputFile = USER_DIR + "saxtf012.out";
+        String goldFile = GOLDEN_DIR + "saxtf012GF.out";
+        // The transformer will use a SAX parser as it's reader.
+        XMLReader reader = XMLReaderFactory.createXMLReader();
+
+        InputSource is = new InputSource(new FileInputStream(XSLT_FILE));
+        SAXSource saxSource = new SAXSource();
+        saxSource.setInputSource(is);
+
+        SAXTransformerFactory saxTFactory = (SAXTransformerFactory)TransformerFactory.newInstance();
+        XMLFilter filter = saxTFactory.newXMLFilter(saxSource);
+
+        filter.setParent(reader);
+        filter.setContentHandler(new MyContentHandler(outputFile));
+
+        // Now, when you call transformer.parse, it will set itself as
+        // the content handler for the parser object (it's "parent"), and
+        // will then call the parse method on the parser.
+        filter.parse(new InputSource(XML_FILE));
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Unit test for TemplatesHandler setter/getter.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testcase13() throws Exception {
+        String outputFile = USER_DIR + "saxtf013.out";
+        String goldFile = GOLDEN_DIR + "saxtf013GF.out";
+        try(FileInputStream fis = new FileInputStream(XML_FILE)) {
+            // The transformer will use a SAX parser as it's reader.
+            XMLReader reader = XMLReaderFactory.createXMLReader();
+
+            SAXTransformerFactory saxTFactory
+                    = (SAXTransformerFactory) TransformerFactory.newInstance();
+            TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
+            // I have put this as it was complaining about systemid
+            thandler.setSystemId("file:///" + USER_DIR);
+
+            reader.setContentHandler(thandler);
+            reader.parse(XSLT_FILE);
+            XMLFilter filter
+                    = saxTFactory.newXMLFilter(thandler.getTemplates());
+            filter.setParent(reader);
+
+            filter.setContentHandler(new MyContentHandler(outputFile));
+            filter.parse(new InputSource(fis));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest01.java	2015-01-09 15:41:35.242114700 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Properties;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * Test a StreamResult using a file name that contains URL characters that need
- * to be encoded.
- */
-public class StreamResultTest01 {
-    /**
-     * Unit test for StreamResult.
-     */
-    @Test
-    public void testcase01() {
-        // Set Transformer properties
-        Properties transformProperties = new Properties();
-        transformProperties.put("method", "xml");
-        transformProperties.put("encoding", "UTF-8");
-        transformProperties.put("omit-xml-declaration", "yes");
-        transformProperties.put("{http://xml.apache.org/xslt}indent-amount", "0");
-        transformProperties.put("indent", "no");
-        transformProperties.put("standalone", "no");
-        transformProperties.put("version", "1.0");
-        transformProperties.put("media-type", "text/xml");
-
-        String[] fileNames = {
-            "StreamResult01.out",
-            "StreamResult 02.out",
-            "StreamResult#03.out"
-        };
-
-        String xslFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        Arrays.stream(fileNames).forEach(file -> {
-            try {
-                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-                dbf.setNamespaceAware(true);
-                DocumentBuilder db = dbf.newDocumentBuilder();
-                Document document = db.parse(new File(xslFile));
-                DOMSource domSource = new DOMSource(document);
-                StreamSource streamSource = new StreamSource(new FileInputStream(xmlFile));
-
-                File streamResultFile = new File(CLASS_DIR + file);
-                StreamResult streamResult = new StreamResult(streamResultFile);
-
-                Transformer transformer = TransformerFactory.newInstance().newTransformer(domSource);
-                transformer.setOutputProperties(transformProperties);
-                transformer.transform(streamSource, streamResult);
-            } catch (SAXException | IOException | ParserConfigurationException
-                    | TransformerException ex) {
-                failUnexpected(ex);
-            }
-        });
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java	2015-01-09 15:41:35.120114509 -0800
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package javax.xml.transform.ptests;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Properties;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.failUnexpected;
+import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+/**
+ * Test a StreamResult using a file name that contains URL characters that need
+ * to be encoded.
+ */
+public class StreamResultTest extends JAXPFileBaseTest {
+    /**
+     * Unit test for StreamResult.
+     */
+    @Test
+    public void testcase01() {
+        // Set Transformer properties
+        Properties transformProperties = new Properties();
+        transformProperties.put("method", "xml");
+        transformProperties.put("encoding", "UTF-8");
+        transformProperties.put("omit-xml-declaration", "yes");
+        transformProperties.put("{http://xml.apache.org/xslt}indent-amount", "0");
+        transformProperties.put("indent", "no");
+        transformProperties.put("standalone", "no");
+        transformProperties.put("version", "1.0");
+        transformProperties.put("media-type", "text/xml");
+
+        String[] fileNames = {
+            "StreamResult01.out",
+            "StreamResult 02.out",
+            "StreamResult#03.out"
+        };
+
+        String xslFile = XML_DIR + "cities.xsl";
+        String xmlFile = XML_DIR + "cities.xml";
+
+        Arrays.stream(fileNames).forEach(file -> {
+            try {
+                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+                dbf.setNamespaceAware(true);
+                DocumentBuilder db = dbf.newDocumentBuilder();
+                Document document = db.parse(new File(xslFile));
+                DOMSource domSource = new DOMSource(document);
+                StreamSource streamSource = new StreamSource(new FileInputStream(xmlFile));
+
+                File streamResultFile = new File(USER_DIR + file);
+                StreamResult streamResult = new StreamResult(streamResultFile);
+
+                Transformer transformer = TransformerFactory.newInstance().newTransformer(domSource);
+                transformer.setOutputProperties(transformProperties);
+                transformer.transform(streamSource, streamResult);
+            } catch (SAXException | IOException | ParserConfigurationException
+                    | TransformerException ex) {
+                failUnexpected(ex);
+            }
+        });
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/TestDTM.java	2015-01-09 15:41:35.476115064 -0800
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import java.io.FilePermission;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareLinesWithGold;
+import static org.apache.qetest.dtm.QeDtmConst.GOLDEN_DIR;
+import static org.apache.qetest.dtm.QeDtmConst.TYPENAME;
+import static org.apache.qetest.dtm.QeDtmConst.generateDTM;
+import org.testng.annotations.Test;
+
+/**
+ * Loads an XML document from a file (or, if no filename is supplied,
+ * an internal string), then dumps its contents. Replaces the old
+ * version, which was specific to the ultra-compressed implementation.
+ * (Which, by the way, we probably ought to revisit as part of our ongoing
+ * speed/size performance evaluation.)
+ */
+public class TestDTM extends JAXPBaseTest { 
+    /**
+     * Create AxisIterator and walk CHILD axis. Dump every walked node and 
+     * compare with expected golden file.
+     * 
+     * @throws IOException if any I/O operation error.
+     */
+    @Test
+    public void test() throws IOException {
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+        String goldFile = GOLDEN_DIR + "DTM_testcase1.out";
+        
+        // Create dtm and generate initial context
+        DTM dtm = generateDTM();
+
+            // DTM -- which will always be true for a node obtained this way, but
+        // won't be true for "shared" DTMs used to hold XSLT variables
+        int rootNode = dtm.getDocument();
+        List<String> lines = new ArrayList<>();
+        lines.add("DOCUMENT PROPERTIES:");
+        lines.add("DocURI=\"" + dtm.getDocumentBaseURI() + "\" \"SystemID=\""
+                + dtm.getDocumentSystemIdentifier(rootNode) + "\"");
+        lines.add("StandAlone=\"" + dtm.getDocumentStandalone(rootNode)
+                + "\" DocVersion=\"" + dtm.getDocumentVersion(rootNode) + "\"");
+        lines.add("");
+        lines.add("DOCUMENT DATA:");
+            // Simple test: Recursively dump the DTM's content.
+        // We'll want to replace this with more serious examples
+        lines.add("DOCUMENT DATA:");
+
+        recursiveDumpNode(dtm, rootNode, lines);
+        setPermissions(new FilePermission(goldFile, "read"));
+        compareLinesWithGold(goldFile, lines);
+    }
+    
+    /**
+     * Format node info to a string list.
+     * @param dtm DTM instance.
+     * @param nodeHandle node handle that represent node will be dumped.
+     * @param indent a format indention.
+     * @return 
+     */
+    private List<String> getNodeInfo(DTM dtm, int nodeHandle, String indent) {
+        List<String> nodeLines = new ArrayList<>();
+        String value = dtm.getNodeValue(nodeHandle);
+        String vq = (value == null) ? "" : "\"";
+
+        // Skip outputing of text nodes. In most cases they clutter the output,
+        // besides I'm only interested in the elemental structure of the dtm.
+        nodeLines.add(indent + nodeHandle + ": " 
+                + TYPENAME[dtm.getNodeType(nodeHandle)] + " "
+                + dtm.getNodeNameX(nodeHandle) + " : "
+                + dtm.getNodeName(nodeHandle) + "\""
+                + " E-Type=" + dtm.getExpandedTypeID(nodeHandle)
+                + " Level=" + dtm.getLevel(nodeHandle) 
+                + " Value=" + vq + value + vq);
+
+        nodeLines.add(indent + "\tPrefix= " + "\"" + dtm.getPrefix(nodeHandle) + "\"" 
+                + " Name= " + "\"" + dtm.getLocalName(nodeHandle) + "\"" 
+                + " URI= " + "\"" + dtm.getNamespaceURI(nodeHandle) + "\"" 
+                + " Parent=" + dtm.getParent(nodeHandle) 
+                + " 1stChild=" + dtm.getFirstChild(nodeHandle) 
+                + " NextSib=" + dtm.getNextSibling(nodeHandle));
+        return nodeLines;
+    }
+    
+    /**
+     * Recursively access every children of the node. Dump every information of
+     * every node to given string list.
+     * @param dtm DTM instance.
+     * @param nodeHandle node handle that will be accessed.
+     * @param lines a string list that recursive accessed node information will
+     *              be dumped.
+     */
+    private void recursiveDumpNode(DTM dtm, int nodeHandle, List<String> lines) {
+        // ITERATE over siblings
+        while (DTM.NULL != nodeHandle) {
+            lines.addAll(getNodeInfo(dtm, nodeHandle, ""));
+
+            // List the namespaces, if any. Include only node's local 
+            // namespaces, not inherited
+            int kid = dtm.getFirstNamespaceNode(nodeHandle, false);
+            if (kid != DTM.NULL) {
+                lines.add("\tNAMESPACES:");
+                //builder.append("\n\tNAMESPACES:");
+                for (; kid != DTM.NULL; kid = dtm.getNextNamespaceNode(nodeHandle, kid, false)) {
+                    lines.addAll(getNodeInfo(dtm, kid, "\t"));
+                }
+            }
+
+            // List the attributes, if any
+            kid = dtm.getFirstAttribute(nodeHandle);
+            if (kid != DTM.NULL) {
+                lines.add("\tATTRIBUTES:");
+                for (; kid != DTM.NULL; kid = dtm.getNextSibling(kid)) {
+                    lines.addAll(getNodeInfo(dtm, kid, "\t"));
+                }
+            }
+
+            // Recurse into the children, if any
+            recursiveDumpNode(dtm, dtm.getFirstChild(nodeHandle), lines);
+            nodeHandle = dtm.getNextSibling(nodeHandle);
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/TestDTMIter.java	2015-01-09 15:41:35.738115473 -0800
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.Axis;
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import com.sun.org.apache.xml.internal.dtm.DTMAxisIterator;
+import java.io.IOException;
+import jaxp.library.JAXPBaseTest;
+import static org.apache.qetest.dtm.QeDtmConst.generateDTM;
+import static org.apache.qetest.dtm.QeDtmConst.getNodeName;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Test for Axis Iterator walking. 
+ */
+public class TestDTMIter extends JAXPBaseTest {
+    /**
+     * DTM instance.
+     */
+    private final DTM dtm;
+
+    /*
+     * Intiate by creating DTM instance and generate initial context.
+     * 
+     */
+    public TestDTMIter() {
+        dtm = generateDTM();
+    }
+    
+    /**
+     * A data provider that provide validation parameters and expected lines.
+     * 
+     * @return an two dimensional array that provide axis type and expected 
+     * lines.
+     */
+    @DataProvider
+    public Object[][] iterProvider() {
+        final Object[][] chkChild = new Object[][] {
+            { 65542, "COMMENT", "#comment", 3, " Default test document " },
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\"" },
+            { 65544, "ELEMENT", "A", 3, null },
+            { 65554, "ELEMENT", "Aa", 3, null },
+            { 65555, "ELEMENT", "Ab", 3, null },
+            { 65556, "ELEMENT", "Ac", 3, null },
+            { 65558, "ELEMENT", "Ad", 3, null }
+        };
+
+        final Object[][] chkParent = new Object[][]{
+            {65537, "ELEMENT", "Document", 2, null}
+        };
+
+        Object[][] chkSelf = new Object[][]{
+            {65558, "ELEMENT", "Ad", 3, null}
+        };
+
+        final Object[][] chkNamespace = new Object[][]{
+            {65538, "NAMESPACE", "xmlns:xml", 3, "http://www.w3.org/XML/1998/namespace"},
+            {65539, "NAMESPACE", "xmlns:d", 3, "www.d.com"},
+            {65559, "NAMESPACE", "xmlns:Ad", 4, "www.Ad.com"},
+            {65560, "NAMESPACE", "xmlns:y", 4, "www.y.com"},
+            {65561, "NAMESPACE", "xmlns:z", 4, "www.z.com"}
+        };
+
+        final Object[][] chkPreceding = new Object[][]{
+            { 65542, "COMMENT", "#comment", 3, " Default test document "},
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65545, "COMMENT", "#comment", 4, " A Subtree "},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65557, "ELEMENT", "Ac1", 4, null}
+        };
+
+        final Object[][] chkPrecedingsibling = new Object[][]{
+            {65542, "COMMENT", "#comment", 3, " Default test document "},
+            {65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            {65544, "ELEMENT", "A", 3, null},
+            {65554, "ELEMENT", "Aa", 3, null},
+            {65555, "ELEMENT", "Ab", 3, null},
+            {65556, "ELEMENT", "Ac", 3, null}
+        };
+
+        final Object[][] chkFollowing = new Object[][]{
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3,  null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65557, "ELEMENT", "Ac1", 4, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+            { 65562, "ELEMENT", "Ad1", 4, null}
+        };
+        
+        final Object[][] checkFollowingSibling = new Object[][]{
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+        };
+        
+        final Object[][] checkDescendant = new Object[][]{
+            {  65545, "COMMENT", "#comment", 4, " A Subtree "},
+            {  65546, "ELEMENT", "B", 4, null},
+            {  65547, "ELEMENT", "C", 5, null},
+            {  65548, "ELEMENT", "D", 6, null},
+            {  65549, "ELEMENT", "E", 7, null},
+            {  65550, "ELEMENT", "F", 8, null}
+        };
+        
+        final Object[][] checkDescendantSelf = new Object[][]{
+            {   65544, "ELEMENT", "A", 3, null},
+            {   65545, "COMMENT", "#comment", 4, " A Subtree "},
+            {   65546, "ELEMENT", "B", 4, null},
+            {   65547, "ELEMENT", "C", 5, null},
+            {   65548, "ELEMENT", "D", 6, null},
+            {   65549, "ELEMENT", "E", 7, null},
+            {   65550, "ELEMENT", "F", 8, null}
+        };
+        
+        final Object[][] checkAncestor = new Object[][]{
+            { 65536, "DOCUMENT", "#document", 1, null},
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null}
+        };
+ 
+        final Object[][] checkAncestorSelf = new Object[][]{
+            { 65536, "DOCUMENT", "#document", 1, null},
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65550, "ELEMENT", "F", 8, null}
+        };        
+        return new Object[][]{
+            {65537, Axis.CHILD, "Document", false, chkChild},
+            {65558, Axis.PARENT, "Ad", false, chkParent},
+            {65558, Axis.SELF, "Ad", false, chkSelf},
+            {65558, Axis.NAMESPACE, "Ad", false, chkNamespace},
+            {65558, Axis.PRECEDING, "Ad", true, chkPreceding},
+            {65558, Axis.PRECEDINGSIBLING, "Ad", true, chkPrecedingsibling},
+            {65558, Axis.FOLLOWING, "Ad", false, chkFollowing},
+            {65558, Axis.FOLLOWINGSIBLING, "Ad", false, checkFollowingSibling},
+            {65544, Axis.DESCENDANT, "A", false, checkDescendant},
+            {65544, Axis.DESCENDANTORSELF, "A", false, checkDescendantSelf} ,
+            {65550, Axis.ANCESTOR, "F", true, checkAncestor},
+            {65550, Axis.ANCESTORORSELF, "F", true, checkAncestorSelf}
+        };
+    }
+
+    /**
+     * Walk all kind of AxisIterator and checking API as expected.
+     *
+     * @param startNode node id to get AxisIterator.
+     * @param axisType Axis type.
+     * @param expectedName expected node name.
+     * @param reversable expected boolean value for checking if the AxisIterator
+     *        is revertible.
+     * @param expectedLines an two dimensional array that will be validate
+     *        traversal of AxisIterator
+     * @throws IOException if any I/O operation error.
+     */
+    @Test(dataProvider = "iterProvider")
+    public void test(int startNode, int axisType, String expectedName, 
+            boolean reversable, Object[][] expectedLines) throws IOException {
+        // This permission is special for the testing.
+        setPermissions(
+            new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+            new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+        
+        // Get a Iterator by given Axis type.
+        DTMAxisIterator iter = dtm.getAxisIterator(axisType);
+        iter.setStartNode(startNode);
+
+        // Print out info about the axis
+        assertEquals(dtm.getNodeName(startNode), expectedName);
+        assertEquals(iter.isReverse(), reversable);
+
+        // Iterate the axis and write node info to output file
+        int line = 0;
+        for (int itNode = iter.next(); DTM.NULL != itNode; 
+                itNode = iter.next(), line++) {
+            assertEquals(itNode, expectedLines[line][0]);
+            assertEquals(getNodeName(dtm, itNode), expectedLines[line][1]);
+            assertEquals(dtm.getNodeName(itNode), expectedLines[line][2]);
+            Integer expectedLevel = (Integer)expectedLines[line][3];
+            assertEquals(dtm.getLevel(itNode), expectedLevel.shortValue());
+            assertEquals(dtm.getNodeValue(itNode), expectedLines[line][4]);
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/TestDTMIterDeep.java	2015-01-09 15:41:35.998115878 -0800
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.Axis;
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import com.sun.org.apache.xml.internal.dtm.DTMAxisIterator;
+import java.io.FilePermission;
+import java.util.ArrayList;
+import java.util.List;
+import jaxp.library.JAXPBaseTest;
+import static org.apache.qetest.dtm.QeDtmConst.XML_DIR;
+import static org.apache.qetest.dtm.QeDtmConst.createDTM;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Basic API test for DTMAxisIterator. Iterator on different Axis type.
+ * 
+ */
+public class TestDTMIterDeep extends JAXPBaseTest {
+    /**
+     * Iterator on different Axis type.
+     * 
+     * @param axisType axis type.
+     * @param expectedLastNode expected last node we will validate.
+     * @param expectedTotal expected total node number we will validate. 
+     */
+    @Test(dataProvider = "axisProvider")
+    public void test(int axisType, int expectedLastNode, int expectedTotal) {
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"),
+                new FilePermission(System.getProperty("test.src") + "/-", "read"));
+        String deepFile = XML_DIR + "xtestdata/elem10kdeep.xml";
+        List<String> lines = new ArrayList<>();
+        lines.add("Axis is " + Axis.getNames(axisType).toUpperCase());
+        DTM dtm = createDTM(0, deepFile, lines);
+
+        // Get various nodes to use as context nodes.
+        int DNode = dtm.getFirstChild(dtm.getDocument());
+        assertEquals(dtm.getNodeName(dtm.getFirstChild(DNode)), "e1");
+
+        // Get an iterator for Descendant:: axis.
+        DTMAxisIterator iter = dtm.getAxisIterator(axisType);
+        iter.setStartNode(DNode);
+        int lastNode = 0;
+        int numOfNodes = 0;
+        for (int atNode = iter.next(); DTM.NULL != atNode; atNode = iter.next()) {
+            lastNode = atNode;
+            numOfNodes = numOfNodes + 1;  // Need to know that we Iterated the whole tree
+        }
+        assertEquals(lastNode, expectedLastNode);
+        assertEquals(numOfNodes, expectedTotal);
+    }
+
+    /**
+     * Axis types for testing.
+     * @return an array contains axis type and its expected number.
+     */
+    @DataProvider
+    public Object[][] axisProvider(){
+        return new Object[][]{
+            {Axis.DESCENDANT, 75538, 10000},
+            {Axis.DESCENDANTORSELF, 75538, 10001},
+            {Axis.ANCESTOR, 65536, 1},
+            {Axis.ANCESTORORSELF, 65537, 2},
+        };
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/TestDTMIterator.java	2015-01-09 15:41:36.259116285 -0800
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.Axis;
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import com.sun.org.apache.xml.internal.dtm.DTMAxisIterator;
+import com.sun.org.apache.xml.internal.dtm.DTMManager;
+import com.sun.org.apache.xml.internal.dtm.DTMWSFilter;
+import com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault;
+import com.sun.org.apache.xpath.internal.objects.XMLStringFactoryImpl;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.apache.qetest.dtm.QeDtmConst.GOLDEN_DIR;
+import static org.apache.qetest.dtm.QeDtmConst.TYPENAME;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Loads an XML document from a file (or, if no filename is supplied,
+ * an internal string), then dumps its contents. Replaces the old
+ * version, which was specific to the ultra-compressed implementation.
+ */
+public class TestDTMIterator extends JAXPFileBaseTest {
+    /**
+     * Test DTMIterator on a well-formed XML string. Checking on expected output.
+     * @throws IOException if any error on File I/O operation.
+     */
+    @Test
+    public void test() throws IOException { 
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+        String goldFile  = GOLDEN_DIR + "TestDTMIterator.out";
+        
+        String defaultSource = "<?xml version=\"1.0\"?>\n"
+                + "<Document xmlns:d=\"www.d.com\" a1=\"hello\" a2=\"goodbye\">"
+                + "<!-- Default test document -->"
+                + "<?api a1=\"yes\" a2=\"no\"?>"
+                + "<A><!-- A Subtree --><B><C><D><E>"
+                + "<F xmlns:f=\"www.f.com\" a1=\"down\" a2=\"up\"/>"
+                + "</E></D></C></B></A>"
+                + "<Aa/><Ab/><Ac><Ac1/></Ac>"
+                + "<Ad xmlns:Ad=\"www.Ad.com\" xmlns:y=\"www.y.com\" xmlns:z=\"www.z.com\">"
+                + "<Ad1/></Ad>"
+                + "</Document>";
+
+        try(StringReader sw = new StringReader(defaultSource)) {
+            Source source = new StreamSource(sw);
+
+                // Get a DTM manager, and ask it to load the DTM "uniquely",
+            // with no whitespace filtering, nonincremental, but _with_
+            // indexing (a fairly common case, and avoids the special
+            // mode used for RTF DTMs).
+            // For testing with some of David Marston's files I do want to strip whitespace.
+            DTMManager manager = DTMManagerDefault.newInstance(new XMLStringFactoryImpl());
+            DTM dtm = manager.getDTM(source, true, (e, d) -> DTMWSFilter.STRIP, false, true);
+
+            // Get various nodes to use as context nodes.
+            int dtmRoot = dtm.getDocument();                  // #document
+            int DNode = dtm.getFirstChild(dtmRoot);           // <Document>
+            int CNode = dtm.getFirstChild(DNode);             // <Comment>
+            int PINode = dtm.getNextSibling(CNode);           // <PI>
+            int ANode = dtm.getNextSibling(PINode);           // <A>
+            int lastNode = 0;
+
+            // Get a Iterator for CHILD:: axis.
+            DTMAxisIterator iter = dtm.getAxisIterator(Axis.CHILD);
+            iter.setStartNode(DNode);
+
+            String outputFile = getNextFile(this.getClass());
+
+            try(PrintWriter pw = new PrintWriter(outputFile)) {
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                    lastNode = itNode;
+                }
+
+                // Get iterator for PARENT:: Axis
+                iter = dtm.getAxisIterator(Axis.PARENT);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for SELF:: Axis
+                iter = dtm.getAxisIterator(Axis.SELF);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for NAMESPACE:: Axis
+                iter = dtm.getAxisIterator(Axis.NAMESPACE);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for PRECEDING:: Axis
+                iter = dtm.getAxisIterator(Axis.PRECEDING);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for PRECEDINGSIBLING:: Axis
+                iter = dtm.getAxisIterator(Axis.PRECEDINGSIBLING);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for FOLLOWING:: Axis
+                iter = dtm.getAxisIterator(Axis.FOLLOWING);
+                iter.setStartNode(ANode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for FOLLOWINGSIBLING:: Axis
+                iter = dtm.getAxisIterator(Axis.FOLLOWINGSIBLING);
+                iter.setStartNode(ANode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get a iterator for  DESCENDANT:: axis.
+                iter = dtm.getAxisIterator(Axis.DESCENDANT);
+                iter.setStartNode(ANode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                    lastNode = itNode;
+                }
+
+                // Get iterator for DESCENDANTORSELF:: Axis
+                iter = dtm.getAxisIterator(Axis.DESCENDANTORSELF);
+                iter.setStartNode(ANode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                    lastNode = itNode;
+                }
+
+                    // The output from Ancestor and Ancestor-or-self is the topic
+                // of Bugzilla 7886
+                // Get iterator for ANCESTOR:: Axis
+                iter = dtm.getAxisIterator(Axis.ANCESTOR);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+
+                // Get iterator for ANCESTORORSELF:: Axis
+                iter = dtm.getAxisIterator(Axis.ANCESTORORSELF);
+                iter.setStartNode(lastNode);
+
+                // Iterate the axis and print out node info.
+                for (int itNode = iter.next(); DTM.NULL != itNode;
+                        itNode = iter.next()) {
+                    printNode(dtm, itNode, " ", pw);
+                }
+            }
+            assertTrue(compareWithGold(goldFile, outputFile));
+        }   
+    }
+
+    /**
+     * Print a node info by given node handle.
+     * @param dtm DTM instance.
+     * @param nodeHandle node handle.
+     * @param indent a format indention.
+     */
+    private void printNode(DTM dtm, int nodeHandle, String indent, PrintWriter pw) {
+        // Briefly display this node
+        // Don't bother displaying namespaces or attrs; we do that at the
+        // next level up.
+        // %REVIEW% Add namespace info, type info, ...
+
+        // Formatting hack -- suppress quotes when value is null, to distinguish
+        // it from "null".
+        String value = dtm.getNodeValue(nodeHandle);
+        String vq = (value == null) ? "" : "\"";
+
+        // Skip outputing of text nodes. In most cases they clutter the output,
+        // besides I'm only interested in the elemental structure of the dtm.
+        if (!"TEXT".equals(TYPENAME[dtm.getNodeType(nodeHandle)])) {
+            pw.println(indent
+                    + +nodeHandle + ": "
+                    + TYPENAME[dtm.getNodeType(nodeHandle)] + " "
+                    + dtm.getNodeName(nodeHandle) + " "
+                    + " Level=" + dtm.getLevel(nodeHandle) + " "
+                    + "\tValue=" + vq + value + vq
+            );
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/TestDTMTrav.java	2015-01-09 15:41:36.535116716 -0800
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.Axis;
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import com.sun.org.apache.xml.internal.dtm.DTMAxisTraverser;
+import java.io.IOException;
+import jaxp.library.JAXPBaseTest;
+import static org.apache.qetest.dtm.QeDtmConst.generateDTM;
+import static org.apache.qetest.dtm.QeDtmConst.getNodeName;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Test for Axis Traverser walking. 
+ */
+public class TestDTMTrav extends JAXPBaseTest {
+    /**
+     * DTM instance.
+     */
+    private final DTM dtm;
+
+    /*
+     * Intiate by creating DTM instance and generate initial context.
+     * 
+     */
+    public TestDTMTrav() {
+        dtm = generateDTM();
+    }
+    
+    /**
+     * A provider that provides validation parameters and expected lines.
+     * 
+     * @return an two dimensional array that provide axis type and expected 
+     * lines.
+     */
+    @DataProvider
+    public Object[][] travProvider(){
+        final Object[][] chkChild = new Object[][] {
+            { 65542, "COMMENT", "#comment", 3, " Default test document " },
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\"" },
+            { 65544, "ELEMENT", "A", 3, null },
+            { 65554, "ELEMENT", "Aa", 3, null },
+            { 65555, "ELEMENT", "Ab", 3, null },
+            { 65556, "ELEMENT", "Ac", 3, null },
+            { 65558, "ELEMENT", "Ad", 3, null }
+        };
+
+        final Object[][] chkParent = new Object[][]{
+            {65537, "ELEMENT", "Document", 2, null}
+        };
+
+        Object[][] chkSelf = new Object[][]{
+            {65558, "ELEMENT", "Ad", 3, null}
+        };
+
+        final Object[][] chkNamespace = new Object[][]{
+            {65538, "NAMESPACE", "xmlns:xml", 3, "http://www.w3.org/XML/1998/namespace"},
+            {65539, "NAMESPACE", "xmlns:d", 3, "www.d.com"},
+            {65559, "NAMESPACE", "xmlns:Ad", 4, "www.Ad.com"},
+            {65560, "NAMESPACE", "xmlns:y", 4, "www.y.com"},
+            {65561, "NAMESPACE", "xmlns:z", 4, "www.z.com"}
+        };
+
+        final Object[][] chkNamespaceDecls = new Object[][]{
+            {65559, "NAMESPACE", "xmlns:Ad", 4, "www.Ad.com"},
+            {65560, "NAMESPACE", "xmlns:y", 4, "www.y.com"},
+            {65561, "NAMESPACE", "xmlns:z", 4, "www.z.com"}
+        };
+
+        final Object[][] chkPreceding = new Object[][]{
+            { 65557, "ELEMENT", "Ac1", 4, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65545, "COMMENT", "#comment", 4, " A Subtree "},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            { 65542, "COMMENT", "#comment", 3, " Default test document "},
+        };
+
+        final Object[][] chkPrecedingsibling = new Object[][]{
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65555, "ELEMENT", "Ab", 3,  null},
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            { 65542, "COMMENT", "#comment", 3, " Default test document "}
+        };
+
+        final Object[][] chkFollowing = new Object[][]{
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3,  null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65557, "ELEMENT", "Ac1", 4, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+            { 65562, "ELEMENT", "Ad1", 4, null}
+        };
+        
+        final Object[][] checkFollowingSibling = new Object[][]{
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+        };
+        
+        final Object[][] checkDescendant = new Object[][]{
+            {  65545, "COMMENT", "#comment", 4, " A Subtree "},
+            {  65546, "ELEMENT", "B", 4, null},
+            {  65547, "ELEMENT", "C", 5, null},
+            {  65548, "ELEMENT", "D", 6, null},
+            {  65549, "ELEMENT", "E", 7, null},
+            {  65550, "ELEMENT", "F", 8, null}
+        };
+        
+        final Object[][] checkDescendantSelf = new Object[][]{
+            {   65544, "ELEMENT", "A", 3, null},
+            {   65545, "COMMENT", "#comment", 4, " A Subtree "},
+            {   65546, "ELEMENT", "B", 4, null},
+            {   65547, "ELEMENT", "C", 5, null},
+            {   65548, "ELEMENT", "D", 6, null},
+            {   65549, "ELEMENT", "E", 7, null},
+            {   65550, "ELEMENT", "F", 8, null}
+        };
+        
+        final Object[][] checkAncestor = new Object[][]{
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65536, "DOCUMENT", "#document", 1, null},
+        };
+ 
+        final Object[][] checkAncestorSelf = new Object[][]{
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65536, "DOCUMENT", "#document", 1, null}
+        }; 
+        
+        final Object[][] checkAllFromNode = new Object[][]{
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65551, "NAMESPACE", "xmlns:f", 9, "www.f.com"},
+            { 65552, "ATTRIBUTE", "a1", 9, "down"},
+            { 65553, "ATTRIBUTE", "a2", 9, "up"}
+        }; 
+        
+        final Object[][] checkAttribute = new Object[][]{
+            { 65540, "ATTRIBUTE", "a1", 3, "hello"},
+            { 65541, "ATTRIBUTE", "a2", 3, "goodbye"}
+        };
+        
+        final Object[][] checkAll = new Object[][]{
+            { 65536, "DOCUMENT", "#document", 1, null},
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65538, "NAMESPACE", "xmlns:xml", 3, "http://www.w3.org/XML/1998/namespace"},
+            { 65539, "NAMESPACE", "xmlns:d", 3, "www.d.com"},
+            { 65540, "ATTRIBUTE", "a1", 3, "hello"},
+            { 65541, "ATTRIBUTE", "a2", 3, "goodbye"},
+            { 65542, "COMMENT", "#comment", 3, " Default test document "},
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65545, "COMMENT", "#comment", 4, " A Subtree "},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65551, "NAMESPACE", "xmlns:f", 9, "www.f.com"},
+            { 65552, "ATTRIBUTE", "a1", 9, "down"},
+            { 65553, "ATTRIBUTE", "a2", 9, "up"},
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65557, "ELEMENT", "Ac1", 4, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+            { 65559, "NAMESPACE", "xmlns:Ad", 4, "www.Ad.com"},
+            { 65560, "NAMESPACE", "xmlns:y", 4, "www.y.com"},
+            { 65561, "NAMESPACE", "xmlns:z", 4, "www.z.com"},
+            { 65562, "ELEMENT", "Ad1", 4, null}
+        };
+
+        final Object[][] checkDescentsFromRoot = new Object[][]{
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65542, "COMMENT", "#comment", 3, " Default test document "},
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65545, "COMMENT", "#comment", 4, " A Subtree "},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65557, "ELEMENT", "Ac1", 4, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+            { 65562, "ELEMENT", "Ad1", 4, null}
+        };
+        
+        final Object[][] checkDescentsOrSelfFromRoot = new Object[][]{
+            { 65536, "DOCUMENT", "#document", 1, null},
+            { 65537, "ELEMENT", "Document", 2, null},
+            { 65542, "COMMENT", "#comment", 3, " Default test document "},
+            { 65543, "PROCESSING_INSTRUCTION", "api", 3, "a1=\"yes\" a2=\"no\""},
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65545, "COMMENT", "#comment", 4, " A Subtree "},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65554, "ELEMENT", "Aa", 3, null},
+            { 65555, "ELEMENT", "Ab", 3, null},
+            { 65556, "ELEMENT", "Ac", 3, null},
+            { 65557, "ELEMENT", "Ac1", 4, null},
+            { 65558, "ELEMENT", "Ad", 3, null},
+            { 65562, "ELEMENT", "Ad1", 4, null}
+        };
+        
+        final Object[][] checkANodeAll = new Object[][]{
+            { 65544, "ELEMENT", "A", 3, null},
+            { 65545, "COMMENT", "#comment", 4, " A Subtree "},
+            { 65546, "ELEMENT", "B", 4, null},
+            { 65547, "ELEMENT", "C", 5, null},
+            { 65548, "ELEMENT", "D", 6, null},
+            { 65549, "ELEMENT", "E", 7, null},
+            { 65550, "ELEMENT", "F", 8, null},
+            { 65551, "NAMESPACE", "xmlns:f", 9, "www.f.com"},
+            { 65552, "ATTRIBUTE", "a1", 9, "down"},
+            { 65553, "ATTRIBUTE", "a2", 9, "up"}
+        };
+        
+        final Object[][] checkCNodeAll = new Object[][]{
+            { 65542, "COMMENT", "#comment", 3, " Default test document "}
+        };
+    
+        return new Object[][]{
+            {65537, Axis.CHILD, "Document", chkChild},
+            {65558, Axis.PARENT, "Ad", chkParent},
+            {65558, Axis.SELF, "Ad", chkSelf},
+            {65558, Axis.NAMESPACE, "Ad", chkNamespace},
+            {65558, Axis.NAMESPACEDECLS, "Ad", chkNamespaceDecls},
+            {65558, Axis.PRECEDING, "Ad", chkPreceding},
+            {65558, Axis.PRECEDINGSIBLING, "Ad", chkPrecedingsibling},
+            {65558, Axis.FOLLOWING, "Ad", chkFollowing},
+            {65558, Axis.FOLLOWINGSIBLING, "Ad", checkFollowingSibling},
+            {65544, Axis.DESCENDANT, "A", checkDescendant},
+            {65544, Axis.DESCENDANTORSELF, "A", checkDescendantSelf},
+            {65550, Axis.ANCESTOR, "F", checkAncestor},
+            {65550, Axis.ANCESTORORSELF, "F", checkAncestorSelf},
+            {65550, Axis.ALLFROMNODE, "F", checkAllFromNode},
+            {65537, Axis.ATTRIBUTE, "Document", checkAttribute},
+            {65550, Axis.ALL, "F", checkAll},   
+            {65550, Axis.DESCENDANTSFROMROOT, "F", checkDescentsFromRoot},
+            {65550, Axis.DESCENDANTSORSELFFROMROOT, "F", checkDescentsOrSelfFromRoot},
+            {65544, Axis.ALLFROMNODE, "A", checkANodeAll},
+            {65542, Axis.ALLFROMNODE, "#comment", checkCNodeAll}
+        };
+    }
+
+    /**
+     * Walk all kind of AxisTraversers and checking API as expected..
+     *
+     * @param startNode node id to get AxisTraverser.
+     * @param axisType Axis type.
+     * @param expectedName expected node name.
+     * @param expectedLines an two dimensional array that will be validate
+     *        traversal of AxisTraverser
+     * @throws IOException if any I/O operation error.
+     */
+    @Test(dataProvider = "travProvider")
+    public void test(int startNode, int axisType, String expectedName, 
+            Object[][] expectedLines) throws IOException {
+        // This permission is special for the testing.
+        setPermissions(
+            new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+            new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+
+        // Get a Traverser by given axis type.
+        assertEquals(dtm.getNodeName(startNode), expectedName);
+        DTMAxisTraverser at = dtm.getAxisTraverser(axisType);
+
+        int line = 0;
+        // Traverse the axis and validate API output.
+        for (int travNode = at.first(startNode); DTM.NULL != travNode;
+                travNode = at.next(startNode, travNode), line++) {
+            assertEquals(travNode, expectedLines[line][0]);
+            assertEquals(getNodeName(dtm, travNode), expectedLines[line][1]);
+            assertEquals(dtm.getNodeName(travNode), expectedLines[line][2]);
+            Integer expectedLevel = (Integer)expectedLines[line][3];
+            assertEquals(dtm.getLevel(travNode), expectedLevel.shortValue());
+            assertEquals(dtm.getNodeValue(travNode), expectedLines[line][4]);
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/TestDTMTravDeep.java	2015-01-09 15:41:36.830117176 -0800
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.Axis;
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import com.sun.org.apache.xml.internal.dtm.DTMAxisTraverser;
+import java.io.FilePermission;
+import java.util.ArrayList;
+import java.util.List;
+import jaxp.library.JAXPBaseTest;
+import static org.apache.qetest.dtm.QeDtmConst.XML_DIR;
+import static org.apache.qetest.dtm.QeDtmConst.createDTM;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Basic API test for DTMAxisTraverser. Traverser on different Axis type.
+ * 
+ */
+public class TestDTMTravDeep extends JAXPBaseTest {
+    /**
+     * Traverser on different Axis type.
+     * @param axisType axis type.
+     * @param expectedLastNode expected last node we will validate.
+     * @param expectedTotal expected total node number we will validate. 
+     */
+    @Test(dataProvider = "axisProvider")
+    public void test(int axisType, int expectedLastNode, int expectedTotal) {
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"),
+                new FilePermission(System.getProperty("test.src") + "/-", "read"));
+        String deepFile = XML_DIR + "xtestdata/elem10kdeep.xml";
+        
+        List<String> lines = new ArrayList<>();
+        lines.add("Axis is  " + Axis.getNames(axisType).toUpperCase());
+        DTM dtm = createDTM(0, deepFile, lines);
+        // Get various nodes to use as context nodes.
+        int dtmRoot = dtm.getDocument();        // #document                                                  
+        int DNode = dtm.getFirstChild(dtmRoot); // <Doc>
+        // returns Traversal time, last node, number of nodes traversed
+        assertEquals(dtm.getNodeName(dtm.getFirstChild(DNode)), "e1");
+        
+        // Get a iterator for Descendant:: axis.
+        DTMAxisTraverser trav = dtm.getAxisTraverser(Axis.DESCENDANT);
+        int lastNode = 0;
+        int numOfNodes = 0;
+        for (int atNode = trav.first(axisType); DTM.NULL != atNode;
+                atNode = trav.next(DNode, axisType)) {
+            lastNode = atNode;
+            numOfNodes = numOfNodes + 1; 
+        }
+        assertEquals(lastNode, expectedLastNode);
+        assertEquals(numOfNodes, expectedTotal);
+    }
+    
+    /**
+     * Axis types for testing.
+     * @return an array contains axis type and its expected number.
+     */
+    @DataProvider
+    public Object[][] axisProvider(){
+        return new Object[][]{
+            { Axis.DESCENDANT, 65536, 1},
+            { Axis.DESCENDANTORSELF, 65536, 1},
+            { Axis.ANCESTOR, 65536, 1},
+            { Axis.ANCESTORORSELF, 65536, 1},
+        };
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/content/xtestdata/elem10kdeep.xml	2015-01-09 15:41:37.135117651 -0800
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc><e1><e2><e3><e4><e5><e6><e7><e8><e9><e10><e11><e12><e13><e14><e15><e16><e17><e18><e19><e20><e21><e22><e23><e24><e25><e26><e27><e28><e29><e30><e31><e32><e33><e34><e35><e36><e37><e38><e39><e40><e41><e42><e43><e44><e45><e46><e47><e48><e49><e50><e51><e52><e53><e54><e55><e56><e57><e58><e59><e60><e61><e62><e63><e64><e65><e66><e67><e68><e69><e70><e71><e72><e73><e74><e75><e76><e77><e78><e79><e80><e81><e82><e83><e84><e85><e86><e87><e88><e89><e90><e91><e92><e93><e94><e95><e96><e97><e98><e99><e100><e101><e102><e103><e104><e105><e106><e107><e108><e109><e110><e111><e112><e113><e114><e115><e116><e117><e118><e119><e120><e121><e122><e123><e124><e125><e126><e127><e128><e129><e130><e131><e132><e133><e134><e135><e136><e137><e138><e139><e140><e141><e142><e143><e144><e145><e146><e147><e148><e149><e150><e151><e152><e153><e154><e155><e156><e157><e158><e159><e160><e161><e162><e163><e164><e165><e166><e167><e168><e169><e170><e171><e172><e173><e174><e175><e176><e177><e178><e179><e180><e181><e182><e183><e184><e185><e186><e187><e188><e189><e190><e191><e192><e193><e194><e195><e196><e197><e198><e199><e200><e201><e202><e203><e204><e205><e206><e207><e208><e209><e210><e211><e212><e213><e214><e215><e216><e217><e218><e219><e220><e221><e222><e223><e224><e225><e226><e227><e228><e229><e230><e231><e232><e233><e234><e235><e236><e237><e238><e239><e240><e241><e242><e243><e244><e245><e246><e247><e248><e249><e250><e251><e252><e253><e254><e255><e256><e257><e258><e259><e260><e261><e262><e263><e264><e265><e266><e267><e268><e269><e270><e271><e272><e273><e274><e275><e276><e277><e278><e279><e280><e281><e282><e283><e284><e285><e286><e287><e288><e289><e290><e291><e292><e293><e294><e295><e296><e297><e298><e299><e300><e301><e302><e303><e304><e305><e306><e307><e308><e309><e310><e311><e312><e313><e314><e315><e316><e317><e318><e319><e320><e321><e322><e323><e324><e325><e326><e327><e328><e329><e330><e331><e332><e333><e334><e335><e336><e337><e338><e339><e340><e341><e342><e343><e344><e345><e346><e347><e348><e349><e350><e351><e352><e353><e354><e355><e356><e357><e358><e359><e360><e361><e362><e363><e364><e365><e366><e367><e368><e369><e370><e371><e372><e373><e374><e375><e376><e377><e378><e379><e380><e381><e382><e383><e384><e385><e386><e387><e388><e389><e390><e391><e392><e393><e394><e395><e396><e397><e398><e399><e400><e401><e402><e403><e404><e405><e406><e407><e408><e409><e410><e411><e412><e413><e414><e415><e416><e417><e418><e419><e420><e421><e422><e423><e424><e425><e426><e427><e428><e429><e430><e431><e432><e433><e434><e435><e436><e437><e438><e439><e440><e441><e442><e443><e444><e445><e446><e447><e448><e449><e450><e451><e452><e453><e454><e455><e456><e457><e458><e459><e460><e461><e462><e463><e464><e465><e466><e467><e468><e469><e470><e471><e472><e473><e474><e475><e476><e477><e478><e479><e480><e481><e482><e483><e484><e485><e486><e487><e488><e489><e490><e491><e492><e493><e494><e495><e496><e497><e498><e499><e500><e501><e502><e503><e504><e505><e506><e507><e508><e509><e510><e511><e512><e513><e514><e515><e516><e517><e518><e519><e520><e521><e522><e523><e524><e525><e526><e527><e528><e529><e530><e531><e532><e533><e534><e535><e536><e537><e538><e539><e540><e541><e542><e543><e544><e545><e546><e547><e548><e549><e550><e551><e552><e553><e554><e555><e556><e557><e558><e559><e560><e561><e562><e563><e564><e565><e566><e567><e568><e569><e570><e571><e572><e573><e574><e575><e576><e577><e578><e579><e580><e581><e582><e583><e584><e585><e586><e587><e588><e589><e590><e591><e592><e593><e594><e595><e596><e597><e598><e599><e600><e601><e602><e603><e604><e605><e606><e607><e608><e609><e610><e611><e612><e613><e614><e615><e616><e617><e618><e619><e620><e621><e622><e623><e624><e625><e626><e627><e628><e629><e630><e631><e632><e633><e634><e635><e636><e637><e638><e639><e640><e641><e642><e643><e644><e645><e646><e647><e648><e649><e650><e651><e652><e653><e654><e655><e656><e657><e658><e659><e660><e661><e662><e663><e664><e665><e666><e667><e668><e669><e670><e671><e672><e673><e674><e675><e676><e677><e678><e679><e680><e681><e682><e683><e684><e685><e686><e687><e688><e689><e690><e691><e692><e693><e694><e695><e696><e697><e698><e699><e700><e701><e702><e703><e704><e705><e706><e707><e708><e709><e710><e711><e712><e713><e714><e715><e716><e717><e718><e719><e720><e721><e722><e723><e724><e725><e726><e727><e728><e729><e730><e731><e732><e733><e734><e735><e736><e737><e738><e739><e740><e741><e742><e743><e744><e745><e746><e747><e748><e749><e750><e751><e752><e753><e754><e755><e756><e757><e758><e759><e760><e761><e762><e763><e764><e765><e766><e767><e768><e769><e770><e771><e772><e773><e774><e775><e776><e777><e778><e779><e780><e781><e782><e783><e784><e785><e786><e787><e788><e789><e790><e791><e792><e793><e794><e795><e796><e797><e798><e799><e800><e801><e802><e803><e804><e805><e806><e807><e808><e809><e810><e811><e812><e813><e814><e815><e816><e817><e818><e819><e820><e821><e822><e823><e824><e825><e826><e827><e828><e829><e830><e831><e832><e833><e834><e835><e836><e837><e838><e839><e840><e841><e842><e843><e844><e845><e846><e847><e848><e849><e850><e851><e852><e853><e854><e855><e856><e857><e858><e859><e860><e861><e862><e863><e864><e865><e866><e867><e868><e869><e870><e871><e872><e873><e874><e875><e876><e877><e878><e879><e880><e881><e882><e883><e884><e885><e886><e887><e888><e889><e890><e891><e892><e893><e894><e895><e896><e897><e898><e899><e900><e901><e902><e903><e904><e905><e906><e907><e908><e909><e910><e911><e912><e913><e914><e915><e916><e917><e918><e919><e920><e921><e922><e923><e924><e925><e926><e927><e928><e929><e930><e931><e932><e933><e934><e935><e936><e937><e938><e939><e940><e941><e942><e943><e944><e945><e946><e947><e948><e949><e950><e951><e952><e953><e954><e955><e956><e957><e958><e959><e960><e961><e962><e963><e964><e965><e966><e967><e968><e969><e970><e971><e972><e973><e974><e975><e976><e977><e978><e979><e980><e981><e982><e983><e984><e985><e986><e987><e988><e989><e990><e991><e992><e993><e994><e995><e996><e997><e998><e999><e1000><e1001><e1002><e1003><e1004><e1005><e1006><e1007><e1008><e1009><e1010><e1011><e1012><e1013><e1014><e1015><e1016><e1017><e1018><e1019><e1020><e1021><e1022><e1023><e1024><e1025><e1026><e1027><e1028><e1029><e1030><e1031><e1032><e1033><e1034><e1035><e1036><e1037><e1038><e1039><e1040><e1041><e1042><e1043><e1044><e1045><e1046><e1047><e1048><e1049><e1050><e1051><e1052><e1053><e1054><e1055><e1056><e1057><e1058><e1059><e1060><e1061><e1062><e1063><e1064><e1065><e1066><e1067><e1068><e1069><e1070><e1071><e1072><e1073><e1074><e1075><e1076><e1077><e1078><e1079><e1080><e1081><e1082><e1083><e1084><e1085><e1086><e1087><e1088><e1089><e1090><e1091><e1092><e1093><e1094><e1095><e1096><e1097><e1098><e1099><e1100><e1101><e1102><e1103><e1104><e1105><e1106><e1107><e1108><e1109><e1110><e1111><e1112><e1113><e1114><e1115><e1116><e1117><e1118><e1119><e1120><e1121><e1122><e1123><e1124><e1125><e1126><e1127><e1128><e1129><e1130><e1131><e1132><e1133><e1134><e1135><e1136><e1137><e1138><e1139><e1140><e1141><e1142><e1143><e1144><e1145><e1146><e1147><e1148><e1149><e1150><e1151><e1152><e1153><e1154><e1155><e1156><e1157><e1158><e1159><e1160><e1161><e1162><e1163><e1164><e1165><e1166><e1167><e1168><e1169><e1170><e1171><e1172><e1173><e1174><e1175><e1176><e1177><e1178><e1179><e1180><e1181><e1182><e1183><e1184><e1185><e1186><e1187><e1188><e1189><e1190><e1191><e1192><e1193><e1194><e1195><e1196><e1197><e1198><e1199><e1200><e1201><e1202><e1203><e1204><e1205><e1206><e1207><e1208><e1209><e1210><e1211><e1212><e1213><e1214><e1215><e1216><e1217><e1218><e1219><e1220><e1221><e1222><e1223><e1224><e1225><e1226><e1227><e1228><e1229><e1230><e1231><e1232><e1233><e1234><e1235><e1236><e1237><e1238><e1239><e1240><e1241><e1242><e1243><e1244><e1245><e1246><e1247><e1248><e1249><e1250><e1251><e1252><e1253><e1254><e1255><e1256><e1257><e1258><e1259><e1260><e1261><e1262><e1263><e1264><e1265><e1266><e1267><e1268><e1269><e1270><e1271><e1272><e1273><e1274><e1275><e1276><e1277><e1278><e1279><e1280><e1281><e1282><e1283><e1284><e1285><e1286><e1287><e1288><e1289><e1290><e1291><e1292><e1293><e1294><e1295><e1296><e1297><e1298><e1299><e1300><e1301><e1302><e1303><e1304><e1305><e1306><e1307><e1308><e1309><e1310><e1311><e1312><e1313><e1314><e1315><e1316><e1317><e1318><e1319><e1320><e1321><e1322><e1323><e1324><e1325><e1326><e1327><e1328><e1329><e1330><e1331><e1332><e1333><e1334><e1335><e1336><e1337><e1338><e1339><e1340><e1341><e1342><e1343><e1344><e1345><e1346><e1347><e1348><e1349><e1350><e1351><e1352><e1353><e1354><e1355><e1356><e1357><e1358><e1359><e1360><e1361><e1362><e1363><e1364><e1365><e1366><e1367><e1368><e1369><e1370><e1371><e1372><e1373><e1374><e1375><e1376><e1377><e1378><e1379><e1380><e1381><e1382><e1383><e1384><e1385><e1386><e1387><e1388><e1389><e1390><e1391><e1392><e1393><e1394><e1395><e1396><e1397><e1398><e1399><e1400><e1401><e1402><e1403><e1404><e1405><e1406><e1407><e1408><e1409><e1410><e1411><e1412><e1413><e1414><e1415><e1416><e1417><e1418><e1419><e1420><e1421><e1422><e1423><e1424><e1425><e1426><e1427><e1428><e1429><e1430><e1431><e1432><e1433><e1434><e1435><e1436><e1437><e1438><e1439><e1440><e1441><e1442><e1443><e1444><e1445><e1446><e1447><e1448><e1449><e1450><e1451><e1452><e1453><e1454><e1455><e1456><e1457><e1458><e1459><e1460><e1461><e1462><e1463><e1464><e1465><e1466><e1467><e1468><e1469><e1470><e1471><e1472><e1473><e1474><e1475><e1476><e1477><e1478><e1479><e1480><e1481><e1482><e1483><e1484><e1485><e1486><e1487><e1488><e1489><e1490><e1491><e1492><e1493><e1494><e1495><e1496><e1497><e1498><e1499><e1500><e1501><e1502><e1503><e1504><e1505><e1506><e1507><e1508><e1509><e1510><e1511><e1512><e1513><e1514><e1515><e1516><e1517><e1518><e1519><e1520><e1521><e1522><e1523><e1524><e1525><e1526><e1527><e1528><e1529><e1530><e1531><e1532><e1533><e1534><e1535><e1536><e1537><e1538><e1539><e1540><e1541><e1542><e1543><e1544><e1545><e1546><e1547><e1548><e1549><e1550><e1551><e1552><e1553><e1554><e1555><e1556><e1557><e1558><e1559><e1560><e1561><e1562><e1563><e1564><e1565><e1566><e1567><e1568><e1569><e1570><e1571><e1572><e1573><e1574><e1575><e1576><e1577><e1578><e1579><e1580><e1581><e1582><e1583><e1584><e1585><e1586><e1587><e1588><e1589><e1590><e1591><e1592><e1593><e1594><e1595><e1596><e1597><e1598><e1599><e1600><e1601><e1602><e1603><e1604><e1605><e1606><e1607><e1608><e1609><e1610><e1611><e1612><e1613><e1614><e1615><e1616><e1617><e1618><e1619><e1620><e1621><e1622><e1623><e1624><e1625><e1626><e1627><e1628><e1629><e1630><e1631><e1632><e1633><e1634><e1635><e1636><e1637><e1638><e1639><e1640><e1641><e1642><e1643><e1644><e1645><e1646><e1647><e1648><e1649><e1650><e1651><e1652><e1653><e1654><e1655><e1656><e1657><e1658><e1659><e1660><e1661><e1662><e1663><e1664><e1665><e1666><e1667><e1668><e1669><e1670><e1671><e1672><e1673><e1674><e1675><e1676><e1677><e1678><e1679><e1680><e1681><e1682><e1683><e1684><e1685><e1686><e1687><e1688><e1689><e1690><e1691><e1692><e1693><e1694><e1695><e1696><e1697><e1698><e1699><e1700><e1701><e1702><e1703><e1704><e1705><e1706><e1707><e1708><e1709><e1710><e1711><e1712><e1713><e1714><e1715><e1716><e1717><e1718><e1719><e1720><e1721><e1722><e1723><e1724><e1725><e1726><e1727><e1728><e1729><e1730><e1731><e1732><e1733><e1734><e1735><e1736><e1737><e1738><e1739><e1740><e1741><e1742><e1743><e1744><e1745><e1746><e1747><e1748><e1749><e1750><e1751><e1752><e1753><e1754><e1755><e1756><e1757><e1758><e1759><e1760><e1761><e1762><e1763><e1764><e1765><e1766><e1767><e1768><e1769><e1770><e1771><e1772><e1773><e1774><e1775><e1776><e1777><e1778><e1779><e1780><e1781><e1782><e1783><e1784><e1785><e1786><e1787><e1788><e1789><e1790><e1791><e1792><e1793><e1794><e1795><e1796><e1797><e1798><e1799><e1800><e1801><e1802><e1803><e1804><e1805><e1806><e1807><e1808><e1809><e1810><e1811><e1812><e1813><e1814><e1815><e1816><e1817><e1818><e1819><e1820><e1821><e1822><e1823><e1824><e1825><e1826><e1827><e1828><e1829><e1830><e1831><e1832><e1833><e1834><e1835><e1836><e1837><e1838><e1839><e1840><e1841><e1842><e1843><e1844><e1845><e1846><e1847><e1848><e1849><e1850><e1851><e1852><e1853><e1854><e1855><e1856><e1857><e1858><e1859><e1860><e1861><e1862><e1863><e1864><e1865><e1866><e1867><e1868><e1869><e1870><e1871><e1872><e1873><e1874><e1875><e1876><e1877><e1878><e1879><e1880><e1881><e1882><e1883><e1884><e1885><e1886><e1887><e1888><e1889><e1890><e1891><e1892><e1893><e1894><e1895><e1896><e1897><e1898><e1899><e1900><e1901><e1902><e1903><e1904><e1905><e1906><e1907><e1908><e1909><e1910><e1911><e1912><e1913><e1914><e1915><e1916><e1917><e1918><e1919><e1920><e1921><e1922><e1923><e1924><e1925><e1926><e1927><e1928><e1929><e1930><e1931><e1932><e1933><e1934><e1935><e1936><e1937><e1938><e1939><e1940><e1941><e1942><e1943><e1944><e1945><e1946><e1947><e1948><e1949><e1950><e1951><e1952><e1953><e1954><e1955><e1956><e1957><e1958><e1959><e1960><e1961><e1962><e1963><e1964><e1965><e1966><e1967><e1968><e1969><e1970><e1971><e1972><e1973><e1974><e1975><e1976><e1977><e1978><e1979><e1980><e1981><e1982><e1983><e1984><e1985><e1986><e1987><e1988><e1989><e1990><e1991><e1992><e1993><e1994><e1995><e1996><e1997><e1998><e1999><e2000><e2001><e2002><e2003><e2004><e2005><e2006><e2007><e2008><e2009><e2010><e2011><e2012><e2013><e2014><e2015><e2016><e2017><e2018><e2019><e2020><e2021><e2022><e2023><e2024><e2025><e2026><e2027><e2028><e2029><e2030><e2031><e2032><e2033><e2034><e2035><e2036><e2037><e2038><e2039><e2040><e2041><e2042><e2043><e2044><e2045><e2046><e2047><e2048><e2049><e2050><e2051><e2052><e2053><e2054><e2055><e2056><e2057><e2058><e2059><e2060><e2061><e2062><e2063><e2064><e2065><e2066><e2067><e2068><e2069><e2070><e2071><e2072><e2073><e2074><e2075><e2076><e2077><e2078><e2079><e2080><e2081><e2082><e2083><e2084><e2085><e2086><e2087><e2088><e2089><e2090><e2091><e2092><e2093><e2094><e2095><e2096><e2097><e2098><e2099><e2100><e2101><e2102><e2103><e2104><e2105><e2106><e2107><e2108><e2109><e2110><e2111><e2112><e2113><e2114><e2115><e2116><e2117><e2118><e2119><e2120><e2121><e2122><e2123><e2124><e2125><e2126><e2127><e2128><e2129><e2130><e2131><e2132><e2133><e2134><e2135><e2136><e2137><e2138><e2139><e2140><e2141><e2142><e2143><e2144><e2145><e2146><e2147><e2148><e2149><e2150><e2151><e2152><e2153><e2154><e2155><e2156><e2157><e2158><e2159><e2160><e2161><e2162><e2163><e2164><e2165><e2166><e2167><e2168><e2169><e2170><e2171><e2172><e2173><e2174><e2175><e2176><e2177><e2178><e2179><e2180><e2181><e2182><e2183><e2184><e2185><e2186><e2187><e2188><e2189><e2190><e2191><e2192><e2193><e2194><e2195><e2196><e2197><e2198><e2199><e2200><e2201><e2202><e2203><e2204><e2205><e2206><e2207><e2208><e2209><e2210><e2211><e2212><e2213><e2214><e2215><e2216><e2217><e2218><e2219><e2220><e2221><e2222><e2223><e2224><e2225><e2226><e2227><e2228><e2229><e2230><e2231><e2232><e2233><e2234><e2235><e2236><e2237><e2238><e2239><e2240><e2241><e2242><e2243><e2244><e2245><e2246><e2247><e2248><e2249><e2250><e2251><e2252><e2253><e2254><e2255><e2256><e2257><e2258><e2259><e2260><e2261><e2262><e2263><e2264><e2265><e2266><e2267><e2268><e2269><e2270><e2271><e2272><e2273><e2274><e2275><e2276><e2277><e2278><e2279><e2280><e2281><e2282><e2283><e2284><e2285><e2286><e2287><e2288><e2289><e2290><e2291><e2292><e2293><e2294><e2295><e2296><e2297><e2298><e2299><e2300><e2301><e2302><e2303><e2304><e2305><e2306><e2307><e2308><e2309><e2310><e2311><e2312><e2313><e2314><e2315><e2316><e2317><e2318><e2319><e2320><e2321><e2322><e2323><e2324><e2325><e2326><e2327><e2328><e2329><e2330><e2331><e2332><e2333><e2334><e2335><e2336><e2337><e2338><e2339><e2340><e2341><e2342><e2343><e2344><e2345><e2346><e2347><e2348><e2349><e2350><e2351><e2352><e2353><e2354><e2355><e2356><e2357><e2358><e2359><e2360><e2361><e2362><e2363><e2364><e2365><e2366><e2367><e2368><e2369><e2370><e2371><e2372><e2373><e2374><e2375><e2376><e2377><e2378><e2379><e2380><e2381><e2382><e2383><e2384><e2385><e2386><e2387><e2388><e2389><e2390><e2391><e2392><e2393><e2394><e2395><e2396><e2397><e2398><e2399><e2400><e2401><e2402><e2403><e2404><e2405><e2406><e2407><e2408><e2409><e2410><e2411><e2412><e2413><e2414><e2415><e2416><e2417><e2418><e2419><e2420><e2421><e2422><e2423><e2424><e2425><e2426><e2427><e2428><e2429><e2430><e2431><e2432><e2433><e2434><e2435><e2436><e2437><e2438><e2439><e2440><e2441><e2442><e2443><e2444><e2445><e2446><e2447><e2448><e2449><e2450><e2451><e2452><e2453><e2454><e2455><e2456><e2457><e2458><e2459><e2460><e2461><e2462><e2463><e2464><e2465><e2466><e2467><e2468><e2469><e2470><e2471><e2472><e2473><e2474><e2475><e2476><e2477><e2478><e2479><e2480><e2481><e2482><e2483><e2484><e2485><e2486><e2487><e2488><e2489><e2490><e2491><e2492><e2493><e2494><e2495><e2496><e2497><e2498><e2499><e2500><e2501><e2502><e2503><e2504><e2505><e2506><e2507><e2508><e2509><e2510><e2511><e2512><e2513><e2514><e2515><e2516><e2517><e2518><e2519><e2520><e2521><e2522><e2523><e2524><e2525><e2526><e2527><e2528><e2529><e2530><e2531><e2532><e2533><e2534><e2535><e2536><e2537><e2538><e2539><e2540><e2541><e2542><e2543><e2544><e2545><e2546><e2547><e2548><e2549><e2550><e2551><e2552><e2553><e2554><e2555><e2556><e2557><e2558><e2559><e2560><e2561><e2562><e2563><e2564><e2565><e2566><e2567><e2568><e2569><e2570><e2571><e2572><e2573><e2574><e2575><e2576><e2577><e2578><e2579><e2580><e2581><e2582><e2583><e2584><e2585><e2586><e2587><e2588><e2589><e2590><e2591><e2592><e2593><e2594><e2595><e2596><e2597><e2598><e2599><e2600><e2601><e2602><e2603><e2604><e2605><e2606><e2607><e2608><e2609><e2610><e2611><e2612><e2613><e2614><e2615><e2616><e2617><e2618><e2619><e2620><e2621><e2622><e2623><e2624><e2625><e2626><e2627><e2628><e2629><e2630><e2631><e2632><e2633><e2634><e2635><e2636><e2637><e2638><e2639><e2640><e2641><e2642><e2643><e2644><e2645><e2646><e2647><e2648><e2649><e2650><e2651><e2652><e2653><e2654><e2655><e2656><e2657><e2658><e2659><e2660><e2661><e2662><e2663><e2664><e2665><e2666><e2667><e2668><e2669><e2670><e2671><e2672><e2673><e2674><e2675><e2676><e2677><e2678><e2679><e2680><e2681><e2682><e2683><e2684><e2685><e2686><e2687><e2688><e2689><e2690><e2691><e2692><e2693><e2694><e2695><e2696><e2697><e2698><e2699><e2700><e2701><e2702><e2703><e2704><e2705><e2706><e2707><e2708><e2709><e2710><e2711><e2712><e2713><e2714><e2715><e2716><e2717><e2718><e2719><e2720><e2721><e2722><e2723><e2724><e2725><e2726><e2727><e2728><e2729><e2730><e2731><e2732><e2733><e2734><e2735><e2736><e2737><e2738><e2739><e2740><e2741><e2742><e2743><e2744><e2745><e2746><e2747><e2748><e2749><e2750><e2751><e2752><e2753><e2754><e2755><e2756><e2757><e2758><e2759><e2760><e2761><e2762><e2763><e2764><e2765><e2766><e2767><e2768><e2769><e2770><e2771><e2772><e2773><e2774><e2775><e2776><e2777><e2778><e2779><e2780><e2781><e2782><e2783><e2784><e2785><e2786><e2787><e2788><e2789><e2790><e2791><e2792><e2793><e2794><e2795><e2796><e2797><e2798><e2799><e2800><e2801><e2802><e2803><e2804><e2805><e2806><e2807><e2808><e2809><e2810><e2811><e2812><e2813><e2814><e2815><e2816><e2817><e2818><e2819><e2820><e2821><e2822><e2823><e2824><e2825><e2826><e2827><e2828><e2829><e2830><e2831><e2832><e2833><e2834><e2835><e2836><e2837><e2838><e2839><e2840><e2841><e2842><e2843><e2844><e2845><e2846><e2847><e2848><e2849><e2850><e2851><e2852><e2853><e2854><e2855><e2856><e2857><e2858><e2859><e2860><e2861><e2862><e2863><e2864><e2865><e2866><e2867><e2868><e2869><e2870><e2871><e2872><e2873><e2874><e2875><e2876><e2877><e2878><e2879><e2880><e2881><e2882><e2883><e2884><e2885><e2886><e2887><e2888><e2889><e2890><e2891><e2892><e2893><e2894><e2895><e2896><e2897><e2898><e2899><e2900><e2901><e2902><e2903><e2904><e2905><e2906><e2907><e2908><e2909><e2910><e2911><e2912><e2913><e2914><e2915><e2916><e2917><e2918><e2919><e2920><e2921><e2922><e2923><e2924><e2925><e2926><e2927><e2928><e2929><e2930><e2931><e2932><e2933><e2934><e2935><e2936><e2937><e2938><e2939><e2940><e2941><e2942><e2943><e2944><e2945><e2946><e2947><e2948><e2949><e2950><e2951><e2952><e2953><e2954><e2955><e2956><e2957><e2958><e2959><e2960><e2961><e2962><e2963><e2964><e2965><e2966><e2967><e2968><e2969><e2970><e2971><e2972><e2973><e2974><e2975><e2976><e2977><e2978><e2979><e2980><e2981><e2982><e2983><e2984><e2985><e2986><e2987><e2988><e2989><e2990><e2991><e2992><e2993><e2994><e2995><e2996><e2997><e2998><e2999><e3000><e3001><e3002><e3003><e3004><e3005><e3006><e3007><e3008><e3009><e3010><e3011><e3012><e3013><e3014><e3015><e3016><e3017><e3018><e3019><e3020><e3021><e3022><e3023><e3024><e3025><e3026><e3027><e3028><e3029><e3030><e3031><e3032><e3033><e3034><e3035><e3036><e3037><e3038><e3039><e3040><e3041><e3042><e3043><e3044><e3045><e3046><e3047><e3048><e3049><e3050><e3051><e3052><e3053><e3054><e3055><e3056><e3057><e3058><e3059><e3060><e3061><e3062><e3063><e3064><e3065><e3066><e3067><e3068><e3069><e3070><e3071><e3072><e3073><e3074><e3075><e3076><e3077><e3078><e3079><e3080><e3081><e3082><e3083><e3084><e3085><e3086><e3087><e3088><e3089><e3090><e3091><e3092><e3093><e3094><e3095><e3096><e3097><e3098><e3099><e3100><e3101><e3102><e3103><e3104><e3105><e3106><e3107><e3108><e3109><e3110><e3111><e3112><e3113><e3114><e3115><e3116><e3117><e3118><e3119><e3120><e3121><e3122><e3123><e3124><e3125><e3126><e3127><e3128><e3129><e3130><e3131><e3132><e3133><e3134><e3135><e3136><e3137><e3138><e3139><e3140><e3141><e3142><e3143><e3144><e3145><e3146><e3147><e3148><e3149><e3150><e3151><e3152><e3153><e3154><e3155><e3156><e3157><e3158><e3159><e3160><e3161><e3162><e3163><e3164><e3165><e3166><e3167><e3168><e3169><e3170><e3171><e3172><e3173><e3174><e3175><e3176><e3177><e3178><e3179><e3180><e3181><e3182><e3183><e3184><e3185><e3186><e3187><e3188><e3189><e3190><e3191><e3192><e3193><e3194><e3195><e3196><e3197><e3198><e3199><e3200><e3201><e3202><e3203><e3204><e3205><e3206><e3207><e3208><e3209><e3210><e3211><e3212><e3213><e3214><e3215><e3216><e3217><e3218><e3219><e3220><e3221><e3222><e3223><e3224><e3225><e3226><e3227><e3228><e3229><e3230><e3231><e3232><e3233><e3234><e3235><e3236><e3237><e3238><e3239><e3240><e3241><e3242><e3243><e3244><e3245><e3246><e3247><e3248><e3249><e3250><e3251><e3252><e3253><e3254><e3255><e3256><e3257><e3258><e3259><e3260><e3261><e3262><e3263><e3264><e3265><e3266><e3267><e3268><e3269><e3270><e3271><e3272><e3273><e3274><e3275><e3276><e3277><e3278><e3279><e3280><e3281><e3282><e3283><e3284><e3285><e3286><e3287><e3288><e3289><e3290><e3291><e3292><e3293><e3294><e3295><e3296><e3297><e3298><e3299><e3300><e3301><e3302><e3303><e3304><e3305><e3306><e3307><e3308><e3309><e3310><e3311><e3312><e3313><e3314><e3315><e3316><e3317><e3318><e3319><e3320><e3321><e3322><e3323><e3324><e3325><e3326><e3327><e3328><e3329><e3330><e3331><e3332><e3333><e3334><e3335><e3336><e3337><e3338><e3339><e3340><e3341><e3342><e3343><e3344><e3345><e3346><e3347><e3348><e3349><e3350><e3351><e3352><e3353><e3354><e3355><e3356><e3357><e3358><e3359><e3360><e3361><e3362><e3363><e3364><e3365><e3366><e3367><e3368><e3369><e3370><e3371><e3372><e3373><e3374><e3375><e3376><e3377><e3378><e3379><e3380><e3381><e3382><e3383><e3384><e3385><e3386><e3387><e3388><e3389><e3390><e3391><e3392><e3393><e3394><e3395><e3396><e3397><e3398><e3399><e3400><e3401><e3402><e3403><e3404><e3405><e3406><e3407><e3408><e3409><e3410><e3411><e3412><e3413><e3414><e3415><e3416><e3417><e3418><e3419><e3420><e3421><e3422><e3423><e3424><e3425><e3426><e3427><e3428><e3429><e3430><e3431><e3432><e3433><e3434><e3435><e3436><e3437><e3438><e3439><e3440><e3441><e3442><e3443><e3444><e3445><e3446><e3447><e3448><e3449><e3450><e3451><e3452><e3453><e3454><e3455><e3456><e3457><e3458><e3459><e3460><e3461><e3462><e3463><e3464><e3465><e3466><e3467><e3468><e3469><e3470><e3471><e3472><e3473><e3474><e3475><e3476><e3477><e3478><e3479><e3480><e3481><e3482><e3483><e3484><e3485><e3486><e3487><e3488><e3489><e3490><e3491><e3492><e3493><e3494><e3495><e3496><e3497><e3498><e3499><e3500><e3501><e3502><e3503><e3504><e3505><e3506><e3507><e3508><e3509><e3510><e3511><e3512><e3513><e3514><e3515><e3516><e3517><e3518><e3519><e3520><e3521><e3522><e3523><e3524><e3525><e3526><e3527><e3528><e3529><e3530><e3531><e3532><e3533><e3534><e3535><e3536><e3537><e3538><e3539><e3540><e3541><e3542><e3543><e3544><e3545><e3546><e3547><e3548><e3549><e3550><e3551><e3552><e3553><e3554><e3555><e3556><e3557><e3558><e3559><e3560><e3561><e3562><e3563><e3564><e3565><e3566><e3567><e3568><e3569><e3570><e3571><e3572><e3573><e3574><e3575><e3576><e3577><e3578><e3579><e3580><e3581><e3582><e3583><e3584><e3585><e3586><e3587><e3588><e3589><e3590><e3591><e3592><e3593><e3594><e3595><e3596><e3597><e3598><e3599><e3600><e3601><e3602><e3603><e3604><e3605><e3606><e3607><e3608><e3609><e3610><e3611><e3612><e3613><e3614><e3615><e3616><e3617><e3618><e3619><e3620><e3621><e3622><e3623><e3624><e3625><e3626><e3627><e3628><e3629><e3630><e3631><e3632><e3633><e3634><e3635><e3636><e3637><e3638><e3639><e3640><e3641><e3642><e3643><e3644><e3645><e3646><e3647><e3648><e3649><e3650><e3651><e3652><e3653><e3654><e3655><e3656><e3657><e3658><e3659><e3660><e3661><e3662><e3663><e3664><e3665><e3666><e3667><e3668><e3669><e3670><e3671><e3672><e3673><e3674><e3675><e3676><e3677><e3678><e3679><e3680><e3681><e3682><e3683><e3684><e3685><e3686><e3687><e3688><e3689><e3690><e3691><e3692><e3693><e3694><e3695><e3696><e3697><e3698><e3699><e3700><e3701><e3702><e3703><e3704><e3705><e3706><e3707><e3708><e3709><e3710><e3711><e3712><e3713><e3714><e3715><e3716><e3717><e3718><e3719><e3720><e3721><e3722><e3723><e3724><e3725><e3726><e3727><e3728><e3729><e3730><e3731><e3732><e3733><e3734><e3735><e3736><e3737><e3738><e3739><e3740><e3741><e3742><e3743><e3744><e3745><e3746><e3747><e3748><e3749><e3750><e3751><e3752><e3753><e3754><e3755><e3756><e3757><e3758><e3759><e3760><e3761><e3762><e3763><e3764><e3765><e3766><e3767><e3768><e3769><e3770><e3771><e3772><e3773><e3774><e3775><e3776><e3777><e3778><e3779><e3780><e3781><e3782><e3783><e3784><e3785><e3786><e3787><e3788><e3789><e3790><e3791><e3792><e3793><e3794><e3795><e3796><e3797><e3798><e3799><e3800><e3801><e3802><e3803><e3804><e3805><e3806><e3807><e3808><e3809><e3810><e3811><e3812><e3813><e3814><e3815><e3816><e3817><e3818><e3819><e3820><e3821><e3822><e3823><e3824><e3825><e3826><e3827><e3828><e3829><e3830><e3831><e3832><e3833><e3834><e3835><e3836><e3837><e3838><e3839><e3840><e3841><e3842><e3843><e3844><e3845><e3846><e3847><e3848><e3849><e3850><e3851><e3852><e3853><e3854><e3855><e3856><e3857><e3858><e3859><e3860><e3861><e3862><e3863><e3864><e3865><e3866><e3867><e3868><e3869><e3870><e3871><e3872><e3873><e3874><e3875><e3876><e3877><e3878><e3879><e3880><e3881><e3882><e3883><e3884><e3885><e3886><e3887><e3888><e3889><e3890><e3891><e3892><e3893><e3894><e3895><e3896><e3897><e3898><e3899><e3900><e3901><e3902><e3903><e3904><e3905><e3906><e3907><e3908><e3909><e3910><e3911><e3912><e3913><e3914><e3915><e3916><e3917><e3918><e3919><e3920><e3921><e3922><e3923><e3924><e3925><e3926><e3927><e3928><e3929><e3930><e3931><e3932><e3933><e3934><e3935><e3936><e3937><e3938><e3939><e3940><e3941><e3942><e3943><e3944><e3945><e3946><e3947><e3948><e3949><e3950><e3951><e3952><e3953><e3954><e3955><e3956><e3957><e3958><e3959><e3960><e3961><e3962><e3963><e3964><e3965><e3966><e3967><e3968><e3969><e3970><e3971><e3972><e3973><e3974><e3975><e3976><e3977><e3978><e3979><e3980><e3981><e3982><e3983><e3984><e3985><e3986><e3987><e3988><e3989><e3990><e3991><e3992><e3993><e3994><e3995><e3996><e3997><e3998><e3999><e4000><e4001><e4002><e4003><e4004><e4005><e4006><e4007><e4008><e4009><e4010><e4011><e4012><e4013><e4014><e4015><e4016><e4017><e4018><e4019><e4020><e4021><e4022><e4023><e4024><e4025><e4026><e4027><e4028><e4029><e4030><e4031><e4032><e4033><e4034><e4035><e4036><e4037><e4038><e4039><e4040><e4041><e4042><e4043><e4044><e4045><e4046><e4047><e4048><e4049><e4050><e4051><e4052><e4053><e4054><e4055><e4056><e4057><e4058><e4059><e4060><e4061><e4062><e4063><e4064><e4065><e4066><e4067><e4068><e4069><e4070><e4071><e4072><e4073><e4074><e4075><e4076><e4077><e4078><e4079><e4080><e4081><e4082><e4083><e4084><e4085><e4086><e4087><e4088><e4089><e4090><e4091><e4092><e4093><e4094><e4095><e4096><e4097><e4098><e4099><e4100><e4101><e4102><e4103><e4104><e4105><e4106><e4107><e4108><e4109><e4110><e4111><e4112><e4113><e4114><e4115><e4116><e4117><e4118><e4119><e4120><e4121><e4122><e4123><e4124><e4125><e4126><e4127><e4128><e4129><e4130><e4131><e4132><e4133><e4134><e4135><e4136><e4137><e4138><e4139><e4140><e4141><e4142><e4143><e4144><e4145><e4146><e4147><e4148><e4149><e4150><e4151><e4152><e4153><e4154><e4155><e4156><e4157><e4158><e4159><e4160><e4161><e4162><e4163><e4164><e4165><e4166><e4167><e4168><e4169><e4170><e4171><e4172><e4173><e4174><e4175><e4176><e4177><e4178><e4179><e4180><e4181><e4182><e4183><e4184><e4185><e4186><e4187><e4188><e4189><e4190><e4191><e4192><e4193><e4194><e4195><e4196><e4197><e4198><e4199><e4200><e4201><e4202><e4203><e4204><e4205><e4206><e4207><e4208><e4209><e4210><e4211><e4212><e4213><e4214><e4215><e4216><e4217><e4218><e4219><e4220><e4221><e4222><e4223><e4224><e4225><e4226><e4227><e4228><e4229><e4230><e4231><e4232><e4233><e4234><e4235><e4236><e4237><e4238><e4239><e4240><e4241><e4242><e4243><e4244><e4245><e4246><e4247><e4248><e4249><e4250><e4251><e4252><e4253><e4254><e4255><e4256><e4257><e4258><e4259><e4260><e4261><e4262><e4263><e4264><e4265><e4266><e4267><e4268><e4269><e4270><e4271><e4272><e4273><e4274><e4275><e4276><e4277><e4278><e4279><e4280><e4281><e4282><e4283><e4284><e4285><e4286><e4287><e4288><e4289><e4290><e4291><e4292><e4293><e4294><e4295><e4296><e4297><e4298><e4299><e4300><e4301><e4302><e4303><e4304><e4305><e4306><e4307><e4308><e4309><e4310><e4311><e4312><e4313><e4314><e4315><e4316><e4317><e4318><e4319><e4320><e4321><e4322><e4323><e4324><e4325><e4326><e4327><e4328><e4329><e4330><e4331><e4332><e4333><e4334><e4335><e4336><e4337><e4338><e4339><e4340><e4341><e4342><e4343><e4344><e4345><e4346><e4347><e4348><e4349><e4350><e4351><e4352><e4353><e4354><e4355><e4356><e4357><e4358><e4359><e4360><e4361><e4362><e4363><e4364><e4365><e4366><e4367><e4368><e4369><e4370><e4371><e4372><e4373><e4374><e4375><e4376><e4377><e4378><e4379><e4380><e4381><e4382><e4383><e4384><e4385><e4386><e4387><e4388><e4389><e4390><e4391><e4392><e4393><e4394><e4395><e4396><e4397><e4398><e4399><e4400><e4401><e4402><e4403><e4404><e4405><e4406><e4407><e4408><e4409><e4410><e4411><e4412><e4413><e4414><e4415><e4416><e4417><e4418><e4419><e4420><e4421><e4422><e4423><e4424><e4425><e4426><e4427><e4428><e4429><e4430><e4431><e4432><e4433><e4434><e4435><e4436><e4437><e4438><e4439><e4440><e4441><e4442><e4443><e4444><e4445><e4446><e4447><e4448><e4449><e4450><e4451><e4452><e4453><e4454><e4455><e4456><e4457><e4458><e4459><e4460><e4461><e4462><e4463><e4464><e4465><e4466><e4467><e4468><e4469><e4470><e4471><e4472><e4473><e4474><e4475><e4476><e4477><e4478><e4479><e4480><e4481><e4482><e4483><e4484><e4485><e4486><e4487><e4488><e4489><e4490><e4491><e4492><e4493><e4494><e4495><e4496><e4497><e4498><e4499><e4500><e4501><e4502><e4503><e4504><e4505><e4506><e4507><e4508><e4509><e4510><e4511><e4512><e4513><e4514><e4515><e4516><e4517><e4518><e4519><e4520><e4521><e4522><e4523><e4524><e4525><e4526><e4527><e4528><e4529><e4530><e4531><e4532><e4533><e4534><e4535><e4536><e4537><e4538><e4539><e4540><e4541><e4542><e4543><e4544><e4545><e4546><e4547><e4548><e4549><e4550><e4551><e4552><e4553><e4554><e4555><e4556><e4557><e4558><e4559><e4560><e4561><e4562><e4563><e4564><e4565><e4566><e4567><e4568><e4569><e4570><e4571><e4572><e4573><e4574><e4575><e4576><e4577><e4578><e4579><e4580><e4581><e4582><e4583><e4584><e4585><e4586><e4587><e4588><e4589><e4590><e4591><e4592><e4593><e4594><e4595><e4596><e4597><e4598><e4599><e4600><e4601><e4602><e4603><e4604><e4605><e4606><e4607><e4608><e4609><e4610><e4611><e4612><e4613><e4614><e4615><e4616><e4617><e4618><e4619><e4620><e4621><e4622><e4623><e4624><e4625><e4626><e4627><e4628><e4629><e4630><e4631><e4632><e4633><e4634><e4635><e4636><e4637><e4638><e4639><e4640><e4641><e4642><e4643><e4644><e4645><e4646><e4647><e4648><e4649><e4650><e4651><e4652><e4653><e4654><e4655><e4656><e4657><e4658><e4659><e4660><e4661><e4662><e4663><e4664><e4665><e4666><e4667><e4668><e4669><e4670><e4671><e4672><e4673><e4674><e4675><e4676><e4677><e4678><e4679><e4680><e4681><e4682><e4683><e4684><e4685><e4686><e4687><e4688><e4689><e4690><e4691><e4692><e4693><e4694><e4695><e4696><e4697><e4698><e4699><e4700><e4701><e4702><e4703><e4704><e4705><e4706><e4707><e4708><e4709><e4710><e4711><e4712><e4713><e4714><e4715><e4716><e4717><e4718><e4719><e4720><e4721><e4722><e4723><e4724><e4725><e4726><e4727><e4728><e4729><e4730><e4731><e4732><e4733><e4734><e4735><e4736><e4737><e4738><e4739><e4740><e4741><e4742><e4743><e4744><e4745><e4746><e4747><e4748><e4749><e4750><e4751><e4752><e4753><e4754><e4755><e4756><e4757><e4758><e4759><e4760><e4761><e4762><e4763><e4764><e4765><e4766><e4767><e4768><e4769><e4770><e4771><e4772><e4773><e4774><e4775><e4776><e4777><e4778><e4779><e4780><e4781><e4782><e4783><e4784><e4785><e4786><e4787><e4788><e4789><e4790><e4791><e4792><e4793><e4794><e4795><e4796><e4797><e4798><e4799><e4800><e4801><e4802><e4803><e4804><e4805><e4806><e4807><e4808><e4809><e4810><e4811><e4812><e4813><e4814><e4815><e4816><e4817><e4818><e4819><e4820><e4821><e4822><e4823><e4824><e4825><e4826><e4827><e4828><e4829><e4830><e4831><e4832><e4833><e4834><e4835><e4836><e4837><e4838><e4839><e4840><e4841><e4842><e4843><e4844><e4845><e4846><e4847><e4848><e4849><e4850><e4851><e4852><e4853><e4854><e4855><e4856><e4857><e4858><e4859><e4860><e4861><e4862><e4863><e4864><e4865><e4866><e4867><e4868><e4869><e4870><e4871><e4872><e4873><e4874><e4875><e4876><e4877><e4878><e4879><e4880><e4881><e4882><e4883><e4884><e4885><e4886><e4887><e4888><e4889><e4890><e4891><e4892><e4893><e4894><e4895><e4896><e4897><e4898><e4899><e4900><e4901><e4902><e4903><e4904><e4905><e4906><e4907><e4908><e4909><e4910><e4911><e4912><e4913><e4914><e4915><e4916><e4917><e4918><e4919><e4920><e4921><e4922><e4923><e4924><e4925><e4926><e4927><e4928><e4929><e4930><e4931><e4932><e4933><e4934><e4935><e4936><e4937><e4938><e4939><e4940><e4941><e4942><e4943><e4944><e4945><e4946><e4947><e4948><e4949><e4950><e4951><e4952><e4953><e4954><e4955><e4956><e4957><e4958><e4959><e4960><e4961><e4962><e4963><e4964><e4965><e4966><e4967><e4968><e4969><e4970><e4971><e4972><e4973><e4974><e4975><e4976><e4977><e4978><e4979><e4980><e4981><e4982><e4983><e4984><e4985><e4986><e4987><e4988><e4989><e4990><e4991><e4992><e4993><e4994><e4995><e4996><e4997><e4998><e4999><e5000><e5001><e5002><e5003><e5004><e5005><e5006><e5007><e5008><e5009><e5010><e5011><e5012><e5013><e5014><e5015><e5016><e5017><e5018><e5019><e5020><e5021><e5022><e5023><e5024><e5025><e5026><e5027><e5028><e5029><e5030><e5031><e5032><e5033><e5034><e5035><e5036><e5037><e5038><e5039><e5040><e5041><e5042><e5043><e5044><e5045><e5046><e5047><e5048><e5049><e5050><e5051><e5052><e5053><e5054><e5055><e5056><e5057><e5058><e5059><e5060><e5061><e5062><e5063><e5064><e5065><e5066><e5067><e5068><e5069><e5070><e5071><e5072><e5073><e5074><e5075><e5076><e5077><e5078><e5079><e5080><e5081><e5082><e5083><e5084><e5085><e5086><e5087><e5088><e5089><e5090><e5091><e5092><e5093><e5094><e5095><e5096><e5097><e5098><e5099><e5100><e5101><e5102><e5103><e5104><e5105><e5106><e5107><e5108><e5109><e5110><e5111><e5112><e5113><e5114><e5115><e5116><e5117><e5118><e5119><e5120><e5121><e5122><e5123><e5124><e5125><e5126><e5127><e5128><e5129><e5130><e5131><e5132><e5133><e5134><e5135><e5136><e5137><e5138><e5139><e5140><e5141><e5142><e5143><e5144><e5145><e5146><e5147><e5148><e5149><e5150><e5151><e5152><e5153><e5154><e5155><e5156><e5157><e5158><e5159><e5160><e5161><e5162><e5163><e5164><e5165><e5166><e5167><e5168><e5169><e5170><e5171><e5172><e5173><e5174><e5175><e5176><e5177><e5178><e5179><e5180><e5181><e5182><e5183><e5184><e5185><e5186><e5187><e5188><e5189><e5190><e5191><e5192><e5193><e5194><e5195><e5196><e5197><e5198><e5199><e5200><e5201><e5202><e5203><e5204><e5205><e5206><e5207><e5208><e5209><e5210><e5211><e5212><e5213><e5214><e5215><e5216><e5217><e5218><e5219><e5220><e5221><e5222><e5223><e5224><e5225><e5226><e5227><e5228><e5229><e5230><e5231><e5232><e5233><e5234><e5235><e5236><e5237><e5238><e5239><e5240><e5241><e5242><e5243><e5244><e5245><e5246><e5247><e5248><e5249><e5250><e5251><e5252><e5253><e5254><e5255><e5256><e5257><e5258><e5259><e5260><e5261><e5262><e5263><e5264><e5265><e5266><e5267><e5268><e5269><e5270><e5271><e5272><e5273><e5274><e5275><e5276><e5277><e5278><e5279><e5280><e5281><e5282><e5283><e5284><e5285><e5286><e5287><e5288><e5289><e5290><e5291><e5292><e5293><e5294><e5295><e5296><e5297><e5298><e5299><e5300><e5301><e5302><e5303><e5304><e5305><e5306><e5307><e5308><e5309><e5310><e5311><e5312><e5313><e5314><e5315><e5316><e5317><e5318><e5319><e5320><e5321><e5322><e5323><e5324><e5325><e5326><e5327><e5328><e5329><e5330><e5331><e5332><e5333><e5334><e5335><e5336><e5337><e5338><e5339><e5340><e5341><e5342><e5343><e5344><e5345><e5346><e5347><e5348><e5349><e5350><e5351><e5352><e5353><e5354><e5355><e5356><e5357><e5358><e5359><e5360><e5361><e5362><e5363><e5364><e5365><e5366><e5367><e5368><e5369><e5370><e5371><e5372><e5373><e5374><e5375><e5376><e5377><e5378><e5379><e5380><e5381><e5382><e5383><e5384><e5385><e5386><e5387><e5388><e5389><e5390><e5391><e5392><e5393><e5394><e5395><e5396><e5397><e5398><e5399><e5400><e5401><e5402><e5403><e5404><e5405><e5406><e5407><e5408><e5409><e5410><e5411><e5412><e5413><e5414><e5415><e5416><e5417><e5418><e5419><e5420><e5421><e5422><e5423><e5424><e5425><e5426><e5427><e5428><e5429><e5430><e5431><e5432><e5433><e5434><e5435><e5436><e5437><e5438><e5439><e5440><e5441><e5442><e5443><e5444><e5445><e5446><e5447><e5448><e5449><e5450><e5451><e5452><e5453><e5454><e5455><e5456><e5457><e5458><e5459><e5460><e5461><e5462><e5463><e5464><e5465><e5466><e5467><e5468><e5469><e5470><e5471><e5472><e5473><e5474><e5475><e5476><e5477><e5478><e5479><e5480><e5481><e5482><e5483><e5484><e5485><e5486><e5487><e5488><e5489><e5490><e5491><e5492><e5493><e5494><e5495><e5496><e5497><e5498><e5499><e5500><e5501><e5502><e5503><e5504><e5505><e5506><e5507><e5508><e5509><e5510><e5511><e5512><e5513><e5514><e5515><e5516><e5517><e5518><e5519><e5520><e5521><e5522><e5523><e5524><e5525><e5526><e5527><e5528><e5529><e5530><e5531><e5532><e5533><e5534><e5535><e5536><e5537><e5538><e5539><e5540><e5541><e5542><e5543><e5544><e5545><e5546><e5547><e5548><e5549><e5550><e5551><e5552><e5553><e5554><e5555><e5556><e5557><e5558><e5559><e5560><e5561><e5562><e5563><e5564><e5565><e5566><e5567><e5568><e5569><e5570><e5571><e5572><e5573><e5574><e5575><e5576><e5577><e5578><e5579><e5580><e5581><e5582><e5583><e5584><e5585><e5586><e5587><e5588><e5589><e5590><e5591><e5592><e5593><e5594><e5595><e5596><e5597><e5598><e5599><e5600><e5601><e5602><e5603><e5604><e5605><e5606><e5607><e5608><e5609><e5610><e5611><e5612><e5613><e5614><e5615><e5616><e5617><e5618><e5619><e5620><e5621><e5622><e5623><e5624><e5625><e5626><e5627><e5628><e5629><e5630><e5631><e5632><e5633><e5634><e5635><e5636><e5637><e5638><e5639><e5640><e5641><e5642><e5643><e5644><e5645><e5646><e5647><e5648><e5649><e5650><e5651><e5652><e5653><e5654><e5655><e5656><e5657><e5658><e5659><e5660><e5661><e5662><e5663><e5664><e5665><e5666><e5667><e5668><e5669><e5670><e5671><e5672><e5673><e5674><e5675><e5676><e5677><e5678><e5679><e5680><e5681><e5682><e5683><e5684><e5685><e5686><e5687><e5688><e5689><e5690><e5691><e5692><e5693><e5694><e5695><e5696><e5697><e5698><e5699><e5700><e5701><e5702><e5703><e5704><e5705><e5706><e5707><e5708><e5709><e5710><e5711><e5712><e5713><e5714><e5715><e5716><e5717><e5718><e5719><e5720><e5721><e5722><e5723><e5724><e5725><e5726><e5727><e5728><e5729><e5730><e5731><e5732><e5733><e5734><e5735><e5736><e5737><e5738><e5739><e5740><e5741><e5742><e5743><e5744><e5745><e5746><e5747><e5748><e5749><e5750><e5751><e5752><e5753><e5754><e5755><e5756><e5757><e5758><e5759><e5760><e5761><e5762><e5763><e5764><e5765><e5766><e5767><e5768><e5769><e5770><e5771><e5772><e5773><e5774><e5775><e5776><e5777><e5778><e5779><e5780><e5781><e5782><e5783><e5784><e5785><e5786><e5787><e5788><e5789><e5790><e5791><e5792><e5793><e5794><e5795><e5796><e5797><e5798><e5799><e5800><e5801><e5802><e5803><e5804><e5805><e5806><e5807><e5808><e5809><e5810><e5811><e5812><e5813><e5814><e5815><e5816><e5817><e5818><e5819><e5820><e5821><e5822><e5823><e5824><e5825><e5826><e5827><e5828><e5829><e5830><e5831><e5832><e5833><e5834><e5835><e5836><e5837><e5838><e5839><e5840><e5841><e5842><e5843><e5844><e5845><e5846><e5847><e5848><e5849><e5850><e5851><e5852><e5853><e5854><e5855><e5856><e5857><e5858><e5859><e5860><e5861><e5862><e5863><e5864><e5865><e5866><e5867><e5868><e5869><e5870><e5871><e5872><e5873><e5874><e5875><e5876><e5877><e5878><e5879><e5880><e5881><e5882><e5883><e5884><e5885><e5886><e5887><e5888><e5889><e5890><e5891><e5892><e5893><e5894><e5895><e5896><e5897><e5898><e5899><e5900><e5901><e5902><e5903><e5904><e5905><e5906><e5907><e5908><e5909><e5910><e5911><e5912><e5913><e5914><e5915><e5916><e5917><e5918><e5919><e5920><e5921><e5922><e5923><e5924><e5925><e5926><e5927><e5928><e5929><e5930><e5931><e5932><e5933><e5934><e5935><e5936><e5937><e5938><e5939><e5940><e5941><e5942><e5943><e5944><e5945><e5946><e5947><e5948><e5949><e5950><e5951><e5952><e5953><e5954><e5955><e5956><e5957><e5958><e5959><e5960><e5961><e5962><e5963><e5964><e5965><e5966><e5967><e5968><e5969><e5970><e5971><e5972><e5973><e5974><e5975><e5976><e5977><e5978><e5979><e5980><e5981><e5982><e5983><e5984><e5985><e5986><e5987><e5988><e5989><e5990><e5991><e5992><e5993><e5994><e5995><e5996><e5997><e5998><e5999><e6000><e6001><e6002><e6003><e6004><e6005><e6006><e6007><e6008><e6009><e6010><e6011><e6012><e6013><e6014><e6015><e6016><e6017><e6018><e6019><e6020><e6021><e6022><e6023><e6024><e6025><e6026><e6027><e6028><e6029><e6030><e6031><e6032><e6033><e6034><e6035><e6036><e6037><e6038><e6039><e6040><e6041><e6042><e6043><e6044><e6045><e6046><e6047><e6048><e6049><e6050><e6051><e6052><e6053><e6054><e6055><e6056><e6057><e6058><e6059><e6060><e6061><e6062><e6063><e6064><e6065><e6066><e6067><e6068><e6069><e6070><e6071><e6072><e6073><e6074><e6075><e6076><e6077><e6078><e6079><e6080><e6081><e6082><e6083><e6084><e6085><e6086><e6087><e6088><e6089><e6090><e6091><e6092><e6093><e6094><e6095><e6096><e6097><e6098><e6099><e6100><e6101><e6102><e6103><e6104><e6105><e6106><e6107><e6108><e6109><e6110><e6111><e6112><e6113><e6114><e6115><e6116><e6117><e6118><e6119><e6120><e6121><e6122><e6123><e6124><e6125><e6126><e6127><e6128><e6129><e6130><e6131><e6132><e6133><e6134><e6135><e6136><e6137><e6138><e6139><e6140><e6141><e6142><e6143><e6144><e6145><e6146><e6147><e6148><e6149><e6150><e6151><e6152><e6153><e6154><e6155><e6156><e6157><e6158><e6159><e6160><e6161><e6162><e6163><e6164><e6165><e6166><e6167><e6168><e6169><e6170><e6171><e6172><e6173><e6174><e6175><e6176><e6177><e6178><e6179><e6180><e6181><e6182><e6183><e6184><e6185><e6186><e6187><e6188><e6189><e6190><e6191><e6192><e6193><e6194><e6195><e6196><e6197><e6198><e6199><e6200><e6201><e6202><e6203><e6204><e6205><e6206><e6207><e6208><e6209><e6210><e6211><e6212><e6213><e6214><e6215><e6216><e6217><e6218><e6219><e6220><e6221><e6222><e6223><e6224><e6225><e6226><e6227><e6228><e6229><e6230><e6231><e6232><e6233><e6234><e6235><e6236><e6237><e6238><e6239><e6240><e6241><e6242><e6243><e6244><e6245><e6246><e6247><e6248><e6249><e6250><e6251><e6252><e6253><e6254><e6255><e6256><e6257><e6258><e6259><e6260><e6261><e6262><e6263><e6264><e6265><e6266><e6267><e6268><e6269><e6270><e6271><e6272><e6273><e6274><e6275><e6276><e6277><e6278><e6279><e6280><e6281><e6282><e6283><e6284><e6285><e6286><e6287><e6288><e6289><e6290><e6291><e6292><e6293><e6294><e6295><e6296><e6297><e6298><e6299><e6300><e6301><e6302><e6303><e6304><e6305><e6306><e6307><e6308><e6309><e6310><e6311><e6312><e6313><e6314><e6315><e6316><e6317><e6318><e6319><e6320><e6321><e6322><e6323><e6324><e6325><e6326><e6327><e6328><e6329><e6330><e6331><e6332><e6333><e6334><e6335><e6336><e6337><e6338><e6339><e6340><e6341><e6342><e6343><e6344><e6345><e6346><e6347><e6348><e6349><e6350><e6351><e6352><e6353><e6354><e6355><e6356><e6357><e6358><e6359><e6360><e6361><e6362><e6363><e6364><e6365><e6366><e6367><e6368><e6369><e6370><e6371><e6372><e6373><e6374><e6375><e6376><e6377><e6378><e6379><e6380><e6381><e6382><e6383><e6384><e6385><e6386><e6387><e6388><e6389><e6390><e6391><e6392><e6393><e6394><e6395><e6396><e6397><e6398><e6399><e6400><e6401><e6402><e6403><e6404><e6405><e6406><e6407><e6408><e6409><e6410><e6411><e6412><e6413><e6414><e6415><e6416><e6417><e6418><e6419><e6420><e6421><e6422><e6423><e6424><e6425><e6426><e6427><e6428><e6429><e6430><e6431><e6432><e6433><e6434><e6435><e6436><e6437><e6438><e6439><e6440><e6441><e6442><e6443><e6444><e6445><e6446><e6447><e6448><e6449><e6450><e6451><e6452><e6453><e6454><e6455><e6456><e6457><e6458><e6459><e6460><e6461><e6462><e6463><e6464><e6465><e6466><e6467><e6468><e6469><e6470><e6471><e6472><e6473><e6474><e6475><e6476><e6477><e6478><e6479><e6480><e6481><e6482><e6483><e6484><e6485><e6486><e6487><e6488><e6489><e6490><e6491><e6492><e6493><e6494><e6495><e6496><e6497><e6498><e6499><e6500><e6501><e6502><e6503><e6504><e6505><e6506><e6507><e6508><e6509><e6510><e6511><e6512><e6513><e6514><e6515><e6516><e6517><e6518><e6519><e6520><e6521><e6522><e6523><e6524><e6525><e6526><e6527><e6528><e6529><e6530><e6531><e6532><e6533><e6534><e6535><e6536><e6537><e6538><e6539><e6540><e6541><e6542><e6543><e6544><e6545><e6546><e6547><e6548><e6549><e6550><e6551><e6552><e6553><e6554><e6555><e6556><e6557><e6558><e6559><e6560><e6561><e6562><e6563><e6564><e6565><e6566><e6567><e6568><e6569><e6570><e6571><e6572><e6573><e6574><e6575><e6576><e6577><e6578><e6579><e6580><e6581><e6582><e6583><e6584><e6585><e6586><e6587><e6588><e6589><e6590><e6591><e6592><e6593><e6594><e6595><e6596><e6597><e6598><e6599><e6600><e6601><e6602><e6603><e6604><e6605><e6606><e6607><e6608><e6609><e6610><e6611><e6612><e6613><e6614><e6615><e6616><e6617><e6618><e6619><e6620><e6621><e6622><e6623><e6624><e6625><e6626><e6627><e6628><e6629><e6630><e6631><e6632><e6633><e6634><e6635><e6636><e6637><e6638><e6639><e6640><e6641><e6642><e6643><e6644><e6645><e6646><e6647><e6648><e6649><e6650><e6651><e6652><e6653><e6654><e6655><e6656><e6657><e6658><e6659><e6660><e6661><e6662><e6663><e6664><e6665><e6666><e6667><e6668><e6669><e6670><e6671><e6672><e6673><e6674><e6675><e6676><e6677><e6678><e6679><e6680><e6681><e6682><e6683><e6684><e6685><e6686><e6687><e6688><e6689><e6690><e6691><e6692><e6693><e6694><e6695><e6696><e6697><e6698><e6699><e6700><e6701><e6702><e6703><e6704><e6705><e6706><e6707><e6708><e6709><e6710><e6711><e6712><e6713><e6714><e6715><e6716><e6717><e6718><e6719><e6720><e6721><e6722><e6723><e6724><e6725><e6726><e6727><e6728><e6729><e6730><e6731><e6732><e6733><e6734><e6735><e6736><e6737><e6738><e6739><e6740><e6741><e6742><e6743><e6744><e6745><e6746><e6747><e6748><e6749><e6750><e6751><e6752><e6753><e6754><e6755><e6756><e6757><e6758><e6759><e6760><e6761><e6762><e6763><e6764><e6765><e6766><e6767><e6768><e6769><e6770><e6771><e6772><e6773><e6774><e6775><e6776><e6777><e6778><e6779><e6780><e6781><e6782><e6783><e6784><e6785><e6786><e6787><e6788><e6789><e6790><e6791><e6792><e6793><e6794><e6795><e6796><e6797><e6798><e6799><e6800><e6801><e6802><e6803><e6804><e6805><e6806><e6807><e6808><e6809><e6810><e6811><e6812><e6813><e6814><e6815><e6816><e6817><e6818><e6819><e6820><e6821><e6822><e6823><e6824><e6825><e6826><e6827><e6828><e6829><e6830><e6831><e6832><e6833><e6834><e6835><e6836><e6837><e6838><e6839><e6840><e6841><e6842><e6843><e6844><e6845><e6846><e6847><e6848><e6849><e6850><e6851><e6852><e6853><e6854><e6855><e6856><e6857><e6858><e6859><e6860><e6861><e6862><e6863><e6864><e6865><e6866><e6867><e6868><e6869><e6870><e6871><e6872><e6873><e6874><e6875><e6876><e6877><e6878><e6879><e6880><e6881><e6882><e6883><e6884><e6885><e6886><e6887><e6888><e6889><e6890><e6891><e6892><e6893><e6894><e6895><e6896><e6897><e6898><e6899><e6900><e6901><e6902><e6903><e6904><e6905><e6906><e6907><e6908><e6909><e6910><e6911><e6912><e6913><e6914><e6915><e6916><e6917><e6918><e6919><e6920><e6921><e6922><e6923><e6924><e6925><e6926><e6927><e6928><e6929><e6930><e6931><e6932><e6933><e6934><e6935><e6936><e6937><e6938><e6939><e6940><e6941><e6942><e6943><e6944><e6945><e6946><e6947><e6948><e6949><e6950><e6951><e6952><e6953><e6954><e6955><e6956><e6957><e6958><e6959><e6960><e6961><e6962><e6963><e6964><e6965><e6966><e6967><e6968><e6969><e6970><e6971><e6972><e6973><e6974><e6975><e6976><e6977><e6978><e6979><e6980><e6981><e6982><e6983><e6984><e6985><e6986><e6987><e6988><e6989><e6990><e6991><e6992><e6993><e6994><e6995><e6996><e6997><e6998><e6999><e7000><e7001><e7002><e7003><e7004><e7005><e7006><e7007><e7008><e7009><e7010><e7011><e7012><e7013><e7014><e7015><e7016><e7017><e7018><e7019><e7020><e7021><e7022><e7023><e7024><e7025><e7026><e7027><e7028><e7029><e7030><e7031><e7032><e7033><e7034><e7035><e7036><e7037><e7038><e7039><e7040><e7041><e7042><e7043><e7044><e7045><e7046><e7047><e7048><e7049><e7050><e7051><e7052><e7053><e7054><e7055><e7056><e7057><e7058><e7059><e7060><e7061><e7062><e7063><e7064><e7065><e7066><e7067><e7068><e7069><e7070><e7071><e7072><e7073><e7074><e7075><e7076><e7077><e7078><e7079><e7080><e7081><e7082><e7083><e7084><e7085><e7086><e7087><e7088><e7089><e7090><e7091><e7092><e7093><e7094><e7095><e7096><e7097><e7098><e7099><e7100><e7101><e7102><e7103><e7104><e7105><e7106><e7107><e7108><e7109><e7110><e7111><e7112><e7113><e7114><e7115><e7116><e7117><e7118><e7119><e7120><e7121><e7122><e7123><e7124><e7125><e7126><e7127><e7128><e7129><e7130><e7131><e7132><e7133><e7134><e7135><e7136><e7137><e7138><e7139><e7140><e7141><e7142><e7143><e7144><e7145><e7146><e7147><e7148><e7149><e7150><e7151><e7152><e7153><e7154><e7155><e7156><e7157><e7158><e7159><e7160><e7161><e7162><e7163><e7164><e7165><e7166><e7167><e7168><e7169><e7170><e7171><e7172><e7173><e7174><e7175><e7176><e7177><e7178><e7179><e7180><e7181><e7182><e7183><e7184><e7185><e7186><e7187><e7188><e7189><e7190><e7191><e7192><e7193><e7194><e7195><e7196><e7197><e7198><e7199><e7200><e7201><e7202><e7203><e7204><e7205><e7206><e7207><e7208><e7209><e7210><e7211><e7212><e7213><e7214><e7215><e7216><e7217><e7218><e7219><e7220><e7221><e7222><e7223><e7224><e7225><e7226><e7227><e7228><e7229><e7230><e7231><e7232><e7233><e7234><e7235><e7236><e7237><e7238><e7239><e7240><e7241><e7242><e7243><e7244><e7245><e7246><e7247><e7248><e7249><e7250><e7251><e7252><e7253><e7254><e7255><e7256><e7257><e7258><e7259><e7260><e7261><e7262><e7263><e7264><e7265><e7266><e7267><e7268><e7269><e7270><e7271><e7272><e7273><e7274><e7275><e7276><e7277><e7278><e7279><e7280><e7281><e7282><e7283><e7284><e7285><e7286><e7287><e7288><e7289><e7290><e7291><e7292><e7293><e7294><e7295><e7296><e7297><e7298><e7299><e7300><e7301><e7302><e7303><e7304><e7305><e7306><e7307><e7308><e7309><e7310><e7311><e7312><e7313><e7314><e7315><e7316><e7317><e7318><e7319><e7320><e7321><e7322><e7323><e7324><e7325><e7326><e7327><e7328><e7329><e7330><e7331><e7332><e7333><e7334><e7335><e7336><e7337><e7338><e7339><e7340><e7341><e7342><e7343><e7344><e7345><e7346><e7347><e7348><e7349><e7350><e7351><e7352><e7353><e7354><e7355><e7356><e7357><e7358><e7359><e7360><e7361><e7362><e7363><e7364><e7365><e7366><e7367><e7368><e7369><e7370><e7371><e7372><e7373><e7374><e7375><e7376><e7377><e7378><e7379><e7380><e7381><e7382><e7383><e7384><e7385><e7386><e7387><e7388><e7389><e7390><e7391><e7392><e7393><e7394><e7395><e7396><e7397><e7398><e7399><e7400><e7401><e7402><e7403><e7404><e7405><e7406><e7407><e7408><e7409><e7410><e7411><e7412><e7413><e7414><e7415><e7416><e7417><e7418><e7419><e7420><e7421><e7422><e7423><e7424><e7425><e7426><e7427><e7428><e7429><e7430><e7431><e7432><e7433><e7434><e7435><e7436><e7437><e7438><e7439><e7440><e7441><e7442><e7443><e7444><e7445><e7446><e7447><e7448><e7449><e7450><e7451><e7452><e7453><e7454><e7455><e7456><e7457><e7458><e7459><e7460><e7461><e7462><e7463><e7464><e7465><e7466><e7467><e7468><e7469><e7470><e7471><e7472><e7473><e7474><e7475><e7476><e7477><e7478><e7479><e7480><e7481><e7482><e7483><e7484><e7485><e7486><e7487><e7488><e7489><e7490><e7491><e7492><e7493><e7494><e7495><e7496><e7497><e7498><e7499><e7500><e7501><e7502><e7503><e7504><e7505><e7506><e7507><e7508><e7509><e7510><e7511><e7512><e7513><e7514><e7515><e7516><e7517><e7518><e7519><e7520><e7521><e7522><e7523><e7524><e7525><e7526><e7527><e7528><e7529><e7530><e7531><e7532><e7533><e7534><e7535><e7536><e7537><e7538><e7539><e7540><e7541><e7542><e7543><e7544><e7545><e7546><e7547><e7548><e7549><e7550><e7551><e7552><e7553><e7554><e7555><e7556><e7557><e7558><e7559><e7560><e7561><e7562><e7563><e7564><e7565><e7566><e7567><e7568><e7569><e7570><e7571><e7572><e7573><e7574><e7575><e7576><e7577><e7578><e7579><e7580><e7581><e7582><e7583><e7584><e7585><e7586><e7587><e7588><e7589><e7590><e7591><e7592><e7593><e7594><e7595><e7596><e7597><e7598><e7599><e7600><e7601><e7602><e7603><e7604><e7605><e7606><e7607><e7608><e7609><e7610><e7611><e7612><e7613><e7614><e7615><e7616><e7617><e7618><e7619><e7620><e7621><e7622><e7623><e7624><e7625><e7626><e7627><e7628><e7629><e7630><e7631><e7632><e7633><e7634><e7635><e7636><e7637><e7638><e7639><e7640><e7641><e7642><e7643><e7644><e7645><e7646><e7647><e7648><e7649><e7650><e7651><e7652><e7653><e7654><e7655><e7656><e7657><e7658><e7659><e7660><e7661><e7662><e7663><e7664><e7665><e7666><e7667><e7668><e7669><e7670><e7671><e7672><e7673><e7674><e7675><e7676><e7677><e7678><e7679><e7680><e7681><e7682><e7683><e7684><e7685><e7686><e7687><e7688><e7689><e7690><e7691><e7692><e7693><e7694><e7695><e7696><e7697><e7698><e7699><e7700><e7701><e7702><e7703><e7704><e7705><e7706><e7707><e7708><e7709><e7710><e7711><e7712><e7713><e7714><e7715><e7716><e7717><e7718><e7719><e7720><e7721><e7722><e7723><e7724><e7725><e7726><e7727><e7728><e7729><e7730><e7731><e7732><e7733><e7734><e7735><e7736><e7737><e7738><e7739><e7740><e7741><e7742><e7743><e7744><e7745><e7746><e7747><e7748><e7749><e7750><e7751><e7752><e7753><e7754><e7755><e7756><e7757><e7758><e7759><e7760><e7761><e7762><e7763><e7764><e7765><e7766><e7767><e7768><e7769><e7770><e7771><e7772><e7773><e7774><e7775><e7776><e7777><e7778><e7779><e7780><e7781><e7782><e7783><e7784><e7785><e7786><e7787><e7788><e7789><e7790><e7791><e7792><e7793><e7794><e7795><e7796><e7797><e7798><e7799><e7800><e7801><e7802><e7803><e7804><e7805><e7806><e7807><e7808><e7809><e7810><e7811><e7812><e7813><e7814><e7815><e7816><e7817><e7818><e7819><e7820><e7821><e7822><e7823><e7824><e7825><e7826><e7827><e7828><e7829><e7830><e7831><e7832><e7833><e7834><e7835><e7836><e7837><e7838><e7839><e7840><e7841><e7842><e7843><e7844><e7845><e7846><e7847><e7848><e7849><e7850><e7851><e7852><e7853><e7854><e7855><e7856><e7857><e7858><e7859><e7860><e7861><e7862><e7863><e7864><e7865><e7866><e7867><e7868><e7869><e7870><e7871><e7872><e7873><e7874><e7875><e7876><e7877><e7878><e7879><e7880><e7881><e7882><e7883><e7884><e7885><e7886><e7887><e7888><e7889><e7890><e7891><e7892><e7893><e7894><e7895><e7896><e7897><e7898><e7899><e7900><e7901><e7902><e7903><e7904><e7905><e7906><e7907><e7908><e7909><e7910><e7911><e7912><e7913><e7914><e7915><e7916><e7917><e7918><e7919><e7920><e7921><e7922><e7923><e7924><e7925><e7926><e7927><e7928><e7929><e7930><e7931><e7932><e7933><e7934><e7935><e7936><e7937><e7938><e7939><e7940><e7941><e7942><e7943><e7944><e7945><e7946><e7947><e7948><e7949><e7950><e7951><e7952><e7953><e7954><e7955><e7956><e7957><e7958><e7959><e7960><e7961><e7962><e7963><e7964><e7965><e7966><e7967><e7968><e7969><e7970><e7971><e7972><e7973><e7974><e7975><e7976><e7977><e7978><e7979><e7980><e7981><e7982><e7983><e7984><e7985><e7986><e7987><e7988><e7989><e7990><e7991><e7992><e7993><e7994><e7995><e7996><e7997><e7998><e7999><e8000><e8001><e8002><e8003><e8004><e8005><e8006><e8007><e8008><e8009><e8010><e8011><e8012><e8013><e8014><e8015><e8016><e8017><e8018><e8019><e8020><e8021><e8022><e8023><e8024><e8025><e8026><e8027><e8028><e8029><e8030><e8031><e8032><e8033><e8034><e8035><e8036><e8037><e8038><e8039><e8040><e8041><e8042><e8043><e8044><e8045><e8046><e8047><e8048><e8049><e8050><e8051><e8052><e8053><e8054><e8055><e8056><e8057><e8058><e8059><e8060><e8061><e8062><e8063><e8064><e8065><e8066><e8067><e8068><e8069><e8070><e8071><e8072><e8073><e8074><e8075><e8076><e8077><e8078><e8079><e8080><e8081><e8082><e8083><e8084><e8085><e8086><e8087><e8088><e8089><e8090><e8091><e8092><e8093><e8094><e8095><e8096><e8097><e8098><e8099><e8100><e8101><e8102><e8103><e8104><e8105><e8106><e8107><e8108><e8109><e8110><e8111><e8112><e8113><e8114><e8115><e8116><e8117><e8118><e8119><e8120><e8121><e8122><e8123><e8124><e8125><e8126><e8127><e8128><e8129><e8130><e8131><e8132><e8133><e8134><e8135><e8136><e8137><e8138><e8139><e8140><e8141><e8142><e8143><e8144><e8145><e8146><e8147><e8148><e8149><e8150><e8151><e8152><e8153><e8154><e8155><e8156><e8157><e8158><e8159><e8160><e8161><e8162><e8163><e8164><e8165><e8166><e8167><e8168><e8169><e8170><e8171><e8172><e8173><e8174><e8175><e8176><e8177><e8178><e8179><e8180><e8181><e8182><e8183><e8184><e8185><e8186><e8187><e8188><e8189><e8190><e8191><e8192><e8193><e8194><e8195><e8196><e8197><e8198><e8199><e8200><e8201><e8202><e8203><e8204><e8205><e8206><e8207><e8208><e8209><e8210><e8211><e8212><e8213><e8214><e8215><e8216><e8217><e8218><e8219><e8220><e8221><e8222><e8223><e8224><e8225><e8226><e8227><e8228><e8229><e8230><e8231><e8232><e8233><e8234><e8235><e8236><e8237><e8238><e8239><e8240><e8241><e8242><e8243><e8244><e8245><e8246><e8247><e8248><e8249><e8250><e8251><e8252><e8253><e8254><e8255><e8256><e8257><e8258><e8259><e8260><e8261><e8262><e8263><e8264><e8265><e8266><e8267><e8268><e8269><e8270><e8271><e8272><e8273><e8274><e8275><e8276><e8277><e8278><e8279><e8280><e8281><e8282><e8283><e8284><e8285><e8286><e8287><e8288><e8289><e8290><e8291><e8292><e8293><e8294><e8295><e8296><e8297><e8298><e8299><e8300><e8301><e8302><e8303><e8304><e8305><e8306><e8307><e8308><e8309><e8310><e8311><e8312><e8313><e8314><e8315><e8316><e8317><e8318><e8319><e8320><e8321><e8322><e8323><e8324><e8325><e8326><e8327><e8328><e8329><e8330><e8331><e8332><e8333><e8334><e8335><e8336><e8337><e8338><e8339><e8340><e8341><e8342><e8343><e8344><e8345><e8346><e8347><e8348><e8349><e8350><e8351><e8352><e8353><e8354><e8355><e8356><e8357><e8358><e8359><e8360><e8361><e8362><e8363><e8364><e8365><e8366><e8367><e8368><e8369><e8370><e8371><e8372><e8373><e8374><e8375><e8376><e8377><e8378><e8379><e8380><e8381><e8382><e8383><e8384><e8385><e8386><e8387><e8388><e8389><e8390><e8391><e8392><e8393><e8394><e8395><e8396><e8397><e8398><e8399><e8400><e8401><e8402><e8403><e8404><e8405><e8406><e8407><e8408><e8409><e8410><e8411><e8412><e8413><e8414><e8415><e8416><e8417><e8418><e8419><e8420><e8421><e8422><e8423><e8424><e8425><e8426><e8427><e8428><e8429><e8430><e8431><e8432><e8433><e8434><e8435><e8436><e8437><e8438><e8439><e8440><e8441><e8442><e8443><e8444><e8445><e8446><e8447><e8448><e8449><e8450><e8451><e8452><e8453><e8454><e8455><e8456><e8457><e8458><e8459><e8460><e8461><e8462><e8463><e8464><e8465><e8466><e8467><e8468><e8469><e8470><e8471><e8472><e8473><e8474><e8475><e8476><e8477><e8478><e8479><e8480><e8481><e8482><e8483><e8484><e8485><e8486><e8487><e8488><e8489><e8490><e8491><e8492><e8493><e8494><e8495><e8496><e8497><e8498><e8499><e8500><e8501><e8502><e8503><e8504><e8505><e8506><e8507><e8508><e8509><e8510><e8511><e8512><e8513><e8514><e8515><e8516><e8517><e8518><e8519><e8520><e8521><e8522><e8523><e8524><e8525><e8526><e8527><e8528><e8529><e8530><e8531><e8532><e8533><e8534><e8535><e8536><e8537><e8538><e8539><e8540><e8541><e8542><e8543><e8544><e8545><e8546><e8547><e8548><e8549><e8550><e8551><e8552><e8553><e8554><e8555><e8556><e8557><e8558><e8559><e8560><e8561><e8562><e8563><e8564><e8565><e8566><e8567><e8568><e8569><e8570><e8571><e8572><e8573><e8574><e8575><e8576><e8577><e8578><e8579><e8580><e8581><e8582><e8583><e8584><e8585><e8586><e8587><e8588><e8589><e8590><e8591><e8592><e8593><e8594><e8595><e8596><e8597><e8598><e8599><e8600><e8601><e8602><e8603><e8604><e8605><e8606><e8607><e8608><e8609><e8610><e8611><e8612><e8613><e8614><e8615><e8616><e8617><e8618><e8619><e8620><e8621><e8622><e8623><e8624><e8625><e8626><e8627><e8628><e8629><e8630><e8631><e8632><e8633><e8634><e8635><e8636><e8637><e8638><e8639><e8640><e8641><e8642><e8643><e8644><e8645><e8646><e8647><e8648><e8649><e8650><e8651><e8652><e8653><e8654><e8655><e8656><e8657><e8658><e8659><e8660><e8661><e8662><e8663><e8664><e8665><e8666><e8667><e8668><e8669><e8670><e8671><e8672><e8673><e8674><e8675><e8676><e8677><e8678><e8679><e8680><e8681><e8682><e8683><e8684><e8685><e8686><e8687><e8688><e8689><e8690><e8691><e8692><e8693><e8694><e8695><e8696><e8697><e8698><e8699><e8700><e8701><e8702><e8703><e8704><e8705><e8706><e8707><e8708><e8709><e8710><e8711><e8712><e8713><e8714><e8715><e8716><e8717><e8718><e8719><e8720><e8721><e8722><e8723><e8724><e8725><e8726><e8727><e8728><e8729><e8730><e8731><e8732><e8733><e8734><e8735><e8736><e8737><e8738><e8739><e8740><e8741><e8742><e8743><e8744><e8745><e8746><e8747><e8748><e8749><e8750><e8751><e8752><e8753><e8754><e8755><e8756><e8757><e8758><e8759><e8760><e8761><e8762><e8763><e8764><e8765><e8766><e8767><e8768><e8769><e8770><e8771><e8772><e8773><e8774><e8775><e8776><e8777><e8778><e8779><e8780><e8781><e8782><e8783><e8784><e8785><e8786><e8787><e8788><e8789><e8790><e8791><e8792><e8793><e8794><e8795><e8796><e8797><e8798><e8799><e8800><e8801><e8802><e8803><e8804><e8805><e8806><e8807><e8808><e8809><e8810><e8811><e8812><e8813><e8814><e8815><e8816><e8817><e8818><e8819><e8820><e8821><e8822><e8823><e8824><e8825><e8826><e8827><e8828><e8829><e8830><e8831><e8832><e8833><e8834><e8835><e8836><e8837><e8838><e8839><e8840><e8841><e8842><e8843><e8844><e8845><e8846><e8847><e8848><e8849><e8850><e8851><e8852><e8853><e8854><e8855><e8856><e8857><e8858><e8859><e8860><e8861><e8862><e8863><e8864><e8865><e8866><e8867><e8868><e8869><e8870><e8871><e8872><e8873><e8874><e8875><e8876><e8877><e8878><e8879><e8880><e8881><e8882><e8883><e8884><e8885><e8886><e8887><e8888><e8889><e8890><e8891><e8892><e8893><e8894><e8895><e8896><e8897><e8898><e8899><e8900><e8901><e8902><e8903><e8904><e8905><e8906><e8907><e8908><e8909><e8910><e8911><e8912><e8913><e8914><e8915><e8916><e8917><e8918><e8919><e8920><e8921><e8922><e8923><e8924><e8925><e8926><e8927><e8928><e8929><e8930><e8931><e8932><e8933><e8934><e8935><e8936><e8937><e8938><e8939><e8940><e8941><e8942><e8943><e8944><e8945><e8946><e8947><e8948><e8949><e8950><e8951><e8952><e8953><e8954><e8955><e8956><e8957><e8958><e8959><e8960><e8961><e8962><e8963><e8964><e8965><e8966><e8967><e8968><e8969><e8970><e8971><e8972><e8973><e8974><e8975><e8976><e8977><e8978><e8979><e8980><e8981><e8982><e8983><e8984><e8985><e8986><e8987><e8988><e8989><e8990><e8991><e8992><e8993><e8994><e8995><e8996><e8997><e8998><e8999><e9000><e9001><e9002><e9003><e9004><e9005><e9006><e9007><e9008><e9009><e9010><e9011><e9012><e9013><e9014><e9015><e9016><e9017><e9018><e9019><e9020><e9021><e9022><e9023><e9024><e9025><e9026><e9027><e9028><e9029><e9030><e9031><e9032><e9033><e9034><e9035><e9036><e9037><e9038><e9039><e9040><e9041><e9042><e9043><e9044><e9045><e9046><e9047><e9048><e9049><e9050><e9051><e9052><e9053><e9054><e9055><e9056><e9057><e9058><e9059><e9060><e9061><e9062><e9063><e9064><e9065><e9066><e9067><e9068><e9069><e9070><e9071><e9072><e9073><e9074><e9075><e9076><e9077><e9078><e9079><e9080><e9081><e9082><e9083><e9084><e9085><e9086><e9087><e9088><e9089><e9090><e9091><e9092><e9093><e9094><e9095><e9096><e9097><e9098><e9099><e9100><e9101><e9102><e9103><e9104><e9105><e9106><e9107><e9108><e9109><e9110><e9111><e9112><e9113><e9114><e9115><e9116><e9117><e9118><e9119><e9120><e9121><e9122><e9123><e9124><e9125><e9126><e9127><e9128><e9129><e9130><e9131><e9132><e9133><e9134><e9135><e9136><e9137><e9138><e9139><e9140><e9141><e9142><e9143><e9144><e9145><e9146><e9147><e9148><e9149><e9150><e9151><e9152><e9153><e9154><e9155><e9156><e9157><e9158><e9159><e9160><e9161><e9162><e9163><e9164><e9165><e9166><e9167><e9168><e9169><e9170><e9171><e9172><e9173><e9174><e9175><e9176><e9177><e9178><e9179><e9180><e9181><e9182><e9183><e9184><e9185><e9186><e9187><e9188><e9189><e9190><e9191><e9192><e9193><e9194><e9195><e9196><e9197><e9198><e9199><e9200><e9201><e9202><e9203><e9204><e9205><e9206><e9207><e9208><e9209><e9210><e9211><e9212><e9213><e9214><e9215><e9216><e9217><e9218><e9219><e9220><e9221><e9222><e9223><e9224><e9225><e9226><e9227><e9228><e9229><e9230><e9231><e9232><e9233><e9234><e9235><e9236><e9237><e9238><e9239><e9240><e9241><e9242><e9243><e9244><e9245><e9246><e9247><e9248><e9249><e9250><e9251><e9252><e9253><e9254><e9255><e9256><e9257><e9258><e9259><e9260><e9261><e9262><e9263><e9264><e9265><e9266><e9267><e9268><e9269><e9270><e9271><e9272><e9273><e9274><e9275><e9276><e9277><e9278><e9279><e9280><e9281><e9282><e9283><e9284><e9285><e9286><e9287><e9288><e9289><e9290><e9291><e9292><e9293><e9294><e9295><e9296><e9297><e9298><e9299><e9300><e9301><e9302><e9303><e9304><e9305><e9306><e9307><e9308><e9309><e9310><e9311><e9312><e9313><e9314><e9315><e9316><e9317><e9318><e9319><e9320><e9321><e9322><e9323><e9324><e9325><e9326><e9327><e9328><e9329><e9330><e9331><e9332><e9333><e9334><e9335><e9336><e9337><e9338><e9339><e9340><e9341><e9342><e9343><e9344><e9345><e9346><e9347><e9348><e9349><e9350><e9351><e9352><e9353><e9354><e9355><e9356><e9357><e9358><e9359><e9360><e9361><e9362><e9363><e9364><e9365><e9366><e9367><e9368><e9369><e9370><e9371><e9372><e9373><e9374><e9375><e9376><e9377><e9378><e9379><e9380><e9381><e9382><e9383><e9384><e9385><e9386><e9387><e9388><e9389><e9390><e9391><e9392><e9393><e9394><e9395><e9396><e9397><e9398><e9399><e9400><e9401><e9402><e9403><e9404><e9405><e9406><e9407><e9408><e9409><e9410><e9411><e9412><e9413><e9414><e9415><e9416><e9417><e9418><e9419><e9420><e9421><e9422><e9423><e9424><e9425><e9426><e9427><e9428><e9429><e9430><e9431><e9432><e9433><e9434><e9435><e9436><e9437><e9438><e9439><e9440><e9441><e9442><e9443><e9444><e9445><e9446><e9447><e9448><e9449><e9450><e9451><e9452><e9453><e9454><e9455><e9456><e9457><e9458><e9459><e9460><e9461><e9462><e9463><e9464><e9465><e9466><e9467><e9468><e9469><e9470><e9471><e9472><e9473><e9474><e9475><e9476><e9477><e9478><e9479><e9480><e9481><e9482><e9483><e9484><e9485><e9486><e9487><e9488><e9489><e9490><e9491><e9492><e9493><e9494><e9495><e9496><e9497><e9498><e9499><e9500><e9501><e9502><e9503><e9504><e9505><e9506><e9507><e9508><e9509><e9510><e9511><e9512><e9513><e9514><e9515><e9516><e9517><e9518><e9519><e9520><e9521><e9522><e9523><e9524><e9525><e9526><e9527><e9528><e9529><e9530><e9531><e9532><e9533><e9534><e9535><e9536><e9537><e9538><e9539><e9540><e9541><e9542><e9543><e9544><e9545><e9546><e9547><e9548><e9549><e9550><e9551><e9552><e9553><e9554><e9555><e9556><e9557><e9558><e9559><e9560><e9561><e9562><e9563><e9564><e9565><e9566><e9567><e9568><e9569><e9570><e9571><e9572><e9573><e9574><e9575><e9576><e9577><e9578><e9579><e9580><e9581><e9582><e9583><e9584><e9585><e9586><e9587><e9588><e9589><e9590><e9591><e9592><e9593><e9594><e9595><e9596><e9597><e9598><e9599><e9600><e9601><e9602><e9603><e9604><e9605><e9606><e9607><e9608><e9609><e9610><e9611><e9612><e9613><e9614><e9615><e9616><e9617><e9618><e9619><e9620><e9621><e9622><e9623><e9624><e9625><e9626><e9627><e9628><e9629><e9630><e9631><e9632><e9633><e9634><e9635><e9636><e9637><e9638><e9639><e9640><e9641><e9642><e9643><e9644><e9645><e9646><e9647><e9648><e9649><e9650><e9651><e9652><e9653><e9654><e9655><e9656><e9657><e9658><e9659><e9660><e9661><e9662><e9663><e9664><e9665><e9666><e9667><e9668><e9669><e9670><e9671><e9672><e9673><e9674><e9675><e9676><e9677><e9678><e9679><e9680><e9681><e9682><e9683><e9684><e9685><e9686><e9687><e9688><e9689><e9690><e9691><e9692><e9693><e9694><e9695><e9696><e9697><e9698><e9699><e9700><e9701><e9702><e9703><e9704><e9705><e9706><e9707><e9708><e9709><e9710><e9711><e9712><e9713><e9714><e9715><e9716><e9717><e9718><e9719><e9720><e9721><e9722><e9723><e9724><e9725><e9726><e9727><e9728><e9729><e9730><e9731><e9732><e9733><e9734><e9735><e9736><e9737><e9738><e9739><e9740><e9741><e9742><e9743><e9744><e9745><e9746><e9747><e9748><e9749><e9750><e9751><e9752><e9753><e9754><e9755><e9756><e9757><e9758><e9759><e9760><e9761><e9762><e9763><e9764><e9765><e9766><e9767><e9768><e9769><e9770><e9771><e9772><e9773><e9774><e9775><e9776><e9777><e9778><e9779><e9780><e9781><e9782><e9783><e9784><e9785><e9786><e9787><e9788><e9789><e9790><e9791><e9792><e9793><e9794><e9795><e9796><e9797><e9798><e9799><e9800><e9801><e9802><e9803><e9804><e9805><e9806><e9807><e9808><e9809><e9810><e9811><e9812><e9813><e9814><e9815><e9816><e9817><e9818><e9819><e9820><e9821><e9822><e9823><e9824><e9825><e9826><e9827><e9828><e9829><e9830><e9831><e9832><e9833><e9834><e9835><e9836><e9837><e9838><e9839><e9840><e9841><e9842><e9843><e9844><e9845><e9846><e9847><e9848><e9849><e9850><e9851><e9852><e9853><e9854><e9855><e9856><e9857><e9858><e9859><e9860><e9861><e9862><e9863><e9864><e9865><e9866><e9867><e9868><e9869><e9870><e9871><e9872><e9873><e9874><e9875><e9876><e9877><e9878><e9879><e9880><e9881><e9882><e9883><e9884><e9885><e9886><e9887><e9888><e9889><e9890><e9891><e9892><e9893><e9894><e9895><e9896><e9897><e9898><e9899><e9900><e9901><e9902><e9903><e9904><e9905><e9906><e9907><e9908><e9909><e9910><e9911><e9912><e9913><e9914><e9915><e9916><e9917><e9918><e9919><e9920><e9921><e9922><e9923><e9924><e9925><e9926><e9927><e9928><e9929><e9930><e9931><e9932><e9933><e9934><e9935><e9936><e9937><e9938><e9939><e9940><e9941><e9942><e9943><e9944><e9945><e9946><e9947><e9948><e9949><e9950><e9951><e9952><e9953><e9954><e9955><e9956><e9957><e9958><e9959><e9960><e9961><e9962><e9963><e9964><e9965><e9966><e9967><e9968><e9969><e9970><e9971><e9972><e9973><e9974><e9975><e9976><e9977><e9978><e9979><e9980><e9981><e9982><e9983><e9984><e9985><e9986><e9987><e9988><e9989><e9990><e9991><e9992><e9993><e9994><e9995><e9996><e9997><e9998><e9999><e10000/></e9999></e9998></e9997></e9996></e9995></e9994></e9993></e9992></e9991></e9990></e9989></e9988></e9987></e9986></e9985></e9984></e9983></e9982></e9981></e9980></e9979></e9978></e9977></e9976></e9975></e9974></e9973></e9972></e9971></e9970></e9969></e9968></e9967></e9966></e9965></e9964></e9963></e9962></e9961></e9960></e9959></e9958></e9957></e9956></e9955></e9954></e9953></e9952></e9951></e9950></e9949></e9948></e9947></e9946></e9945></e9944></e9943></e9942></e9941></e9940></e9939></e9938></e9937></e9936></e9935></e9934></e9933></e9932></e9931></e9930></e9929></e9928></e9927></e9926></e9925></e9924></e9923></e9922></e9921></e9920></e9919></e9918></e9917></e9916></e9915></e9914></e9913></e9912></e9911></e9910></e9909></e9908></e9907></e9906></e9905></e9904></e9903></e9902></e9901></e9900></e9899></e9898></e9897></e9896></e9895></e9894></e9893></e9892></e9891></e9890></e9889></e9888></e9887></e9886></e9885></e9884></e9883></e9882></e9881></e9880></e9879></e9878></e9877></e9876></e9875></e9874></e9873></e9872></e9871></e9870></e9869></e9868></e9867></e9866></e9865></e9864></e9863></e9862></e9861></e9860></e9859></e9858></e9857></e9856></e9855></e9854></e9853></e9852></e9851></e9850></e9849></e9848></e9847></e9846></e9845></e9844></e9843></e9842></e9841></e9840></e9839></e9838></e9837></e9836></e9835></e9834></e9833></e9832></e9831></e9830></e9829></e9828></e9827></e9826></e9825></e9824></e9823></e9822></e9821></e9820></e9819></e9818></e9817></e9816></e9815></e9814></e9813></e9812></e9811></e9810></e9809></e9808></e9807></e9806></e9805></e9804></e9803></e9802></e9801></e9800></e9799></e9798></e9797></e9796></e9795></e9794></e9793></e9792></e9791></e9790></e9789></e9788></e9787></e9786></e9785></e9784></e9783></e9782></e9781></e9780></e9779></e9778></e9777></e9776></e9775></e9774></e9773></e9772></e9771></e9770></e9769></e9768></e9767></e9766></e9765></e9764></e9763></e9762></e9761></e9760></e9759></e9758></e9757></e9756></e9755></e9754></e9753></e9752></e9751></e9750></e9749></e9748></e9747></e9746></e9745></e9744></e9743></e9742></e9741></e9740></e9739></e9738></e9737></e9736></e9735></e9734></e9733></e9732></e9731></e9730></e9729></e9728></e9727></e9726></e9725></e9724></e9723></e9722></e9721></e9720></e9719></e9718></e9717></e9716></e9715></e9714></e9713></e9712></e9711></e9710></e9709></e9708></e9707></e9706></e9705></e9704></e9703></e9702></e9701></e9700></e9699></e9698></e9697></e9696></e9695></e9694></e9693></e9692></e9691></e9690></e9689></e9688></e9687></e9686></e9685></e9684></e9683></e9682></e9681></e9680></e9679></e9678></e9677></e9676></e9675></e9674></e9673></e9672></e9671></e9670></e9669></e9668></e9667></e9666></e9665></e9664></e9663></e9662></e9661></e9660></e9659></e9658></e9657></e9656></e9655></e9654></e9653></e9652></e9651></e9650></e9649></e9648></e9647></e9646></e9645></e9644></e9643></e9642></e9641></e9640></e9639></e9638></e9637></e9636></e9635></e9634></e9633></e9632></e9631></e9630></e9629></e9628></e9627></e9626></e9625></e9624></e9623></e9622></e9621></e9620></e9619></e9618></e9617></e9616></e9615></e9614></e9613></e9612></e9611></e9610></e9609></e9608></e9607></e9606></e9605></e9604></e9603></e9602></e9601></e9600></e9599></e9598></e9597></e9596></e9595></e9594></e9593></e9592></e9591></e9590></e9589></e9588></e9587></e9586></e9585></e9584></e9583></e9582></e9581></e9580></e9579></e9578></e9577></e9576></e9575></e9574></e9573></e9572></e9571></e9570></e9569></e9568></e9567></e9566></e9565></e9564></e9563></e9562></e9561></e9560></e9559></e9558></e9557></e9556></e9555></e9554></e9553></e9552></e9551></e9550></e9549></e9548></e9547></e9546></e9545></e9544></e9543></e9542></e9541></e9540></e9539></e9538></e9537></e9536></e9535></e9534></e9533></e9532></e9531></e9530></e9529></e9528></e9527></e9526></e9525></e9524></e9523></e9522></e9521></e9520></e9519></e9518></e9517></e9516></e9515></e9514></e9513></e9512></e9511></e9510></e9509></e9508></e9507></e9506></e9505></e9504></e9503></e9502></e9501></e9500></e9499></e9498></e9497></e9496></e9495></e9494></e9493></e9492></e9491></e9490></e9489></e9488></e9487></e9486></e9485></e9484></e9483></e9482></e9481></e9480></e9479></e9478></e9477></e9476></e9475></e9474></e9473></e9472></e9471></e9470></e9469></e9468></e9467></e9466></e9465></e9464></e9463></e9462></e9461></e9460></e9459></e9458></e9457></e9456></e9455></e9454></e9453></e9452></e9451></e9450></e9449></e9448></e9447></e9446></e9445></e9444></e9443></e9442></e9441></e9440></e9439></e9438></e9437></e9436></e9435></e9434></e9433></e9432></e9431></e9430></e9429></e9428></e9427></e9426></e9425></e9424></e9423></e9422></e9421></e9420></e9419></e9418></e9417></e9416></e9415></e9414></e9413></e9412></e9411></e9410></e9409></e9408></e9407></e9406></e9405></e9404></e9403></e9402></e9401></e9400></e9399></e9398></e9397></e9396></e9395></e9394></e9393></e9392></e9391></e9390></e9389></e9388></e9387></e9386></e9385></e9384></e9383></e9382></e9381></e9380></e9379></e9378></e9377></e9376></e9375></e9374></e9373></e9372></e9371></e9370></e9369></e9368></e9367></e9366></e9365></e9364></e9363></e9362></e9361></e9360></e9359></e9358></e9357></e9356></e9355></e9354></e9353></e9352></e9351></e9350></e9349></e9348></e9347></e9346></e9345></e9344></e9343></e9342></e9341></e9340></e9339></e9338></e9337></e9336></e9335></e9334></e9333></e9332></e9331></e9330></e9329></e9328></e9327></e9326></e9325></e9324></e9323></e9322></e9321></e9320></e9319></e9318></e9317></e9316></e9315></e9314></e9313></e9312></e9311></e9310></e9309></e9308></e9307></e9306></e9305></e9304></e9303></e9302></e9301></e9300></e9299></e9298></e9297></e9296></e9295></e9294></e9293></e9292></e9291></e9290></e9289></e9288></e9287></e9286></e9285></e9284></e9283></e9282></e9281></e9280></e9279></e9278></e9277></e9276></e9275></e9274></e9273></e9272></e9271></e9270></e9269></e9268></e9267></e9266></e9265></e9264></e9263></e9262></e9261></e9260></e9259></e9258></e9257></e9256></e9255></e9254></e9253></e9252></e9251></e9250></e9249></e9248></e9247></e9246></e9245></e9244></e9243></e9242></e9241></e9240></e9239></e9238></e9237></e9236></e9235></e9234></e9233></e9232></e9231></e9230></e9229></e9228></e9227></e9226></e9225></e9224></e9223></e9222></e9221></e9220></e9219></e9218></e9217></e9216></e9215></e9214></e9213></e9212></e9211></e9210></e9209></e9208></e9207></e9206></e9205></e9204></e9203></e9202></e9201></e9200></e9199></e9198></e9197></e9196></e9195></e9194></e9193></e9192></e9191></e9190></e9189></e9188></e9187></e9186></e9185></e9184></e9183></e9182></e9181></e9180></e9179></e9178></e9177></e9176></e9175></e9174></e9173></e9172></e9171></e9170></e9169></e9168></e9167></e9166></e9165></e9164></e9163></e9162></e9161></e9160></e9159></e9158></e9157></e9156></e9155></e9154></e9153></e9152></e9151></e9150></e9149></e9148></e9147></e9146></e9145></e9144></e9143></e9142></e9141></e9140></e9139></e9138></e9137></e9136></e9135></e9134></e9133></e9132></e9131></e9130></e9129></e9128></e9127></e9126></e9125></e9124></e9123></e9122></e9121></e9120></e9119></e9118></e9117></e9116></e9115></e9114></e9113></e9112></e9111></e9110></e9109></e9108></e9107></e9106></e9105></e9104></e9103></e9102></e9101></e9100></e9099></e9098></e9097></e9096></e9095></e9094></e9093></e9092></e9091></e9090></e9089></e9088></e9087></e9086></e9085></e9084></e9083></e9082></e9081></e9080></e9079></e9078></e9077></e9076></e9075></e9074></e9073></e9072></e9071></e9070></e9069></e9068></e9067></e9066></e9065></e9064></e9063></e9062></e9061></e9060></e9059></e9058></e9057></e9056></e9055></e9054></e9053></e9052></e9051></e9050></e9049></e9048></e9047></e9046></e9045></e9044></e9043></e9042></e9041></e9040></e9039></e9038></e9037></e9036></e9035></e9034></e9033></e9032></e9031></e9030></e9029></e9028></e9027></e9026></e9025></e9024></e9023></e9022></e9021></e9020></e9019></e9018></e9017></e9016></e9015></e9014></e9013></e9012></e9011></e9010></e9009></e9008></e9007></e9006></e9005></e9004></e9003></e9002></e9001></e9000></e8999></e8998></e8997></e8996></e8995></e8994></e8993></e8992></e8991></e8990></e8989></e8988></e8987></e8986></e8985></e8984></e8983></e8982></e8981></e8980></e8979></e8978></e8977></e8976></e8975></e8974></e8973></e8972></e8971></e8970></e8969></e8968></e8967></e8966></e8965></e8964></e8963></e8962></e8961></e8960></e8959></e8958></e8957></e8956></e8955></e8954></e8953></e8952></e8951></e8950></e8949></e8948></e8947></e8946></e8945></e8944></e8943></e8942></e8941></e8940></e8939></e8938></e8937></e8936></e8935></e8934></e8933></e8932></e8931></e8930></e8929></e8928></e8927></e8926></e8925></e8924></e8923></e8922></e8921></e8920></e8919></e8918></e8917></e8916></e8915></e8914></e8913></e8912></e8911></e8910></e8909></e8908></e8907></e8906></e8905></e8904></e8903></e8902></e8901></e8900></e8899></e8898></e8897></e8896></e8895></e8894></e8893></e8892></e8891></e8890></e8889></e8888></e8887></e8886></e8885></e8884></e8883></e8882></e8881></e8880></e8879></e8878></e8877></e8876></e8875></e8874></e8873></e8872></e8871></e8870></e8869></e8868></e8867></e8866></e8865></e8864></e8863></e8862></e8861></e8860></e8859></e8858></e8857></e8856></e8855></e8854></e8853></e8852></e8851></e8850></e8849></e8848></e8847></e8846></e8845></e8844></e8843></e8842></e8841></e8840></e8839></e8838></e8837></e8836></e8835></e8834></e8833></e8832></e8831></e8830></e8829></e8828></e8827></e8826></e8825></e8824></e8823></e8822></e8821></e8820></e8819></e8818></e8817></e8816></e8815></e8814></e8813></e8812></e8811></e8810></e8809></e8808></e8807></e8806></e8805></e8804></e8803></e8802></e8801></e8800></e8799></e8798></e8797></e8796></e8795></e8794></e8793></e8792></e8791></e8790></e8789></e8788></e8787></e8786></e8785></e8784></e8783></e8782></e8781></e8780></e8779></e8778></e8777></e8776></e8775></e8774></e8773></e8772></e8771></e8770></e8769></e8768></e8767></e8766></e8765></e8764></e8763></e8762></e8761></e8760></e8759></e8758></e8757></e8756></e8755></e8754></e8753></e8752></e8751></e8750></e8749></e8748></e8747></e8746></e8745></e8744></e8743></e8742></e8741></e8740></e8739></e8738></e8737></e8736></e8735></e8734></e8733></e8732></e8731></e8730></e8729></e8728></e8727></e8726></e8725></e8724></e8723></e8722></e8721></e8720></e8719></e8718></e8717></e8716></e8715></e8714></e8713></e8712></e8711></e8710></e8709></e8708></e8707></e8706></e8705></e8704></e8703></e8702></e8701></e8700></e8699></e8698></e8697></e8696></e8695></e8694></e8693></e8692></e8691></e8690></e8689></e8688></e8687></e8686></e8685></e8684></e8683></e8682></e8681></e8680></e8679></e8678></e8677></e8676></e8675></e8674></e8673></e8672></e8671></e8670></e8669></e8668></e8667></e8666></e8665></e8664></e8663></e8662></e8661></e8660></e8659></e8658></e8657></e8656></e8655></e8654></e8653></e8652></e8651></e8650></e8649></e8648></e8647></e8646></e8645></e8644></e8643></e8642></e8641></e8640></e8639></e8638></e8637></e8636></e8635></e8634></e8633></e8632></e8631></e8630></e8629></e8628></e8627></e8626></e8625></e8624></e8623></e8622></e8621></e8620></e8619></e8618></e8617></e8616></e8615></e8614></e8613></e8612></e8611></e8610></e8609></e8608></e8607></e8606></e8605></e8604></e8603></e8602></e8601></e8600></e8599></e8598></e8597></e8596></e8595></e8594></e8593></e8592></e8591></e8590></e8589></e8588></e8587></e8586></e8585></e8584></e8583></e8582></e8581></e8580></e8579></e8578></e8577></e8576></e8575></e8574></e8573></e8572></e8571></e8570></e8569></e8568></e8567></e8566></e8565></e8564></e8563></e8562></e8561></e8560></e8559></e8558></e8557></e8556></e8555></e8554></e8553></e8552></e8551></e8550></e8549></e8548></e8547></e8546></e8545></e8544></e8543></e8542></e8541></e8540></e8539></e8538></e8537></e8536></e8535></e8534></e8533></e8532></e8531></e8530></e8529></e8528></e8527></e8526></e8525></e8524></e8523></e8522></e8521></e8520></e8519></e8518></e8517></e8516></e8515></e8514></e8513></e8512></e8511></e8510></e8509></e8508></e8507></e8506></e8505></e8504></e8503></e8502></e8501></e8500></e8499></e8498></e8497></e8496></e8495></e8494></e8493></e8492></e8491></e8490></e8489></e8488></e8487></e8486></e8485></e8484></e8483></e8482></e8481></e8480></e8479></e8478></e8477></e8476></e8475></e8474></e8473></e8472></e8471></e8470></e8469></e8468></e8467></e8466></e8465></e8464></e8463></e8462></e8461></e8460></e8459></e8458></e8457></e8456></e8455></e8454></e8453></e8452></e8451></e8450></e8449></e8448></e8447></e8446></e8445></e8444></e8443></e8442></e8441></e8440></e8439></e8438></e8437></e8436></e8435></e8434></e8433></e8432></e8431></e8430></e8429></e8428></e8427></e8426></e8425></e8424></e8423></e8422></e8421></e8420></e8419></e8418></e8417></e8416></e8415></e8414></e8413></e8412></e8411></e8410></e8409></e8408></e8407></e8406></e8405></e8404></e8403></e8402></e8401></e8400></e8399></e8398></e8397></e8396></e8395></e8394></e8393></e8392></e8391></e8390></e8389></e8388></e8387></e8386></e8385></e8384></e8383></e8382></e8381></e8380></e8379></e8378></e8377></e8376></e8375></e8374></e8373></e8372></e8371></e8370></e8369></e8368></e8367></e8366></e8365></e8364></e8363></e8362></e8361></e8360></e8359></e8358></e8357></e8356></e8355></e8354></e8353></e8352></e8351></e8350></e8349></e8348></e8347></e8346></e8345></e8344></e8343></e8342></e8341></e8340></e8339></e8338></e8337></e8336></e8335></e8334></e8333></e8332></e8331></e8330></e8329></e8328></e8327></e8326></e8325></e8324></e8323></e8322></e8321></e8320></e8319></e8318></e8317></e8316></e8315></e8314></e8313></e8312></e8311></e8310></e8309></e8308></e8307></e8306></e8305></e8304></e8303></e8302></e8301></e8300></e8299></e8298></e8297></e8296></e8295></e8294></e8293></e8292></e8291></e8290></e8289></e8288></e8287></e8286></e8285></e8284></e8283></e8282></e8281></e8280></e8279></e8278></e8277></e8276></e8275></e8274></e8273></e8272></e8271></e8270></e8269></e8268></e8267></e8266></e8265></e8264></e8263></e8262></e8261></e8260></e8259></e8258></e8257></e8256></e8255></e8254></e8253></e8252></e8251></e8250></e8249></e8248></e8247></e8246></e8245></e8244></e8243></e8242></e8241></e8240></e8239></e8238></e8237></e8236></e8235></e8234></e8233></e8232></e8231></e8230></e8229></e8228></e8227></e8226></e8225></e8224></e8223></e8222></e8221></e8220></e8219></e8218></e8217></e8216></e8215></e8214></e8213></e8212></e8211></e8210></e8209></e8208></e8207></e8206></e8205></e8204></e8203></e8202></e8201></e8200></e8199></e8198></e8197></e8196></e8195></e8194></e8193></e8192></e8191></e8190></e8189></e8188></e8187></e8186></e8185></e8184></e8183></e8182></e8181></e8180></e8179></e8178></e8177></e8176></e8175></e8174></e8173></e8172></e8171></e8170></e8169></e8168></e8167></e8166></e8165></e8164></e8163></e8162></e8161></e8160></e8159></e8158></e8157></e8156></e8155></e8154></e8153></e8152></e8151></e8150></e8149></e8148></e8147></e8146></e8145></e8144></e8143></e8142></e8141></e8140></e8139></e8138></e8137></e8136></e8135></e8134></e8133></e8132></e8131></e8130></e8129></e8128></e8127></e8126></e8125></e8124></e8123></e8122></e8121></e8120></e8119></e8118></e8117></e8116></e8115></e8114></e8113></e8112></e8111></e8110></e8109></e8108></e8107></e8106></e8105></e8104></e8103></e8102></e8101></e8100></e8099></e8098></e8097></e8096></e8095></e8094></e8093></e8092></e8091></e8090></e8089></e8088></e8087></e8086></e8085></e8084></e8083></e8082></e8081></e8080></e8079></e8078></e8077></e8076></e8075></e8074></e8073></e8072></e8071></e8070></e8069></e8068></e8067></e8066></e8065></e8064></e8063></e8062></e8061></e8060></e8059></e8058></e8057></e8056></e8055></e8054></e8053></e8052></e8051></e8050></e8049></e8048></e8047></e8046></e8045></e8044></e8043></e8042></e8041></e8040></e8039></e8038></e8037></e8036></e8035></e8034></e8033></e8032></e8031></e8030></e8029></e8028></e8027></e8026></e8025></e8024></e8023></e8022></e8021></e8020></e8019></e8018></e8017></e8016></e8015></e8014></e8013></e8012></e8011></e8010></e8009></e8008></e8007></e8006></e8005></e8004></e8003></e8002></e8001></e8000></e7999></e7998></e7997></e7996></e7995></e7994></e7993></e7992></e7991></e7990></e7989></e7988></e7987></e7986></e7985></e7984></e7983></e7982></e7981></e7980></e7979></e7978></e7977></e7976></e7975></e7974></e7973></e7972></e7971></e7970></e7969></e7968></e7967></e7966></e7965></e7964></e7963></e7962></e7961></e7960></e7959></e7958></e7957></e7956></e7955></e7954></e7953></e7952></e7951></e7950></e7949></e7948></e7947></e7946></e7945></e7944></e7943></e7942></e7941></e7940></e7939></e7938></e7937></e7936></e7935></e7934></e7933></e7932></e7931></e7930></e7929></e7928></e7927></e7926></e7925></e7924></e7923></e7922></e7921></e7920></e7919></e7918></e7917></e7916></e7915></e7914></e7913></e7912></e7911></e7910></e7909></e7908></e7907></e7906></e7905></e7904></e7903></e7902></e7901></e7900></e7899></e7898></e7897></e7896></e7895></e7894></e7893></e7892></e7891></e7890></e7889></e7888></e7887></e7886></e7885></e7884></e7883></e7882></e7881></e7880></e7879></e7878></e7877></e7876></e7875></e7874></e7873></e7872></e7871></e7870></e7869></e7868></e7867></e7866></e7865></e7864></e7863></e7862></e7861></e7860></e7859></e7858></e7857></e7856></e7855></e7854></e7853></e7852></e7851></e7850></e7849></e7848></e7847></e7846></e7845></e7844></e7843></e7842></e7841></e7840></e7839></e7838></e7837></e7836></e7835></e7834></e7833></e7832></e7831></e7830></e7829></e7828></e7827></e7826></e7825></e7824></e7823></e7822></e7821></e7820></e7819></e7818></e7817></e7816></e7815></e7814></e7813></e7812></e7811></e7810></e7809></e7808></e7807></e7806></e7805></e7804></e7803></e7802></e7801></e7800></e7799></e7798></e7797></e7796></e7795></e7794></e7793></e7792></e7791></e7790></e7789></e7788></e7787></e7786></e7785></e7784></e7783></e7782></e7781></e7780></e7779></e7778></e7777></e7776></e7775></e7774></e7773></e7772></e7771></e7770></e7769></e7768></e7767></e7766></e7765></e7764></e7763></e7762></e7761></e7760></e7759></e7758></e7757></e7756></e7755></e7754></e7753></e7752></e7751></e7750></e7749></e7748></e7747></e7746></e7745></e7744></e7743></e7742></e7741></e7740></e7739></e7738></e7737></e7736></e7735></e7734></e7733></e7732></e7731></e7730></e7729></e7728></e7727></e7726></e7725></e7724></e7723></e7722></e7721></e7720></e7719></e7718></e7717></e7716></e7715></e7714></e7713></e7712></e7711></e7710></e7709></e7708></e7707></e7706></e7705></e7704></e7703></e7702></e7701></e7700></e7699></e7698></e7697></e7696></e7695></e7694></e7693></e7692></e7691></e7690></e7689></e7688></e7687></e7686></e7685></e7684></e7683></e7682></e7681></e7680></e7679></e7678></e7677></e7676></e7675></e7674></e7673></e7672></e7671></e7670></e7669></e7668></e7667></e7666></e7665></e7664></e7663></e7662></e7661></e7660></e7659></e7658></e7657></e7656></e7655></e7654></e7653></e7652></e7651></e7650></e7649></e7648></e7647></e7646></e7645></e7644></e7643></e7642></e7641></e7640></e7639></e7638></e7637></e7636></e7635></e7634></e7633></e7632></e7631></e7630></e7629></e7628></e7627></e7626></e7625></e7624></e7623></e7622></e7621></e7620></e7619></e7618></e7617></e7616></e7615></e7614></e7613></e7612></e7611></e7610></e7609></e7608></e7607></e7606></e7605></e7604></e7603></e7602></e7601></e7600></e7599></e7598></e7597></e7596></e7595></e7594></e7593></e7592></e7591></e7590></e7589></e7588></e7587></e7586></e7585></e7584></e7583></e7582></e7581></e7580></e7579></e7578></e7577></e7576></e7575></e7574></e7573></e7572></e7571></e7570></e7569></e7568></e7567></e7566></e7565></e7564></e7563></e7562></e7561></e7560></e7559></e7558></e7557></e7556></e7555></e7554></e7553></e7552></e7551></e7550></e7549></e7548></e7547></e7546></e7545></e7544></e7543></e7542></e7541></e7540></e7539></e7538></e7537></e7536></e7535></e7534></e7533></e7532></e7531></e7530></e7529></e7528></e7527></e7526></e7525></e7524></e7523></e7522></e7521></e7520></e7519></e7518></e7517></e7516></e7515></e7514></e7513></e7512></e7511></e7510></e7509></e7508></e7507></e7506></e7505></e7504></e7503></e7502></e7501></e7500></e7499></e7498></e7497></e7496></e7495></e7494></e7493></e7492></e7491></e7490></e7489></e7488></e7487></e7486></e7485></e7484></e7483></e7482></e7481></e7480></e7479></e7478></e7477></e7476></e7475></e7474></e7473></e7472></e7471></e7470></e7469></e7468></e7467></e7466></e7465></e7464></e7463></e7462></e7461></e7460></e7459></e7458></e7457></e7456></e7455></e7454></e7453></e7452></e7451></e7450></e7449></e7448></e7447></e7446></e7445></e7444></e7443></e7442></e7441></e7440></e7439></e7438></e7437></e7436></e7435></e7434></e7433></e7432></e7431></e7430></e7429></e7428></e7427></e7426></e7425></e7424></e7423></e7422></e7421></e7420></e7419></e7418></e7417></e7416></e7415></e7414></e7413></e7412></e7411></e7410></e7409></e7408></e7407></e7406></e7405></e7404></e7403></e7402></e7401></e7400></e7399></e7398></e7397></e7396></e7395></e7394></e7393></e7392></e7391></e7390></e7389></e7388></e7387></e7386></e7385></e7384></e7383></e7382></e7381></e7380></e7379></e7378></e7377></e7376></e7375></e7374></e7373></e7372></e7371></e7370></e7369></e7368></e7367></e7366></e7365></e7364></e7363></e7362></e7361></e7360></e7359></e7358></e7357></e7356></e7355></e7354></e7353></e7352></e7351></e7350></e7349></e7348></e7347></e7346></e7345></e7344></e7343></e7342></e7341></e7340></e7339></e7338></e7337></e7336></e7335></e7334></e7333></e7332></e7331></e7330></e7329></e7328></e7327></e7326></e7325></e7324></e7323></e7322></e7321></e7320></e7319></e7318></e7317></e7316></e7315></e7314></e7313></e7312></e7311></e7310></e7309></e7308></e7307></e7306></e7305></e7304></e7303></e7302></e7301></e7300></e7299></e7298></e7297></e7296></e7295></e7294></e7293></e7292></e7291></e7290></e7289></e7288></e7287></e7286></e7285></e7284></e7283></e7282></e7281></e7280></e7279></e7278></e7277></e7276></e7275></e7274></e7273></e7272></e7271></e7270></e7269></e7268></e7267></e7266></e7265></e7264></e7263></e7262></e7261></e7260></e7259></e7258></e7257></e7256></e7255></e7254></e7253></e7252></e7251></e7250></e7249></e7248></e7247></e7246></e7245></e7244></e7243></e7242></e7241></e7240></e7239></e7238></e7237></e7236></e7235></e7234></e7233></e7232></e7231></e7230></e7229></e7228></e7227></e7226></e7225></e7224></e7223></e7222></e7221></e7220></e7219></e7218></e7217></e7216></e7215></e7214></e7213></e7212></e7211></e7210></e7209></e7208></e7207></e7206></e7205></e7204></e7203></e7202></e7201></e7200></e7199></e7198></e7197></e7196></e7195></e7194></e7193></e7192></e7191></e7190></e7189></e7188></e7187></e7186></e7185></e7184></e7183></e7182></e7181></e7180></e7179></e7178></e7177></e7176></e7175></e7174></e7173></e7172></e7171></e7170></e7169></e7168></e7167></e7166></e7165></e7164></e7163></e7162></e7161></e7160></e7159></e7158></e7157></e7156></e7155></e7154></e7153></e7152></e7151></e7150></e7149></e7148></e7147></e7146></e7145></e7144></e7143></e7142></e7141></e7140></e7139></e7138></e7137></e7136></e7135></e7134></e7133></e7132></e7131></e7130></e7129></e7128></e7127></e7126></e7125></e7124></e7123></e7122></e7121></e7120></e7119></e7118></e7117></e7116></e7115></e7114></e7113></e7112></e7111></e7110></e7109></e7108></e7107></e7106></e7105></e7104></e7103></e7102></e7101></e7100></e7099></e7098></e7097></e7096></e7095></e7094></e7093></e7092></e7091></e7090></e7089></e7088></e7087></e7086></e7085></e7084></e7083></e7082></e7081></e7080></e7079></e7078></e7077></e7076></e7075></e7074></e7073></e7072></e7071></e7070></e7069></e7068></e7067></e7066></e7065></e7064></e7063></e7062></e7061></e7060></e7059></e7058></e7057></e7056></e7055></e7054></e7053></e7052></e7051></e7050></e7049></e7048></e7047></e7046></e7045></e7044></e7043></e7042></e7041></e7040></e7039></e7038></e7037></e7036></e7035></e7034></e7033></e7032></e7031></e7030></e7029></e7028></e7027></e7026></e7025></e7024></e7023></e7022></e7021></e7020></e7019></e7018></e7017></e7016></e7015></e7014></e7013></e7012></e7011></e7010></e7009></e7008></e7007></e7006></e7005></e7004></e7003></e7002></e7001></e7000></e6999></e6998></e6997></e6996></e6995></e6994></e6993></e6992></e6991></e6990></e6989></e6988></e6987></e6986></e6985></e6984></e6983></e6982></e6981></e6980></e6979></e6978></e6977></e6976></e6975></e6974></e6973></e6972></e6971></e6970></e6969></e6968></e6967></e6966></e6965></e6964></e6963></e6962></e6961></e6960></e6959></e6958></e6957></e6956></e6955></e6954></e6953></e6952></e6951></e6950></e6949></e6948></e6947></e6946></e6945></e6944></e6943></e6942></e6941></e6940></e6939></e6938></e6937></e6936></e6935></e6934></e6933></e6932></e6931></e6930></e6929></e6928></e6927></e6926></e6925></e6924></e6923></e6922></e6921></e6920></e6919></e6918></e6917></e6916></e6915></e6914></e6913></e6912></e6911></e6910></e6909></e6908></e6907></e6906></e6905></e6904></e6903></e6902></e6901></e6900></e6899></e6898></e6897></e6896></e6895></e6894></e6893></e6892></e6891></e6890></e6889></e6888></e6887></e6886></e6885></e6884></e6883></e6882></e6881></e6880></e6879></e6878></e6877></e6876></e6875></e6874></e6873></e6872></e6871></e6870></e6869></e6868></e6867></e6866></e6865></e6864></e6863></e6862></e6861></e6860></e6859></e6858></e6857></e6856></e6855></e6854></e6853></e6852></e6851></e6850></e6849></e6848></e6847></e6846></e6845></e6844></e6843></e6842></e6841></e6840></e6839></e6838></e6837></e6836></e6835></e6834></e6833></e6832></e6831></e6830></e6829></e6828></e6827></e6826></e6825></e6824></e6823></e6822></e6821></e6820></e6819></e6818></e6817></e6816></e6815></e6814></e6813></e6812></e6811></e6810></e6809></e6808></e6807></e6806></e6805></e6804></e6803></e6802></e6801></e6800></e6799></e6798></e6797></e6796></e6795></e6794></e6793></e6792></e6791></e6790></e6789></e6788></e6787></e6786></e6785></e6784></e6783></e6782></e6781></e6780></e6779></e6778></e6777></e6776></e6775></e6774></e6773></e6772></e6771></e6770></e6769></e6768></e6767></e6766></e6765></e6764></e6763></e6762></e6761></e6760></e6759></e6758></e6757></e6756></e6755></e6754></e6753></e6752></e6751></e6750></e6749></e6748></e6747></e6746></e6745></e6744></e6743></e6742></e6741></e6740></e6739></e6738></e6737></e6736></e6735></e6734></e6733></e6732></e6731></e6730></e6729></e6728></e6727></e6726></e6725></e6724></e6723></e6722></e6721></e6720></e6719></e6718></e6717></e6716></e6715></e6714></e6713></e6712></e6711></e6710></e6709></e6708></e6707></e6706></e6705></e6704></e6703></e6702></e6701></e6700></e6699></e6698></e6697></e6696></e6695></e6694></e6693></e6692></e6691></e6690></e6689></e6688></e6687></e6686></e6685></e6684></e6683></e6682></e6681></e6680></e6679></e6678></e6677></e6676></e6675></e6674></e6673></e6672></e6671></e6670></e6669></e6668></e6667></e6666></e6665></e6664></e6663></e6662></e6661></e6660></e6659></e6658></e6657></e6656></e6655></e6654></e6653></e6652></e6651></e6650></e6649></e6648></e6647></e6646></e6645></e6644></e6643></e6642></e6641></e6640></e6639></e6638></e6637></e6636></e6635></e6634></e6633></e6632></e6631></e6630></e6629></e6628></e6627></e6626></e6625></e6624></e6623></e6622></e6621></e6620></e6619></e6618></e6617></e6616></e6615></e6614></e6613></e6612></e6611></e6610></e6609></e6608></e6607></e6606></e6605></e6604></e6603></e6602></e6601></e6600></e6599></e6598></e6597></e6596></e6595></e6594></e6593></e6592></e6591></e6590></e6589></e6588></e6587></e6586></e6585></e6584></e6583></e6582></e6581></e6580></e6579></e6578></e6577></e6576></e6575></e6574></e6573></e6572></e6571></e6570></e6569></e6568></e6567></e6566></e6565></e6564></e6563></e6562></e6561></e6560></e6559></e6558></e6557></e6556></e6555></e6554></e6553></e6552></e6551></e6550></e6549></e6548></e6547></e6546></e6545></e6544></e6543></e6542></e6541></e6540></e6539></e6538></e6537></e6536></e6535></e6534></e6533></e6532></e6531></e6530></e6529></e6528></e6527></e6526></e6525></e6524></e6523></e6522></e6521></e6520></e6519></e6518></e6517></e6516></e6515></e6514></e6513></e6512></e6511></e6510></e6509></e6508></e6507></e6506></e6505></e6504></e6503></e6502></e6501></e6500></e6499></e6498></e6497></e6496></e6495></e6494></e6493></e6492></e6491></e6490></e6489></e6488></e6487></e6486></e6485></e6484></e6483></e6482></e6481></e6480></e6479></e6478></e6477></e6476></e6475></e6474></e6473></e6472></e6471></e6470></e6469></e6468></e6467></e6466></e6465></e6464></e6463></e6462></e6461></e6460></e6459></e6458></e6457></e6456></e6455></e6454></e6453></e6452></e6451></e6450></e6449></e6448></e6447></e6446></e6445></e6444></e6443></e6442></e6441></e6440></e6439></e6438></e6437></e6436></e6435></e6434></e6433></e6432></e6431></e6430></e6429></e6428></e6427></e6426></e6425></e6424></e6423></e6422></e6421></e6420></e6419></e6418></e6417></e6416></e6415></e6414></e6413></e6412></e6411></e6410></e6409></e6408></e6407></e6406></e6405></e6404></e6403></e6402></e6401></e6400></e6399></e6398></e6397></e6396></e6395></e6394></e6393></e6392></e6391></e6390></e6389></e6388></e6387></e6386></e6385></e6384></e6383></e6382></e6381></e6380></e6379></e6378></e6377></e6376></e6375></e6374></e6373></e6372></e6371></e6370></e6369></e6368></e6367></e6366></e6365></e6364></e6363></e6362></e6361></e6360></e6359></e6358></e6357></e6356></e6355></e6354></e6353></e6352></e6351></e6350></e6349></e6348></e6347></e6346></e6345></e6344></e6343></e6342></e6341></e6340></e6339></e6338></e6337></e6336></e6335></e6334></e6333></e6332></e6331></e6330></e6329></e6328></e6327></e6326></e6325></e6324></e6323></e6322></e6321></e6320></e6319></e6318></e6317></e6316></e6315></e6314></e6313></e6312></e6311></e6310></e6309></e6308></e6307></e6306></e6305></e6304></e6303></e6302></e6301></e6300></e6299></e6298></e6297></e6296></e6295></e6294></e6293></e6292></e6291></e6290></e6289></e6288></e6287></e6286></e6285></e6284></e6283></e6282></e6281></e6280></e6279></e6278></e6277></e6276></e6275></e6274></e6273></e6272></e6271></e6270></e6269></e6268></e6267></e6266></e6265></e6264></e6263></e6262></e6261></e6260></e6259></e6258></e6257></e6256></e6255></e6254></e6253></e6252></e6251></e6250></e6249></e6248></e6247></e6246></e6245></e6244></e6243></e6242></e6241></e6240></e6239></e6238></e6237></e6236></e6235></e6234></e6233></e6232></e6231></e6230></e6229></e6228></e6227></e6226></e6225></e6224></e6223></e6222></e6221></e6220></e6219></e6218></e6217></e6216></e6215></e6214></e6213></e6212></e6211></e6210></e6209></e6208></e6207></e6206></e6205></e6204></e6203></e6202></e6201></e6200></e6199></e6198></e6197></e6196></e6195></e6194></e6193></e6192></e6191></e6190></e6189></e6188></e6187></e6186></e6185></e6184></e6183></e6182></e6181></e6180></e6179></e6178></e6177></e6176></e6175></e6174></e6173></e6172></e6171></e6170></e6169></e6168></e6167></e6166></e6165></e6164></e6163></e6162></e6161></e6160></e6159></e6158></e6157></e6156></e6155></e6154></e6153></e6152></e6151></e6150></e6149></e6148></e6147></e6146></e6145></e6144></e6143></e6142></e6141></e6140></e6139></e6138></e6137></e6136></e6135></e6134></e6133></e6132></e6131></e6130></e6129></e6128></e6127></e6126></e6125></e6124></e6123></e6122></e6121></e6120></e6119></e6118></e6117></e6116></e6115></e6114></e6113></e6112></e6111></e6110></e6109></e6108></e6107></e6106></e6105></e6104></e6103></e6102></e6101></e6100></e6099></e6098></e6097></e6096></e6095></e6094></e6093></e6092></e6091></e6090></e6089></e6088></e6087></e6086></e6085></e6084></e6083></e6082></e6081></e6080></e6079></e6078></e6077></e6076></e6075></e6074></e6073></e6072></e6071></e6070></e6069></e6068></e6067></e6066></e6065></e6064></e6063></e6062></e6061></e6060></e6059></e6058></e6057></e6056></e6055></e6054></e6053></e6052></e6051></e6050></e6049></e6048></e6047></e6046></e6045></e6044></e6043></e6042></e6041></e6040></e6039></e6038></e6037></e6036></e6035></e6034></e6033></e6032></e6031></e6030></e6029></e6028></e6027></e6026></e6025></e6024></e6023></e6022></e6021></e6020></e6019></e6018></e6017></e6016></e6015></e6014></e6013></e6012></e6011></e6010></e6009></e6008></e6007></e6006></e6005></e6004></e6003></e6002></e6001></e6000></e5999></e5998></e5997></e5996></e5995></e5994></e5993></e5992></e5991></e5990></e5989></e5988></e5987></e5986></e5985></e5984></e5983></e5982></e5981></e5980></e5979></e5978></e5977></e5976></e5975></e5974></e5973></e5972></e5971></e5970></e5969></e5968></e5967></e5966></e5965></e5964></e5963></e5962></e5961></e5960></e5959></e5958></e5957></e5956></e5955></e5954></e5953></e5952></e5951></e5950></e5949></e5948></e5947></e5946></e5945></e5944></e5943></e5942></e5941></e5940></e5939></e5938></e5937></e5936></e5935></e5934></e5933></e5932></e5931></e5930></e5929></e5928></e5927></e5926></e5925></e5924></e5923></e5922></e5921></e5920></e5919></e5918></e5917></e5916></e5915></e5914></e5913></e5912></e5911></e5910></e5909></e5908></e5907></e5906></e5905></e5904></e5903></e5902></e5901></e5900></e5899></e5898></e5897></e5896></e5895></e5894></e5893></e5892></e5891></e5890></e5889></e5888></e5887></e5886></e5885></e5884></e5883></e5882></e5881></e5880></e5879></e5878></e5877></e5876></e5875></e5874></e5873></e5872></e5871></e5870></e5869></e5868></e5867></e5866></e5865></e5864></e5863></e5862></e5861></e5860></e5859></e5858></e5857></e5856></e5855></e5854></e5853></e5852></e5851></e5850></e5849></e5848></e5847></e5846></e5845></e5844></e5843></e5842></e5841></e5840></e5839></e5838></e5837></e5836></e5835></e5834></e5833></e5832></e5831></e5830></e5829></e5828></e5827></e5826></e5825></e5824></e5823></e5822></e5821></e5820></e5819></e5818></e5817></e5816></e5815></e5814></e5813></e5812></e5811></e5810></e5809></e5808></e5807></e5806></e5805></e5804></e5803></e5802></e5801></e5800></e5799></e5798></e5797></e5796></e5795></e5794></e5793></e5792></e5791></e5790></e5789></e5788></e5787></e5786></e5785></e5784></e5783></e5782></e5781></e5780></e5779></e5778></e5777></e5776></e5775></e5774></e5773></e5772></e5771></e5770></e5769></e5768></e5767></e5766></e5765></e5764></e5763></e5762></e5761></e5760></e5759></e5758></e5757></e5756></e5755></e5754></e5753></e5752></e5751></e5750></e5749></e5748></e5747></e5746></e5745></e5744></e5743></e5742></e5741></e5740></e5739></e5738></e5737></e5736></e5735></e5734></e5733></e5732></e5731></e5730></e5729></e5728></e5727></e5726></e5725></e5724></e5723></e5722></e5721></e5720></e5719></e5718></e5717></e5716></e5715></e5714></e5713></e5712></e5711></e5710></e5709></e5708></e5707></e5706></e5705></e5704></e5703></e5702></e5701></e5700></e5699></e5698></e5697></e5696></e5695></e5694></e5693></e5692></e5691></e5690></e5689></e5688></e5687></e5686></e5685></e5684></e5683></e5682></e5681></e5680></e5679></e5678></e5677></e5676></e5675></e5674></e5673></e5672></e5671></e5670></e5669></e5668></e5667></e5666></e5665></e5664></e5663></e5662></e5661></e5660></e5659></e5658></e5657></e5656></e5655></e5654></e5653></e5652></e5651></e5650></e5649></e5648></e5647></e5646></e5645></e5644></e5643></e5642></e5641></e5640></e5639></e5638></e5637></e5636></e5635></e5634></e5633></e5632></e5631></e5630></e5629></e5628></e5627></e5626></e5625></e5624></e5623></e5622></e5621></e5620></e5619></e5618></e5617></e5616></e5615></e5614></e5613></e5612></e5611></e5610></e5609></e5608></e5607></e5606></e5605></e5604></e5603></e5602></e5601></e5600></e5599></e5598></e5597></e5596></e5595></e5594></e5593></e5592></e5591></e5590></e5589></e5588></e5587></e5586></e5585></e5584></e5583></e5582></e5581></e5580></e5579></e5578></e5577></e5576></e5575></e5574></e5573></e5572></e5571></e5570></e5569></e5568></e5567></e5566></e5565></e5564></e5563></e5562></e5561></e5560></e5559></e5558></e5557></e5556></e5555></e5554></e5553></e5552></e5551></e5550></e5549></e5548></e5547></e5546></e5545></e5544></e5543></e5542></e5541></e5540></e5539></e5538></e5537></e5536></e5535></e5534></e5533></e5532></e5531></e5530></e5529></e5528></e5527></e5526></e5525></e5524></e5523></e5522></e5521></e5520></e5519></e5518></e5517></e5516></e5515></e5514></e5513></e5512></e5511></e5510></e5509></e5508></e5507></e5506></e5505></e5504></e5503></e5502></e5501></e5500></e5499></e5498></e5497></e5496></e5495></e5494></e5493></e5492></e5491></e5490></e5489></e5488></e5487></e5486></e5485></e5484></e5483></e5482></e5481></e5480></e5479></e5478></e5477></e5476></e5475></e5474></e5473></e5472></e5471></e5470></e5469></e5468></e5467></e5466></e5465></e5464></e5463></e5462></e5461></e5460></e5459></e5458></e5457></e5456></e5455></e5454></e5453></e5452></e5451></e5450></e5449></e5448></e5447></e5446></e5445></e5444></e5443></e5442></e5441></e5440></e5439></e5438></e5437></e5436></e5435></e5434></e5433></e5432></e5431></e5430></e5429></e5428></e5427></e5426></e5425></e5424></e5423></e5422></e5421></e5420></e5419></e5418></e5417></e5416></e5415></e5414></e5413></e5412></e5411></e5410></e5409></e5408></e5407></e5406></e5405></e5404></e5403></e5402></e5401></e5400></e5399></e5398></e5397></e5396></e5395></e5394></e5393></e5392></e5391></e5390></e5389></e5388></e5387></e5386></e5385></e5384></e5383></e5382></e5381></e5380></e5379></e5378></e5377></e5376></e5375></e5374></e5373></e5372></e5371></e5370></e5369></e5368></e5367></e5366></e5365></e5364></e5363></e5362></e5361></e5360></e5359></e5358></e5357></e5356></e5355></e5354></e5353></e5352></e5351></e5350></e5349></e5348></e5347></e5346></e5345></e5344></e5343></e5342></e5341></e5340></e5339></e5338></e5337></e5336></e5335></e5334></e5333></e5332></e5331></e5330></e5329></e5328></e5327></e5326></e5325></e5324></e5323></e5322></e5321></e5320></e5319></e5318></e5317></e5316></e5315></e5314></e5313></e5312></e5311></e5310></e5309></e5308></e5307></e5306></e5305></e5304></e5303></e5302></e5301></e5300></e5299></e5298></e5297></e5296></e5295></e5294></e5293></e5292></e5291></e5290></e5289></e5288></e5287></e5286></e5285></e5284></e5283></e5282></e5281></e5280></e5279></e5278></e5277></e5276></e5275></e5274></e5273></e5272></e5271></e5270></e5269></e5268></e5267></e5266></e5265></e5264></e5263></e5262></e5261></e5260></e5259></e5258></e5257></e5256></e5255></e5254></e5253></e5252></e5251></e5250></e5249></e5248></e5247></e5246></e5245></e5244></e5243></e5242></e5241></e5240></e5239></e5238></e5237></e5236></e5235></e5234></e5233></e5232></e5231></e5230></e5229></e5228></e5227></e5226></e5225></e5224></e5223></e5222></e5221></e5220></e5219></e5218></e5217></e5216></e5215></e5214></e5213></e5212></e5211></e5210></e5209></e5208></e5207></e5206></e5205></e5204></e5203></e5202></e5201></e5200></e5199></e5198></e5197></e5196></e5195></e5194></e5193></e5192></e5191></e5190></e5189></e5188></e5187></e5186></e5185></e5184></e5183></e5182></e5181></e5180></e5179></e5178></e5177></e5176></e5175></e5174></e5173></e5172></e5171></e5170></e5169></e5168></e5167></e5166></e5165></e5164></e5163></e5162></e5161></e5160></e5159></e5158></e5157></e5156></e5155></e5154></e5153></e5152></e5151></e5150></e5149></e5148></e5147></e5146></e5145></e5144></e5143></e5142></e5141></e5140></e5139></e5138></e5137></e5136></e5135></e5134></e5133></e5132></e5131></e5130></e5129></e5128></e5127></e5126></e5125></e5124></e5123></e5122></e5121></e5120></e5119></e5118></e5117></e5116></e5115></e5114></e5113></e5112></e5111></e5110></e5109></e5108></e5107></e5106></e5105></e5104></e5103></e5102></e5101></e5100></e5099></e5098></e5097></e5096></e5095></e5094></e5093></e5092></e5091></e5090></e5089></e5088></e5087></e5086></e5085></e5084></e5083></e5082></e5081></e5080></e5079></e5078></e5077></e5076></e5075></e5074></e5073></e5072></e5071></e5070></e5069></e5068></e5067></e5066></e5065></e5064></e5063></e5062></e5061></e5060></e5059></e5058></e5057></e5056></e5055></e5054></e5053></e5052></e5051></e5050></e5049></e5048></e5047></e5046></e5045></e5044></e5043></e5042></e5041></e5040></e5039></e5038></e5037></e5036></e5035></e5034></e5033></e5032></e5031></e5030></e5029></e5028></e5027></e5026></e5025></e5024></e5023></e5022></e5021></e5020></e5019></e5018></e5017></e5016></e5015></e5014></e5013></e5012></e5011></e5010></e5009></e5008></e5007></e5006></e5005></e5004></e5003></e5002></e5001></e5000></e4999></e4998></e4997></e4996></e4995></e4994></e4993></e4992></e4991></e4990></e4989></e4988></e4987></e4986></e4985></e4984></e4983></e4982></e4981></e4980></e4979></e4978></e4977></e4976></e4975></e4974></e4973></e4972></e4971></e4970></e4969></e4968></e4967></e4966></e4965></e4964></e4963></e4962></e4961></e4960></e4959></e4958></e4957></e4956></e4955></e4954></e4953></e4952></e4951></e4950></e4949></e4948></e4947></e4946></e4945></e4944></e4943></e4942></e4941></e4940></e4939></e4938></e4937></e4936></e4935></e4934></e4933></e4932></e4931></e4930></e4929></e4928></e4927></e4926></e4925></e4924></e4923></e4922></e4921></e4920></e4919></e4918></e4917></e4916></e4915></e4914></e4913></e4912></e4911></e4910></e4909></e4908></e4907></e4906></e4905></e4904></e4903></e4902></e4901></e4900></e4899></e4898></e4897></e4896></e4895></e4894></e4893></e4892></e4891></e4890></e4889></e4888></e4887></e4886></e4885></e4884></e4883></e4882></e4881></e4880></e4879></e4878></e4877></e4876></e4875></e4874></e4873></e4872></e4871></e4870></e4869></e4868></e4867></e4866></e4865></e4864></e4863></e4862></e4861></e4860></e4859></e4858></e4857></e4856></e4855></e4854></e4853></e4852></e4851></e4850></e4849></e4848></e4847></e4846></e4845></e4844></e4843></e4842></e4841></e4840></e4839></e4838></e4837></e4836></e4835></e4834></e4833></e4832></e4831></e4830></e4829></e4828></e4827></e4826></e4825></e4824></e4823></e4822></e4821></e4820></e4819></e4818></e4817></e4816></e4815></e4814></e4813></e4812></e4811></e4810></e4809></e4808></e4807></e4806></e4805></e4804></e4803></e4802></e4801></e4800></e4799></e4798></e4797></e4796></e4795></e4794></e4793></e4792></e4791></e4790></e4789></e4788></e4787></e4786></e4785></e4784></e4783></e4782></e4781></e4780></e4779></e4778></e4777></e4776></e4775></e4774></e4773></e4772></e4771></e4770></e4769></e4768></e4767></e4766></e4765></e4764></e4763></e4762></e4761></e4760></e4759></e4758></e4757></e4756></e4755></e4754></e4753></e4752></e4751></e4750></e4749></e4748></e4747></e4746></e4745></e4744></e4743></e4742></e4741></e4740></e4739></e4738></e4737></e4736></e4735></e4734></e4733></e4732></e4731></e4730></e4729></e4728></e4727></e4726></e4725></e4724></e4723></e4722></e4721></e4720></e4719></e4718></e4717></e4716></e4715></e4714></e4713></e4712></e4711></e4710></e4709></e4708></e4707></e4706></e4705></e4704></e4703></e4702></e4701></e4700></e4699></e4698></e4697></e4696></e4695></e4694></e4693></e4692></e4691></e4690></e4689></e4688></e4687></e4686></e4685></e4684></e4683></e4682></e4681></e4680></e4679></e4678></e4677></e4676></e4675></e4674></e4673></e4672></e4671></e4670></e4669></e4668></e4667></e4666></e4665></e4664></e4663></e4662></e4661></e4660></e4659></e4658></e4657></e4656></e4655></e4654></e4653></e4652></e4651></e4650></e4649></e4648></e4647></e4646></e4645></e4644></e4643></e4642></e4641></e4640></e4639></e4638></e4637></e4636></e4635></e4634></e4633></e4632></e4631></e4630></e4629></e4628></e4627></e4626></e4625></e4624></e4623></e4622></e4621></e4620></e4619></e4618></e4617></e4616></e4615></e4614></e4613></e4612></e4611></e4610></e4609></e4608></e4607></e4606></e4605></e4604></e4603></e4602></e4601></e4600></e4599></e4598></e4597></e4596></e4595></e4594></e4593></e4592></e4591></e4590></e4589></e4588></e4587></e4586></e4585></e4584></e4583></e4582></e4581></e4580></e4579></e4578></e4577></e4576></e4575></e4574></e4573></e4572></e4571></e4570></e4569></e4568></e4567></e4566></e4565></e4564></e4563></e4562></e4561></e4560></e4559></e4558></e4557></e4556></e4555></e4554></e4553></e4552></e4551></e4550></e4549></e4548></e4547></e4546></e4545></e4544></e4543></e4542></e4541></e4540></e4539></e4538></e4537></e4536></e4535></e4534></e4533></e4532></e4531></e4530></e4529></e4528></e4527></e4526></e4525></e4524></e4523></e4522></e4521></e4520></e4519></e4518></e4517></e4516></e4515></e4514></e4513></e4512></e4511></e4510></e4509></e4508></e4507></e4506></e4505></e4504></e4503></e4502></e4501></e4500></e4499></e4498></e4497></e4496></e4495></e4494></e4493></e4492></e4491></e4490></e4489></e4488></e4487></e4486></e4485></e4484></e4483></e4482></e4481></e4480></e4479></e4478></e4477></e4476></e4475></e4474></e4473></e4472></e4471></e4470></e4469></e4468></e4467></e4466></e4465></e4464></e4463></e4462></e4461></e4460></e4459></e4458></e4457></e4456></e4455></e4454></e4453></e4452></e4451></e4450></e4449></e4448></e4447></e4446></e4445></e4444></e4443></e4442></e4441></e4440></e4439></e4438></e4437></e4436></e4435></e4434></e4433></e4432></e4431></e4430></e4429></e4428></e4427></e4426></e4425></e4424></e4423></e4422></e4421></e4420></e4419></e4418></e4417></e4416></e4415></e4414></e4413></e4412></e4411></e4410></e4409></e4408></e4407></e4406></e4405></e4404></e4403></e4402></e4401></e4400></e4399></e4398></e4397></e4396></e4395></e4394></e4393></e4392></e4391></e4390></e4389></e4388></e4387></e4386></e4385></e4384></e4383></e4382></e4381></e4380></e4379></e4378></e4377></e4376></e4375></e4374></e4373></e4372></e4371></e4370></e4369></e4368></e4367></e4366></e4365></e4364></e4363></e4362></e4361></e4360></e4359></e4358></e4357></e4356></e4355></e4354></e4353></e4352></e4351></e4350></e4349></e4348></e4347></e4346></e4345></e4344></e4343></e4342></e4341></e4340></e4339></e4338></e4337></e4336></e4335></e4334></e4333></e4332></e4331></e4330></e4329></e4328></e4327></e4326></e4325></e4324></e4323></e4322></e4321></e4320></e4319></e4318></e4317></e4316></e4315></e4314></e4313></e4312></e4311></e4310></e4309></e4308></e4307></e4306></e4305></e4304></e4303></e4302></e4301></e4300></e4299></e4298></e4297></e4296></e4295></e4294></e4293></e4292></e4291></e4290></e4289></e4288></e4287></e4286></e4285></e4284></e4283></e4282></e4281></e4280></e4279></e4278></e4277></e4276></e4275></e4274></e4273></e4272></e4271></e4270></e4269></e4268></e4267></e4266></e4265></e4264></e4263></e4262></e4261></e4260></e4259></e4258></e4257></e4256></e4255></e4254></e4253></e4252></e4251></e4250></e4249></e4248></e4247></e4246></e4245></e4244></e4243></e4242></e4241></e4240></e4239></e4238></e4237></e4236></e4235></e4234></e4233></e4232></e4231></e4230></e4229></e4228></e4227></e4226></e4225></e4224></e4223></e4222></e4221></e4220></e4219></e4218></e4217></e4216></e4215></e4214></e4213></e4212></e4211></e4210></e4209></e4208></e4207></e4206></e4205></e4204></e4203></e4202></e4201></e4200></e4199></e4198></e4197></e4196></e4195></e4194></e4193></e4192></e4191></e4190></e4189></e4188></e4187></e4186></e4185></e4184></e4183></e4182></e4181></e4180></e4179></e4178></e4177></e4176></e4175></e4174></e4173></e4172></e4171></e4170></e4169></e4168></e4167></e4166></e4165></e4164></e4163></e4162></e4161></e4160></e4159></e4158></e4157></e4156></e4155></e4154></e4153></e4152></e4151></e4150></e4149></e4148></e4147></e4146></e4145></e4144></e4143></e4142></e4141></e4140></e4139></e4138></e4137></e4136></e4135></e4134></e4133></e4132></e4131></e4130></e4129></e4128></e4127></e4126></e4125></e4124></e4123></e4122></e4121></e4120></e4119></e4118></e4117></e4116></e4115></e4114></e4113></e4112></e4111></e4110></e4109></e4108></e4107></e4106></e4105></e4104></e4103></e4102></e4101></e4100></e4099></e4098></e4097></e4096></e4095></e4094></e4093></e4092></e4091></e4090></e4089></e4088></e4087></e4086></e4085></e4084></e4083></e4082></e4081></e4080></e4079></e4078></e4077></e4076></e4075></e4074></e4073></e4072></e4071></e4070></e4069></e4068></e4067></e4066></e4065></e4064></e4063></e4062></e4061></e4060></e4059></e4058></e4057></e4056></e4055></e4054></e4053></e4052></e4051></e4050></e4049></e4048></e4047></e4046></e4045></e4044></e4043></e4042></e4041></e4040></e4039></e4038></e4037></e4036></e4035></e4034></e4033></e4032></e4031></e4030></e4029></e4028></e4027></e4026></e4025></e4024></e4023></e4022></e4021></e4020></e4019></e4018></e4017></e4016></e4015></e4014></e4013></e4012></e4011></e4010></e4009></e4008></e4007></e4006></e4005></e4004></e4003></e4002></e4001></e4000></e3999></e3998></e3997></e3996></e3995></e3994></e3993></e3992></e3991></e3990></e3989></e3988></e3987></e3986></e3985></e3984></e3983></e3982></e3981></e3980></e3979></e3978></e3977></e3976></e3975></e3974></e3973></e3972></e3971></e3970></e3969></e3968></e3967></e3966></e3965></e3964></e3963></e3962></e3961></e3960></e3959></e3958></e3957></e3956></e3955></e3954></e3953></e3952></e3951></e3950></e3949></e3948></e3947></e3946></e3945></e3944></e3943></e3942></e3941></e3940></e3939></e3938></e3937></e3936></e3935></e3934></e3933></e3932></e3931></e3930></e3929></e3928></e3927></e3926></e3925></e3924></e3923></e3922></e3921></e3920></e3919></e3918></e3917></e3916></e3915></e3914></e3913></e3912></e3911></e3910></e3909></e3908></e3907></e3906></e3905></e3904></e3903></e3902></e3901></e3900></e3899></e3898></e3897></e3896></e3895></e3894></e3893></e3892></e3891></e3890></e3889></e3888></e3887></e3886></e3885></e3884></e3883></e3882></e3881></e3880></e3879></e3878></e3877></e3876></e3875></e3874></e3873></e3872></e3871></e3870></e3869></e3868></e3867></e3866></e3865></e3864></e3863></e3862></e3861></e3860></e3859></e3858></e3857></e3856></e3855></e3854></e3853></e3852></e3851></e3850></e3849></e3848></e3847></e3846></e3845></e3844></e3843></e3842></e3841></e3840></e3839></e3838></e3837></e3836></e3835></e3834></e3833></e3832></e3831></e3830></e3829></e3828></e3827></e3826></e3825></e3824></e3823></e3822></e3821></e3820></e3819></e3818></e3817></e3816></e3815></e3814></e3813></e3812></e3811></e3810></e3809></e3808></e3807></e3806></e3805></e3804></e3803></e3802></e3801></e3800></e3799></e3798></e3797></e3796></e3795></e3794></e3793></e3792></e3791></e3790></e3789></e3788></e3787></e3786></e3785></e3784></e3783></e3782></e3781></e3780></e3779></e3778></e3777></e3776></e3775></e3774></e3773></e3772></e3771></e3770></e3769></e3768></e3767></e3766></e3765></e3764></e3763></e3762></e3761></e3760></e3759></e3758></e3757></e3756></e3755></e3754></e3753></e3752></e3751></e3750></e3749></e3748></e3747></e3746></e3745></e3744></e3743></e3742></e3741></e3740></e3739></e3738></e3737></e3736></e3735></e3734></e3733></e3732></e3731></e3730></e3729></e3728></e3727></e3726></e3725></e3724></e3723></e3722></e3721></e3720></e3719></e3718></e3717></e3716></e3715></e3714></e3713></e3712></e3711></e3710></e3709></e3708></e3707></e3706></e3705></e3704></e3703></e3702></e3701></e3700></e3699></e3698></e3697></e3696></e3695></e3694></e3693></e3692></e3691></e3690></e3689></e3688></e3687></e3686></e3685></e3684></e3683></e3682></e3681></e3680></e3679></e3678></e3677></e3676></e3675></e3674></e3673></e3672></e3671></e3670></e3669></e3668></e3667></e3666></e3665></e3664></e3663></e3662></e3661></e3660></e3659></e3658></e3657></e3656></e3655></e3654></e3653></e3652></e3651></e3650></e3649></e3648></e3647></e3646></e3645></e3644></e3643></e3642></e3641></e3640></e3639></e3638></e3637></e3636></e3635></e3634></e3633></e3632></e3631></e3630></e3629></e3628></e3627></e3626></e3625></e3624></e3623></e3622></e3621></e3620></e3619></e3618></e3617></e3616></e3615></e3614></e3613></e3612></e3611></e3610></e3609></e3608></e3607></e3606></e3605></e3604></e3603></e3602></e3601></e3600></e3599></e3598></e3597></e3596></e3595></e3594></e3593></e3592></e3591></e3590></e3589></e3588></e3587></e3586></e3585></e3584></e3583></e3582></e3581></e3580></e3579></e3578></e3577></e3576></e3575></e3574></e3573></e3572></e3571></e3570></e3569></e3568></e3567></e3566></e3565></e3564></e3563></e3562></e3561></e3560></e3559></e3558></e3557></e3556></e3555></e3554></e3553></e3552></e3551></e3550></e3549></e3548></e3547></e3546></e3545></e3544></e3543></e3542></e3541></e3540></e3539></e3538></e3537></e3536></e3535></e3534></e3533></e3532></e3531></e3530></e3529></e3528></e3527></e3526></e3525></e3524></e3523></e3522></e3521></e3520></e3519></e3518></e3517></e3516></e3515></e3514></e3513></e3512></e3511></e3510></e3509></e3508></e3507></e3506></e3505></e3504></e3503></e3502></e3501></e3500></e3499></e3498></e3497></e3496></e3495></e3494></e3493></e3492></e3491></e3490></e3489></e3488></e3487></e3486></e3485></e3484></e3483></e3482></e3481></e3480></e3479></e3478></e3477></e3476></e3475></e3474></e3473></e3472></e3471></e3470></e3469></e3468></e3467></e3466></e3465></e3464></e3463></e3462></e3461></e3460></e3459></e3458></e3457></e3456></e3455></e3454></e3453></e3452></e3451></e3450></e3449></e3448></e3447></e3446></e3445></e3444></e3443></e3442></e3441></e3440></e3439></e3438></e3437></e3436></e3435></e3434></e3433></e3432></e3431></e3430></e3429></e3428></e3427></e3426></e3425></e3424></e3423></e3422></e3421></e3420></e3419></e3418></e3417></e3416></e3415></e3414></e3413></e3412></e3411></e3410></e3409></e3408></e3407></e3406></e3405></e3404></e3403></e3402></e3401></e3400></e3399></e3398></e3397></e3396></e3395></e3394></e3393></e3392></e3391></e3390></e3389></e3388></e3387></e3386></e3385></e3384></e3383></e3382></e3381></e3380></e3379></e3378></e3377></e3376></e3375></e3374></e3373></e3372></e3371></e3370></e3369></e3368></e3367></e3366></e3365></e3364></e3363></e3362></e3361></e3360></e3359></e3358></e3357></e3356></e3355></e3354></e3353></e3352></e3351></e3350></e3349></e3348></e3347></e3346></e3345></e3344></e3343></e3342></e3341></e3340></e3339></e3338></e3337></e3336></e3335></e3334></e3333></e3332></e3331></e3330></e3329></e3328></e3327></e3326></e3325></e3324></e3323></e3322></e3321></e3320></e3319></e3318></e3317></e3316></e3315></e3314></e3313></e3312></e3311></e3310></e3309></e3308></e3307></e3306></e3305></e3304></e3303></e3302></e3301></e3300></e3299></e3298></e3297></e3296></e3295></e3294></e3293></e3292></e3291></e3290></e3289></e3288></e3287></e3286></e3285></e3284></e3283></e3282></e3281></e3280></e3279></e3278></e3277></e3276></e3275></e3274></e3273></e3272></e3271></e3270></e3269></e3268></e3267></e3266></e3265></e3264></e3263></e3262></e3261></e3260></e3259></e3258></e3257></e3256></e3255></e3254></e3253></e3252></e3251></e3250></e3249></e3248></e3247></e3246></e3245></e3244></e3243></e3242></e3241></e3240></e3239></e3238></e3237></e3236></e3235></e3234></e3233></e3232></e3231></e3230></e3229></e3228></e3227></e3226></e3225></e3224></e3223></e3222></e3221></e3220></e3219></e3218></e3217></e3216></e3215></e3214></e3213></e3212></e3211></e3210></e3209></e3208></e3207></e3206></e3205></e3204></e3203></e3202></e3201></e3200></e3199></e3198></e3197></e3196></e3195></e3194></e3193></e3192></e3191></e3190></e3189></e3188></e3187></e3186></e3185></e3184></e3183></e3182></e3181></e3180></e3179></e3178></e3177></e3176></e3175></e3174></e3173></e3172></e3171></e3170></e3169></e3168></e3167></e3166></e3165></e3164></e3163></e3162></e3161></e3160></e3159></e3158></e3157></e3156></e3155></e3154></e3153></e3152></e3151></e3150></e3149></e3148></e3147></e3146></e3145></e3144></e3143></e3142></e3141></e3140></e3139></e3138></e3137></e3136></e3135></e3134></e3133></e3132></e3131></e3130></e3129></e3128></e3127></e3126></e3125></e3124></e3123></e3122></e3121></e3120></e3119></e3118></e3117></e3116></e3115></e3114></e3113></e3112></e3111></e3110></e3109></e3108></e3107></e3106></e3105></e3104></e3103></e3102></e3101></e3100></e3099></e3098></e3097></e3096></e3095></e3094></e3093></e3092></e3091></e3090></e3089></e3088></e3087></e3086></e3085></e3084></e3083></e3082></e3081></e3080></e3079></e3078></e3077></e3076></e3075></e3074></e3073></e3072></e3071></e3070></e3069></e3068></e3067></e3066></e3065></e3064></e3063></e3062></e3061></e3060></e3059></e3058></e3057></e3056></e3055></e3054></e3053></e3052></e3051></e3050></e3049></e3048></e3047></e3046></e3045></e3044></e3043></e3042></e3041></e3040></e3039></e3038></e3037></e3036></e3035></e3034></e3033></e3032></e3031></e3030></e3029></e3028></e3027></e3026></e3025></e3024></e3023></e3022></e3021></e3020></e3019></e3018></e3017></e3016></e3015></e3014></e3013></e3012></e3011></e3010></e3009></e3008></e3007></e3006></e3005></e3004></e3003></e3002></e3001></e3000></e2999></e2998></e2997></e2996></e2995></e2994></e2993></e2992></e2991></e2990></e2989></e2988></e2987></e2986></e2985></e2984></e2983></e2982></e2981></e2980></e2979></e2978></e2977></e2976></e2975></e2974></e2973></e2972></e2971></e2970></e2969></e2968></e2967></e2966></e2965></e2964></e2963></e2962></e2961></e2960></e2959></e2958></e2957></e2956></e2955></e2954></e2953></e2952></e2951></e2950></e2949></e2948></e2947></e2946></e2945></e2944></e2943></e2942></e2941></e2940></e2939></e2938></e2937></e2936></e2935></e2934></e2933></e2932></e2931></e2930></e2929></e2928></e2927></e2926></e2925></e2924></e2923></e2922></e2921></e2920></e2919></e2918></e2917></e2916></e2915></e2914></e2913></e2912></e2911></e2910></e2909></e2908></e2907></e2906></e2905></e2904></e2903></e2902></e2901></e2900></e2899></e2898></e2897></e2896></e2895></e2894></e2893></e2892></e2891></e2890></e2889></e2888></e2887></e2886></e2885></e2884></e2883></e2882></e2881></e2880></e2879></e2878></e2877></e2876></e2875></e2874></e2873></e2872></e2871></e2870></e2869></e2868></e2867></e2866></e2865></e2864></e2863></e2862></e2861></e2860></e2859></e2858></e2857></e2856></e2855></e2854></e2853></e2852></e2851></e2850></e2849></e2848></e2847></e2846></e2845></e2844></e2843></e2842></e2841></e2840></e2839></e2838></e2837></e2836></e2835></e2834></e2833></e2832></e2831></e2830></e2829></e2828></e2827></e2826></e2825></e2824></e2823></e2822></e2821></e2820></e2819></e2818></e2817></e2816></e2815></e2814></e2813></e2812></e2811></e2810></e2809></e2808></e2807></e2806></e2805></e2804></e2803></e2802></e2801></e2800></e2799></e2798></e2797></e2796></e2795></e2794></e2793></e2792></e2791></e2790></e2789></e2788></e2787></e2786></e2785></e2784></e2783></e2782></e2781></e2780></e2779></e2778></e2777></e2776></e2775></e2774></e2773></e2772></e2771></e2770></e2769></e2768></e2767></e2766></e2765></e2764></e2763></e2762></e2761></e2760></e2759></e2758></e2757></e2756></e2755></e2754></e2753></e2752></e2751></e2750></e2749></e2748></e2747></e2746></e2745></e2744></e2743></e2742></e2741></e2740></e2739></e2738></e2737></e2736></e2735></e2734></e2733></e2732></e2731></e2730></e2729></e2728></e2727></e2726></e2725></e2724></e2723></e2722></e2721></e2720></e2719></e2718></e2717></e2716></e2715></e2714></e2713></e2712></e2711></e2710></e2709></e2708></e2707></e2706></e2705></e2704></e2703></e2702></e2701></e2700></e2699></e2698></e2697></e2696></e2695></e2694></e2693></e2692></e2691></e2690></e2689></e2688></e2687></e2686></e2685></e2684></e2683></e2682></e2681></e2680></e2679></e2678></e2677></e2676></e2675></e2674></e2673></e2672></e2671></e2670></e2669></e2668></e2667></e2666></e2665></e2664></e2663></e2662></e2661></e2660></e2659></e2658></e2657></e2656></e2655></e2654></e2653></e2652></e2651></e2650></e2649></e2648></e2647></e2646></e2645></e2644></e2643></e2642></e2641></e2640></e2639></e2638></e2637></e2636></e2635></e2634></e2633></e2632></e2631></e2630></e2629></e2628></e2627></e2626></e2625></e2624></e2623></e2622></e2621></e2620></e2619></e2618></e2617></e2616></e2615></e2614></e2613></e2612></e2611></e2610></e2609></e2608></e2607></e2606></e2605></e2604></e2603></e2602></e2601></e2600></e2599></e2598></e2597></e2596></e2595></e2594></e2593></e2592></e2591></e2590></e2589></e2588></e2587></e2586></e2585></e2584></e2583></e2582></e2581></e2580></e2579></e2578></e2577></e2576></e2575></e2574></e2573></e2572></e2571></e2570></e2569></e2568></e2567></e2566></e2565></e2564></e2563></e2562></e2561></e2560></e2559></e2558></e2557></e2556></e2555></e2554></e2553></e2552></e2551></e2550></e2549></e2548></e2547></e2546></e2545></e2544></e2543></e2542></e2541></e2540></e2539></e2538></e2537></e2536></e2535></e2534></e2533></e2532></e2531></e2530></e2529></e2528></e2527></e2526></e2525></e2524></e2523></e2522></e2521></e2520></e2519></e2518></e2517></e2516></e2515></e2514></e2513></e2512></e2511></e2510></e2509></e2508></e2507></e2506></e2505></e2504></e2503></e2502></e2501></e2500></e2499></e2498></e2497></e2496></e2495></e2494></e2493></e2492></e2491></e2490></e2489></e2488></e2487></e2486></e2485></e2484></e2483></e2482></e2481></e2480></e2479></e2478></e2477></e2476></e2475></e2474></e2473></e2472></e2471></e2470></e2469></e2468></e2467></e2466></e2465></e2464></e2463></e2462></e2461></e2460></e2459></e2458></e2457></e2456></e2455></e2454></e2453></e2452></e2451></e2450></e2449></e2448></e2447></e2446></e2445></e2444></e2443></e2442></e2441></e2440></e2439></e2438></e2437></e2436></e2435></e2434></e2433></e2432></e2431></e2430></e2429></e2428></e2427></e2426></e2425></e2424></e2423></e2422></e2421></e2420></e2419></e2418></e2417></e2416></e2415></e2414></e2413></e2412></e2411></e2410></e2409></e2408></e2407></e2406></e2405></e2404></e2403></e2402></e2401></e2400></e2399></e2398></e2397></e2396></e2395></e2394></e2393></e2392></e2391></e2390></e2389></e2388></e2387></e2386></e2385></e2384></e2383></e2382></e2381></e2380></e2379></e2378></e2377></e2376></e2375></e2374></e2373></e2372></e2371></e2370></e2369></e2368></e2367></e2366></e2365></e2364></e2363></e2362></e2361></e2360></e2359></e2358></e2357></e2356></e2355></e2354></e2353></e2352></e2351></e2350></e2349></e2348></e2347></e2346></e2345></e2344></e2343></e2342></e2341></e2340></e2339></e2338></e2337></e2336></e2335></e2334></e2333></e2332></e2331></e2330></e2329></e2328></e2327></e2326></e2325></e2324></e2323></e2322></e2321></e2320></e2319></e2318></e2317></e2316></e2315></e2314></e2313></e2312></e2311></e2310></e2309></e2308></e2307></e2306></e2305></e2304></e2303></e2302></e2301></e2300></e2299></e2298></e2297></e2296></e2295></e2294></e2293></e2292></e2291></e2290></e2289></e2288></e2287></e2286></e2285></e2284></e2283></e2282></e2281></e2280></e2279></e2278></e2277></e2276></e2275></e2274></e2273></e2272></e2271></e2270></e2269></e2268></e2267></e2266></e2265></e2264></e2263></e2262></e2261></e2260></e2259></e2258></e2257></e2256></e2255></e2254></e2253></e2252></e2251></e2250></e2249></e2248></e2247></e2246></e2245></e2244></e2243></e2242></e2241></e2240></e2239></e2238></e2237></e2236></e2235></e2234></e2233></e2232></e2231></e2230></e2229></e2228></e2227></e2226></e2225></e2224></e2223></e2222></e2221></e2220></e2219></e2218></e2217></e2216></e2215></e2214></e2213></e2212></e2211></e2210></e2209></e2208></e2207></e2206></e2205></e2204></e2203></e2202></e2201></e2200></e2199></e2198></e2197></e2196></e2195></e2194></e2193></e2192></e2191></e2190></e2189></e2188></e2187></e2186></e2185></e2184></e2183></e2182></e2181></e2180></e2179></e2178></e2177></e2176></e2175></e2174></e2173></e2172></e2171></e2170></e2169></e2168></e2167></e2166></e2165></e2164></e2163></e2162></e2161></e2160></e2159></e2158></e2157></e2156></e2155></e2154></e2153></e2152></e2151></e2150></e2149></e2148></e2147></e2146></e2145></e2144></e2143></e2142></e2141></e2140></e2139></e2138></e2137></e2136></e2135></e2134></e2133></e2132></e2131></e2130></e2129></e2128></e2127></e2126></e2125></e2124></e2123></e2122></e2121></e2120></e2119></e2118></e2117></e2116></e2115></e2114></e2113></e2112></e2111></e2110></e2109></e2108></e2107></e2106></e2105></e2104></e2103></e2102></e2101></e2100></e2099></e2098></e2097></e2096></e2095></e2094></e2093></e2092></e2091></e2090></e2089></e2088></e2087></e2086></e2085></e2084></e2083></e2082></e2081></e2080></e2079></e2078></e2077></e2076></e2075></e2074></e2073></e2072></e2071></e2070></e2069></e2068></e2067></e2066></e2065></e2064></e2063></e2062></e2061></e2060></e2059></e2058></e2057></e2056></e2055></e2054></e2053></e2052></e2051></e2050></e2049></e2048></e2047></e2046></e2045></e2044></e2043></e2042></e2041></e2040></e2039></e2038></e2037></e2036></e2035></e2034></e2033></e2032></e2031></e2030></e2029></e2028></e2027></e2026></e2025></e2024></e2023></e2022></e2021></e2020></e2019></e2018></e2017></e2016></e2015></e2014></e2013></e2012></e2011></e2010></e2009></e2008></e2007></e2006></e2005></e2004></e2003></e2002></e2001></e2000></e1999></e1998></e1997></e1996></e1995></e1994></e1993></e1992></e1991></e1990></e1989></e1988></e1987></e1986></e1985></e1984></e1983></e1982></e1981></e1980></e1979></e1978></e1977></e1976></e1975></e1974></e1973></e1972></e1971></e1970></e1969></e1968></e1967></e1966></e1965></e1964></e1963></e1962></e1961></e1960></e1959></e1958></e1957></e1956></e1955></e1954></e1953></e1952></e1951></e1950></e1949></e1948></e1947></e1946></e1945></e1944></e1943></e1942></e1941></e1940></e1939></e1938></e1937></e1936></e1935></e1934></e1933></e1932></e1931></e1930></e1929></e1928></e1927></e1926></e1925></e1924></e1923></e1922></e1921></e1920></e1919></e1918></e1917></e1916></e1915></e1914></e1913></e1912></e1911></e1910></e1909></e1908></e1907></e1906></e1905></e1904></e1903></e1902></e1901></e1900></e1899></e1898></e1897></e1896></e1895></e1894></e1893></e1892></e1891></e1890></e1889></e1888></e1887></e1886></e1885></e1884></e1883></e1882></e1881></e1880></e1879></e1878></e1877></e1876></e1875></e1874></e1873></e1872></e1871></e1870></e1869></e1868></e1867></e1866></e1865></e1864></e1863></e1862></e1861></e1860></e1859></e1858></e1857></e1856></e1855></e1854></e1853></e1852></e1851></e1850></e1849></e1848></e1847></e1846></e1845></e1844></e1843></e1842></e1841></e1840></e1839></e1838></e1837></e1836></e1835></e1834></e1833></e1832></e1831></e1830></e1829></e1828></e1827></e1826></e1825></e1824></e1823></e1822></e1821></e1820></e1819></e1818></e1817></e1816></e1815></e1814></e1813></e1812></e1811></e1810></e1809></e1808></e1807></e1806></e1805></e1804></e1803></e1802></e1801></e1800></e1799></e1798></e1797></e1796></e1795></e1794></e1793></e1792></e1791></e1790></e1789></e1788></e1787></e1786></e1785></e1784></e1783></e1782></e1781></e1780></e1779></e1778></e1777></e1776></e1775></e1774></e1773></e1772></e1771></e1770></e1769></e1768></e1767></e1766></e1765></e1764></e1763></e1762></e1761></e1760></e1759></e1758></e1757></e1756></e1755></e1754></e1753></e1752></e1751></e1750></e1749></e1748></e1747></e1746></e1745></e1744></e1743></e1742></e1741></e1740></e1739></e1738></e1737></e1736></e1735></e1734></e1733></e1732></e1731></e1730></e1729></e1728></e1727></e1726></e1725></e1724></e1723></e1722></e1721></e1720></e1719></e1718></e1717></e1716></e1715></e1714></e1713></e1712></e1711></e1710></e1709></e1708></e1707></e1706></e1705></e1704></e1703></e1702></e1701></e1700></e1699></e1698></e1697></e1696></e1695></e1694></e1693></e1692></e1691></e1690></e1689></e1688></e1687></e1686></e1685></e1684></e1683></e1682></e1681></e1680></e1679></e1678></e1677></e1676></e1675></e1674></e1673></e1672></e1671></e1670></e1669></e1668></e1667></e1666></e1665></e1664></e1663></e1662></e1661></e1660></e1659></e1658></e1657></e1656></e1655></e1654></e1653></e1652></e1651></e1650></e1649></e1648></e1647></e1646></e1645></e1644></e1643></e1642></e1641></e1640></e1639></e1638></e1637></e1636></e1635></e1634></e1633></e1632></e1631></e1630></e1629></e1628></e1627></e1626></e1625></e1624></e1623></e1622></e1621></e1620></e1619></e1618></e1617></e1616></e1615></e1614></e1613></e1612></e1611></e1610></e1609></e1608></e1607></e1606></e1605></e1604></e1603></e1602></e1601></e1600></e1599></e1598></e1597></e1596></e1595></e1594></e1593></e1592></e1591></e1590></e1589></e1588></e1587></e1586></e1585></e1584></e1583></e1582></e1581></e1580></e1579></e1578></e1577></e1576></e1575></e1574></e1573></e1572></e1571></e1570></e1569></e1568></e1567></e1566></e1565></e1564></e1563></e1562></e1561></e1560></e1559></e1558></e1557></e1556></e1555></e1554></e1553></e1552></e1551></e1550></e1549></e1548></e1547></e1546></e1545></e1544></e1543></e1542></e1541></e1540></e1539></e1538></e1537></e1536></e1535></e1534></e1533></e1532></e1531></e1530></e1529></e1528></e1527></e1526></e1525></e1524></e1523></e1522></e1521></e1520></e1519></e1518></e1517></e1516></e1515></e1514></e1513></e1512></e1511></e1510></e1509></e1508></e1507></e1506></e1505></e1504></e1503></e1502></e1501></e1500></e1499></e1498></e1497></e1496></e1495></e1494></e1493></e1492></e1491></e1490></e1489></e1488></e1487></e1486></e1485></e1484></e1483></e1482></e1481></e1480></e1479></e1478></e1477></e1476></e1475></e1474></e1473></e1472></e1471></e1470></e1469></e1468></e1467></e1466></e1465></e1464></e1463></e1462></e1461></e1460></e1459></e1458></e1457></e1456></e1455></e1454></e1453></e1452></e1451></e1450></e1449></e1448></e1447></e1446></e1445></e1444></e1443></e1442></e1441></e1440></e1439></e1438></e1437></e1436></e1435></e1434></e1433></e1432></e1431></e1430></e1429></e1428></e1427></e1426></e1425></e1424></e1423></e1422></e1421></e1420></e1419></e1418></e1417></e1416></e1415></e1414></e1413></e1412></e1411></e1410></e1409></e1408></e1407></e1406></e1405></e1404></e1403></e1402></e1401></e1400></e1399></e1398></e1397></e1396></e1395></e1394></e1393></e1392></e1391></e1390></e1389></e1388></e1387></e1386></e1385></e1384></e1383></e1382></e1381></e1380></e1379></e1378></e1377></e1376></e1375></e1374></e1373></e1372></e1371></e1370></e1369></e1368></e1367></e1366></e1365></e1364></e1363></e1362></e1361></e1360></e1359></e1358></e1357></e1356></e1355></e1354></e1353></e1352></e1351></e1350></e1349></e1348></e1347></e1346></e1345></e1344></e1343></e1342></e1341></e1340></e1339></e1338></e1337></e1336></e1335></e1334></e1333></e1332></e1331></e1330></e1329></e1328></e1327></e1326></e1325></e1324></e1323></e1322></e1321></e1320></e1319></e1318></e1317></e1316></e1315></e1314></e1313></e1312></e1311></e1310></e1309></e1308></e1307></e1306></e1305></e1304></e1303></e1302></e1301></e1300></e1299></e1298></e1297></e1296></e1295></e1294></e1293></e1292></e1291></e1290></e1289></e1288></e1287></e1286></e1285></e1284></e1283></e1282></e1281></e1280></e1279></e1278></e1277></e1276></e1275></e1274></e1273></e1272></e1271></e1270></e1269></e1268></e1267></e1266></e1265></e1264></e1263></e1262></e1261></e1260></e1259></e1258></e1257></e1256></e1255></e1254></e1253></e1252></e1251></e1250></e1249></e1248></e1247></e1246></e1245></e1244></e1243></e1242></e1241></e1240></e1239></e1238></e1237></e1236></e1235></e1234></e1233></e1232></e1231></e1230></e1229></e1228></e1227></e1226></e1225></e1224></e1223></e1222></e1221></e1220></e1219></e1218></e1217></e1216></e1215></e1214></e1213></e1212></e1211></e1210></e1209></e1208></e1207></e1206></e1205></e1204></e1203></e1202></e1201></e1200></e1199></e1198></e1197></e1196></e1195></e1194></e1193></e1192></e1191></e1190></e1189></e1188></e1187></e1186></e1185></e1184></e1183></e1182></e1181></e1180></e1179></e1178></e1177></e1176></e1175></e1174></e1173></e1172></e1171></e1170></e1169></e1168></e1167></e1166></e1165></e1164></e1163></e1162></e1161></e1160></e1159></e1158></e1157></e1156></e1155></e1154></e1153></e1152></e1151></e1150></e1149></e1148></e1147></e1146></e1145></e1144></e1143></e1142></e1141></e1140></e1139></e1138></e1137></e1136></e1135></e1134></e1133></e1132></e1131></e1130></e1129></e1128></e1127></e1126></e1125></e1124></e1123></e1122></e1121></e1120></e1119></e1118></e1117></e1116></e1115></e1114></e1113></e1112></e1111></e1110></e1109></e1108></e1107></e1106></e1105></e1104></e1103></e1102></e1101></e1100></e1099></e1098></e1097></e1096></e1095></e1094></e1093></e1092></e1091></e1090></e1089></e1088></e1087></e1086></e1085></e1084></e1083></e1082></e1081></e1080></e1079></e1078></e1077></e1076></e1075></e1074></e1073></e1072></e1071></e1070></e1069></e1068></e1067></e1066></e1065></e1064></e1063></e1062></e1061></e1060></e1059></e1058></e1057></e1056></e1055></e1054></e1053></e1052></e1051></e1050></e1049></e1048></e1047></e1046></e1045></e1044></e1043></e1042></e1041></e1040></e1039></e1038></e1037></e1036></e1035></e1034></e1033></e1032></e1031></e1030></e1029></e1028></e1027></e1026></e1025></e1024></e1023></e1022></e1021></e1020></e1019></e1018></e1017></e1016></e1015></e1014></e1013></e1012></e1011></e1010></e1009></e1008></e1007></e1006></e1005></e1004></e1003></e1002></e1001></e1000></e999></e998></e997></e996></e995></e994></e993></e992></e991></e990></e989></e988></e987></e986></e985></e984></e983></e982></e981></e980></e979></e978></e977></e976></e975></e974></e973></e972></e971></e970></e969></e968></e967></e966></e965></e964></e963></e962></e961></e960></e959></e958></e957></e956></e955></e954></e953></e952></e951></e950></e949></e948></e947></e946></e945></e944></e943></e942></e941></e940></e939></e938></e937></e936></e935></e934></e933></e932></e931></e930></e929></e928></e927></e926></e925></e924></e923></e922></e921></e920></e919></e918></e917></e916></e915></e914></e913></e912></e911></e910></e909></e908></e907></e906></e905></e904></e903></e902></e901></e900></e899></e898></e897></e896></e895></e894></e893></e892></e891></e890></e889></e888></e887></e886></e885></e884></e883></e882></e881></e880></e879></e878></e877></e876></e875></e874></e873></e872></e871></e870></e869></e868></e867></e866></e865></e864></e863></e862></e861></e860></e859></e858></e857></e856></e855></e854></e853></e852></e851></e850></e849></e848></e847></e846></e845></e844></e843></e842></e841></e840></e839></e838></e837></e836></e835></e834></e833></e832></e831></e830></e829></e828></e827></e826></e825></e824></e823></e822></e821></e820></e819></e818></e817></e816></e815></e814></e813></e812></e811></e810></e809></e808></e807></e806></e805></e804></e803></e802></e801></e800></e799></e798></e797></e796></e795></e794></e793></e792></e791></e790></e789></e788></e787></e786></e785></e784></e783></e782></e781></e780></e779></e778></e777></e776></e775></e774></e773></e772></e771></e770></e769></e768></e767></e766></e765></e764></e763></e762></e761></e760></e759></e758></e757></e756></e755></e754></e753></e752></e751></e750></e749></e748></e747></e746></e745></e744></e743></e742></e741></e740></e739></e738></e737></e736></e735></e734></e733></e732></e731></e730></e729></e728></e727></e726></e725></e724></e723></e722></e721></e720></e719></e718></e717></e716></e715></e714></e713></e712></e711></e710></e709></e708></e707></e706></e705></e704></e703></e702></e701></e700></e699></e698></e697></e696></e695></e694></e693></e692></e691></e690></e689></e688></e687></e686></e685></e684></e683></e682></e681></e680></e679></e678></e677></e676></e675></e674></e673></e672></e671></e670></e669></e668></e667></e666></e665></e664></e663></e662></e661></e660></e659></e658></e657></e656></e655></e654></e653></e652></e651></e650></e649></e648></e647></e646></e645></e644></e643></e642></e641></e640></e639></e638></e637></e636></e635></e634></e633></e632></e631></e630></e629></e628></e627></e626></e625></e624></e623></e622></e621></e620></e619></e618></e617></e616></e615></e614></e613></e612></e611></e610></e609></e608></e607></e606></e605></e604></e603></e602></e601></e600></e599></e598></e597></e596></e595></e594></e593></e592></e591></e590></e589></e588></e587></e586></e585></e584></e583></e582></e581></e580></e579></e578></e577></e576></e575></e574></e573></e572></e571></e570></e569></e568></e567></e566></e565></e564></e563></e562></e561></e560></e559></e558></e557></e556></e555></e554></e553></e552></e551></e550></e549></e548></e547></e546></e545></e544></e543></e542></e541></e540></e539></e538></e537></e536></e535></e534></e533></e532></e531></e530></e529></e528></e527></e526></e525></e524></e523></e522></e521></e520></e519></e518></e517></e516></e515></e514></e513></e512></e511></e510></e509></e508></e507></e506></e505></e504></e503></e502></e501></e500></e499></e498></e497></e496></e495></e494></e493></e492></e491></e490></e489></e488></e487></e486></e485></e484></e483></e482></e481></e480></e479></e478></e477></e476></e475></e474></e473></e472></e471></e470></e469></e468></e467></e466></e465></e464></e463></e462></e461></e460></e459></e458></e457></e456></e455></e454></e453></e452></e451></e450></e449></e448></e447></e446></e445></e444></e443></e442></e441></e440></e439></e438></e437></e436></e435></e434></e433></e432></e431></e430></e429></e428></e427></e426></e425></e424></e423></e422></e421></e420></e419></e418></e417></e416></e415></e414></e413></e412></e411></e410></e409></e408></e407></e406></e405></e404></e403></e402></e401></e400></e399></e398></e397></e396></e395></e394></e393></e392></e391></e390></e389></e388></e387></e386></e385></e384></e383></e382></e381></e380></e379></e378></e377></e376></e375></e374></e373></e372></e371></e370></e369></e368></e367></e366></e365></e364></e363></e362></e361></e360></e359></e358></e357></e356></e355></e354></e353></e352></e351></e350></e349></e348></e347></e346></e345></e344></e343></e342></e341></e340></e339></e338></e337></e336></e335></e334></e333></e332></e331></e330></e329></e328></e327></e326></e325></e324></e323></e322></e321></e320></e319></e318></e317></e316></e315></e314></e313></e312></e311></e310></e309></e308></e307></e306></e305></e304></e303></e302></e301></e300></e299></e298></e297></e296></e295></e294></e293></e292></e291></e290></e289></e288></e287></e286></e285></e284></e283></e282></e281></e280></e279></e278></e277></e276></e275></e274></e273></e272></e271></e270></e269></e268></e267></e266></e265></e264></e263></e262></e261></e260></e259></e258></e257></e256></e255></e254></e253></e252></e251></e250></e249></e248></e247></e246></e245></e244></e243></e242></e241></e240></e239></e238></e237></e236></e235></e234></e233></e232></e231></e230></e229></e228></e227></e226></e225></e224></e223></e222></e221></e220></e219></e218></e217></e216></e215></e214></e213></e212></e211></e210></e209></e208></e207></e206></e205></e204></e203></e202></e201></e200></e199></e198></e197></e196></e195></e194></e193></e192></e191></e190></e189></e188></e187></e186></e185></e184></e183></e182></e181></e180></e179></e178></e177></e176></e175></e174></e173></e172></e171></e170></e169></e168></e167></e166></e165></e164></e163></e162></e161></e160></e159></e158></e157></e156></e155></e154></e153></e152></e151></e150></e149></e148></e147></e146></e145></e144></e143></e142></e141></e140></e139></e138></e137></e136></e135></e134></e133></e132></e131></e130></e129></e128></e127></e126></e125></e124></e123></e122></e121></e120></e119></e118></e117></e116></e115></e114></e113></e112></e111></e110></e109></e108></e107></e106></e105></e104></e103></e102></e101></e100></e99></e98></e97></e96></e95></e94></e93></e92></e91></e90></e89></e88></e87></e86></e85></e84></e83></e82></e81></e80></e79></e78></e77></e76></e75></e74></e73></e72></e71></e70></e69></e68></e67></e66></e65></e64></e63></e62></e61></e60></e59></e58></e57></e56></e55></e54></e53></e52></e51></e50></e49></e48></e47></e46></e45></e44></e43></e42></e41></e40></e39></e38></e37></e36></e35></e34></e33></e32></e31></e30></e29></e28></e27></e26></e25></e24></e23></e22></e21></e20></e19></e18></e17></e16></e15></e14></e13></e12></e11></e10></e9></e8></e7></e6></e5></e4></e3></e2></e1></doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/golden/DTM_testcase1.out	2015-01-09 15:41:37.419118094 -0800
@@ -0,0 +1,106 @@
+ *** DOCUMENT PROPERTIES: *** 
+DocURI="null" SystemID="null"
+StandAlone="null" DocVersion="null"
+
+ *** DOCUMENT DATA: *** 
+65536: DOCUMENT  : #document" E-Type=9 Level=1 Value=null
+	Prefix= "" Name= "" URI= "null" Parent=-1 1stChild=65537 NextSib=-1
+65537: ELEMENT bdd:dummyDocument : bdd:dummyDocument" E-Type=14 Level=2 Value=null
+	Prefix= "bdd" Name= "dummyDocument" URI= "www.bdd.org" Parent=65536 1stChild=65541 NextSib=-1
+	NAMESPACES:
+	65538: NAMESPACE xml : xmlns:xml" E-Type=15 Level=3 Value="http://www.w3.org/XML/1998/namespace"
+		Prefix= "" Name= "xml" URI= "null" Parent=65537 1stChild=-1 NextSib=65539
+	65539: NAMESPACE bdd : xmlns:bdd" E-Type=16 Level=3 Value="www.bdd.org"
+		Prefix= "" Name= "bdd" URI= "null" Parent=65537 1stChild=-1 NextSib=65540
+	ATTRIBUTES:
+	65540: ATTRIBUTE version : version" E-Type=17 Level=3 Value="99"
+		Prefix= "" Name= "version" URI= "null" Parent=65537 1stChild=-1 NextSib=-1
+65541: COMMENT  : #comment" E-Type=8 Level=3 Value=" Default test document "
+	Prefix= "" Name= "" URI= "null" Parent=65537 1stChild=-1 NextSib=65542
+65542: TEXT  : #text" E-Type=3 Level=3 Value="	&  "
+	Prefix= "" Name= "" URI= "null" Parent=65537 1stChild=-1 NextSib=65543
+65543: PROCESSING_INSTRUCTION api : api" E-Type=18 Level=3 Value="attrib1="yes" attrib2="no""
+	Prefix= "" Name= "api" URI= "null" Parent=65537 1stChild=-1 NextSib=65544
+65544: ELEMENT A : A" E-Type=19 Level=3 Value=null
+	Prefix= "" Name= "A" URI= "null" Parent=65537 1stChild=65545 NextSib=65550
+65545: ELEMENT B : B" E-Type=20 Level=4 Value=null
+	Prefix= "" Name= "B" URI= "null" Parent=65544 1stChild=65549 NextSib=-1
+	ATTRIBUTES:
+	65546: ATTRIBUTE hat : hat" E-Type=21 Level=5 Value="new"
+		Prefix= "" Name= "hat" URI= "null" Parent=65545 1stChild=-1 NextSib=65547
+	65547: ATTRIBUTE car : car" E-Type=22 Level=5 Value="Honda"
+		Prefix= "" Name= "car" URI= "null" Parent=65545 1stChild=-1 NextSib=65548
+	65548: ATTRIBUTE dog : dog" E-Type=23 Level=5 Value="Boxer"
+		Prefix= "" Name= "dog" URI= "null" Parent=65545 1stChild=-1 NextSib=-1
+65549: TEXT  : #text" E-Type=3 Level=5 Value="Life is good"
+	Prefix= "" Name= "" URI= "null" Parent=65545 1stChild=-1 NextSib=-1
+65550: ELEMENT C : C" E-Type=24 Level=3 Value=null
+	Prefix= "" Name= "C" URI= "null" Parent=65537 1stChild=65551 NextSib=65555
+65551: TEXT  : #text" E-Type=3 Level=4 Value="My Anaconda"
+	Prefix= "" Name= "" URI= "null" Parent=65550 1stChild=-1 NextSib=65552
+65552: ELEMENT xyz:D : xyz:D" E-Type=25 Level=4 Value=null
+	Prefix= "xyz" Name= "D" URI= "www.xyz.org" Parent=65550 1stChild=-1 NextSib=65554
+	NAMESPACES:
+	65553: NAMESPACE xyz : xmlns:xyz" E-Type=26 Level=5 Value="www.xyz.org"
+		Prefix= "" Name= "xyz" URI= "null" Parent=65552 1stChild=-1 NextSib=-1
+65554: TEXT  : #text" E-Type=3 Level=4 Value="Words"
+	Prefix= "" Name= "" URI= "null" Parent=65550 1stChild=-1 NextSib=-1
+65555: TEXT  : #text" E-Type=3 Level=3 Value="
+  	   Want a more interesting docuent, provide the URI on the command line!
+   "
+	Prefix= "" Name= "" URI= "null" Parent=65537 1stChild=-1 NextSib=65556
+65556: ELEMENT Sub-Doc : Sub-Doc" E-Type=27 Level=3 Value=null
+	Prefix= "" Name= "Sub-Doc" URI= "null" Parent=65537 1stChild=65560 NextSib=-1
+	NAMESPACES:
+	65557: NAMESPACE d : xmlns:d" E-Type=28 Level=4 Value="www.d.com"
+		Prefix= "" Name= "d" URI= "null" Parent=65556 1stChild=-1 NextSib=65558
+	ATTRIBUTES:
+	65558: ATTRIBUTE a1 : a1" E-Type=29 Level=4 Value="hello"
+		Prefix= "" Name= "a1" URI= "null" Parent=65556 1stChild=-1 NextSib=65559
+	65559: ATTRIBUTE a2 : a2" E-Type=30 Level=4 Value="goodbye"
+		Prefix= "" Name= "a2" URI= "null" Parent=65556 1stChild=-1 NextSib=-1
+65560: COMMENT  : #comment" E-Type=8 Level=4 Value=" Default test Subdocument "
+	Prefix= "" Name= "" URI= "null" Parent=65556 1stChild=-1 NextSib=65561
+65561: PROCESSING_INSTRUCTION api : api" E-Type=18 Level=4 Value="a1="yes" a2="no""
+	Prefix= "" Name= "api" URI= "null" Parent=65556 1stChild=-1 NextSib=65562
+65562: ELEMENT A : A" E-Type=19 Level=4 Value=null
+	Prefix= "" Name= "A" URI= "null" Parent=65556 1stChild=65563 NextSib=65572
+65563: COMMENT  : #comment" E-Type=8 Level=5 Value=" A Subtree "
+	Prefix= "" Name= "" URI= "null" Parent=65562 1stChild=-1 NextSib=65564
+65564: ELEMENT B : B" E-Type=20 Level=5 Value=null
+	Prefix= "" Name= "B" URI= "null" Parent=65562 1stChild=65565 NextSib=-1
+65565: ELEMENT C : C" E-Type=24 Level=6 Value=null
+	Prefix= "" Name= "C" URI= "null" Parent=65564 1stChild=65566 NextSib=-1
+65566: ELEMENT D : D" E-Type=31 Level=7 Value=null
+	Prefix= "" Name= "D" URI= "null" Parent=65565 1stChild=65567 NextSib=-1
+65567: ELEMENT E : E" E-Type=32 Level=8 Value=null
+	Prefix= "" Name= "E" URI= "null" Parent=65566 1stChild=65568 NextSib=-1
+65568: ELEMENT f:F : f:F" E-Type=33 Level=9 Value=null
+	Prefix= "f" Name= "F" URI= "www.f.com" Parent=65567 1stChild=-1 NextSib=-1
+	NAMESPACES:
+	65569: NAMESPACE f : xmlns:f" E-Type=34 Level=10 Value="www.f.com"
+		Prefix= "" Name= "f" URI= "null" Parent=65568 1stChild=-1 NextSib=65570
+	ATTRIBUTES:
+	65570: ATTRIBUTE a1 : a1" E-Type=29 Level=10 Value="down"
+		Prefix= "" Name= "a1" URI= "null" Parent=65568 1stChild=-1 NextSib=65571
+	65571: ATTRIBUTE a2 : a2" E-Type=30 Level=10 Value="up"
+		Prefix= "" Name= "a2" URI= "null" Parent=65568 1stChild=-1 NextSib=-1
+65572: ELEMENT Aa : Aa" E-Type=35 Level=4 Value=null
+	Prefix= "" Name= "Aa" URI= "null" Parent=65556 1stChild=-1 NextSib=65573
+65573: ELEMENT Ab : Ab" E-Type=36 Level=4 Value=null
+	Prefix= "" Name= "Ab" URI= "null" Parent=65556 1stChild=-1 NextSib=65574
+65574: ELEMENT Ac : Ac" E-Type=37 Level=4 Value=null
+	Prefix= "" Name= "Ac" URI= "null" Parent=65556 1stChild=65575 NextSib=65576
+65575: ELEMENT Ac1 : Ac1" E-Type=38 Level=5 Value=null
+	Prefix= "" Name= "Ac1" URI= "null" Parent=65574 1stChild=-1 NextSib=-1
+65576: ELEMENT Ad:Ad : Ad:Ad" E-Type=39 Level=4 Value=null
+	Prefix= "Ad" Name= "Ad" URI= "www.Ad.com" Parent=65556 1stChild=65580 NextSib=-1
+	NAMESPACES:
+	65577: NAMESPACE Ad : xmlns:Ad" E-Type=40 Level=5 Value="www.Ad.com"
+		Prefix= "" Name= "Ad" URI= "null" Parent=65576 1stChild=-1 NextSib=65578
+	65578: NAMESPACE y : xmlns:y" E-Type=41 Level=5 Value="www.y.com"
+		Prefix= "" Name= "y" URI= "null" Parent=65576 1stChild=-1 NextSib=65579
+	65579: NAMESPACE z : xmlns:z" E-Type=42 Level=5 Value="www.z.com"
+		Prefix= "" Name= "z" URI= "null" Parent=65576 1stChild=-1 NextSib=-1
+65580: ELEMENT Ad1 : Ad1" E-Type=43 Level=5 Value=null
+	Prefix= "" Name= "Ad1" URI= "null" Parent=65576 1stChild=-1 NextSib=-1
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/dtm/golden/TestDTMIterator.out	2015-01-09 15:41:37.716118557 -0800
@@ -0,0 +1,71 @@
+ 65542: COMMENT #comment  Level=3 	Value=" Default test document "
+ 65543: PROCESSING_INSTRUCTION api  Level=3 	Value="a1="yes" a2="no""
+ 65544: ELEMENT A  Level=3 	Value=null
+ 65554: ELEMENT Aa  Level=3 	Value=null
+ 65555: ELEMENT Ab  Level=3 	Value=null
+ 65556: ELEMENT Ac  Level=3 	Value=null
+ 65558: ELEMENT Ad  Level=3 	Value=null
+ 65537: ELEMENT Document  Level=2 	Value=null
+ 65558: ELEMENT Ad  Level=3 	Value=null
+ 65538: NAMESPACE xmlns:xml  Level=3 	Value="http://www.w3.org/XML/1998/namespace"
+ 65539: NAMESPACE xmlns:d  Level=3 	Value="www.d.com"
+ 65559: NAMESPACE xmlns:Ad  Level=4 	Value="www.Ad.com"
+ 65560: NAMESPACE xmlns:y  Level=4 	Value="www.y.com"
+ 65561: NAMESPACE xmlns:z  Level=4 	Value="www.z.com"
+ 65542: COMMENT #comment  Level=3 	Value=" Default test document "
+ 65543: PROCESSING_INSTRUCTION api  Level=3 	Value="a1="yes" a2="no""
+ 65544: ELEMENT A  Level=3 	Value=null
+ 65545: COMMENT #comment  Level=4 	Value=" A Subtree "
+ 65546: ELEMENT B  Level=4 	Value=null
+ 65547: ELEMENT C  Level=5 	Value=null
+ 65548: ELEMENT D  Level=6 	Value=null
+ 65549: ELEMENT E  Level=7 	Value=null
+ 65550: ELEMENT F  Level=8 	Value=null
+ 65554: ELEMENT Aa  Level=3 	Value=null
+ 65555: ELEMENT Ab  Level=3 	Value=null
+ 65556: ELEMENT Ac  Level=3 	Value=null
+ 65557: ELEMENT Ac1  Level=4 	Value=null
+ 65542: COMMENT #comment  Level=3 	Value=" Default test document "
+ 65543: PROCESSING_INSTRUCTION api  Level=3 	Value="a1="yes" a2="no""
+ 65544: ELEMENT A  Level=3 	Value=null
+ 65554: ELEMENT Aa  Level=3 	Value=null
+ 65555: ELEMENT Ab  Level=3 	Value=null
+ 65556: ELEMENT Ac  Level=3 	Value=null
+ 65554: ELEMENT Aa  Level=3 	Value=null
+ 65555: ELEMENT Ab  Level=3 	Value=null
+ 65556: ELEMENT Ac  Level=3 	Value=null
+ 65557: ELEMENT Ac1  Level=4 	Value=null
+ 65558: ELEMENT Ad  Level=3 	Value=null
+ 65562: ELEMENT Ad1  Level=4 	Value=null
+ 65554: ELEMENT Aa  Level=3 	Value=null
+ 65555: ELEMENT Ab  Level=3 	Value=null
+ 65556: ELEMENT Ac  Level=3 	Value=null
+ 65558: ELEMENT Ad  Level=3 	Value=null
+ 65545: COMMENT #comment  Level=4 	Value=" A Subtree "
+ 65546: ELEMENT B  Level=4 	Value=null
+ 65547: ELEMENT C  Level=5 	Value=null
+ 65548: ELEMENT D  Level=6 	Value=null
+ 65549: ELEMENT E  Level=7 	Value=null
+ 65550: ELEMENT F  Level=8 	Value=null
+ 65544: ELEMENT A  Level=3 	Value=null
+ 65545: COMMENT #comment  Level=4 	Value=" A Subtree "
+ 65546: ELEMENT B  Level=4 	Value=null
+ 65547: ELEMENT C  Level=5 	Value=null
+ 65548: ELEMENT D  Level=6 	Value=null
+ 65549: ELEMENT E  Level=7 	Value=null
+ 65550: ELEMENT F  Level=8 	Value=null
+ 65536: DOCUMENT #document  Level=1 	Value=null
+ 65537: ELEMENT Document  Level=2 	Value=null
+ 65544: ELEMENT A  Level=3 	Value=null
+ 65546: ELEMENT B  Level=4 	Value=null
+ 65547: ELEMENT C  Level=5 	Value=null
+ 65548: ELEMENT D  Level=6 	Value=null
+ 65549: ELEMENT E  Level=7 	Value=null
+ 65536: DOCUMENT #document  Level=1 	Value=null
+ 65537: ELEMENT Document  Level=2 	Value=null
+ 65544: ELEMENT A  Level=3 	Value=null
+ 65546: ELEMENT B  Level=4 	Value=null
+ 65547: ELEMENT C  Level=5 	Value=null
+ 65548: ELEMENT D  Level=6 	Value=null
+ 65549: ELEMENT E  Level=7 	Value=null
+ 65550: ELEMENT F  Level=8 	Value=null
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/EmbeddedStylesheetTest.java	2015-01-09 15:41:37.971118955 -0800
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static org.testng.Assert.assertNull;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class EmbeddedStylesheetTest extends JAXPFileBaseTest {
+    /**
+     * Simple XML documents with xml-stylesheet PI's.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase1() throws Exception {
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+        String xmlName = XML_DIR + "embeddedIdentity.xml";
+        String goldFile = GOLDEN_DIR + "embeddedIdentity.out";
+        String outputFile = USER_DIR + "embeddedIdentity.out";
+
+        TransformerFactory factory = TransformerFactory.newInstance();
+        Source stylesheet = factory.getAssociatedStylesheet(
+                new StreamSource(filenameToURL(xmlName)), null, null, null);
+        Templates embedTemplates = factory.newTemplates(stylesheet);
+        Transformer embedTransformer = embedTemplates.newTransformer();
+        embedTransformer.transform(
+                new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(outputFile));
+        compareWithGold(goldFile, outputFile);
+    }
+
+    /**
+     * Data provider for testCase2.
+     * @return two dimensional array that provide parameters as output file, 
+     * golden file, title, media.
+     */
+    @DataProvider
+    public static Object[][] titleMediaProvider() {
+        return new Object[][]{
+            {"EmbeddedRelative0.out", "EmbeddedRelative0.out", null, "bar/media"},
+            {"EmbeddedRelative1.out", "EmbeddedRelative1.out", null, "foo/media"},
+            {"EmbeddedRelative0.out", "EmbeddedRelative0.out", "bar-title", null},
+            {"EmbeddedRelative1.out", "EmbeddedRelative1.out", "foo-title", null},
+            {"EmbeddedRelative2.out", "EmbeddedRelative2.out", null, "alt/media"}
+        };
+    }
+
+    /**
+     * Test media, title, character set types of xml-stylesheet PI's.
+     *
+     * @param outputFileName output file name.
+     * @param goldFileName golden validation file name.
+     * @param media The media attribute to be matched.  May be null, in which
+     *      case the prefered templates will be used (i.e. alternate = no).
+     * @param title The value of the title attribute to match.  May be null.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "titleMediaProvider")
+    public void testCase2(String outputFileName, String goldFileName,
+        String title, String media) throws Exception {
+        String mediaTitleName = XML_DIR + "EmbeddedMediaTitle.xml";
+        String outputFile = USER_DIR + outputFileName;
+        String goldFile = GOLDEN_DIR + goldFileName;
+
+        TransformerFactory factory = TransformerFactory.newInstance();
+        Source xslSrc = factory.getAssociatedStylesheet(
+                new StreamSource(filenameToURL(mediaTitleName)),
+                media, title, null);
+        factory.newTransformer(xslSrc).transform(
+                new StreamSource(filenameToURL(mediaTitleName)),
+                new StreamResult(outputFile));
+        compareWithGold(goldFile, outputFile);
+    }
+
+    @DataProvider
+    public Object[][] invalidTitleMedia() {
+        return new Object[][] {
+            {"title-not-found", null},
+            {null, "media/notfound"},
+            {"alt-title", "media/notfound"},
+            {"title-not-found", "alt/media"}
+        };
+    }
+
+    /**
+     * Expect null if invalid title or media.
+     * 
+     * @param media The media attribute to be matched.  May be null, in which
+     *      case the prefered templates will be used (i.e. alternate = no).
+     * @param title The value of the title attribute to match.  May be null.
+     * @throws TransformerConfigurationException Thrown in case of {@linkplain
+     * java.util.ServiceConfigurationError service configuration error} or if
+     * the implementation is not available or cannot be instantiated.
+     */
+    @Test(dataProvider = "invalidTitleMedia")
+    public void checkNull(String title, String media) 
+            throws TransformerConfigurationException {
+        String mediaTitleName = XML_DIR + "EmbeddedMediaTitle.xml";
+        TransformerFactory factory = TransformerFactory.newInstance();
+        Source xslSrc = factory.getAssociatedStylesheet(
+                new StreamSource(filenameToURL(mediaTitleName)),
+                media, title, null);
+        assertNull(xslSrc);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/ErrorListenerAPITest.java	2015-01-09 15:41:38.237119370 -0800
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import com.sun.org.apache.xml.internal.utils.DefaultErrorHandler;
+import javax.xml.transform.TransformerException;
+import jaxp.library.JAXPBaseTest;
+import static org.testng.Assert.assertNotNull;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * API Coverage test for ErrorListener.
+ */
+public class ErrorListenerAPITest extends JAXPBaseTest {
+    /**
+     * All test method need access internal package 
+     * com.sun.org.apache.xml.internal.utils and 
+     * com.sun.org.apache.xpath.internal.objects.
+     */
+    @BeforeMethod
+    public void inititalize() {
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+    }
+    /**
+     * Root exception wrap message.
+     */
+    private final String EXP_MSG = "Exception-message-here";
+    
+    /**
+     * Transformer exception wrap message.
+     */
+    private final String TRANSFORMER_EXP_MSG = "TransformerException-message-here";
+
+    /**
+     * Default behavior of DefaultErrorHandler.warning is doing nothing.
+     * 
+     * @throws TransformerException Any SAX exception, possibly wrapping another
+     *         exception.
+     */
+    @Test
+    public void testWarning() throws TransformerException {
+        DefaultErrorHandler deh = new DefaultErrorHandler();
+        assertNotNull(deh);
+        
+        Exception ex = new Exception(EXP_MSG);
+        TransformerException tex = new TransformerException(TRANSFORMER_EXP_MSG, ex);
+        deh.warning(tex);
+    }
+    
+    /**
+     * Default behavior of DefaultErrorHandler.error is throwing out the 
+     * TransformerException.
+     * 
+     * @throws TransformerException Any SAX exception, possibly wrapping another
+     *         exception. 
+     */
+    @Test(expectedExceptions = TransformerException.class)
+    public void testError() throws TransformerException {
+        DefaultErrorHandler deh = new DefaultErrorHandler();
+        assertNotNull(deh);
+        
+        Exception ex = new Exception(EXP_MSG);
+        TransformerException tex = new TransformerException(TRANSFORMER_EXP_MSG, ex);
+        deh.error(tex);
+    }
+    
+    /**
+     * Default behavior of DefaultErrorHandler.fatalError is throwing out the 
+     * TransformerException.
+     * 
+     * @throws TransformerException Any SAX exception, possibly wrapping another
+     *         exception.
+     */
+    @Test(expectedExceptions = TransformerException.class)
+    public void testFatalError() throws TransformerException {
+        DefaultErrorHandler deh = new DefaultErrorHandler();
+        assertNotNull(deh);
+        
+        Exception ex = new Exception(EXP_MSG);
+        TransformerException tex = new TransformerException(TRANSFORMER_EXP_MSG, ex);
+        deh.fatalError(tex);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/ErrorListenerTest.java	2015-01-09 15:41:38.508119792 -0800
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.apache.qetest.CheckingHandler.Expectation.ITEM_CHECKFAIL;
+import static org.apache.qetest.trax.CheckingErrorListener.THROW_NEVER;
+import static org.apache.qetest.trax.CheckingErrorListener.TYPE_FATALERROR;
+import static org.apache.qetest.trax.CheckingErrorListener.TYPE_WARNING;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import org.apache.qetest.xsl.CheckingSAXErrorHandler;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+/**
+ * Verify that ErrorListeners are called properly from Transformers. Also
+ * verifies basic Transformer behavior after a stylesheet with errors has been
+ * built. Note: parts of this test may rely on specific Xalan functionality, in
+ * that with the specific errors I've chosen, Xalan can actually continue to
+ * process the stylesheet, even though it had an error. XSLTC mode may either
+ * throw slighly different kinds of errors, or may not be able to continue after
+ * the error (we should investigate changing this test to just verify common
+ * things, and then check the rest into the xalanj2 directory).
+ */
+public class ErrorListenerTest extends JAXPFileBaseTest {
+    /**
+     * Expect fatal when transformation by default.
+     */
+    private static final int TEMPLATES_EXPECTED_TYPE = TYPE_FATALERROR;
+
+    /**
+     * Expect warning when transformation by default.
+     */
+    private static final int TRANSFORM_EXPECTED_TYPE = TYPE_WARNING;
+
+    /**
+     * Data provide provides test XML, stylesheet and output files name.
+     * @return an array has XML, stylesheet and output files name.
+     */
+    @DataProvider
+    public Object[][] testFiles(){
+        return new Object[][]{
+            {XML_DIR + "ErrorListenerTest.xml", 
+                XML_DIR + "ErrorListenerTest.xsl",
+                GOLDEN_DIR + "ErrorListenerTest.out"}
+        };
+    }
+
+    /**
+     * TransformerFactory Set/Get ErrorListener test.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur. 
+     */
+    @Test(dataProvider = "testFiles")
+    public void testCase1(String xmlFile, String xslFile, String goldFile) 
+            throws Exception {
+        String outputFile = getNextFile(this.getClass());
+ 
+        CheckingErrorListener chkErrorListener = new CheckingErrorListener(THROW_NEVER);
+
+        TransformerFactory factory = TransformerFactory.newInstance();
+        // Set the errorListener and validate it
+        factory.setErrorListener(chkErrorListener);
+
+        // Attempt to build templates from known-bad stylesheet
+        // Validate known errors in stylesheet building
+        chkErrorListener.setExpected(TEMPLATES_EXPECTED_TYPE,
+                ITEM_CHECKFAIL);
+        Templates templates = factory.newTemplates(new StreamSource(filenameToURL(xslFile)));
+        // Clear out any setExpected or counters
+        chkErrorListener.reset();
+
+        // This stylesheet will still work, even though errors
+        //  were detected during it's building.  Note that
+        //  future versions of Xalan or other processors may
+        //  not be able to continue here...
+        Transformer transformer = templates.newTransformer();
+
+        // Set the errorListener and validate it
+        transformer.setErrorListener(chkErrorListener);
+
+        // Validate the first xsl:message call in the stylesheet
+        chkErrorListener.setExpected(TRANSFORM_EXPECTED_TYPE,
+                ITEM_CHECKFAIL);
+        transformer.transform(new StreamSource(filenameToURL(xmlFile)),
+                new StreamResult(outputFile));
+        // Clear out any setExpected or counters
+        chkErrorListener.reset();
+        compareWithGold(goldFile, outputFile);
+    }
+
+    /**
+     * Build a bad style-sheet/do a transform with DOMs. Verify that the 
+     * ErrorListener is called properly. Primarily using SAXSources.
+     * 
+     * @param xmlFile test XML filename.
+     * @param xslFile test style-sheet filename.
+     * @param goldFile golden verification filename.
+     *  
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "testFiles")
+    public void testCase2(String xmlFile, String xslFile, String goldFile) 
+            throws Exception {
+        String outputFile = getNextFile(this.getClass());
+
+        CheckingErrorListener loggingErrorListener = new CheckingErrorListener(THROW_NEVER);
+        // assumes SAXSource.feature!
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory)TransformerFactory.newInstance();
+
+        // Set the errorListener and validate it
+        saxFactory.setErrorListener(loggingErrorListener);
+
+        // Use the JAXP way to get an XMLReader
+        XMLReader reader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        InputSource is = new InputSource(filenameToURL(xslFile));
+
+        // Attempt to build templates from known-bad stylesheet
+        // Validate known errors in stylesheet building
+        loggingErrorListener.setExpected(TEMPLATES_EXPECTED_TYPE,
+                ITEM_CHECKFAIL);
+        TransformerHandler handler = saxFactory.newTransformerHandler(new SAXSource(is));
+        // Clear out any setExpected or counters
+        loggingErrorListener.reset();
+
+        // This stylesheet will still work, even though errors
+        //  were detected during it's building.  Note that
+        //  future versions of Xalan or other processors may
+        //  not be able to continue here...
+
+        // Create a result and setup SAX parsing 'tree'
+        Result result = new StreamResult(outputFile);
+        handler.setResult(result);
+        reader.setContentHandler(handler);
+
+        CheckingSAXErrorHandler loggingSAXErrorHandler 
+                = new CheckingSAXErrorHandler(CheckingSAXErrorHandler.THROW_NEVER);
+        reader.setErrorHandler(loggingSAXErrorHandler);
+
+        // Validate the first xsl:message call in the stylesheet
+        loggingErrorListener.setExpected(TRANSFORM_EXPECTED_TYPE,
+                ITEM_CHECKFAIL);
+        reader.parse(filenameToURL(xmlFile));
+        // Clear out any setExpected or counters
+        loggingErrorListener.reset();
+        loggingSAXErrorHandler.reset();
+        compareWithGold(goldFile, outputFile);
+    }
+    
+    /**
+     * Build a bad style-sheet/do a transform with DOMs. Verify that the 
+     * ErrorListener is called properly. Primarily using DOMSources.
+     * 
+     * @param xmlFile test XML filename.
+     * @param xslFile test style-sheet filename.
+     * @param goldFile golden verification filename. 
+     * @throws Exception If any errors occur. 
+     */
+    @Test(dataProvider = "testFiles")
+    public void testCase3(String xmlFile, String xslFile, String goldFile) 
+            throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        CheckingErrorListener chkErrorListener = new CheckingErrorListener(THROW_NEVER);
+        // Startup a DOM factory, create some nodes/DOMs
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslNode = docBuilder.parse(new InputSource(filenameToURL(xslFile)));
+        Node xmlNode = docBuilder.parse(new InputSource(filenameToURL(xmlFile)));
+
+        // Create a transformer factory with an error listener
+        TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setErrorListener(chkErrorListener);
+
+        // Attempt to build templates from known-bad stylesheet
+        // Validate known errors in stylesheet building
+        Templates templates = factory.newTemplates(new DOMSource(xslNode));
+        // Clear out any setExpected or counters 
+        Transformer transformer = templates.newTransformer();
+        transformer.setErrorListener(chkErrorListener);
+        transformer.transform(new DOMSource(xmlNode), new StreamResult(outputFile));
+        compareWithGold(goldFile, outputFile);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/ExamplesTest.java	2015-01-09 15:41:38.786120226 -0800
@@ -0,0 +1,499 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import com.sun.org.apache.xml.internal.serializer.OutputPropertiesFactory;
+import com.sun.org.apache.xml.internal.serializer.Serializer;
+import com.sun.org.apache.xml.internal.serializer.SerializerFactory;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Properties;
+import java.util.PropertyPermission;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
+
+/**
+ * Test version of xml-xalan/java/samples/trax/Examples.java.
+ * This file is essentially copied from the Examples for TRAX, or
+ * javax.xml.transform; however this file actually validates most output and
+ * behavior for correctness.
+ */
+public class ExamplesTest extends JAXPFileBaseTest {
+    /**
+     * Test XML file 1 name.
+     */
+    private static final String SOURCE_ID = XML_DIR + "xml/foo.xml";
+    
+    /**
+     * Test XML file 2 name.
+     */
+    private static final String SOURCE_ID2 = XML_DIR + "xml/baz.xml";
+    
+    /**
+     * Test stylesheet file name.
+     */
+    private static final String XSL_ID =  XML_DIR + "xsl/foo.xsl";
+
+    /**
+     * Show the Transformer as a simple XMLFilter. This is pretty similar to
+     * exampleXMLReader, except that here the parent XMLReader is created by the
+     * caller, instead of automatically within the XMLFilter. This gives the
+     * caller more direct control over the parent reader.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleXMLFilter() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+
+            TransformerFactory tfactory = TransformerFactory.newInstance();
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            SAXParser jaxpParser = factory.newSAXParser();
+            XMLReader reader = jaxpParser.getXMLReader();
+
+            // Set the result handling to be a serialization to the file output stream.
+            Serializer serializer = SerializerFactory.getSerializer(
+                    OutputPropertiesFactory.getDefaultMethodProperties("xml"));
+            serializer.setOutputStream(fos);
+            reader.setContentHandler(serializer.asContentHandler());
+            reader.setFeature("http://xml.org/sax/features/namespace-prefixes",
+                    true);
+            reader.setFeature("http://apache.org/xml/features/validation/dynamic",
+                    true);
+            XMLFilter filter = ((SAXTransformerFactory) tfactory)
+                    .newXMLFilter(new StreamSource(filenameToURL(XSL_ID)));
+            filter.setParent(reader);
+
+            // Now, when you call transformer.parse, it will set itself as
+            // the content handler for the parser object (it's "parent"), and
+            // will then call the parse method on the parser.
+            filter.parse(new InputSource(filenameToURL(SOURCE_ID)));
+        }
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_14.out", outputFile));
+    }
+
+    /**
+     * Show simple transformation from reader to output stream. In general this
+     * use case is discouraged, since the XML encoding can not be processed.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleFromReader() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        // Create a transform factory instance.
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // Note that in this case the XML encoding can not be processed!
+        Reader xslReader = new BufferedReader(new InputStreamReader(new FileInputStream(XSL_ID), "UTF-8"));
+        StreamSource xslSource = new StreamSource(xslReader);
+        // Note that if we don't do this, relative URLs can not be resolved correctly!
+        xslSource.setSystemId(filenameToURL(XSL_ID));
+
+        // Create a transformer for the stylesheet.
+        Transformer transformer = tfactory.newTransformer(xslSource);
+
+        Reader xmlReader = new BufferedReader(new InputStreamReader(new FileInputStream(SOURCE_ID), "UTF-8"));
+        StreamSource xmlSource = new StreamSource(xmlReader);
+        // Note that if we don't do this, relative URLs can not be resolved correctly!
+        xmlSource.setSystemId(filenameToURL(SOURCE_ID));
+
+        // Transform the source XML to output file.
+        transformer.transform(xmlSource, new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_5.out", outputFile));
+    }
+
+    /**
+     * Show the Transformer using SAX events in and SAX events out.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleContentHandlerToContentHandler() throws Exception {
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        String outputFile = getNextFile(this.getClass());
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            // Does this factory support SAX features?
+            if (!tfactory.getFeature(SAXSource.FEATURE)) {
+                return;
+            }
+            // If so, we can safely cast.
+            SAXTransformerFactory stfactory = (SAXTransformerFactory) tfactory;
+
+            // A TransformerHandler is a ContentHandler that will listen for
+            // SAX events, and transform them to the result.
+            TransformerHandler handler
+                    = stfactory.newTransformerHandler(new StreamSource(filenameToURL(XSL_ID)));
+
+            // Set the result handling to be a serialization to the file output stream.
+            Serializer serializer = SerializerFactory.getSerializer(
+                    OutputPropertiesFactory.getDefaultMethodProperties("xml"));
+            serializer.setOutputStream(fos);
+            Result result = new SAXResult(serializer.asContentHandler());
+
+            handler.setResult(result);
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            XMLReader reader = factory.newSAXParser().getXMLReader();
+            reader.setContentHandler(handler);
+
+            // It's a good idea for the parser to send lexical events.
+            // The TransformerHandler is also a LexicalHandler.
+            reader.setProperty("http://xml.org/sax/properties/lexical-handler", handler);
+
+            // Parse the source XML, and send the parse events to the TransformerHandler.
+            reader.parse(filenameToURL(SOURCE_ID));
+        }
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_3.out", outputFile));
+    }
+
+    /**
+     * Show the Transformer using SAX events in and DOM nodes out.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleContentHandler2DOM() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // Make sure the transformer factory we obtained supports both
+        // DOM and SAX.
+        if (!(tfactory.getFeature(SAXSource.FEATURE)
+                && tfactory.getFeature(DOMSource.FEATURE))) {
+            return;
+        }
+        // We can now safely cast to a SAXTransformerFactory.
+        SAXTransformerFactory sfactory = (SAXTransformerFactory) tfactory;
+
+        // Create an Document node as the root for the output.
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        org.w3c.dom.Document outNode = docBuilder.newDocument();
+
+        // Create a ContentHandler that can liston to SAX events
+        // and transform the output to DOM nodes.
+        TransformerHandler handler
+                = sfactory.newTransformerHandler(new StreamSource(filenameToURL(XSL_ID)));
+        handler.setResult(new DOMResult(outNode));
+
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        XMLReader reader = factory.newSAXParser().getXMLReader();
+        reader.setContentHandler(handler);
+        reader.setProperty("http://xml.org/sax/properties/lexical-handler",
+                handler);
+
+        // Send the SAX events from the parser to the transformer,
+        // and thus to the DOM tree.
+        reader.parse(filenameToURL(SOURCE_ID));
+
+        // Serialize the node for diagnosis.
+        //    This serializes to outNames.nextName()
+        Transformer serializer = tfactory.newTransformer();
+        serializer.setOutputProperty(OutputKeys.INDENT, "yes");
+        serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+        serializer.transform(new DOMSource(outNode),
+                new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_2.out", outputFile));
+    }
+
+    /**
+     * A fuller example showing how the TrAX interface can be used to serialize
+     * a DOM tree.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleAsSerializer() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        org.w3c.dom.Document outNode = docBuilder.newDocument();
+        Node doc = docBuilder.parse(new InputSource(filenameToURL(SOURCE_ID)));
+
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // This creates a transformer that does a simple identity transform,
+        // and thus can be used for all intents and purposes as a serializer.
+        Transformer serializer = tfactory.newTransformer();
+
+        Properties oprops = new Properties();
+        oprops.put("method", "html");
+        oprops.put("{http://xml.apache.org/xslt}indent-amount", "2");
+        serializer.setOutputProperties(oprops);
+        serializer.transform(new DOMSource(doc),
+                new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_1.out", outputFile));
+    }
+
+    /**
+     * Show simple transformation from input stream to output stream.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleFromStream() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        try (InputStream xslIS = new BufferedInputStream(new FileInputStream(XSL_ID));
+                InputStream xmlIS = new BufferedInputStream(new FileInputStream(SOURCE_ID))) {
+            // Create a transform factory instance.
+            TransformerFactory tfactory = TransformerFactory.newInstance();
+            StreamSource xslSource = new StreamSource(xslIS);
+            // Note that if we don't do this, relative URLs can not be resolved correctly!
+            xslSource.setSystemId(filenameToURL(XSL_ID));
+
+            // Create a transformer for the stylesheet.
+            Transformer transformer = tfactory.newTransformer(xslSource);
+            StreamSource xmlSource = new StreamSource(xmlIS);
+            // Note that if we don't do this, relative URLs can not be resolved correctly!
+            xmlSource.setSystemId(filenameToURL(SOURCE_ID));
+
+            // Transform the source XML to output file.
+            transformer.transform(xmlSource, new StreamResult(outputFile));
+        }
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_6.out", outputFile));
+    }
+
+    /**
+     * Show how to override output properties.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleOutputProperties() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        Templates templates = tfactory.newTemplates(new StreamSource(filenameToURL(XSL_ID)));
+        Properties oprops = templates.getOutputProperties();
+
+        oprops.put(OutputKeys.INDENT, "yes");
+
+        Transformer transformer = templates.newTransformer();
+
+        transformer.setOutputProperties(oprops);
+        transformer.transform(new StreamSource(filenameToURL(SOURCE_ID)),
+                new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_7.out", outputFile));
+    }
+
+    /**
+     * Show how to transform a DOM tree into another DOM tree. This uses the
+     * javax.xml.parsers to parse an XML file into a DOM, and create an output
+     * DOM.
+     *
+     * @throws Exception If any errors occur.
+     */
+    public void exampleDOM2DOM() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        org.w3c.dom.Document outNode = docBuilder.newDocument();
+        Node xslDoc = docBuilder.parse(new InputSource(filenameToURL(XSL_ID)));
+        DOMSource dsource = new DOMSource(xslDoc);
+        // If we don't do this, the transformer won't know how to
+        // resolve relative URLs in the stylesheet.
+        dsource.setSystemId(filenameToURL(XSL_ID));
+
+        Templates templates = tfactory.newTemplates(dsource);
+
+        Transformer transformer = templates.newTransformer();
+        Node xmlDoc = docBuilder.parse(new InputSource(filenameToURL(SOURCE_ID)));
+
+        transformer.transform(new DOMSource(xmlDoc), new DOMResult(outNode));
+
+        Transformer serializer = tfactory.newTransformer();
+        serializer.transform(new DOMSource(outNode), new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_4.out", outputFile));
+    }
+
+    /**
+     * Show the Transformer using SAX events in and DOM nodes out.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleSimple1() throws Exception {        
+        String outputFile = getNextFile(this.getClass());
+        // Create a transform factory instance.
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // Create a transformer for the stylesheet.
+        Transformer transformer
+                = tfactory.newTransformer(new StreamSource(filenameToURL(XSL_ID)));
+        // No need to setSystemId, the transformer can get it from the URL
+
+        transformer.transform(new StreamSource(filenameToURL(SOURCE_ID)),
+                new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_8.out", outputFile));
+    }
+
+    /**
+     * Show the simplest possible transformation from File to a File.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleSimple2() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // Create a transformer for the stylesheet.
+        try {
+            setPermissions(new PropertyPermission("user.dir", "read"));
+            Transformer transformer
+                = tfactory.newTransformer(new StreamSource(new File(XSL_ID)));
+            // No need to setSystemId, the transformer can get it from the File
+
+            transformer.transform(new StreamSource(new File(SOURCE_ID)),
+                new StreamResult(new File(outputFile)));
+        } finally {
+            setPermissions();
+        }
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_9.out", outputFile));
+    }
+
+    /**
+     * Show the that a transformer can be reused, and show resetting a parameter
+     * on the transformer.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleTransformerReuse() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        // Create a transform factory instance.
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // Create a transformer for the stylesheet.
+        Transformer transformer
+                = tfactory.newTransformer(new StreamSource(filenameToURL(XSL_ID)));
+
+        transformer.setParameter("a-param", "hello to you!");
+
+        transformer.transform(new StreamSource(filenameToURL(SOURCE_ID)),
+                new StreamResult(outputFile));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_10.out", outputFile));
+
+        transformer.setParameter("a-param",  "hello to me!");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        String outputFile2 = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(filenameToURL(SOURCE_ID)),
+                new StreamResult(outputFile2));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_11.out", outputFile));
+    }
+
+    /**
+     * Show the simplest possible transformation from system id to output
+     * stream.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleUseTemplatesObj() throws Exception {
+        String outputFile1 = getNextFile(this.getClass());
+        String outputFile2 = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+
+        // Create a templates object, which is the processed,
+        // thread-safe representation of the stylesheet.
+        Templates templates = tfactory.newTemplates(new StreamSource(filenameToURL(XSL_ID)));
+
+        // Illustrate the fact that you can make multiple transformers
+        // from the same template.
+        Transformer transformer1 = templates.newTransformer();
+        Transformer transformer2 = templates.newTransformer();
+
+        transformer1.transform(new StreamSource(filenameToURL(SOURCE_ID)),
+                new StreamResult(outputFile1));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_12.out", outputFile1));
+
+        transformer2.transform(new StreamSource(filenameToURL(SOURCE_ID2)),
+                new StreamResult(outputFile2));
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_13.out", outputFile2));
+    }
+
+    /**
+     * Show the Transformer as a SAX2 XMLReader. An XMLFilter obtained from
+     * newXMLFilter should act as a transforming XMLReader if setParent is not
+     * called. Internally, an XMLReader is created as the parent for the
+     * XMLFilter.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void exampleXMLReader() throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            TransformerFactory tfactory = TransformerFactory.newInstance();
+            XMLReader reader  = ((SAXTransformerFactory) tfactory)
+                    .newXMLFilter(new StreamSource(filenameToURL(XSL_ID)));
+
+            // Set the result handling to be a serialization to the file output stream.
+            Serializer serializer = SerializerFactory.getSerializer(OutputPropertiesFactory.getDefaultMethodProperties("xml"));
+
+            serializer.setOutputStream(fos);
+
+            reader.setContentHandler(serializer.asContentHandler());
+            reader.parse(new InputSource(filenameToURL(SOURCE_ID)));
+        }
+        assertTrue(compareWithGold(GOLDEN_DIR + "ExamplesTest_15.out", outputFile));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/Minitest.java	2015-01-09 15:41:39.102120719 -0800
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import java.io.FileOutputStream;
+import java.util.Properties;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import org.apache.qetest.xslwrapper.TransformWrapper;
+import org.apache.qetest.xslwrapper.TransformWrapperFactory;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for Xalan-J 2.x.
+ *
+ * Developers should always run either the minitest or smoketest
+ * target before checking any code into the xml-xalan CVS
+ * repository.  Running the minitest before checking in ensures
+ * that the Xalan CVS tree will always be in a compileable and
+ * at least basically functional state, thus ensuring a workable
+ * product for your fellow Xalan developers.  Ensuring your code
+ * passes the smoketest target will also help the nightly GUMP
+ * runs to pass the smoketest as well and avoid 'nag' emails.
+ */
+public class Minitest extends JAXPFileBaseTest {
+    /**
+     * Constants matching parameter names/values.
+     */
+    private static final String PARAM1S = "param1s";
+
+    private static final String PARAM1N = "param1n";
+
+    /**
+     * Basic systemId transforms and parameters plus API coverage.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void test() throws Exception {
+        String xslFile = XML_DIR + "Minitest.xsl";
+        String xmlFile = XML_DIR + "Minitest.xml";
+        // Use separate output files for different versions, since
+        //  some indenting rules are implemented differently 1.x/2.x
+        String goldFile = GOLDEN_DIR + "Minitest-xalanj2.out";
+
+        String file1 = getNextFile(this.getClass());
+        String file2 = getNextFile(this.getClass());
+
+        try (FileOutputStream fos1 = new FileOutputStream(file1);
+                FileOutputStream fos2 = new FileOutputStream(file2);) {
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Templates templates = factory.newTemplates(new StreamSource(filenameToURL(xslFile)));
+            Transformer transformer = templates.newTransformer();
+            transformer.transform(new StreamSource(filenameToURL(xmlFile)),
+                    new StreamResult(fos1));
+            compareWithGold(goldFile, file1);
+
+            // Validate transformer reuse
+            transformer.transform(new StreamSource(filenameToURL(xmlFile)),
+                    new StreamResult(fos2));
+            compareWithGold(goldFile, file2);
+        } 
+
+        String paramXslFile = XML_DIR + "MinitestParam.xsl";
+        String paramXmlFile = XML_DIR + "MinitestParam.xml";
+        String paramGoldFile = GOLDEN_DIR + "MinitestParam.out";
+        String file3 = getNextFile(this.getClass());
+        try (FileOutputStream fos = new FileOutputStream(file3)) {
+            // Validate selected API's - primarily Parameters
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Templates paramTemplates = factory.newTemplates(new StreamSource(filenameToURL(paramXslFile)));
+            Transformer paramTransformer = paramTemplates.newTransformer();
+            paramTransformer.setParameter(PARAM1S, "paramVal");
+            assertTrue(paramTransformer.getParameter(PARAM1S) instanceof String);
+
+            // Verify simple re-set/get of a single parameter - new Integer
+            paramTransformer.setParameter(PARAM1S, 1234);   // SPR SCUU4R3JGY - can't re-set
+            assertTrue(paramTransformer.getParameter(PARAM1S) instanceof Integer);
+
+            // Validate a transform with two params set
+            paramTransformer.setParameter(PARAM1N, "new-param1n-value");
+
+            paramTransformer.transform(new StreamSource(filenameToURL(paramXmlFile)),
+                    new StreamResult(fos));
+            compareWithGold(paramGoldFile, file3);
+            // Validate params are still set after transform
+            assertTrue(paramTransformer.getParameter(PARAM1S) instanceof Integer);
+            assertTrue(paramTransformer.getParameter(PARAM1S) instanceof Integer);
+        }
+    }
+
+    /**
+     * Using different Transformer to transform xml files.
+     * Note wrapper here is mapping with wrapper according to
+     * TransformWrapperFactory.wrapperMapper 
+     * 
+     * @return an array that has the style-sheet file name, XML file name,
+     *         golden validation file name and type of wrapper.
+     */
+    @DataProvider
+    public Object[][] wrapperProvider() {
+        return new Object[][]{
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.dom"},
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.sax"},
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.stream"},
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.file"},
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.systemId"},
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.localPath"},
+            {"Minitest.xsl", "Minitest.xml", "Minitest-xalanj2.out", "trax.systemId3"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.dom"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.sax"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.stream"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.file"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.systemId"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.localPath"},
+            {"MinitestPerf.xsl", "MinitestPerf.xml", "MinitestPerf.out", "trax.systemId3"}
+        };
+    }
+
+    /**
+     * Basic test for transformWrapper. Worker method to use a TransformWrapper
+     * to transform a file and checking the output.
+     *
+     * @param xslName stylesheet file.
+     * @param xmlName XML file for parsing.
+     * @param goldName golden file for checking.
+     * @param flavor Test favor.
+     * @throws Exception any exception in wrapper.
+     */
+    @Test(dataProvider = "wrapperProvider")
+    public void testTransformWrapper(String xslName, String xmlName,
+            String goldName, String flavor) throws Exception {
+        String xslFile = XML_DIR + xslName;
+        String xmlFile = XML_DIR + xmlName;
+        String goldFile = GOLDEN_DIR + goldName;
+        String outputFile = getNextFile(this.getClass());
+
+        TransformWrapper transformWrapper = TransformWrapperFactory.newWrapper(flavor);
+        transformWrapper.newProcessor(new Properties());
+        if (null == xslFile) {
+            // presume it's an embedded test
+            transformWrapper.transformEmbedded(xmlFile, outputFile);
+        } else {
+            // presume it's a normal stylesheet test
+            transformWrapper.transform(xmlFile, xslFile, outputFile);
+        }
+        compareWithGold(goldFile, outputFile);
+
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/ParameterTest.java	2015-01-09 15:41:39.365121129 -0800
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Functional test of various usages of parameters in transforms.
+ */
+public class ParameterTest extends JAXPFileBaseTest {
+    /**
+     * Test XSL file.
+     */
+    private static final String XSLT_TEST_FILE = filenameToURL(XML_DIR + "ParameterTest.xsl");
+
+    /**
+     * Test XML file.
+     */
+    private static final String XML_TEST_FILE = filenameToURL(XML_DIR + "ParameterTest.xml");
+
+    /**
+     * Test XSL file.
+     */
+    private static final String SIMPLE_XSLT_TEST_FILE = filenameToURL(XML_DIR + "ParameterTest2.xsl");
+
+    /**
+     * Test XML file.
+     */
+    private static final String SIMPLE_XML_TEST_FILE = filenameToURL(XML_DIR + "ParameterTest2.xml");
+
+    /**
+     * Test Parameters.
+     */
+    private static final String[][] PARAMETERS
+        = {
+            {
+                "t1",
+                "'a'",
+                "<outt>false-notset,false-blank,false-a,false-1,'a'</outt>",
+                "(10)Select expr of a 'param' string"
+            },
+            {
+                "t1",
+                "a",
+                "<outt>false-notset,false-blank,true-a,false-1,a</outt>",
+                "(10a)Select expr of a param string"
+            },
+            {
+                "t1",
+                "'1'",
+                "<outt>false-notset,false-blank,false-a,false-1,'1'</outt>",
+                "(11)Select expr of a 'param' number"
+            },
+            {
+                "t1",
+                "1",
+                "<outt>false-notset,false-blank,false-a,true-1,1</outt>",
+                "(11a)Select expr of a param number"
+            },
+            {
+                "t1",
+                "''",
+                "<outt>false-notset,false-blank,false-a,false-1,''</outt>",
+                "(12)Select expr of a param 'blank' string"
+            },
+            {
+                "t1",
+                "",
+                "<outt>false-notset,true-blank,false-a,false-1,</outt>",
+                "(12a)Select expr of a param blank string"
+            },
+            {
+                "p1",
+                "'foo'",
+                "'foo','foo';",
+                "(13)Stylesheet with literal 'param' value"
+            },
+            {
+                "p1",
+                "foo",
+                "foo,foo;",
+                "(13a)Stylesheet with literal param value"
+            },
+            {
+                "p1",
+                "'bar'",
+                "'bar','bar';",
+                "(14)Stylesheet with replaced/another literal 'param' value"
+            },
+            {
+                "p1",
+                "bar",
+                "bar,bar;",
+                "(14a)Stylesheet with replaced/another literal param value"
+            },
+            {
+                "p2",
+                "'&lt;item&gt;bar&lt;/item&gt;'",
+                "'&amp;lt;item&amp;gt;bar&amp;lt;/item&amp;gt;','&amp;lt;item&amp;gt;bar&amp;lt;/item&amp;gt;'; GHI,<B>GHI</B>; </outp>",
+                "(15)Stylesheet with 'param' value with nodes"
+            },
+            {
+                "p2",
+                "&lt;item&gt;bar&lt;/item&gt;",
+                "&amp;lt;item&amp;gt;bar&amp;lt;/item&amp;gt;,&amp;lt;item&amp;gt;bar&amp;lt;/item&amp;gt;;",
+                "(15a)Stylesheet with param value with nodes"
+            },
+            {
+                "p3",
+                "'foo3'",
+                "DEF,<B>DEF</B>;",
+                "(16)Stylesheet with literal 'param' value in a template, is not passed"
+            },
+            {
+                "p3",
+                "foo3",
+                "DEF,<B>DEF</B>;",
+                "(16a)Stylesheet with literal param value in a template, is not passed"
+            },
+            {
+                "s1",
+                "'foos'",
+                "'foos','foos';",
+                "(17)Stylesheet with literal 'param' select"
+            },
+            {
+                "s1",
+                "foos",
+                "foos,foos;",
+                "(17a)Stylesheet with literal param select"
+            },
+            {
+                "s1",
+                "'bars'",
+                "<outs>'bars','bars'; s2val,s2val; s3val,s3val; </outs>",
+                "(18)Stylesheet with replaced/another literal 'param' select"
+            },
+            {
+                "s1",
+                "bars",
+                "<outs>bars,bars; s2val,s2val; s3val,s3val; </outs>",
+                "(18a)Stylesheet with replaced/another literal param select"
+            },
+            {
+                "s2",
+                "'&lt;item/&gt;'",
+                "'&amp;lt;item/&amp;gt;','&amp;lt;item/&amp;gt;'; s3val,s3val; </outs>",
+                "(19)Stylesheet with nodes(?) 'param' select"
+            },
+            {
+                "s2",
+                "&lt;item/&gt;",
+                "&amp;lt;item/&amp;gt;,&amp;lt;item/&amp;gt;; s3val,s3val; </outs>",
+                "(19a)Stylesheet with nodes(?) param select"
+            }
+    };
+    
+    @DataProvider
+    public Object[][] parameters() {
+        return Arrays.stream(PARAMETERS).map(ps -> new Object[]{
+            ps[0], ps[1], new StreamSource(XML_TEST_FILE), 
+            new StreamSource(XSLT_TEST_FILE), ps[2]
+        }).toArray(Object[][]::new);
+    }
+
+    /**
+     * Reuse the same transformer multiple times with parameters set.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void reuseParametersTest() throws Exception {
+        Transformer transformer = TransformerFactory.newInstance()
+                .newTemplates(new StreamSource(SIMPLE_XSLT_TEST_FILE))
+                .newTransformer();
+        String outputFile1 = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(XML_TEST_FILE),
+                new StreamResult(outputFile1));
+        // Verify the values are correct for no params set
+        checkFileContains(outputFile1, "<globalVarAttr>ParameterTest.xml:</globalVarAttr>");
+        String outputFile2 = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(SIMPLE_XML_TEST_FILE),
+                new StreamResult(outputFile2));
+        // Do NOT call clear Parameters here; reuse the transformer
+        checkFileContains(outputFile2, "<globalVarAttr>ParameterTest.xml:</globalVarAttr>");
+        String outputFile3 = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(XML_TEST_FILE),
+                new StreamResult(outputFile3));
+        // Do NOT call clearParameters here; reuse the transformer
+        transformer.transform(new StreamSource(XML_TEST_FILE),
+                new StreamResult(outputFile3));
+    }
+
+    /**
+     * Test setting a single string-valued parameter.
+     * Uses the supplied Transformer and calls setParameter()
+     * then transform(Source, Source), then uses the worker
+     * method checkFileContains() to validate and output results.
+     *
+     * @param paramName simple name of parameter
+     * @param paramVal String value of parameter
+     * @param transformer object to use
+     * @param xmlSource object to use in transform
+     * @param checkString to look for in output file (logged)
+     */
+    private void testSetParam(String paramName, String paramVal,
+            Transformer transformer, Source xmlSource, String checkString) 
+            throws TransformerException, IOException {
+        String outputFile = getNextFile(this.getClass());
+
+        transformer.setParameter(paramName, paramVal);
+        transformer.transform(xmlSource, new StreamResult(outputFile));
+        assertTrue(checkFileContains(outputFile, checkString));
+    }
+
+    /**
+     * Test setting a single string-valued parameter.
+     * Creates a Transformer and calls setParameter()
+     * then transform(Source, Source), then uses the worker
+     * method checkFileContains() to validate and output results.
+     *
+     * @param paramName simple name of parameter
+     * @param paramVal String value of parameter
+     * @param xmlSource object to use in transform
+     * @param xslStylesheet object to use in transform
+     * @param checkString to look for in output file (logged)
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void testSetParam(String paramName, String paramVal, 
+            Source xmlSource, Source xslStylesheet, String checkString) 
+            throws Exception {
+        testSetParam(paramName, paramVal,
+            TransformerFactory.newInstance().newTransformer(xslStylesheet),
+                xmlSource, checkString);
+    }
+    
+    /**
+     * Setting various string-valued parameters and reusing transformers.
+     * Creates one transformer first, then loops through array
+     * of simple test data re-using transformer.
+     * @throws IOException if any I/O operation error.
+     * @throws TransformerException If an unrecoverable error occurs during the 
+     *         course of the transformation.
+     */
+    @Test
+    public void reuseTestParams() throws IOException, TransformerException {
+        Transformer transformer = TransformerFactory.newInstance()
+                .newTemplates(new StreamSource(XSLT_TEST_FILE))
+                .newTransformer();
+        String outputFile = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(XML_TEST_FILE),
+                new StreamResult(outputFile));
+        transformer.clearParameters();
+        // Verify each of the three kinds of params are correct
+        assertTrue(checkFileContains(outputFile, "<outp>ABC,<B>ABC</B>; DEF,<B>DEF</B>; GHI,<B>GHI</B>; </outp>"));
+        assertTrue(checkFileContains(outputFile, "<outs>s1val,s1val; s2val,s2val; s3val,s3val; </outs>"));
+        assertTrue(checkFileContains(outputFile, "<outt>true-notset,false-blank,false-a,false-1,notset</outt>"));
+        Arrays.stream(PARAMETERS).forEach(ps -> {
+            try {
+                testSetParam(ps[0], ps[1], new StreamSource(XML_TEST_FILE),
+                        new StreamSource(XSLT_TEST_FILE), ps[2]);
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        });
+    }
+    
+
+    
+    /**
+     * Checks if a file contains a certain string (all within one line).
+     * We should really consider validating the entire output file, but
+     * this is the important functionality, and it makes maintaining the
+     * test and gold data easier (since it's all in this file).
+     *
+     * @param file local path/name of file to check.
+     * @param checkStr String to look for in the file.
+     * @return true if file contain checkStr
+     *         false if file doesn't contain checkStr.
+     * @throws IOException if any wrong with I/O operation.
+     */
+    protected boolean checkFileContains(String file, String checkStr) throws IOException {
+        return Files.readAllLines(Paths.get(file)).stream()
+                .anyMatch(s -> s.contains(checkStr));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/SystemIdImpInclTest.java	2015-01-09 15:41:39.631121544 -0800
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Test behavior of imports/includes with various setSystemId sources.
+ * Note: This test is directory-dependent, so if there are any fails, check the  
+ * code to see what the test file is expecting the path/directory/etc to be.
+ */
+public class SystemIdImpInclTest extends JAXPFileBaseTest {
+    /** 
+     * Gold filename for level0, i.e. one directory above the test file. 
+     */
+    private static final String GOLDEN_File_LEVEL0 = "SystemIdImpInclLevel0.out";
+
+    /**
+     * Gold filename for level1, i.e. the directory of the test file.
+     */
+    private static final String GOLDEN_File_LEVEL1 = "SystemIdImpInclLevel1.out";
+
+    /** 
+     * Gold filename for level2, i.e. a directory below the test file.
+     */
+    private static final String GOLDEN_File_LEVEL2 = "SystemIdImpInclLevel2.out";
+    
+    /**
+     * Test style-sheet file name.
+     */
+    private static final String XSL_FILE = XML_DIR + "SystemIdImpIncl.xsl";
+
+    /**
+     * Test style-sheet file name.
+     */
+    private static final String LEVEL0_INCLUDE_XSL = XML_DIR + "../SystemIdImpIncl.xsl";
+    
+    /**
+     * Test style-sheet file name.
+     */
+    private static final String LEVEL1_INCLUDE_XSL = XSL_FILE;
+    
+    /**
+     * Test style-sheet file name.
+     */
+    private static final String LEVEL2_INCLUDE_XSL = XML_DIR + "systemid/SystemIdImpIncl.xsl";
+    
+    /**
+     * Test XML file name.
+     */
+    private static final String XML_FILE = XML_DIR + "SystemIdImpIncl.xml";
+
+    /**
+     * Simple StreamSources with different setSystemIds.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase1() throws Exception {
+        String goldFile  = GOLDEN_DIR + GOLDEN_File_LEVEL1;
+        String outputFile  = getNextFile(this.getClass());
+        
+        try(InputStream xmlStream = new FileInputStream(XML_FILE);
+                FileOutputStream fos = new FileOutputStream(outputFile);) {
+            TransformerFactory factory = TransformerFactory.newInstance();
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            Node xslNode = docBuilder.parse(new InputSource(filenameToURL(XSL_FILE)));
+            Source xslSource = new DOMSource(xslNode);
+            xslSource.setSystemId(filenameToURL(LEVEL1_INCLUDE_XSL));
+            
+            Source xmlSource = new StreamSource(xmlStream);
+            xmlSource.setSystemId(filenameToURL(XML_FILE));
+            factory.newTemplates(xslSource).newTransformer().
+                    transform(xmlSource, new StreamResult(fos));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * Verify simple SAXSources with systemIds.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase2() throws Exception {
+        String goldFile  = GOLDEN_DIR + GOLDEN_File_LEVEL0;
+        String outputFile  = getNextFile(this.getClass());
+        
+        try(InputStream xslStream = new FileInputStream(XSL_FILE);
+                InputStream xmlStream = new FileInputStream(XML_FILE);
+                FileOutputStream fos = new FileOutputStream(outputFile);) {
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Source xslSource = new StreamSource(new InputStreamReader(xslStream));
+            xslSource.setSystemId(filenameToURL(LEVEL0_INCLUDE_XSL));
+            
+            Source xmlSource = new StreamSource(xmlStream);
+            xmlSource.setSystemId(filenameToURL(XML_FILE));
+            factory.newTemplates(xslSource).newTransformer().
+                    transform(xmlSource, new StreamResult(fos));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * Verify simple SAXSources with systemIds.
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase3() throws Exception {
+        String goldFile  = GOLDEN_DIR + GOLDEN_File_LEVEL2;
+        String outputFile  = getNextFile(this.getClass());
+        
+        try(InputStream xslStream = new FileInputStream(XSL_FILE);
+                InputStream xmlStream = new FileInputStream(XML_FILE);
+                FileOutputStream fos = new FileOutputStream(outputFile);) {
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Source xslSource = new StreamSource(new InputStreamReader(xslStream, "UTF-8"));
+            xslSource.setSystemId(filenameToURL(LEVEL2_INCLUDE_XSL));
+            
+            Source xmlSource = new StreamSource(xmlStream);
+            xmlSource.setSystemId(filenameToURL(XML_FILE));
+            factory.newTemplates(xslSource).newTransformer().
+                    transform(xmlSource, new StreamResult(fos));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/TemplateAPITest.java	2015-01-09 15:41:39.896121957 -0800
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import java.io.FilePermission;
+import java.util.Properties;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ * Basic API coverage test for the Templates class of TRAX.
+ */
+public class TemplateAPITest extends JAXPBaseTest{
+    /**
+     * TRAX Templates: cover newTransformer(),getOutputProperties() APIs and 
+     * basic functionality.
+     * @throws javax.xml.transform.TransformerConfigurationException
+     */
+    @Test
+    public void test() throws TransformerConfigurationException {
+        setPermissions(new FilePermission(XML_DIR + "-", "read"));
+        final String xslFile = XML_DIR + "TransformerAPIParam.xsl";
+        final String outputFormatXSL = XML_DIR + "TransformerAPIOutputFormat.xsl";
+        
+        TransformerFactory factory = TransformerFactory.newInstance();
+        Templates templates1 = factory.newTemplates(new StreamSource(xslFile));
+        
+        // Cover APIs newTransformer(), getOutputProperties()
+        Transformer transformer = templates1.newTransformer();
+        assertNotNull(transformer);
+        Properties outputFormat = templates1.getOutputProperties();
+        assertNotNull(outputFormat);
+        
+        // Check that the local stylesheet.getProperty has default set, cf. 
+        // getOutputProperties javadoc
+        assertEquals(outputFormat.getProperty(OutputKeys.METHOD), "xml");
+        assertNull(outputFormat.get(OutputKeys.METHOD));
+        assertEquals(outputFormat.getProperty(OutputKeys.INDENT), "no");
+        assertNull(outputFormat.get(OutputKeys.INDENT));
+        
+        Templates templates2 
+                = factory.newTemplates(new StreamSource(outputFormatXSL));
+        Properties outputFormat2 = templates2.getOutputProperties();
+        assertNotNull(outputFormat2);
+               
+        // Known outputFormat property name/value from outputFormatXSL.
+        final String OUTPUT_FORMAT_NAME = OutputKeys.CDATA_SECTION_ELEMENTS;
+        final String OUTPUT_FORMAT_VALUE = "cdataHere ";
+
+        // Test known properties
+        outputFormat2.getProperty(OUTPUT_FORMAT_NAME);
+        assertEquals(outputFormat2.getProperty(OUTPUT_FORMAT_NAME), OUTPUT_FORMAT_VALUE);
+        assertEquals(outputFormat2.getProperty("omit-xml-declaration"), "yes");
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/TransformerAPITest.java	2015-01-09 15:41:40.162122372 -0800
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import java.io.FileOutputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Basic API coverage test for the Transformer class of TRAX.
+ * This test focuses on coverage testing for the API's, and
+ * very brief functional testing.
+ */
+public class TransformerAPITest extends JAXPFileBaseTest {
+     /** 
+      * Parameter names from TransformerAPIParam.xsl  
+      */
+    private static final String PARAM1S = "param1s";
+    
+    /** 
+      * Parameter names from TransformerAPIParam.xsl  
+      */
+    private static final String PARAM3S = "param3s";
+    
+    /** 
+     * Parameter names from TransformerAPIParam.xsl  
+     */
+    private static final String PARAM1N = "param1n";
+    
+    /**
+     * TransformerFactory for creating Transfomer.
+     */
+    private final TransformerFactory factory;
+    
+    /**
+     * Initiate Transformer factory.
+     */
+    public TransformerAPITest() {
+        factory = TransformerFactory.newInstance();
+    }
+    
+    /** 
+     * Known outputFormat values from TransformerAPIOutputFormat.xsl .
+     */
+    private static final String METHOD_VALUE = "xml";
+    private static final String VERSION_VALUE ="123.45";
+    private static final String ENCODING_VALUE ="UTF-16";
+    private static final String STANDALONE_VALUE = "yes";
+    private static final String DOCTYPE_PUBLIC_VALUE = "this-is-doctype-public";
+    private static final String DOCTYPE_SYSTEM_VALUE = "this-is-doctype-system";
+    private static final String CDATA_SECTION_ELEMENTS_VALUE = "cdataHere ";
+    private static final String INDENT_VALUE  =  "yes";
+    private static final String MEDIA_TYPE_VALUE = "text/test/xml";
+    private static final String OMIT_XML_DECLARATION_VALUE = "yes";
+    
+    /**
+     * Basic API coverage tests for Transformer API.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase1() throws Exception {
+        String xmlFile = filenameToURL(XML_DIR + "TransformerAPIParam.xml");
+        String xslFile = filenameToURL(XML_DIR + "TransformerAPIParam.xsl");
+        String goldFile= GOLDEN_DIR + "TransformerAPIParam.out";
+
+        Transformer identityTransformer = factory.newTransformer();
+        Templates templates = factory.newTemplates(new StreamSource(xslFile));
+        assertNull(identityTransformer.getParameter("This-param-does-not-exist"));
+
+        identityTransformer.setParameter("foo", "bar");
+        assertNotNull(identityTransformer.getParameter("foo"));
+
+        Transformer transformer = templates.newTransformer();
+        // Default Transformer should not have any parameters.
+        assertNull(transformer.getParameter("This-param-does-not-exist"));
+        // Including params in the stylesheet, Javadoc says "This method does
+        // not return a default parameter value, which cannot be determined 
+        // until the node context is evaluated during the transformation process".
+        assertNull(transformer.getParameter(PARAM1S));
+
+        // Verify simple set/get of a single parameter - Integer
+        transformer.setParameter(PARAM3S, 1234);
+        assertEquals(transformer.getParameter(PARAM3S), 1234);
+
+        transformer.setParameter(PARAM3S, 99);   // Had bug can't re-set
+        assertEquals(transformer.getParameter(PARAM3S), 99);
+        
+        // Verify simple re-set/get of a single parameter - now a new String
+        transformer.setParameter(PARAM3S, "new value3s");
+        assertEquals(transformer.getParameter(PARAM3S), "new value3s");
+        
+        transformer.setParameter(PARAM1S, "'test-param-1s'"); // note single quotes
+        transformer.setParameter(PARAM1N, 1234);
+        
+        
+        // Verify basic params actually affect transformation
+        //   Use the transformer we set the params onto above!
+        String outputFile = getNextFile(this.getClass());
+        try (FileOutputStream fos = new FileOutputStream(outputFile);) {
+            transformer.transform(new StreamSource(xmlFile),
+                            new StreamResult(fos));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+        assertEquals(transformer.getParameter(PARAM1S), "'test-param-1s'");
+        assertEquals(transformer.getParameter(PARAM1N), 1234);
+    }
+    
+    /**
+     * API coverage test of Transformer.set/getOutputProperty().
+     * 
+     * @param xslFile XSLT file we will use.
+     * @param xmlFile XML test file.
+     * @param goldFile golden validation file.
+     * @param expectedProperties expected result.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider="propertiesDataProvider")
+    public void testCase2(String xslFile, String xmlFile, String goldFile,
+            String[] expectedProperties) throws Exception {
+        Transformer transformer = factory.newTemplates(new StreamSource(xslFile)).newTransformer();
+        Properties props = transformer.getOutputProperties();
+        // Default uses UTF8 as encoding.
+        Charset cs = StandardCharsets.UTF_8;
+        for(int i = 0; i < expectedProperties.length; i = i + 2) {
+            assertEquals(props.get(expectedProperties[i]), 
+                    expectedProperties[i + 1]);
+            if(expectedProperties[i].equals(OutputKeys.ENCODING)) {
+                cs = Charset.forName(expectedProperties[i + 1]);
+            }
+        }
+        // Always do set/get testing on default Transformer.
+        Transformer defaultTransformer = factory.newTransformer();
+        defaultTransformer.setOutputProperty(OutputKeys.METHOD, "text");
+        assertEquals(defaultTransformer.getOutputProperty(OutputKeys.METHOD), "text"); 
+        
+        String outputFile = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(xmlFile), new StreamResult(outputFile));
+        assertTrue(compareWithGold(goldFile, outputFile, cs));
+    }
+    
+    /**
+     * Data provider for testCase2.
+     * 
+     * @return an array that has parameters XSL file,XML file, golden validation
+     *         file, expected properties.
+     */
+    @DataProvider
+    public Object[][] propertiesDataProvider(){
+        return new Object[][]{
+            {XML_DIR + "identity.xsl",
+                XML_DIR + "identity.xml", 
+                GOLDEN_DIR + "identity.out",
+                new String[]{OutputKeys.METHOD, null,
+                    OutputKeys.INDENT, null}},
+            {XML_DIR + "TransformerAPIVar.xsl",
+                XML_DIR + "TransformerAPIVar.xml", 
+                GOLDEN_DIR + "TransformerAPIVar.out",
+                new String[]{OutputKeys.METHOD, "xml", OutputKeys.INDENT, "no"}},
+            {XML_DIR + "TransformerAPIOutputFormat.xsl",
+                XML_DIR + "TransformerAPIOutputFormat.xml", 
+                GOLDEN_DIR + "TransformerAPIOutputFormatUTF16.out",
+                new String[]{                    
+                    OutputKeys.METHOD, METHOD_VALUE,
+                    OutputKeys.VERSION, VERSION_VALUE,
+                    OutputKeys.ENCODING, ENCODING_VALUE,
+                    OutputKeys.STANDALONE, STANDALONE_VALUE,
+                    OutputKeys.DOCTYPE_PUBLIC, DOCTYPE_PUBLIC_VALUE,
+                    OutputKeys.DOCTYPE_SYSTEM, DOCTYPE_SYSTEM_VALUE, 
+                    OutputKeys.CDATA_SECTION_ELEMENTS, CDATA_SECTION_ELEMENTS_VALUE,
+                    OutputKeys.INDENT, INDENT_VALUE,
+                    OutputKeys.MEDIA_TYPE, MEDIA_TYPE_VALUE,
+                    OutputKeys.OMIT_XML_DECLARATION, OMIT_XML_DECLARATION_VALUE}},
+            {XML_DIR + "TransformerAPIHTMLFormat.xsl",
+                XML_DIR + "TransformerAPIHTMLFormat.xml",
+                GOLDEN_DIR + "TransformerAPIHTMLFormat.out",
+                new String[]{
+                    OutputKeys.METHOD, "html", OutputKeys.INDENT, null}}
+        };
+    }
+    
+    /**
+     * API coverage test of Transformer.set/getOutputProperties()
+     *
+     * @throws TransformerConfigurationException Thrown in case of 
+     *         ServiceConfigurationError service configuration error or if the
+     *         implementation is not available or cannot be instantiated. 
+     */
+    @Test
+    public void testCase3() throws TransformerConfigurationException {
+        Transformer identityTransformer = factory.newTransformer();
+        assertNotNull(factory.newTemplates(new StreamSource(XML_DIR + "TransformerAPIOutputFormat.xsl")));
+        assertNotNull(identityTransformer.getOutputProperties());
+        identityTransformer.setOutputProperties(new Properties());
+        assertEquals(identityTransformer.getOutputProperties(), new Properties());
+    }
+
+    /**
+     * Data provider for re-use Transformer test.
+     * 
+     * @return an array that has parameters XSL file,XML file, golden validation
+     *         file.
+     */ 
+    @DataProvider
+    public Object[][] reuseTranfomerOnSameXMLProvider() {
+        return new Object[][]{
+            {XML_DIR + "identity.xsl",
+                XML_DIR + "identity.xml",
+                GOLDEN_DIR + "identity.out"}, 
+            {XML_DIR + "TransformerAPIVar.xsl",
+                XML_DIR + "TransformerAPIVar.xml",
+                GOLDEN_DIR + "TransformerAPIVar.out"}, 
+            {XML_DIR + "TransformerAPIVar.xsl",
+                XML_DIR + "TransformerAPIVar2.xml",
+                GOLDEN_DIR + "TransformerAPIVar2.out"}
+        };
+    }
+    
+    /**
+     * TRAX Transformer: cover transform() API and multiple Transformations from
+     * single transformer on same XML file with same style-sheet file.
+     * 
+     * @param xslFile XSLT file we will use.
+     * @param xmlFile XML test file.
+     * @param goldFile golden validation file.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "reuseTranfomerOnSameXMLProvider")
+    public void reuseTransformerSameXMLTest(String xslFile, String xmlFile, 
+            String goldFile) throws Exception {
+        Transformer reuseTransformer = factory.newTransformer(new StreamSource(xslFile));
+        String outputFile = getNextFile(this.getClass());
+
+        // Re-use the transformer multiple times on XML file.
+        reuseTransformer.transform(new StreamSource(xmlFile),
+                                  new StreamResult(outputFile));
+        assertTrue(compareWithGold(goldFile, outputFile));
+        reuseTransformer.transform(new StreamSource(xmlFile),
+                                  new StreamResult(outputFile));
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * Data provider for re-use Transformer test.
+     * Note: same style-sheet should be transformed two different XML files.
+     * 
+     * @return an array that has parameters XSL file,two XML files and two 
+     *         golden validation files.
+     */ 
+    @DataProvider
+    public Object[][] reuseTranfomerOnDiffXMLProvider() {
+        return new Object[][]{ 
+            {XML_DIR + "TransformerAPIVar.xsl",
+                XML_DIR + "TransformerAPIVar.xml",
+                GOLDEN_DIR + "TransformerAPIVar.out",
+                XML_DIR + "TransformerAPIVar2.xml",
+                GOLDEN_DIR + "TransformerAPIVar2.out"}
+        };
+    }
+
+    /**
+     * TRAX Transformer: cover transform() API and multiple Transformations from
+     * single transformer on same XML file.
+     * 
+     * @param xslFile XSLT file we will use.
+     * @param xmlFile1 First XML test file to be transformed.
+     * @param goldFile1 golden validation file for xmlFile1.
+     * @param xmlFile2 Second XML test file to be transformed.
+     * @param goldFile2 golden validation file for xmlFile2.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "reuseTranfomerOnDiffXMLProvider")
+    public void reuseTransformerDiffXMLTest(String xslFile, String xmlFile1,
+            String goldFile1, String xmlFile2, String goldFile2) 
+            throws Exception {
+        Transformer reuseTransformer = factory.newTransformer(new StreamSource(xslFile));
+
+        // Transform first xml file and validate it.
+        String outputFile1 = getNextFile(this.getClass());
+        reuseTransformer.transform(new StreamSource(xmlFile1),
+                                  new StreamResult(outputFile1));
+        assertTrue(compareWithGold(goldFile1, outputFile1));
+        
+        // Transform second xml file and validate it.
+        String outputFile2 = getNextFile(this.getClass());
+        reuseTransformer.transform(new StreamSource(xmlFile2),
+                                  new StreamResult(outputFile2));
+        assertTrue(compareWithGold(goldFile2, outputFile2));
+
+        // Transform first xml file and validate it again.
+        String outputFile3 = getNextFile(this.getClass());
+        reuseTransformer.transform(new StreamSource(xmlFile1),
+                                  new StreamResult(outputFile3));
+        assertTrue(compareWithGold(goldFile1, outputFile3));
+    }
+    
+    /**
+     * Negative test on getOutputProperty. IllegalArgumentException If the 
+     * property is not supported.
+     * 
+     * @param notSupportedProperty an invalid property name.
+     * @throws TransformerConfigurationException Thrown in case of 
+     *         ServiceConfigurationError service configuration error or if the
+     *         implementation is not available or cannot be instantiated. 
+     */
+    @Test(dataProvider = "bogusProperties", expectedExceptions = IllegalArgumentException.class)
+    public void bogusPropertyName(String notSupportedProperty) 
+            throws TransformerConfigurationException{
+        Transformer transformer = factory.newTransformer();
+        transformer.getOutputProperty(notSupportedProperty);
+    }
+    
+    /**
+     * Data provider for bogusPropertyName negative tests.
+     * 
+     * @return a parameters array that contains all invalid properties name. 
+     */
+    @DataProvider
+    public Object[][] bogusProperties() {
+        return new Object[][]{
+            {"bogus-name"},
+            {"bogus-{name}"}
+        };
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/TransformerFactoryAPITest.java	2015-01-09 15:41:40.424122780 -0800
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilePermission;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.Test;
+
+/**
+ * API Coverage test for TransformerFactory class of TRAX.
+ */
+public class TransformerFactoryAPITest extends JAXPBaseTest {
+    /**
+     * Cached system property.
+     */
+    private final String cachedSysProp = null;
+
+    /**
+     * System property name, from TransformerFactory.
+     */
+    private static final String DEFAULT_PROP_NAME = "javax.xml.transform.TransformerFactory";
+    
+    /**
+     * Stored system property name for TransformerFactory. 
+     */
+    private String factory_prop_value;
+
+    /**
+     * System property name for Xalan-J 2.x impl.
+     */
+    private static final String XALAN_CLASSNAME = "org.apache.xalan.processor.TransformerFactoryImpl";
+    
+    /**
+     * Test XSLT file name.
+     */
+    private static final String XSL_URI = filenameToURL(XML_DIR + "identity.xsl");
+
+    /**
+     * Test XML file name.
+     */
+    private static final String EMBEDDED_XML = XML_DIR + "embeddedIdentity.xml"; 
+
+    /**
+     * Test XML uri.
+     */
+    private static final String EMBEDDED_XML_URI = filenameToURL(EMBEDDED_XML);
+    
+    /**
+     * Golden file name.
+     */
+    private static final String EMBEDDED_GOLD_FILE = GOLDEN_DIR + "embeddedIdentity.out";
+    
+    /**
+     * invalid feature/attribute name for negative test. 
+     */
+    private static final String BOGUS_NAME = "fnord:this/feature/does/not/exist";
+
+    /**
+     * Coverage tests for factory pattern API's.
+     */
+    @Test
+    public void testCase1() {
+        // Reset the system property to what was cached previously
+        // test when system property is null
+        setSystemProperty(DEFAULT_PROP_NAME, null);
+        assertNotNull(TransformerFactory.newInstance());
+        // This should come last so it will stay set for the rest of the test
+        // Note: this needs review, since in the future we may
+        //  not guaruntee order of testCase execution!
+        setSystemProperty(DEFAULT_PROP_NAME, cachedSysProp);
+        assertNotNull(TransformerFactory.newInstance());
+    }
+    
+    /**
+     * Save system property for restoring.
+     */
+    @BeforeGroups (groups = {"systemProp"})
+    public void saveProp() {
+        factory_prop_value = getSystemProperty(DEFAULT_PROP_NAME);
+    }
+    
+    /**
+     * Restore the system property.
+     */
+    @AfterGroups (groups = {"systemProp"})
+    public void restoreProp() {
+        setSystemProperty(DEFAULT_PROP_NAME, factory_prop_value);
+    }
+
+    /**
+     * TransformerFactoryConfigurationError is thrown when system property is a
+     * bogus name.
+     */
+    @Test(groups = {"systemProp"}, expectedExceptions = TransformerFactoryConfigurationError.class)
+    public void negativeTestCase1() {
+        setSystemProperty(DEFAULT_PROP_NAME, "this.class.does.not.exist");
+        TransformerFactory.newInstance();
+    }
+
+    /**
+     * TransformerFactoryConfigurationError is thrown when system property is
+     * another kind of class name.
+     */
+    @Test(groups = {"systemProp"}, expectedExceptions = TransformerFactoryConfigurationError.class)
+    public void negativeTestCase2() {
+        setSystemProperty(DEFAULT_PROP_NAME, "java.lang.String");
+        TransformerFactory.newInstance();
+    }
+    
+    
+
+    /**
+     * Coverage tests for newTransformer() API's.
+     * 
+     * @throws TransformerConfigurationException Thrown in case of 
+     *         ServiceConfigurationError service configuration error or if the
+     *         implementation is not available or cannot be instantiated.
+     */
+    @Test
+    public void testCase2() throws TransformerConfigurationException {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"));
+        TransformerFactory factory = TransformerFactory.newInstance();
+        Transformer identityTransformer = factory.newTransformer();
+        assertNotNull(identityTransformer);
+
+        assertTrue(factory.getFeature(StreamSource.FEATURE));
+        assertNotNull(factory.newTransformer(new StreamSource(XSL_URI)));
+        setPermissions();
+    }
+
+    /**
+     * Coverage tests for newTemplates() API's.
+     * 
+     * @throws TransformerConfigurationException Thrown in case of 
+     *         ServiceConfigurationError service configuration error or if the
+     *         implementation is not available or cannot be instantiated.
+     */
+    @Test
+    public void testCase3() throws TransformerConfigurationException {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"));
+        TransformerFactory factory = TransformerFactory.newInstance();
+        assertNotNull(factory.getFeature(StreamSource.FEATURE));
+        assertNotNull(factory.newTemplates(new StreamSource(XSL_URI)));
+        setPermissions();
+    }
+
+    /**
+     * Coverage tests for getAssociatedStylesheet() API's.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase4() throws Exception{   
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"),
+                new FilePermission(GOLDEN_DIR + "/-", "read"),
+                new FilePermission(USER_DIR + "-", "read, write"));
+        String outputFile = getNextFile(this.getClass());
+        try (FileOutputStream resultStream = new FileOutputStream(getNextFile(this.getClass()))){
+            TransformerFactory factory = TransformerFactory.newInstance();
+            // Get the xml-stylesheet and process it
+            Source stylesheet = factory.getAssociatedStylesheet(
+                    new StreamSource(EMBEDDED_XML_URI), null, null, null);
+            assertTrue(stylesheet instanceof Source);
+            assertNotNull(stylesheet);
+
+            Transformer transformer = factory.newTransformer(stylesheet);
+            transformer.transform(new StreamSource(EMBEDDED_XML_URI), 
+                    new StreamResult(resultStream));
+        }
+        assert(compareWithGold(EMBEDDED_GOLD_FILE, outputFile));
+        setPermissions();
+    }
+
+    /**
+     * Coverage tests for get/setURIResolver(), get/setErrorListener() API's.
+     */
+    @Test
+    public void testCase5() {
+        TransformerFactory factory = TransformerFactory.newInstance();
+        assertNull(factory.getURIResolver());
+        CheckingURIResolver loggingURIRes = new CheckingURIResolver();
+        factory.setURIResolver(loggingURIRes);
+        assertEquals(factory.getURIResolver(), loggingURIRes);
+        factory.setURIResolver(null);
+        assertNull(factory.getURIResolver());
+        assertNotNull(factory.getErrorListener());
+        CheckingErrorListener loggingErrListener = new CheckingErrorListener();
+        factory.setErrorListener(loggingErrListener);
+        assertEquals(factory.getErrorListener(), loggingErrListener);
+    }
+
+    /**
+     * IAE is thrown when setErrorListener(null).
+     */
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testNegativeCase5() {
+        TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setErrorListener(null);
+    }
+    
+    /**
+     * Miscellaneous tests.
+     * @throws Exception If any errors occur. 
+     */
+    @Test
+    public void associateSourceTest() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"));
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DOMSource domsource = new DOMSource(DocumentBuilderFactory.
+                newInstance().newDocumentBuilder().parse(EMBEDDED_XML));
+        assertNull(factory.getAssociatedStylesheet(domsource,"screen","Modern",null));
+       
+        try(FileInputStream fis = new FileInputStream(EMBEDDED_XML)) {
+            StreamSource ss = new StreamSource(fis);
+            assertNull(factory.getAssociatedStylesheet(ss,"screen","Modern",null));
+        }
+       
+        try(FileInputStream fis = new FileInputStream(EMBEDDED_XML)) {
+            StreamSource ss = new StreamSource(fis);
+            ss.setSystemId(EMBEDDED_XML_URI);
+            assertNull(factory.getAssociatedStylesheet(ss,"screen","Modern",null));
+        }
+        setPermissions();
+    }
+    
+    /**
+     * Test if factory supports valid features and doesn't support invalid 
+     * features.
+     */
+    @Test
+    public void getFeaturesTest() {
+        TransformerFactory factory = TransformerFactory.newInstance();
+        // Expected no NPE here.
+        assertFalse(factory.getFeature(BOGUS_NAME));
+        
+        assertTrue(factory.getFeature(StreamSource.FEATURE));
+        assertTrue(factory.getFeature(StreamResult.FEATURE));
+    }
+
+    /**
+     * IllegalArgumentException is thrown when implementation does not recognize
+     * the attribute.
+     */
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void bogusSetFeatures() {
+        TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setAttribute(BOGUS_NAME, "on");
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/URIResolverTest.java	2015-01-09 15:41:40.693123200 -0800
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+
+/**
+ * Verify that URIResolvers are called properly.
+ */
+public class URIResolverTest extends JAXPFileBaseTest {
+    /**
+     * Build a style-sheet/do a transform with lots of URIs to resolve.
+     * Verify that the URIResolver is called properly.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase1() throws Exception {
+        setPermissions(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xml.internal.utils"),
+                new RuntimePermission("accessClassInPackage.com.sun.org.apache.xpath.internal.objects"));
+        String xslFile = XML_DIR + "URIResolverTest.xsl";
+        String xmlFile = XML_DIR + "URIResolverTest.xml";
+        String goldFile = GOLDEN_DIR + "URIResolverTest.out";
+
+        // Validate various URI's to be resolved during stylesheet
+        //  build with the loggingURIResolver
+        String[] expXslUris = {
+                    "{" + filenameToURL(xslFile) + "}" + "impincl/SystemIdImport.xsl",
+                    "{" + filenameToURL(xslFile) + "}" + "impincl/SystemIdInclude.xsl"
+                };
+        CheckingURIResolver chkURIResolver = new CheckingURIResolver(expXslUris);
+        TransformerFactory factory = TransformerFactory.newInstance();
+        // Set the URIResolver and validate it
+        factory.setURIResolver(chkURIResolver);
+        Templates templates = factory.newTemplates(new StreamSource(xslFile));
+        Transformer transformer = templates.newTransformer();
+        assertEquals(factory.getURIResolver(), chkURIResolver);
+        
+        // Validate various URI's to be resolved during transform
+        //  time with the loggingURIResolver
+        String[] expectedXmlUris = {
+            "{" + filenameToURL(xslFile) + "}" + "../impincl/SystemIdImport.xsl",
+            "{" + filenameToURL(xslFile) + "}" + "impincl/SystemIdImport.xsl",
+            "{" + filenameToURL(xslFile) + "}" + "systemid/impincl/SystemIdImport.xsl",
+        };
+        CheckingURIResolver transfomerResolver = new CheckingURIResolver(expectedXmlUris);
+        transformer.setURIResolver(transfomerResolver);
+        String outputFile = getNextFile(this.getClass());
+        transformer.transform(new StreamSource(filenameToURL(xmlFile)),
+                                  new StreamResult(outputFile));
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }   
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/DOMImpIncl.xml	2015-01-09 15:41:40.964123622 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <list>
+    <item>Above Should be include-list then import-list</item>
+    <item match-by="import">Should be matched-by-import</item>
+    <item match-by="include">Should be matched-by-include</item>
+    <item match-by="main">Should be matched-by-import-also</item>
+    <list>
+      <item>Should be matched-by-main</item>
+      <item>Should be matched-by-main</item>
+    </list>
+  </list>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/DOMImpIncl.xsl	2015-01-09 15:41:41.234124044 -0800
@@ -0,0 +1,28 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: StreamImpIncl.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for StreamSource APIs. -->
+
+<xsl:import href="impincl/SimpleImport.xsl"/>
+<xsl:include href="impincl/SimpleInclude.xsl"/>
+
+<xsl:template match="doc">
+ <out>
+  <xsl:apply-templates/>
+ </out>
+</xsl:template>
+
+<xsl:template match="list" priority="-1">
+ <main-list>
+  <xsl:apply-templates/>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+  <matched-by-main>
+    <xsl:value-of select="." />
+  </matched-by-main>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/DOMTest.xml	2015-01-09 15:41:41.498124455 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/DOMTest.xsl	2015-01-09 15:41:41.748124845 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- From the XSLT spec: "the identity transformation can be written using xsl:copy as follows:" -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/EmbeddedFragment.xml	2015-01-09 15:41:42.008125251 -0800
@@ -0,0 +1,65 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet type="text/xsl" href="#style1"?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA | head | body)*>
+
+<!ELEMENT head (#PCDATA | xsl:stylesheet)*>
+<!ELEMENT body (#PCDATA|para)*>
+
+<!ELEMENT xsl:stylesheet (#PCDATA | xsl:key | xsl:template)*>
+<!ATTLIST xsl:stylesheet 
+		  id ID #REQUIRED
+		  xmlns:xsl CDATA #FIXED "http://www.w3.org/1999/XSL/Transform"
+		  version NMTOKEN #REQUIRED>
+
+<!ELEMENT xsl:key EMPTY>
+<!ATTLIST xsl:key
+    name NMTOKENS #REQUIRED
+    match CDATA #REQUIRED
+    use CDATA #REQUIRED>
+
+<!ELEMENT xsl:template (#PCDATA | out)*>
+<!ATTLIST xsl:template  match CDATA #IMPLIED>
+
+<!ELEMENT out (#PCDATA | xsl:value-of | xsl:text)*>
+
+<!ELEMENT xsl:value-of EMPTY>
+<!ATTLIST xsl:value-of select CDATA #REQUIRED>
+
+<!ELEMENT xsl:text (#PCDATA)>
+
+<!ELEMENT para (#PCDATA)*>
+<!ATTLIST para id ID #REQUIRED>
+]>
+
+<doc>
+  <head>
+	<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                id="style1">
+
+	<!-- FileName: EmbeddedFragment/embed01 -->
+	<!-- Document: http://www.w3.org/TR/xslt -->
+	<!-- DocVersion: 19991116 -->
+	<!-- Section: 2.7 Embedding Stylesheets. -->
+	<!-- Purpose: General test of embedded stylesheet using fragment identifier -->
+
+	  <xsl:key name="test" match="para" use="@id"/>
+
+		<xsl:template match="/">
+  			<out>
+    			<xsl:value-of select="doc/body/para"/>
+				<xsl:value-of select="key('test','foey')"/><xsl:text>&#10;</xsl:text>
+  			</out>
+		</xsl:template>
+	</xsl:stylesheet>
+  </head>
+
+  <body>
+  	<para id="foo">
+Hello
+	</para>
+	<para id="foey">
+Goodbye
+	</para>
+  </body>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/EmbeddedMediaTitle.xml	2015-01-09 15:41:42.268125656 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet media="foo/media" title="foo-title" type="text/xsl" href="impincl/EmbeddedRelative.xsl"?>
+<?xml-stylesheet media="bar/media" title="bar-title" type="text/xml" href="../impincl/EmbeddedRelative.xsl"?>
+<?xml-stylesheet media="alt/media" alternate="no" title="alt-title" type="application/xml+xslt" href="NotFoundAlternate.xsl"?>
+<?xml-stylesheet media="alt/media" alternate="yes" title="alt-title" type="application/xml+xslt" href="systemid/impincl/EmbeddedRelative.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/EmbeddedType-application-xml-xslt.xml	2015-01-09 15:41:42.520126049 -0800
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="not/valid" href="file-not-found.xsl"?>
+<?xml-stylesheet type="application/xml+xslt" href="EmbeddedType.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/EmbeddedType-text-xml.xml	2015-01-09 15:41:42.773126444 -0800
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="not/valid" href="file-not-found.xsl"?>
+<?xml-stylesheet type="text/xml" href="EmbeddedType.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/EmbeddedType-text-xsl.xml	2015-01-09 15:41:43.029126843 -0800
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="not/valid" href="file-not-found.xsl"?>
+<?xml-stylesheet type="text/xsl" href="EmbeddedType.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/EmbeddedType.xsl	2015-01-09 15:41:43.295127258 -0800
@@ -0,0 +1,16 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: EmbeddedType.xsl -->
+<!-- Explicitly only matches on /list so we don't get top-level PI's -->
+  <xsl:template match="/list">
+    <embedded-type>
+      <xsl:apply-templates select="item"/>
+    </embedded-type>
+  </xsl:template>
+
+  <xsl:template match="item">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/ErrorListenerTest.xml	2015-01-09 15:41:43.563127676 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list name="list1">
+  <item>warning(TransformerException)</item>
+  <item>error(TransformerException)</item>
+  <item>fatalError(TransformerException)</item>
+  <list name="list2">
+    <item>ErrorListener API's</item>
+    <item>Defined Above</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/ErrorListenerTest.xsl	2015-01-09 15:41:43.825128085 -0800
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="xml"/>
+
+<!-- FileName: ErrorListenerTest -->
+<!-- Creator: shane_curcuru@lotus.com -->
+<!-- Purpose: Various tests that ErrorListeners get called for illegal stylesheets. -->
+<!-- ExpectedMessage: TBD -->
+<!-- ExpectedError: TBD -->
+<!-- ExpectedFatalError: xsl:decimal-format names must be unique. Name "myminus" has been duplicated -->
+
+<!-- duplicating decimal-format names is illegal, but shouldn't 
+     affect other processing in the stylesheet, so it should be 
+     recoverable, allowing processing to continue.
+--> 
+<xsl:decimal-format name="myminus" minus-sign='_' />
+<xsl:decimal-format name="myminus" minus-sign='`' />
+
+<xsl:template match="list">
+  <list-out>
+    <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
+    <xsl:message terminate="no">ExpectedMessage from:<xsl:value-of select="@name"/></xsl:message>
+    <xsl:apply-templates/>
+  </list-out>
+</xsl:template>
+
+<xsl:template match="item">
+  <item-out>
+    <xsl:value-of select="."/>
+  </item-out>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/Minitest.xml	2015-01-09 15:41:44.097128509 -0800
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+<!-- Filename: Minitest.xml -->
+<!-- Author: Paul_Dick@lotus.com -->
+<!-- Author: Shane_Curcuru@lotus.com updated for Minitest use Dec-00 -->
+
+<Family_Geneologies>
+	<Family Surname= "The Smith">
+		<Parents>
+			<Father First="Lewis" MI="R" Last="Smith">Lew Smith</Father> 
+			<Mother First="Ruth" MI="C" Last="Smith">Ruth Smith</Mother> 
+			<GrandKids>
+				<gkid>1</gkid>
+				<gkid>2</gkid>
+				<gkid>3</gkid>
+				<gkid>4</gkid>
+				<gkid>5</gkid>
+				<gkid>6</gkid>
+				<gkid>7</gkid>
+				<gkid>8</gkid>
+				<gkid>9</gkid>
+			</GrandKids>
+		</Parents>
+		<Children>
+			<Child>
+				<Basic_Information>
+					<Name First="Andy" MI="A" Last="Smith">Andy Smith</Name>
+					<Address Street="32 Stonefield Dr" Town="Princton" State="NJ" Zip="07642">Stonefield Dr</Address>
+					<Phone>
+						<Home>483-23-5432</Home>
+						<Work/>
+						<Fax/>
+						<Celluar/>					  
+					</Phone>
+					<Social_Security>012-23-1234</Social_Security>
+				</Basic_Information>
+				<Personal_Information>
+					<Sex>Male</Sex>
+					<Age>45</Age>
+					<Married Kids="2">Yes</Married>
+					<Family_Information>
+						<Wife>
+							<Name First="Suzie" MI="A" Last="Smith">Suzie</Name>
+							<Age>45</Age>
+						</Wife>
+						<Kids>
+							<Kid ID="1">
+								<Name First="Julie" MI="A" Last="Smith">Jules</Name>
+								<Age>9</Age></Kid>
+							<Kid ID="4">
+								<Name First="Daniel" MI="L" Last="Smith">Daniel</Name>
+								<Age>8</Age></Kid></Kids>
+					</Family_Information>
+				</Personal_Information>
+				<Education>
+					<PA What="Physican Assistant" From="Hannamen College" When="'84">PA</PA>
+					<BS What="Organic Chemistry" From="Ohio Weslyean University" When="'78">BS</BS>
+				</Education>
+			</Child>
+<Child>
+<Basic_Information>
+<Name First="Thomas" MI="B" Last="Smith">Tom Smith</Name>
+<Address Street="47 Pondside Lane" Town="Needham" State="MA" Zip="04532">Pondside Lane</Address>
+<Phone>
+<Home>508.257.2754</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>274-76-2971</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>30</Age>
+<Married Kids="2">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Margaret" MI="A" Last="Young">Maggy</Name>
+<Age>39</Age>
+</Wife>
+<Kids>
+<Kid ID="3">
+<Name First="Joshua" MI="R" Last="Smith">Joshua</Name>
+<Age>7</Age></Kid>
+<Kid ID="6">
+<Name First="Lauren" MI="R" Last="Smith">Lauren</Name>
+<Age>5</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education What="Finance" From="Boston University" When="'81">BA</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Henry" MI="M" Last="Smith">Henry Smith</Name>
+<Address Street="25 Lakeview" Town="Pittsfield" State="MA" Zip="98623">Lakeview</Address>
+<Phone>
+<Home>417.645.4954</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>231-45-3590</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>40</Age>
+<Married Kids="2">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Elizbeth" MI="Q" Last="Smith">Beth</Name>
+<Age>40</Age>
+</Wife>
+<Kids>
+<Kid ID="2">
+<Name First="Nathaniel" MI="Q" Last="Smith">Nate</Name>
+<Age>8</Age></Kid>
+<Kid ID="5">
+<Name First="Samual" MI="Q" Last="Smith">Sam</Name>
+<Age>7</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education>
+<MBA In="Technology MBA" From="Northeastern University" When="'96">MBA</MBA>
+<BA In="Applied Physics &amp; Math" From="Mass Institute of Technology" When="'82">BA</BA>
+</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Bruce" MI="E" Last="Smith">Bruce Smith</Name>
+<Address Street="36 Strawberry Lane" Town="North Attleboro" State="MA" Zip="73564">Strawberry Lane</Address>
+<Phone>
+<Work>617.432.5607</Work>
+<Home>213.457.2190</Home>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>675-00-4312</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>38</Age>
+<Married Kids="1">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Betsy" MI="A" Last="Smith">Betsy</Name>
+<Age>34</Age>
+</Wife>
+<Kids>
+<Kid ID="7">
+<Name First="Benjamin" MI="D" Last="Smith">Ben</Name>
+<Age>5</Age></Kid>
+<Kid ID="8">
+<Name First="Lucy" MI="E" Last="Smith">Lucy</Name>
+<Age>2</Age></Kid>
+<Kid ID="9">
+<Name First="Jake" MI="E" Last="Smith">Jake</Name>
+<Age>1</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education What="Computer Science &amp; Psychology" From="University of Maine" When="'84">BA</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Joseph" MI="A" Last="Smith">Joe Smith</Name>
+<Address Street="85 Green St." Town="Melrose" State="MA" Zip="02176">Green St.</Address>
+<Phone>
+<Home>781.665.0539</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>425-46-6982</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>34</Age>
+<Married Kids="0">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Lilla" MI="A" Last="Smith">Lilla</Name>
+<Age>38</Age>
+</Wife>
+</Family_Information>
+</Personal_Information>
+<Education>
+<MA What="Education" From="Boston College" When="'92">MA</MA>
+<BA What="Political Science" From="University of Maine" When="'89">BA</BA>
+</Education>
+</Child>
+</Children>
+</Family>
+<Family Surname= "The Westons">
+<Parents>
+<Father First="Melvin" MI="O" Last="Weston">Melvin Weston</Father> 
+<Mother First="Elizabeth" MI="A" Last="Harris">Liz Harris</Mother> 
+<GrandKids>
+<gkid>7</gkid>
+<gkid>8</gkid>
+<gkid>9</gkid>
+</GrandKids>
+</Parents>
+<Children>
+<Child>
+<Basic_Information>
+<Name First="Caroline" MI="A" Last="Weston">Caroline Weston</Name>
+<Address Street="Finchly Road" Town="Hanover" State="NH" Zip="23765">Finchly Road</Address>
+<Phone>
+<Home>715.264.8205</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>09-46-8791</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Female</Sex>
+<Age>37</Age>
+<Married >No</Married>
+<Family_Information>
+</Family_Information>
+</Personal_Information>
+<Education What="Administrator" From="Cathrine Gibbs" When="'80">Assoc</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Betsy" MI="A" Last="Weston">Betsy Weston</Name>
+<Address Street="36 Strawberry Lane" Town="North Attleboro" State="MA" Zip="73564">Strawberry Lane</Address>
+<Phone>
+<Work>617.432.5607</Work>
+<Home>213.457.2190</Home>
+<Celluar/>
+</Phone>
+<Social_Security>123-46-9876</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Female</Sex>
+<Age>34</Age>
+<Married Kids="1">Yes</Married>
+<Family_Information>
+<Husband>
+<Name First="Bruce" MI="E" Last="Smith">Bruce</Name>
+<Age>38</Age>
+</Husband>
+<Kids>
+<Kid ID="7">
+<Name First="Benjamin" MI="D" Last="Smith">Ben</Name>
+<Age>5</Age></Kid>
+<Kid ID="8">
+<Name First="Lucy" MI="E" Last="Smith">Lucy</Name>
+<Age>2</Age></Kid>
+<Kid ID="9">
+<Name First="Jake" MI="E" Last="Smith">Jake</Name>
+<Age>1</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education>
+<MA What="Exercise Physiology" From="Indiania University" When="'89">MA</MA>
+<BS What="Kinetics" From="Leeds Poloytechnical" When="'87">BS</BS>
+</Education>
+</Child>
+</Children>
+</Family>
+</Family_Geneologies>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/Minitest.xsl	2015-01-09 15:41:44.360128919 -0800
@@ -0,0 +1,104 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+				xmlns:smith="url://the.smith.family"
+				xmlns:weston="url://the.weston.family"
+				exclude-result-prefixes="smith weston">
+
+<!-- Filename: Minitest.xsl -->
+<!-- Author: Paul_Dick@lotus.com -->
+<!-- Author: Shane_Curcuru@lotus.com updated for Minitest use Dec-00 -->
+
+<xsl:import href="impincl/MinitestImport.xsl"/>
+<xsl:include href="impincl/MinitestInclude.xsl"/>
+
+<xsl:strip-space elements="Family_Geneologies Kids Males"/>
+<xsl:output method="xml" indent="yes"/>
+<xsl:variable name="root" select="'Families'"/>
+
+<!-- Root xsl:template - start processing here -->
+<xsl:key name="KidInfo" match="Kid" use="@ID"/>
+
+<xsl:template match="Family_Geneologies">
+  <out>
+     <xsl:apply-templates select="Family"/>  
+  </out>
+</xsl:template>
+ 
+
+<xsl:template match="Family">
+<xsl:text>&#10;</xsl:text>
+
+	<xsl:call-template name="tree">
+	   <xsl:with-param name="Surname" select="@Surname"/>
+	</xsl:call-template><xsl:text>&#10;</xsl:text>
+
+	<xsl:value-of select="@Surname" />
+
+    <xsl:apply-templates select="Parents">
+	   <xsl:with-param name="Surname" select="@Surname"/>
+	</xsl:apply-templates>
+
+	<xsl:apply-templates select="Children/Child">
+	   <xsl:sort select="Basic_Information/Name/@First"/>
+	</xsl:apply-templates>
+
+</xsl:template>
+
+<xsl:template match="Child">
+	<xsl:text>&#10;&#13;</xsl:text>
+	<xsl:value-of select=".//Name"/>'s phone number is <xsl:value-of select=".//Phone/Home"/><xsl:text>.</xsl:text>
+	<xsl:if test='Personal_Information/Sex[.="Male"]' ><xsl:text/>
+He is <xsl:value-of select="Personal_Information/Age"/><xsl:text>. </xsl:text>
+	</xsl:if>
+	<xsl:if test='Personal_Information/Sex[.="Female"]' >
+She is <xsl:value-of select="Personal_Information/Age"/><xsl:text>. </xsl:text>
+	</xsl:if>
+	<xsl:apply-templates select="Personal_Information/Married"/> 
+</xsl:template>
+					
+<xsl:template match ="Personal_Information/Married">
+  <xsl:variable name="spouse" select="following-sibling::*/Wife/Name | following-sibling::*/child::Husband/child::Name"/>  
+	<xsl:if test='.="Yes"' >
+		<xsl:value-of select="ancestor::Child/Basic_Information/Name/@First"/> is married to <xsl:value-of select="$spouse"/>
+		<xsl:text>.</xsl:text> 
+		<xsl:choose>
+			<xsl:when test="./@Kids > 0">
+Their children are <xsl:text/>
+				<xsl:for-each select="following-sibling::*/child::Kids/child::Kid">
+				   <!--xsl:value-of select="."/-->
+				   <xsl:choose>
+						<xsl:when test="(position()=last())">
+							<xsl:value-of select="Name"/>:<xsl:value-of select="Age"/></xsl:when>
+						<xsl:otherwise>
+				   			<xsl:value-of select="Name"/>:<xsl:value-of select="Age"/><xsl:text>, </xsl:text></xsl:otherwise>
+				   </xsl:choose>
+				   <xsl:if test="(position()=last()-1)">and </xsl:if>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:when test="./@Kids = 0">
+They have no kids
+			</xsl:when>
+		</xsl:choose>											
+	</xsl:if>
+	<xsl:if test='.="No"'>
+		<xsl:value-of select="ancestor::Child/child::Basic_Information/child::Name/@First"/> is not married. 
+		<!-- The following is another way to print out the same message
+		<xsl:value-of select="../..//Basic_Information/Name/@First"/> is not married   -->
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match ="Parents">
+   <xsl:param name="Surname" select="'Default'"/>
+The parents are: <xsl:value-of select="Father/@First"/> and <xsl:value-of select="Mother"/>
+    <xsl:choose>
+       <xsl:when test="contains($Surname,'Dicks')">
+          <xsl:apply-templates select="GrandKids" mode="document"/>
+	   </xsl:when>
+	   <xsl:otherwise>
+          <xsl:apply-templates select="GrandKids" mode="orginal"/>
+	   </xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/MinitestParam.xml	2015-01-09 15:41:44.631129342 -0800
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <selector>
+    <item number="1">one</item>
+    <item value="two">2</item>
+  </selector>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/MinitestParam.xsl	2015-01-09 15:41:44.925129801 -0800
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="text" />
+
+<!-- Note: params must match various projects' Minitest.java tests -->
+<!-- params with select=value -->
+  <xsl:param name="param1s" select="'default1s'"/>
+  <xsl:param name="param2s" select="'default2s'"/>
+  <xsl:param name="param3s" select="default3s"/>
+
+<!-- params with node values -->
+  <xsl:param name="param1n">'default1n'</xsl:param>
+  <xsl:param name="param2n">'default2n'</xsl:param>
+  <xsl:param name="param3n">default3n</xsl:param>
+
+  <xsl:template match="doc">
+    <out>
+      <xsl:text>&#10;</xsl:text>
+      <xsl:text> :param1s: </xsl:text><xsl:value-of select="$param1s"/>
+      <xsl:text> :param2s: </xsl:text><xsl:value-of select="$param2s"/>
+      <xsl:text> :param3s: </xsl:text><xsl:value-of select="$param3s"/>
+      <xsl:text>&#10;</xsl:text>
+      <xsl:text> :param1n: </xsl:text><xsl:value-of select="$param1n"/>
+      <xsl:text> :param2n: </xsl:text><xsl:value-of select="$param2n"/>
+      <xsl:text> :param3n: </xsl:text><xsl:value-of select="$param3n"/>
+      <xsl:text>&#10;</xsl:text>
+    </out>
+  </xsl:template>
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/MinitestPerf.xml	2015-01-09 15:41:45.191130215 -0800
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+<!-- Filename: Minitest.xml -->
+<!-- Author: Paul_Dick@lotus.com -->
+<!-- Author: Shane_Curcuru@lotus.com updated for Minitest use Dec-00 -->
+
+<Family_Geneologies>
+	<Family Surname= "The Smith">
+		<Parents>
+			<Father First="Lewis" MI="R" Last="Smith">Lew Smith</Father> 
+			<Mother First="Ruth" MI="C" Last="Smith">Ruth Smith</Mother> 
+			<GrandKids>
+				<gkid>1</gkid>
+				<gkid>2</gkid>
+				<gkid>3</gkid>
+				<gkid>4</gkid>
+				<gkid>5</gkid>
+				<gkid>6</gkid>
+				<gkid>7</gkid>
+				<gkid>8</gkid>
+				<gkid>9</gkid>
+			</GrandKids>
+		</Parents>
+		<Children>
+			<Child>
+				<Basic_Information>
+					<Name First="Andy" MI="A" Last="Smith">Andy Smith</Name>
+					<Address Street="32 Stonefield Dr" Town="Princton" State="NJ" Zip="07642">Stonefield Dr</Address>
+					<Phone>
+						<Home>483-23-5432</Home>
+						<Work/>
+						<Fax/>
+						<Celluar/>					  
+					</Phone>
+					<Social_Security>012-23-1234</Social_Security>
+				</Basic_Information>
+				<Personal_Information>
+					<Sex>Male</Sex>
+					<Age>45</Age>
+					<Married Kids="2">Yes</Married>
+					<Family_Information>
+						<Wife>
+							<Name First="Suzie" MI="A" Last="Smith">Suzie</Name>
+							<Age>45</Age>
+						</Wife>
+						<Kids>
+							<Kid ID="1">
+								<Name First="Julie" MI="A" Last="Smith">Jules</Name>
+								<Age>9</Age></Kid>
+							<Kid ID="4">
+								<Name First="Daniel" MI="L" Last="Smith">Daniel</Name>
+								<Age>8</Age></Kid></Kids>
+					</Family_Information>
+				</Personal_Information>
+				<Education>
+					<PA What="Physican Assistant" From="Hannamen College" When="'84">PA</PA>
+					<BS What="Organic Chemistry" From="Ohio Weslyean University" When="'78">BS</BS>
+				</Education>
+			</Child>
+<Child>
+<Basic_Information>
+<Name First="Thomas" MI="B" Last="Smith">Tom Smith</Name>
+<Address Street="47 Pondside Lane" Town="Needham" State="MA" Zip="04532">Pondside Lane</Address>
+<Phone>
+<Home>508.257.2754</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>274-76-2971</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>30</Age>
+<Married Kids="2">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Margaret" MI="A" Last="Young">Maggy</Name>
+<Age>39</Age>
+</Wife>
+<Kids>
+<Kid ID="3">
+<Name First="Joshua" MI="R" Last="Smith">Joshua</Name>
+<Age>7</Age></Kid>
+<Kid ID="6">
+<Name First="Lauren" MI="R" Last="Smith">Lauren</Name>
+<Age>5</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education What="Finance" From="Boston University" When="'81">BA</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Henry" MI="M" Last="Smith">Henry Smith</Name>
+<Address Street="25 Lakeview" Town="Pittsfield" State="MA" Zip="98623">Lakeview</Address>
+<Phone>
+<Home>417.645.4954</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>231-45-3590</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>40</Age>
+<Married Kids="2">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Elizbeth" MI="Q" Last="Smith">Beth</Name>
+<Age>40</Age>
+</Wife>
+<Kids>
+<Kid ID="2">
+<Name First="Nathaniel" MI="Q" Last="Smith">Nate</Name>
+<Age>8</Age></Kid>
+<Kid ID="5">
+<Name First="Samual" MI="Q" Last="Smith">Sam</Name>
+<Age>7</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education>
+<MBA In="Technology MBA" From="Northeastern University" When="'96">MBA</MBA>
+<BA In="Applied Physics &amp; Math" From="Mass Institute of Technology" When="'82">BA</BA>
+</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Bruce" MI="E" Last="Smith">Bruce Smith</Name>
+<Address Street="36 Strawberry Lane" Town="North Attleboro" State="MA" Zip="73564">Strawberry Lane</Address>
+<Phone>
+<Work>617.432.5607</Work>
+<Home>213.457.2190</Home>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>675-00-4312</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>38</Age>
+<Married Kids="1">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Betsy" MI="A" Last="Smith">Betsy</Name>
+<Age>34</Age>
+</Wife>
+<Kids>
+<Kid ID="7">
+<Name First="Benjamin" MI="D" Last="Smith">Ben</Name>
+<Age>5</Age></Kid>
+<Kid ID="8">
+<Name First="Lucy" MI="E" Last="Smith">Lucy</Name>
+<Age>2</Age></Kid>
+<Kid ID="9">
+<Name First="Jake" MI="E" Last="Smith">Jake</Name>
+<Age>1</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education What="Computer Science &amp; Psychology" From="University of Maine" When="'84">BA</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Joseph" MI="A" Last="Smith">Joe Smith</Name>
+<Address Street="85 Green St." Town="Melrose" State="MA" Zip="02176">Green St.</Address>
+<Phone>
+<Home>781.665.0539</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>425-46-6982</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Male</Sex>
+<Age>34</Age>
+<Married Kids="0">Yes</Married>
+<Family_Information>
+<Wife>
+<Name First="Lilla" MI="A" Last="Smith">Lilla</Name>
+<Age>38</Age>
+</Wife>
+</Family_Information>
+</Personal_Information>
+<Education>
+<MA What="Education" From="Boston College" When="'92">MA</MA>
+<BA What="Political Science" From="University of Maine" When="'89">BA</BA>
+</Education>
+</Child>
+</Children>
+</Family>
+<Family Surname= "The Westons">
+<Parents>
+<Father First="Melvin" MI="O" Last="Weston">Melvin Weston</Father> 
+<Mother First="Elizabeth" MI="A" Last="Harris">Liz Harris</Mother> 
+<GrandKids>
+<gkid>7</gkid>
+<gkid>8</gkid>
+<gkid>9</gkid>
+</GrandKids>
+</Parents>
+<Children>
+<Child>
+<Basic_Information>
+<Name First="Caroline" MI="A" Last="Weston">Caroline Weston</Name>
+<Address Street="Finchly Road" Town="Hanover" State="NH" Zip="23765">Finchly Road</Address>
+<Phone>
+<Home>715.264.8205</Home>
+<Work/>
+<Fax/>
+<Celluar/>
+</Phone>
+<Social_Security>09-46-8791</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Female</Sex>
+<Age>37</Age>
+<Married >No</Married>
+<Family_Information>
+</Family_Information>
+</Personal_Information>
+<Education What="Administrator" From="Cathrine Gibbs" When="'80">Assoc</Education>
+</Child>
+<Child>
+<Basic_Information>
+<Name First="Betsy" MI="A" Last="Weston">Betsy Weston</Name>
+<Address Street="36 Strawberry Lane" Town="North Attleboro" State="MA" Zip="73564">Strawberry Lane</Address>
+<Phone>
+<Work>617.432.5607</Work>
+<Home>213.457.2190</Home>
+<Celluar/>
+</Phone>
+<Social_Security>123-46-9876</Social_Security>
+</Basic_Information>
+<Personal_Information>
+<Sex>Female</Sex>
+<Age>34</Age>
+<Married Kids="1">Yes</Married>
+<Family_Information>
+<Husband>
+<Name First="Bruce" MI="E" Last="Smith">Bruce</Name>
+<Age>38</Age>
+</Husband>
+<Kids>
+<Kid ID="7">
+<Name First="Benjamin" MI="D" Last="Smith">Ben</Name>
+<Age>5</Age></Kid>
+<Kid ID="8">
+<Name First="Lucy" MI="E" Last="Smith">Lucy</Name>
+<Age>2</Age></Kid>
+<Kid ID="9">
+<Name First="Jake" MI="E" Last="Smith">Jake</Name>
+<Age>1</Age></Kid></Kids>
+</Family_Information>
+</Personal_Information>
+<Education>
+<MA What="Exercise Physiology" From="Indiania University" When="'89">MA</MA>
+<BS What="Kinetics" From="Leeds Poloytechnical" When="'87">BS</BS>
+</Education>
+</Child>
+</Children>
+</Family>
+</Family_Geneologies>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/MinitestPerf.xsl	2015-01-09 15:41:45.454130626 -0800
@@ -0,0 +1,104 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+				xmlns:smith="url://the.smith.family"
+				xmlns:weston="url://the.weston.family"
+				exclude-result-prefixes="smith weston">
+
+<!-- Filename: Minitest.xsl -->
+<!-- Author: Paul_Dick@lotus.com -->
+<!-- Author: Shane_Curcuru@lotus.com updated for Minitest use Dec-00 -->
+
+<xsl:import href="impincl/MinitestImport.xsl"/>
+<xsl:include href="impincl/MinitestInclude.xsl"/>
+
+<xsl:strip-space elements="Family_Geneologies Kids Males"/>
+<xsl:output method="xml" indent="yes"/>
+<xsl:variable name="root" select="'Families'"/>
+
+<!-- Root xsl:template - start processing here -->
+<xsl:key name="KidInfo" match="Kid" use="@ID"/>
+
+<xsl:template match="Family_Geneologies">
+  <out>
+     <xsl:apply-templates select="Family"/>  
+  </out>
+</xsl:template>
+ 
+
+<xsl:template match="Family">
+<xsl:text>&#10;</xsl:text>
+
+	<xsl:call-template name="tree">
+	   <xsl:with-param name="Surname" select="@Surname"/>
+	</xsl:call-template><xsl:text>&#10;</xsl:text>
+
+	<xsl:value-of select="@Surname" />
+
+    <xsl:apply-templates select="Parents">
+	   <xsl:with-param name="Surname" select="@Surname"/>
+	</xsl:apply-templates>
+
+	<xsl:apply-templates select="Children/Child">
+	   <xsl:sort select="Basic_Information/Name/@First"/>
+	</xsl:apply-templates>
+
+</xsl:template>
+
+<xsl:template match="Child">
+	<xsl:text>&#10;&#13;</xsl:text>
+	<xsl:value-of select=".//Name"/>'s phone number is <xsl:value-of select=".//Phone/Home"/><xsl:text>.</xsl:text>
+	<xsl:if test='Personal_Information/Sex[.="Male"]' ><xsl:text/>
+He is <xsl:value-of select="Personal_Information/Age"/><xsl:text>. </xsl:text>
+	</xsl:if>
+	<xsl:if test='Personal_Information/Sex[.="Female"]' >
+She is <xsl:value-of select="Personal_Information/Age"/><xsl:text>. </xsl:text>
+	</xsl:if>
+	<xsl:apply-templates select="Personal_Information/Married"/> 
+</xsl:template>
+					
+<xsl:template match ="Personal_Information/Married">
+  <xsl:variable name="spouse" select="following-sibling::*/Wife/Name | following-sibling::*/child::Husband/child::Name"/>  
+	<xsl:if test='.="Yes"' >
+		<xsl:value-of select="ancestor::Child/Basic_Information/Name/@First"/> is married to <xsl:value-of select="$spouse"/>
+		<xsl:text>.</xsl:text> 
+		<xsl:choose>
+			<xsl:when test="./@Kids > 0">
+Their children are <xsl:text/>
+				<xsl:for-each select="following-sibling::*/child::Kids/child::Kid">
+				   <!--xsl:value-of select="."/-->
+				   <xsl:choose>
+						<xsl:when test="(position()=last())">
+							<xsl:value-of select="Name"/>:<xsl:value-of select="Age"/></xsl:when>
+						<xsl:otherwise>
+				   			<xsl:value-of select="Name"/>:<xsl:value-of select="Age"/><xsl:text>, </xsl:text></xsl:otherwise>
+				   </xsl:choose>
+				   <xsl:if test="(position()=last()-1)">and </xsl:if>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:when test="./@Kids = 0">
+They have no kids
+			</xsl:when>
+		</xsl:choose>											
+	</xsl:if>
+	<xsl:if test='.="No"'>
+		<xsl:value-of select="ancestor::Child/child::Basic_Information/child::Name/@First"/> is not married. 
+		<!-- The following is another way to print out the same message
+		<xsl:value-of select="../..//Basic_Information/Name/@First"/> is not married   -->
+	</xsl:if>
+</xsl:template>
+
+<xsl:template match ="Parents">
+   <xsl:param name="Surname" select="'Default'"/>
+The parents are: <xsl:value-of select="Father/@First"/> and <xsl:value-of select="Mother"/>
+    <xsl:choose>
+       <xsl:when test="contains($Surname,'Dicks')">
+          <xsl:apply-templates select="GrandKids" mode="document"/>
+	   </xsl:when>
+	   <xsl:otherwise>
+          <xsl:apply-templates select="GrandKids" mode="orginal"/>
+	   </xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/OutputPropertiesHTML.xml	2015-01-09 15:41:45.715131033 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html-tag>
+  <head-tag>
+    <title-tag text="title-tag:text"/>
+  </head-tag>
+  <body-tag>
+    <p-tag>P-tag:begin<cdataHere>CDATA? or not?</cdataHere></p-tag>
+    <ul-tag>
+      <li-tag number="1">li-tag:one</li-tag>
+      <li-tag value="two">li-tag:two</li-tag>
+    </ul-tag>
+  </body-tag>
+</html-tag>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/OutputPropertiesHTML.xsl	2015-01-09 15:41:45.978131443 -0800
@@ -0,0 +1,51 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: OutputPropertiesHTML.xsl -->
+  <!-- Purpose: Legal HTML output for use with OutputPropertiesTest.java -->
+
+<!-- Include various XSLT spec xsl:output attrs -->
+<xsl:output method="html"
+            version="123.45"
+            standalone="yes"
+            doctype-public="this-is-doctype-public"
+            doctype-system="this-is-doctype-system"
+            cdata-section-elements="cdataHere"
+            indent="yes"
+            media-type="text/test/xml"
+            omit-xml-declaration="yes" />
+
+<xsl:template match="/">
+  <HTML>
+  <xsl:apply-templates/>
+  </HTML>
+</xsl:template>
+
+<xsl:template match="html-tag">
+    <HEAD>
+      <xsl:element name="TITLE"><xsl:value-of select="head-tag/title-tag/@text"/></xsl:element>
+      <xsl:text>xsl:text within HEAD tag</xsl:text>
+    </HEAD>
+    <BODY>
+    <xsl:apply-templates select="body-tag"/>
+    <xsl:text disable-output-escaping="yes">&lt;P>Fake 'p' element&lt;/P></xsl:text>
+    <!-- Some HTML elements below, just for fun -->
+    <P>&#064; &#160; &#126; &#169; &#200;</P>
+    </BODY>
+</xsl:template>
+
+<xsl:template match="body-tag">
+    <xsl:apply-templates select="p-tag | ul-tag"/>
+</xsl:template>
+
+<xsl:template match="p-tag">
+  <xsl:element name="P">
+    <xsl:value-of select="."/>
+  </xsl:element>
+</xsl:template>
+ 
+<xsl:template match="ul-tag">
+  <UL>
+    <xsl:copy-of select="."/>
+  </UL>
+</xsl:template>
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/ParameterTest.xml	2015-01-09 15:41:46.243131856 -0800
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- Testing xsl:param-->
+<doc filename="ParameterTest.xml">
+  <item number="1">1</item>
+  <item number="2">2</item>
+  <item number="3">3</item>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/ParameterTest.xsl	2015-01-09 15:41:46.516132282 -0800
@@ -0,0 +1,59 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <!-- FileName: ParameterTest.xsl -->
+  <!-- Document: http://www.w3.org/TR/xslt -->
+  <!-- DocVersion: 19990922 -->
+  <!-- Section: 11.2 Values of Variables and Parameters  -->
+  <!-- Purpose: Functional test of various usages of parameters in transforms -->
+
+<!-- Declare one of each flavor of common global param statements -->
+<xsl:param name="p1">
+    <B>ABC</B>
+</xsl:param>
+
+<xsl:param name="p2"><B>DEF</B></xsl:param>
+
+<xsl:param name="t1">notset</xsl:param>
+
+<xsl:param name="s1" select="'s1val'">
+</xsl:param>
+
+<xsl:param name="s2" select="'s2val'"></xsl:param>
+
+<xsl:template match="doc">
+  <xsl:param name="p3"><B>GHI</B></xsl:param>
+  <xsl:param name="s3" select="'s3val'"></xsl:param>
+
+  <outp>
+    <xsl:value-of select="$p1"/><xsl:text>,</xsl:text><xsl:copy-of select="$p1"/><xsl:text>; </xsl:text>
+    <xsl:value-of select="$p2"/><xsl:text>,</xsl:text><xsl:copy-of select="$p2"/><xsl:text>; </xsl:text>
+    <xsl:value-of select="$p3"/><xsl:text>,</xsl:text><xsl:copy-of select="$p3"/><xsl:text>; </xsl:text>
+  </outp>
+  <xsl:text>:
+  </xsl:text>
+  <outs>
+    <xsl:value-of select="$s1"/><xsl:text>,</xsl:text><xsl:copy-of select="$s1"/><xsl:text>; </xsl:text>
+    <xsl:value-of select="$s2"/><xsl:text>,</xsl:text><xsl:copy-of select="$s2"/><xsl:text>; </xsl:text>
+    <xsl:value-of select="$s3"/><xsl:text>,</xsl:text><xsl:copy-of select="$s3"/><xsl:text>; </xsl:text>
+  </outs>
+  <xsl:text>:
+  </xsl:text>
+
+  <outt>
+    <xsl:value-of select="$t1='notset'"/><xsl:text>-notset,</xsl:text>
+    <xsl:value-of select="$t1=''"/><xsl:text>-blank,</xsl:text>
+    <xsl:value-of select="$t1='a'"/><xsl:text>-a,</xsl:text>
+    <xsl:value-of select="$t1='1'"/><xsl:text>-1,</xsl:text>
+    <xsl:value-of select="$t1"/>
+  </outt>
+  <xsl:apply-templates/>
+
+  <!-- @todo Should also call a template and pass a param as well -->
+</xsl:template>
+
+<xsl:template match="item[text() = '2']">
+  <xsl:text>Item-2-found</xsl:text>
+</xsl:template>
+  
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/ParameterTest2.xml	2015-01-09 15:41:46.783132698 -0800
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- Testing xsl:param-->
+<doc filename="ParameterTest2.xml">
+  <item number="1.1">11</item>
+  <item number="2.2">22</item>
+  <item number="3.3">33</item>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/ParameterTest2.xsl	2015-01-09 15:41:47.058133128 -0800
@@ -0,0 +1,15 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="xml" indent="yes"/>
+  <!-- FileName: ParameterTest2.xsl -->
+  <!-- Purpose: Reproduce Bugzilla1611 -->
+
+<xsl:variable name="globalVarAttr" select="/doc/@filename" />
+
+<xsl:template match="/">
+  <out>
+    <globalVarAttr><xsl:value-of select="$globalVarAttr"/><xsl:text>:</xsl:text><xsl:copy-of select="$globalVarAttr"/></globalVarAttr>
+  </out>
+</xsl:template>
+  
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXImpIncl.xml	2015-01-09 15:41:47.320133536 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <list>
+    <item>Above Should be include-list then import-list</item>
+    <item match-by="import">Should be matched-by-import</item>
+    <item match-by="include">Should be matched-by-include</item>
+    <item match-by="main">Should be matched-by-import-also</item>
+    <list>
+      <item>Should be matched-by-main</item>
+      <item>Should be matched-by-main</item>
+    </list>
+  </list>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXImpIncl.xsl	2015-01-09 15:41:47.573133931 -0800
@@ -0,0 +1,28 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SAXImpIncl.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for SAXSource/SAXResult APIs. -->
+
+<xsl:import href="impincl/SimpleImport.xsl"/>
+<xsl:include href="impincl/SimpleInclude.xsl"/>
+
+<xsl:template match="doc">
+ <out>
+  <xsl:apply-templates/>
+ </out>
+</xsl:template>
+
+<xsl:template match="list" priority="-1">
+ <main-list>
+  <xsl:apply-templates/>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+  <matched-by-main>
+    <xsl:value-of select="." />
+  </matched-by-main>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXTest.xml	2015-01-09 15:41:47.831134333 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXTest.xsl	2015-01-09 15:41:48.097134748 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- From the XSLT spec: "the identity transformation can be written using xsl:copy as follows:" -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXdtd.dtd	2015-01-09 15:41:48.395135213 -0800
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Cheap dtd for testing LexicalHandler events -->
+<!ENTITY nbsp   "&#160;" >
+<!ENTITY cent   "&#162;" >
+<!ENTITY pound  "&#163;" >
+<!ENTITY curren "&#164;" >
+<!ENTITY yen    "&#165;" >
+<!ENTITY copy   "&#169;" >
+<!ENTITY test-ent   "an-xsl-entity" >
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXdtd.xml	2015-01-09 15:41:48.677135653 -0800
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE list 
+[
+  <!ENTITY copy   "&#169;" >
+  <!ENTITY test-ent   "an-xml-entity" >
+  <!ELEMENT list (item* | list*)>
+  <!ATTLIST list 
+            name CDATA #IMPLIED
+  >
+  <!ELEMENT item (#PCDATA)>
+]>
+
+<list>
+  <item>Xalan-J&copy; 1.x</item>
+  <item>Xalan-J&test-ent; 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan <![CDATA[this is a CDATA section blah<?<!/>blah]]> documentation</item>
+    <item>Xalan <!-- This is a comment --> tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SAXdtd.xsl	2015-01-09 15:41:48.960136094 -0800
@@ -0,0 +1,23 @@
+<?xml version="1.0"?> 
+<!DOCTYPE SAXDTD SYSTEM "SAXdtd.dtd">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Use different encoding to see entities better -->
+<xsl:output method="xml" encoding="ISO-8859-1"/>
+
+  <xsl:template match="/">
+    <out>
+      <head>Testing &copy; entities &test-ent; here</head>
+      <xsl:apply-templates/>
+    </out>
+  </xsl:template>
+
+
+<!-- From the XSLT spec: "the identity transformation can be written using xsl:copy as follows:" -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/StreamOutputFormat.xml	2015-01-09 15:41:49.311136642 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <cdataHere>CDATA? or not?</cdataHere>
+  <selector>
+    <item number="1">one</item>
+    <item value="two">2</item>
+  </selector>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/StreamOutputFormat.xsl	2015-01-09 15:41:49.604137099 -0800
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!-- Include all XSLT spec xsl:output attrs -->
+<xsl:output method="xml"
+            version="123.45"
+            encoding="UTF-8"
+            standalone="yes"
+            doctype-public="this-is-doctype-public"
+            doctype-system="this-is-doctype-system"
+            cdata-section-elements="cdataHere"
+            indent="yes"
+            media-type="text/test/xml"
+            omit-xml-declaration="no" />
+
+  <xsl:template match="doc">
+    <out>
+      <cdataHere>CDATA? or not?</cdataHere>
+      <xsl:text>foo</xsl:text>
+      <xsl:copy-of select="cdataHere" />
+      <out2>
+        <xsl:text>bar</xsl:text>
+        <xsl:copy-of select="selector" />
+      </out2>
+    </out>
+  </xsl:template>
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SystemIdImpIncl.xml	2015-01-09 15:41:49.870137514 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <list>
+    <item>Above Should be include-list then import-list</item>
+    <item>This is SystemIdImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</item>
+    <item match-by="import">Should be matched-by-import</item>
+    <item match-by="include">Should be matched-by-include</item>
+    <item match-by="main">Should be matched-by-import-also</item>
+    <list>
+      <item>Should be matched-by-main</item>
+      <item>Should be matched-by-main</item>
+    </list>
+  </list>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SystemIdImpIncl.xsl	2015-01-09 15:41:50.148137948 -0800
@@ -0,0 +1,29 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdImpIncl.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+  <!-- This is SystemIdImpIncl.xsl, used for setSystemId testing Note that different settings of systemIds will have different expected results! -->
+
+<xsl:import href="impincl/SystemIdImport.xsl"/>
+<xsl:include href="impincl/SystemIdInclude.xsl"/>
+
+<xsl:template match="doc">
+ <out>
+  <xsl:apply-templates/>
+ </out>
+</xsl:template>
+
+<xsl:template match="list" priority="-1">
+ <main-list>
+  <xsl:apply-templates/>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+  <matched-by-main>
+    <xsl:value-of select="." />
+  </matched-by-main>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SystemIdTest.xml	2015-01-09 15:41:50.420138372 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Filename: SystemIdTest.xml -->
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/SystemIdTest.xsl	2015-01-09 15:41:50.688138790 -0800
@@ -0,0 +1,12 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: SystemIdTest.xsl -->
+<!-- From the XSLT spec: "the identity transformation can be written using xsl:copy as follows:" -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIHTMLFormat.xml	2015-01-09 15:41:50.956139208 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html-tag>
+  <head-tag>
+    <title-tag text="title-tag:text"/>
+  </head-tag>
+  <body-tag>
+    <p-tag>P-tag:begin<cdataHere>CDATA? or not?</cdataHere><br-tag/><hr-tag/></p-tag>
+    <ul-tag>
+      <li-tag number="1">li-tag:one</li-tag>
+      <li-tag value="two">li-tag:two</li-tag>
+    </ul-tag>
+  </body-tag>
+</html-tag>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIHTMLFormat.xsl	2015-01-09 15:41:51.218139617 -0800
@@ -0,0 +1,56 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: TransformerAPIHTMLFormat.xsl -->
+  <!-- Purpose: Legal HTML output for use with OutputPropertiesTest.java -->
+
+<!-- Include various XSLT spec xsl:output attrs -->
+<xsl:output method="html"
+            media-type="text/test/xml"
+            omit-xml-declaration="yes" />
+
+<xsl:template match="/">
+  <HTML>
+  <xsl:apply-templates/>
+  </HTML>
+</xsl:template>
+
+<xsl:template match="html-tag">
+    <HEAD>
+      <xsl:element name="TITLE"><xsl:value-of select="head-tag/title-tag/@text"/></xsl:element>
+      <xsl:text>xsl:text within HEAD tag</xsl:text>
+    </HEAD>
+    <BODY>
+    <xsl:apply-templates select="body-tag"/>
+    <xsl:text disable-output-escaping="yes">&lt;P>Fake 'p' element&lt;/P></xsl:text>
+    <!-- Some HTML elements below, just for fun -->
+    <P>&#064; &#160; &#126; &#169; &#200;</P>
+    </BODY>
+</xsl:template>
+
+<xsl:template match="body-tag">
+    <xsl:apply-templates select="p-tag | ul-tag"/>
+</xsl:template>
+
+<xsl:template match="p-tag">
+  <xsl:element name="P">
+    <xsl:value-of select="."/>
+    <xsl:apply-templates select="br-tag | hr-tag"/>
+  </xsl:element>
+</xsl:template>
+ 
+<xsl:template match="ul-tag">
+  <UL>
+    <xsl:copy-of select="."/>
+  </UL>
+</xsl:template>
+
+<xsl:template match="br-tag">
+  <BR/>
+</xsl:template>
+
+<xsl:template match="hr-tag">
+  <HR></HR>
+</xsl:template>
+
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIOutputFormat.xml	2015-01-09 15:41:51.478140023 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <cdataHere>CDATA? or not?</cdataHere>
+  <selector>
+    <item number="1">one</item>
+    <item value="two">2</item>
+  </selector>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIOutputFormat.xsl	2015-01-09 15:41:51.745140439 -0800
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!-- Include all XSLT spec xsl:output attrs -->
+<xsl:output method="xml"
+            version="123.45"
+            encoding="UTF-16"
+            standalone="yes"
+            doctype-public="this-is-doctype-public"
+            doctype-system="this-is-doctype-system"
+            cdata-section-elements="cdataHere"
+            indent="yes"
+            media-type="text/test/xml"
+            omit-xml-declaration="yes" />
+
+  <xsl:template match="doc">
+    <out>
+      <cdataHere>CDATA? or not?</cdataHere>
+      <xsl:text>foo</xsl:text>
+      <xsl:copy-of select="cdataHere" />
+      <out2>
+        <xsl:text>bar</xsl:text>
+        <xsl:copy-of select="selector" />
+      </out2>
+    </out>
+  </xsl:template>
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIParam.xml	2015-01-09 15:41:52.011140854 -0800
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <selector>
+    <item number="1">one</item>
+    <item value="two">2</item>
+  </selector>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIParam.xsl	2015-01-09 15:41:52.288141287 -0800
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!-- params with select=value -->
+  <xsl:param name="param1s" select="'default1s'"/>
+  <xsl:param name="param2s" select="'default2s'"/>
+  <xsl:param name="param3s" select="default3s"/>
+<!-- params with node values -->
+  <xsl:param name="param1n">'default1n'</xsl:param>
+  <xsl:param name="param2n">'default2n'</xsl:param>
+  <xsl:param name="param3n">default3n</xsl:param>
+  <xsl:template match="doc">
+    <out><xsl:text>&#10;</xsl:text>
+      <xsl:text> :param1s:</xsl:text><xsl:value-of select="$param1s"/>
+      <xsl:text> :param2s:</xsl:text><xsl:value-of select="$param2s"/>
+      <xsl:text> :param3s:</xsl:text><xsl:value-of select="$param3s"/>
+      <xsl:text>&#10;</xsl:text>
+      <xsl:text> :param1n:</xsl:text><xsl:value-of select="$param1n"/>
+      <xsl:text> :param2n:</xsl:text><xsl:value-of select="$param2n"/>
+      <xsl:text> :param3n:</xsl:text><xsl:value-of select="$param3n"/>
+      <xsl:text>&#10;</xsl:text>
+    </out>
+  </xsl:template>
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIVar.xml	2015-01-09 15:41:52.547141690 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <body>
+    <list>
+      <item>TransformerAPIVar-original</item>
+    </list>
+  </body>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIVar.xsl	2015-01-09 15:41:52.811142102 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+	
+  <xsl:variable name="globalVar" select="/doc/body/list/item"/>
+	
+  <xsl:template match="/">
+    <out>
+      <item><xsl:value-of select="$globalVar"/></item>
+      <item>Text and:<xsl:value-of select="$globalVar"/></item>
+    </out>
+  </xsl:template>
+	
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerAPIVar2.xml	2015-01-09 15:41:53.076142516 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <body>
+    <list>
+      <item>TransformerAPIVar2-changed</item>
+    </list>
+  </body>
+</doc>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerFactoryAPIModern.css	2015-01-09 15:41:53.347142939 -0800
@@ -0,0 +1,6 @@
+       ARTICLE { font-family: sans-serif; background: white; color: black }
+       AUTHOR { margin: 1em; color: red }
+       HEADLINE { text-align: right; margin-bottom: 2em }
+       PARA { line-height: 1.5; margin-left: 15% }
+       INSTRUMENT { color: blue }
+
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/TransformerFactoryAPIModern.xml	2015-01-09 15:41:53.616143358 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="TransformerFactoryAPIModern.css" title="Modern" media="screen"
+         type="text/css"?>
+       <ARTICLE>
+         <HEADLINE>Fredrick the Great meets Bach</HEADLINE>
+         <AUTHOR>Johann Nikolaus Forkel</AUTHOR>
+         <PARA>
+           One evening, just as he was getting his 
+           <INSTRUMENT>flute</INSTRUMENT> ready and his
+           musicians were assembled, an officer brought him a list of
+           the strangers who had arrived.
+         </PARA>
+       </ARTICLE>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/URIResolverTest.xml	2015-01-09 15:41:53.878143767 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <list>
+    <item>Above Should be include-list then import-list</item>
+    <item>This is URIResolverTest.xml!</item>
+    <item match-by="import">Should be matched-by-import</item>
+    <item match-by="include">Should be matched-by-include</item>
+    <item match-by="main">Should be matched-by-import-also</item>
+    <list>
+      <item>Should be matched-by-main</item>
+      <item>Should be matched-by-main</item>
+    </list>
+  </list>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/URIResolverTest.xsl	2015-01-09 15:41:54.161144209 -0800
@@ -0,0 +1,40 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: URIResolverTest.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Various kinds of URIs need to be resolved from this stylesheet. -->
+
+<xsl:import href="impincl/SystemIdImport.xsl"/>
+<xsl:include href="impincl/SystemIdInclude.xsl"/>
+
+<xsl:template match="doc">
+ <out>
+  <head>
+   <xsl:variable name="resolvedURI1" select="document('../impincl/SystemIdImport.xsl')/xsl:stylesheet/xsl:template[@match='list']"/>
+   <xsl:variable name="resolvedURI2" select="document('impincl/SystemIdImport.xsl')/xsl:stylesheet/xsl:template[@match='list']"/>
+   <xsl:variable name="resolvedURI3" select="document('systemid/impincl/SystemIdImport.xsl')/xsl:stylesheet/xsl:template[@match='list']"/>
+   <xsl:text>Various document() calls: </xsl:text>
+   <xsl:value-of select="$resolvedURI1"/>
+   <xsl:text>, </xsl:text>
+   <xsl:value-of select="$resolvedURI2"/>
+   <xsl:text>, </xsl:text>
+   <xsl:value-of select="$resolvedURI3"/>
+   <xsl:text>.</xsl:text>
+  </head>
+  <xsl:apply-templates/>
+ </out>
+</xsl:template>
+
+<xsl:template match="list" priority="-1">
+ <main-list>
+  <xsl:apply-templates/>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+  <matched-by-main>
+    <xsl:value-of select="." />
+  </matched-by-main>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/cities.xml	2015-01-09 15:41:54.422144616 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="yes" ?>
+<cities>
+	<city name="Paris" country="France"/>
+	<city name="Roma" country="Italia"/>
+	<city name="Nice" country="France"/>
+	<city name="Madrid" country="Espana"/>
+	<city name="Milano" country="Italia"/>
+	<city name="Firenze" country="Italia"/>
+	<city name="Napoli" country="Italia"/>
+	<city name="Lyon" country="France"/>
+	<city name="Barcelona" country="Espana"/>
+</cities>
+
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/cities.xsl	2015-01-09 15:41:54.734145103 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="/">
+<xsl:variable name="unique-countries" select="/cities/city[not(@country=preceding-sibling::city/@country)]/@country"/>
+    <countries>
+	<xsl:for-each select="$unique-countries">
+	  <country name="{.}">
+		<xsl:for-each select="//city[@country=current()]">
+		  <city><xsl:value-of select="@name"/></city>
+		</xsl:for-each>
+	  </country> 
+	</xsl:for-each>
+    </countries>
+</xsl:template>
+</xsl:stylesheet>
+
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/embeddedIdentity.xml	2015-01-09 15:41:55.001145519 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="identity.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/identity.xml	2015-01-09 15:41:55.260145923 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/identity.xsl	2015-01-09 15:41:55.518146326 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- From the XSLT spec: "the identity transformation can be written using xsl:copy as follows:" -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/EmbeddedImpIncl.xml	2015-01-09 15:41:55.778146732 -0800
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xml" href="EmbeddedImpIncl.xsl"?>
+<doc>
+  <list>
+    <item>Above Should be include-list then import-list</item>
+    <item>This is EmbeddedImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</item>
+    <item match-by="import">Should be matched-by-import</item>
+    <item match-by="include">Should be matched-by-include</item>
+    <item match-by="main">Should be matched-by-import-also</item>
+    <list>
+      <item>Should be matched-by-main</item>
+      <item>Should be matched-by-main</item>
+    </list>
+  </list>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/EmbeddedImpIncl.xsl	2015-01-09 15:41:56.039147139 -0800
@@ -0,0 +1,29 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: EmbeddedImpIncl.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+  <!-- This is EmbeddedImpIncl.xsl, used for setSystemId testing Note that different settings of systemIds will have different expected results! -->
+  <!-- We re-use the stylesheets from the SystemId test here -->
+<xsl:import href="impincl/SystemIdImport.xsl"/>
+<xsl:include href="impincl/SystemIdInclude.xsl"/>
+
+<xsl:template match="doc">
+ <out>
+  <xsl:apply-templates/>
+ </out>
+</xsl:template>
+
+<xsl:template match="list" priority="-1">
+ <main-list>
+  <xsl:apply-templates/>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+  <matched-by-main>
+    <xsl:value-of select="." />
+  </matched-by-main>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/EmbeddedRelative.xml	2015-01-09 15:41:56.302147549 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="impincl/EmbeddedRelative.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/EmbeddedRelative.xsl	2015-01-09 15:41:56.559147950 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: EmbeddedRelative.xsl -->
+  <xsl:template match="/list">
+    <embedded-relative-level1>
+      <xsl:apply-templates select="@*|node()"/>
+    </embedded-relative-level1>
+  </xsl:template>
+
+  <xsl:template match="item">
+      <xsl:copy>
+        <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/MinitestDocument.xml	2015-01-09 15:41:56.825148365 -0800
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<GrandKids>
+	<gkid>1</gkid>
+	<gkid>2</gkid>
+	<gkid>3</gkid>
+	<gkid>4</gkid>
+	<gkid>5</gkid>
+	<gkid>6</gkid>
+	<gkid>7</gkid>
+	<gkid>8</gkid>
+	<gkid>9</gkid>
+</GrandKids>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/MinitestImport.xsl	2015-01-09 15:41:57.111148812 -0800
@@ -0,0 +1,35 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: MinitestImport.xsl -->
+<!-- Author: Paul_Dick@lotus.com -->
+
+
+<xsl:template match="GrandKids" mode="orginal">
+They have <xsl:value-of select="count(*)"/> grandchildren: <xsl:text/>
+	<xsl:for-each select="gkid">
+		<xsl:value-of select="key('KidInfo',(.))/Name/@First"/>
+		<xsl:if test="not(position()=last())">, </xsl:if>
+		<xsl:if test="(position()=last()-1)">and </xsl:if>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template match="GrandKids" mode="document">
+They should have <xsl:value-of select="count(document('MinitestDocument.xml')/GrandKids/gkid)"/> grandchildren: <xsl:text/>
+	<xsl:for-each select="gkid">
+		<xsl:value-of select="key('KidInfo',.)/Name/@First"/>
+		<xsl:if test="not(position()=last())">, </xsl:if>
+		<xsl:if test="(position()=last()-1)">and </xsl:if>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template match="GrandKids" mode="doc">
+They got <xsl:value-of select="count(document('MinitestDocument.xml')/GrandKids/gkid)"/> grandchildren: <xsl:text/>
+	<xsl:for-each select="document('MinitestDocument.xml')/GrandKids/gkid">
+		<xsl:value-of select="key('KidInfo',(.))/Name/@First"/>
+		<xsl:if test="not(position()=last())">, </xsl:if>
+		<xsl:if test="(position()=last()-1)">and </xsl:if>
+	</xsl:for-each>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/MinitestInclude.xsl	2015-01-09 15:41:57.383149236 -0800
@@ -0,0 +1,67 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: MinitestInclude.xsl -->
+<!-- Author: Paul_Dick@lotus.com -->
+
+<xsl:template name="tree">
+   <xsl:param name="Surname" select="Default"/>
+
+   <xsl:comment> Create an simplified output tree for each family </xsl:comment><xsl:text>&#10;   </xsl:text>
+   <xsl:element name="{$root}">
+   <xsl:element name="{substring-after($Surname,'The ')}">
+
+       <!-- Start with the Parents.-->
+	   <xsl:element name="Parents">
+	   <xsl:for-each select="Parents/Father | Parents/Mother">
+		  <xsl:element name="{name(.)}">
+		     <xsl:value-of select="."/>
+		  </xsl:element>
+	   </xsl:for-each>
+	   </xsl:element>
+
+	   <!-- Then the Children. -->
+       <xsl:element name="Children">
+	   <xsl:attribute name="number">
+	      <xsl:value-of select="count(Children/Child)"/>
+	   </xsl:attribute>
+	   <xsl:for-each select="Children/Child">
+		     <xsl:element name="{Personal_Information/Sex}">
+
+			  <xsl:attribute name="name">
+			     <xsl:value-of select="Basic_Information/Name/@First"/>
+			  </xsl:attribute>
+			  <xsl:choose>
+			  <xsl:when test="Personal_Information/Sex='Male'">
+				<xsl:attribute name="wife">
+					<xsl:value-of select="Personal_Information/Family_Information/Wife/Name/@First"/>
+				</xsl:attribute>
+			  </xsl:when>
+			  <xsl:when test="Personal_Information/Sex='Female'">
+				<xsl:attribute name="husband">
+					<xsl:value-of select="Personal_Information/Family_Information/Husband/Name/@First"/>
+				</xsl:attribute>
+			  </xsl:when>
+			  </xsl:choose>
+
+			  <xsl:attribute name="kids">
+				  <xsl:value-of select="count(Personal_Information/Family_Information/Kids/Kid)"/>
+			  </xsl:attribute>				
+
+			  <xsl:if test="count(Personal_Information/Family_Information/Kids/Kid)">
+			     <xsl:element name="Kids">
+			        <xsl:for-each select="Personal_Information/Family_Information/Kids/Kid">
+			           <xsl:element name="Grandkid"><xsl:value-of select="Name/@First"/></xsl:element>
+			        </xsl:for-each>
+			     </xsl:element>
+			  </xsl:if>
+			   
+			  <xsl:value-of select="Basic_Information/Name/@First"/>
+			 </xsl:element>
+	   </xsl:for-each>
+	   </xsl:element>
+
+   </xsl:element>
+   </xsl:element>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/SimpleImport.xsl	2015-01-09 15:41:57.651149654 -0800
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SimpleImport.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for StreamSource APIs. -->
+
+<xsl:template match="list">
+  <import-list>
+    <xsl:apply-templates/>
+  </import-list>
+</xsl:template>
+
+<xsl:template match="item[@match-by='import']">
+  <matched-by-import>
+    <xsl:value-of select="." />
+  </matched-by-import>
+</xsl:template>
+
+<xsl:template match="item">
+  <matched-by-import-also>
+    <xsl:value-of select="." />
+  </matched-by-import-also>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/SimpleInclude.xsl	2015-01-09 15:41:57.924150080 -0800
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SimpleInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for StreamSource APIs. -->
+
+<xsl:template match="list">
+  <include-list>
+    <xsl:apply-imports/>
+  </include-list>
+</xsl:template>
+
+<xsl:template match="item[@match-by='include']">
+  <matched-by-include>
+    <xsl:value-of select="." />
+  </matched-by-include>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/StreamImpIncl.xml	2015-01-09 15:41:58.193150500 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+  <list>
+    <item>Above Should be include-list then import-list</item>
+    <item match-by="import">Should be matched-by-import</item>
+    <item match-by="include">Should be matched-by-include</item>
+    <item match-by="main">Should be matched-by-import-also</item>
+    <list>
+      <item>Should be matched-by-main</item>
+      <item>Should be matched-by-main</item>
+    </list>
+  </list>
+</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/StreamImpIncl.xsl	2015-01-09 15:41:58.461150918 -0800
@@ -0,0 +1,28 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: StreamImpIncl.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for StreamSource APIs. -->
+
+<xsl:import href="impincl/SimpleImport.xsl"/>
+<xsl:include href="impincl/SimpleInclude.xsl"/>
+
+<xsl:template match="doc">
+ <out>
+  <xsl:apply-templates/>
+ </out>
+</xsl:template>
+
+<xsl:template match="list" priority="-1">
+ <main-list>
+  <xsl:apply-templates/>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+  <matched-by-main>
+    <xsl:value-of select="." />
+  </matched-by-main>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/SystemIdImport.xsl	2015-01-09 15:41:58.734151344 -0800
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+
+<xsl:template match="list">
+  <import-list-level1>
+    <xsl:apply-templates/>
+  </import-list-level1>
+</xsl:template>
+
+<xsl:template match="item[@match-by='import']">
+  <matched-by-import-level1>
+    <xsl:value-of select="." />
+  </matched-by-import-level1>
+</xsl:template>
+
+<xsl:template match="item">
+  <matched-by-import-also-level1>
+    <xsl:value-of select="." />
+  </matched-by-import-also-level1>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/SystemIdInclude.xsl	2015-01-09 15:41:59.007151770 -0800
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+
+<xsl:template match="list">
+  <include-list-level1>
+    <xsl:apply-imports/>
+  </include-list-level1>
+</xsl:template>
+
+<xsl:template match="item[@match-by='include']">
+  <matched-by-include-level1>
+    <xsl:value-of select="." />
+  </matched-by-include-level1>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/citiesinclude.xsl	2015-01-09 15:41:59.271152182 -0800
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:include href="../cities.xsl"/>
+</xsl:stylesheet>
+
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/impincl/SimpleImport.xsl	2015-01-09 15:41:59.528152583 -0800
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SimpleImport.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for StreamSource APIs. -->
+
+<xsl:template match="list">
+  <import-list>
+    <xsl:apply-templates/>
+  </import-list>
+</xsl:template>
+
+<xsl:template match="item[@match-by='import']">
+  <matched-by-import>
+    <xsl:value-of select="." />
+  </matched-by-import>
+</xsl:template>
+
+<xsl:template match="item">
+  <matched-by-import-also>
+    <xsl:value-of select="." />
+  </matched-by-import-also>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/impincl/impincl/SimpleInclude.xsl	2015-01-09 15:41:59.795153000 -0800
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SimpleInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests for StreamSource APIs. -->
+
+<xsl:template match="list">
+  <include-list>
+    <xsl:apply-imports/>
+  </include-list>
+</xsl:template>
+
+<xsl:template match="item[@match-by='include']">
+  <matched-by-include>
+    <xsl:value-of select="." />
+  </matched-by-include>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/systemid/impincl/EmbeddedRelative.xsl	2015-01-09 15:42:00.077153440 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: EmbeddedRelative.xsl -->
+  <xsl:template match="/list">
+    <embedded-relative-level2>
+      <xsl:apply-templates select="@*|node()"/>
+    </embedded-relative-level2>
+  </xsl:template>
+
+  <xsl:template match="item">
+      <xsl:copy>
+        <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/systemid/impincl/SystemIdImport.xsl	2015-01-09 15:42:00.335153843 -0800
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+
+<xsl:template match="list">
+  <import-list-level2>
+    <xsl:apply-templates/>
+  </import-list-level2>
+</xsl:template>
+
+<xsl:template match="item[@match-by='import']">
+  <matched-by-import-level2>
+    <xsl:value-of select="." />
+  </matched-by-import-level2>
+</xsl:template>
+
+<xsl:template match="item">
+  <matched-by-import-also-level2>
+    <xsl:value-of select="." />
+  </matched-by-import-also-level2>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/systemid/impincl/SystemIdInclude.xsl	2015-01-09 15:42:00.594154247 -0800
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+
+<xsl:template match="list">
+  <include-list-level2>
+    <xsl:apply-imports/>
+  </include-list-level2>
+</xsl:template>
+
+<xsl:template match="item[@match-by='include']">
+  <matched-by-include-level2>
+    <xsl:value-of select="." />
+  </matched-by-include-level2>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xml/baz.xml	2015-01-09 15:42:00.915154748 -0800
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<foo:document 
+		  xmlns:foo="http://apache.org/foo"
+		  xmlns:bar="http://apache.org/bar">
+<bar:element>MyBaz</bar:element>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xml/foo.xml	2015-01-09 15:42:01.191155178 -0800
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?>
+<foo:document 
+		  xmlns:foo="http://apache.org/foo"
+		  xmlns:bar="http://apache.org/bar"
+		  file-name="test"
+         file-path="work"
+		  creation-date="971255692078">
+<bar:element>MyBar</bar:element>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xml/subdir1/foo2.xml	2015-01-09 15:42:01.458155595 -0800
@@ -0,0 +1,2 @@
+<?xml version='1.0'?>
+<doc>text in foo2.xml</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xml/subdir1/subdir2/foo3.xml	2015-01-09 15:42:01.731156021 -0800
@@ -0,0 +1,2 @@
+<?xml version='1.0'?>
+<doc>text in foo3.xml</doc>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xsl/baz.xsl	2015-01-09 15:42:02.048156516 -0800
@@ -0,0 +1,18 @@
+<xsl:stylesheet 
+      xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+    
+  <!-- same as foo.xsl but doesn't include the param because of a bug -->  
+  <xsl:template match="/">
+    <out>
+      <xsl:apply-templates/>
+    </out>
+  </xsl:template>
+      
+  <xsl:template 
+      match="@*|*|text()|processing-instruction()">
+    <xsl:copy>
+      <xsl:apply-templates 
+         select="@*|*|text()|processing-instruction()"/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xsl/foo.xsl	2015-01-09 15:42:02.317156936 -0800
@@ -0,0 +1,27 @@
+<xsl:stylesheet 
+      xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'
+      xmlns:bar="http://apache.org/bar"
+      exclude-result-prefixes="bar">
+      
+  <xsl:include href="inc1/inc1.xsl"/>
+      
+  <xsl:param name="a-param">default param value</xsl:param>
+  
+  <xsl:template match="bar:element">
+    <bar>
+      <param-val>
+        <xsl:value-of select="$a-param"/><xsl:text>, </xsl:text>
+        <xsl:value-of select="$my-var"/>
+      </param-val>
+      <data><xsl:apply-templates/></data>
+    </bar>
+  </xsl:template>
+      
+  <xsl:template 
+      match="@*|*|text()|processing-instruction()">
+    <xsl:copy>
+      <xsl:apply-templates 
+         select="@*|*|text()|processing-instruction()"/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xsl/foo2.xsl	2015-01-09 15:42:02.598157374 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:bar="http://apache.org/bar">
+  
+  <xsl:template match="bar">
+    <out>
+      <xsl:value-of select="."/>
+    </out>
+  </xsl:template>
+  
+  <xsl:template match="text()">
+  </xsl:template>  
+ 
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xsl/foo3.xsl	2015-01-09 15:42:02.860157783 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  
+  <xsl:template match="out">
+    <out>
+      <xsl:apply-templates/>
+    </out>
+  </xsl:template>
+  
+  <xsl:template match="text()">
+    <some-text><xsl:value-of select="."/></some-text>
+  </xsl:template>  
+   
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xsl/inc1/inc1.xsl	2015-01-09 15:42:03.128158202 -0800
@@ -0,0 +1,6 @@
+<xsl:stylesheet 
+      xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+      
+  <xsl:include href="inc2/inc2.xsl"/>
+  
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/content/xsl/inc1/inc2/inc2.xsl	2015-01-09 15:42:03.408158639 -0800
@@ -0,0 +1,4 @@
+<xsl:stylesheet 
+      xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+  <xsl:variable name="my-var" select="'text from my-var in inc2.xsl'"/>
+</xsl:stylesheet>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/dom/DOMResultAPITest.java	2015-01-09 15:42:03.687159074 -0800
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.dom;
+
+import java.io.FilePermission;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareSerializeDOMWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+
+/**
+ *
+ * API Coverage test for the DOMResult class of TRAX.
+ */
+public class DOMResultAPITest extends JAXPBaseTest {
+    /**
+     * Basic API coverage, constructor and set/get methods.
+     * 
+     * @throws ParserConfigurationException in case of ServiceConfigurationError
+     *         service configuration error or if the implementation is not 
+     *         available or cannot be instantiated.
+     */
+    @Test
+    public void testCase1() throws ParserConfigurationException {
+        // Default no-arg ctor sets nothing (but needs special test for
+        //  creating new doc when being transformed)
+        DOMResult defaultDOM = new DOMResult();
+        assertNull(defaultDOM.getNode());
+        assertNull(defaultDOM.getSystemId());
+
+        // ctor(Node) with a simple node
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node n = docBuilder.newDocument();
+        DOMResult nodeDOM = new DOMResult(n);
+        assertEquals(nodeDOM.getNode(), n);
+        assertNull(nodeDOM.getSystemId());
+
+        DOMResult nodeDOMid = new DOMResult(n, "this-is-system-id");
+        assertEquals(nodeDOMid.getNode(), n);
+        assertEquals(nodeDOMid.getSystemId(), "this-is-system-id");
+
+        DOMResult wackyDOM = new DOMResult();
+        Node n2 = docBuilder.newDocument();
+        wackyDOM.setNode(n2);
+        assertEquals(wackyDOM.getNode(), n2);
+
+        wackyDOM.setSystemId("another-system-id");
+        assertEquals(wackyDOM.getSystemId(), "another-system-id");
+    }
+    
+    /**
+     * Basic functionality of DOMResults.
+     * Test 'blank' Result; reuse Results; swap Nodes; etc.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase2() throws Exception {
+        setPermissions(new FilePermission(System.getProperty("user.dir") + "/-",
+                    "read, write"),
+                new FilePermission(System.getProperty("test.src") + "/-",
+                    "read"));
+        String xslURI = filenameToURL(XML_DIR + "DOMTest.xsl");
+        String xmlURI = filenameToURL(XML_DIR + "DOMTest.xml");
+        String goldFile = GOLDEN_DIR + "DOMTest.out";
+
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslNode = docBuilder.parse(new InputSource(xslURI));
+        Node xmlNode = docBuilder.parse(new InputSource(xmlURI));
+
+        // Try to get templates, transformer from node
+        DOMSource xslSource = new DOMSource(xslNode);
+        Templates templates = factory.newTemplates(xslSource);
+        DOMSource xmlSource = new DOMSource(xmlNode);
+
+        // Transforming into a DOMResult with a node is already
+        //  well covered in DOMSourceAPITest and elsewhere
+        // Verify a 'blank' Result object gets filled up properly
+        DOMResult blankResult = new DOMResult();
+        Transformer transformer = templates.newTransformer();
+        transformer.transform(xmlSource, blankResult);
+        Node blankNode = blankResult.getNode();
+        assertNotNull(blankNode);
+        assertTrue(compareSerializeDOMWithGold(goldFile, blankNode));
+
+        // Reuse the same result for multiple transforms
+        DOMResult reuseResult1 = new DOMResult(docBuilder.newDocument());
+        transformer = templates.newTransformer();
+        transformer.transform(xmlSource, reuseResult1);
+        Node reuseNode = reuseResult1.getNode();
+        assertTrue(compareSerializeDOMWithGold(goldFile, reuseNode));
+        
+        // So far it throws Exception as follows if you use same DOMResult:
+        // org.w3c.dom.DOMException: HIERARCHY_REQUEST_ERR: An attempt was made 
+        // to insert a node where it is not permitted.
+        DOMResult reuseResult2 = new DOMResult(docBuilder.newDocument());
+        transformer = templates.newTransformer();
+        transformer.transform(xmlSource, reuseResult2);
+        reuseNode = reuseResult2.getNode();
+        assertTrue(compareSerializeDOMWithGold(goldFile, reuseNode));
+    }
+}
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/dom/DOMSourceAPITest.java	2015-01-09 15:42:03.960159500 -0800
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.dom;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.compareSerializeDOMWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+
+/**
+ * API Coverage test for the DOMSource class of TRAX.
+ */
+public class DOMSourceAPITest extends JAXPFileBaseTest {
+    /**
+     * Basic API coverage, constructor and set/get methods.
+     * 
+     * @throws ParserConfigurationException if  the implementation is not 
+     *         available or cannot be instantiated.
+     */
+    @Test
+    public void testCase1() throws ParserConfigurationException {
+        // Default no-arg ctor sets nothing (but needs special test for
+        //  creating new doc when being transformed)
+        DOMSource defaultDOM = new DOMSource();
+        assertNull(defaultDOM.getNode());
+        assertNull(defaultDOM.getSystemId());
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node n = docBuilder.newDocument();
+        DOMSource nodeDOM = new DOMSource(n);
+        assertEquals(nodeDOM.getNode(), n);
+        assertNull(nodeDOM.getSystemId());
+
+        DOMSource nodeDOMid = new DOMSource(n, "this-is-system-id");
+        assertEquals(nodeDOMid.getNode(), n);
+        assertEquals(nodeDOMid.getSystemId(), "this-is-system-id");
+
+        DOMSource wackyDOM = new DOMSource();
+        Node n2 = docBuilder.newDocument();
+        wackyDOM.setNode(n2);
+        assertEquals(wackyDOM.getNode(), n2);
+
+        wackyDOM.setSystemId("another-system-id");
+        assertEquals(wackyDOM.getSystemId(), "another-system-id");
+    }
+
+    /**
+     * newTemplates on empty DOMSource throws TransformerConfigurationException.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test(expectedExceptions = TransformerConfigurationException.class)
+    public void negativeTestCase21() throws Exception {
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        // A blank DOM as an input stylesheet - what should happen?
+        DOMSource blankXSLDOM = new DOMSource();
+        factory.newTemplates(blankXSLDOM);
+    }
+
+    /**
+     * newTransformer on empty DOMSource throws TransformerConfigurationException.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test(expectedExceptions = TransformerConfigurationException.class)
+    public void negativeTestCase22() throws Exception {
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        // A blank DOM as an input stylesheet - what should happen?
+        DOMSource blankXSLDOM = new DOMSource();
+        factory.newTransformer(blankXSLDOM);
+    }
+
+    /**
+     * Validation with DOMSource on TransformerException.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test(expectedExceptions = TransformerException.class)
+    public void negativeTestCase24() throws Exception {
+        String xslFile = XML_DIR + "DOMImpIncl.xsl";
+        String xslImpInclURI = filenameToURL(xslFile);
+        String xmlFile = XML_DIR + "DOMImpIncl.xml";
+        String xmlImpInclURI = filenameToURL(xmlFile);
+
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslImpInclNode = docBuilder.parse(new InputSource(xslImpInclURI));
+        Node xmlImpInclNode = docBuilder.parse(new InputSource(xmlImpInclURI));
+
+        DOMSource xslDOM = new DOMSource(xslImpInclNode);
+        Transformer transformerXSL = factory.newTransformer(xslDOM);
+        DOMSource xmlDOM = new DOMSource(xmlImpInclNode);
+        DOMResult emptyResult = new DOMResult();
+        transformerXSL.transform(xmlDOM, emptyResult);
+    }
+
+    /**
+     * Blank DOMSource should parse without error.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test
+    public void positiveTestCase21() throws Exception {
+        String xslURI = filenameToURL(XML_DIR + "DOMTest.xsl");
+        String xmlURI = filenameToURL(XML_DIR + "DOMTest.xml");
+        String goldFile = GOLDEN_DIR + "DOMTest.out";
+
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslNode = docBuilder.parse(new InputSource(xslURI));
+        Node xmlNode = docBuilder.parse(new InputSource(xmlURI));
+        // Try to get templates, transformerXSL from node
+        DOMSource xslDOM = new DOMSource(xslNode);
+        Templates templates = factory.newTemplates(xslDOM);
+        assertNotNull(templates);
+        Transformer transformerXSL = factory.newTransformer(xslDOM);
+        assertNotNull(transformerXSL);
+
+        // A blank DOM as an output of the transform - should auto-create a 
+        // source Document
+        DOMSource xmlDOM = new DOMSource(xmlNode);
+        Node outNode = docBuilder.newDocument();
+        DOMResult outResult = new DOMResult(outNode);
+        transformerXSL.transform(xmlDOM, outResult);
+        outNode = outResult.getNode();
+        assertNotNull(outNode);
+        assertTrue(compareSerializeDOMWithGold(goldFile, outNode));
+    }
+
+    /**
+     * Validate DOMSource setting with systemid. 
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void positiveTestCase22() throws Exception {
+        String xslImpInclFile = XML_DIR + "DOMImpIncl.xsl";
+        String xslImpInclURI = filenameToURL(xslImpInclFile);
+        String xmlImpInclFile = XML_DIR + "DOMImpIncl.xml";
+        String xmlImpInclURI = filenameToURL(xmlImpInclFile);
+        String goldImpInclFile = GOLDEN_DIR + "DOMImpIncl.out";
+
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslImpInclNode = docBuilder.parse(new InputSource(xslImpInclURI));
+        Node xmlImpInclNode = docBuilder.parse(new InputSource(xmlImpInclURI));
+
+        DOMSource xslDOM = new DOMSource(xslImpInclNode);
+        // Note that inputName, xmlName are already URL'd
+        xslDOM.setSystemId(xslImpInclURI);
+        Transformer transformerXSL = factory.newTransformer(xslDOM);
+        DOMSource xmlDOM = new DOMSource(xmlImpInclNode);
+        // Do we really need to set SystemId on both XML and XSL?
+        xmlDOM.setSystemId(xmlImpInclFile);
+        DOMResult emptyResult = new DOMResult();
+        transformerXSL.transform(xmlDOM, emptyResult);
+        Node outNode = emptyResult.getNode();
+        assertNotNull(outNode);
+        assertTrue(compareSerializeDOMWithGold(goldImpInclFile, outNode));
+    }
+
+    /**
+     * Validate simple transform on DOMSource.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void positiveTestCase23() throws Exception {
+        String xslURI = filenameToURL(XML_DIR + "DOMTest.xsl");
+        String xmlURI = filenameToURL(XML_DIR + "DOMTest.xml");
+        String goldFile = GOLDEN_DIR + "DOMTest.out";
+
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslNode = docBuilder.parse(new InputSource(xslURI));
+        Node xmlNode = docBuilder.parse(new InputSource(xmlURI));
+        // Try to get templates, transformerXSL from node
+        DOMSource xslDOM = new DOMSource(xslNode);
+        Templates templates = factory.newTemplates(xslDOM);
+        assertNotNull(templates);
+        Transformer transformerXSL = factory.newTransformer(xslDOM);
+        assertNotNull(transformerXSL);
+
+        // A simple DOM-DOM-DOM transform
+        DOMSource xmlDOM = new DOMSource(xmlNode);
+        Node outNode = docBuilder.newDocument();
+        DOMResult outDOM = new DOMResult(outNode);
+        transformerXSL.transform(xmlDOM, outDOM);
+        Node gotNode = outDOM.getNode();
+        assertNotNull(gotNode);
+        assertTrue(compareSerializeDOMWithGold(goldFile, gotNode));
+    }
+
+    /**
+     * Test re-usage source for the stylesheet. It expects same result.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test
+    public void testCase3() throws Exception {
+        String xslFile = XML_DIR + "DOMTest.xsl";
+        String xmlFile = XML_DIR + "DOMTest.xml";
+        String goldFile = GOLDEN_DIR + "DOMTest.out";
+
+        String xslImpInclFile = XML_DIR + "DOMImpIncl.xsl";
+        String xmlImpInclFile = XML_DIR + "DOMImpIncl.xml";
+        String goldImpInclFile = GOLDEN_DIR + "DOMImpIncl.out";
+
+        // Startup a factory, create some nodes/DOMs
+        TransformerFactory factory = TransformerFactory.newInstance();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+        Node xslNode = docBuilder.parse(new InputSource(xslFile));
+        Node xmlNode = docBuilder.parse(new InputSource(xmlFile));
+        Node xslImpInclNode = docBuilder.parse(new InputSource(xslImpInclFile));
+        Node xmlImpInclNode = docBuilder.parse(new InputSource(xmlImpInclFile));
+
+        // Re-use DOMSource for stylesheet
+        DOMSource xmlSource1 = new DOMSource(xmlNode);
+        DOMResult result1 = new DOMResult(docBuilder.newDocument());
+        DOMSource xslSource = new DOMSource(xslNode);
+        Transformer transformer1 = factory.newTransformer(xslSource);
+        transformer1.transform(xmlSource1, result1);
+        Node node1 = result1.getNode();
+        assertTrue(compareSerializeDOMWithGold(goldFile, node1));
+        // Use same Source for the stylesheet
+        DOMSource xmlSource2 = new DOMSource(xmlNode);
+        DOMResult result2 = new DOMResult(docBuilder.newDocument());
+        Transformer transformer2 = factory.newTransformer(xslSource);
+        transformer2.transform(xmlSource2, result2);
+        Node node2 = result2.getNode();
+        assertTrue(compareSerializeDOMWithGold(goldFile, node2));
+
+        // Re-use DOMSource for XML doc; with the same stylesheet
+        DOMResult result3 = new DOMResult(docBuilder.newDocument());
+        Transformer transformer3 = factory.newTransformer(xslSource);
+        transformer3.transform(xmlSource2, result3);
+        Node node3 = result3.getNode();
+        assertTrue(compareSerializeDOMWithGold(goldFile, node3));
+
+        // Re-use DOMSource after setNode to different one
+        DOMSource xmlSource = new DOMSource(xmlNode);
+        // Use same Sources, but change Nodes for xml,xsl
+        xmlSource.setNode(xmlImpInclNode);
+        xmlSource.setSystemId(xmlImpInclFile);
+        xslSource.setNode(xslImpInclNode);
+        xslSource.setSystemId(xslImpInclFile);
+        transformer2 = factory.newTransformer(xslSource);
+        result2 = new DOMResult(docBuilder.newDocument());
+        transformer2.transform(xmlSource, result2);
+        node2 = result2.getNode();
+        assertTrue(compareSerializeDOMWithGold(goldImpInclFile, node2));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/DOMImpIncl.out	2015-01-09 15:42:04.239159936 -0800
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><out>
+  <include-list><import-list>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-import>Should be matched-by-import</matched-by-import>
+    <matched-by-include>Should be matched-by-include</matched-by-include>
+    <matched-by-import-also>Should be matched-by-import-also</matched-by-import-also>
+    <include-list><import-list>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list></include-list>
+  </import-list></include-list>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/DOMTest.out	2015-01-09 15:42:04.534160396 -0800
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/EmbeddedFragment.out	2015-01-09 15:42:04.814160833 -0800
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<out>
+Hello
+	
+Goodbye
+	
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/EmbeddedRelative0.out	2015-01-09 15:42:05.094161270 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<embedded-relative-level0>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  
+</embedded-relative-level0>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/EmbeddedRelative1.out	2015-01-09 15:42:05.412161766 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<embedded-relative-level1>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  
+</embedded-relative-level1>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/EmbeddedRelative2.out	2015-01-09 15:42:05.717162242 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<embedded-relative-level2>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  
+</embedded-relative-level2>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/EmbeddedType.out	2015-01-09 15:42:05.989162667 -0800
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<embedded-type><item>Xalan-J 1.x</item><item>Xalan-J 2.x</item><item>Xalan-C 1.x</item></embedded-type>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ErrorListenerTest.out	2015-01-09 15:42:06.266163099 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list-out name="list1">
+  <item-out>warning(TransformerException)</item-out>
+  <item-out>error(TransformerException)</item-out>
+  <item-out>fatalError(TransformerException)</item-out>
+  <list-out name="list2">
+    <item-out>ErrorListener API's</item-out>
+    <item-out>Defined Above</item-out>
+  </list-out>
+</list-out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_1.out	2015-01-09 15:42:06.568163571 -0800
@@ -0,0 +1,4 @@
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl">
+<foo:document xmlns:bar="http://apache.org/bar" xmlns:foo="http://apache.org/foo" creation-date="971255692078" file-name="test" file-path="work">
+<bar:element>MyBar</bar:element>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_10.out	2015-01-09 15:42:06.853164016 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>hello to you!, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_11.out	2015-01-09 15:42:07.121164434 -0800
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar>
+<param-val>hello to me!, text from my-var in inc2.xsl</param-val>
+<data>MyBar</data>
+</bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_12.out	2015-01-09 15:42:07.394164860 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_13.out	2015-01-09 15:42:07.665165283 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBaz</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_14.out	2015-01-09 15:42:07.929165695 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar:element>MyBar</bar:element>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_15.out	2015-01-09 15:42:08.226166159 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_2.out	2015-01-09 15:42:08.497166582 -0800
@@ -0,0 +1,6 @@
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" creation-date="971255692078" file-name="test" file-path="work">
+<bar>
+<param-val>default param value, text from my-var in inc2.xsl</param-val>
+<data>MyBar</data>
+</bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_3.out	2015-01-09 15:42:08.794167045 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_4.out	2015-01-09 15:42:09.060167461 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_5.out	2015-01-09 15:42:09.331167884 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_6.out	2015-01-09 15:42:09.601168305 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_7.out	2015-01-09 15:42:09.872168728 -0800
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar>
+<param-val>default param value, text from my-var in inc2.xsl</param-val>
+<data>MyBar</data>
+</bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_8.out	2015-01-09 15:42:10.158169175 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/ExamplesTest_9.out	2015-01-09 15:42:10.510169724 -0800
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/Minitest-xalanj2.out	2015-01-09 15:42:10.786170155 -0800
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<out>
+<!-- Create an simplified output tree for each family -->
+   <Families>
+<Smith>
+<Parents>
+<Father>Lew Smith</Father>
+<Mother>Ruth Smith</Mother>
+</Parents>
+<Children number="5">
+<Male name="Andy" wife="Suzie" kids="2">
+<Kids>
+<Grandkid>Julie</Grandkid>
+<Grandkid>Daniel</Grandkid>
+</Kids>Andy</Male>
+<Male name="Thomas" wife="Margaret" kids="2">
+<Kids>
+<Grandkid>Joshua</Grandkid>
+<Grandkid>Lauren</Grandkid>
+</Kids>Thomas</Male>
+<Male name="Henry" wife="Elizbeth" kids="2">
+<Kids>
+<Grandkid>Nathaniel</Grandkid>
+<Grandkid>Samual</Grandkid>
+</Kids>Henry</Male>
+<Male name="Bruce" wife="Betsy" kids="3">
+<Kids>
+<Grandkid>Benjamin</Grandkid>
+<Grandkid>Lucy</Grandkid>
+<Grandkid>Jake</Grandkid>
+</Kids>Bruce</Male>
+<Male name="Joseph" wife="Lilla" kids="0">Joseph</Male>
+</Children>
+</Smith>
+</Families>
+The Smith
+The parents are: Lewis and Ruth Smith
+They have 9 grandchildren: Julie, Nathaniel, Joshua, Daniel, Samual, Lauren, Benjamin, Lucy, and Jake
+&#13;Andy Smith's phone number is 483-23-5432.
+He is 45. Andy is married to Suzie.
+Their children are Jules:9, and Daniel:8
+&#13;Bruce Smith's phone number is 213.457.2190.
+He is 38. Bruce is married to Betsy.
+Their children are Ben:5, Lucy:2, and Jake:1
+&#13;Henry Smith's phone number is 417.645.4954.
+He is 40. Henry is married to Beth.
+Their children are Nate:8, and Sam:7
+&#13;Joe Smith's phone number is 781.665.0539.
+He is 34. Joseph is married to Lilla.
+They have no kids
+			
+&#13;Tom Smith's phone number is 508.257.2754.
+He is 30. Thomas is married to Maggy.
+Their children are Joshua:7, and Lauren:5
+<!-- Create an simplified output tree for each family -->
+   <Families>
+<Westons>
+<Parents>
+<Father>Melvin Weston</Father>
+<Mother>Liz Harris</Mother>
+</Parents>
+<Children number="2">
+<Female name="Caroline" husband="" kids="0">Caroline</Female>
+<Female name="Betsy" husband="Bruce" kids="3">
+<Kids>
+<Grandkid>Benjamin</Grandkid>
+<Grandkid>Lucy</Grandkid>
+<Grandkid>Jake</Grandkid>
+</Kids>Betsy</Female>
+</Children>
+</Westons>
+</Families>
+The Westons
+The parents are: Melvin and Liz Harris
+They have 3 grandchildren: Benjamin, Lucy, and Jake
+&#13;Betsy Weston's phone number is 213.457.2190.
+She is 34. Betsy is married to Bruce.
+Their children are Ben:5, Lucy:2, and Jake:1
+&#13;Caroline Weston's phone number is 715.264.8205.
+She is 37. Caroline is not married. 
+		
+	</out>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/MinitestParam.out	2015-01-09 15:42:11.050170567 -0800
@@ -0,0 +1,3 @@
+
+ :param1s: 1234 :param2s: default2s :param3s: 
+ :param1n: new-param1n-value :param2n: 'default2n' :param3n: default3n
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/MinitestPerf.out	2015-01-09 15:42:11.316170982 -0800
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<out>
+<!-- Create an simplified output tree for each family -->
+   <Families>
+<Smith>
+<Parents>
+<Father>Lew Smith</Father>
+<Mother>Ruth Smith</Mother>
+</Parents>
+<Children number="5">
+<Male name="Andy" wife="Suzie" kids="2">
+<Kids>
+<Grandkid>Julie</Grandkid>
+<Grandkid>Daniel</Grandkid>
+</Kids>Andy</Male>
+<Male name="Thomas" wife="Margaret" kids="2">
+<Kids>
+<Grandkid>Joshua</Grandkid>
+<Grandkid>Lauren</Grandkid>
+</Kids>Thomas</Male>
+<Male name="Henry" wife="Elizbeth" kids="2">
+<Kids>
+<Grandkid>Nathaniel</Grandkid>
+<Grandkid>Samual</Grandkid>
+</Kids>Henry</Male>
+<Male name="Bruce" wife="Betsy" kids="3">
+<Kids>
+<Grandkid>Benjamin</Grandkid>
+<Grandkid>Lucy</Grandkid>
+<Grandkid>Jake</Grandkid>
+</Kids>Bruce</Male>
+<Male name="Joseph" wife="Lilla" kids="0">Joseph</Male>
+</Children>
+</Smith>
+</Families>
+The Smith
+The parents are: Lewis and Ruth Smith
+They have 9 grandchildren: Julie, Nathaniel, Joshua, Daniel, Samual, Lauren, Benjamin, Lucy, and Jake
+&#13;Andy Smith's phone number is 483-23-5432.
+He is 45. Andy is married to Suzie.
+Their children are Jules:9, and Daniel:8
+&#13;Bruce Smith's phone number is 213.457.2190.
+He is 38. Bruce is married to Betsy.
+Their children are Ben:5, Lucy:2, and Jake:1
+&#13;Henry Smith's phone number is 417.645.4954.
+He is 40. Henry is married to Beth.
+Their children are Nate:8, and Sam:7
+&#13;Joe Smith's phone number is 781.665.0539.
+He is 34. Joseph is married to Lilla.
+They have no kids
+			
+&#13;Tom Smith's phone number is 508.257.2754.
+He is 30. Thomas is married to Maggy.
+Their children are Joshua:7, and Lauren:5
+<!-- Create an simplified output tree for each family -->
+   <Families>
+<Westons>
+<Parents>
+<Father>Melvin Weston</Father>
+<Mother>Liz Harris</Mother>
+</Parents>
+<Children number="2">
+<Female name="Caroline" husband="" kids="0">Caroline</Female>
+<Female name="Betsy" husband="Bruce" kids="3">
+<Kids>
+<Grandkid>Benjamin</Grandkid>
+<Grandkid>Lucy</Grandkid>
+<Grandkid>Jake</Grandkid>
+</Kids>Betsy</Female>
+</Children>
+</Westons>
+</Families>
+The Westons
+The parents are: Melvin and Liz Harris
+They have 3 grandchildren: Benjamin, Lucy, and Jake
+&#13;Betsy Weston's phone number is 213.457.2190.
+She is 34. Betsy is married to Bruce.
+Their children are Ben:5, Lucy:2, and Jake:1
+&#13;Caroline Weston's phone number is 715.264.8205.
+She is 37. Caroline is not married. 
+		
+	</out>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/OutputPropertiesHTML.out	2015-01-09 15:42:11.580171394 -0800
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "this-is-doctype-public" "this-is-doctype-system">
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>title-tag:text</TITLE>xsl:text within HEAD tag</HEAD>
+<BODY>
+<P>P-tag:beginCDATA? or not?</P>
+<UL>
+<ul-tag>
+      
+<li-tag number="1">li-tag:one</li-tag>
+      
+<li-tag value="two">li-tag:two</li-tag>
+    
+</ul-tag>
+</UL><P>Fake 'p' element</P><P>@ &nbsp; ~ &copy; &Egrave;</P>
+</BODY>
+</HTML>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SAXImpIncl.out	2015-01-09 15:42:11.870171847 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<out>
+  <include-list><import-list>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-import>Should be matched-by-import</matched-by-import>
+    <matched-by-include>Should be matched-by-include</matched-by-include>
+    <matched-by-import-also>Should be matched-by-import-also</matched-by-import-also>
+    <include-list><import-list>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list></include-list>
+  </import-list></include-list>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SAXTest.out	2015-01-09 15:42:12.145172276 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SAXdtd.out	2015-01-09 15:42:12.413172695 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<out><head>Testing © entities an-xsl-entity here</head><list>
+  <item>Xalan-J© 1.x</item>
+  <item>Xalan-Jan-xml-entity 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan this is a CDATA section blah&lt;?&lt;!/&gt;blah documentation</item>
+    <item>Xalan  tests</item>
+  </list>
+</list></out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/StreamImpIncl.out	2015-01-09 15:42:12.691173129 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+  <include-list-level1><import-list-level1>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-main>This is SystemIdImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</matched-by-main>
+    <matched-by-import-level1>Should be matched-by-import</matched-by-import-level1>
+    <matched-by-include-level1>Should be matched-by-include</matched-by-include-level1>
+    <matched-by-import-also-level1>Should be matched-by-import-also</matched-by-import-also-level1>
+    <include-list-level1><import-list-level1>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list-level1></include-list-level1>
+  </import-list-level1></include-list-level1>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/StreamOutputFormat.out	2015-01-09 15:42:12.961173550 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE out PUBLIC "this-is-doctype-public" "this-is-doctype-system">
+<out>
+<cdataHere><![CDATA[CDATA? or not?]]></cdataHere>foo<cdataHere><![CDATA[CDATA? or not?]]></cdataHere>
+<out2>bar<selector>
+    <item number="1">one</item>
+    <item value="two">2</item>
+  </selector>
+</out2>
+</out>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SystemIdImpInclHttp.out	2015-01-09 15:42:13.243173991 -0800
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<out>
+  <include-list-level-http><import-list-level-http>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-main>This is SystemIdImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</matched-by-main>
+    <matched-by-import-level-http>Should be matched-by-import</matched-by-import-level-http>
+    <matched-by-include-level-http>Should be matched-by-include</matched-by-include-level-http>
+    <matched-by-import-also-level-http>Should be matched-by-import-also</matched-by-import-also-level-http>
+    <include-list-level-http><import-list-level-http>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list-level-http></include-list-level-http>
+  </import-list-level-http></include-list-level-http>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SystemIdImpInclLevel0.out	2015-01-09 15:42:13.545174462 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+  <include-list-level0><import-list-level0>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-main>This is SystemIdImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</matched-by-main>
+    <matched-by-import-level0>Should be matched-by-import</matched-by-import-level0>
+    <matched-by-include-level0>Should be matched-by-include</matched-by-include-level0>
+    <matched-by-import-also-level0>Should be matched-by-import-also</matched-by-import-also-level0>
+    <include-list-level0><import-list-level0>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list-level0></include-list-level0>
+  </import-list-level0></include-list-level0>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SystemIdImpInclLevel1.out	2015-01-09 15:42:13.816174885 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+  <include-list-level1><import-list-level1>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-main>This is SystemIdImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</matched-by-main>
+    <matched-by-import-level1>Should be matched-by-import</matched-by-import-level1>
+    <matched-by-include-level1>Should be matched-by-include</matched-by-include-level1>
+    <matched-by-import-also-level1>Should be matched-by-import-also</matched-by-import-also-level1>
+    <include-list-level1><import-list-level1>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list-level1></include-list-level1>
+  </import-list-level1></include-list-level1>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SystemIdImpInclLevel2.out	2015-01-09 15:42:14.092175316 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+  <include-list-level2><import-list-level2>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-main>This is SystemIdImpIncl.xml, used for setSystemId testing Note that different settings of systemIds will have different expected results!</matched-by-main>
+    <matched-by-import-level2>Should be matched-by-import</matched-by-import-level2>
+    <matched-by-include-level2>Should be matched-by-include</matched-by-include-level2>
+    <matched-by-import-also-level2>Should be matched-by-import-also</matched-by-import-also-level2>
+    <include-list-level2><import-list-level2>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list-level2></include-list-level2>
+  </import-list-level2></include-list-level2>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/SystemIdTest.out	2015-01-09 15:42:14.366175744 -0800
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Filename: SystemIdTest.xml --><list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/TransformerAPIHTMLFormat.out	2015-01-09 15:42:14.645176180 -0800
@@ -0,0 +1,19 @@
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>title-tag:text</TITLE>xsl:text within HEAD tag</HEAD>
+<BODY>
+<P>P-tag:beginCDATA? or not?<BR>
+<HR>
+</P>
+<UL>
+<ul-tag>
+      
+<li-tag number="1">li-tag:one</li-tag>
+      
+<li-tag value="two">li-tag:two</li-tag>
+    
+</ul-tag>
+</UL><P>Fake 'p' element</P><P>@ &nbsp; ~ &copy; &Egrave;</P>
+</BODY>
+</HTML>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/TransformerAPIOutputFormatUTF16.out	2015-01-09 15:42:14.919176607 -0800
@@ -0,0 +1,9 @@
+<!DOCTYPE out PUBLIC "this-is-doctype-public" "this-is-doctype-system">
+<out>
+<cdataHere><![CDATA[CDATA? or not?]]></cdataHere>foo<cdataHere><![CDATA[CDATA? or not?]]></cdataHere>
+<out2>bar<selector>
+    <item number="1">one</item>
+    <item value="two">2</item>
+  </selector>
+</out2>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/TransformerAPIParam.out	2015-01-09 15:42:15.226177087 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+ :param1s:'test-param-1s' :param2s:default2s :param3s:new value3s
+ :param1n:1234 :param2n:'default2n' :param3n:default3n
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/TransformerAPIVar.out	2015-01-09 15:42:15.509177529 -0800
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><out><item>TransformerAPIVar-original</item><item>Text and:TransformerAPIVar-original</item></out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/TransformerAPIVar2.out	2015-01-09 15:42:15.779177950 -0800
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><out><item>TransformerAPIVar2-changed</item><item>Text and:TransformerAPIVar2-changed</item></out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/URIResolverTest.out	2015-01-09 15:42:16.052178376 -0800
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><out><head>Various document() calls: 
+  
+    
+  
+, 
+  
+    
+  
+, 
+  
+    
+  
+.</head>
+  <include-list-level1><import-list-level1>
+    <matched-by-main>Above Should be include-list then import-list</matched-by-main>
+    <matched-by-main>This is URIResolverTest.xml!</matched-by-main>
+    <matched-by-import-level1>Should be matched-by-import</matched-by-import-level1>
+    <matched-by-include-level1>Should be matched-by-include</matched-by-include-level1>
+    <matched-by-import-also-level1>Should be matched-by-import-also</matched-by-import-also-level1>
+    <include-list-level1><import-list-level1>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+      <matched-by-main>Should be matched-by-main</matched-by-main>
+    </import-list-level1></include-list-level1>
+  </import-list-level1></include-list-level1>
+</out>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/baz.out	2015-01-09 15:42:16.330178811 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBaz</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/cities-indent-no.out	2015-01-09 15:42:16.604179238 -0800
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<countries><country name="France"><city>Paris</city><city>Nice</city><city>Lyon</city></country><country name="Italia"><city>Roma</city><city>Milano</city><city>Firenze</city><city>Napoli</city></country><country name="Espana"><city>Madrid</city><city>Barcelona</city></country></countries>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/cities-method-text.out	2015-01-09 15:42:16.868179651 -0800
@@ -0,0 +1 @@
+ParisNiceLyonRomaMilanoFirenzeNapoliMadridBarcelona
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/cities.out	2015-01-09 15:42:17.147180086 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><countries>
+<country name="France">
+<city>Paris</city>
+<city>Nice</city>
+<city>Lyon</city>
+</country>
+<country name="Italia">
+<city>Roma</city>
+<city>Milano</city>
+<city>Firenze</city>
+<city>Napoli</city>
+</country>
+<country name="Espana">
+<city>Madrid</city>
+<city>Barcelona</city>
+</country>
+</countries>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/citiesSerialized.out	2015-01-09 15:42:17.413180502 -0800
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<countries><country name="France"><city>Paris</city><city>Nice</city><city>Lyon</city></country><country name="Italia"><city>Roma</city><city>Milano</city><city>Firenze</city><city>Napoli</city></country><country name="Espana"><city>Madrid</city><city>Barcelona</city></country></countries>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/embeddedIdentity.out	2015-01-09 15:42:17.683180923 -0800
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="identity.xsl"?><list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/foo.out	2015-01-09 15:42:17.956181349 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/fooSAX.out	2015-01-09 15:42:18.268181837 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/fooSAX2.out	2015-01-09 15:42:18.538182258 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>default param value, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/identity.out	2015-01-09 15:42:18.833182719 -0800
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/output.out	2015-01-09 15:42:19.103183140 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?>
+<foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar>
+<param-val>default param value, text from my-var in inc2.xsl</param-val>
+<data>MyBar</data>
+</bar>
+</foo:document>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/param1.out	2015-01-09 15:42:19.436183660 -0800
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?><foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar><param-val>hello to you!, text from my-var in inc2.xsl</param-val><data>MyBar</data></bar>
+</foo:document>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/golden/param2.out	2015-01-09 15:42:19.759184165 -0800
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../xsl/foo.xsl"?>
+<foo:document xmlns:foo="http://apache.org/foo" xmlns:bar="http://apache.org/bar" file-name="test" file-path="work" creation-date="971255692078">
+<bar>
+<param-val>hello to me!, text from my-var in inc2.xsl</param-val>
+<data>MyBar</data>
+</bar>
+</foo:document>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/impincl/EmbeddedRelative.xml	2015-01-09 15:42:20.021184574 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="impincl/EmbeddedRelative.xsl"?>
+<list>
+  <item>Xalan-J 1.x</item>
+  <item>Xalan-J 2.x</item>
+  <item>Xalan-C 1.x</item>
+  <list>
+    <item>Xalan documentation</item>
+    <item>Xalan tests</item>
+  </list>
+</list>
\ No newline at end of file
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/impincl/EmbeddedRelative.xsl	2015-01-09 15:42:20.281184980 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!-- Filename: EmbeddedRelative.xsl -->
+  <xsl:template match="/list">
+    <embedded-relative-level1>
+      <xsl:apply-templates select="@*|node()"/>
+    </embedded-relative-level1>
+  </xsl:template>
+
+  <xsl:template match="item">
+      <xsl:copy>
+        <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+  </xsl:template>
+     
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/impincl/SystemIdImport.xsl	2015-01-09 15:42:20.543185389 -0800
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+
+<xsl:template match="list">
+  <import-list-level0>
+    <xsl:apply-templates/>
+  </import-list-level0>
+</xsl:template>
+
+<xsl:template match="item[@match-by='import']">
+  <matched-by-import-level0>
+    <xsl:value-of select="." />
+  </matched-by-import-level0>
+</xsl:template>
+
+<xsl:template match="item">
+  <matched-by-import-also-level0>
+    <xsl:value-of select="." />
+  </matched-by-import-also-level0>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/impincl/SystemIdInclude.xsl	2015-01-09 15:42:20.798185787 -0800
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <!-- FileName: SystemIdInclude.xsl -->
+  <!-- Author: shane_curcuru@lotus.com -->
+  <!-- Purpose: Basic import and include tests with differen systemId's. -->
+
+<xsl:template match="list">
+  <include-list-level0>
+    <xsl:apply-imports/>
+  </include-list-level0>
+</xsl:template>
+
+<xsl:template match="item[@match-by='include']">
+  <matched-by-include-level0>
+    <xsl:value-of select="." />
+  </matched-by-include-level0>
+</xsl:template>
+
+</xsl:stylesheet>
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/sax/SAXResultAPITest.java	2015-01-09 15:42:21.108186271 -0800
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.sax;
+
+import java.io.FileOutputStream;
+import java.io.FilePermission;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import org.apache.qetest.xsl.CheckingContentHandler;
+import org.apache.qetest.xsl.CheckingLexicalHandler;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.fail;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.Test;
+import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * API Coverage test for the SAXResult class of TRAX.
+ */
+public class SAXResultAPITest extends JAXPBaseTest {
+
+    /**
+     * Nonsense systemId for various tests.
+     */
+    private static final String NONSENSE_SYSTEMID = "file:///nonsense-system-id";
+
+    /**
+     * Basic API coverage, constructor and set/get methods.
+     *
+     * @throws TransformerConfigurationException Thrown in case of 
+     *         ServiceConfigurationError service configuration error or if the
+     *         implementation is not available or cannot be instantiated.
+     */
+    @Test
+    public void testCase1() throws TransformerConfigurationException {
+
+        // Default no-arg ctor sets nothing
+        SAXResult defaultSAX = new SAXResult();
+        assertNull(defaultSAX.getHandler());
+        assertNull(defaultSAX.getLexicalHandler());
+        assertNull(defaultSAX.getSystemId());
+
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        // ctor(Handler) with identity transformer, which is both
+        //  a ContentHandler and LexicalHandler  
+        ContentHandler handler = (ContentHandler) saxFactory.newTransformerHandler();
+        SAXResult handlerSAX = new SAXResult(handler);
+        assertSame(handlerSAX.getHandler(), handler);
+        assertNull(handlerSAX.getLexicalHandler());
+        assertNull(handlerSAX.getSystemId());
+
+        // ctor(Handler) with LoggingContentHandler, which not
+        //  a LexicalHandler, so it can't be cast
+        ContentHandler nonLexHandler = new CheckingContentHandler();
+        SAXResult otherHandlerSAX = new SAXResult(nonLexHandler);
+        assertSame(otherHandlerSAX.getHandler(), nonLexHandler);
+        assertNull(otherHandlerSAX.getLexicalHandler());
+        assertNull(otherHandlerSAX.getSystemId());
+
+        // Note the Javadoc in SAXResult which talks about
+        //  automatically casting the ContentHandler into
+        //  a LexicalHandler: this cannot be tested alone
+        //  here, since it's the Transformer that does that
+        //  internally if necessary, and it may not get set
+        //  back into the SAXResult object itself
+        // set/getHandler API coverage
+        SAXResult wackySAX = new SAXResult();
+        wackySAX.setHandler(handler); // isa LexicalHandler also
+        assertSame(wackySAX.getHandler(), handler);
+        assertNull(wackySAX.getLexicalHandler());
+
+        // set/getLexicalHandler API coverage
+        LexicalHandler lexHandler = new CheckingLexicalHandler();
+        wackySAX.setLexicalHandler(lexHandler); // SCUU4SPPMV - does not work
+        assertSame(wackySAX.getLexicalHandler(), lexHandler);
+        assertSame(wackySAX.getHandler(), handler);
+
+        // set/getHandler API coverage, setting to null, which
+        //  should work here but can't be used legally
+        wackySAX.setHandler(null);
+        assertNull(wackySAX.getHandler());
+        assertSame(wackySAX.getLexicalHandler(), lexHandler);
+
+        wackySAX.setLexicalHandler(null);
+        assertNull(wackySAX.getLexicalHandler());
+
+        // set/getSystemId API coverage
+        wackySAX.setSystemId(NONSENSE_SYSTEMID);
+        assertEquals(wackySAX.getSystemId(), NONSENSE_SYSTEMID);
+        wackySAX.setSystemId(null);
+        assertNull(wackySAX.getSystemId());
+
+    }
+    
+    /**
+     * Save system property for restoring.
+     */
+    @BeforeGroups (groups = {"accessLocalFiles"})
+    public void setFilePermissions() {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"),
+                new FilePermission(GOLDEN_DIR + "/-", "read"),
+                new FilePermission(USER_DIR + "-", "read, write"));
+    }
+   
+    /**
+     * Restore the system property.
+     */
+    @AfterGroups (groups = {"readLocalFiles"})
+    public void restoreFilePermissions() {
+        setPermissions();
+    }
+
+    /**
+     * Basic functionality of SAXResults.
+     * @throws Exception If any errors occur.
+     */
+    @Test(groups = {"accessLocalFiles"})
+    public void testCase2() throws Exception {
+        String xslFile = XML_DIR + "SAXTest.xsl";
+        String xmlFile = XML_DIR + "SAXTest.xml";
+        String goldFile = GOLDEN_DIR + "SAXTest.out";
+        String outputFile = USER_DIR + "SAXTest_02.out";
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+            Templates streamTemplates = saxFactory.newTemplates(new StreamSource(filenameToURL(xslFile)));
+            // Use a TransformerHandler for serialization: this
+            //  supports ContentHandler and can replace the
+            //  Xalan/Xerces specific Serializers we used to use
+            TransformerHandler tHandler = saxFactory.newTransformerHandler();
+            tHandler.setResult(new StreamResult(fos));
+            SAXResult saxResult = new SAXResult(tHandler);
+
+            // Just do a normal transform to this result
+            Transformer transformer = streamTemplates.newTransformer();
+            transformer.transform(new StreamSource(filenameToURL(xmlFile)), saxResult);
+        }
+        compareWithGold(goldFile, outputFile);
+    }
+
+    /**
+     * Detailed functionality of SAXResults: setLexicalHandler.
+     *
+     * @throws Exception If any errors occur.
+     */
+    @Test(groups = {"accessLocalFiles"})
+    public void testCase3() throws Exception {
+        String xslFile = XML_DIR + "SAXdtd.xsl";
+        String xmlFile = XML_DIR + "SAXdtd.xml";
+        String goldFile = GOLDEN_DIR + "SAXdtd.out";
+        String outputFile = USER_DIR + "SAXdtd.out";
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+            Templates streamTemplates = saxFactory.newTemplates(new StreamSource(filenameToURL(xslFile)));
+            TransformerHandler tHandler = saxFactory.newTransformerHandler();
+            tHandler.setResult(new StreamResult(fos));
+
+            SAXResult saxResult = new SAXResult();
+            // Add a contentHandler that logs out info about the transform, and
+            // that passes-through calls back to the original tHandler.
+            CheckingContentHandler lch = new CheckingContentHandler();
+            lch.setDefaultHandler(tHandler);
+            saxResult.setHandler(lch);
+
+            // Add a lexicalHandler that logs out info about the  transform, and
+            // that passes-through calls back to the original tHandler
+            CheckingLexicalHandler llh = new CheckingLexicalHandler(tHandler);
+            saxResult.setLexicalHandler(llh);
+
+            // Just do a normal transform to this result
+            Transformer transformer = streamTemplates.newTransformer();
+            transformer.transform(new StreamSource(filenameToURL(xmlFile)), saxResult);
+            fail("Excepted a TransformerException");
+        } catch (TransformerException expected) {}
+        compareWithGold(goldFile, outputFile);
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+            TransformerHandler tHandler = saxFactory.newTransformerHandler();
+            Result realResult = new StreamResult(fos);
+            tHandler.setResult(realResult);
+
+            SAXResult saxResult = new SAXResult();
+            CheckingContentHandler lch = new CheckingContentHandler();
+            lch.setDefaultHandler(tHandler);
+            saxResult.setHandler(lch);
+
+            CheckingLexicalHandler llh = new CheckingLexicalHandler(tHandler);
+            saxResult.setLexicalHandler(llh);
+
+            // Do an identityTransform to this result
+            Transformer identityTransformer = TransformerFactory.newInstance().newTransformer();
+            identityTransformer.transform(new StreamSource(filenameToURL(xmlFile)), saxResult);
+            fail("Excepted a TransformerException");
+        } catch (TransformerException expected) {}
+        compareWithGold(goldFile, outputFile);
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            // Validate a DOMSource to a logging SAXResult, as above
+            DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+            dfactory.setNamespaceAware(true);
+            DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+            Node xmlNode = docBuilder.parse(new InputSource(filenameToURL(xmlFile)));
+            SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+
+            // Have an actual handler that does the physical output
+            TransformerHandler tHandler = saxFactory.newTransformerHandler();
+            Templates streamTemplates = saxFactory.newTemplates(new StreamSource(filenameToURL(xslFile)));
+            tHandler.setResult(new StreamResult(fos));
+
+            SAXResult saxResult = new SAXResult();
+            // Add a contentHandler that logs out info about the
+            //  transform, and that passes-through calls back
+            //  to the original tHandler
+            CheckingContentHandler lch = new CheckingContentHandler();
+            lch.setDefaultHandler(tHandler);
+            saxResult.setHandler(lch);
+
+            // Add a lexicalHandler that logs out info about the
+            //  transform, and that passes-through calls back
+            //  to the original tHandler
+            CheckingLexicalHandler llh = new CheckingLexicalHandler(tHandler);
+            saxResult.setLexicalHandler(llh);
+
+            // Just do a normal transform to this result
+            streamTemplates.newTransformer().transform(new DOMSource(xmlNode), saxResult);
+            fail("Excepted a TransformerException");
+        } catch (TransformerException expected) {}
+        compareWithGold(goldFile, outputFile);
+    }
+
+    /**
+     * Negative test: SAXResult without a handler throws TransformerException.
+     *
+     * @throws TransformerException If an unrecoverable error occurs during the 
+     *         course of the transformation.
+     */
+    @Test(expectedExceptions = TransformerException.class)
+    public void negativeTransform() throws TransformerException {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"));
+        String xslFile = XML_DIR + "SAXTest.xsl";
+        String xmlFile = XML_DIR + "SAXTest.xml";
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        Templates streamTemplates = saxFactory.newTemplates(new StreamSource(filenameToURL(xslFile)));
+        // Just do a normal transform to this result
+        Transformer transformer = streamTemplates.newTransformer();
+        transformer.transform(new StreamSource(filenameToURL(xmlFile)), new SAXResult());
+        setPermissions();
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/sax/SAXSourceAPITest.java	2015-01-09 15:42:21.381186698 -0800
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.sax;
+
+import java.io.FileInputStream;
+import java.io.FilePermission;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+/**
+ * API Coverage test for the SAXSource class of TRAX.
+ */
+public class SAXSourceAPITest extends JAXPBaseTest {
+
+    /**
+     * Nonsense systemId for various tests.
+     */
+    private static final String NONSENSE_SYSTEMID = "file:///nonsense-system-id";
+
+    /**
+     * Basic API coverage, constructor and set/get methods.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    public void testCase1() throws Exception {
+        // Default no-arg ctor sets nothing (but needs special test for
+        // creating new doc when being transformed)
+        SAXSource defaultSAX = new SAXSource();
+        assertNull(defaultSAX.getInputSource());
+        assertNull(defaultSAX.getXMLReader());
+        assertNull(defaultSAX.getSystemId());
+        // ctor(InputSource) with an InputSource()
+        InputSource srcNoID = new InputSource();
+        SAXSource saxSrcNoID = new SAXSource(srcNoID);
+        assertEquals(saxSrcNoID.getInputSource(), srcNoID,
+                "SAXSource(new InputSource()) has InputSource: "
+                + saxSrcNoID.getInputSource());
+        assertNull(saxSrcNoID.getXMLReader());
+        assertNull(saxSrcNoID.getSystemId());
+
+        // ctor(InputSource) with an InputSource("sysId")
+        InputSource srcWithID = new InputSource(NONSENSE_SYSTEMID);
+        SAXSource saxSrcWithID = new SAXSource(srcWithID);
+        assertEquals(saxSrcWithID.getInputSource(), srcWithID);
+        assertNull(saxSrcWithID.getXMLReader());
+        assertEquals(saxSrcWithID.getSystemId(), NONSENSE_SYSTEMID);
+
+        // ctor(XMLReader, InputSource)
+        XMLReader reader2 = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        SAXSource saxSrcReaderID2 = new SAXSource(reader2, srcWithID);
+        assertEquals(saxSrcReaderID2.getInputSource(), srcWithID);
+        assertEquals(saxSrcReaderID2.getXMLReader(), reader2);
+        assertEquals(saxSrcReaderID2.getSystemId(), NONSENSE_SYSTEMID);
+
+        // ctor(XMLReader, InputSource)
+        // Be sure to use the JAXP methods only!
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        SAXParser saxParser = factory.newSAXParser();
+        XMLReader reader = saxParser.getXMLReader();
+        SAXSource saxSrcReaderID = new SAXSource(reader, srcWithID);
+        assertEquals(saxSrcReaderID.getInputSource(), srcWithID);
+        assertEquals(saxSrcReaderID.getXMLReader(), reader);
+        assertEquals(saxSrcReaderID.getSystemId(), NONSENSE_SYSTEMID);
+
+        // ctor(null InputSource) - note it won't actually
+        //  be able to be used as a Source in real life
+        SAXSource saxNullSrc = new SAXSource(null);
+        assertNull(saxNullSrc.getInputSource());
+        assertNull(saxNullSrc.getXMLReader());
+        assertNull(saxNullSrc.getSystemId());
+
+        // ctor(null Reader, null InputSource)
+        SAXSource saxNullSrc2 = new SAXSource(null, null);
+        assertNull(saxNullSrc2.getInputSource());
+        assertNull(saxNullSrc2.getXMLReader());
+        assertNull(saxNullSrc2.getSystemId());
+
+        // Validate various simple set/get methods
+        SAXSource wackySAX = new SAXSource();
+
+        // Validate setting systemId auto-creates InputSource
+        //  with that systemId
+        wackySAX.setSystemId(NONSENSE_SYSTEMID);
+        assertEquals(wackySAX.getSystemId(), NONSENSE_SYSTEMID);
+        assertNotNull(wackySAX.getInputSource());
+        InputSource newIS = wackySAX.getInputSource();
+        assertEquals(newIS.getSystemId(), NONSENSE_SYSTEMID);
+
+        // API Coverage set/getSystemId
+        wackySAX.setSystemId("another-system-id");
+        assertEquals(wackySAX.getSystemId(), "another-system-id");
+        InputSource gotIS = wackySAX.getInputSource();
+        assertEquals(gotIS.getSystemId(), "another-system-id");
+        // setting to null explicitly
+        wackySAX.setSystemId(null);
+        assertNull(wackySAX.getSystemId());
+        assertNull(wackySAX.getInputSource().getSystemId());
+
+        // API Coverage set/getInputSource
+        InputSource anotherIS = new InputSource(NONSENSE_SYSTEMID);
+        wackySAX.setInputSource(anotherIS);
+        assertEquals(wackySAX.getInputSource(), anotherIS);
+        assertEquals(wackySAX.getSystemId(), NONSENSE_SYSTEMID);
+
+        // API Coverage set/getXMLReader
+        assertNull(wackySAX.getXMLReader(), null);
+        // Be sure to use the JAXP methods only!
+        saxParser = factory.newSAXParser();
+        XMLReader wackyReader = saxParser.getXMLReader();
+        wackySAX.setXMLReader(wackyReader);
+        assertEquals(wackySAX.getXMLReader(), wackyReader);
+        wackySAX.setXMLReader(null);
+        assertNull(wackySAX.getXMLReader());
+
+    }
+
+    /**
+     * Basic functionality of SAXSources. Use them in simple transforms,
+     * with/without systemId set.
+     *
+     * @throws Exception If any errors occur.
+     */
+    public void testCase2() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"),
+                new FilePermission(USER_DIR + "-", "read, write"));
+        String xslURI = filenameToURL(XML_DIR + "SAXTest.xsl");
+        String xmlFile = XML_DIR + "SAXTest.xml";
+        String xmlURI = filenameToURL(XML_DIR + "SAXTest.xml");
+        String goldFile = GOLDEN_DIR + "SAXTest.out";
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        try (FileInputStream xmlFis = new FileInputStream(xmlFile);) {
+            Templates streamTemplates = saxFactory.newTemplates(new SAXSource(new InputSource(xslURI)));
+            assertNotNull(streamTemplates);
+
+            Transformer transformer1 = saxFactory.newTransformer(new SAXSource(new InputSource(xslURI)));
+            assertNotNull(transformer1);
+            // Validate process of a stylesheet using a simple SAXSource with a URL
+            SAXSource xslSAXSrc = new SAXSource(new InputSource(xslURI));
+            Templates templates = saxFactory.newTemplates(xslSAXSrc);
+            assertNotNull(templates);
+
+            xslSAXSrc = new SAXSource(new InputSource(xslURI));
+            Transformer transformer2 = saxFactory.newTransformer(xslSAXSrc);
+            assertNotNull(transformer2);
+
+            Transformer transformer3 = templates.newTransformer();
+            assertNotNull(transformer3);
+
+            SAXSource xmlSAXSrc = new SAXSource(new InputSource(xmlURI));
+            String nextFile = getNextFile(this.getClass());
+            transformer1.transform(xmlSAXSrc, new StreamResult(nextFile));
+            assertTrue(compareWithGold(goldFile, nextFile));
+
+            nextFile = getNextFile(this.getClass());
+            transformer2.transform(xmlSAXSrc, new StreamResult(nextFile));
+            assertTrue(compareWithGold(goldFile, nextFile));
+
+            // Validate process of a stylesheet using a simple SAXSource with an 
+            // InputStream. Note setting systemId is not necessary with this 
+            // stylesheet. 
+            Templates templatesStream = saxFactory.newTemplates(xslSAXSrc);
+            assertNotNull(templatesStream);
+            Transformer transformerStream = templatesStream.newTransformer();
+            assertNotNull(transformerStream);
+
+            SAXSource xmlSAXSrcStream = new SAXSource(new InputSource(xmlFis));
+            nextFile = getNextFile(this.getClass());
+            transformerStream.transform(xmlSAXSrcStream, new StreamResult(nextFile));
+            assertTrue(compareWithGold(goldFile, nextFile));
+            setPermissions();
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/sax/SAXTransformerFactoryAPITest.java	2015-01-09 15:42:21.650187118 -0800
@@ -0,0 +1,493 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.sax;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.FILE_SEP;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import org.apache.qetest.trax.CheckingErrorListener;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+/**
+ * API Coverage test for SAXTransformerFactory.
+ */
+public class SAXTransformerFactoryAPITest extends JAXPFileBaseTest {
+    /**
+     * Test XSLT embedded file.
+     */
+    private static final String CITIES_INCLUDE_FILE = XML_DIR + "impincl" 
+                        + FILE_SEP + "citiesinclude.xsl";
+    
+    /**
+     * Test XSLT file.
+     */
+    private static final String XSLT_FILE = XML_DIR + "cities.xsl";
+    
+    /**
+     * Test XML file.
+     */
+    private static final String XML_FILE = XML_DIR + "cities.xml";
+    
+    /**
+     * Test golden verification file.
+     */
+    private static final String GOLDEN_FILE = GOLDEN_DIR + "cities.out";
+    
+    @DataProvider
+    public Object[][] parameters(){
+        return new Object[][]{
+            {XML_FILE, XSLT_FILE, GOLDEN_FILE}
+        };
+    }
+
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest01(String xmlFile, String xslFile, String goldFile) 
+            throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            handler.setResult(new StreamResult(fos));
+            reader.setContentHandler(handler);
+            // Log what output is about to be created
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    /**
+     *  This tests newTransformerhandler() method which takes SAXSource as 
+     *  argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest02(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile);
+             FileInputStream fis = new FileInputStream(xslFile);) {
+            XMLReader reader = getJAXPXMLReader();
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            SAXSource ss = new SAXSource();
+            ss.setInputSource(new InputSource(fis));
+            TransformerHandler handler =  saxTFactory.newTransformerHandler(ss);
+
+            handler.setResult(new StreamResult(fos));
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * This tests newTransformerhandler() method which takes DOMSource as 
+     * argument. No relative URIs used.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest03(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        CheckingErrorListener loggingErrListener = new CheckingErrorListener();
+        tfactory.setErrorListener(loggingErrListener);
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true); // Ensure we get namespaces! May be required for some Xerces versions
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+            DOMSource domSource = new DOMSource((Node)docBuilder.parse(new File(xslFile)));
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory)tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(domSource);
+            handler.setResult(new StreamResult(fos));
+            XMLReader reader = getJAXPXMLReader();
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    /**
+     * This tests newTransformerhandler() method which takes DOMSource as 
+     * argument. Here a relative URI is used in citiesinclude.xsl file. 
+     * setSystemId is not used for DOMSource. It should throw an exception. 
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters", expectedExceptions = TransformerConfigurationException.class)
+    public void SAXTFactoryTest04(String xmlFile, String xslFile, String goldFile) 
+            throws Exception {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            // Ensure we get namespaces! May be required for some Xerces versions
+            dbf.setNamespaceAware(true); 
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+             // note specific file name used
+            Node node = (Node) docBuilder.parse(new File(CITIES_INCLUDE_FILE));
+            DOMSource domSource = new DOMSource(node);
+            // setSystemId is not used for DOMSource. expecting Exception.
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(domSource);
+            handler.setResult(new StreamResult(fos));
+
+            XMLReader reader = getJAXPXMLReader();
+            reader.setContentHandler(handler);
+
+            // Log what output is about to be created
+            reader.parse(filenameToURL(xmlFile));
+        } 
+    }
+    
+    /**
+     * Tests newTransformerhandler() method which takes DOMSource as argument.  
+     * Here a relative URI is used in citiesinclude.xsl file. setSystemId is 
+     * used for DOMSource. It should run well.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest05(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+
+            Document document = docBuilder.parse(new File(CITIES_INCLUDE_FILE));
+            DOMSource domSource = new DOMSource((Node) document);
+            domSource.setSystemId(filenameToURL(CITIES_INCLUDE_FILE));
+            TransformerHandler handler = saxTFactory.newTransformerHandler(domSource);
+            handler.setResult(new StreamResult(fos));
+            XMLReader reader = getJAXPXMLReader();
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        // Validate the output by comparing against gold
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest06(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest07(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile)); 
+    }
+
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest08(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest09(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest10(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest11(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile));  
+    }
+
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest12(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        } 
+        assertTrue(compareWithGold(goldFile, outputFile));
+    }
+    
+    /**
+     * This tests newTransformerhandler() method which takes StreamSource as
+     * argument.
+     * 
+     * @param xmlFile XML test file name.
+     * @param xslFile XSLT test file name.
+     * @param goldFile golden file name.
+     * @throws Exception If any errors occur.
+     */
+    @Test(dataProvider = "parameters")
+    public void SAXTFactoryTest13(String xmlFile, String xslFile, String goldFile) 
+            throws Exception  {
+        String outputFile = getNextFile(this.getClass());
+        TransformerFactory tfactory = TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            XMLReader reader = getJAXPXMLReader();
+
+            SAXTransformerFactory saxTFactory = (SAXTransformerFactory) tfactory;
+            TransformerHandler handler = saxTFactory.newTransformerHandler(
+                    new StreamSource(filenameToURL(xslFile)));
+            // Send results out to the next output name
+            Result result = new StreamResult(fos);
+
+            handler.setResult(result);
+            reader.setContentHandler(handler);
+            reader.parse(filenameToURL(xmlFile));
+        }
+        assertTrue(compareWithGold(goldFile, outputFile)); 
+    }
+   
+    /**
+     * Worker method to get an XMLReader.
+     *
+     * @return a new XMLReader for use, with setNamespaceAware(true)
+     * @throws Exception If any errors occur.
+     */
+    private XMLReader getJAXPXMLReader()
+            throws Exception {
+        // Be sure to use the JAXP methods only!
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        return factory.newSAXParser().getXMLReader();
+    } 
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/sax/TemplatesHandlerAPITest.java	2015-01-09 15:42:21.920187540 -0800
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.sax;
+
+import java.io.FileOutputStream;
+import java.io.FilePermission;
+import java.util.Properties;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import org.testng.annotations.Test;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/**
+ * API Coverage test for the TemplatesHandler class of TRAX.
+ */
+public class TemplatesHandlerAPITest extends JAXPBaseTest {
+    /**
+     * Nonsense systemId for various tests.
+     */
+    private static final String NONSENSE_SYSTEMID = "file:///nonsense/system/id/";
+
+    /**
+     * Basic API coverage of set/get methods. Note that most of the
+     * functionality of this class goes far beyond what we test in this
+     * testCase.
+     * 
+     * @throws TransformerConfigurationException Thrown in case of 
+     *         ServiceConfigurationError service configuration error or if the
+     *         implementation is not available or cannot be instantiated.
+     */
+    @Test
+    public void testCase1() throws TransformerConfigurationException {
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        // Basic construction
+        TemplatesHandler tHandler = saxFactory.newTemplatesHandler();
+        assertNotNull(tHandler);
+
+        // getTemplates API coverage - simple
+        Templates templates = tHandler.getTemplates();
+        assertNull(templates);
+
+        // set/getSystemId API coverage
+        tHandler.setSystemId(NONSENSE_SYSTEMID);
+        assertEquals(tHandler.getSystemId(), NONSENSE_SYSTEMID);
+        tHandler.setSystemId(null);
+        assertNull(tHandler.getSystemId());
+
+    }
+
+    /**
+     * Template API test on transform process.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void testCase2() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"),
+                new FilePermission(GOLDEN_DIR + "/-", "read"),
+                new FilePermission(USER_DIR + "-", "read, write"));
+        String xslURI = filenameToURL(XML_DIR + "SAXTest.xsl");
+        String xmlURI = filenameToURL(XML_DIR + "SAXTest.xml");
+        String goldFile = GOLDEN_DIR + "SAXTest.out";
+        String outputFile1 = USER_DIR + "TemplatesHandlerAPITest1.out";
+
+        String xslImpInclURI = filenameToURL(XML_DIR + "SAXImpIncl.xsl");
+        String xmlImpInclURI = filenameToURL(XML_DIR + "SAXImpIncl.xml");
+        String goldImpInclFile = GOLDEN_DIR + "SAXImpIncl.out";
+        String outputFile2 = USER_DIR + "TemplatesHandlerAPITest2.out";
+
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        try (FileOutputStream fos = new FileOutputStream(outputFile1)) {
+            // Validate a templatesHandler can create a valid stylesheet
+            TemplatesHandler templatesHandler = saxFactory.newTemplatesHandler();
+
+            XMLReader reader = getJAXPXMLReader();
+            reader.setContentHandler(templatesHandler);
+            // Parse the stylesheet, which means we should be able to getTemplates()
+            reader.parse(xslURI);
+
+            //Get the Templates object from the ContentHandler
+            Templates templates = templatesHandler.getTemplates();
+            assertNotNull(templates);
+            Properties xslOutProps = templates.getOutputProperties();
+            assertNotNull(xslOutProps);
+            // validate transformer not null
+            Transformer transformer = templates.newTransformer();
+            assertNotNull(transformer);
+
+            // Validate that this transformer actually works
+            Result result = new StreamResult(fos);
+            Source xmlSource = new StreamSource(xmlURI);
+            transformer.transform(xmlSource, result);
+            compareWithGold(goldFile, outputFile1);
+        }
+        compareWithGold(goldFile, outputFile1);
+
+        try (FileOutputStream fos = new FileOutputStream(outputFile2)) {
+            // Validate a templatesHandler can create a stylesheet
+            //  with imports/includes, with the default systemId
+            TemplatesHandler templatesHandler = saxFactory.newTemplatesHandler();
+
+            XMLReader reader = getJAXPXMLReader();
+            reader.setContentHandler(templatesHandler);
+
+            // Parse the stylesheet, which means we should be able to getTemplates()
+            reader.parse(xmlImpInclURI);
+
+            //Get the Templates object from the ContentHandler
+            Templates templates = templatesHandler.getTemplates();
+            assertNotNull(templates);
+            Properties xslOutProps = templates.getOutputProperties();
+            assertNotNull(xslOutProps);
+            Transformer transformer = templates.newTransformer();
+            assertNotNull(transformer);
+
+            Result result = new StreamResult(fos);
+            Source xmlSource = new StreamSource(xmlImpInclURI);
+            transformer.transform(xmlSource, result);
+
+        }
+        compareWithGold(goldImpInclFile, outputFile2);
+        setPermissions();
+    }
+
+    /**
+     * Worker method to get an XMLReader. Not the most efficient of methods, but
+     * makes the code simpler.
+     *
+     * @return a new XMLReader for use, with setNamespaceAware(true)
+     * @throws ParserConfigurationException if a parser cannot be created which
+     * satisfies the requested configuration.
+     * @throws SAXException for SAX errors.
+     */
+    private XMLReader getJAXPXMLReader() throws SAXException,
+            ParserConfigurationException {
+        // Be sure to use the JAXP methods only!
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        return factory.newSAXParser().getXMLReader();
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/sax/TransformerHandlerAPITest.java	2015-01-09 15:42:22.190187961 -0800
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.sax;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import org.testng.annotations.Test;
+
+/**
+ * API Coverage test for the TransformerHandler class of TRAX.
+ */
+public class TransformerHandlerAPITest extends JAXPFileBaseTest {
+    /**
+     * Nonsense systemId for various tests.
+     */
+    private static final String NONSENSE_SYSTEMID = "file:///nonsense/system/id/";
+
+    /**
+     * IllegalArgumentException is thrown if result set as null.
+     * 
+     * @throws TransformerConfigurationException Thrown in case of 
+     * ServiceConfigurationError service configuration error or if the
+     *  implementation is not available or cannot be instantiated. 
+     */
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void negativeCase1() throws TransformerConfigurationException {
+        String outputFile = USER_DIR + "TransformerHandlerAPITest01.out";
+        // Validate API's for an identity transformer
+        // No public constructor available: you must always ask
+        //  a SAXTransformerFactory to give you one
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+
+        // Basic construction of identity transformer
+        TransformerHandler tHandler = saxFactory.newTransformerHandler();
+
+        // set/getSystemId API coverage
+        tHandler.setSystemId(NONSENSE_SYSTEMID);
+        tHandler.setSystemId(null);
+
+        // setResult API coverage
+        Result unusedResult = new StreamResult(outputFile);
+        tHandler.setResult(unusedResult);
+        tHandler.setResult(null);
+    }
+
+    /**
+     * IllegalArgumentException is thrown if result set as null.
+     * 
+     * @throws TransformerConfigurationException Thrown in case of 
+     * ServiceConfigurationError service configuration error or if the
+     * implementation is not available or cannot be instantiated.
+     */
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void negativeCase2() throws TransformerConfigurationException {
+        String outputFile = getNextFile(this.getClass());
+
+        // Validate API's for an identity transformer
+        // No public constructor available: you must always ask
+        //  a SAXTransformerFactory to give you one
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+
+        // Basic construction of identity transformer
+        TransformerHandler tHandler = saxFactory.newTransformerHandler();
+
+        // set/getSystemId API coverage
+        tHandler.setSystemId(NONSENSE_SYSTEMID);
+        tHandler.setSystemId(null);
+
+        // setResult API coverage
+        Result unusedResult = new StreamResult(outputFile);
+        tHandler.setResult(unusedResult);
+        tHandler.setResult(null);
+    }
+
+    /**
+     * IllegalArgumentExceptionis thrown  if result set as null.
+     * 
+     * @throws TransformerConfigurationException Thrown in case of 
+     * ServiceConfigurationError service configuration error or if the
+     * implementation is not available or cannot be instantiated. 
+     */
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void negativeCase3() throws TransformerConfigurationException {
+        String xslURI = filenameToURL(XML_DIR + "SAXTest.xsl");
+        String outputFile = getNextFile(this.getClass());
+
+        // Validate API's for a 'real' transformer, which is different code
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        // Basic construction of identity transformer
+        TransformerHandler tHandler = saxFactory.newTransformerHandler(new StreamSource(xslURI));
+        assertNotNull(tHandler);
+        // getTemplates API coverage - simple
+        Transformer transformer = tHandler.getTransformer();
+        assertNotNull(transformer);
+        // set/getSystemId API coverage
+        tHandler.setSystemId(NONSENSE_SYSTEMID);
+        assertEquals(tHandler.getSystemId(), NONSENSE_SYSTEMID);
+        tHandler.setSystemId(null);
+        assertNull(tHandler.getSystemId());
+
+        // setResult API coverage
+        Result unusedResult = new StreamResult(outputFile);
+        tHandler.setResult(unusedResult);
+        tHandler.setResult(null);
+    }
+
+    /**
+     * Basic functionality of TransformerHandler.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    public void testCase2() throws Exception {
+        String xslURI = filenameToURL(XML_DIR + "SAXTest.xsl");
+        String xmlURI = XML_DIR + "SAXTest.xml";
+        String goldFile = GOLDEN_DIR + "SAXTest.out";
+        String outputURI = filenameToURL(USER_DIR + "SAXTest.out");
+
+        SAXTransformerFactory saxFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        // Validate an identity transformerHandler is valid and performs as an
+        // identity stylesheet
+        TransformerHandler transformerHandler = saxFactory.newTransformerHandler();
+        Transformer transformer = transformerHandler.getTransformer();
+        assertNotNull(transformer);
+        transformer.transform(new StreamSource(xmlURI), new StreamResult(xslURI));
+        compareWithGold(xmlURI, outputURI);
+
+
+        // Validate newTransformerHandler(Source) works
+        transformer = transformerHandler.getTransformer();
+        assertNotNull(transformer);
+        transformer.transform(new StreamSource(xmlURI), new StreamResult(outputURI));
+        compareWithGold(goldFile, outputURI);
+
+        // Validate newTransformerHandler(Templates) works
+        Source  xslSource = new StreamSource(xslURI);
+        Templates otherTemplates = saxFactory.newTemplates(xslSource);
+        transformerHandler = saxFactory.newTransformerHandler(otherTemplates);
+        transformer = transformerHandler.getTransformer();
+        assertNotNull(transformer);
+        transformer.transform(new StreamSource(xmlURI), new StreamResult(outputURI));
+        compareWithGold(goldFile, outputURI);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/sax/TransformerHandlerTest.java	2015-01-09 15:42:22.469188397 -0800
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.sax;
+
+import java.io.StringReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Collectors;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPFileBaseTest;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import org.apache.qetest.xsl.CheckingSAXErrorHandler;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+import org.xml.sax.SAXParseException;
+
+/**
+ * Basic functionality test for the TransformerHandler class of TRAX.
+ */
+public class TransformerHandlerTest extends JAXPFileBaseTest {
+
+    /**
+     * Un-formed XML string(note mismatched tags).
+     */
+    private static final String XML_ERROR_STR
+            = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+            + "<root1></root2>";
+
+    /**
+     * Well-formed XML string.
+     */
+    private static final String XML_GOOD_STR
+            = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+            + "<root>Hello world</root>";
+
+    /**
+     * XSLT string.
+     */
+    private static final String XSL_STR
+            = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+            + "<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">"
+            + "<xsl:template match=\"/\">"
+            + "<xsl:copy-of select=\".\"/>"
+            + "</xsl:template>"
+            + "</xsl:stylesheet>";
+    
+    /**
+     * Golden validation string.
+     */
+    private static final String GOLDEN_STR
+            = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>Hello world</root>";
+
+    /**
+     * Transformer.transform on a not well-formed XML throws TransformerException.
+     * 
+     * @throws TransformerException If an unrecoverable error occurs during the 
+     *         course of the transformation. 
+     */
+    @Test(expectedExceptions = TransformerException.class)
+    public void negativeCase1() throws TransformerException {
+        // No public constructor available: you must always ask
+        //  a SAXTransformerFactory to give you one
+        SAXTransformerFactory saxFactory
+                = (SAXTransformerFactory) TransformerFactory.newInstance();
+        try (StringReader sr1 = new StringReader(XSL_STR);
+                StringReader sr2 = new StringReader(XML_ERROR_STR)) {
+            Transformer reusedTransformer = saxFactory.newTransformer(
+                    new StreamSource(sr1));
+            reusedTransformer.transform(new StreamSource(sr2),
+                    new StreamResult(getNextFile(TransformerHandlerTest.class)));
+        }
+    }
+
+    /**
+     * Reader.read on a not well-formed XML throws TransformerException. 
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test(expectedExceptions = SAXParseException.class)
+    public void testCase2() throws Exception {
+        SAXTransformerFactory saxFactory
+                = (SAXTransformerFactory) TransformerFactory.newInstance();
+        try(StringReader sr1 = new StringReader(XSL_STR);
+                StringReader sr2 = new StringReader(XML_ERROR_STR);) {
+            TransformerHandler thandler = saxFactory.newTransformerHandler(
+                    new StreamSource(sr1));
+            SAXParserFactory spf1 = SAXParserFactory.newInstance();
+            spf1.setNamespaceAware(true);
+            SAXParser parser1 = spf1.newSAXParser();
+            org.xml.sax.XMLReader reader = parser1.getXMLReader();
+            reader.setContentHandler(thandler);
+            reader.setErrorHandler(new CheckingSAXErrorHandler());
+            thandler.setResult(new StreamResult(getNextFile(TransformerHandlerTest.class)));
+            reader.parse(new org.xml.sax.InputSource(sr2));
+        }
+    }
+
+    /**
+     * Re-transform several times with XMLReader and Transformer. No exception 
+     * should be thrown.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test
+    public void testCase3() throws Exception {
+        SAXTransformerFactory saxFactory
+                = (SAXTransformerFactory) TransformerFactory.newInstance();
+        String outputFile1 = getNextFile(this.getClass());
+        String outputFile2 = getNextFile(this.getClass());
+        try(StringReader sr1 = new StringReader(XSL_STR);
+                StringReader sr2 = new StringReader(XML_GOOD_STR);
+                StringReader sr3 = new StringReader(XSL_STR);
+                StringReader sr4 = new StringReader(XML_GOOD_STR)) {
+            TransformerHandler thandler = saxFactory.newTransformerHandler(
+                    new StreamSource(sr1));
+            SAXParserFactory spf = SAXParserFactory.newInstance();
+            spf.setNamespaceAware(true);
+            SAXParser parser = spf.newSAXParser();
+            org.xml.sax.XMLReader reader = parser.getXMLReader();
+            thandler.setResult(new StreamResult(outputFile1));
+            reader.setContentHandler(thandler);
+            reader.setErrorHandler(new CheckingSAXErrorHandler());
+            reader.parse(new org.xml.sax.InputSource(sr2));
+
+            Transformer reusedTransformer = TransformerFactory.newInstance()
+                    .newTransformer(new StreamSource(sr3));
+            reusedTransformer.transform(new StreamSource(sr4),
+                    new StreamResult(outputFile2));
+        }
+        String outputStr1 = Files.readAllLines(Paths.get(outputFile1)).stream()
+                .collect(Collectors.joining(System.getProperty("line.separator")));
+        String outputStr2 = Files.readAllLines(Paths.get(outputFile1)).stream()
+                .collect(Collectors.joining(System.getProperty("line.separator")));
+        assertEquals(outputStr1, GOLDEN_STR);
+        assertEquals(outputStr2, GOLDEN_STR);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/stream/StreamResultAPITest.java	2015-01-09 15:42:22.733188809 -0800
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.stream;
+
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.FileInputStream;
+import java.io.FilePermission;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.StringWriter;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareStringWithGold;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import org.testng.annotations.Test;
+
+/**
+ * API Coverage test for the StreamResult class of TRAX.
+ */
+public class StreamResultAPITest extends JAXPBaseTest {
+    /**
+     * Basic API coverage, constructor and set/get methods.
+     * @throws IOException if any I/O operation failed.
+     */
+    @Test
+    public void testCase1() throws IOException {
+        // Default no-arg ctor sets nothing
+        StreamResult defaultStream = new StreamResult();
+        assertNull(defaultStream.getOutputStream());
+        assertNull(defaultStream.getWriter());
+        assertNull(defaultStream.getSystemId());
+
+        try(ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                StringWriter strWriter = new StringWriter();) {
+            StreamResult byteResult1 = new StreamResult(baos);
+            assertEquals(byteResult1.getOutputStream(), baos);
+            assertNull(byteResult1.getWriter());
+            assertNull(byteResult1.getSystemId());
+
+            StreamResult readerResult1 = new StreamResult(strWriter);
+            assertNull(readerResult1.getOutputStream());
+            assertEquals(readerResult1.getWriter(), strWriter);
+            assertNull(readerResult1.getSystemId());
+
+            StreamResult wackyStream = new StreamResult();
+            wackyStream.setOutputStream(baos);
+            assertEquals(wackyStream.getOutputStream(), baos);
+
+            wackyStream.setWriter(strWriter);
+            assertEquals(wackyStream.getWriter(), strWriter);
+
+            wackyStream.setSystemId("new-system-id");
+            assertEquals(wackyStream.getSystemId(), "new-system-id");
+        }
+    }
+    
+    /**
+     * Basic functionality of StreamResults.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test
+    public void testCase2() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"),
+                new FilePermission(GOLDEN_DIR + "/-", "read"),
+                new FilePermission(USER_DIR + "-", "read, write"));
+        String xsltFile = XML_DIR + "StreamOutputFormat.xsl";
+        String xmlFile = XML_DIR + "StreamOutputFormat.xml";
+        String goldFile = GOLDEN_DIR + "StreamOutputFormat.out"; 
+        
+        TransformerFactory factory = TransformerFactory.newInstance();
+        try (InputStream xslis = new FileInputStream(xsltFile);
+             InputStream xmlis1 = new FileInputStream(xmlFile);
+             InputStream xmlis2 = new FileInputStream(xmlFile);
+             InputStream xmlis3 = new FileInputStream(xmlFile);
+             InputStream xmlis4 = new FileInputStream(xmlFile);
+             InputStream xmlis5 = new FileInputStream(xmlFile);
+             InputStream xmlis6 = new FileInputStream(xmlFile);) {
+            // Create re-useable sources
+            Source xslSource = new StreamSource(xslis);
+            Templates templates = factory.newTemplates(xslSource);
+            
+            // Test some OutputStreams
+            // Simple FileOutputStream is tested in numerous other tests
+            Transformer transformer = templates.newTransformer();
+  
+            // Note: must get a new xmlSource for each transform for now. 
+            // FileInputStreams don't just get 'reset' for you,
+            // But it would be nice to reuse the StreamSources
+            try(ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                ByteArrayOutputStream baos2 = new ByteArrayOutputStream();) {
+                transformer.transform(new StreamSource(xmlis1), 
+                        new StreamResult(baos));
+                transformer.transform(new StreamSource(xmlis2), 
+                        new StreamResult(new PrintStream(baos2)));
+                assertEquals(baos.toString(), baos2.toString());
+                compareStringWithGold(goldFile, baos.toString("UTF-8"));
+            }
+            
+            // Test wrap on StringWriter and CharArrayWriter
+            try(StringWriter sw = new StringWriter();
+                    CharArrayWriter cw = new CharArrayWriter();) {
+                transformer.transform(new StreamSource(xmlis3), new StreamResult(sw));
+                transformer.transform(new StreamSource(xmlis4), new StreamResult(cw));
+                assertEquals(sw.toString(), cw.toString());
+                compareStringWithGold(goldFile, sw.toString());
+            }
+            
+            // Test with systemId set
+            try (StringWriter sw1 = new StringWriter();
+                StringWriter sw2 = new StringWriter();) {
+                transformer.transform(new StreamSource(xmlis5), new StreamResult(sw1));
+                Result swResult2 = new StreamResult(sw2);
+                swResult2.setSystemId("random-system-id");
+                transformer.transform(new StreamSource(xmlis6), swResult2);
+                assertEquals(sw1.toString(), sw2.toString());
+                assertEquals(swResult2.getSystemId(), "random-system-id");
+                compareStringWithGold(goldFile, sw1.toString());
+            }
+        }
+        setPermissions();
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/apache/qetest/trax/stream/StreamSourceAPITest.java	2015-01-09 15:42:23.003189231 -0800
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax.stream;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilePermission;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jaxp.library.JAXPBaseTest;
+import static jaxp.library.JAXPTestUtilities.USER_DIR;
+import static jaxp.library.JAXPTestUtilities.compareWithGold;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import static org.apache.qetest.trax.TraxConst.GOLDEN_DIR;
+import static org.apache.qetest.trax.TraxConst.XML_DIR;
+import static jaxp.library.JAXPTestUtilities.getNextFile;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import org.testng.annotations.Test;
+
+/**
+ * API Coverage test for the StreamSource class of TRAX.
+ */
+public class StreamSourceAPITest extends JAXPBaseTest {
+    /**
+     * Basic API coverage, constructor and set/get methods.
+     */
+    @Test
+    public void testCase1() {
+        // Default StreamSource contains empty source.
+        StreamSource defaultStream = new StreamSource();
+        assertNull(defaultStream.getInputStream());
+        assertNull(defaultStream.getReader());
+        assertNull(defaultStream.getPublicId());
+        assertNull(defaultStream.getSystemId());
+
+        byte[] bytes = {0, 0, 0, 0};  // just a few zeroes, not really needed
+        ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+        StreamSource byteSource1 = new StreamSource(bais);
+        assertEquals(byteSource1.getInputStream(), bais);
+        assertNull(byteSource1.getReader());
+        assertNull(byteSource1.getPublicId());
+        assertNull(byteSource1.getSystemId());
+
+        StreamSource byteSource2 = new StreamSource(bais, "some-system-id");
+        assertEquals(byteSource2.getInputStream(), bais);
+        assertNull(byteSource2.getReader());
+        assertNull(byteSource2.getPublicId());
+        assertEquals(byteSource2.getSystemId(), "some-system-id");
+
+        try(StringReader strReader = 
+                new StringReader("this is not your parent's XML data")) {
+            StreamSource readerSource1 = new StreamSource(strReader);
+            assertNull(readerSource1.getInputStream());
+            assertEquals(readerSource1.getReader(), strReader);
+            assertNull(readerSource1.getPublicId());
+            assertNull(readerSource1.getSystemId());
+
+            StreamSource readerSource2 = new StreamSource(strReader, "some-system-id");
+            assertNull(readerSource2.getInputStream());
+            assertEquals(readerSource2.getReader(), strReader);
+            assertNull(readerSource2.getPublicId());
+            assertEquals(readerSource2.getSystemId(), "some-system-id");
+
+            StreamSource sysIDStream = new StreamSource("real-system-id");
+            assertNull(sysIDStream.getInputStream());
+            assertNull(sysIDStream.getReader());
+            assertNull(sysIDStream.getPublicId());
+            assertEquals(sysIDStream.getSystemId(), "real-system-id");
+
+            StreamSource wackyStream = new StreamSource();
+            wackyStream.setInputStream(bais);
+            assertEquals(wackyStream.getInputStream(), bais);
+
+            wackyStream.setReader(strReader);
+            assertEquals(wackyStream.getReader(), strReader);
+
+            wackyStream.setSystemId("new-system-id");
+            assertEquals(wackyStream.getSystemId(), "new-system-id");
+
+            wackyStream.setPublicId("new-public-id");
+            assertEquals(wackyStream.getPublicId(), "new-public-id");
+        }
+    }
+
+    /**
+     * Basic functionality of StreamResource.
+     * 
+     * @throws Exception If any errors occur. 
+     */
+    @Test
+    public void testCase2() throws Exception {
+        setPermissions(new FilePermission(XML_DIR + "/-", "read"),
+                new FilePermission(GOLDEN_DIR + "/-", "read"),
+                new FilePermission(USER_DIR + "-", "read, write"));
+        String xsltFile = XML_DIR + "impincl/StreamImpIncl.xsl";
+        String xmlFile = XML_DIR + "impincl/StreamImpIncl.xml";
+        String goldFile = GOLDEN_DIR + "StreamImpIncl.out";
+        String xslID = filenameToURL(xsltFile);
+        String xmlID = filenameToURL(xmlFile);
+
+        TransformerFactory factory = TransformerFactory.newInstance();
+        try (InputStream xslStream1 = new FileInputStream(xsltFile);
+                InputStream xmlStream1 = new FileInputStream(xmlFile);
+                InputStream xslStream2 = new FileInputStream(xsltFile);
+                InputStream xmlStream2 = new FileInputStream(xmlFile);
+                InputStream xslStream3 = new FileInputStream(xsltFile);
+                InputStream xmlStream3 = new FileInputStream(xmlFile);) {
+            String outputFile1 = getNextFile(this.getClass());
+            try(OutputStream fos1 = new FileOutputStream(outputFile1)) {
+                Source xslSource1 = new StreamSource(xslStream1);
+                xslSource1.setSystemId(xslID);
+                Source xmlSource1 = new StreamSource(xmlStream1);
+                xmlSource1.setSystemId(xmlID);
+                factory.newTemplates(xslSource1).newTransformer()
+                        .transform(xmlSource1, new StreamResult(fos1));
+            }
+            compareWithGold(goldFile, outputFile1);
+            
+            String outputFile2 = getNextFile(this.getClass());
+            try(OutputStream fos = new FileOutputStream(outputFile2)) {
+                factory.newTemplates(new StreamSource(xslStream2, xslID))
+                        .newTransformer().transform(
+                        new StreamSource(xmlStream2, xmlID), new StreamResult(fos));  
+            }
+            compareWithGold(goldFile, outputFile2);
+            
+            String outputFile3 = getNextFile(this.getClass());
+            try(OutputStream fos = new FileOutputStream(outputFile3)) {
+                StreamSource source = new StreamSource(xslStream3);
+                source.setSystemId(xslID);
+                factory.newTemplates(source).newTransformer()
+                    .transform(new StreamSource(xmlStream3), new StreamResult(fos));
+            }
+            compareWithGold(goldFile, outputFile3);
+        }
+        setPermissions();
+    }
+}
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest01.java	2015-01-09 15:42:23.381189821 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.xml.sax.ptests;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-
-/**
- * Class containing the test cases for Namespace Table defined at
- * http://www.megginson.com/SAX/Java/namespaces.html
- */
-public class NSTableTest01 {
-    private static final String NAMESPACES =
-                        "http://xml.org/sax/features/namespaces";
-    private static final String NAMESPACE_PREFIXES =
-                        "http://xml.org/sax/features/namespace-prefixes";
-
-    /**
-     * Here namespace processing and namespace-prefixes are enabled.
-     * The testcase tests XMLReader for this.
-     */
-    @Test
-    public void xrNSTable01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-
-            XMLReader xmlReader = saxParser.getXMLReader();
-            xmlReader.setFeature(NAMESPACE_PREFIXES, true);
-
-            assertTrue(xmlReader.getFeature(NAMESPACES));
-            assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Here namespace processing is enabled. This will make namespace-prefixes
-     * disabled. The testcase tests XMLReader for this.
-     */
-    @Test
-    public void xrNSTable02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            SAXParser saxParser = spf.newSAXParser();
-
-            XMLReader xmlReader = saxParser.getXMLReader();
-            assertTrue(xmlReader.getFeature(NAMESPACES));
-            assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
-
-    }
-
-    /**
-     * Here namespace processing is disabled. This will make namespace-prefixes
-     * enabled. The testcase tests XMLReader for this.
-     */
-    @Test
-    public void xrNSTable03() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            SAXParser saxParser = spf.newSAXParser();
-            XMLReader xmlReader = saxParser.getXMLReader();
-            assertFalse(xmlReader.getFeature(NAMESPACES));
-            assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Here namespace processing is disabled, and namespace-prefixes is
-     * disabled. This will make namespace processing on.The testcase tests
-     * XMLReader for this.  This behavior only apply to crimson, not
-     * xerces
-     */
-    @Test
-    public void xrNSTable04() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            SAXParser saxParser = spf.newSAXParser();
-            XMLReader xmlReader = saxParser.getXMLReader();
-            xmlReader.setFeature(NAMESPACE_PREFIXES, false);
-
-            assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXException ex) {
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Here namespace processing and namespace-prefixes are enabled.
-     * The testcase tests SAXParserFactory for this.
-     */
-    @Test
-    public void spNSTable01() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setFeature(NAMESPACE_PREFIXES,true);
-            assertTrue(spf.getFeature(NAMESPACES));
-            assertTrue(spf.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException
-                | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Here namespace processing is enabled. This will make namespace-prefixes
-     * disabled. The testcase tests SAXParserFactory for this.
-     */
-    @Test
-    public void spNSTable02() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            assertTrue(spf.getFeature(NAMESPACES));
-            assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException
-                | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
-    }
-
-    /**
-     * Here namespace processing is disabled. This will make namespace-prefixes
-     * enabled. The testcase tests SAXParserFactory for this.
-     */
-    @Test
-    public void spNSTable03() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            assertFalse(spf.getFeature(NAMESPACES));
-            assertTrue(spf.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException
-                | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
-    }
-    /**
-     * Here namespace processing is disabled, and namespace-prefixes is
-     * disabled. This will make namespace processing on.The testcase tests
-     * SAXParserFactory for this.  This behavior only apply to crimson,
-     * not xerces.
-     */
-    @Test
-    public void spNSTable04() {
-        try {
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setFeature(NAMESPACE_PREFIXES, false);
-
-            assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
-        } catch (ParserConfigurationException | SAXNotRecognizedException
-                | SAXNotSupportedException ex) {
-            failUnexpected(ex);
-        }
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java	2015-01-09 15:42:23.265189640 -0800
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.xml.sax.ptests;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import jaxp.library.JAXPBaseTest;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
+import org.xml.sax.XMLReader;
+
+/**
+ * Class containing the test cases for Namespace Table defined at
+ * http://www.megginson.com/SAX/Java/namespaces.html
+ */
+public class NSTableTest extends JAXPBaseTest {
+    private static final String NAMESPACES =
+                        "http://xml.org/sax/features/namespaces";
+    private static final String NAMESPACE_PREFIXES =
+                        "http://xml.org/sax/features/namespace-prefixes";
+
+    /**
+     * Here namespace processing and namespace-prefixes are enabled.
+     * The testcase tests XMLReader for this.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void xrNSTable01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        SAXParser saxParser = spf.newSAXParser();
+
+        XMLReader xmlReader = saxParser.getXMLReader();
+        xmlReader.setFeature(NAMESPACE_PREFIXES, true);
+
+        assertTrue(xmlReader.getFeature(NAMESPACES));
+        assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
+    }
+
+    /**
+     * Here namespace processing is enabled. This will make namespace-prefixes
+     * disabled. The testcase tests XMLReader for this.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void xrNSTable02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+
+        XMLReader xmlReader = spf.newSAXParser().getXMLReader();
+        assertTrue(xmlReader.getFeature(NAMESPACES));
+        assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
+    }
+
+    /**
+     * Here namespace processing is disabled. This will make namespace-prefixes
+     * enabled. The testcase tests XMLReader for this.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void xrNSTable03() throws Exception {
+        XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        assertFalse(xmlReader.getFeature(NAMESPACES));
+        assertTrue(xmlReader.getFeature(NAMESPACE_PREFIXES));
+    }
+
+    /**
+     * Here namespace processing is disabled, and namespace-prefixes is
+     * disabled. This will make namespace processing on.The testcase tests
+     * XMLReader for this.  This behavior only apply to crimson, not
+     * XERCES.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void xrNSTable04() throws Exception {
+        XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        xmlReader.setFeature(NAMESPACE_PREFIXES, false);
+        assertFalse(xmlReader.getFeature(NAMESPACE_PREFIXES));
+    }
+
+    /**
+     * Here namespace processing and namespace-prefixes are enabled.
+     * The testcase tests SAXParserFactory for this.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void spNSTable01() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        spf.setFeature(NAMESPACE_PREFIXES,true);
+        assertTrue(spf.getFeature(NAMESPACES));
+        assertTrue(spf.getFeature(NAMESPACE_PREFIXES));
+    }
+
+    /**
+     * Here namespace processing is enabled. This will make namespace-prefixes
+     * disabled. The testcase tests SAXParserFactory for this.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void spNSTable02() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setNamespaceAware(true);
+        assertTrue(spf.getFeature(NAMESPACES));
+        assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
+    }
+
+    /**
+     * Here namespace processing is disabled. This will make namespace-prefixes
+     * enabled. The testcase tests SAXParserFactory for this.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void spNSTable03() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        assertFalse(spf.getFeature(NAMESPACES));
+        assertTrue(spf.getFeature(NAMESPACE_PREFIXES));
+    }
+    /**
+     * Here namespace processing is disabled, and namespace-prefixes is
+     * disabled. This will make namespace processing on.The testcase tests
+     * SAXParserFactory for this.  This behavior only apply to crimson,
+     * not xerces.
+     * 
+     * @throws Exception If any errors occur.
+     */
+    @Test
+    public void spNSTable04() throws Exception {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setFeature(NAMESPACE_PREFIXES, false);
+        assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyCHandler.java	2015-01-09 15:42:23.648190238 -0800
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 1999, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package javax.xml.parsers.ptests;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import static jaxp.library.JAXPTestUtilities.ERROR_MSG_HEADER;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.LocatorImpl;
+
+/**
+ * Customized DefaultHandler which writes output document when methods are
+ * called by Transformer. Test may use output document to compare with golden
+ * file for verification.
+ */
+class MyCHandler extends DefaultHandler implements AutoCloseable {
+
+    private final BufferedWriter bWriter;
+    private final Locator locator = new LocatorImpl();
+
+    private MyCHandler(File file) throws IOException {
+        bWriter = new BufferedWriter(new FileWriter(file));
+    }
+
+    public static MyCHandler newInstance(File file) throws IOException {
+        MyCHandler handler = new MyCHandler(file);
+        return handler;
+    }
+
+    @Override
+    public void characters(char[] ch, int start, int length) {
+        String s = new String(ch, start, length);
+        String str = String.format("characters...length is:%d\n<%s>", s.length(), s);
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void endDocument() {
+        String str = "endDocument...";
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+            bWriter.flush();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void endElement(String namespaceURI, String localName, String qName) {
+        String str = String.format("endElement...\nnamespaceURI: <%s> localName: <%s> qName: <%s>", namespaceURI, localName, qName);
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void endPrefixMapping(String prefix) {
+        String str = String.format("endPrefixMapping...\nprefix: <%s>", prefix);
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void ignorableWhitespace(char[] ch, int start, int length) {
+        String s = new String(ch, start, length);
+        String str = String.format("ignorableWhitespace...\n%s ignorable white space string length: %d", s, s.length());
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void processingInstruction(String target, String data) {
+        String str = String.format("processingInstruction...target:<%s> data: <%s>", target, data);
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void skippedEntity(String name) {
+        String str = String.format("skippedEntity...\nname: <%s>", name);
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void startDocument() {
+        String str = "startDocument...";
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void startElement(String namespaceURI, String localName, String qName, Attributes atts) {
+        String str = String.format("startElement...\nnamespaceURI: <%s> localName: <%s> qName: <%s> Number of Attributes: <%d> Line# <%d>", namespaceURI,
+                localName, qName, atts.getLength(), locator.getLineNumber());
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void startPrefixMapping(String prefix, String uri) {
+        String str = String.format("startPrefixMapping...\nprefix: <%s> uri: <%s>", prefix, uri);
+        try {
+            bWriter.write(str, 0, str.length());
+            bWriter.newLine();
+        } catch (IOException e) {
+            throw new RuntimeException(ERROR_MSG_HEADER, e);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (bWriter != null)
+            bWriter.close();
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/MyErrorHandler.java	2015-01-09 15:42:23.945190702 -0800
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 1999, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package javax.xml.parsers.ptests;
+
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Customized DefaultHandler used for SAXParseException testing.
+ */
+class MyErrorHandler extends DefaultHandler {
+    /**
+     * Flag whether any event was received.
+     */
+    private volatile boolean errorOccured;
+
+    /**
+     * Set no event received on constructor.
+     */
+    private MyErrorHandler() {
+        errorOccured = false;
+    }
+
+    /**
+     * Factory method to create a MyErrorHandler instance.
+     * @return a MyErrorHandler instance. 
+     */
+    public static MyErrorHandler newInstance() {
+        return new MyErrorHandler();
+    }
+
+    /**
+     * Receive notification of a recoverable error.
+     * @param e a recoverable parser exception error. 
+     */
+    @Override
+    public void error(SAXParseException e) {
+        errorOccured = true;
+    }
+
+    /**
+     * Receive notification of a parser warning.
+     * @param e a parser warning  event.
+     */
+    @Override
+    public void warning(SAXParseException e) {
+        errorOccured = true;
+    }
+
+    /**
+     * Report a fatal XML parsing error.
+     * @param e The error information encoded as an exception. 
+     */
+    @Override
+    public void fatalError(SAXParseException e) {
+        errorOccured = true;
+    }
+    
+    /**
+     * Has any event been received. 
+     * 
+     * @return true if any event has been received.
+     *         false if no event has been received.
+     */
+    public boolean isErrorOccured() {
+        return errorOccured;
+    }
+}
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/TestUtils.java	2015-01-09 15:42:24.348191331 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.parsers.ptests;
-
-import static jaxp.library.JAXPTestUtilities.ERROR_MSG_HEADER;
-import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.LocatorImpl;
-
-/**
- * Utility interface which includes final variables of xml, golden file
- * directories.
- */
-interface TestUtils {
-    final String XML_DIR = System.getProperty("test.src", ".") + FILE_SEP + "javax/xml/parsers/xmlfiles";
-    final String GOLDEN_DIR = XML_DIR + FILE_SEP + "out";
-}
-
-/**
- * Customized DefaultHandler which writes output document when methods are
- * called by Transformer. Test may use output document to compare with golden
- * file for verification.
- */
-class MyCHandler extends DefaultHandler {
-
-    private final BufferedWriter bWriter;
-    private final Locator locator = new LocatorImpl();
-
-    private MyCHandler(File file) throws IOException {
-        bWriter = new BufferedWriter(new FileWriter(file));
-    }
-
-    public static MyCHandler newInstance(File file) throws IOException {
-        MyCHandler handler = new MyCHandler(file);
-        return handler;
-    }
-
-    public void characters(char[] ch, int start, int length) {
-        String s = new String(ch, start, length);
-        String str = String.format("characters...length is:%d\n<%s>", s.length(), s);
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void endDocument() {
-        String str = "endDocument...";
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-            bWriter.flush();
-            bWriter.close();
-
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void endElement(String namespaceURI, String localName, String qName) {
-        String str = String.format("endElement...\nnamespaceURI: <%s> localName: <%s> qName: <%s>", namespaceURI, localName, qName);
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void endPrefixMapping(String prefix) {
-        String str = String.format("endPrefixMapping...\nprefix: <%s>", prefix);
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void ignorableWhitespace(char[] ch, int start, int length) {
-        String s = new String(ch, start, length);
-        String str = String.format("ignorableWhitespace...\n%s ignorable white space string length: %d", s, s.length());
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void processingInstruction(String target, String data) {
-        String str = String.format("processingInstruction...target:<%s> data: <%s>", target, data);
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void skippedEntity(String name) {
-        String str = String.format("skippedEntity...\nname: <%s>", name);
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void startDocument() {
-        String str = "startDocument...";
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void startElement(String namespaceURI, String localName, String qName, Attributes atts) {
-        String str = String.format("startElement...\nnamespaceURI: <%s> localName: <%s> qName: <%s> Number of Attributes: <%d> Line# <%d>", namespaceURI,
-                localName, qName, atts.getLength(), locator.getLineNumber());
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-
-    public void startPrefixMapping(String prefix, String uri) {
-        String str = String.format("startPrefixMapping...\nprefix: <%s> uri: <%s>", prefix, uri);
-        try {
-            bWriter.write(str, 0, str.length());
-            bWriter.newLine();
-        } catch (IOException e) {
-            throw new RuntimeException(ERROR_MSG_HEADER, e);
-        }
-    }
-}
-
-/**
- * Customized DefaultHandler used for SAXParseException testing.
- */
-class MyErrorHandler extends DefaultHandler {
-    boolean errorOccured = false;
-
-    private MyErrorHandler() {
-    }
-
-    public static MyErrorHandler newInstance() {
-        return new MyErrorHandler();
-    }
-
-    public void error(SAXParseException e) {
-        errorOccured = true;
-    }
-
-    public void warning(SAXParseException e) {
-        errorOccured = true;
-    }
-
-    public void fatalError(SAXParseException e) {
-        errorOccured = true;
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/javax/xml/parsers/ptests/ParserTestConst.java	2015-01-09 15:42:24.225191139 -0800
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package javax.xml.parsers.ptests;
+
+import static jaxp.library.JAXPTestUtilities.FILE_SEP;
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
+
+
+/**
+ * Utility interface which includes final variables of XML, golden file
+ * directories.
+ */
+public class ParserTestConst {
+    /**
+     * XML source file directory.
+     */
+    public static final String XML_DIR = getPathByClassName(ParserTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles"); 
+
+    
+    /**
+     * Golden validation files directory.
+     */
+    public static final String GOLDEN_DIR = getPathByClassName(ParserTestConst.class, 
+            ".." + FILE_SEP + "xmlfiles" + FILE_SEP + "out");
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/jaxp/library/JAXPBaseTest.java	2015-01-09 15:42:24.619191755 -0800
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jaxp.library;
+
+import java.security.Permission;
+import java.security.Permissions;
+import java.security.Policy;
+import java.util.PropertyPermission;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+/**
+ * This is a base class that every test class must extend if it needs to be run 
+ * with security mode.
+ */
+public class JAXPBaseTest {
+    /**
+     * Backing up policy.
+     */
+    protected static Policy policy;
+    
+    /**
+     * Backing up security manager.
+     */
+    private static SecurityManager sm;
+
+    /*
+     * Install a SecurityManager along with a base Policy to allow testNG to 
+     * run when there is a security manager.
+     */
+    @BeforeClass
+    public void setUpClass() throws Exception {
+        setPolicy(new TestPolicy());
+        System.setSecurityManager(new SecurityManager());
+    }
+
+    /*
+     * Install the original Policy and SecurityManager when there is a security
+     * manager.
+     */
+    @AfterClass
+    public void tearDownClass() throws Exception {
+        System.setSecurityManager(sm);
+        setPolicy(policy);
+    }
+    
+    /*
+     * Utility Method used to set the current Policy.
+     */
+    protected static void setPolicy(Policy p) {
+        Policy.setPolicy(p);
+    }
+    
+    /*
+     * Add the specified permission(s) to the test policy.
+     * Note there is no way to add permissions to current permissions. Reset 
+     * test policy by setting minimal permmisons in addition to specified 
+     * permissions when calling this method.
+     */
+    protected static void setPermissions(Permission... ps) {
+        Policy.setPolicy(new TestPolicy(ps));
+    }
+  
+    /*
+     * Add the specified permission(s) to the test policy.
+     * Note there is no way to add permissions to current permissions. Reset 
+     * test policy by setting minimal permmisons in addition to specified 
+     * permissions when calling this method.
+     */
+    protected static void setPermissions(Permissions ps) {
+        Policy.setPolicy(new TestPolicy(ps));
+    }
+
+    /**
+     * Backing up policy and security manager for restore when there is a 
+     * security manager.
+     */
+    public JAXPBaseTest() {
+        policy = Policy.getPolicy();
+        sm = System.getSecurityManager();
+    }
+    
+    /**
+     * Safety acquire a system property.
+     * Note invocation of this method will restore permission to limited
+     * minimal permission of tests. If there is additional permission set
+     * already, you need restore permission by yourself.
+     * @param propName System property name to be acquired.
+     * @return property value 
+     */
+    protected String getSystemProperty(final String propName) {
+        setPermissions(new PropertyPermission(propName, "read"));
+        try {
+            return System.getProperty(propName);
+        } finally {
+            setPermissions();
+        }
+    }
+
+    /**
+     * Safety set a system property by given system value.
+     * 
+     * @param propName System property name to be set.
+     * @param propValue System property value to be set.
+     */
+    protected void setSystemProperty(final String propName, final String propValue) {
+        setPermissions(new PropertyPermission(propName, "write"));
+        try {
+            if (propValue == null) {
+                System.clearProperty(propName);
+            } else {
+                System.setProperty(propName, propValue);
+            }
+        } finally {
+            setPermissions();
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileBaseTest.java	2015-01-09 15:42:24.892192181 -0800
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jaxp.library;
+
+import java.io.FilePermission;
+import java.security.Permission;
+import java.security.Permissions;
+import java.security.Policy;
+import static jaxp.library.JAXPBaseTest.setPolicy;
+import org.testng.annotations.BeforeClass;
+
+/**
+ * This is a base class that every test class that need to access local XML 
+ * files must extend if it needs to be run with security mode.
+ */
+public class JAXPFileBaseTest extends JAXPBaseTest {
+    /*
+     * Install a SecurityManager along with a base Policy to allow testNG to 
+     * run when there is a security manager.
+     */    
+    @BeforeClass
+    @Override
+    public void setUpClass() throws Exception {
+        setPolicy(new FileTestPolicy());
+        System.setSecurityManager(new SecurityManager());
+    }
+
+    /*
+     * Add the specified permission(s) to the test policy.
+     * Note there is no way to add permissions to current permissions. Reset 
+     * test policy by setting minimal permmisons in addition to specified 
+     * permissions when calling this method.
+     */
+    protected static void setPermissions(Permission... ps) {
+        Policy.setPolicy(new FileTestPolicy(ps));
+    }
+  
+    /*
+     * Add the specified permission(s) to the test policy.
+     * Note there is no way to add permissions to current permissions. Reset 
+     * test policy by setting minimal permmisons in addition to specified 
+     * permissions when calling this method.
+     */
+    protected static void setPermissions(Permissions ps) {
+        Policy.setPolicy(new FileTestPolicy(ps));
+    }    
+}
+
+/**
+ * This policy is only given to tests that need access local files. Additional
+ * permissions for accessing local files have been granted by default.
+ * @author HaiboYan
+ */
+class FileTestPolicy extends TestPolicy {
+    /**
+     * Constructor which sets the minimum permissions by default allowing testNG 
+     * to work with a SecurityManager. 
+     * @param ps permissions to be added.
+     */
+    public FileTestPolicy(Permissions ps) {
+        super(ps);
+    }
+
+    /**
+     * Constructor which sets the minimum permissions by default allowing testNG 
+     * to work with a SecurityManager. 
+     * @param ps permission array to be added.
+     */
+    public FileTestPolicy(Permission... ps) {
+        super(ps);
+    }
+
+    /**
+     * Defines the minimal permissions required by testNG when running these
+     * tests
+     */
+    @Override
+    protected void setMinimalPermissions() {
+        super.setMinimalPermissions();
+        permissions.add(new FilePermission(System.getProperty("user.dir") + "/-",
+                "read, write"));
+        permissions.add(new FilePermission(System.getProperty("test.src") + "/-",
+                "read"));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileReadOnlyBaseTest.java	2015-01-09 15:42:25.172192618 -0800
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jaxp.library;
+
+import java.io.FilePermission;
+import static jaxp.library.JAXPBaseTest.setPermissions;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
+
+/**
+ * This is a base class that every test class that need to reading local XML 
+ * files must extend if it needs to be run with security mode.
+ */
+public class JAXPFileReadOnlyBaseTest extends JAXPBaseTest {
+    /**
+     * Source files/XML files directory.
+     */
+    private final String SRC_DIR = getSystemProperty("test.src");
+
+    /**
+     * Allowing access local file system for this group.
+     */
+    @BeforeGroups (groups = {"readLocalFiles"})
+    public void setFilePermissions() {
+        setPermissions(new FilePermission(SRC_DIR + "/-", "read"));
+    }
+    
+    /**
+     * Restore the system property.
+     */
+    @AfterGroups (groups = {"readLocalFiles"})
+    public void restoreFilePermissions() {
+        setPermissions();
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/jaxp/library/TestPolicy.java	2015-01-09 15:42:25.448193049 -0800
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jaxp.library;
+
+import java.security.AllPermission;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import java.security.SecurityPermission;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.PropertyPermission;
+import java.util.StringJoiner;
+
+/*
+ * Simple Policy class that supports the required Permissions to validate the
+ * JAXP concrete classes. 
+ * Note: permission can only be added. You may want to create a new TestPolicy
+ *       instance if you need remove permissions.
+ */
+public class TestPolicy extends Policy {
+    protected final PermissionCollection permissions = new Permissions();
+
+    /**
+     * Constructor which sets the minimum permissions by default allowing testNG 
+     * to work with a SecurityManager. 
+     */
+    public TestPolicy() {
+        setMinimalPermissions(); 
+    }
+    
+    /**
+     * Construct an instance with the minimal permissions required by the test 
+     * environment and additional permission(s) as specified. 
+     * @param ps permissions to be added.
+     */
+    public TestPolicy(Permissions ps) {
+        setMinimalPermissions(); 
+        TestPolicy.this.addPermissions(ps);
+    }
+
+    /**
+     * Construct an instance with the minimal permissions required by the test 
+     * environment and additional permission(s) as specified. 
+     * @param ps permission array to be added.
+     */
+    public TestPolicy(Permission... ps) {
+        setMinimalPermissions(); 
+        addPermissions(ps);
+    }
+
+    /**
+     * Defines the minimal permissions required by testNG when running these
+     * tests
+     */
+    protected void setMinimalPermissions() {
+        permissions.add(new SecurityPermission("getPolicy"));
+        permissions.add(new SecurityPermission("setPolicy"));
+        permissions.add(new RuntimePermission("getClassLoader"));
+        permissions.add(new RuntimePermission("setSecurityManager"));
+        permissions.add(new RuntimePermission("createSecurityManager"));
+        permissions.add(new PropertyPermission("testng.show.stack.frames",
+                "read"));
+        permissions.add(new PropertyPermission("user.dir", "read"));
+        permissions.add(new PropertyPermission("test.src", "read"));
+        permissions.add(new PropertyPermission("file.separator", "read"));
+        permissions.add(new PropertyPermission("line.separator", "read"));
+        permissions.add(new PropertyPermission("fileStringBuffer", "read"));
+        permissions.add(new PropertyPermission("dataproviderthreadcount", "read"));
+    }
+
+    /*
+     * Add permissions for your tests.
+     * @param permissions to be added.
+     */
+    private void addPermissions(Permissions ps) {
+        Collections.list(ps.elements()).forEach(p -> permissions.add(p));
+    }
+    
+    
+    /*
+     * Add permissions for your tests.
+     * @param permissions to be added.
+     */
+    private void addPermissions(Permission[] ps) {
+        Arrays.stream(ps).forEach(p -> permissions.add(p));
+    }
+    
+    /**
+     * Set all permissions. Caution: this should not called carefully unless
+     * it's really needed.
+     */
+    private void setAllPermissions() {
+        permissions.add(new AllPermission());
+    }
+
+    /*
+     * Overloaded methods from the Policy class.
+     */
+    @Override
+    public String toString() {
+        StringJoiner sj = new StringJoiner("\n", "policy: ", "");
+        Enumeration<Permission> perms = permissions.elements();
+        while (perms.hasMoreElements()) {
+            sj.add(perms.nextElement().toString());
+        }
+        return sj.toString();
+
+    }
+
+    @Override
+    public PermissionCollection getPermissions(ProtectionDomain domain) {
+        return permissions;
+    }
+
+    @Override
+    public PermissionCollection getPermissions(CodeSource codesource) {
+        return permissions;
+    }
+
+    @Override
+    public boolean implies(ProtectionDomain domain, Permission perm) {
+        return permissions.implies(perm);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/CheckingHandler.java	2015-01-09 15:42:25.731193491 -0800
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest;
+
+/**
+ * Base class defining common functionality of logging handlers.
+ * <p>
+ * Common functionality used for testing when implementing various Handlers and
+ * Listeners. Provides common ways to set Loggers and levels, reset, and set
+ * expected errors or the like. Likely used to implement testing wrapper classes
+ * for things like javax.xml.transform.ErrorListener and
+ * org.xml.sax.ErrorHandler</p>
+ * <p>
+ * The best description for this class can be seen in an example; see
+ * trax.LoggingErrorHandler.java for one.</p>
+ */
+public interface CheckingHandler {
+    /**
+     * Reset any items or counters we've handled. Resets any data about what
+     * we've handled or logged so far, like getLast() and getCounters() data, as
+     * well as any expected items from setExpected(). Does not change our Logger
+     * or loggingLevel.
+     */
+    public void reset();
+
+    /**
+     * Ask us to report checkPass/Fail for certain events we handle. Since we
+     * may have to handle many events between when a test will be able to call
+     * us, testers can set this to have us automatically call checkPass when we
+     * see an item that matches, or to call checkFail when we get an unexpected
+     * item. Generally, we only call check* methods when:
+     * <ul>
+     * <li>containsString is not set, reset, or is ITEM_DONT_CARE, we do nothing
+     * (i.e. never call check* for this item)</li>
+     * <li>containsString is ITEM_CHECKFAIL, we will always call checkFail with
+     * the contents of any item if it occurs</li>
+     * <li>containsString is anything else, we will grab a String representation
+     * of every item of that type that comes along, and if the containsString is
+     * found, case-sensitive, within the handled item's string, call checkPass,
+     * otherwise call checkFail</li>
+     * </ul>
+     * Note that most implementations will only validate the first event of a
+     * specific type, and then will reset validation for that event type. This
+     * is because many events may be raised in between the time that a calling
+     * Test class could tell us of the 'next' expected event.
+     *
+     * @param itemType which of the various types of items we might handle;
+     * should be defined as a constant by subclasses
+     * @param expectation a set expectation if we care this event or not.
+     */
+    public void setExpected(int itemType, Expectation expectation);
+
+    enum Expectation {
+        ITEM_DONT_CARE,
+        ITEM_CHECKFAIL,
+        ITEM_CHECKPASS,
+        ITEM_RESOLVE
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/dtm/QeDtmConst.java	2015-01-09 15:42:25.999193910 -0800
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.dtm;
+
+import com.sun.org.apache.xml.internal.dtm.DTM;
+import com.sun.org.apache.xml.internal.dtm.DTMManager;
+import com.sun.org.apache.xml.internal.dtm.DTMWSFilter;
+import com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault;
+import com.sun.org.apache.xpath.internal.objects.XMLStringFactoryImpl;
+import java.io.StringReader;
+import java.util.List;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
+
+/**
+ * This is the utilities test class provide basic support for DTM test.
+ */
+public class QeDtmConst {
+    /**
+     * XML source file directory.
+     */
+    public static final String XML_DIR = getPathByClassName(QeDtmConst.class, "content"); 
+
+    /**
+     * Golden validation files directory.
+     */
+    public static final String GOLDEN_DIR = getPathByClassName(QeDtmConst.class, "golden");
+
+    /**
+     * A XML source string for building DTM.
+     */
+    public static final String DEFAULT_SOURCE = "<?xml version=\"1.0\"?>\n"
+            + "<Document xmlns:d=\"www.d.com\" a1=\"hello\" a2=\"goodbye\">"
+            + "<!-- Default test document -->"
+            + "<?api a1=\"yes\" a2=\"no\"?>"
+            + "<A><!-- A Subtree --><B><C><D><E><F xmlns:f=\"www.f.com\" a1=\"down\" a2=\"up\"/></E></D></C></B></A>"
+            + "<Aa/><Ab/><Ac><Ac1/></Ac>"
+            + "<Ad xmlns:Ad=\"www.Ad.com\" xmlns:y=\"www.y.com\" xmlns:z=\"www.z.com\">"
+            + "<Ad1/></Ad>"
+            + "</Document>";
+
+    /**
+     * String represent for DOM node type. The sequence of this array following
+     * same sequence in.
+     */
+    public static final String[] TYPENAME = {"NULL",
+                "ELEMENT",
+                "ATTRIBUTE",
+                "TEXT",
+                "CDATA_SECTION",
+                "ENTITY_REFERENCE",
+                "ENTITY",
+                "PROCESSING_INSTRUCTION",
+                "COMMENT",
+                "DOCUMENT",
+                "DOCUMENT_TYPE",
+                "DOCUMENT_FRAGMENT",
+                "NOTATION",
+                "NAMESPACE"
+            };
+
+    /**
+     * This routine generates a new DTM with stripping whitespace filter. 
+     * non-incremental, but with indexing (a fairly common case, and
+     * avoids the special mode used for RTF DTMs).
+     * @param theSource URL for StreamSource
+     * @return a non-null DTM reference.
+     */
+    public static DTM createDTM(String theSource) {
+        return DTMManagerDefault.newInstance(new XMLStringFactoryImpl())
+                .getDTM(new StreamSource(new StringReader(theSource)), true, 
+                (eh, dtm) -> DTMWSFilter.STRIP, false, true);
+    }
+
+    /**
+     * This routine generates a new DTM for each test case with no whitespace 
+     * filtering, non-incremental, but with indexing (a fairly common case, 
+     * and avoids the special mode used for RTF DTMs).
+     * @param method 0 create StreamSource directly.
+     *               1 create StreamSource by StringReader.
+     * @param theSource the specification of the source object.
+     * @param lines output string list that will be appended by memory usage.
+     * @return 
+     */
+    public static DTM createDTM(int method, String theSource, List<String> lines) {
+        // Create DTM and generate initial context
+        Source source = (method == 1) ?
+                new StreamSource(new StringReader(theSource)) :
+                new StreamSource(theSource);
+
+        DTMManager manager = DTMManagerDefault.newInstance(new XMLStringFactoryImpl());
+        return manager.getDTM(source, true, (eh, dtm) -> DTMWSFilter.STRIP, false, true);
+    } 
+
+    /**
+     * Create DTM and generate initial context.
+     * @return a non-null DTM reference with initial context. 
+     */
+    public static DTM generateDTM() {
+        return createDTM(DEFAULT_SOURCE);
+    }
+    
+    /**
+     * Retrieve string represent for a XML node.
+     * @param dtm A XML document model table represent.
+     * @param nodeHandle Node id.
+     * @return A string represent by given node id. 
+     */
+    public static String getNodeName(DTM dtm, int nodeHandle) {
+        return TYPENAME[dtm.getNodeType(nodeHandle)];
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/trax/CheckingErrorListener.java	2015-01-09 15:42:26.269194332 -0800
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+import org.apache.qetest.CheckingHandler;
+import static org.apache.qetest.CheckingHandler.Expectation.ITEM_CHECKPASS;
+import static org.apache.qetest.CheckingHandler.Expectation.ITEM_DONT_CARE;
+import static org.testng.Assert.fail;
+
+/**
+ * Cheap-o ErrorListener for use by API tests.
+ * <p>
+ * Implements javax.xml.transform.ErrorListener and dumps everything to a
+ * Logger; is separately settable as to when it will throw an exception; also
+ * separately settable as to when we should validate specific events that we
+ * handle.</p>
+ */
+public class CheckingErrorListener implements CheckingHandler, ErrorListener {
+
+    /**
+     * Constants determining when we should throw exceptions.
+     * <ul>Flags are combineable like a bitfield.
+     * <li>THROW_NEVER - never ever (always continue - note this may have
+     * unexpected effects when fatalErrors happen, see
+     * {@link javax.xml.transform.ErrorListener#fatalError(javax.xml.transform.TransformerException)}</li>
+     * <li>THROW_ON_WARNING - throw only on warnings</li>
+     * <li>THROW_ON_ERROR - throw only on errors</li>
+     * <li>THROW_ON_FATAL - throw only on fatalErrors - default</li>
+     * <li>THROW_ALWAYS - always throw exceptions</li>
+     * </ul>
+     */
+    public static final int THROW_NEVER = 0;
+
+    /**
+     * THROW_ON_WARNING - throw only on warnings.
+     */
+    public static final int THROW_ON_WARNING = 1;
+
+    /**
+     * THROW_ON_ERROR - throw only on errors.
+     */
+    public static final int THROW_ON_ERROR = 2;
+
+    /**
+     * THROW_ON_FATAL - throw only on fatalErrors - default.
+     */
+    public static final int THROW_ON_FATAL = 4;
+
+    /**
+     * THROW_ALWAYS - always throw exceptions.
+     */
+    public static final int THROW_ALWAYS = THROW_ON_WARNING | THROW_ON_ERROR
+            | THROW_ON_FATAL;
+
+    /**
+     * If we should throw an exception for each message type.
+     */
+    protected final int throwWhen;
+
+    /**
+     * Constructor set when we should re-throw exceptions.
+     *
+     * @param t THROW_WHEN_* constant as to when we should re-throw an exception
+     * when we are called.
+     */
+    public CheckingErrorListener(int t) {
+        throwWhen = t;
+    }
+    
+    /**
+     * Default constructor will behave as default. Throw only when there is 
+     * non-recoverable error.
+     */
+    public CheckingErrorListener() {
+        this(THROW_ON_FATAL);
+    }
+
+    /**
+     * Tells us when we should re-throw exceptions.
+     *
+     * @return THROW_WHEN_* constant as to when we should re-throw an exception
+     * when we are called
+     */
+    public int getThrowWhen() {
+        return throwWhen;
+    }
+
+    /**
+     * Constant for items returned in getCounters: messages.
+     */
+    public static final int TYPE_WARNING = 0;
+
+    /**
+     * Constant for items returned in getCounters: errors.
+     */
+    public static final int TYPE_ERROR = 1;
+
+    /**
+     * Constant for items returned in getCounters: fatalErrors.
+     */
+    public static final int TYPE_FATALERROR = 2;
+
+    /**
+     * Expected values for events we may handle, default=ITEM_DONT_CARE.
+     */
+    private final Expectation[] expected = {
+                ITEM_DONT_CARE, /* warning */
+                ITEM_DONT_CARE, /* error */
+                ITEM_DONT_CARE /* fatalError */};
+
+    /**
+     * Ask us to report checkPass/Fail for certain events we handle. Since we
+     * may have to handle many events between when a test will be able to call
+     * us, testers can set this to have us automatically call checkPass when we
+     * see an item that matches, or to call checkFail when we get an unexpected
+     * item. Generally, we only call check* methods when:
+     * <ul>
+     * <li>containsString is not set, reset, or is ITEM_DONT_CARE, we do nothing
+     * (i.e. never call check* for this item)</li>
+     * <li>containsString is ITEM_CHECKFAIL, we will always call checkFail with
+     * the contents of any item if it occurs</li>
+     * <li>containsString is anything else, we will grab a String representation
+     * of every item of that type that comes along, and if the containsString is
+     * found, case-sensitive, within the handled item's string, call checkPass,
+     * otherwise call checkFail</li>
+     * </ul>
+     * Note that any time we handle a particular event that was expected, we
+     * un-set the expected value for that item. This means that you can only ask
+     * us to validate one occurrence of any particular event; all events after
+     * that one will be treated as ITEM_DONT_CARE. Callers can of course call
+     * setExpected again, of course, but this covers the case where we handle
+     * multiple events in a single block, perhaps out of the caller's direct
+     * control. Note that we first store the event via setLast(), then we
+     * validate the event as above, and then we potentially re-throw the
+     * exception as by setThrowWhen().
+     *
+     * @param itemType which of the various types of items we might handle;
+     * should be defined as a constant by subclasses
+     * @param expectation expectation if we need check or not.
+     */
+    @Override
+    public void setExpected(int itemType, Expectation expectation) {
+        expected[itemType] = expectation;
+    }
+
+    /**
+     * Reset all items or counters we've handled.
+     */
+    @Override
+    public void reset() {
+        for (int j = 0; j < expected.length; j++) {
+            expected[j] = ITEM_DONT_CARE;
+        }
+    }
+
+    /**
+     * Grab basic info out of a TransformerException. Worker method to hide
+     * implementation; currently just calls exception.getMessageAndLocation().
+     *
+     * @param exception to get information from
+     * @return simple string describing the exception (getMessageAndLocation())
+     */
+    public String getTransformerExceptionInfo(TransformerException exception) {
+        if (exception == null) {
+            return "";  // Don't return null, just to make other code here simpler
+        }
+        return exception.getMessageAndLocation();
+    }
+
+    /**
+     * Implementation of warning; calls logMsg with info contained in exception.
+     *
+     * @param exception provided by Transformer
+     * @exception TransformerException thrown only if asked to or if loggers are
+     * bad
+     */
+    @Override
+    public void warning(TransformerException exception) throws TransformerException {
+        // Log or validate the exception
+        if(expected[TYPE_WARNING] == ITEM_CHECKPASS)
+            fail("Unexpected error: ex " + exception);
+
+        // Also re-throw the exception if asked to
+        if ((throwWhen & THROW_ON_WARNING) == THROW_ON_WARNING) {
+            // Note: re-throw the SAME exception, not a new one!
+            throw exception;
+        }
+    }
+
+    /**
+     * Implementation of error; calls logMsg with info contained in exception.
+     * Only ever throws an exception itself if asked to or if loggers are bad.
+     *
+     * @param exception provided by Transformer
+     * @exception TransformerException thrown only if asked to.
+     */
+    @Override
+    public void error(TransformerException exception) throws TransformerException {
+        // validate the exception
+        if(expected[TYPE_ERROR] == ITEM_CHECKPASS)
+            fail("Unexpected error: ex " + exception);
+
+        // Also re-throw the exception if asked to
+        if ((throwWhen & THROW_ON_ERROR) == THROW_ON_ERROR) {
+            // Note: re-throw the SAME exception, not a new one!
+            throw exception;
+        }
+    }
+
+    /**
+     * Implementation of error; calls logMsg with info contained in exception.
+     * Only ever throws an exception itself if asked to or if loggers are bad.
+     * Note that this may cause unusual behavior since we may not actually
+     * re-throw the exception, even though it was 'fatal'.
+     *
+     * @param exception provided by Transformer
+     * @exception TransformerException thrown only if asked to.
+     */
+    @Override
+    public void fatalError(TransformerException exception) throws TransformerException {
+        // validate the exception
+        if(expected[TYPE_FATALERROR] == ITEM_CHECKPASS)
+            fail("Unexpected fatal error: ex " + exception);
+
+        // Also re-throw the exception if asked to
+        if ((throwWhen & THROW_ON_FATAL) == THROW_ON_FATAL) {
+            // Note: re-throw the SAME exception, not a new one!
+            throw exception;
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/trax/CheckingURIResolver.java	2015-01-09 15:42:26.538194752 -0800
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.trax;
+
+import com.sun.org.apache.xml.internal.utils.SystemIDResolver;
+import java.util.Arrays;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.stream.StreamSource;
+import static org.testng.Assert.fail;
+
+/**
+ * Implementation of URIResolver that logs all calls. Currently just provides
+ * default service; returns null.
+ *
+ */
+public class CheckingURIResolver implements URIResolver {
+
+    /**
+     * Expected value(s) for URIs we may resolve.
+     */
+    private final String[] expected;
+    
+    /**
+     * Default constructor for simple verification test. 
+     */
+    public CheckingURIResolver() {
+        this.expected = new String[0];
+    }
+    
+    /**
+     * Initiator by given URIs that we expected.
+     * 
+     * @param expected expected URI string that will be verified when resolve. 
+     */
+    public CheckingURIResolver(final String[] expected) {
+        this.expected = expected;
+    }
+
+    /**
+     * This will be called by the processor when it encounters an xsl:include,
+     * xsl:import, or document() function.
+     *
+     * @param href An href attribute, which may be relative or absolute.
+     * @param base The base URI in effect when the href attribute was
+     * encountered.
+     * @return A non-null Source object.
+     * @throws TransformerException if an error occurs when trying to resolve
+     *         the URI.
+     */
+    @Override
+    public Source resolve(String href, String base) throws TransformerException {
+        // Note that we don't currently have a default URIResolver,
+        //  so the LoggingURIResolver class will just attempt
+        //  to use the SystemIDResolver class instead
+        String sysId = SystemIDResolver.getAbsoluteURI(href, base);
+        Source resolvedSource = new StreamSource(sysId);
+
+        // verifiy sysId and base.
+        if(!Arrays.stream(expected).anyMatch(expectedStr -> 
+                expectedStr.equals("{" + base + "}" + href)))
+            fail("Unexpected resolve called href:" + href + ";base:" + base);
+        return resolvedSource;
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/trax/TraxConst.java	2015-01-09 15:42:26.835195216 -0800
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.apache.qetest.trax;
+
+import static jaxp.library.JAXPTestUtilities.getPathByClassName;
+
+/**
+ * This is the utilities test class provide basic support for Trax test.
+ */
+public class TraxConst {
+    /**
+     * XML source file directory.
+     */
+    public static final String XML_DIR = getPathByClassName(TraxConst.class, "content"); 
+
+    /**
+     * Golden validation files directory.
+     */
+    public static final String GOLDEN_DIR = getPathByClassName(TraxConst.class, "golden");
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xsl/CheckingContentHandler.java	2015-01-09 15:42:27.105195637 -0800
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xsl;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+/**
+ * Cheap-o ContentHandler for use by API tests.
+ * <p>Implements ContentHandler and a way to debug SAX stuff.</p>
+ */
+public class CheckingContentHandler implements ContentHandler  {
+    /**
+     * Our default handler that we pass all events through to.
+     */
+    private volatile ContentHandler defaultHandler;
+
+    /**
+     * Set a default handler for us to wrapper. Set a ContentHandler for us to
+     * use.
+     * @param handler Object of the correct type to pass-through to.
+     */
+    public void setDefaultHandler(ContentHandler handler) {
+        defaultHandler = handler;
+
+    }
+
+    /**
+     * Accessor method for our default handler.
+     * @return default (Object) our default handler; null if unset
+     */
+    public ContentHandler getDefaultHandler() {
+        return defaultHandler;
+    }
+    
+    @Override
+    public void setDocumentLocator(Locator locator) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void startDocument() throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void endDocument() throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void startPrefixMapping(String prefix, String uri) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void endPrefixMapping(String prefix) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void characters(char[] ch, int start, int length) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void processingInstruction(String target, String data) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void skippedEntity(String name) throws SAXException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }   
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xsl/CheckingLexicalHandler.java	2015-01-09 15:42:27.386196076 -0800
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xsl;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * Cheap-o LexicalHandler for use by API tests. This is a wrapper LexicalHandler.
+ * It always delegate the lexical analysis to wrapped LexicalHandler.
+ */
+public class CheckingLexicalHandler implements LexicalHandler {
+    /**
+     * Default handler
+     */
+    private final LexicalHandler defaultHandler;
+    
+    /**
+     * Default constructor.
+     */
+    public CheckingLexicalHandler() {
+        defaultHandler = null;
+    } 
+    
+    /**
+     * Constructor by setting LexicalHandler.
+     * @param lh a delegated LexicalHandler.
+     */
+    public CheckingLexicalHandler(LexicalHandler lh) {
+        defaultHandler = lh;
+    } 
+    
+    ////////////////// Implement LexicalHandler //////////////////
+    @Override
+    public void startDTD(String name, String publicId, String systemId) throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.startDTD(name, publicId, systemId);
+    }
+
+    @Override
+    public void endDTD() throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.endDTD();
+    }
+
+    @Override
+    public void startEntity(String name) throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.startEntity(name);
+    }
+
+    @Override
+    public void endEntity(String name) throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.endEntity(name);
+    }
+
+    @Override
+    public void startCDATA() throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.startCDATA();
+    }
+
+    @Override
+    public void endCDATA() throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.endCDATA();
+    }
+
+    @Override
+    public void comment(char ch[], int start, int length) throws SAXException {
+        if(null != defaultHandler)
+            defaultHandler.comment(ch, start, length);
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xsl/CheckingSAXErrorHandler.java	2015-01-09 15:42:27.694196558 -0800
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xsl;
+
+import org.apache.qetest.CheckingHandler;
+import static org.apache.qetest.CheckingHandler.Expectation.ITEM_CHECKPASS;
+import static org.apache.qetest.CheckingHandler.Expectation.ITEM_DONT_CARE;
+import static org.testng.Assert.fail;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * Cheap-o ErrorHandler for use by API tests.
+ */
+public class CheckingSAXErrorHandler implements CheckingHandler, ErrorHandler {
+
+    /**
+     * Constants determining when we should throw exceptions.
+     * <ul>Flags are combineable like a bitfield.
+     * <li>THROW_NEVER - never ever (always continue - note this may have
+     * unexpected effects when fatalErrors happen, see
+     * {@link javax.xml.transform.ErrorListener#fatalError(javax.xml.transform.TransformerException)}</li>
+     * <li>THROW_ON_WARNING - throw only on warnings</li>
+     * <li>THROW_ON_ERROR - throw only on errors</li>
+     * <li>THROW_ON_FATAL - throw only on fatalErrors - default</li>
+     * <li>THROW_ALWAYS - always throw exceptions</li>
+     * </ul>
+     */
+    public static final int THROW_NEVER = 0;
+
+    /**
+     * THROW_ON_WARNING - throw only on warnings.
+     */
+    public static final int THROW_ON_WARNING = 1;
+
+    /**
+     * THROW_ON_ERROR - throw only on errors.
+     */
+    public static final int THROW_ON_ERROR = 2;
+
+    /**
+     * THROW_ON_FATAL - throw only on fatalErrors - default.
+     */
+    public static final int THROW_ON_FATAL = 4;
+
+    /**
+     * THROW_ALWAYS - always throw exceptions.
+     */
+    public static final int THROW_ALWAYS = THROW_ON_WARNING | THROW_ON_ERROR
+            | THROW_ON_FATAL;
+
+    /**
+     * If we should throw an exception for each message type.
+     */
+    private final int throwWhen;
+
+    /**
+     * Constructor set when we should re-throw exceptions.
+     *
+     * @param t THROW_WHEN_* constant as to when we should re-throw an exception
+     * when we are called
+     */
+    public CheckingSAXErrorHandler(int t) {
+        throwWhen = t;
+    }
+
+    /**
+     * Default constructor will behave as default. Throw only when there is 
+     * non-recoverable error.
+     */ 
+    public CheckingSAXErrorHandler() {
+        this.throwWhen = THROW_ON_FATAL;
+    }
+
+    /**
+     * Tells us when we should re-throw exceptions.
+     *
+     * @return THROW_WHEN_* constant as to when we should re-throw an exception
+     * when we are called
+     */
+    public int getThrowWhen() {
+        return throwWhen;
+    }
+
+    /**
+     * Constant for items returned in getCounters: messages.
+     */
+    public static final int TYPE_WARNING = 0;
+
+    /**
+     * Constant for items returned in getCounters: errors.
+     */
+    public static final int TYPE_ERROR = 1;
+
+    /**
+     * Constant for items returned in getCounters: fatalErrors.
+     */
+    public static final int TYPE_FATALERROR = 2;
+
+    /**
+     * Expected values for events we may handle, default=ITEM_DONT_CARE.
+     */
+    private final Expectation[] expected = {
+        ITEM_DONT_CARE, /* warning */
+        ITEM_DONT_CARE, /* error */
+        ITEM_DONT_CARE /* fatalError */};
+
+    /**
+     * Ask us to report checkPass/Fail for certain events we handle. Since we
+     * may have to handle many events between when a test will be able to call
+     * us, testers can set this to have us automatically call checkPass when we
+     * see an item that matches, or to call checkFail when we get an unexpected
+     * item. Generally, we only call check* methods when:
+     * <ul>
+     * <li>containsString is not set, reset, or is ITEM_DONT_CARE, we do nothing
+     * (i.e. never call check* for this item)</li>
+     * <li>containsString is ITEM_CHECKFAIL, we will always call checkFail with
+     * the contents of any item if it occurs</li>
+     * <li>containsString is anything else, we will grab a String representation
+     * of every item of that type that comes along, and if the containsString is
+     * found, case-sensitive, within the handled item's string, call checkPass,
+     * otherwise call checkFail</li>
+     * </ul>
+     * Note that any time we handle a particular event that was expected, we
+     * un-set the expected value for that item. This means that you can only ask
+     * us to validate one occurrence of any particular event; all events after
+     * that one will be treated as ITEM_DONT_CARE. Callers can of course call
+     * setExpected again, of course, but this covers the case where we handle
+     * multiple events in a single block, perhaps out of the caller's direct
+     * control. Note that we first store the event via setLast(), then we
+     * validate the event as above, and then we potentially re-throw the
+     * exception as by setThrowWhen().
+     *
+     * @param itemType which of the various types of items we might handle;
+     * should be defined as a constant by subclasses
+     * @param expectation expectation if we need check or not.
+     */
+    @Override
+    public void setExpected(int itemType, Expectation expectation) {
+        expected[itemType] = expectation;
+    }
+
+    /**
+     * Reset all items or counters we've handled.
+     */
+    @Override
+    public void reset() {
+        for (int j = 0; j < expected.length; j++) {
+            expected[j] = ITEM_DONT_CARE;
+        }
+    }
+
+    /**
+     * Receive notification of a warning. fail the test if it expects pass.
+     * Re-throw the exception when re-throw flag is set.
+     * @param exception The error information encapsulated in a
+     *                  SAX parse exception.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception. 
+     */
+    @Override
+    public void warning(SAXParseException exception) throws SAXException {
+        // Log or validate the exception
+        if (expected[TYPE_WARNING] == ITEM_CHECKPASS) {
+            fail("Unexpected error: ex " + exception);
+        }
+
+        // Also re-throw the exception if asked to
+        if ((throwWhen & THROW_ON_WARNING) == THROW_ON_WARNING) {
+            // Note: re-throw the SAME exception, not a new one!
+            throw exception;
+        }
+    }
+
+    /**
+     * Receive notification of a recoverable error. fail the test if it expects
+     * pass. Re-throw the exception when re-throw flag is set.
+     * @param exception The error information encapsulated in a
+     *                  SAX parse exception.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception. 
+     */
+    @Override
+    public void error(SAXParseException exception) throws SAXException {
+        // validate the exception
+        if (expected[TYPE_FATALERROR] == ITEM_CHECKPASS) {
+            fail("Unexpected fatal error: ex " + exception);
+        }
+
+        // Also re-throw the exception if asked to
+        if ((throwWhen & THROW_ON_ERROR) == THROW_ON_ERROR) {
+            // Note: re-throw the SAME exception, not a new one!
+            throw exception;
+        }
+    }
+
+    /**
+     * Receive notification of a non-recoverable error. fail the test if it 
+     * expects pass. Re-throw the exception when re-throw flag is set.
+     * @param exception The error information encapsulated in a
+     *                  SAX parse exception.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception. 
+     */
+    @Override
+    public void fatalError(SAXParseException exception) throws SAXException {
+        // validate the exception
+        if (expected[TYPE_ERROR] == ITEM_CHECKPASS) {
+            fail("Unexpected fatal error: ex " + exception);
+        }
+
+        // Also re-throw the exception if asked to
+        if ((throwWhen & THROW_ON_FATAL) == THROW_ON_FATAL) {
+            // Note: re-throw the SAME exception, not a new one!
+            throw exception;
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TransformWrapper.java	2015-01-09 15:42:27.974196995 -0800
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.Properties;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+
+/**
+ * Helper interface to wrapper various XSLT processors for testing.
+ *
+ * A TransformWrapper wraps a particular 'flavor' of XSLT processing. This
+ * includes both a particular XSLT implementation, such as Xalan or Saxon, as
+ * well as a particular method to perform processing, like using streams or DOMs
+ * to perform transforms.
+ *
+ * As an important side effect, this class should return timing information
+ * about the steps done to perform the transformation. Note that exactly what is
+ * timed and how it's timed should be clearly documented in implementing
+ * classes!
+ *
+ * This is not a general-purpose wrapper for doing XSLT transformations: for
+ * that, you might as well use the real javax.xml.transform package itself.
+ * However this does allow many conformance and performance tests to run
+ * comparatively between different flavors of processors.
+ *
+ * TransformWrapper is a bit of an awkward name, but I wanted to keep it
+ * separate from the pre-existing ProcessorWrapper that this replaces so we can
+ * ensure stability for Xalan testing while updating to this new class.
+ *
+ */
+public interface TransformWrapper {
+    /**
+     * URL for set/getAttribute: should be an integer to set for the output
+     * indent of the processor.
+     *
+     * This is a common enough attribute that most wrapper implementations
+     * should be able to support it in a straightforward manner.
+     */
+    public static final String ATTRIBUTE_INDENT
+            = "http://xml.apache.org/xalan/wrapper/indent";
+
+    /**
+     * URL for set/getAttribute: should be an Object to attempt to set as a
+     * diagnostic log/stream for the processor.
+     *
+     */
+    public static final String ATTRIBUTE_DIAGNOSTICS
+            = "http://xml.apache.org/xalan/wrapper/diagnostics";
+
+    /**
+     * Marker for Attributes to set on Processors.
+     *
+     * Options that startWith() this constant will actually be attempted to be
+     * set onto our underlying processor/transformer.
+     */
+    public static final String SET_PROCESSOR_ATTRIBUTES
+            = "Processor.setAttribute.";
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    public Properties getProcessorInfo();
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory. For Xalan-J 1.x this creates an XSLTProcessor. Other
+     * implementations may or may not actually do any work in this method.
+     *
+     * @param options Properties of options, possibly specific to that
+     * implementation. For future use.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation can't initiate a TransformerFactory.
+     */
+    public TransformerFactory newProcessor(Properties options) throws TransformerConfigurationException;
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed for any underlying processor implementation.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception;
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    public void buildStylesheet(String xslName) throws Exception;
+
+    /**
+     * Reports if a pre-built/pre-compiled stylesheet is ready; presumably built
+     * by calling buildStylesheet(xslName).
+     *
+     * @return true if one is ready; false otherwise
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    public boolean isStylesheetReady();
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception;
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrapped processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception;
+
+    /**
+     * Set a stylesheet parameter for use in later transforms.
+     *
+     * This method merely stores the triple for use later in a transform
+     * operation. Note that the actual mechanisims for setting parameters in
+     * implementation differ, especially with regards to namespaces.
+     *
+     * Note that the namespace may not contain the "{" or "}" characters, since
+     * these would be illegal XML namespaces anyways; an
+     * IllegalArgumentException will be thrown; also the name must not be null.
+     *
+     * @param namespace for the parameter, must not contain {}
+     * @param name of the parameter, must not be null
+     * @param value of the parameter
+     *
+     * @throws IllegalArgumentException thrown if the namespace or name appears
+     * to be illegal.
+     */
+    public void setParameter(String namespace, String name, String value)
+            throws IllegalArgumentException;
+
+    /**
+     * Get a parameter that was set with setParameter.
+     *
+     * Only returns parameters set locally, not parameters exposed by the
+     * underlying processor implementation. Not terribly useful but I like
+     * providing gets for any sets I define.
+     *
+     * @param namespace for the parameter, must not contain {}
+     * @param name of the parameter, must not be null
+     *
+     * @return value of the parameter; null if not found
+     */
+    public Object getParameter(String namespace, String name);
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    public void reset(boolean newProcessor);
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TransformWrapperFactory.java	2015-01-09 15:42:28.293197493 -0800
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.Properties;
+
+/**
+ * Factory static class for creating TransformWrappers.
+ *
+ * Includes a 'wrapperMapper' functionality to simplify specifying the 'flavor'
+ * of a wrapper to create. This is optional, but will allow a user to specify
+ * newWrapper("trax.file") and get back an instance of an
+ * org.apache.qetest.xslwrapper.TraxFileWrapper.
+ */
+public class TransformWrapperFactory {
+
+    /**
+     * Currently known list of implemented wrappers.
+     * <ul>
+     * <p>Allows specification of a simple name for each wrapper, so clients 
+     * don't necessarily have to know the FQCN or fully qualified class name of
+     * their wrapper.</p>
+     * </ul>
+     */
+    protected final static Properties wrapperMapper = new Properties();
+
+    /**
+     * Static initializer for wrapperMapper. Attempts to load
+     * TransformWrapperFactory.properties into our wrapperMapper.
+     */
+    static {
+        // Add a default trax flavor, since it's widely used
+        // This should be overwritten below if the properties
+        // file can be loaded.
+        wrapperMapper.put("trax.systemId", "org.apache.qetest.xslwrapper.TraxSystemIdWrapper");
+        wrapperMapper.put("trax.file", "org.apache.qetest.xslwrapper.TraxFileWrapper");
+        wrapperMapper.put("trax.stream", "org.apache.qetest.xslwrapper.TraxStreamWrapper");
+        wrapperMapper.put("trax.dom", "org.apache.qetest.xslwrapper.TraxDOMWrapper");
+        wrapperMapper.put("trax.sax", "org.apache.qetest.xslwrapper.TraxSAXWrapper");
+        wrapperMapper.put("trax.localPath", "org.apache.qetest.xslwrapper.TraxLocalPathWrapper");
+        wrapperMapper.put("trax.systemId3", "org.apache.qetest.xslwrapper.TraxSystemId3Wrapper");
+    }
+
+    /**
+     * Accessor for our wrapperMapper.
+     * @return Properties block of wrapper implementations that we implicitly 
+     * know about; may be null if we have none
+     */
+    public static final Properties getDescriptions() {
+        return wrapperMapper;
+    }
+
+    /**
+     * Return an instance of a TransformWrapper of requested flavor.
+     *
+     * This static factory method creates TransformWrappers for the user. Our
+     * 'wrapperMapper' functionality allows users to either specify short names
+     * listed in TransformWrapperFactory.properties (which are mapped to the
+     * appropriate FQCN's) or to directly supply the FQCN of a wrapper to
+     * create.
+     *
+     * @param flavor to create, either a wrapperMapped one or FQCN
+     *
+     * @return instance of a wrapper; will throw an IllegalArgumentException if
+     * we cannot find the asked-for wrapper class anywhere
+     */
+    public static final TransformWrapper newWrapper(String flavor) {
+        // Attempt to lookup the flavor: if found, use the value we got, 
+        // otherwise default to the same value
+        String className = wrapperMapper.getProperty(flavor, flavor);
+
+        try {
+            // Allow people to use bare classnames in popular packages
+            Class clazz = Class.forName(className);
+            return (TransformWrapper) clazz.newInstance();
+        } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+            throw new IllegalArgumentException("newWrapper(" + flavor + ") threw: " + e.toString());
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TransformWrapperHelper.java	2015-01-09 15:42:28.558197907 -0800
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.HashMap;
+import java.util.Properties;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+
+/**
+ * A few default implementations of TransformWrapper methods.
+ *
+ * A TransformWrapperHelper implements a few of the common methods from
+ * TransformWrapper that don't directly interact with the underlying processor.
+ * Individual wrapper implementations are free to extend this class to get some
+ * free code.
+ */
+public abstract class TransformWrapperHelper implements TransformWrapper {
+    /**
+     * TransformerFactory to use; constructed in newProcessor().
+     */
+    protected TransformerFactory factory;
+
+    /**
+     * Cached copy of newProcessor() properties.
+     */
+    protected Properties newProcessorOpts;
+
+    /**
+     * Constant denoting that indent should not be set.
+     */
+    private static final int NO_INDENT = -2;
+
+    /**
+     * Set of stylesheet parameters for use in transforms.
+     */
+    protected final HashMap<String,String> m_params = new HashMap<>();
+
+    /**
+     * If our wrapper has a built stylesheet ready.
+     */
+    protected volatile boolean m_stylesheetReady = false;
+
+    /**
+     * Current number of spaces to indent, default: NO_INDENT. Users call
+     * setAttribute(ATTRIBUTE_INDENT, int) to set this. If it is set, it will be
+     * applied to an underlying processor during each transform operation, where
+     * supported.
+     */
+    protected int m_indent = NO_INDENT;
+
+    /**
+     * Reports if a pre-built/pre-compiled stylesheet is ready; presumably built
+     * by calling buildStylesheet(xslName).
+     *
+     * @return true if one is ready; false otherwise
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public boolean isStylesheetReady() {
+        return m_stylesheetReady;
+    }
+
+    /**
+     * Set a stylesheet parameter for use in later transforms.
+     *
+     * This method merely stores the triple for use later in a transform
+     * operation. Note that the actual mechanisims for setting parameters in
+     * implementation differ, especially with regards to namespaces.
+     *
+     * Note that the namespace may not contain the "{" or "}" characters, since
+     * these would be illegal XML namespaces anyways; an
+     * IllegalArgumentException will be thrown. Note that the name may not begin
+     * with the "{" character, since it would likely be an illegal XML name
+     * anyways; an IllegalArgumentException will be thrown.
+     *
+     * @param namespace for the parameter
+     * @param name of the parameter
+     * @param value of the parameter
+     *
+     * @throws IllegalArgumentException thrown if the namespace appears to be
+     * illegal.
+     */
+    @Override
+    public void setParameter(String namespace, String name, String value)
+            throws IllegalArgumentException {
+        if (null != namespace) {
+            if ((namespace.contains("{"))
+                    || (namespace.contains("}"))) {
+                throw new IllegalArgumentException("setParameter: illegal namespace includes brackets: " + namespace);
+            }
+        }
+        if (null != name) {
+            if (name.startsWith("{")) {
+                throw new IllegalArgumentException(
+                        "setParameter: illegal name begins with bracket: " + name);
+            }
+        }
+
+        if (null != namespace) {
+            m_params.put("{" + namespace + "}" + name, value);
+        } else {
+            m_params.put(name, value);
+        }
+    }
+
+    /**
+     * Get a parameter that was set with setParameter.
+     *
+     * Only returns parameters set locally, not parameters exposed by the
+     * underlying processor implementation. Not terribly useful but I always
+     * like providing gets for any sets I define.
+     *
+     * @param namespace for the parameter
+     * @param name of the parameter
+     */
+    @Override
+    public Object getParameter(String namespace, String name) {
+        if (null == m_params) {
+            return null;
+        }
+
+        if (null != namespace) {
+            return m_params.get("{" + namespace + "}" + name);
+        } else {
+            return m_params.get(name);
+        }
+    }
+
+    /**
+     * Apply the parameters that were set with setParameter to our underlying
+     * processor implementation.
+     *
+     * Subclasses may call this to apply all set parameters during each
+     * transform if they override the applyParameter() method to set a single
+     * parameter.
+     *
+     * This is a convenience method for getting data out of m_params that was
+     * encoded by our setParameter().
+     *
+     * @param transformer a Transformer object.
+     */
+    protected void applyParameters(Transformer transformer) {
+        m_params.forEach((key, value) -> {
+            String namespace = null;
+            String name;
+            if (key.startsWith("{")) {
+                int idx = key.indexOf("}");
+                namespace = key.substring(1, idx);
+                name = key.substring(idx + 1);
+            } else {
+                // namespace stays null
+                name = key;
+            }
+            // Call subclassed worker method for each parameter
+            applyParameter(transformer, namespace, name, value);
+        });
+    }
+
+    /**
+     * Apply a single parameter to our underlying processor implementation: must
+     * be overridden.
+     *
+     * Subclasses must override; this class will throw an IllegalStateException
+     * since we can't do anything.
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    protected abstract void applyParameter(Transformer transformer, String namespace,
+            String name, String value);
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This class clears the indent and any parameters. Subclasses are free to
+     * call us to get this default behavior or not. Note that subclasses must
+     * clear m_stylesheetReady themselves if needed.
+     *
+     * @param newProcessor ignored in this class
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        m_params.clear();
+        m_indent = NO_INDENT;
+    }
+
+    /**
+     * Ensure newProcessor has been called when needed.
+     *
+     * Prevent users from shooting themselves in the foot by calling a
+     * transform* API before newProcessor().
+     *
+     * @throws java.lang.Exception
+     */
+    public void preventFootShooting() throws Exception {
+        if (null == factory) {
+            newProcessor(newProcessorOpts);
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxDOMWrapper.java	2015-01-09 15:42:28.821198318 -0800
@@ -0,0 +1,392 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.Properties;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses DOMs for
+ * it's sources.
+ *
+ * This implementation records separate times for xslRead (time to parse the xsl
+ * and build a DOM) and xslBuild (time to take the DOMSource object until it's
+ * built the templates); xmlRead (time to parse the xml and build a DOM). Note
+ * xmlBuild is not timed since it's not easily measureable in TrAX. The
+ * transform time is just the time to create the DOMResult object; the
+ * resultsWrite is the separate time it takes to serialize that to disk.
+ *
+ * <b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.
+ *
+ */
+public class TraxDOMWrapper extends TransformWrapperHelper {
+    /**
+     * Templates to use for buildStylesheet().
+     */
+    private Templates builtTemplates;
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform transforms from DOMSource(node)
+     */
+    public String getDescription() {
+        return "Uses TrAX to perform transforms from DOMSource(node)";
+    }
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "dom");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory. For Xalan-J 1.x this creates an XSLTProcessor. Other
+     * implementations may or may not actually do any work in this method.
+     *
+     * @param options Properties of options, unused.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation doesn't support StreamSource or StreamResult.
+     */
+    @Override
+    public TransformerFactory newProcessor(Properties options) throws TransformerConfigurationException {
+        newProcessorOpts = options;
+        reset(false);
+        factory = TransformerFactory.newInstance();
+        // Verify the factory supports DOM!
+        if (!(factory.getFeature(DOMSource.FEATURE)
+                && factory.getFeature(DOMResult.FEATURE))) {
+            throw new TransformerConfigurationException("TraxDOMWrapper.newProcessor: factory does not support DOM!");
+        }
+        // Set any of our options as Attributes on the factory
+        TraxWrapperUtils.setAttributes(factory, options);
+        return factory;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed for any underlying processor implementation.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+
+        // Timed: read xsl into a DOM
+        Node xslNode = docBuilder.parse(new InputSource(filenameToURL(xslName)));
+
+        // Untimed: create DOMSource and setSystemId
+        DOMSource xslSource = new DOMSource(xslNode);
+        xslSource.setSystemId(filenameToURL(xslName));
+
+        // Timed: build Transformer from DOMSource
+        Transformer transformer = factory.newTransformer(xslSource);
+
+        // Timed: read xml into a DOM
+        Node xmlNode = docBuilder.parse(new InputSource(filenameToURL(xmlName)));
+
+        // Untimed: create DOMSource and setSystemId
+        DOMSource xmlSource = new DOMSource(xmlNode);
+        xmlSource.setSystemId(filenameToURL(xmlName));
+
+        // Untimed: create DOMResult
+        Document outDoc = docBuilder.newDocument();
+        DocumentFragment outNode = outDoc.createDocumentFragment();
+        DOMResult domResult = new DOMResult(outNode);
+
+        // Untimed: Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Untimed: Apply any parameters needed
+        applyParameters(transformer);
+
+        // Timed: build xml (so to speak) and transform
+        transformer.transform(xmlSource, domResult);
+
+        // Untimed: prepare serializer with outputProperties
+        //  from the stylesheet
+        Transformer resultSerializer = factory.newTransformer();
+        Properties serializationProps = transformer.getOutputProperties();
+        resultSerializer.setOutputProperties(serializationProps);
+
+        // Timed: writeResults from the DOMResult
+        resultSerializer.transform(new DOMSource(outNode),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    @Override
+    public void buildStylesheet(String xslName) throws Exception {
+        preventFootShooting();
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+
+        // Read xsl into a DOM
+        Node xslNode = docBuilder.parse(new InputSource(filenameToURL(xslName)));
+        // Untimed: create DOMSource and setSystemId
+        DOMSource xslSource = new DOMSource(xslNode);
+        xslSource.setSystemId(filenameToURL(xslName));
+
+        // Build Templates from DOMSource
+        builtTemplates = factory.newTemplates(xslSource);
+
+        m_stylesheetReady = true;
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+
+        preventFootShooting();
+
+        // Get Transformer from Templates
+        Transformer transformer = builtTemplates.newTransformer();
+
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+
+        // Read xml into a DOM
+        Node xmlNode = docBuilder.parse(new InputSource(filenameToURL(xmlName)));
+
+        // Create DOMSource and setSystemId
+        DOMSource xmlSource = new DOMSource(xmlNode);
+        xmlSource.setSystemId(filenameToURL(xmlName));
+
+        // Create DOMResult
+        Document outNode = docBuilder.newDocument();
+        DOMResult domResult = new DOMResult(outNode);
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // Build xml (so to speak) and transform
+        transformer.transform(xmlSource, domResult);
+
+        // Prepare serializer with outputProperties from the stylesheet
+        Transformer resultSerializer = factory.newTransformer();
+        Properties serializationProps = transformer.getOutputProperties();
+        resultSerializer.setOutputProperties(serializationProps);
+
+        // writeResults from the DOMResult
+        resultSerializer.transform(new DOMSource(outNode),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrapped processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+        dfactory.setNamespaceAware(true);
+        DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
+
+        // read xml into a DOM
+        Node xmlNode = docBuilder.parse(new InputSource(filenameToURL(xmlName)));
+
+        // create DOMSource and setSystemId
+        DOMSource xmlSource = new DOMSource(xmlNode);
+        xmlSource.setSystemId(filenameToURL(xmlName));
+
+        // readxsl from the xml document
+        Source xslSource = factory.getAssociatedStylesheet(xmlSource,
+                null, null, null);
+
+        // build Transformer from Source
+        Transformer transformer = factory.newTransformer(xslSource);
+
+        // create DOMResult
+        Document outNode = docBuilder.newDocument();
+        DOMResult domResult = new DOMResult(outNode);
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // Build xml (so to speak) and transform
+        transformer.transform(xmlSource, domResult);
+
+        // Prepare serializer with outputProperties from the stylesheet
+        Transformer resultSerializer = factory.newTransformer();
+        Properties serializationProps = transformer.getOutputProperties();
+        resultSerializer.setOutputProperties(serializationProps);
+
+        // writeResults from the DOMResult
+        resultSerializer.transform(new DOMSource(outNode),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        super.reset(newProcessor); // clears indent and parameters
+        m_stylesheetReady = false;
+        builtTemplates = null;
+        if (newProcessor) {
+            try {
+                newProcessor(newProcessorOpts);
+            } catch (TransformerConfigurationException ignore) {}
+        }
+    }
+
+    /**
+     * Apply a single parameter to a Transformer.
+     *
+     * Overridden to take a Transformer and call setParameter().
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    @Override
+    protected void applyParameter(Transformer transformer, String namespace,
+            String name, String value) {
+        try {
+            // Munge the namespace into the name per
+            //  javax.xml.transform.Transformer.setParameter()
+            if (null != namespace) {
+                name = "{" + namespace + "}" + name;
+            }
+            transformer.setParameter(name, value);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("applyParameter threw: " + e.toString());
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxFileWrapper.java	2015-01-09 15:42:29.077198718 -0800
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.io.File;
+import java.util.Properties;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses files for
+ * it's sources.
+ *
+ * This is the second most common usage: transformer =
+ * factory.newTransformer(new StreamSource(new File(xslName)));
+ * transformer.transform(new StreamSource(new File(xmlName)), new
+ * StreamResult(resultFileName));
+ *
+ * <b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.
+ *
+ */
+public class TraxFileWrapper extends TransformWrapperHelper {
+    /**
+     * Templates to use for buildStylesheet().
+     */
+    private Templates builtTemplates;
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform transforms from StreamSource(systemId)
+     */
+    public String getDescription() {
+        return "Uses TrAX to perform transforms from StreamSource(new File(filename))";
+    }
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "file");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory. For Xalan-J 1.x this creates an XSLTProcessor. Other
+     * implmentations may or may not actually do any work in this method.
+     *
+     * @param options Hashtable of options, unused.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation doesn't support StreamSource or StreamResult.
+     */
+    @Override
+    public TransformerFactory newProcessor(Properties options) throws TransformerConfigurationException {
+        newProcessorOpts = options;
+        reset(false);
+        factory = TransformerFactory.newInstance();
+        // Verify the factory supports Streams!
+        if (!(factory.getFeature(StreamSource.FEATURE)
+                && factory.getFeature(StreamResult.FEATURE))) {
+            throw new TransformerConfigurationException("TraxFileWrapper.newProcessor: factory does not support Streams!");
+        }
+        // Set any of our options as Attributes on the factory
+        TraxWrapperUtils.setAttributes(factory, options);
+        return factory;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed for any underlying processor implementation.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+
+        // read/build xsl from a File
+        Transformer transformer = factory.newTransformer(new StreamSource(new File(xslName)));
+
+        // Untimed: Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Untimed: Apply any parameters needed
+        applyParameters(transformer);
+
+        // Timed: read/build xml, transform, and write results
+        transformer.transform(new StreamSource(new File(xmlName)), new StreamResult(resultName));
+    }
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    @Override
+    public void buildStylesheet(String xslName) throws Exception {
+        preventFootShooting();
+
+        // read/build xsl from a URL
+        builtTemplates = factory.newTemplates(new StreamSource(new File(xslName)));
+        m_stylesheetReady = true;
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+
+        preventFootShooting();
+
+        // Get Transformer from Templates
+        Transformer transformer = builtTemplates.newTransformer();
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results
+        long startTime = System.currentTimeMillis();
+        transformer.transform(new StreamSource(new File(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrapped processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        preventFootShooting();
+        // Read xsl from the xml document.
+        Source xslSource = factory.getAssociatedStylesheet(
+                new StreamSource(new File(xmlName)),null, null, null);
+
+        // Build xsl from a URL
+        Transformer transformer = factory.newTransformer(xslSource);
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results.
+        transformer.transform(new StreamSource(new File(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        super.reset(newProcessor); // clears indent and parameters
+        m_stylesheetReady = false;
+        builtTemplates = null;
+        if (newProcessor) {
+            try {
+                newProcessor(newProcessorOpts);
+            } catch (TransformerConfigurationException ignore) {}
+        }
+    }
+
+    /**
+     * Apply a single parameter to a Transformer.
+     *
+     * Overridden to take a Transformer and call setParameter().
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    @Override
+    protected void applyParameter(Transformer transformer, String namespace,
+            String name, String value) {
+        try {
+            // Munge the namespace into the name per
+            //  javax.xml.transform.Transformer.setParameter()
+            if (null != namespace) {
+                name = "{" + namespace + "}" + name;
+            }
+            transformer.setParameter(name, value);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("applyParameter threw: " + e.toString());
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxLocalPathWrapper.java	2015-01-09 15:42:29.376199185 -0800
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.Properties;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses supplied
+ * local paths for it's sources.
+ *
+ * This is the most common usage: transformer = factory.newTransformer(new
+ * StreamSource(xslPath)); transformer.transform(new StreamSource(xmlPath), new
+ * StreamResult(resultFileName));
+ *
+ * Note that URLs are theoretically required by the TrAX API's, so this is not
+ * necessarily a good test... It is essentially the same as TraxLocalPathWrapper
+ * without calling filenameToURL().
+ *
+ * <b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.
+ *
+ */
+public class TraxLocalPathWrapper extends TransformWrapperHelper {
+    /**
+     * Templates to use for buildStylesheet().
+     */
+    private Templates builtTemplates;
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform transforms from StreamSource(localPath)
+     */
+    public String getDescription() {
+        return "Uses TrAX to perform transforms from StreamSource(localPath)";
+    }
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "localPath");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory. For Xalan-J 1.x this creates an XSLTProcessor. Other
+     * implmentations may or may not actually do any work in this method.
+     *
+     * @param options Hashtable of options, unused.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation doesn't support StreamSource or StreamResult.
+     */
+    @Override
+    public TransformerFactory newProcessor(Properties options) throws TransformerConfigurationException {
+        newProcessorOpts = options;
+        reset(false);
+        factory = TransformerFactory.newInstance();
+        // Verify the factory supports Streams!
+        if (!(factory.getFeature(StreamSource.FEATURE)
+                && factory.getFeature(StreamResult.FEATURE))) {
+            throw new TransformerConfigurationException("TraxLocalPathWrapper.newProcessor: factory does not support Streams!");
+        }
+        // Set any of our options as Attributes on the factory
+        TraxWrapperUtils.setAttributes(factory, options);
+        return factory;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed for any underlying processor implementation.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+        // read/build xsl from a URL
+        Transformer transformer = factory.newTransformer(new StreamSource(xslName));
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results.
+        transformer.transform(new StreamSource(xmlName),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    @Override
+    public void buildStylesheet(String xslName) throws Exception {
+        preventFootShooting();// Timed: read/build xsl from a URL
+        builtTemplates = factory.newTemplates(new StreamSource(xslName));
+        m_stylesheetReady = true;
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+
+        preventFootShooting();
+
+        // Get Transformer from Templates
+        Transformer transformer = builtTemplates.newTransformer();
+        // Untimed: Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results
+        transformer.transform(new StreamSource(xmlName),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrapped processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        preventFootShooting();
+        // Read xsl from the xml document
+        Source xslSource = factory.getAssociatedStylesheet(
+                new StreamSource(xmlName), null, null, null);
+
+        // Build xsl from a URL
+        Transformer transformer = factory.newTransformer(xslSource);
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results
+        transformer.transform(new StreamSource(xmlName),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        super.reset(newProcessor); // clears indent and parameters
+        m_stylesheetReady = false;
+        builtTemplates = null;
+        if (newProcessor) {
+            try {
+                newProcessor(newProcessorOpts);
+            } catch (TransformerConfigurationException ignore) {}
+        }
+    }
+
+    /**
+     * Apply a single parameter to a Transformer.
+     *
+     * Overridden to take a Transformer and call setParameter().
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    @Override
+    protected void applyParameter(Transformer transformer, String namespace,
+            String name, String value) {
+        try {
+            // Munge the namespace into the name per
+            //  javax.xml.transform.Transformer.setParameter()
+            if (null != namespace) {
+                name = "{" + namespace + "}" + name;
+            }
+            transformer.setParameter(name, value);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("applyParameter threw: " + e.toString());
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxSAXWrapper.java	2015-01-09 15:42:29.637199593 -0800
@@ -0,0 +1,463 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses
+ * SAXSource/SAXResult whenever possible.
+ * This implementation uses SAX to build the stylesheet and to perform the
+ * transformation.
+ * <p><b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.</p>
+ *
+ */
+public class TraxSAXWrapper extends TransformWrapperHelper {
+    /**
+     * SAXTransformerFactory we actually use; constructed in newProcessor().
+     */
+    private SAXTransformerFactory saxFactory;
+
+    /**
+     * Templates to use for buildStylesheet().
+     */
+    private Templates builtTemplates;
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform transforms from SAXSource(systemId)
+     */
+    public String getDescription() {
+        return "Uses TrAX to perform transforms from SAXSource(stream)";
+    }
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "sax");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory.
+     *
+     * @param options Hashtable of options, unused.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation doesn't support StreamSource or StreamResult.
+     */
+    @Override
+    public TransformerFactory newProcessor(Properties options) throws TransformerConfigurationException {
+        newProcessorOpts = options;
+        reset(false);
+        factory = TransformerFactory.newInstance();
+        // Verify the factory supports SAX!
+        if (!(factory.getFeature(SAXSource.FEATURE)
+                && factory.getFeature(SAXResult.FEATURE))) {
+            throw new TransformerConfigurationException("TraxSAXWrapper.newProcessor: factory does not support SAX!");
+        }
+        // Set any of our options as Attributes on the factory
+        TraxWrapperUtils.setAttributes(factory, options);
+        saxFactory = (SAXTransformerFactory) factory;
+        return saxFactory;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file using SAX.
+     *
+     * Pseudocode:      <code>
+     *   // Read/build stylesheet
+     *   xslReader.setContentHandler(templatesHandler);
+     *   xslReader.parse(xslName);
+     *
+     *   xslOutputProps = templates.getOutputProperties();
+     *   // Set features and tie in DTD, lexical, etc. handling
+     *
+     *   serializingHandler.getTransformer().setOutputProperties(xslOutputProps);
+     *   serializingHandler.setResult(new StreamResult(outBytes));
+     *   stylesheetHandler.setResult(new SAXResult(serializingHandler));
+     *   xmlReader.setContentHandler(stylesheetHandler);
+     *   // Perform Transform
+     *   xmlReader.parse(xmlName);
+     *   // Separately: write bytes to disk
+     * </code>
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+
+        // Create a ContentHandler to handle parsing of the xsl
+        TemplatesHandler templatesHandler = saxFactory.newTemplatesHandler();
+
+        // Create an XMLReader and set its ContentHandler.
+        // Be sure to use the JAXP methods only!
+        XMLReader xslReader = getJAXPXMLReader();
+        xslReader.setContentHandler(templatesHandler);
+
+        // read/build Templates from StreamSource
+        xslReader.parse(filenameToURL(xslName));
+
+        // Get the Templates object from the ContentHandler.
+        Templates templates = templatesHandler.getTemplates();
+        // Get the outputProperties from the stylesheet, so
+        //  we can later use them for the serialization
+        Properties xslOutputProps = templates.getOutputProperties();
+
+        // Create a ContentHandler to handle parsing of the XML
+        TransformerHandler stylesheetHandler = saxFactory.newTransformerHandler(templates);
+        // Also set systemId to the stylesheet
+        stylesheetHandler.setSystemId(filenameToURL(xslName));
+
+        // Untimed: Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(stylesheetHandler.getTransformer(), newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(stylesheetHandler.getTransformer());
+
+        // Use a new XMLReader to parse the XML document
+        XMLReader xmlReader = getJAXPXMLReader();
+        xmlReader.setContentHandler(stylesheetHandler);
+
+        // Set the ContentHandler to also function as LexicalHandler,
+        // includes "lexical" events (e.g., comments and CDATA).
+        xmlReader.setProperty(
+                "http://xml.org/sax/properties/lexical-handler",
+                stylesheetHandler);
+
+        // Also attempt to set as a DeclHandler, which Xalan-J
+        //  supports even though it is not required by JAXP
+        // Ignore exceptions for other processors since this
+        //  is not a required setting
+        try {
+            xmlReader.setProperty(
+                    "http://xml.org/sax/properties/declaration-handler",
+                    stylesheetHandler);
+        } catch (SAXException se) { /* no-op - ignore */ }
+
+        // added by sb. Tie together DTD and other handling
+        xmlReader.setDTDHandler(stylesheetHandler);
+        try {
+            xmlReader.setFeature(
+                    "http://xml.org/sax/features/namespace-prefixes",
+                    true);
+        } catch (SAXException se) { /* no-op - ignore */ }
+        try {
+            xmlReader.setFeature(
+                    "http://apache.org/xml/features/validation/dynamic",
+                    true);
+        } catch (SAXException se) { /* no-op - ignore */ }
+
+        // Create a 'pipe'-like identity transformer, so we can
+        //  easily get our results serialized to disk
+        TransformerHandler serializingHandler = saxFactory.newTransformerHandler();
+        // Set the stylesheet's output properties into the output
+        //  via it's Transformer
+        serializingHandler.getTransformer().setOutputProperties(xslOutputProps);
+
+        // Create StreamResult to byte stream in memory
+        ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
+        StreamResult byteResult = new StreamResult(outBytes);
+        serializingHandler.setResult(byteResult);
+
+        // Create a SAXResult dumping into our 'pipe' serializer
+        //  and tie in lexical handling (is any other handling needed?)
+        SAXResult saxResult = new SAXResult(serializingHandler);
+        saxResult.setLexicalHandler(serializingHandler);
+
+        // Set the original stylesheet to dump into our result
+        stylesheetHandler.setResult(saxResult);
+
+        // Parse the XML input document and do transform
+        xmlReader.parse(filenameToURL(xmlName));
+
+        // writeResults from the byte array
+        byte[] writeBytes = outBytes.toByteArray(); // Should this be timed too or not?
+        try (FileOutputStream writeStream = new FileOutputStream(resultName)) {
+            writeStream.write(writeBytes);
+        }
+    }
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    @Override
+    public void buildStylesheet(String xslName) throws Exception {
+        preventFootShooting();
+
+        // Create a ContentHandler to handle parsing of the xsl
+        TemplatesHandler templatesHandler = saxFactory.newTemplatesHandler();
+
+        // Create an XMLReader and set its ContentHandler.
+        XMLReader xslReader = getJAXPXMLReader();
+        xslReader.setContentHandler(templatesHandler);
+
+        // read/build Templates from StreamSource
+        xslReader.parse(filenameToURL(xslName));
+
+        // Also set systemId to the stylesheet
+        templatesHandler.setSystemId(filenameToURL(xslName));
+
+        // Get the Templates object from the ContentHandler.
+        builtTemplates = templatesHandler.getTemplates();
+        m_stylesheetReady = true;
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+        preventFootShooting();
+
+        // Get the outputProperties from the stylesheet, so
+        //  we can later use them for the serialization
+        Properties xslOutputProps = builtTemplates.getOutputProperties();
+
+        // Create a ContentHandler to handle parsing of the XML
+        TransformerHandler stylesheetHandler = saxFactory.newTransformerHandler(builtTemplates);
+
+        // Untimed: Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(stylesheetHandler.getTransformer(), newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(stylesheetHandler.getTransformer());
+
+        // Use a new XMLReader to parse the XML document
+        XMLReader xmlReader = getJAXPXMLReader();
+        xmlReader.setContentHandler(stylesheetHandler);
+
+        // Set the ContentHandler to also function as LexicalHandler,
+        // includes "lexical" events (e.g., comments and CDATA).
+        xmlReader.setProperty(
+                "http://xml.org/sax/properties/lexical-handler",
+                stylesheetHandler);
+        xmlReader.setProperty(
+                "http://xml.org/sax/properties/declaration-handler",
+                stylesheetHandler);
+
+        // added by sb. Tie together DTD and other handling
+        xmlReader.setDTDHandler(stylesheetHandler);
+        try {
+            xmlReader.setFeature(
+                    "http://xml.org/sax/features/namespace-prefixes",
+                    true);
+        } catch (SAXException se) { /* no-op - ignore */ }
+        try {
+            xmlReader.setFeature(
+                    "http://apache.org/xml/features/validation/dynamic",
+                    true);
+        } catch (SAXException se) { /* no-op - ignore */ }
+
+        // Create a 'pipe'-like identity transformer, so we can
+        //  easily get our results serialized to disk
+        TransformerHandler serializingHandler = saxFactory.newTransformerHandler();
+        // Set the stylesheet's output properties into the output
+        //  via it's Transformer
+        serializingHandler.getTransformer().setOutputProperties(xslOutputProps);
+
+        // Create StreamResult to byte stream in memory
+        ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
+        StreamResult byteResult = new StreamResult(outBytes);
+        serializingHandler.setResult(byteResult);
+
+        // Create a SAXResult dumping into our 'pipe' serializer
+        //  and tie in lexical handling (is any other handling needed?)
+        SAXResult saxResult = new SAXResult(serializingHandler);
+        saxResult.setLexicalHandler(serializingHandler);
+
+        // Set the original stylesheet to dump into our result
+        stylesheetHandler.setResult(saxResult);
+
+        // Timed: Parse the XML input document and do transform
+        xmlReader.parse(filenameToURL(xmlName));
+
+        // Timed: writeResults from the byte array
+        byte[] writeBytes = outBytes.toByteArray(); // Should this be timed too or not?
+        try (FileOutputStream writeStream = new FileOutputStream(resultName)) {
+            writeStream.write(writeBytes);
+        }
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrappered processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        throw new RuntimeException("TraxSAXWrapper.transformEmbedded not implemented yet!");
+    }
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        super.reset(newProcessor); // clears indent and parameters
+        m_stylesheetReady = false;
+        builtTemplates = null;
+        if (newProcessor) {
+            try {
+                newProcessor(newProcessorOpts);
+            } catch (TransformerConfigurationException ignore) {}
+        }
+    }
+
+    /**
+     * Apply a single parameter to a Transformer.
+     *
+     * Overridden to take a Transformer and call setParameter().
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    @Override
+    protected void applyParameter(Transformer transformer, String namespace,
+            String name, String value) {
+        try {
+            // Munge the namespace into the name per
+            //  javax.xml.transform.Transformer.setParameter()
+            if (null != namespace) {
+                name = "{" + namespace + "}" + name;
+            }
+            transformer.setParameter(name, value);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("applyParameter threw: " + e.toString());
+        }
+    }
+
+    /**
+     * Worker method to get an XMLReader.
+     *
+     * Not the most efficient of methods, but makes the code simpler.
+     *
+     * @return a new XMLReader for use, with setNamespaceAware(true)
+     * @throws java.lang.Exception
+     */
+    protected XMLReader getJAXPXMLReader() throws Exception {
+        // Be sure to use the JAXP methods only!
+        SAXParserFactory sfactory = SAXParserFactory.newInstance();
+        sfactory.setNamespaceAware(true);
+        return sfactory.newSAXParser().getXMLReader();
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxStreamWrapper.java	2015-01-09 15:42:29.901200005 -0800
@@ -0,0 +1,409 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses in-memory
+ * streams for it's sources.
+ *
+ * <p>
+ * This implementation separates the process of reading xml and xsl files from
+ * disk into byte arrays out from the time processing of a new
+ * StreamSource(byte[]) takes to build a stylesheet. It also separates the time
+ * of performing the transformation to a StreamResult(byte[]) from the time
+ * spent simply sending the byte[] through a FileOutputStream to disk.</p>
+ *
+ * <p>
+ * <b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.</p>
+ *
+ */
+public class TraxStreamWrapper extends TransformWrapperHelper {
+    /**
+     * Templates to use for buildStylesheet().
+     */
+    private Templates builtTemplates;
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform transforms from StreamSource(systemId)
+     */
+    public String getDescription() {
+        return "Uses TrAX to perform transforms from StreamSource(stream)";
+    }
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "streams");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory.
+     *
+     * @param options Properties of options, unused.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this.
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation doesn't support StreamSource or StreamResult.
+     */
+    @Override
+    public TransformerFactory newProcessor(Properties options)
+            throws TransformerConfigurationException {
+        newProcessorOpts = options;
+        reset(false);
+        factory = TransformerFactory.newInstance();
+        // Verify the factory supports Streams!
+        if (!(factory.getFeature(StreamSource.FEATURE)
+                && factory.getFeature(StreamResult.FEATURE))) {
+            throw new TransformerConfigurationException("TraxStreamWrapper.newProcessor: factory does not support Streams!");
+        }
+        // Set any of our options as Attributes on the factory
+        TraxWrapperUtils.setAttributes(factory, options);
+        return factory;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be read
+     * as byte streams before being passed to underlying StreamSources, etc.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+
+        File xslFile = new File(xslName);
+        int xslLength = new Long(xslFile.length()).intValue();
+        byte[] xslBytes = new byte[xslLength];
+        File xmlFile = new File(xmlName);
+        int xmlLength = new Long(xmlFile.length()).intValue();
+        byte[] xmlBytes = new byte[xmlLength];
+        try (FileInputStream xslStream = new FileInputStream(xslFile);
+                FileInputStream xmlStream = new FileInputStream(xmlFile)) {
+            // Read xsl into a byte array
+            xslStream.read(xslBytes);
+            // Create StreamSource and setSystemId
+            StreamSource xslSource = new StreamSource(new ByteArrayInputStream(xslBytes));
+            // Note that systemIds must be a legal URI
+            xslSource.setSystemId(filenameToURL(xslName));
+
+            // Build Transformer from StreamSource
+            Transformer transformer = factory.newTransformer(xslSource);
+
+            // Read xml into a byte array
+            xmlStream.read(xmlBytes);
+
+            // Create StreamSource and setSystemId
+            StreamSource xmlSource = new StreamSource(new ByteArrayInputStream(xmlBytes));
+            xmlSource.setSystemId(filenameToURL(xmlName));
+
+            // Create StreamResult
+            ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
+            StreamResult byteResult = new StreamResult(outBytes);
+
+            // Set any of our options as Attributes on the transformer
+            TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+            // Apply any parameters needed
+            applyParameters(transformer);
+
+            // Build xml (so to speak) and transform
+            transformer.transform(xmlSource, byteResult);
+
+            // writeResults from the byte array
+            byte[] writeBytes = outBytes.toByteArray(); // Should this be timed too or not?
+            try (FileOutputStream writeStream = new FileOutputStream(resultName)) {
+                writeStream.write(writeBytes);
+            }
+        }
+    }
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrappered processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    @Override
+    public void buildStylesheet(String xslName) throws Exception {
+        preventFootShooting();
+
+        File xslFile = new File(xslName);
+        int xslLength = new Long(xslFile.length()).intValue();
+        byte[] xslBytes = new byte[xslLength];
+        
+        try(FileInputStream xslStream = new FileInputStream(xslFile)) {
+            // Read xsl into a byte array
+            xslStream.read(xslBytes);
+
+            // Create StreamSource and setSystemId
+            StreamSource xslSource = new StreamSource(new ByteArrayInputStream(xslBytes));
+            // Note that systemIds must be a legal URI
+            xslSource.setSystemId(filenameToURL(xslName));
+
+            // Build Transformer from StreamSource
+            builtTemplates = factory.newTemplates(xslSource);
+
+            // Set internal state that we have a templates ready
+            //  Note: in theory, there's no need to check builtTemplates
+            //  since the newTemplates should never return null
+            //  (it might have thrown an exception, but we don't care)
+            m_stylesheetReady = true;
+        }
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+
+        preventFootShooting();
+
+        try (FileOutputStream writeStream = new FileOutputStream(resultName)) {
+            // Get Transformer from Templates
+            Transformer transformer = builtTemplates.newTransformer();
+
+            File xmlFile = new File(xmlName);
+            int xmlLength = new Long(xmlFile.length()).intValue();
+            byte[] xmlBytes = new byte[xmlLength];
+            FileInputStream xmlStream = new FileInputStream(xmlFile);
+            // Read xml into a byte array
+            xmlStream.read(xmlBytes);
+
+            // Create StreamSource and setSystemId
+            StreamSource xmlSource = new StreamSource(new ByteArrayInputStream(xmlBytes));
+            xmlSource.setSystemId(filenameToURL(xmlName));
+
+            // Create StreamResult
+            ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
+            StreamResult byteResult = new StreamResult(outBytes);
+
+            // Set any of our options as Attributes on the transformer
+            TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+            // Untimed: Apply any parameters needed
+            applyParameters(transformer);
+
+            // Build xml (so to speak) and transform
+            transformer.transform(xmlSource, byteResult);
+
+            // writeResults from the byte array
+            byte[] writeBytes = outBytes.toByteArray();
+            writeStream.write(writeBytes);
+        }
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrappered processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        preventFootShooting();
+
+        File xmlFile = new File(xmlName);
+        try (FileOutputStream writeStream = new FileOutputStream(resultName);) {
+            int xmlLength = new Long(xmlFile.length()).intValue();
+            byte[] xmlBytes = new byte[xmlLength];
+            FileInputStream xmlStream = new FileInputStream(xmlFile);
+            // Read xml into a byte array
+            xmlStream.read(xmlBytes);
+
+            // Create StreamSource and setSystemId
+            StreamSource xmlSource = new StreamSource(new ByteArrayInputStream(xmlBytes));
+            xmlSource.setSystemId(filenameToURL(xmlName));
+
+            // Read xsl from the xml document
+            Source xslSource = factory.getAssociatedStylesheet(xmlSource, null, null, null);
+
+            // Build xsl from a URL
+            Transformer transformer = factory.newTransformer(xslSource);
+
+            // Re-read the XML file for use in transform; not timed
+            xmlFile = new File(xmlName);
+            xmlLength = new Long(xmlFile.length()).intValue(); 
+            xmlBytes = new byte[xmlLength];
+            xmlStream = new FileInputStream(xmlFile);
+            xmlStream.read(xmlBytes);
+
+            // Create StreamSource and setSystemId
+            xmlSource = new StreamSource(new ByteArrayInputStream(xmlBytes));
+            xmlSource.setSystemId(filenameToURL(xmlName));
+
+            // Create StreamResult
+            ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
+            StreamResult byteResult = new StreamResult(outBytes);
+
+            // Set any of our options as Attributes on the transformer
+            TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+            // Apply any parameters needed
+            applyParameters(transformer);
+
+            // Build xml (so to speak) and transform
+            transformer.transform(xmlSource, byteResult);
+
+            // writeResults from the byte array
+            byte[] writeBytes = outBytes.toByteArray();
+
+            writeStream.write(writeBytes);
+        }
+
+    }
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        super.reset(newProcessor); // clears indent and parameters
+        m_stylesheetReady = false;
+        builtTemplates = null;
+        if (newProcessor) {
+            try {
+                newProcessor(newProcessorOpts);
+            } catch (TransformerConfigurationException ignore) {}
+        }
+    }
+
+    /**
+     * Apply a single parameter to a Transformer.
+     *
+     * Overridden to take a Transformer and call setParameter().
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    @Override
+    protected void applyParameter(Transformer transformer, String namespace,
+            String name, String value) {
+        try {
+            // Munge the namespace into the name per
+            //  javax.xml.transform.Transformer.setParameter()
+            if (null != namespace) {
+                name = "{" + namespace + "}" + name;
+            }
+            transformer.setParameter(name, value);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("applyParameter threw: " + e.toString());
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxSystemId3Wrapper.java	2015-01-09 15:42:30.184200447 -0800
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.Properties;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses systemId
+ * URL's for it's sources; plus always transforms the xml file <b>three</b>
+ * times.
+ *
+ * This is the most common usage: transformer = factory.newTransformer(new
+ * StreamSource(xslURL)); transformer.transform(new StreamSource(xmlURL), new
+ * StreamResult(resultFileName));
+ *
+ * <b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.
+ */
+public class TraxSystemId3Wrapper extends TraxSystemIdWrapper {
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform THREE transforms from StreamSource(systemId)
+     */
+    @Override
+    public String getDescription() {
+        return "Uses TrAX to perform THREE transforms from StreamSource(systemId)";
+    }
+
+    /**
+     * Get a specific description of the wrappered processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "systemId3");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file <b>three</b> times.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed for any underlying processor implementation.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+
+        // Read/build xsl from a URL
+        Transformer transformer = factory.newTransformer(
+                new StreamSource(filenameToURL(xslName)));
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // Read/build xml, transform, and write results
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+
+        // This is to test transformer re-use
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file <b>three</b> times.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+
+        preventFootShooting();
+
+        // Get Transformer from Templates
+        Transformer transformer = builtTemplates.newTransformer();
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+
+        // This is to test transformer re-use
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrapped processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        preventFootShooting();
+        // Read xsl from the xml document
+        Source xslSource = factory.getAssociatedStylesheet(new StreamSource(filenameToURL(xmlName)),
+                null, null, null);
+
+        // Build xsl from a URL
+        Transformer transformer = factory.newTransformer(xslSource);
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // read/build xml, transform, and write results
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+
+        // This is to test transformer re-use
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxSystemIdWrapper.java	2015-01-09 15:42:30.452200866 -0800
@@ -0,0 +1,299 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.util.Properties;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import static jaxp.library.JAXPTestUtilities.filenameToURL;
+
+/**
+ * Implementation of TransformWrapper that uses the TrAX API and uses systemId
+ * URL's for it's sources.
+ *
+ * This is the most common usage: transformer = factory.newTransformer(new
+ * StreamSource(xslURL)); transformer.transform(new StreamSource(xmlURL), new
+ * StreamResult(resultFileName));
+ *
+ * <b>Important!</b> The underlying System property of
+ * javax.xml.transform.TransformerFactory will determine the actual TrAX
+ * implementation used. This value will be reported out in our
+ * getProcessorInfo() method.
+ */
+public class TraxSystemIdWrapper extends TransformWrapperHelper {
+    /**
+     * Templates to use for buildStylesheet().
+     */
+    protected Templates builtTemplates;
+
+    /**
+     * Get a general description of this wrapper itself.
+     *
+     * @return Uses TrAX to perform transforms from StreamSource(systemId)
+     */
+    public String getDescription() {
+        return "Uses TrAX to perform transforms from StreamSource(systemId)";
+    }
+
+    /**
+     * Get a specific description of the wrapped processor.
+     *
+     * @return specific description of the underlying processor or transformer
+     * implementation: this should include both the general product name, as
+     * well as specific version info. If possible, should be implemented without
+     * actively creating an underlying processor.
+     */
+    @Override
+    public Properties getProcessorInfo() {
+        Properties p = TraxWrapperUtils.getTraxInfo();
+        p.put("traxwrapper.method", "systemId");
+        p.put("traxwrapper.desc", getDescription());
+        return p;
+    }
+
+    /**
+     * Actually create/initialize an underlying processor or factory.
+     *
+     * For TrAX/javax.xml.transform implementations, this creates a new
+     * TransformerFactory. For Xalan-J 1.x this creates an XSLTProcessor. Other
+     * implmentations may or may not actually do any work in this method.
+     *
+     * @param options Properties of options, unused.
+     *
+     * @return (Object)getProcessor() as a side-effect, this will be null if
+     * there was any problem creating the processor OR if the underlying
+     * implementation doesn't use this
+     * @throws javax.xml.transform.TransformerConfigurationException when 
+     * actual implementation doesn't support StreamSource or StreamResult.
+     */
+    @Override
+    public TransformerFactory newProcessor(Properties options) 
+            throws TransformerConfigurationException {
+        newProcessorOpts = options;
+        reset(false);
+        factory = TransformerFactory.newInstance();
+        // Verify the factory supports Streams!
+        if (!(factory.getFeature(StreamSource.FEATURE)
+                && factory.getFeature(StreamResult.FEATURE))) {
+            throw new TransformerConfigurationException("TraxSystemIdWrapper.newProcessor: factory does not support Streams!");
+        }
+        // Set any of our options as Attributes on the factory
+        TraxWrapperUtils.setAttributes(factory, newProcessorOpts);
+        return factory;
+    }
+
+    /**
+     * Transform supplied xmlName file with the stylesheet in the xslName file
+     * into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed for any underlying processor implementation.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param xslName local path\filename of XSL stylesheet to use
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transform(String xmlName, String xslName, String resultName)
+            throws Exception {
+        preventFootShooting();
+
+        // Read/build xsl from a URL
+        Transformer transformer = factory.newTransformer(
+                new StreamSource(filenameToURL(xslName)));
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // Read/build xml, transform, and write results
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Pre-build/pre-compile a stylesheet.
+     *
+     * Although the actual mechanics are implementation-dependent, most
+     * processors have some method of pre-setting up the data needed by the
+     * stylesheet itself for later use in transforms. In
+     * TrAX/javax.xml.transform, this equates to creating a Templates object.
+     *
+     * Sets isStylesheetReady() to true if it succeeds. Users can then call
+     * transformWithStylesheet(xmlName, resultName) to actually perform a
+     * transformation with this pre-built stylesheet.
+     *
+     * @param xslName local path\filename of XSL stylesheet to use
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     *
+     * @see #transformWithStylesheet(String xmlName, String resultName)
+     */
+    @Override
+    public void buildStylesheet(String xslName) throws Exception {
+        preventFootShooting();
+
+        // Read/build xsl from a URL
+        builtTemplates = factory.newTemplates(
+                new StreamSource(filenameToURL(xslName)));
+        m_stylesheetReady = true;
+    }
+
+    /**
+     * Transform supplied xmlName file with a pre-built/pre-compiled stylesheet
+     * into a resultName file.
+     *
+     * User must have called buildStylesheet(xslName) beforehand, obviously.
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation; throws an
+     * IllegalStateException if isStylesheetReady() == false.
+     *
+     * @see #buildStylesheet(String xslName)
+     */
+    @Override
+    public void transformWithStylesheet(String xmlName, String resultName)
+            throws Exception {
+        if (!isStylesheetReady()) {
+            throw new IllegalStateException("transformWithStylesheet() when isStylesheetReady() == false");
+        }
+
+        preventFootShooting();
+
+        // Get Transformer from Templates
+        Transformer transformer = builtTemplates.newTransformer();
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // Read/build xml, transform, and write results
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Transform supplied xmlName file with a stylesheet found in an
+     * xml-stylesheet PI into a resultName file.
+     *
+     * Names are assumed to be local path\filename references, and will be
+     * converted to URLs as needed. Implementations will use whatever facilities
+     * exist in their wrapped processor to fetch and build the stylesheet to
+     * use for the transform.
+     *
+     * @param xmlName local path\filename of XML file to transform
+     * @param resultName local path\filename to put result in
+     *
+     * @throws Exception any underlying exceptions from the wrapped processor
+     * are simply allowed to propagate; throws a RuntimeException if any other
+     * problems prevent us from actually completing the operation
+     */
+    @Override
+    public void transformEmbedded(String xmlName, String resultName)
+            throws Exception {
+        preventFootShooting();
+        // Read xsl from the xml document
+        Source xslSource = factory.getAssociatedStylesheet(new StreamSource(filenameToURL(xmlName)),
+                null, null, null);
+
+        // Build xsl from a URL
+        Transformer transformer = factory.newTransformer(xslSource);
+
+        // Set any of our options as Attributes on the transformer
+        TraxWrapperUtils.setAttributes(transformer, newProcessorOpts);
+
+        // Apply any parameters needed
+        applyParameters(transformer);
+
+        // Read/build xml, transform, and write results
+        transformer.transform(new StreamSource(filenameToURL(xmlName)),
+                new StreamResult(resultName));
+    }
+
+    /**
+     * Reset our parameters and wrapper state, and optionally force creation of
+     * a new underlying processor implementation.
+     *
+     * This always clears our built stylesheet and any parameters that have been
+     * set. If newProcessor is true, also forces a re-creation of our underlying
+     * processor as if by calling newProcessor().
+     *
+     * @param newProcessor if we should reset our underlying processor
+     * implementation as well
+     */
+    @Override
+    public void reset(boolean newProcessor) {
+        super.reset(newProcessor); // clears indent and parameters
+        m_stylesheetReady = false;
+        builtTemplates = null;
+        if (newProcessor) {
+            try {
+                newProcessor(newProcessorOpts);
+            } catch (TransformerConfigurationException ignore) {
+            }
+        }
+    }
+
+    /**
+     * Apply a single parameter to a Transformer.
+     *
+     * Overridden to take a Transformer and call setParameter().
+     *
+     * @param transformer a Transformer object.
+     * @param namespace for the parameter, may be null
+     * @param name for the parameter, should not be null
+     * @param value for the parameter, may be null
+     */
+    @Override
+    protected void applyParameter(Transformer transformer, String namespace,
+            String name, String value) {
+        try {
+            // Munge the namespace into the name per
+            //  javax.xml.transform.Transformer.setParameter()
+            if (null != namespace) {
+                name = "{" + namespace + "}" + name;
+            }
+            transformer.setParameter(name, value);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("applyParameter threw: " + e.toString());
+        }
+    }
+}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/apache/qetest/xslwrapper/TraxWrapperUtils.java	2015-01-09 15:42:30.717201280 -0800
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ */
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.qetest.xslwrapper;
+
+import java.lang.reflect.Field;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+
+/**
+ * Cheap-o utilities for Trax*Wrapper implementations.
+ *
+ */
+public abstract class TraxWrapperUtils {
+
+    /**
+     * Get a generic description of the TrAX related info.
+     *
+     * @return Properties block with basic info about any TrAX implementing
+     * processor, plus specific version information about Xalan-J 2.x or
+     * Xerces-J 1.x if found.
+     */
+    public static Properties getTraxInfo() {
+        Properties p = new Properties();
+        p.put("traxwrapper.api", "trax");
+        p.put("traxwrapper.language", "java");
+        try {
+            Properties sysProps = System.getProperties();
+            p.put("traxwrapper.jaxp.transform",
+                    sysProps.getProperty("javax.xml.transform.TransformerFactory", "unset"));
+            p.put("traxwrapper.jaxp.parser.dom",
+                    sysProps.getProperty("javax.xml.parsers.DocumentBuilderFactory", "unset"));
+            p.put("traxwrapper.jaxp.parser.sax",
+                    sysProps.getProperty("javax.xml.parsers.SAXParserFactory", "unset"));
+        } /* In case we're in an Applet */
+        catch (SecurityException ignore) { /* no-op, ignore */ }
+
+        // Look for some Xalan/Xerces specific version info
+        try {
+            Class clazz = Class.forName("org.apache.xerces.framework.Version");
+            // Found 1.x, grab it's version fields
+            Field f = clazz.getField("fVersion");
+            p.put("traxwrapper.xerces.version", (String) f.get(null));
+        } catch (ClassNotFoundException | IllegalAccessException 
+            | IllegalArgumentException | NoSuchFieldException 
+            | SecurityException ignore) {}
+ 
+        try {
+            Class clazz = Class.forName("org.apache.xalan.processor.XSLProcessorVersion");
+            Field f = clazz.getField("S_VERSION");
+            p.put("traxwrapper.xalan.version", (String) f.get(null));
+        } catch (ClassNotFoundException | IllegalAccessException 
+            | IllegalArgumentException | NoSuchFieldException 
+            | SecurityException ignore) {}
+
+        return p;
+    }
+
+    /**
+     * Apply specific Attributes to a TransformerFactory OR Transformer, OR call
+     * specific setFoo() API's on a TransformerFactory OR Transformer.
+     *
+     * Filters on hash keys.startsWith("Processor.setAttribute"). Most Attributes
+     * are simply passed to factory.setAttribute(), however certain special
+     * cases are handled: setURIResolver, setErrorListener. Exceptions thrown by
+     * underlying transformer are propagated.
+     *
+     * This takes an Object so that an underlying worker method can process
+     * either a TransformerFactory or a Transformer.
+     *
+     * @param setPropsOn
+     * @param attrs potential attributes to set.
+     */
+    public static void setAttributes(Object setPropsOn,
+            Properties attrs) throws IllegalArgumentException {
+        if ((null == setPropsOn) || (null == attrs)) {
+            return;
+        }
+
+        Enumeration attrKeys;
+        try {
+            // Attempt to use as a Properties block..
+            attrKeys = attrs.propertyNames();
+        } catch (ClassCastException cce) {
+            // .. but fallback to get as Hashtable instead
+            attrKeys = attrs.keys();
+        }
+
+        while (attrKeys.hasMoreElements()) {
+            String key = (String) attrKeys.nextElement();
+            // Only attempt to set the attr if it matches our marker
+            if ((null != key)
+                    && (key.startsWith(TransformWrapper.SET_PROCESSOR_ATTRIBUTES))) {
+                Object value;
+                try {
+                    // Attempt to use as a Properties block..
+                    value =  attrs.getProperty(key);
+                    // But, if null, then try getting as hash anyway
+                    if (null == value) {
+                        value = attrs.get(key);
+                    }
+                } catch (ClassCastException cce) {
+                    // .. but fallback to get as Hashtable instead
+                    value = attrs.get(key);
+                }
+                // Strip off our marker for the property name
+                String processorKey = key.substring(TransformWrapper.SET_PROCESSOR_ATTRIBUTES.length());
+                // Ugly, but it works -sc
+                if (setPropsOn instanceof TransformerFactory) {
+                    setAttribute((TransformerFactory) setPropsOn, processorKey, value);
+                } else if (setPropsOn instanceof Transformer) {
+                    setAttribute((Transformer) setPropsOn, processorKey, value);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Token specifying a call to setURIResolver.
+     */
+    private final static String SET_URI_RESOLVER = "setURIResolver";
+
+    /**
+     * Token specifying a call to setErrorListener.
+     */
+    private final static String SET_ERROR_LISTENER = "setErrorListener";
+
+    /**
+     * Apply specific Attributes to a TransformerFactory OR call specific
+     * setFoo() API's on a TransformerFactory.
+     *
+     * Filters on keys.startsWith("Processor.setAttribute.") Most Attributes
+     * are simply passed to factory.setAttribute(), however certain special
+     * cases are handled: setURIResolver, setErrorListener. Exceptions thrown by
+     * underlying transformer are propagated.
+     *
+     * @see setAttribute(Transformer, String, Object)
+     * @param factory TransformerFactory to call setAttributes on.
+     * @param key specific attribute or special case attribute.
+     * @param value to set for key.
+     */
+    private static void setAttribute(TransformerFactory factory,
+            String key, Object value) throws IllegalArgumentException {
+        if ((null == factory) || (null == key)) {
+            return;
+        }
+
+        // Note: allow exceptions to propagate here
+        // Check if this is a special case to call a specific
+        //  API, or the general case to call setAttribute(key...)
+        switch(key) {
+            case SET_URI_RESOLVER:
+                factory.setURIResolver((URIResolver) value);
+                break;
+            case SET_ERROR_LISTENER:
+                factory.setErrorListener((ErrorListener) value);;
+                break;
+            default:
+                // General case; just call setAttribute
+                factory.setAttribute(key, value);
+                break;                
+        }
+    }
+
+    /**
+     * Apply specific Attributes to a Transformer OR call specific setFoo()
+     * API's on a Transformer.
+     *
+     * Filters on keys.startsWith("Processor.setAttribute.") Only certain
+     * special cases are handled: setURIResolver, setErrorListener. Exceptions
+     * thrown by underlying transformer are propagated.
+     *
+     * @see setAttribute(TransformerFactory, String, Object)
+     * @param factory TransformerFactory to call setAttributes on.
+     * @param key specific attribute or special case attribute.
+     * @param value to set for key.
+     */
+    private static void setAttribute(Transformer transformer,
+            String key, Object value) throws IllegalArgumentException {
+        if ((null == transformer) || (null == key)) {
+            return;
+        }
+
+        // Note: allow exceptions to propagate here
+        // Check if this is a special case to call a specific
+        //  API, or the general case to call setAttribute(key...)
+        switch(key) {
+            case SET_URI_RESOLVER:
+                transformer.setURIResolver((URIResolver) value);
+                break;
+            case SET_ERROR_LISTENER:
+                transformer.setErrorListener((ErrorListener) value);
+                break;
+        }
+    }
+}
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/MyAttrCHandler.java	2015-01-09 15:42:31.098201875 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.xml.sax.ptests;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Simple attributes handler.
- */
-public class MyAttrCHandler extends DefaultHandler {
-    /**
-     * FileWriter to write string to output file.
-     */
-    private final BufferedWriter bWriter;
-
-    /**
-     * Initiate FileWriter
-     * @param fileName output file name.
-     * @throws IOException
-     */
-    public MyAttrCHandler(String fileName) throws IOException {
-        bWriter = new BufferedWriter(new FileWriter(fileName));
-    }
-
-    /**
-     * Write element content before start access every element.
-     * @throws org.xml.sax.SAXException
-     */
-    @Override
-    public void startElement(String uri, String localName,
-                String qName, Attributes attributes) throws SAXException {
-        try {
-            String string = "uri <" + uri + "> localName <" + localName +
-                        "> qName <" + qName + ">";
-
-            bWriter.write( string, 0, string.length());
-            bWriter.newLine();
-
-            int length = attributes.getLength();
-            string = "length: " + length;
-
-            bWriter.write( string, 0, string.length());
-            bWriter.newLine();
-
-            for (int ind=0; ind < length ; ind++) {
-                string = "For index = " + ind + "\n";
-                string += "getLocalName <" + attributes.getLocalName(ind)
-                                +">" + "\n";
-                string += "getQName <" + attributes.getQName(ind) +">" + "\n";
-                string += "getType <" + attributes.getType(ind) +">" + "\n";
-                string += "getURI <" + attributes.getURI(ind) +">" + "\n";
-                string += "getValue <" + attributes.getValue(ind) +">" + "\n";
-
-                bWriter.write( string, 0, string.length());
-                bWriter.newLine();
-
-                String gotLocalName = attributes.getLocalName(ind);
-                String gotQName = attributes.getQName(ind);
-                String gotURI = attributes.getURI(ind);
-
-                string ="Using localName, qname and uri pertaining to index = "
-                                + ind;
-                bWriter.write( string, 0, string.length());
-                bWriter.newLine();
-
-                string = "getIndex(qName) <" + attributes.getIndex(gotQName)
-                                +">" + "\n";
-                string += "getIndex(uri, localName) <" +
-                        attributes.getIndex(gotURI, gotLocalName) +">" + "\n";
-
-                string += "getType(qName) <" +
-                        attributes.getType(gotQName) +">" + "\n";
-                string += "getType(uri, localName) <" +
-                        attributes.getType(gotURI, gotLocalName) +">" + "\n";
-
-                string += "getValue(qName) <" +
-                        attributes.getValue(gotQName) +">" + "\n";
-                string += "getValue(uri, localName) <" +
-                        attributes.getValue(gotURI, gotLocalName) +">" + "\n";
-
-                bWriter.write( string, 0, string.length());
-                bWriter.newLine();
-            }
-            bWriter.newLine();
-        } catch(IOException ex){
-            throw new SAXException(ex);
-        }
-    }
-
-    /**
-     * Flush the stream and close the file.
-     * @throws IOException when writing or closing file failed.
-     */
-    public void flushAndClose() throws IOException {
-        bWriter.flush();
-        bWriter.close();
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/xml/sax/ptests/MyAttrCHandler.java	2015-01-09 15:42:30.981201692 -0800
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.xml.sax.ptests;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Simple attributes handler.
+ */
+public class MyAttrCHandler extends DefaultHandler {
+    /**
+     * FileWriter to write string to output file.
+     */
+    private final BufferedWriter bWriter;
+
+    /**
+     * Initiate FileWriter
+     * @param fileName output file name.
+     * @throws IOException
+     */
+    public MyAttrCHandler(String fileName) throws IOException {
+        bWriter = new BufferedWriter(new FileWriter(fileName));
+    }
+
+    /**
+     * Write element content before start access every element.
+     * @throws org.xml.sax.SAXException
+     */
+    @Override
+    public void startElement(String uri, String localName,
+                String qName, Attributes attributes) throws SAXException {
+        try {
+            String string = "uri <" + uri + "> localName <" + localName +
+                        "> qName <" + qName + ">";
+
+            bWriter.write( string, 0, string.length());
+            bWriter.newLine();
+
+            int length = attributes.getLength();
+            string = "length: " + length;
+
+            bWriter.write( string, 0, string.length());
+            bWriter.newLine();
+
+            for (int ind=0; ind < length ; ind++) {
+                string = "For index = " + ind + "\n";
+                string += "getLocalName <" + attributes.getLocalName(ind)
+                                +">" + "\n";
+                string += "getQName <" + attributes.getQName(ind) +">" + "\n";
+                string += "getType <" + attributes.getType(ind) +">" + "\n";
+                string += "getURI <" + attributes.getURI(ind) +">" + "\n";
+                string += "getValue <" + attributes.getValue(ind) +">" + "\n";
+
+                bWriter.write( string, 0, string.length());
+                bWriter.newLine();
+
+                String gotLocalName = attributes.getLocalName(ind);
+                String gotQName = attributes.getQName(ind);
+                String gotURI = attributes.getURI(ind);
+
+                string ="Using localName, qname and uri pertaining to index = "
+                                + ind;
+                bWriter.write( string, 0, string.length());
+                bWriter.newLine();
+
+                string = "getIndex(qName) <" + attributes.getIndex(gotQName)
+                                +">" + "\n";
+                string += "getIndex(uri, localName) <" +
+                        attributes.getIndex(gotURI, gotLocalName) +">" + "\n";
+
+                string += "getType(qName) <" +
+                        attributes.getType(gotQName) +">" + "\n";
+                string += "getType(uri, localName) <" +
+                        attributes.getType(gotURI, gotLocalName) +">" + "\n";
+
+                string += "getValue(qName) <" +
+                        attributes.getValue(gotQName) +">" + "\n";
+                string += "getValue(uri, localName) <" +
+                        attributes.getValue(gotURI, gotLocalName) +">" + "\n";
+
+                bWriter.write( string, 0, string.length());
+                bWriter.newLine();
+            }
+            bWriter.newLine();
+        } catch(IOException ex){
+            throw new SAXException(ex);
+        }
+    }
+
+    /**
+     * Flush the stream and close the file.
+     * @throws IOException when writing or closing file failed.
+     */
+    public void flushAndClose() throws IOException {
+        bWriter.flush();
+        bWriter.close();
+    }
+}
--- old/test/javax/xml/jaxp/functional/org/xml/sax/ptests/MyNSContentHandler.java	2015-01-09 15:42:31.453202429 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.xml.sax.ptests;
-
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.LocatorImpl;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.FileWriter;
-import org.xml.sax.SAXException;
-
-class MyNSContentHandler extends DefaultHandler {
-    /**
-     * Prefix for written string.
-     */
-    private final static String WRITE_ERROR = "bWrite error";
-    /**
-     * FileWriter to write output file.
-     */
-    private final BufferedWriter bWriter;
-
-    /**
-     * Default locator.
-     */
-    Locator locator = new LocatorImpl();
-
-    /**
-     * Initiate FileWrite.
-     * @param outputFileName file name of output file.
-     * @throws SAXException when open output file failed.
-     */
-    public MyNSContentHandler(String outputFileName) throws SAXException {
-        try {
-            bWriter = new BufferedWriter(new FileWriter(outputFileName));
-        } catch (IOException ex) {
-            throw new SAXException(ex);
-        }
-    }
-
-    /**
-     * Write characters tag along with content of characters when meet
-     * characters event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void characters(char[] ch, int start, int length)
-            throws SAXException {
-        String s = new String(ch, start, length);
-        println("characters...length is:" + s.length() + "\n"
-                + "<" + s + ">");
-    }
-
-    /**
-     * Write endDocument tag then flush the content and close the file when meet
-     * endDocument event.
-     * @throws IOException error happen when writing file or closing file.
-     */
-    @Override
-    public void endDocument() throws SAXException {
-        try {
-            println("endDocument...");
-            bWriter.flush();
-            bWriter.close();
-        } catch (IOException ex) {
-            throw new SAXException(WRITE_ERROR, ex);
-        }
-    }
-
-    /**
-     * Write endElement tag with namespaceURI, localName, qName to the file when
-     * meet endElement event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void endElement(String namespaceURI, String localName, String qName)
-            throws SAXException {
-        println("endElement...\n" + "namespaceURI: <" + namespaceURI
-                + "> localName: <" + localName + "> qName: <" + qName + ">");
-    }
-
-    /**
-     * Write endPrefixMapping tag along with prefix to the file when meet
-     * endPrefixMapping event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void endPrefixMapping(String prefix) throws SAXException {
-        println("endPrefixMapping...\n" + "prefix: <" + prefix + ">");
-    }
-
-    /**
-     * Write ignorableWhitespace tag along with white spaces when meet
-     * ignorableWhitespace event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void ignorableWhitespace(char[] ch, int start, int length)
-            throws SAXException {
-        String s = new String(ch, start, length);
-        println("ignorableWhitespace...\n" + s
-                + " ignorable white space string length: " + s.length());
-    }
-
-    /**
-     * Write processingInstruction tag along with target name and target data
-     * when meet processingInstruction event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void processingInstruction(String target, String data)
-            throws SAXException {
-        println("processingInstruction...target:<" + target
-                + "> data: <" + data + ">");
-    }
-
-    /**
-     * Write setDocumentLocator tag when meet setDocumentLocator event.
-     */
-    @Override
-    public void setDocumentLocator(Locator locator) {
-        try {
-            this.locator = locator;
-            println("setDocumentLocator...");
-        } catch (SAXException ex) {
-            System.err.println(WRITE_ERROR + ex);
-        }
-    }
-
-    /**
-     * Write skippedEntity tag along with entity name when meet skippedEntity
-     * event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void skippedEntity(String name) throws SAXException {
-        println("skippedEntity...\n" + "name: <" + name + ">");
-    }
-
-    /**
-     * Write startDocument tag when meet startDocument event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void startDocument() throws SAXException {
-        println("startDocument...");
-    }
-
-    /**
-     * Write startElement tag along with namespaceURI, localName, qName, number
-     * of attributes and line number when meet startElement event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void startElement(String namespaceURI, String localName,
-            String qName, Attributes atts) throws SAXException {
-        println("startElement...\n" + "namespaceURI: <" + namespaceURI
-                + "> localName: <" + localName + "> qName: <" + qName
-                + "> Number of Attributes: <" + atts.getLength()
-                + "> Line# <" + locator.getLineNumber() + ">");
-    }
-
-    /**
-     * Write startPrefixMapping tag along with prefix and uri when meet
-     * startPrefixMapping event.
-     * @throws IOException error happen when writing file.
-     */
-    @Override
-    public void startPrefixMapping(String prefix, String uri)
-            throws SAXException {
-        println("startPrefixMapping...\n" + "prefix: <" + prefix
-                + "> uri: <" + uri + ">");
-    }
-    /**
-     * Write outString to output file.
-     * @param outString string to be written.
-     * @throws SAXException
-     */
-    private void println(String outString) throws SAXException {
-        try {
-            bWriter.write( outString, 0, outString.length());
-            bWriter.newLine();
-        } catch (IOException ex) {
-            throw new SAXException(WRITE_ERROR, ex);
-        }
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/org/xml/sax/ptests/MyNSContentHandler.java	2015-01-09 15:42:31.340202253 -0800
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.xml.sax.ptests;
+
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.LocatorImpl;
+import org.xml.sax.Locator;
+import org.xml.sax.Attributes;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.FileWriter;
+import org.xml.sax.SAXException;
+
+class MyNSContentHandler extends DefaultHandler implements AutoCloseable{
+    /**
+     * Prefix for written string.
+     */
+    private final static String WRITE_ERROR = "bWrite error";
+
+    /**
+     * FileWriter to write output file.
+     */
+    private final BufferedWriter bWriter;
+
+    /**
+     * Default locator.
+     */
+    Locator locator = new LocatorImpl();
+
+    /**
+     * Initiate FileWrite.
+     * @param outputFileName file name of output file.
+     * @throws SAXException when open output file failed.
+     */
+    public MyNSContentHandler(String outputFileName) throws SAXException {
+        try {
+            bWriter = new BufferedWriter(new FileWriter(outputFileName));
+        } catch (IOException ex) {
+            throw new SAXException(ex);
+        }
+    }
+
+    /**
+     * Write characters tag along with content of characters when meet
+     * characters event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void characters(char[] ch, int start, int length)
+            throws SAXException {
+        String s = new String(ch, start, length);
+        println("characters...length is:" + s.length() + "\n"
+                + "<" + s + ">");
+    }
+
+    /**
+     * Write endDocument tag then flush the content and close the file when meet
+     * endDocument event.
+     * @throws IOException error happen when writing file or closing file.
+     */
+    @Override
+    public void endDocument() throws SAXException {
+        try {
+            println("endDocument...");
+            bWriter.flush();
+            bWriter.close();
+        } catch (IOException ex) {
+            throw new SAXException(WRITE_ERROR, ex);
+        }
+    }
+
+    /**
+     * Write endElement tag with namespaceURI, localName, qName to the file when
+     * meet endElement event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void endElement(String namespaceURI, String localName, String qName)
+            throws SAXException {
+        println("endElement...\n" + "namespaceURI: <" + namespaceURI
+                + "> localName: <" + localName + "> qName: <" + qName + ">");
+    }
+
+    /**
+     * Write endPrefixMapping tag along with prefix to the file when meet
+     * endPrefixMapping event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void endPrefixMapping(String prefix) throws SAXException {
+        println("endPrefixMapping...\n" + "prefix: <" + prefix + ">");
+    }
+
+    /**
+     * Write ignorableWhitespace tag along with white spaces when meet
+     * ignorableWhitespace event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void ignorableWhitespace(char[] ch, int start, int length)
+            throws SAXException {
+        String s = new String(ch, start, length);
+        println("ignorableWhitespace...\n" + s
+                + " ignorable white space string length: " + s.length());
+    }
+
+    /**
+     * Write processingInstruction tag along with target name and target data
+     * when meet processingInstruction event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void processingInstruction(String target, String data)
+            throws SAXException {
+        println("processingInstruction...target:<" + target
+                + "> data: <" + data + ">");
+    }
+
+    /**
+     * Write setDocumentLocator tag when meet setDocumentLocator event.
+     */
+    @Override
+    public void setDocumentLocator(Locator locator) {
+        try {
+            this.locator = locator;
+            println("setDocumentLocator...");
+        } catch (SAXException ex) {
+            System.err.println(WRITE_ERROR + ex);
+        }
+    }
+
+    /**
+     * Write skippedEntity tag along with entity name when meet skippedEntity
+     * event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void skippedEntity(String name) throws SAXException {
+        println("skippedEntity...\n" + "name: <" + name + ">");
+    }
+
+    /**
+     * Write startDocument tag when meet startDocument event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void startDocument() throws SAXException {
+        println("startDocument...");
+    }
+
+    /**
+     * Write startElement tag along with namespaceURI, localName, qName, number
+     * of attributes and line number when meet startElement event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void startElement(String namespaceURI, String localName,
+            String qName, Attributes atts) throws SAXException {
+        println("startElement...\n" + "namespaceURI: <" + namespaceURI
+                + "> localName: <" + localName + "> qName: <" + qName
+                + "> Number of Attributes: <" + atts.getLength()
+                + "> Line# <" + locator.getLineNumber() + ">");
+    }
+
+    /**
+     * Write startPrefixMapping tag along with prefix and uri when meet
+     * startPrefixMapping event.
+     * @throws IOException error happen when writing file.
+     */
+    @Override
+    public void startPrefixMapping(String prefix, String uri)
+            throws SAXException {
+        println("startPrefixMapping...\n" + "prefix: <" + prefix
+                + "> uri: <" + uri + ">");
+    }
+    /**
+     * Write outString to output file.
+     * @param outString string to be written.
+     * @throws SAXException
+     */
+    private void println(String outString) throws SAXException {
+        try {
+            bWriter.write( outString, 0, outString.length());
+            bWriter.newLine();
+        } catch (IOException ex) {
+            throw new SAXException(WRITE_ERROR, ex);
+        }
+    }
+
+    /**
+     * Close writer if it's initiated.
+     * @throws IOException if any I/O error when close writer. 
+     */
+    @Override
+    public void close() throws IOException {
+        if (bWriter != null)
+            bWriter.close();
+    }
+}
--- old/test/javax/xml/jaxp/functional/test/auctionportal/MyDOMErrorHandler.java	2015-01-09 15:42:31.833203023 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package test.auctionportal;
-
-import org.w3c.dom.DOMErrorHandler;
-import org.w3c.dom.DOMError;
-
-/**
- * Error handler for recording DOM processing error.
- */
-public class MyDOMErrorHandler implements DOMErrorHandler {
-    /**
-     * flag shows if there is any error.
-     */
-    private volatile boolean errorOccured = false;
-
-    /**
-     * Set errorOcurred to true when an error occurs.
-     * @param error The error object that describes the error. This object
-     * may be reused by the DOM implementation across multiple calls to
-     * the handleError method.
-     * @return true that processing may continue depending on.
-     */
-    @Override
-    public boolean handleError (DOMError error) {
-        System.err.println( "ERROR" + error.getMessage());
-        System.err.println( "ERROR" + error.getRelatedData());
-        errorOccured = true;
-        return true;
-    }
-
-    /**
-     * Showing if any error was handled.
-     * @return true if there is one or more error.
-     *         false no error occurs.
-     */
-    public boolean isError() {
-        return errorOccured;
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/test/auctionportal/MyDOMErrorHandler.java	2015-01-09 15:42:31.720202846 -0800
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.auctionportal;
+
+import org.w3c.dom.DOMErrorHandler;
+import org.w3c.dom.DOMError;
+
+/**
+ * Error handler for recording DOM processing error.
+ */
+public class MyDOMErrorHandler implements DOMErrorHandler {
+    /**
+     * flag shows if there is any error.
+     */
+    private volatile boolean errorOccured = false;
+
+    /**
+     * Set errorOcurred to true when an error occurs.
+     * @param error The error object that describes the error. This object
+     * may be reused by the DOM implementation across multiple calls to
+     * the handleError method.
+     * @return true that processing may continue depending on.
+     */
+    @Override
+    public boolean handleError (DOMError error) {
+        System.err.println( "ERROR" + error.getMessage());
+        System.err.println( "ERROR" + error.getRelatedData());
+        errorOccured = true;
+        return true;
+    }
+
+    /**
+     * Showing if any error was handled.
+     * @return true if there is one or more error.
+     *         false no error occurs.
+     */
+    public boolean isError() {
+        return errorOccured;
+    }
+}
--- old/test/javax/xml/jaxp/functional/test/auctionportal/MyDOMOutput.java	2015-01-09 15:42:32.208203609 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package test.auctionportal;
-
-import org.w3c.dom.ls.LSOutput;
-import java.io.OutputStream;
-import java.io.Writer;
-
-/**
- * A Thread-safe LS output destination for DOM processing. LSOutput objects
- * belong to the application. The DOM implementation will never modify them
- * (though it may make copies and modify the copies, if necessary).
- */
-public class MyDOMOutput implements LSOutput {
-    /**
-     * An attribute of a language and binding dependent type that represents a
-     * writable stream of bytes.
-     */
-    private OutputStream bytestream;
-
-    /**
-     * character encoding to use for the output.
-     */
-    private String encoding;
-
-    /**
-     * The system identifier.
-     */
-    private String sysId;
-
-    /**
-     * Writable stream to which 16-bit units can be output.
-     */
-    private Writer writer;
-
-    /**
-     * An attribute of a language and binding dependent type that represents a
-     * writable stream of bytes.
-     *
-     * @return a writable stream.
-     */
-    @Override
-    public OutputStream getByteStream() {
-        return bytestream;
-    }
-
-    /**
-     * An attribute of a language and binding dependent type that represents a
-     * writable stream to which 16-bit units can be output.
-     *
-     * @return writable stream instance.
-     */
-    @Override
-    public Writer getCharacterStream() {
-        return writer;
-    }
-
-    /**
-     * The character encoding to use for the output.
-     *
-     * @return the character encoding.
-     */
-    @Override
-    public String getEncoding() {
-        return encoding;
-    }
-
-    /**
-     * The system identifier for this output destination.
-     *
-     * @return system identifier.
-     */
-    @Override
-    public String getSystemId() {
-        return sysId;
-    }
-
-    /**
-     * Set writable stream of bytes.
-     *
-     * @param bs OutputStream instance
-     */
-    @Override
-    public void setByteStream(OutputStream bs) {
-        bytestream = bs;
-    }
-
-    /**
-     * Set 16 bits unit writable stream.
-     *
-     * @param bs a Writer instance
-     */
-    @Override
-    public void setCharacterStream(Writer cs) {
-        writer = cs;
-    }
-
-    /**
-     * Set character encoding to use for the output.
-     *
-     * @param encoding encoding set to the output
-     */
-    @Override
-    public void setEncoding(String encoding) {
-        this.encoding = encoding;
-    }
-
-    /**
-     * Set the system identifier for the output.
-     *
-     * @param sysId system identifier string.
-     */
-    @Override
-    public void setSystemId(String sysId) {
-        this.sysId = sysId;
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/test/auctionportal/MyDOMOutput.java	2015-01-09 15:42:32.088203421 -0800
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.auctionportal;
+
+import org.w3c.dom.ls.LSOutput;
+import java.io.OutputStream;
+import java.io.Writer;
+
+/**
+ * A Thread-safe LS output destination for DOM processing. LSOutput objects
+ * belong to the application. The DOM implementation will never modify them
+ * (though it may make copies and modify the copies, if necessary).
+ */
+public class MyDOMOutput implements LSOutput {
+    /**
+     * An attribute of a language and binding dependent type that represents a
+     * writable stream of bytes.
+     */
+    private OutputStream bytestream;
+
+    /**
+     * character encoding to use for the output.
+     */
+    private String encoding;
+
+    /**
+     * The system identifier.
+     */
+    private String sysId;
+
+    /**
+     * Writable stream to which 16-bit units can be output.
+     */
+    private Writer writer;
+
+    /**
+     * An attribute of a language and binding dependent type that represents a
+     * writable stream of bytes.
+     *
+     * @return a writable stream.
+     */
+    @Override
+    public OutputStream getByteStream() {
+        return bytestream;
+    }
+
+    /**
+     * An attribute of a language and binding dependent type that represents a
+     * writable stream to which 16-bit units can be output.
+     *
+     * @return writable stream instance.
+     */
+    @Override
+    public Writer getCharacterStream() {
+        return writer;
+    }
+
+    /**
+     * The character encoding to use for the output.
+     *
+     * @return the character encoding.
+     */
+    @Override
+    public String getEncoding() {
+        return encoding;
+    }
+
+    /**
+     * The system identifier for this output destination.
+     *
+     * @return system identifier.
+     */
+    @Override
+    public String getSystemId() {
+        return sysId;
+    }
+
+    /**
+     * Set writable stream of bytes.
+     *
+     * @param bs OutputStream instance
+     */
+    @Override
+    public void setByteStream(OutputStream bs) {
+        bytestream = bs;
+    }
+
+    /**
+     * Set 16 bits unit writable stream.
+     *
+     * @param cs a Writer instance
+     */
+    @Override
+    public void setCharacterStream(Writer cs) {
+        writer = cs;
+    }
+
+    /**
+     * Set character encoding to use for the output.
+     *
+     * @param encoding encoding set to the output
+     */
+    @Override
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    /**
+     * Set the system identifier for the output.
+     *
+     * @param sysId system identifier string.
+     */
+    @Override
+    public void setSystemId(String sysId) {
+        this.sysId = sysId;
+    }
+}
--- old/test/javax/xml/jaxp/functional/test/auctionportal/MyErrorHandler.java	2015-01-09 15:42:32.646204293 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package test.auctionportal;
-
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * ErrorHandler for error handling. Set state if any method in error, warning
- * or fatalError was called.
- */
-public final class MyErrorHandler extends DefaultHandler {
-    /**
-     * Enumeration for ErrorHandler's state.
-     */
-    private enum STATE { ERROR, FATAL, WARNING, NORMAL};
-
-    /**
-     * Set state as normal by default.
-     */
-    private volatile STATE state = STATE.NORMAL;
-
-    /**
-     * Keep exception for further investigation.
-     */
-    private volatile SAXParseException exception;
-
-    /**
-     * Save exception and set state to ERROR.
-     * @param e exception wrap error.
-     */
-    @Override
-    public void error (SAXParseException e) {
-        state = STATE.ERROR;
-        exception = e;
-    }
-
-    /**
-     * Save exception and set state to FATAL.
-     * @param e exception wrap error.
-     */
-    @Override
-    public void fatalError (SAXParseException e) {
-        state = STATE.FATAL;
-        exception = e;
-    }
-
-    /**
-     * Save exception and set state to WARNING.
-     * @param e exception wrap error.
-     */
-    @Override
-    public void warning (SAXParseException e) {
-        state = STATE.WARNING;
-        exception = e;
-    }
-
-    /**
-     * return ErrorHandle's state .
-     * @return true No error, fatalError and warning.
-     *         false there is any error, fatalError or warning in processing.
-     */
-    public boolean isAnyError() {
-        if (state != STATE.NORMAL)
-            System.out.println(exception);
-        return state != STATE.NORMAL;
-    }
-
-    /**
-     * return whether fatalError is the only error.
-     * @return true fatalError is the only error.
-     *         false there is no error, or other error besides fatalError.
-     */
-    public boolean isFatalError() {
-        if (state == STATE.FATAL)
-            System.out.println(exception);
-        return state == STATE.FATAL;
-    }
-
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/test/auctionportal/MyErrorHandler.java	2015-01-09 15:42:32.466204012 -0800
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.auctionportal;
+
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * ErrorHandler for error handling. Set state if any method in error, warning
+ * or fatalError was called.
+ */
+public final class MyErrorHandler extends DefaultHandler {
+    /**
+     * Enumeration for ErrorHandler's state.
+     */
+    private enum STATE { ERROR, FATAL, WARNING, NORMAL};
+
+    /**
+     * Set state as normal by default.
+     */
+    private volatile STATE state = STATE.NORMAL;
+
+    /**
+     * Keep exception for further investigation.
+     */
+    private volatile SAXParseException exception;
+
+    /**
+     * Save exception and set state to ERROR.
+     * @param e exception wrap error.
+     */
+    @Override
+    public void error (SAXParseException e) {
+        state = STATE.ERROR;
+        exception = e;
+    }
+
+    /**
+     * Save exception and set state to FATAL.
+     * @param e exception wrap error.
+     */
+    @Override
+    public void fatalError (SAXParseException e) {
+        state = STATE.FATAL;
+        exception = e;
+    }
+
+    /**
+     * Save exception and set state to WARNING.
+     * @param e exception wrap error.
+     */
+    @Override
+    public void warning (SAXParseException e) {
+        state = STATE.WARNING;
+        exception = e;
+    }
+
+    /**
+     * return ErrorHandle's state .
+     * @return true No error, fatalError and warning.
+     *         false there is any error, fatalError or warning in processing.
+     */
+    public boolean isAnyError() {
+        if (state != STATE.NORMAL)
+            System.out.println(exception);
+        return state != STATE.NORMAL;
+    }
+
+    /**
+     * return whether fatalError is the only error.
+     * @return true fatalError is the only error.
+     *         false there is no error, or other error besides fatalError.
+     */
+    public boolean isFatalError() {
+        if (state == STATE.FATAL)
+            System.out.println(exception);
+        return state == STATE.FATAL;
+    }
+
+}
--- old/test/javax/xml/jaxp/functional/test/auctionportal/XInclHandler.java	2015-01-09 15:42:33.046204918 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package test.auctionportal;
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.stream.Collectors;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * A SAX2 event handlers.
- * This SAX2 ContentHandler receives callback event then print whole document
- * that is parsed.
- */
-public class XInclHandler extends DefaultHandler implements LexicalHandler {
-    /**
-     * Print writer.
-     */
-    private final PrintWriter fOut;
-
-    /**
-     * Canonical output.
-     */
-    private volatile boolean fCanonical;
-
-    /**
-     * Element depth.
-     */
-    private volatile int fElementDepth;
-
-    /**
-     * Sets whether output is canonical.
-     */
-    public void setCanonical(boolean canonical) {
-        fCanonical = canonical;
-    }
-
-    /**
-     * Sets the output stream for printing.
-     * @param stream OutputStream for message output.
-     * @param encoding File encoding for message output.
-     */
-    public XInclHandler(OutputStream stream, String encoding)
-            throws UnsupportedEncodingException {
-        // At least set one encoding.
-        if (encoding == null) {
-            encoding = "UTF8";
-        }
-
-        fOut = new PrintWriter(new OutputStreamWriter(stream, encoding), false);
-    }
-
-    /**
-     * Receive notification of the beginning of the document. Write the start
-     * document tag if it's not canonical mode.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     */
-    @Override
-    public void startDocument() throws SAXException {
-        fElementDepth = 0;
-
-        if (!fCanonical) {
-            writeFlush("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        }
-    }
-
-    /**
-     * Receive notification of a processing instruction.
-     * @param target The processing instruction target.
-     * @param data The processing instruction data, or null if
-     *             none is supplied.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     */
-    @Override
-    public void processingInstruction (String target, String data)
-        throws SAXException {
-        if (fElementDepth > 0) {
-            StringBuilder instruction = new StringBuilder("<?").append(target);
-            if (data != null && data.length() > 0) {
-                instruction.append(' ').append(data);
-            }
-            instruction.append("?>");
-            writeFlush(instruction.toString());
-        }
-    }
-
-    /**
-     * Receive notification of the start of an element then write the normalized
-     * output to the file.
-     * @param uri The Namespace URI, or the empty string if the
-     *        element has no Namespace URI or if Namespace
-     *        processing is not being performed.
-     * @param localName The local name (without prefix), or the
-     *        empty string if Namespace processing is not being
-     *        performed.
-     * @param qName The qualified name (with prefix), or the
-     *        empty string if qualified names are not available.
-     * @param attributes The attributes attached to the element.  If
-     *        there are no attributes, it shall be an empty
-     *        Attributes object.
-     */
-    @Override
-    public void startElement(String uri, String local, String raw,
-            Attributes attrs) throws SAXException {
-        fElementDepth++;
-        StringBuilder start = new StringBuilder().append('<').append(raw);
-        if (attrs != null) {
-            for (int i = 0; i < attrs.getLength(); i++) {
-                start.append(' ').append(attrs.getQName(i)).append("=\"").
-                    append(normalizeAndPrint(attrs.getValue(i))).append('"');
-            }
-        }
-        start.append('>');
-        writeFlush(start.toString());
-    }
-
-    /**
-     * Receive notification of character data inside an element and write
-     * normalized characters to file.
-     * @param ch The characters.
-     * @param start The start position in the character array.
-     * @param length The number of characters to use from the
-     *               character array.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     */
-    @Override
-    public void characters(char ch[], int start, int length)
-            throws SAXException {
-        writeFlush(normalizeAndPrint(ch, start, length));
-    }
-
-    /**
-     * Receiving notification of ignorable whitespace in element content and
-     * writing normalized ignorable characters to file.
-     * @param ch The characters.
-     * @param start The start position in the character array.
-     * @param length The number of characters to use from the
-     *               character array.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     */
-    @Override
-    public void ignorableWhitespace(char ch[], int start, int length)
-            throws SAXException {
-        characters(ch, start, length);
-    }
-
-    /**
-     * Receive notification of the end of an element and print end element.
-     *
-     * @param uri The Namespace URI, or the empty string if the
-     *        element has no Namespace URI or if Namespace
-     *        processing is not being performed.
-     * @param localName The local name (without prefix), or the
-     *        empty string if Namespace processing is not being
-     *        performed.
-     * @param qName The qualified name (with prefix), or the
-     *        empty string if qualified names are not available.
-     */
-    @Override
-    public void endElement(String uri, String local, String raw)
-            throws SAXException {
-        fElementDepth--;
-        writeFlush("</" + raw + ">");
-    }
-
-    /**
-     * Receive notification of a parser warning and print it out.
-     * @param e The warning information encoded as an exception.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     */
-    @Override
-    public void warning(SAXParseException ex) throws SAXException {
-        printError("Warning", ex);
-    }
-
-    /**
-     * Receive notification of a parser error and print it out.
-     * @param e The error information encoded as an exception.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-
-     */
-    @Override
-    public void error(SAXParseException ex) throws SAXException {
-        printError("Error", ex);
-    }
-
-    /**
-     * Receive notification of a parser fatal error. Throw out fatal error
-     * following print fatal error message.
-     * @param e The fatal error information encoded as an exception.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-
-     */
-    @Override
-    public void fatalError(SAXParseException ex) throws SAXException {
-        printError("Fatal Error", ex);
-        throw ex;
-    }
-
-    /**
-     * Do nothing on start DTD.
-     * @param name The document type name.
-     * @param publicId The declared public identifier for the
-     *        external DTD subset, or null if none was declared.
-     * @param systemId The declared system identifier for the
-     *        external DTD subset, or null if none was declared.
-     *        (Note that this is not resolved against the document
-     *        base URI.)
-     * @exception SAXException The application may raise an
-     *            exception.
-     */
-    @Override
-    public void startDTD(String name, String publicId, String systemId)
-        throws SAXException {
-    }
-
-    /**
-     * Do nothing on end DTD.
-     * @exception SAXException The application may raise an exception.
-     */
-    @Override
-    public void endDTD() throws SAXException {
-    }
-
-    /**
-     * Do nothing on start entity.
-     * @param name The name of the entity.  If it is a parameter
-     *        entity, the name will begin with '%', and if it is the
-     *        external DTD subset, it will be "[dtd]".
-     * @exception SAXException The application may raise an exception.
-     */
-    @Override
-    public void startEntity(String name) throws SAXException {
-    }
-
-    /**
-     * Do nothing on end entity.
-     * @param name The name of the entity.  If it is a parameter
-     *        entity, the name will begin with '%', and if it is the
-     *        external DTD subset, it will be "[dtd]".
-     * @exception SAXException The application may raise an exception.
-     */
-    @Override
-    public void endEntity(String name) throws SAXException {
-    }
-
-    /**
-     * Do nothing on start CDATA section.
-     * @exception SAXException The application may raise an exception.
-     */
-    @Override
-    public void startCDATA() throws SAXException {
-    }
-
-    /**
-     * Do nothing on end CDATA section.
-     * @exception SAXException The application may raise an exception.
-     */
-    @Override
-    public void endCDATA() throws SAXException {
-    }
-
-    /**
-     * Report an normalized XML comment when receive a comment in the document.
-     *
-     * @param ch An array holding the characters in the comment.
-     * @param start The starting position in the array.
-     * @param length The number of characters to use from the array.
-     * @exception SAXException The application may raise an exception.
-     */
-    @Override
-    public void comment(char ch[], int start, int length) throws SAXException {
-        if (!fCanonical && fElementDepth > 0) {
-            writeFlush("<!--" + normalizeAndPrint(ch, start, length) + "-->");
-        }
-    }
-
-    /**
-     * Normalizes and prints the given string.
-     * @param s String to be normalized
-     */
-    private String normalizeAndPrint(String s) {
-        return s.chars().mapToObj(c -> normalizeAndPrint((char)c)).
-                collect(Collectors.joining());
-    }
-
-    /**
-     * Normalizes and prints the given array of characters.
-     * @param ch The characters to be normalized.
-     * @param start The start position in the character array.
-     * @param length The number of characters to use from the
-     *               character array.
-     */
-    private String normalizeAndPrint(char[] ch, int offset, int length) {
-        return normalizeAndPrint(new String(ch, offset, length));
-    }
-
-    /**
-     * Normalizes given character.
-     * @param c char to be normalized.
-     */
-    private String normalizeAndPrint(char c) {
-        switch (c) {
-            case '<':
-                return "&lt;";
-            case '>':
-                return "&gt;";
-            case '&':
-                return "&amp;";
-            case '"':
-                return "&quot;";
-            case '\r':
-            case '\n':
-                return fCanonical ? "&#" + Integer.toString(c) + ";" : String.valueOf(c);
-            default:
-                return String.valueOf(c);
-        }
-    }
-
-    /**
-     * Prints the error message.
-     * @param type error type
-     * @param ex exception that need to be printed
-     */
-    private void printError(String type, SAXParseException ex) {
-        System.err.print("[" + type + "] ");
-        String systemId = ex.getSystemId();
-        if (systemId != null) {
-            int index = systemId.lastIndexOf('/');
-            if (index != -1)
-                systemId = systemId.substring(index + 1);
-            System.err.print(systemId);
-        }
-        System.err.print(':' + ex.getLineNumber());
-        System.err.print(':' + ex.getColumnNumber());
-        System.err.println(": " + ex.getMessage());
-        System.err.flush();
-    }
-
-    /**
-     * Write out and flush.
-     * @param out string to be written.
-     */
-    private void writeFlush(String out) {
-        fOut.print(out);
-        fOut.flush();
-    }
-}
--- /dev/null	2014-09-08 10:45:56.830930409 -0700
+++ new/test/javax/xml/jaxp/libs/test/auctionportal/XInclHandler.java	2015-01-09 15:42:32.928204733 -0800
@@ -0,0 +1,389 @@
+/*
+ * Copyright (c) 2003, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.auctionportal;
+
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.stream.Collectors;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * A SAX2 event handlers.
+ * This SAX2 ContentHandler receives callback event then print whole document
+ * that is parsed.
+ */
+public class XInclHandler extends DefaultHandler implements LexicalHandler {
+    /**
+     * Print writer.
+     */
+    private final PrintWriter fOut;
+
+    /**
+     * Canonical output.
+     */
+    private volatile boolean fCanonical;
+
+    /**
+     * Element depth.
+     */
+    private volatile int fElementDepth;
+
+    /**
+     * Sets whether output is canonical.
+     * 
+     * @param canonical if the output is canonical format.
+     */
+    public void setCanonical(boolean canonical) {
+        fCanonical = canonical;
+    }
+
+    /**
+     * Sets the output stream for printing.
+     * @param stream OutputStream for message output.
+     * @param encoding File encoding for message output.
+     * @throws UnsupportedEncodingException if given encoding is an unsupported
+     *         encoding name or invalid encoding name.
+     */
+    public XInclHandler(OutputStream stream, String encoding)
+            throws UnsupportedEncodingException {
+        // At least set one encoding.
+        if (encoding == null) {
+            encoding = "UTF8";
+        }
+
+        fOut = new PrintWriter(new OutputStreamWriter(stream, encoding), false);
+    }
+
+    /**
+     * Receive notification of the beginning of the document. Write the start
+     * document tag if it's not canonical mode.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     */
+    @Override
+    public void startDocument() throws SAXException {
+        fElementDepth = 0;
+
+        if (!fCanonical) {
+            writeFlush("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        }
+    }
+
+    /**
+     * Receive notification of a processing instruction.
+     * @param target The processing instruction target.
+     * @param data The processing instruction data, or null if
+     *             none is supplied.
+     * @exception SAXException Any SAX exception, possibly wrapping another 
+     *            exception.
+     */
+    @Override
+    public void processingInstruction (String target, String data)
+        throws SAXException {
+        if (fElementDepth > 0) {
+            StringBuilder instruction = new StringBuilder("<?").append(target);
+            if (data != null && data.length() > 0) {
+                instruction.append(' ').append(data);
+            }
+            instruction.append("?>");
+            writeFlush(instruction.toString());
+        }
+    }
+
+    /**
+     * Receive notification of the start of an element then write the normalized
+     * output to the file.
+     * @param uri The Namespace URI, or the empty string if the
+     *        element has no Namespace URI or if Namespace
+     *        processing is not being performed.
+     * @param local The local name (without prefix), or the
+     *        empty string if Namespace processing is not being
+     *        performed.
+     * @param raw The qualified name (with prefix), or the
+     *        empty string if qualified names are not available.
+     * @param attrs The attributes attached to the element.  If
+     *        there are no attributes, it shall be an empty
+     *        Attributes object.
+     * @throws SAXException Any SAX exception, possibly wrapping another 
+     *         exception.
+     */
+    @Override
+    public void startElement(String uri, String local, String raw,
+            Attributes attrs) throws SAXException {
+        fElementDepth++;
+        StringBuilder start = new StringBuilder().append('<').append(raw);
+        if (attrs != null) {
+            for (int i = 0; i < attrs.getLength(); i++) {
+                start.append(' ').append(attrs.getQName(i)).append("=\"").
+                    append(normalizeAndPrint(attrs.getValue(i))).append('"');
+            }
+        }
+        start.append('>');
+        writeFlush(start.toString());
+    }
+
+    /**
+     * Receive notification of character data inside an element and write
+     * normalized characters to file.
+     * @param ch The characters.
+     * @param start The start position in the character array.
+     * @param length The number of characters to use from the
+     *               character array.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     */
+    @Override
+    public void characters(char ch[], int start, int length)
+            throws SAXException {
+        writeFlush(normalizeAndPrint(ch, start, length));
+    }
+
+    /**
+     * Receiving notification of ignorable whitespace in element content and
+     * writing normalized ignorable characters to file.
+     * @param ch The characters.
+     * @param start The start position in the character array.
+     * @param length The number of characters to use from the
+     *               character array.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     */
+    @Override
+    public void ignorableWhitespace(char ch[], int start, int length)
+            throws SAXException {
+        characters(ch, start, length);
+    }
+
+    /**
+     * Receive notification of the end of an element and print end element.
+     *
+     * @param uri The Namespace URI, or the empty string if the
+     *        element has no Namespace URI or if Namespace
+     *        processing is not being performed.
+     * @param local The local name (without prefix), or the
+     *        empty string if Namespace processing is not being
+     *        performed.
+     * @param raw The qualified name (with prefix), or the
+     *        empty string if qualified names are not available.
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     */
+    @Override
+    public void endElement(String uri, String local, String raw)
+            throws SAXException {
+        fElementDepth--;
+        writeFlush("</" + raw + ">");
+    }
+
+    /**
+     * Receive notification of a parser warning and print it out.
+     * @param ex The warning information encoded as an exception.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     */
+    @Override
+    public void warning(SAXParseException ex) throws SAXException {
+        printError("Warning", ex);
+    }
+
+    /**
+     * Receive notification of a parser error and print it out.
+     * @param ex The error information encoded as an exception.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+     */
+    @Override
+    public void error(SAXParseException ex) throws SAXException {
+        printError("Error", ex);
+    }
+
+    /**
+     * Receive notification of a parser fatal error. Throw out fatal error
+     * following print fatal error message.
+     * @param ex The fatal error information encoded as an exception.
+     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
+
+     */
+    @Override
+    public void fatalError(SAXParseException ex) throws SAXException {
+        printError("Fatal Error", ex);
+        throw ex;
+    }
+
+    /**
+     * Do nothing on start DTD.
+     * @param name The document type name.
+     * @param publicId The declared public identifier for the
+     *        external DTD subset, or null if none was declared.
+     * @param systemId The declared system identifier for the
+     *        external DTD subset, or null if none was declared.
+     *        (Note that this is not resolved against the document
+     *        base URI.)
+     * @exception SAXException The application may raise an
+     *            exception.
+     */
+    @Override
+    public void startDTD(String name, String publicId, String systemId)
+        throws SAXException {
+    }
+
+    /**
+     * Do nothing on end DTD.
+     * @exception SAXException The application may raise an exception.
+     */
+    @Override
+    public void endDTD() throws SAXException {
+    }
+
+    /**
+     * Do nothing on start entity.
+     * @param name The name of the entity.  If it is a parameter
+     *        entity, the name will begin with '%', and if it is the
+     *        external DTD subset, it will be "[dtd]".
+     * @exception SAXException The application may raise an exception.
+     */
+    @Override
+    public void startEntity(String name) throws SAXException {
+    }
+
+    /**
+     * Do nothing on end entity.
+     * @param name The name of the entity.  If it is a parameter
+     *        entity, the name will begin with '%', and if it is the
+     *        external DTD subset, it will be "[dtd]".
+     * @exception SAXException The application may raise an exception.
+     */
+    @Override
+    public void endEntity(String name) throws SAXException {
+    }
+
+    /**
+     * Do nothing on start CDATA section.
+     * @exception SAXException The application may raise an exception.
+     */
+    @Override
+    public void startCDATA() throws SAXException {
+    }
+
+    /**
+     * Do nothing on end CDATA section.
+     * @exception SAXException The application may raise an exception.
+     */
+    @Override
+    public void endCDATA() throws SAXException {
+    }
+
+    /**
+     * Report an normalized XML comment when receive a comment in the document.
+     *
+     * @param ch An array holding the characters in the comment.
+     * @param start The starting position in the array.
+     * @param length The number of characters to use from the array.
+     * @exception SAXException The application may raise an exception.
+     */
+    @Override
+    public void comment(char ch[], int start, int length) throws SAXException {
+        if (!fCanonical && fElementDepth > 0) {
+            writeFlush("<!--" + normalizeAndPrint(ch, start, length) + "-->");
+        }
+    }
+
+    /**
+     * Normalizes and prints the given string.
+     * @param s String to be normalized
+     */
+    private String normalizeAndPrint(String s) {
+        return s.chars().mapToObj(c -> normalizeAndPrint((char)c)).
+                collect(Collectors.joining());
+    }
+
+    /**
+     * Normalizes and prints the given array of characters.
+     * @param ch The characters to be normalized.
+     * @param start The start position in the character array.
+     * @param length The number of characters to use from the
+     *               character array.
+     */
+    private String normalizeAndPrint(char[] ch, int offset, int length) {
+        return normalizeAndPrint(new String(ch, offset, length));
+    }
+
+    /**
+     * Normalizes given character.
+     * @param c char to be normalized.
+     */
+    private String normalizeAndPrint(char c) {
+        switch (c) {
+            case '<':
+                return "&lt;";
+            case '>':
+                return "&gt;";
+            case '&':
+                return "&amp;";
+            case '"':
+                return "&quot;";
+            case '\r':
+            case '\n':
+                return fCanonical ? "&#" + Integer.toString(c) + ";" : String.valueOf(c);
+            default:
+                return String.valueOf(c);
+        }
+    }
+
+    /**
+     * Prints the error message.
+     * @param type error type
+     * @param ex exception that need to be printed
+     */
+    private void printError(String type, SAXParseException ex) {
+        System.err.print("[" + type + "] ");
+        String systemId = ex.getSystemId();
+        if (systemId != null) {
+            int index = systemId.lastIndexOf('/');
+            if (index != -1)
+                systemId = systemId.substring(index + 1);
+            System.err.print(systemId);
+        }
+        System.err.print(':' + ex.getLineNumber());
+        System.err.print(':' + ex.getColumnNumber());
+        System.err.println(": " + ex.getMessage());
+        System.err.flush();
+    }
+
+    /**
+     * Write out and flush.
+     * @param out string to be written.
+     */
+    private void writeFlush(String out) {
+        fOut.print(out);
+        fOut.flush();
+    }
+}
--- old/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactory02.java	2015-01-09 15:42:33.397205466 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javax.xml.parsers.ptests;
-
-import static jaxp.library.JAXPTestUtilities.FILE_SEP;
-import static jaxp.library.JAXPTestUtilities.USER_DIR;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXResult;
-
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/**
- * This tests the setIgnoringElementWhitespace and setIgnoringComments of
- * DocumentBuilderFactory
- */
-public class DocumentBuilderFactory02 {
-
-    /**
-     * This testcase tests for the isIgnoringElementContentWhitespace and the
-     * setIgnoringElementContentWhitespace. The xml file has all kinds of
-     * whitespace,tab and newline characters, it uses the MyNSContentHandler
-     * which does not invoke the characters callback when this
-     * setIgnoringElementContentWhitespace is set to true.
-     */
-    @Test
-    public void testCheckElementContentWhitespace() {
-        try {
-            String goldFile = TestUtils.GOLDEN_DIR + FILE_SEP + "dbfactory02GF.out";
-            String outputFile = USER_DIR + FILE_SEP + "dbfactory02.out";
-            MyErrorHandler eh = MyErrorHandler.newInstance();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setValidating(true);
-            assertFalse(dbf.isIgnoringElementContentWhitespace());
-            dbf.setIgnoringElementContentWhitespace(true);
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            db.setErrorHandler(eh);
-            Document doc = db.parse(new File(TestUtils.XML_DIR, "DocumentBuilderFactory06.xml"));
-            assertFalse(eh.errorOccured);
-            DOMSource domSource = new DOMSource(doc);
-            TransformerFactory tfactory = TransformerFactory.newInstance();
-            Transformer transformer = tfactory.newTransformer();
-            SAXResult saxResult = new SAXResult();
-            saxResult.setHandler(MyCHandler.newInstance(new File(outputFile)));
-            transformer.transform(domSource, saxResult);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (ParserConfigurationException | SAXException | IOException | TransformerException e) {
-            failUnexpected(e);
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest002.java	2015-01-09 15:42:33.594205774 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test newTransformerhandler() method which takes SAXSource as argument can
- * be set to XMLReader.
- */
-public class SAXTFactoryTest002 {
-    /**
-     * SAXTFactory.newTransformerhandler() method which takes SAXSource as
-     * argument can be set to XMLReader. SAXSource has input XML file as its
-     * input source. XMLReader has a content handler which write out the result
-     * to output file. Test verifies output file is same as golden file.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf002.out";
-        String goldFile = GOLDEN_DIR + "saxtf002GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile);
-                FileInputStream fis = new FileInputStream(xsltFile)) {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory) TransformerFactory.newInstance();
-            SAXSource ss = new SAXSource();
-            ss.setInputSource(new InputSource(fis));
-
-            TransformerHandler handler = saxTFactory.newTransformerHandler(ss);
-            Result result = new StreamResult(fos);
-            handler.setResult(result);
-            reader.setContentHandler(handler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest003.java	2015-01-09 15:42:33.790206080 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test newTransformerhandler() method which takes DOMSource as argument can
- * be set to XMLReader.
- */
-public class SAXTFactoryTest003 {
-    /**
-     * Unit test for newTransformerhandler(Source). DcoumentBuilderFactory is
-     * namespace awareness, DocumentBuilder parse xslt file as DOMSource.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf003.out";
-        String goldFile = GOLDEN_DIR + "saxtf003GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document document = docBuilder.parse(new File(xsltFile));
-            Node node = (Node)document;
-            DOMSource domSource= new DOMSource(node);
-
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-            TransformerHandler handler =
-                        saxTFactory.newTransformerHandler(domSource);
-            Result result = new StreamResult(fos);
-            handler.setResult(result);
-            reader.setContentHandler(handler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (TransformerConfigurationException | ParserConfigurationException
-                | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest004.java	2015-01-09 15:42:33.986206386 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.IOException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/*
- * TransformerConfigurationException expected when there is relative URI is used
- * in citiesinclude.xsl file
- */
-public class SAXTFactoryTest004 {
-    /**
-     * Negative test for newTransformerHandler when relative URI is in XML file.
-     * @throws TransformerConfigurationException If for some reason the
-     * TransformerHandler can not be created.
-     */
-    @Test(expectedExceptions = TransformerConfigurationException.class)
-    public void transformerHandlerTest01() throws TransformerConfigurationException {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document document = docBuilder.parse(new File(XML_DIR + "citiesinclude.xsl"));
-            DOMSource domSource= new DOMSource(document);
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-            saxTFactory.newTransformerHandler(domSource);
-        } catch (ParserConfigurationException | IOException | SAXException ex) {
-            failUnexpected(ex);
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest005.java	2015-01-09 15:42:34.185206697 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test SAXSource API when relative URI is used in xsl file and SystemId was set
- */
-public class SAXTFactoryTest005 {
-    /**
-     * Unit test for XMLReader parsing when relative URI is used in xsl file and
-     * SystemId was set.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf005.out";
-        String goldFile = GOLDEN_DIR + "saxtf005GF.out";
-        String xsltFile = XML_DIR + "citiesinclude.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document document = docBuilder.parse(new File(xsltFile));
-            Node node = (Node)document;
-            DOMSource domSource= new DOMSource(node);
-
-            domSource.setSystemId("file:///" + XML_DIR);
-
-            TransformerHandler handler =
-                        saxTFactory.newTransformerHandler(domSource);
-            Result result = new StreamResult(fos);
-
-            handler.setResult(result);
-            reader.setContentHandler(handler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (TransformerConfigurationException | ParserConfigurationException
-                | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest006.java	2015-01-09 15:42:34.384207008 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test newTransformerHandler with a DOMSource and StreamResult set.
- */
-public class SAXTFactoryTest006 extends TransformerTestConst{
-    /**
-     * Unit test newTransformerHandler with a DOMSource.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf006.out";
-        String goldFile = GOLDEN_DIR + "saxtf006GF.out";
-        String xsltFile = XML_DIR + "citiesinclude.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Node node = (Node)docBuilder.parse(new File(xsltFile));
-
-            DOMSource domSource = new DOMSource(node, "file:///" + XML_DIR);
-            TransformerHandler handler =
-                        saxTFactory.newTransformerHandler(domSource);
-
-            Result result = new StreamResult(fos);
-            handler.setResult(result);
-            reader.setContentHandler(handler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (TransformerConfigurationException | ParserConfigurationException
-                | SAXException | IOException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest008.java	2015-01-09 15:42:34.588207327 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TemplatesHandler;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test newTransformerHandler with a Template Handler.
- */
-public class SAXTFactoryTest008 {
-    /**
-     * Test newTransformerHandler with a Template Handler.
-     */
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf008.out";
-        String goldFile = GOLDEN_DIR + "saxtf008GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-
-            TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
-            reader.setContentHandler(thandler);
-            reader.parse(xsltFile);
-            TransformerHandler tfhandler
-                    = saxTFactory.newTransformerHandler(thandler.getTemplates());
-
-            Result result = new StreamResult(fos);
-            tfhandler.setResult(result);
-
-            reader.setContentHandler(tfhandler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-  }
-
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest009.java	2015-01-09 15:42:34.787207638 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TemplatesHandler;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test newTransformerHandler with a Template Handler along with a relative URI
- * in the xslt file.
- */
-public class SAXTFactoryTest009 {
-    /**
-     * Test newTransformerHandler with a Template Handler along with a relative
-     * URI in the xslt file.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf009.out";
-        String goldFile = GOLDEN_DIR + "saxtf009GF.out";
-        String xsltFile = XML_DIR + "citiesinclude.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-
-            TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
-            thandler.setSystemId("file:///" + XML_DIR);
-            reader.setContentHandler(thandler);
-            reader.parse(xsltFile);
-            TransformerHandler tfhandler=
-                saxTFactory.newTransformerHandler(thandler.getTemplates());
-            Result result = new StreamResult(fos);
-            tfhandler.setResult(result);
-            reader.setContentHandler(tfhandler);
-            reader.parse(xmlFile);
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-  }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest010.java	2015-01-09 15:42:34.985207947 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.stream.StreamSource;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test XMLFilter parse InputSource along with customized ContentHandler.
- */
-public class SAXTFactoryTest010 {
-    /**
-     * Unit test for contentHandler setter/getter along reader as handler's
-     * parent.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf010.out";
-        String goldFile = GOLDEN_DIR + "saxtf010GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try {
-            // The transformer will use a SAX parser as it's reader.
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-            XMLFilter filter =
-                saxTFactory.newXMLFilter(new StreamSource(xsltFile));
-
-            filter.setParent(reader);
-            filter.setContentHandler(new MyContentHandler(outputFile));
-
-            // Now, when you call transformer.parse, it will set itself as
-            // the content handler for the parser object (it's "parent"), and
-            // will then call the parse method on the parser.
-            filter.parse(new InputSource(xmlFile));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest011.java	2015-01-09 15:42:35.184208258 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test XMLFilter parse InputSource along with customized ContentHandler by
- * using SAX parser as it's reader.
- */
-public class SAXTFactoryTest011 {
-    /**
-     * Unit test for contentHandler setter/getter with parent.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf011.out";
-        String goldFile = GOLDEN_DIR + "saxtf011GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try {
-            // The transformer will use a SAX parser as it's reader.
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder docBuilder = dbf.newDocumentBuilder();
-            Document document = docBuilder.parse(new File(xsltFile));
-            Node node = (Node)document;
-            DOMSource domSource= new DOMSource(node);
-
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory)TransformerFactory.newInstance();
-            XMLFilter filter = saxTFactory.newXMLFilter(domSource);
-
-            filter.setParent(reader);
-            filter.setContentHandler(new MyContentHandler(outputFile));
-
-            // Now, when you call transformer.parse, it will set itself as
-            // the content handler for the parser object (it's "parent"), and
-            // will then call the parse method on the parser.
-            filter.parse(new InputSource(xmlFile));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException
-                | ParserConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest012.java	2015-01-09 15:42:35.381208566 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test XMLFilter parse InputSource along with customized ContentHandler by
- * using SAX parser as it's reader.
- */
-public class SAXTFactoryTest012 {
-    /**
-     * Unit test for contentHandler setter/getter.
-     */
-    @Test
-    public void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf012.out";
-        String goldFile = GOLDEN_DIR + "saxtf012GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-        try {
-            // The transformer will use a SAX parser as it's reader.
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-
-            InputSource is = new InputSource(new FileInputStream(xsltFile));
-            SAXSource saxSource = new SAXSource();
-            saxSource.setInputSource(is);
-
-            SAXTransformerFactory saxTFactory = (SAXTransformerFactory)TransformerFactory.newInstance();
-            XMLFilter filter = saxTFactory.newXMLFilter(saxSource);
-
-            filter.setParent(reader);
-            filter.setContentHandler(new MyContentHandler(outputFile));
-
-            // Now, when you call transformer.parse, it will set itself as
-            // the content handler for the parser object (it's "parent"), and
-            // will then call the parse method on the parser.
-            filter.parse(new InputSource(xmlFile));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}
--- old/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest013.java	2015-01-09 15:42:35.581208878 -0800
+++ /dev/null	2014-09-08 10:45:56.830930409 -0700
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javax.xml.transform.ptests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import static javax.xml.transform.ptests.TransformerTestConst.CLASS_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR;
-import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TemplatesHandler;
-import static jaxp.library.JAXPTestUtilities.compareWithGold;
-import static jaxp.library.JAXPTestUtilities.failCleanup;
-import static jaxp.library.JAXPTestUtilities.failUnexpected;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Test XMLFilter parse InputSource along with TemplatesHandler.
- */
-public class SAXTFactoryTest013 {
-    /**
-     * Unit test for TemplatesHandler setter/getter.
-     */
-    @Test
-    public  void testcase01() {
-        String outputFile = CLASS_DIR + "saxtf013.out";
-        String goldFile = GOLDEN_DIR + "saxtf013GF.out";
-        String xsltFile = XML_DIR + "cities.xsl";
-        String xmlFile = XML_DIR + "cities.xml";
-
-        try {
-            // The transformer will use a SAX parser as it's reader.
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-
-            SAXTransformerFactory saxTFactory
-                    = (SAXTransformerFactory) TransformerFactory.newInstance();
-            TemplatesHandler thandler = saxTFactory.newTemplatesHandler();
-            // I have put this as it was complaining about systemid
-            thandler.setSystemId("file:///" + CLASS_DIR);
-
-            reader.setContentHandler(thandler);
-            reader.parse(xsltFile);
-            XMLFilter filter
-                    = saxTFactory.newXMLFilter(thandler.getTemplates());
-            filter.setParent(reader);
-
-            filter.setContentHandler(
-                    new MyContentHandler(outputFile));
-            filter.parse(new InputSource(new FileInputStream(xmlFile)));
-            assertTrue(compareWithGold(goldFile, outputFile));
-        } catch (SAXException | IOException | TransformerConfigurationException ex) {
-            failUnexpected(ex);
-        } finally {
-            try {
-                Path outputPath = Paths.get(outputFile);
-                if(Files.exists(outputPath))
-                    Files.delete(outputPath);
-            } catch (IOException ex) {
-                failCleanup(ex, outputFile);
-            }
-        }
-    }
-}