From 0785d3b590984de0fee8f4590d5a167bee80343b Mon Sep 17 00:00:00 2001 From: Frank Yuan Date: Mon, 10 Aug 2015 09:52:32 -0700 Subject: [PATCH] 8132660: Change jaxp unit test package name to be different with jaxp api Reviewed-by: joehw --- .../javax/xml/jaxp/unittest/TEST.properties | 6 - .../{javax/xml => }/common/Bug6350682.java | 4 +- .../xml => }/common/Bug6723276Test.java | 4 +- .../{javax/xml => }/common/Bug6941169.xml | 0 .../{javax/xml => }/common/Bug6941169.xsd | 0 .../xml => }/common/Bug6941169Test.java | 4 +- .../xml => }/common/Bug7143711Test.java | 2 +- .../{javax/xml => }/datatype/Bug6320118.java | 4 +- .../xml => }/datatype/Bug6937951Test.java | 8 +- .../xml => }/datatype/Bug6937964Test.java | 8 +- .../xml => }/datatype/Bug7042647Test.java | 8 +- .../datatype/DatatypeFactoryTest.java | 9 +- .../xml => }/datatype/DurationTest.java | 8 +- .../xml => }/datatype/FactoryFindTest.java | 6 +- .../datatype/XMLGregorianCalendarTest.java | 9 +- .../{org/w3c => }/dom/Bug4915524.java | 4 +- .../{org/w3c => }/dom/Bug4915748.java | 4 +- .../{org/w3c => }/dom/Bug4966082.java | 4 +- .../unittest/{org/w3c => }/dom/Bug4966082.xml | 0 .../{org/w3c => }/dom/Bug4966138.java | 4 +- .../{org/w3c => }/dom/Bug4966142.java | 4 +- .../unittest/{org/w3c => }/dom/Bug4966142.xml | 0 .../unittest/{org/w3c => }/dom/Bug4966142.xsd | 0 .../{org/w3c => }/dom/Bug4966143.java | 4 +- .../unittest/{org/w3c => }/dom/Bug4966143.xml | 0 .../unittest/{org/w3c => }/dom/Bug4966143.xsd | 0 .../{org/w3c => }/dom/Bug6339023.java | 4 +- .../{org/w3c => }/dom/Bug6355326.java | 4 +- .../{org/w3c => }/dom/Bug6367542.java | 4 +- .../{org/w3c => }/dom/Bug6520131.java | 4 +- .../{org/w3c => }/dom/Bug6521260.java | 4 +- .../unittest/{org/w3c => }/dom/Bug6582545.xml | 0 .../{org/w3c => }/dom/Bug6582545Test.java | 7 +- .../unittest/{org/w3c => }/dom/Bug6879614.xml | 0 .../{org/w3c => }/dom/Bug6879614Test.java | 5 +- .../{org/w3c => }/dom/CR6333993Test.java | 6 +- .../{org/w3c => }/dom/CR6517707Test.java | 7 +- .../{org/w3c => }/dom/CR6517717Test.java | 7 +- .../{org/w3c => }/dom/CR6909336Test.java | 5 +- .../w3c => }/dom/DOMConfigurationTest.java | 19 +- .../w3c => }/dom/DOMConfigurationTest.xsd | 0 .../{org/w3c => }/dom/DOMXPathTest.java | 4 +- .../{org/w3c => }/dom/JdkXmlDomTest.java | 2 +- .../{org/w3c => }/dom/TCKEncodingTest.java | 5 +- .../{org/w3c => }/dom/ls/Bug4973153.java | 4 +- .../{org/w3c => }/dom/ls/Bug6290947.java | 4 +- .../{org/w3c => }/dom/ls/Bug6354955.java | 4 +- .../{org/w3c => }/dom/ls/Bug6376823.java | 4 +- .../{org/w3c => }/dom/ls/Bug6710741Test.java | 6 +- .../{org/w3c => }/dom/ls/LSParserTCKTest.java | 8 +- .../{org/w3c => }/dom/ls/LSParserTest.java | 8 +- .../w3c => }/dom/ls/LSSerializerTest.java | 6 +- .../{org/w3c => }/dom/ls/note_in_dtd.xml | 0 .../jaxp/unittest/{org/w3c => }/dom/test.xml | 0 .../jaxp/unittest/{org/w3c => }/dom/test.xsd | 0 .../parsers/Bug4674384_MAX_OCCURS_Test.java | 7 +- .../parsers/Bug4674384_MAX_OCCURS_Test.xml | 0 .../parsers/Bug4674384_MAX_OCCURS_Test.xsd | 0 .../{javax/xml => }/parsers/Bug4934208.java | 4 +- .../{javax/xml => }/parsers/Bug4967002.java | 4 +- .../{javax/xml => }/parsers/Bug4985486.java | 4 +- .../{javax/xml => }/parsers/Bug4985486.xml | 0 .../{javax/xml => }/parsers/Bug4991020.java | 4 +- .../{javax/xml => }/parsers/Bug4991020.xml | 0 .../{javax/xml => }/parsers/Bug4991020.xsd | 0 .../{javax/xml => }/parsers/Bug4991946.java | 4 +- .../{javax/xml => }/parsers/Bug4991946.xml | 0 .../{javax/xml => }/parsers/Bug4991946.xsd | 0 .../{javax/xml => }/parsers/Bug5010072.java | 4 +- .../{javax/xml => }/parsers/Bug5010072.xsd | 0 .../{javax/xml => }/parsers/Bug5025825.java | 4 +- .../{javax/xml => }/parsers/Bug6309988.java | 4 +- .../{javax/xml => }/parsers/Bug6341770.java | 4 +- .../{javax/xml => }/parsers/Bug6361283.java | 4 +- .../xml => }/parsers/Bug6506304Test.java | 7 +- .../{javax/xml => }/parsers/Bug6518733.java | 4 +- .../{javax/xml => }/parsers/Bug6518733.xml | 0 .../{javax/xml => }/parsers/Bug6564400.java | 4 +- .../{javax/xml => }/parsers/Bug6564400.xml | 0 .../{javax/xml => }/parsers/Bug6564400.xsd | 0 .../{javax/xml => }/parsers/Bug6573786.java | 4 +- .../parsers/Bug6573786ErrorHandler.java | 4 +- .../{javax/xml => }/parsers/Bug6594813.java | 4 +- .../{javax/xml => }/parsers/Bug6608841.dtd | 0 .../{javax/xml => }/parsers/Bug6608841.java | 4 +- .../{javax/xml => }/parsers/Bug6608841.xml | 0 .../parsers/Bug6608841_xhtml11-flat.dtd | 0 .../{javax/xml => }/parsers/Bug6690015.java | 4 +- .../{javax/xml => }/parsers/Bug6760982.java | 4 +- .../xml => }/parsers/Bug6849942Test.java | 7 +- .../{javax/xml => }/parsers/Bug7157608.dtd | 0 .../{javax/xml => }/parsers/Bug7157608.xml | 0 .../xml => }/parsers/Bug7157608Test.java | 7 +- .../{javax/xml => }/parsers/Bug7157608_1.xml | 0 .../xml => }/parsers/Bug7166896Test.java | 8 +- .../{javax/xml => }/parsers/Bug8073385.java | 2 +- .../{javax/xml => }/parsers/DosTest.xml | 0 .../{javax/xml => }/parsers/DosTest3.xml | 0 .../xml => }/parsers/FactoryFindTest.java | 6 +- .../xml => }/parsers/MyDefaultHandler.java | 4 +- .../xml => }/parsers/MyErrorHandler.java | 4 +- .../xml => }/parsers/ParseEmptyStream.java | 7 +- .../{javax/xml => }/parsers/bug6690015.xml | 0 .../{javax/xml => }/parsers/bug6760982.xml | 0 .../{javax/xml => }/parsers/catalog.xml | 0 .../{javax/xml => }/parsers/catalog.xsd | 0 .../{javax/xml => }/parsers/entity.xml | 0 .../{javax/xml => }/parsers/entity64K.xml | 0 .../unittest/{javax/xml => }/parsers/test.xsd | 0 .../{javax/xml => }/parsers/test1.xml | 0 .../{javax/xml => }/parsers/test2.xml | 0 .../unittest/{javax/xml => }/parsers/toys.xml | 0 .../unittest/{javax/xml => }/parsers/toys.xsd | 0 .../{javax/xml => }/parsers/toys3002.xsd | 0 .../parsers/xinclude/Bug6794483Test.java | 2 +- .../xml => }/parsers/xinclude/test1.xml | 0 .../xml => }/parsers/xinclude/test2.xml | 0 .../xml/jaxp/unittest/policy/PolicyUtil.java | 35 -- .../xml/jaxp/unittest/policy/common.policy | 27 - .../xml => }/sax/Attributes2ImplTest.java | 4 +- .../{org/xml => }/sax/Bug6889654Test.java | 4 +- .../{org/xml => }/sax/Bug6925410Test.java | 4 +- .../{org/xml => }/sax/Bug6949607Test.java | 4 +- .../{org/xml => }/sax/Bug6992561Test.java | 4 +- .../unittest/{org/xml => }/sax/Bug7057778.xml | 0 .../{org/xml => }/sax/Bug7057778Test.java | 4 +- .../xml => }/sax/DefaultHandler2Test.java | 4 +- .../{org/xml => }/sax/IssueTracker56Test.java | 4 +- .../{org/xml => }/sax/MyDefaultHandler2.java | 4 +- .../{org/xml => }/sax/NSSupportTest.java | 4 +- .../{org/xml => }/sax/SAXExceptionExt.java | 4 +- .../{org/xml => }/sax/externalDTD.dtd | 0 .../jaxp/unittest/{org/xml => }/sax/toys.xml | 0 .../unittest/{org/xml => }/sax/toys_error.xml | 0 .../AttributeLocalNameTest.java | 2 +- .../{javax/xml => }/stream/Bug6370703.java | 4 +- .../{javax/xml => }/stream/Bug6378422.java | 4 +- .../{javax/xml => }/stream/Bug6380870.java | 4 +- .../{javax/xml => }/stream/Bug6489502.java | 2 +- .../{javax/xml => }/stream/Bug6509774.java | 4 +- .../xml => }/stream/Bug6688002Test.java | 9 +- .../{javax/xml => }/stream/Bug6976938.xml | 0 .../xml => }/stream/Bug6976938Test.java | 8 +- .../stream/CoalesceTest/CoalesceTest.java | 2 +- .../xml => }/stream/CoalesceTest/coalesce.xml | 0 .../stream/EntitiesTest/EntityTest.java | 2 +- .../stream/EntitiesTest/testCharRef.xml | 0 .../EntitiesTest/testCharRef.xml.output | 0 .../stream/EventReaderDelegateTest.java | 10 +- .../EventsTest}/Issue41Test.java | 4 +- .../EventsTest}/Issue48Test.java | 4 +- .../EventsTest}/Issue53Test.java | 4 +- .../EventsTest}/Issue58Test.java | 4 +- .../xml => }/stream/FactoryFindTest.java | 7 +- .../xml => }/stream/FactoryFindTest.policy | 0 .../stream/IgnoreExternalDTDTest.java | 9 +- .../ProcessingInstructionTest.java | 4 +- .../stream/StreamReaderDelegateTest.java | 9 +- .../xml => }/stream/XMLEventLocationTest.java | 6 +- .../stream/XMLEventReaderTest/Bug6489890.java | 2 +- .../stream/XMLEventReaderTest/Bug6555001.java | 2 +- .../XMLEventReaderTest/Bug6586466Test.java | 2 +- .../XMLEventReaderTest/Bug6613059Test.java | 2 +- .../XMLEventReaderTest/Bug6668115Test.java | 2 +- .../XMLEventReaderTest/Bug6846133Test.java | 2 +- .../XMLEventReaderTest/Issue40Test.java | 2 +- .../stream/XMLEventReaderTest/bug6613059.xml | 0 .../stream/XMLEventReaderTest/play.xml | 0 .../stream/XMLEventReaderTest/play2.xml | 0 .../stream/XMLEventReaderTest/sgml.xml | 0 .../ReaderToWriterTest.java | 2 +- .../ReaderToWriterTest.wsdl | 0 .../XMLEventWriterTest/ReaderToWriterTest.xml | 0 .../W2JDLR4002TestService.wsdl.data | 0 .../XMLEventWriterTest.java | 2 +- .../XMLEventWriterTest/XMLEventWriterTest.xml | 0 .../stream/XMLEventWriterTest/merge-1.xml | 0 .../stream/XMLEventWriterTest/merge-2.xml | 0 .../stream/XMLEventWriterTest/replace1.txt | 0 .../XMLInputFactoryTest/Bug6756677Test.java | 6 +- .../XMLInputFactoryTest/Bug6909759Test.java | 2 +- .../XMLInputFactoryTest/IssueTracker38.java | 2 +- .../XMLInputFactoryTest/MyInputFactory.java | 2 +- .../stream/XMLInputFactoryTest/play.xml | 0 .../XMLOutputFactoryTest/Bug6846132Test.java | 2 +- .../DuplicateNSDeclarationTest.java | 2 +- .../StreamResultTest.java | 2 +- .../XMLResolverTest/XMLResolverTest.java | 2 +- .../XMLResolverTest/XMLResolverTest.xml | 0 .../stream/XMLResolverTest/replace1.txt | 0 .../stream/XMLResolverTest/replace2.txt | 0 .../XMLStreamExceptionTest/ExceptionTest.java | 2 +- .../XMLStreamFilterTest/Bug6481615.java | 2 +- .../XMLStreamFilterTest/Bug6481678.java | 2 +- .../XMLStreamFilterTest/HasNextTest.java | 2 +- .../XMLStreamFilterTest/HasNextTest.xml | 0 .../HasNextTypeFilter.java | 2 +- .../stream/XMLStreamReaderTest/BOMTest.java | 2 +- .../XMLStreamReaderTest/Bug6388460.java | 2 +- .../XMLStreamReaderTest/Bug6472982Test.java | 2 +- .../stream/XMLStreamReaderTest/Bug6767322.xml | 0 .../XMLStreamReaderTest/Bug6767322Test.java | 2 +- .../XMLStreamReaderTest/Bug6847819Test.java | 2 +- .../stream/XMLStreamReaderTest/BugTest.java | 2 +- .../DefaultAttributeTest.java | 2 +- .../XMLStreamReaderTest/DoubleXmlnsTest.java | 2 +- .../XMLStreamReaderTest/ExternalDTD.dtd} | 0 .../XMLStreamReaderTest/ExternalDTD.xml} | 0 .../XMLStreamReaderTest/Hello.wsdl.data | 0 .../XMLStreamReaderTest/IsValidatingTest.java | 2 +- .../XMLStreamReaderTest/IsValidatingTest.xml | 0 .../IsValidatingTestInternalSubset.xml | 0 .../XMLStreamReaderTest/Issue44Test.java | 2 +- .../XMLStreamReaderTest/Issue47Test.java | 2 +- .../XMLStreamReaderTest/IssueTracker24.java | 2 +- .../XMLStreamReaderTest/IssueTracker35.java | 2 +- .../XMLStreamReaderTest/IssueTracker70.java | 2 +- .../XMLStreamReaderTest/IssueTracker70.xml | 0 .../XMLStreamReaderTest/Jsr173MR1Req5.xml | 0 .../Jsr173MR1Req5Test.java | 2 +- .../XMLStreamReaderTest/Jsr173MR1Req8.xml | 0 .../Jsr173MR1Req8Test.java | 2 +- .../XMLStreamReaderTest/NamespaceTest.java | 2 +- .../XMLStreamReaderTest/StreamReaderTest.java | 2 +- .../XMLStreamReaderTest/SupportDTDTest.java | 2 +- .../XMLStreamReaderTest/UTF16-BE.wsdl.data | 0 .../XMLStreamReaderTest/UTF8-BOM.xml.data | 0 .../XMLStreamReaderTest/VoiceXMLDTDTest.java | 2 +- .../stream/XMLStreamReaderTest/XML11Test.java | 2 +- .../stream/XMLStreamReaderTest/XMLSchema.dtd | 0 .../stream/XMLStreamReaderTest/XMLSchema.xsd | 0 .../stream/XMLStreamReaderTest/datatypes.dtd | 0 .../stream/XMLStreamReaderTest/report.dtd | 0 .../stream/XMLStreamReaderTest/sgml.xml | 0 .../stream/XMLStreamReaderTest/voicexml.xml | 0 .../stream/XMLStreamReaderTest/vxml.dtd | 0 .../stream/XMLStreamReaderTest/xml11.xml.data | 0 .../AttributeEscapeTest.java | 2 +- .../XMLStreamWriterTest/Bug6452107.java | 2 +- .../XMLStreamWriterTest/Bug6600882Test.java | 2 +- .../XMLStreamWriterTest/Bug6675332Test.java | 2 +- .../XMLStreamWriterTest/Bug7037352Test.java | 2 +- .../stream/XMLStreamWriterTest/DOMUtil.java | 2 +- .../XMLStreamWriterTest/DomUtilTest.java | 2 +- .../XMLStreamWriterTest/EmptyElementTest.java | 2 +- .../XMLStreamWriterTest/EncodingTest.java | 2 +- .../XMLStreamWriterTest/NamespaceTest.java | 2 +- .../NullUriDetectionTest.java | 2 +- .../XMLStreamWriterTest/SqeLinuxTest.java | 2 +- .../UnprefixedNameTest.java | 2 +- .../XMLStreamWriterTest/WriterTest.java | 2 +- .../XMLStreamWriterTest.java | 2 +- .../stream/XMLStreamWriterTest/message_12.xml | 0 .../XMLStreamWriterTest/testEight.xml.org | 0 .../XMLStreamWriterTest/testFive.xml.org | 0 .../XMLStreamWriterTest/testFour.xml.org | 0 .../XMLStreamWriterTest/testOne.xml.org | 0 .../XMLStreamWriterTest/testSeven.xml.org | 0 .../XMLStreamWriterTest/testSix.xml.org | 0 .../XMLStreamWriterTest/testThree.xml.org | 0 .../{javax/xml => }/stream/basic-form.vxml | 0 .../{javax/xml => }/stream/report.dtd | 0 .../xml => }/stream/sgml-bad-systemId.xml | 0 .../unittest/{javax/xml => }/stream/sgml.xml | 0 .../xml => }/stream/sgml_Bug6509774.xml | 0 .../{javax/xml => }/stream/testfile1.xml | 0 .../{javax/xml => }/stream/testfile2.xml | 0 .../{javax/xml => }/stream/testfile3.xml | 0 .../{javax/xml => }/stream/testfile4.xml | 0 .../unittest/{javax/xml => }/stream/toys.xml | 0 .../unittest/{javax/xml => }/stream/vxml.dtd | 0 .../{javax/xml => }/transform/5368141.xml | 0 .../{javax/xml => }/transform/Bug4693341.dtd | 0 .../{javax/xml => }/transform/Bug4693341.out | 0 .../{javax/xml => }/transform/Bug4693341.xml | 0 .../xml => }/transform/Bug4693341Test.java | 4 +- .../xml => }/transform/Bug4693341_golden.dtd | 0 .../xml => }/transform/Bug4693341_golden.xml | 0 .../{javax/xml => }/transform/Bug4892774.java | 13 +- .../{javax/xml => }/transform/Bug5073477.java | 4 +- .../{javax/xml => }/transform/Bug5073477.xml | 0 .../{javax/xml => }/transform/Bug6175602.java | 4 +- .../{javax/xml => }/transform/Bug6206491.java | 4 +- .../{javax/xml => }/transform/Bug6206491.xml | 0 .../{javax/xml => }/transform/Bug6206491.xsl | 0 .../xml => }/transform/Bug6206491_2.xml | 0 .../xml => }/transform/Bug6216226Test.java | 6 +- .../{javax/xml => }/transform/Bug6311448.java | 4 +- .../{javax/xml => }/transform/Bug6384805.java | 4 +- .../{javax/xml => }/transform/Bug6465722.java | 4 +- .../{javax/xml => }/transform/Bug6467808.java | 4 +- .../{javax/xml => }/transform/Bug6490380.java | 4 +- .../{javax/xml => }/transform/Bug6490921.java | 4 +- .../{javax/xml => }/transform/Bug6505031.java | 4 +- .../{javax/xml => }/transform/Bug6513892.java | 4 +- .../{javax/xml => }/transform/Bug6537167.java | 4 +- .../{javax/xml => }/transform/Bug6540545.java | 4 +- .../{javax/xml => }/transform/Bug6559595.java | 4 +- .../{javax/xml => }/transform/Bug6565260.java | 4 +- .../{javax/xml => }/transform/Bug6940416.java | 4 +- .../xml => }/transform/BugDB12665704.xml | 0 .../xml => }/transform/BugDB12665704.xsl | 0 .../xml => }/transform/BugDB12665704Test.java | 10 +- .../{javax/xml => }/transform/CR6401137.xml | 0 .../{javax/xml => }/transform/CR6401137.xsl | 0 .../xml => }/transform/CR6401137Test.java | 8 +- .../xml => }/transform/CR6551600.policy | 0 .../xml => }/transform/CR6551600Test.java | 6 +- .../{javax/xml => }/transform/CR6577667.xsl | 0 .../xml => }/transform/CR6577667Test.java | 6 +- .../xml => }/transform/CR6652519Test.java | 6 +- .../xml => }/transform/CR6689809Test.java | 5 +- .../{javax/xml => }/transform/CR6905829.xml | 0 .../{javax/xml => }/transform/CR6905829.xsl | 0 .../xml => }/transform/CR6905829Inc.xsl | 0 .../xml => }/transform/CR6905829Test.java | 6 +- .../{javax/xml => }/transform/CR6935697.xml | 0 .../{javax/xml => }/transform/CR6935697.xsl | 0 .../xml => }/transform/CR6935697Test.java | 9 +- .../{javax/xml => }/transform/CR6941869.xml | 0 .../{javax/xml => }/transform/CR6941869.xsl | 0 .../xml => }/transform/CR6941869Test.java | 6 +- .../{javax/xml => }/transform/CR6957215.xml | 0 .../{javax/xml => }/transform/CR6957215.xsl | 0 .../xml => }/transform/CR6957215Test.java | 12 +- .../{javax/xml => }/transform/CR7098746.xml | 0 .../{javax/xml => }/transform/CR7098746.xsl | 0 .../xml => }/transform/CR7098746Test.java | 9 +- .../xml => }/transform/DOMResultTest.java | 9 +- .../xml => }/transform/DocumentExtFunc.java | 2 +- .../xml => }/transform/FactoryFindTest.java | 6 +- .../{javax/xml => }/transform/Issue2204.xml | 0 .../{javax/xml => }/transform/Issue2204.xsl | 0 .../xml => }/transform/Issue2204Test.java | 4 +- .../{javax/xml => }/transform/Issue2290.xsl | 0 .../xml => }/transform/Issue2290Test.java | 4 +- .../transform/MsWordXMLImport.xsl.data | 2 +- .../NCAA_Conference_Schedule_XML.dtd | 0 .../xml => }/transform/OpenJDK100017Test.java | 6 +- .../xml => }/transform/PredicateInKeyTest.xml | 2 +- .../xml => }/transform/PredicateInKeyTest.xsl | 2 +- .../xml => }/transform/SAX2DOMTest.java | 4 +- .../{javax/xml => }/transform/SAX2DOMTest.xml | 0 .../transform/SecureProcessingTest.java | 8 +- .../transform/SecureProcessingTest.xml | 0 .../transform/SecureProcessingTest.xsl | 0 .../{javax/xml => }/transform/SourceTest.java | 7 +- .../{javax/xml => }/transform/SourceTest.xml | 0 .../{javax/xml => }/transform/SourceTest.xsl | 0 .../xml => }/transform/StAXSourceTest.java | 8 +- .../transform/TransformerFactoryTest.java | 11 +- .../xml => }/transform/TransformerTest.java | 7 +- .../transform/TransformerUtilFactory.java | 14 +- .../transform/VersionDefaultHandler.java | 4 +- .../transform/VersionEventWriter.java | 4 +- .../{javax/xml => }/transform/ViewEditor1.xsl | 0 .../xml => }/transform/XSLTFunctionsTest.java | 12 +- .../{javax/xml => }/transform/attribset27.xml | 0 .../{javax/xml => }/transform/attribset27.xsl | 0 .../{javax/xml => }/transform/catalog.xml | 0 .../{javax/xml => }/transform/catalog.xsd | 0 .../{javax/xml => }/transform/catalog_10.xml | 0 .../{javax/xml => }/transform/config.dtd | 0 .../{javax/xml => }/transform/config.xml | 0 .../xml => }/transform/default-layout.xsl | 0 .../xml => }/transform/global-variables.xsl | 0 .../{javax/xml => }/transform/global.xsl | 0 .../{javax/xml => }/transform/home.xsl | 0 .../unittest/{javax/xml => }/transform/in.xml | 0 .../{javax/xml => }/transform/inner.xsl | 0 .../{javax/xml => }/transform/logon.xsl | 0 .../{javax/xml => }/transform/maps.xml | 0 .../{javax/xml => }/transform/msgAttach.xml | 0 .../{javax/xml => }/transform/numbering63.xml | 0 .../{javax/xml => }/transform/numbering63.xsl | 0 .../{javax/xml => }/transform/outer.xsl | 0 .../{javax/xml => }/transform/redirect.xml | 0 .../{javax/xml => }/transform/redirect.xsl | 0 .../xml => }/transform/sax/Bug6451633.java | 4 +- .../{javax/xml => }/transform/src.xml | 0 .../{javax/xml => }/transform/template.xml | 0 .../xml => }/transform/tigertest-in.xml | 0 .../{javax/xml => }/transform/tigertest.xsl | 0 .../{javax/xml => }/transform/tmp.xml | 0 .../{javax/xml => }/transform/toys.xml | 0 .../{javax/xml => }/transform/transform.xsl | 0 .../xml => }/transform/upload-media-form.xsl | 0 .../xml => }/transform/upload-media.xsl | 0 .../{javax/xml => }/transform/util.xsl | 0 .../xml => }/transform/util/DOMUtil.java | 4 +- .../xml => }/transform/util/SAXUtil.java | 7 +- .../xml => }/transform/util/StAXUtil.java | 9 +- .../xml => }/transform/util/StreamUtil.java | 7 +- .../transform/util/TransformerUtil.java | 4 +- .../jaxp/unittest/util/BOMInputStream.java | 80 --- .../xml/jaxp/unittest/util/BaseStAXUT.java | 559 ------------------ .../unittest/util/DraconianErrorHandler.java | 37 -- .../{javax/xml => }/validation/6773084.policy | 0 .../xml => }/validation/AnyElementTest.java | 4 +- .../xml => }/validation/Bug4966232.java | 4 +- .../xml => }/validation/Bug4966254.java | 4 +- .../{javax/xml => }/validation/Bug4966254.xml | 0 .../{javax/xml => }/validation/Bug4966254.xsd | 0 .../xml => }/validation/Bug4969042.java | 4 +- .../xml => }/validation/Bug4969089.java | 4 +- .../xml => }/validation/Bug4969110.java | 4 +- .../xml => }/validation/Bug4969689.java | 4 +- .../xml => }/validation/Bug4969692.java | 4 +- .../xml => }/validation/Bug4969693.java | 4 +- .../xml => }/validation/Bug4969695.java | 4 +- .../xml => }/validation/Bug4969732.java | 4 +- .../xml => }/validation/Bug4970380.java | 4 +- .../xml => }/validation/Bug4970383.java | 4 +- .../xml => }/validation/Bug4970400.java | 4 +- .../xml => }/validation/Bug4970402.java | 4 +- .../xml => }/validation/Bug4970951.java | 4 +- .../xml => }/validation/Bug4971605.java | 4 +- .../xml => }/validation/Bug4971607.java | 4 +- .../xml => }/validation/Bug4972882.java | 4 +- .../xml => }/validation/Bug4986844.java | 4 +- .../{javax/xml => }/validation/Bug4986844.xsd | 0 .../xml => }/validation/Bug4987574.java | 4 +- .../xml => }/validation/Bug4988267.java | 4 +- .../{javax/xml => }/validation/Bug4988267.xsd | 0 .../xml => }/validation/Bug4988268.java | 4 +- .../{javax/xml => }/validation/Bug4988268.xsd | 0 .../xml => }/validation/Bug4988387.java | 4 +- .../{javax/xml => }/validation/Bug4988387.xsd | 0 .../xml => }/validation/Bug4996446.java | 4 +- .../{javax/xml => }/validation/Bug4996446.xsd | 0 .../xml => }/validation/Bug4997818.java | 4 +- .../xml => }/validation/Bug5011500.java | 4 +- .../xml => }/validation/Bug5072946.java | 4 +- .../{javax/xml => }/validation/Bug5072946.xml | 0 .../{javax/xml => }/validation/Bug5072946.xsd | 0 .../xml => }/validation/Bug6378043.java | 4 +- .../xml => }/validation/Bug6449797.java | 4 +- .../{javax/xml => }/validation/Bug6449797.xsd | 0 .../xml => }/validation/Bug6457662.java | 4 +- .../{javax/xml => }/validation/Bug6467424.xml | 0 .../{javax/xml => }/validation/Bug6467424.xsd | 0 .../xml => }/validation/Bug6467424Test.java | 7 +- .../xml => }/validation/Bug6483188.java | 4 +- .../xml => }/validation/Bug6493687.java | 4 +- .../{javax/xml => }/validation/Bug6493687.xml | 0 .../{javax/xml => }/validation/Bug6493687.xsd | 0 .../xml => }/validation/Bug6509668.java | 4 +- .../xml => }/validation/Bug6526547.java | 4 +- .../{javax/xml => }/validation/Bug6526547.xml | 0 .../{javax/xml => }/validation/Bug6526547.xsd | 0 .../xml => }/validation/Bug6531160.java | 4 +- .../{javax/xml => }/validation/Bug6695843.xml | 0 .../{javax/xml => }/validation/Bug6695843.xsd | 0 .../xml => }/validation/Bug6695843Test.java | 7 +- .../{javax/xml => }/validation/Bug6773084.xsd | 0 .../validation/Bug6773084In/Bug6773084_1.xml | 0 .../validation/Bug6773084In/Bug6773084_10.xml | 0 .../validation/Bug6773084In/Bug6773084_11.xml | 0 .../validation/Bug6773084In/Bug6773084_12.xml | 0 .../validation/Bug6773084In/Bug6773084_13.xml | 0 .../validation/Bug6773084In/Bug6773084_14.xml | 0 .../validation/Bug6773084In/Bug6773084_15.xml | 0 .../validation/Bug6773084In/Bug6773084_16.xml | 0 .../validation/Bug6773084In/Bug6773084_17.xml | 0 .../validation/Bug6773084In/Bug6773084_18.xml | 0 .../validation/Bug6773084In/Bug6773084_19.xml | 0 .../validation/Bug6773084In/Bug6773084_2.xml | 0 .../validation/Bug6773084In/Bug6773084_20.xml | 0 .../validation/Bug6773084In/Bug6773084_21.xml | 0 .../validation/Bug6773084In/Bug6773084_22.xml | 0 .../validation/Bug6773084In/Bug6773084_23.xml | 0 .../validation/Bug6773084In/Bug6773084_24.xml | 0 .../validation/Bug6773084In/Bug6773084_25.xml | 0 .../validation/Bug6773084In/Bug6773084_3.xml | 0 .../validation/Bug6773084In/Bug6773084_4.xml | 0 .../validation/Bug6773084In/Bug6773084_5.xml | 0 .../validation/Bug6773084In/Bug6773084_6.xml | 0 .../validation/Bug6773084In/Bug6773084_7.xml | 0 .../validation/Bug6773084In/Bug6773084_8.xml | 0 .../validation/Bug6773084In/Bug6773084_9.xml | 0 .../xml => }/validation/Bug6773084Test.java | 7 +- .../xml => }/validation/Bug6859210.java | 4 +- .../xml => }/validation/Bug6925531Test.java | 7 +- .../{javax/xml => }/validation/Bug6946312.xml | 0 .../xml => }/validation/Bug6946312Test.java | 6 +- .../{javax/xml => }/validation/Bug6954738.xml | 0 .../{javax/xml => }/validation/Bug6954738.xsd | 0 .../xml => }/validation/Bug6954738_Test.java | 7 +- .../xml => }/validation/CR6708840Test.java | 7 +- .../{javax/xml => }/validation/CR6740048.java | 4 +- .../{javax/xml => }/validation/CR6740048.xml | 0 .../{javax/xml => }/validation/CR6740048.xsd | 0 .../{javax/xml => }/validation/CREMAS01.xml | 0 .../{javax/xml => }/validation/CREMAS01.xsd | 0 .../xml => }/validation/ErrorHandlerImpl.java | 4 +- .../{javax/xml => }/validation/Issue682.xml | 0 .../{javax/xml => }/validation/Issue682.xsd | 0 .../xml => }/validation/Issue682Test.java | 4 +- .../xml => }/validation/IssueTracker30.java | 4 +- .../IssueTracker30_occurs-error.xml | 0 .../validation/IssueTracker30_occurs-ok.xml | 0 .../IssueTracker30_occurs-optimize-error.xml | 0 .../IssueTracker30_occurs-optimize-ok.xml | 0 .../IssueTracker30_occurs-optimize.xsd | 0 .../validation/IssueTracker30_occurs.xsd | 0 .../xml => }/validation/JaxpIssue43Test.java | 7 +- .../xml => }/validation/JaxpIssue49.java | 7 +- .../xml => }/validation/JaxpIssue49.xml | 0 .../validation/LargeMaxOccursTest.java | 7 +- .../xml => }/validation/MultiOccursTest.java | 4 +- .../validation/MultiOccursUnboundedTest.java | 4 +- .../xml => }/validation/OccursTest.java | 4 +- .../validation/OccursUnboundedTest.java | 4 +- .../validation/OccursWildcardTest.java | 4 +- .../validation/OccursWildcardUnbounded.java | 4 +- .../validation/ParticlesId005Test.java | 4 +- .../validation/ParticlesIg004Test.java | 7 +- .../validation/ParticlesQ013Test.java | 4 +- .../validation/ProcessContents-lax-error.xml | 0 .../validation/ProcessContents-ok.xml | 0 .../xml => }/validation/ProcessContents.xsd | 0 .../xml => }/validation/TCKGroupA008Test.java | 8 +- .../xml => }/validation/ValidatorTest.java | 7 +- .../xml => }/validation/XMLDocBuilder.java | 4 +- .../validation/XMLSchemaValidator.java | 4 +- .../xml => }/validation/gMonths-invalid.xml | 2 +- .../{javax/xml => }/validation/gMonths.xml | 2 +- .../{javax/xml => }/validation/gMonths.xsd | 2 +- .../{javax/xml => }/validation/groupA008.xsd | 0 .../xml => }/validation/groupA008ea.red | 0 .../xml => }/validation/groupA008eb.red | 0 .../xml => }/validation/hello_literal.wsdl | 0 .../{javax/xml => }/validation/idI009.xsd | 0 .../{javax/xml => }/validation/idIimp.xsd | 0 .../{javax/xml => }/validation/idIxpns.xsd | 0 .../{javax/xml => }/validation/idIxpns1.xsd | 0 .../{javax/xml => }/validation/mgG014.xsd | 0 .../{javax/xml => }/validation/mgJ014.xsd | 0 .../validation/multi-occurs-error-max.xml | 0 .../validation/multi-occurs-error-min-max.xml | 0 .../validation/multi-occurs-error-min.xml | 0 .../xml => }/validation/multi-occurs-ok.xml | 0 .../multi-occurs-unbounded-error-min.xml | 0 .../validation/multi-occurs-unbounded-ok.xml | 0 .../validation/multi-occurs-unbounded.xsd | 0 .../xml => }/validation/multi-occurs.xsd | 0 .../xml => }/validation/occurs-error-max.xml | 0 .../validation/occurs-error-min-max.xml | 0 .../xml => }/validation/occurs-error-min.xml | 0 .../{javax/xml => }/validation/occurs-ok.xml | 0 .../validation/occurs-unbounded-error-min.xml | 0 .../validation/occurs-unbounded-ok.xml | 0 .../xml => }/validation/occurs-unbounded.xsd | 0 .../validation/occurs-wildcard-unbounded.xsd | 0 .../xml => }/validation/occurs-wildcard.xsd | 0 .../{javax/xml => }/validation/occurs.xsd | 0 .../xml => }/validation/particlesId005.xml | 0 .../xml => }/validation/particlesId005.xsd | 0 .../xml => }/validation/particlesIe003.xsd | 0 .../xml => }/validation/particlesIg004.xsd | 0 .../xml => }/validation/particlesOptimize.xsd | 0 .../xml => }/validation/particlesQ013.xml | 0 .../xml => }/validation/particlesQ013.xsd | 0 .../xml => }/validation/particlesR005.xsd | 0 .../xml => }/validation/targetNS00101m2.xsd | 0 .../validation/targetNS00101m2_stub.xml | 0 .../validation/targetNS00101m2_stub.xsd | 0 .../xml => }/validation/targetNS00101m2a.xsd | 0 .../Bug6943252In/byte_fractionDigits004.xsd | 0 .../Bug6943252In/byte_fractionDigits007.xsd | 0 .../Bug6943252In/int_fractionDigits004.xsd | 0 .../Bug6943252In/int_fractionDigits007.xsd | 0 .../integer_fractionDigits004.xsd | 0 .../integer_fractionDigits007.xsd | 0 .../Bug6943252In/long_fractionDigits004.xsd | 0 .../Bug6943252In/long_fractionDigits007.xsd | 0 .../negativeInteger_fractionDigits004.xsd | 0 .../negativeInteger_fractionDigits007.xsd | 0 .../nonNegativeInteger_fractionDigits004.xsd | 0 .../nonNegativeInteger_fractionDigits007.xsd | 0 .../nonPositiveInteger_fractionDigits004.xsd | 0 .../nonPositiveInteger_fractionDigits007.xsd | 0 .../positiveInteger_fractionDigits004.xsd | 0 .../positiveInteger_fractionDigits007.xsd | 0 .../Bug6943252In/short_fractionDigits004.xsd | 0 .../Bug6943252In/short_fractionDigits007.xsd | 0 .../unsignedByte_fractionDigits004.xsd | 0 .../unsignedByte_fractionDigits007.xsd | 0 .../unsignedInt_fractionDigits004.xsd | 0 .../unsignedInt_fractionDigits007.xsd | 0 .../unsignedLong_fractionDigits004.xsd | 0 .../unsignedLong_fractionDigits007.xsd | 0 .../unsignedShort_fractionDigits004.xsd | 0 .../unsignedShort_fractionDigits007.xsd | 0 .../validation/tck/Bug6943252Test.java | 2 +- .../xml => }/validation/tck/Bug6963124.xsd | 0 .../validation/tck/Bug6963124Test.java | 2 +- .../xml => }/validation/tck/Bug6963468.xml | 0 .../xml => }/validation/tck/Bug6963468.xsd | 0 .../validation/tck/Bug6963468Test.java | 2 +- .../xml => }/validation/tck/Bug6964720.xsd | 0 .../validation/tck/Bug6964720Test.java | 2 +- .../tck/Bug6967214/RegexTest_1258.xsd | 0 .../validation/tck/Bug6967214/reD10.xsd | 0 .../validation/tck/Bug6967214/reD11.xsd | 0 .../validation/tck/Bug6967214/reD12.xsd | 0 .../validation/tck/Bug6967214/reE9.xsd | 0 .../validation/tck/Bug6967214Test.java | 2 +- .../xml => }/validation/tck/Bug6970890.xsd | 0 .../validation/tck/Bug6970890Test.java | 2 +- .../xml => }/validation/tck/Bug6970890_1.xsd | 0 .../xml => }/validation/tck/Bug6971190.xml | 0 .../xml => }/validation/tck/Bug6971190.xsd | 0 .../validation/tck/Bug6971190Test.java | 2 +- .../xml => }/validation/tck/Bug6971190_v.xml | 0 .../xml => }/validation/tck/Bug6971190_v.xsd | 0 .../xml => }/validation/tck/Bug6974551.xml | 0 .../xml => }/validation/tck/Bug6974551.xsd | 0 .../validation/tck/Bug6974551Test.java | 2 +- .../validation/tck/Bug6975265/notatF025.xsd | 0 .../validation/tck/Bug6975265/notatF037.xsd | 0 .../validation/tck/Bug6975265/notatF041.xsd | 0 .../validation/tck/Bug6975265/notatF045.xsd | 0 .../validation/tck/Bug6975265/notatF049.xsd | 0 .../validation/tck/Bug6975265Test.java | 2 +- .../validation/tck/Bug6977201/reA2.xml | 0 .../validation/tck/Bug6977201/reA2.xsd | 0 .../validation/tck/Bug6977201/reA3.xml | 0 .../validation/tck/Bug6977201/reA3.xsd | 0 .../validation/tck/Bug6977201/reA4.xml | 0 .../validation/tck/Bug6977201/reA4.xsd | 0 .../validation/tck/Bug6977201/reA5.xml | 0 .../validation/tck/Bug6977201/reA5.xsd | 0 .../validation/tck/Bug6977201/reA6.xml | 0 .../validation/tck/Bug6977201/reA6.xsd | 0 .../validation/tck/Bug6977201Test.java | 2 +- .../xml => }/validation/tck/Bug6989956.xml | 0 .../xml => }/validation/tck/Bug6989956.xsd | 0 .../validation/tck/Bug6989956Test.java | 2 +- .../xml => }/validation/tck/Bug7014246.xsd | 0 .../validation/tck/Bug7014246Test.java | 2 +- .../xml => }/validation/test-element.xsd | 0 .../xml => }/validation/test-sequence.xsd | 0 .../{javax/xml => }/validation/test.xsd | 0 .../{javax/xml => }/validation/toys.xml | 0 .../{javax/xml => }/validation/toys.xsd | 0 .../{javax/xml => }/validation/types.xsd | 0 .../{javax/xml => }/xpath/Bug4991857.java | 4 +- .../{javax/xml => }/xpath/Bug4991939.java | 4 +- .../{javax/xml => }/xpath/Bug4992788.java | 4 +- .../{javax/xml => }/xpath/Bug4992793.java | 4 +- .../{javax/xml => }/xpath/Bug4992805.java | 4 +- .../xml => }/xpath/ClassLoaderTest.java | 4 +- .../{javax/xml => }/xpath/MyClassLoader.java | 4 +- .../xml => }/xpath/SecureProcessingTest.java | 11 +- .../xml => }/xpath/SecureProcessingTest.xml | 0 .../xml => }/xpath/XPathAnyTypeTest.java | 10 +- .../xml => }/xpath/XPathExpAnyTypeTest.java | 11 +- .../{javax/xml => }/xpath/XPathTest.java | 6 +- .../{javax/xml => }/xpath/XPathTestBase.java | 14 +- 660 files changed, 817 insertions(+), 1281 deletions(-) delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/TEST.properties rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6350682.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6723276Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6941169.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6941169.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug6941169Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/common/Bug7143711Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug6320118.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug6937951Test.java (88%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug6937964Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/Bug7042647Test.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/DatatypeFactoryTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/DurationTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/FactoryFindTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/datatype/XMLGregorianCalendarTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4915524.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4915748.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966082.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966082.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966138.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966142.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966142.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966142.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966143.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966143.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug4966143.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6339023.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6355326.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6367542.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6520131.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6521260.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6582545.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6582545Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6879614.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/Bug6879614Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6333993Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6517707Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6517717Test.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/CR6909336Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/DOMConfigurationTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/DOMConfigurationTest.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/DOMXPathTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/JdkXmlDomTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/TCKEncodingTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug4973153.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6290947.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6354955.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6376823.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/Bug6710741Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/LSParserTCKTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/LSParserTest.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/LSSerializerTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/ls/note_in_dtd.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/test.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/w3c => }/dom/test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4674384_MAX_OCCURS_Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4674384_MAX_OCCURS_Test.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4674384_MAX_OCCURS_Test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4934208.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4967002.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4985486.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4985486.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991020.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991020.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991020.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991946.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991946.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug4991946.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug5010072.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug5010072.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug5025825.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6309988.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6341770.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6361283.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6506304Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6518733.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6518733.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6564400.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6564400.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6564400.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6573786.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6573786ErrorHandler.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6594813.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6608841_xhtml11-flat.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6690015.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6760982.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug6849942Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7157608_1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug7166896Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/Bug8073385.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/DosTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/DosTest3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/FactoryFindTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/MyDefaultHandler.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/MyErrorHandler.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/ParseEmptyStream.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/bug6690015.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/bug6760982.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/catalog.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/catalog.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/entity.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/entity64K.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/test1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/test2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/toys.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/toys3002.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/xinclude/Bug6794483Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/xinclude/test1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/parsers/xinclude/test2.xml (100%) delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/policy/common.policy rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Attributes2ImplTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6889654Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6925410Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6949607Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug6992561Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug7057778.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/Bug7057778Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/DefaultHandler2Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/IssueTracker56Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/MyDefaultHandler2.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/NSSupportTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/SAXExceptionExt.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/externalDTD.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{org/xml => }/sax/toys_error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/AttributeLocalNameTest/AttributeLocalNameTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6370703.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6378422.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6380870.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6489502.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6509774.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6688002Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6976938.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/Bug6976938Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/CoalesceTest/CoalesceTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/CoalesceTest/coalesce.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EntitiesTest/EntityTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EntitiesTest/testCharRef.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EntitiesTest/testCharRef.xml.output (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/EventReaderDelegateTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue41Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue48Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue53Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/Events => stream/EventsTest}/Issue58Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/FactoryFindTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/FactoryFindTest.policy (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/IgnoreExternalDTDTest.java (90%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/ProcessingInstruction => stream/ProcessingInstructionTest}/ProcessingInstructionTest.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/StreamReaderDelegateTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventLocationTest.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6489890.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6555001.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6586466Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6613059Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6668115Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Bug6846133Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/Issue40Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/bug6613059.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/play.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/play2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventReaderTest/sgml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/ReaderToWriterTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/ReaderToWriterTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/XMLEventWriterTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/XMLEventWriterTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/merge-1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/merge-2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLEventWriterTest/replace1.txt (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/Bug6756677Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/Bug6909759Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/IssueTracker38.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/MyInputFactory.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLInputFactoryTest/play.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLOutputFactoryTest/Bug6846132Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLOutputFactoryTest/StreamResultTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/XMLResolverTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/XMLResolverTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/replace1.txt (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLResolverTest/replace2.txt (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamExceptionTest/ExceptionTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/Bug6481615.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/Bug6481678.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/HasNextTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/HasNextTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamFilterTest/HasNextTypeFilter.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/BOMTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6388460.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6472982Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6767322.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6767322Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Bug6847819Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/BugTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/DefaultAttributeTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/DoubleXmlnsTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak => stream/XMLStreamReaderTest/ExternalDTD.dtd} (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak => stream/XMLStreamReaderTest/ExternalDTD.xml} (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Hello.wsdl.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IsValidatingTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IsValidatingTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Issue44Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Issue47Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker24.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker35.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker70.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/IssueTracker70.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/NamespaceTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/StreamReaderTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/SupportDTDTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/UTF8-BOM.xml.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/XML11Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/XMLSchema.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/XMLSchema.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/datatypes.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/report.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/sgml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/voicexml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/vxml.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamReaderTest/xml11.xml.data (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/AttributeEscapeTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug6452107.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug6600882Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug6675332Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/Bug7037352Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/DOMUtil.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/DomUtilTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/EmptyElementTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/EncodingTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/NamespaceTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/NullUriDetectionTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/SqeLinuxTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/UnprefixedNameTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/WriterTest.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/XMLStreamWriterTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/message_12.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testEight.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testFive.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testFour.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testOne.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testSeven.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testSix.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/XMLStreamWriterTest/testThree.xml.org (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/basic-form.vxml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/report.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/sgml-bad-systemId.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/sgml.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/sgml_Bug6509774.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/testfile4.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/stream/vxml.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/5368141.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341.out (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341_golden.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4693341_golden.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug4892774.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug5073477.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug5073477.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6175602.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6206491_2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6216226Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6311448.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6384805.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6465722.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6467808.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6490380.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6490921.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6505031.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6513892.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6537167.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6540545.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6559595.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6565260.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Bug6940416.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/BugDB12665704.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/BugDB12665704.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/BugDB12665704Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6401137.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6401137.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6401137Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6551600.policy (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6551600Test.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6577667.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6577667Test.java (90%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6652519Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6689809Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829Inc.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6905829Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6935697.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6935697.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6935697Test.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6941869.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6941869.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6941869Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6957215.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6957215.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR6957215Test.java (88%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR7098746.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR7098746.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/CR7098746Test.java (90%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/DOMResultTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/DocumentExtFunc.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/FactoryFindTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2204.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2204.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2204Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2290.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/Issue2290Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/MsWordXMLImport.xsl.data (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/NCAA_Conference_Schedule_XML.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/OpenJDK100017Test.java (91%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/PredicateInKeyTest.xml (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/PredicateInKeyTest.xsl (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SAX2DOMTest.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SAX2DOMTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SecureProcessingTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SecureProcessingTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SecureProcessingTest.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SourceTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SourceTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/SourceTest.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/StAXSourceTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/TransformerFactoryTest.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/TransformerTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/TransformerUtilFactory.java (84%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/VersionDefaultHandler.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/VersionEventWriter.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/ViewEditor1.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/XSLTFunctionsTest.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/attribset27.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/attribset27.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/catalog.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/catalog.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/catalog_10.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/config.dtd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/config.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/default-layout.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/global-variables.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/global.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/home.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/in.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/inner.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/logon.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/maps.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/msgAttach.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/numbering63.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/numbering63.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/outer.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/redirect.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/redirect.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/sax/Bug6451633.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/src.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/template.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/tigertest-in.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/tigertest.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/tmp.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/transform.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/upload-media-form.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/upload-media.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util.xsl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/DOMUtil.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/SAXUtil.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/StAXUtil.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/StreamUtil.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/transform/util/TransformerUtil.java (94%) delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java delete mode 100644 jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/6773084.policy (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/AnyElementTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966232.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966254.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966254.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4966254.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969042.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969089.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969110.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969689.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969692.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969693.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969695.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4969732.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970380.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970383.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970400.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970402.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4970951.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4971605.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4971607.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4972882.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4986844.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4986844.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4987574.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988267.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988267.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988268.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988268.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988387.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4988387.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4996446.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4996446.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug4997818.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5011500.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5072946.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5072946.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug5072946.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6378043.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6449797.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6449797.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6457662.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6467424.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6467424.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6467424Test.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6483188.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6493687.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6493687.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6493687.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6509668.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6526547.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6526547.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6526547.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6531160.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6695843.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6695843.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6695843Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_1.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_10.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_11.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_12.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_13.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_14.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_15.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_16.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_17.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_18.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_19.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_20.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_21.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_22.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_23.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_24.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_25.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_4.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_5.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_6.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_7.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_8.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084In/Bug6773084_9.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6773084Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6859210.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6925531Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6946312.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6946312Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6954738.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6954738.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Bug6954738_Test.java (92%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6708840Test.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6740048.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6740048.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CR6740048.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CREMAS01.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/CREMAS01.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ErrorHandlerImpl.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Issue682.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Issue682.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/Issue682Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-optimize-error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-optimize-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs-optimize.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/IssueTracker30_occurs.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/JaxpIssue43Test.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/JaxpIssue49.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/JaxpIssue49.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/LargeMaxOccursTest.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/MultiOccursTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/MultiOccursUnboundedTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursUnboundedTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursWildcardTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/OccursWildcardUnbounded.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ParticlesId005Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ParticlesIg004Test.java (88%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ParticlesQ013Test.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ProcessContents-lax-error.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ProcessContents-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ProcessContents.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/TCKGroupA008Test.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/ValidatorTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/XMLDocBuilder.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/XMLSchemaValidator.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/gMonths-invalid.xml (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/gMonths.xml (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/gMonths.xsd (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/groupA008.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/groupA008ea.red (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/groupA008eb.red (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/hello_literal.wsdl (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idI009.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idIimp.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idIxpns.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/idIxpns1.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/mgG014.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/mgJ014.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-error-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-error-min-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-unbounded-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-unbounded-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs-unbounded.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/multi-occurs.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-error-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-error-min-max.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-unbounded-error-min.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-unbounded-ok.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-unbounded.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-wildcard-unbounded.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs-wildcard.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/occurs.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesId005.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesId005.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesIe003.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesIg004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesOptimize.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesQ013.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesQ013.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/particlesR005.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2_stub.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2_stub.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/targetNS00101m2a.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/byte_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/byte_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/int_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/int_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/integer_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/integer_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/long_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/long_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/short_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/short_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6943252Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963124.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963124Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963468.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963468.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6963468Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6964720.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6964720Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/RegexTest_1258.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reD10.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reD11.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reD12.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214/reE9.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6967214Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6970890.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6970890Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6970890_1.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190_v.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6971190_v.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6974551.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6974551.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6974551Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF025.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF037.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF041.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF045.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265/notatF049.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6975265Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA2.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA2.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA3.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA3.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA4.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA4.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA5.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA5.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA6.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201/reA6.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6977201Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6989956.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6989956.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug6989956Test.java (99%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug7014246.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/tck/Bug7014246Test.java (98%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/test-element.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/test-sequence.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/test.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/toys.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/toys.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/validation/types.xsd (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4991857.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4991939.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4992788.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4992793.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/Bug4992805.java (95%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/ClassLoaderTest.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/MyClassLoader.java (93%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/SecureProcessingTest.java (94%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/SecureProcessingTest.xml (100%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathAnyTypeTest.java (97%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathExpAnyTypeTest.java (96%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathTest.java (89%) rename jaxp/test/javax/xml/jaxp/unittest/{javax/xml => }/xpath/XPathTestBase.java (92%) diff --git a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties b/jaxp/test/javax/xml/jaxp/unittest/TEST.properties deleted file mode 100644 index 23136c131a5..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties +++ /dev/null @@ -1,6 +0,0 @@ -# jaxp test uses TestNG -TestNG.dirs = . - -# Declare module dependency -modules=java.xml - diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java index 04d4f2502b7..e955df49676 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.common; +package common; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.TransformerFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java index 7e1ecd89a6f..63ac73d4973 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.common; +package common; import org.testng.annotations.Test; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xml b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xml rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xsd b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xsd rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java index fa35c3aa2cb..8f03995bc10 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.common; +package common; import java.io.InputStream; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java index 7b38db0c0c2..5074da2150b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.common; +package common; import java.security.AllPermission; import java.security.Permission; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java index 959a978f6f0..87d3829e658 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.datatype; +package datatype; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java similarity index 88% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java index a7335644c61..161f127b9b2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java @@ -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 @@ -21,7 +21,11 @@ * questions. */ -package javax.xml.datatype; +package datatype; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java index 31aff0538f9..73ea2930cf2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java @@ -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 @@ -21,11 +21,15 @@ * questions. */ -package javax.xml.datatype; +package datatype; import java.math.BigDecimal; import java.math.BigInteger; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.Duration; import javax.xml.namespace.QName; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java similarity index 89% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java index 36438265010..3bf98f65bed 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java @@ -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 @@ -21,11 +21,15 @@ * questions. */ -package javax.xml.datatype; +package datatype; import java.util.Calendar; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java index 67e458ee719..c6977e98967 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java @@ -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 @@ -21,11 +21,16 @@ * questions. */ -package javax.xml.datatype; +package datatype; import java.math.BigDecimal; import java.math.BigInteger; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java index f97536c8765..ece77adc8fa 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.datatype; +package datatype; import java.math.BigDecimal; import java.math.BigInteger; @@ -30,6 +30,10 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.TimeZone; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.Duration; import javax.xml.namespace.QName; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java index e9e84bd61a3..87e46373e8b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java @@ -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 @@ -21,11 +21,13 @@ * questions. */ -package javax.xml.datatype; +package datatype; import java.net.URL; import java.net.URLClassLoader; +import javax.xml.datatype.DatatypeFactory; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java rename to jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java index b842fd5a177..4c3deb901ac 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java @@ -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 @@ -21,7 +21,12 @@ * questions. */ -package javax.xml.datatype; +package datatype; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import org.testng.Assert; import org.testng.annotations.BeforeMethod; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java index f496447619d..3540089c9ef 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java index 9e04b082254..8c8f71714de 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java index 3bc3c357443..b18f8094710 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java index ddd0bf5ff89..5244112fe3f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java index dd55013d571..890ada5f019 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xsd rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java index 7133089d296..9cf87b200af 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xsd rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java index 273708cc209..7b611bd9993 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java index 911baf4a07f..cea41cc9a87 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java index fa77a70df16..c0a3e164834 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java index c30f43070da..982d481014e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java index bcfa894ed53..3c9a97644eb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java index 2966d0accc6..fec67cdfe20 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.File; import java.io.IOException; @@ -32,6 +32,9 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.NodeList; import org.xml.sax.SAXException; /* diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java index 7c669698814..b19a28ba29a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.File; import java.io.IOException; @@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.annotations.Test; +import org.w3c.dom.Document; import org.xml.sax.SAXException; /* diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java index b54e9c61de0..84c06b829b4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.ByteArrayInputStream; @@ -34,6 +34,8 @@ import javax.xml.xpath.XPathFactory; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; /* * @bug 6333993 diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java index 67241c85d05..9bc2c6c3a0f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -33,6 +33,9 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.Entity; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java index 02e1972b11a..44bab9c37f7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.IOException; import java.io.StringReader; @@ -32,6 +32,9 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.Entity; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java index 85e90cd294b..15dc9636af6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; @@ -30,6 +30,7 @@ import javax.xml.transform.dom.DOMResult; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.Document; import org.w3c.dom.bootstrap.DOMImplementationRegistry; /* diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java index 6a4fba6245c..0bc4669c4e6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java @@ -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 @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.w3c.dom; +package dom; import java.io.IOException; import java.io.StringReader; @@ -34,6 +34,21 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.Attr; +import org.w3c.dom.CDATASection; +import org.w3c.dom.Comment; +import org.w3c.dom.DOMConfiguration; +import org.w3c.dom.DOMError; +import org.w3c.dom.DOMErrorHandler; +import org.w3c.dom.DOMException; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Entity; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.ProcessingInstruction; +import org.w3c.dom.Text; import org.w3c.dom.ls.DOMImplementationLS; import org.w3c.dom.ls.LSInput; import org.w3c.dom.ls.LSParser; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.xsd rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java index fa92dc7175b..ebd97facd4b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java @@ -20,12 +20,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.w3c.dom; +package dom; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.DOMImplementation; /* * @bug 8042244 diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java index b65b4fd6bff..4c1269cf79c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.w3c.dom; +package dom; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java index a5148fb563b..4f4ece1766a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom; +package dom; import java.io.IOException; import java.io.StringReader; @@ -32,6 +32,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.Test; +import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java index 6b9b44ccaac..b16d06c6172 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java index 065dfcbe491..9ef91451fbe 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import java.io.StringBufferInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java index d184cf8e6f2..cdaa0cf4d03 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java index f3ba84e2e0e..d4fcc32aeb9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import java.io.StringBufferInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java index 3f70fb7b6bb..d0b95b99073 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -30,6 +30,8 @@ import org.testng.Assert; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSException; /* * @bug 6710741 diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java index 69e27e1bb96..8c609fc594d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import java.io.IOException; import java.io.StringBufferInputStream; @@ -39,6 +39,10 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSInput; +import org.w3c.dom.ls.LSParser; +import org.w3c.dom.ls.LSParserFilter; import org.w3c.dom.traversal.NodeFilter; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java index 3d0c199ea3f..bf24b878037 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -33,6 +33,10 @@ import org.w3c.dom.DOMError; import org.w3c.dom.DOMErrorHandler; import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSInput; +import org.w3c.dom.ls.LSParser; +import org.w3c.dom.ls.LSResourceResolver; /* * @summary Test LSParser's DOMConfiguration for supported properties. diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java index 9df924a3c43..172d3299d5b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java @@ -21,7 +21,7 @@ * questions. */ -package org.w3c.dom.ls; +package dom.ls; import java.io.IOException; import java.io.OutputStream; @@ -39,6 +39,10 @@ import org.w3c.dom.DOMError; import org.w3c.dom.DOMErrorHandler; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSException; +import org.w3c.dom.ls.LSOutput; +import org.w3c.dom.ls.LSSerializer; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/note_in_dtd.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/note_in_dtd.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xml rename to jaxp/test/javax/xml/jaxp/unittest/dom/test.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xsd rename to jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java index 7978e5c7c15..5c8248a065b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java @@ -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 @@ -21,10 +21,13 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + import org.testng.Assert; import org.testng.annotations.Test; import org.xml.sax.helpers.DefaultHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java index 8e77af0ef87..50f5514f3af 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java index 3fd09a7b6e4..084323445a9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java index b8ab86e6858..c87f47187c7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import javax.xml.parsers.SAXParserFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java index 38036a725e0..6a50919122f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java index 39091809059..f48e0bdc783 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java index 292a3042e71..68d9a170435 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java index a2912089f9e..9a87104746b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java index 499dc2a5861..fc38d41c3e4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java index e5b1f74a793..94873dfaab3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; import java.io.FileWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java index 8a0f3c9f322..f3bfb88fce1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java index b93e7333977..a7e82d51eab 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java @@ -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 @@ -21,7 +21,10 @@ * questions. */ -package javax.xml.parsers; +package parsers; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java index c1d141eef53..c6a03542a43 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.FileReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java index c76304d8bad..e7aa719dd81 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java index 49488360b0d..ff3d19388e6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.InputStream; import java.io.StringBufferInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java index 5d55cea1029..b938eb6eb6f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java index d660f958bcc..a89d834642f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.StringReader; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.dtd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java index d68837793fe..db724d83e86 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841_xhtml11-flat.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841_xhtml11-flat.dtd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java index 50838e82196..25f536f73bb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java index 1a2bc04f9de..cfd2fe26a74 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; import java.io.FileReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java index 3a28a094243..c65bd1bc285 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java @@ -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 @@ -21,10 +21,13 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.ByteArrayInputStream; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + import org.testng.Assert; import org.testng.annotations.Test; import org.w3c.dom.Document; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.dtd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java index c4a7f7a42e6..bd1e303dc17 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java @@ -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 @@ -21,11 +21,14 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.File; import java.io.IOException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608_1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608_1.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java similarity index 91% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java index e886bca59c9..7230f9c1488 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java @@ -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 @@ -21,10 +21,14 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.IOException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + import org.testng.Assert; import org.testng.annotations.Test; import org.w3c.dom.Document; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java index 1d3aa66ce08..5a034c378b9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.StringReader; import java.util.Locale; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest3.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest3.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java index 6f769714125..031b0fea2a2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java @@ -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 @@ -21,11 +21,13 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.net.URL; import java.net.URLClassLoader; +import javax.xml.parsers.SAXParserFactory; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java index a63bcd4cf26..c690163eb86 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import org.xml.sax.Attributes; import org.xml.sax.Locator; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java index 3dc24dcdfcb..695c932f603 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers; +package parsers; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java index cc9ba34faa7..a6dafccba4c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java @@ -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 @@ -21,10 +21,13 @@ * questions. */ -package javax.xml.parsers; +package parsers; import java.io.StringReader; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + import org.testng.Assert; import org.testng.annotations.Test; import org.xml.sax.InputSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6690015.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6690015.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6760982.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6760982.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity64K.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity64K.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test1.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test2.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test2.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys3002.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys3002.xsd rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java index ee5e2587d6c..841191704eb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.parsers.xinclude; +package parsers.xinclude; import static java.lang.System.lineSeparator; import static org.testng.Assert.assertEquals; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test1.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test2.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test2.xml rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java b/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java deleted file mode 100644 index 340f5de7d55..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java +++ /dev/null @@ -1,35 +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 policy; - -import java.security.Policy; - -public class PolicyUtil { - - public static void changePolicy(String policyFile) { - System.setProperty("java.security.policy", policyFile); - Policy.getPolicy().refresh(); - } - -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy b/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy deleted file mode 100644 index 0ca5f742c09..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy +++ /dev/null @@ -1,27 +0,0 @@ -grant { - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "accessDeclaredMembers"; - - permission java.io.FilePermission "${test.classes}/../../-", "read, write, delete"; - permission java.io.FilePermission ".", "read, write, delete"; - permission java.util.PropertyPermission "*", "read, write"; - - permission java.lang.RuntimePermission "setSecurityManager"; - permission java.lang.RuntimePermission "createSecurityManager"; - permission java.lang.RuntimePermission "createClassLoader"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.RuntimePermission "setContextClassLoader"; - permission java.security.SecurityPermission "getPolicy"; - - permission java.io.FilePermission "${test.src}/-", "read, write, delete"; - permission java.io.FilePermission "${user.dir}/-", "read, write, delete"; - permission java.io.FilePermission "${java.io.tmpdir}/-", "read, write, delete"; - - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.classfile"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.generic"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.xml.internal.stream.writers"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xerces.internal.impl"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xslt"; -}; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java index 362440fcf55..e8a1bba6864 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java index ece2b16f09c..e5043aa0f48 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java index 280d2c8d6e1..5679ed6b262 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import javax.xml.datatype.DatatypeConfigurationException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java index 800788a8581..d8fd89cd29a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.ByteArrayInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java index f4761bf9440..d82fe101f47 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778.xml rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java index 39039ddc223..77809766d5e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java index ecce29090ce..15205d745cb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java index 9b26c5d04e0..b5a46472f34 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java index 548d662256e..44ac9fde73d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java index b2c5221f259..c04ecc7ab54 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import java.util.Enumeration; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java rename to jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java index 3e5421c5573..9b9800d27fa 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package org.xml.sax; +package sax; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/externalDTD.dtd b/jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/externalDTD.dtd rename to jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys.xml rename to jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys_error.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys_error.xml rename to jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java index dd2570c8daa..01d54e05785 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.AttributeLocalNameTest; +package stream.AttributeLocalNameTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java index 0366b2ef831..f386e5d5a30 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java index be4e230a51f..f273d1f002e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import javax.xml.stream.XMLInputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java index 8f8cfa45f98..8eb6a7ffad9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java index 1c0793995fa..9cc264a4fd6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java index 711775fba81..b92f4bf0757 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java index 594546296b4..57bb97ed144 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java @@ -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 @@ -21,13 +21,18 @@ * questions. */ -package javax.xml.stream; +package stream; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java index 08be1fe5c51..ac317469cd7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java @@ -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 @@ -21,9 +21,13 @@ * questions. */ -package javax.xml.stream; +package stream; import javax.xml.namespace.QName; +import javax.xml.stream.EventFilter; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java index 899e2705892..70f286cefbe 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package javax.xml.stream.CoalesceTest; +package stream.CoalesceTest; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/coalesce.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/coalesce.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java index 0da8153adce..aa72e3fb139 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.EntitiesTest; +package stream.EntitiesTest; import java.io.IOException; import java.io.InputStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml.output b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml.output rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java index 77186aea6e1..b314ff7a022 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java @@ -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 @@ -21,14 +21,20 @@ * questions. */ -package javax.xml.stream; +package stream; import org.testng.annotations.Test; import org.testng.Assert; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import javax.xml.stream.FactoryConfigurationError; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; import javax.xml.stream.util.EventReaderDelegate; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java index 87d3ad41587..738f4e3329a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.Events; +package stream.EventsTest; import java.io.StringReader; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java index b10b6cd92c0..b5673029449 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.Events; +package stream.EventsTest; import java.io.StringReader; import java.util.Iterator; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java index c9c1deeac13..7193d27e48f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.Events; +package stream.EventsTest; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.events.StartDocument; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java index 30ce60028dd..3c467411b70 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.Events; +package stream.EventsTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java index 555c8a8a565..f016df38df4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import java.io.File; import java.io.FileInputStream; @@ -32,6 +32,9 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Properties; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; + import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.policy b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.policy rename to jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java similarity index 90% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java index 79b6c89603c..5475cba5d6e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java @@ -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 @@ -21,10 +21,15 @@ * questions. */ -package javax.xml.stream; +package stream; import java.io.StringReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + import org.testng.annotations.Test; /* diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java index 9dc297f9761..1234a37a803 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.ProcessingInstruction; +package stream.ProcessingInstructionTest; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java index b1f76f9672b..d7f9f485fc2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream; +package stream; import java.io.File; import java.io.FileInputStream; @@ -30,6 +30,11 @@ import java.io.InputStream; import java.util.Iterator; import javax.xml.namespace.NamespaceContext; +import javax.xml.stream.FactoryConfigurationError; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; import javax.xml.stream.util.StreamReaderDelegate; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java index eccc7ff7d0c..6c760382c58 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java @@ -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 @@ -21,8 +21,10 @@ * questions. */ -package javax.xml.stream; +package stream; +import javax.xml.stream.Location; +import javax.xml.stream.XMLEventFactory; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java index 84a49f956c4..0d554808f79 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java index dfd95e3aca2..566186c4c33 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java index c3484426bad..319c50ad7fa 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import org.testng.annotations.Test; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java index 73fe8c4c61e..88d0be0c17d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import org.testng.annotations.Test; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java index a66ec748058..c56e7569c3c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java index 0470a6bf441..16bf959dc45 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import javax.xml.stream.XMLStreamException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java index 48ecebcae90..161b6e6dcdb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventReaderTest; +package stream.XMLEventReaderTest; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/bug6613059.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/bug6613059.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play2.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/sgml.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java index 9c2df037342..1805e9922f0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventWriterTest; +package stream.XMLEventWriterTest; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java index d12ca93b4a9..ab076f27d6e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLEventWriterTest; +package stream.XMLEventWriterTest; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-1.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-1.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-2.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/replace1.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/replace1.txt rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java index 569d6c5f5f9..17604ac6d09 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLInputFactoryTest; +package stream.XMLInputFactoryTest; import javax.xml.stream.XMLInputFactory; @@ -36,7 +36,7 @@ public class Bug6756677Test { @Test public void testNewInstance() { - String myFactory = "javax.xml.stream.XMLInputFactoryTest.MyInputFactory"; + String myFactory = "stream.XMLInputFactoryTest.MyInputFactory"; try { System.setProperty("MyInputFactory", myFactory); XMLInputFactory xif = XMLInputFactory.newInstance("MyInputFactory", null); @@ -52,7 +52,7 @@ public class Bug6756677Test { // newFactory was added in StAX 1.2 @Test public void testNewFactory() { - String myFactory = "javax.xml.stream.XMLInputFactoryTest.MyInputFactory"; + String myFactory = "stream.XMLInputFactoryTest.MyInputFactory"; ClassLoader cl = null; try { System.setProperty("MyInputFactory", myFactory); diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java index 1c699c83323..36cc136dadd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLInputFactoryTest; +package stream.XMLInputFactoryTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java index f468d7a0f41..448a854d45f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLInputFactoryTest; +package stream.XMLInputFactoryTest; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java index 581c122585c..551d3f0f8d2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLInputFactoryTest; +package stream.XMLInputFactoryTest; import java.io.InputStream; import java.io.Reader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/play.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/play.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java index 9e5093d35e6..15afdafd751 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLOutputFactoryTest; +package stream.XMLOutputFactoryTest; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLOutputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java index 64517c363ed..884c9235d24 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLOutputFactoryTest; +package stream.XMLOutputFactoryTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java index 368c80c1b0d..96d928c6572 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLOutputFactoryTest; +package stream.XMLOutputFactoryTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java index 9d4ca307fff..1a0780398d6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLResolverTest; +package stream.XMLResolverTest; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace1.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace1.txt rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace2.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace2.txt rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java index a64d93f1dd8..3e0dda7d042 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamExceptionTest; +package stream.XMLStreamExceptionTest; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java index 25bc88d22d6..1aa221969d3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamFilterTest; +package stream.XMLStreamFilterTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java index 1f697b775a5..9b3273ac09e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamFilterTest; +package stream.XMLStreamFilterTest; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java index 5625f78177f..3df73ae0472 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamFilterTest; +package stream.XMLStreamFilterTest; import javax.xml.stream.StreamFilter; import javax.xml.stream.XMLInputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java index 95b3f505a27..1fd6e20fe08 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamFilterTest; +package stream.XMLStreamFilterTest; import javax.xml.stream.EventFilter; import javax.xml.stream.StreamFilter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java index eb7c3b44770..b253e95b1b0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java index 4d6b58ad41a..c73348c744c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java index 830718fe175..c22dde736de 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java index fe0da552cc8..b9ffde7fefd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.ByteArrayInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java index c9211c06781..2480b727d90 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import org.testng.annotations.Test; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java index 2499a07db4a..15e01a21896 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java index 33e8c5b9353..6ce3bd4568d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.util.Iterator; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java index da73bd6cc91..df1ced6bb61 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Hello.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Hello.wsdl.data rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java index dcd2d39b2bb..06dc2665a7f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java index 47ed0bc9ff9..082aa87d0c4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java index 736971d1f5a..7d868423677 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java index 0d2f723fcd1..dd0fb1a0bf9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java index 2f93c9810b6..1aa8d6b4c7c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java index ed9dc284943..c616a3aa669 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java index c58fd03908d..50dfed8a487 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java index c39106f24bc..d1c007402ff 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java index 75d32705daf..5c9440d0998 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java index 8b7475db66a..cbaa37863cf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java index 7b8e28e8a01..1a2e325fdd2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF8-BOM.xml.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF8-BOM.xml.data rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java index 5e193f667fa..5befcb70609 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java index 2293aaca37a..ac98279175d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamReaderTest; +package stream.XMLStreamReaderTest; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.dtd rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.xsd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.xsd rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/datatypes.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/datatypes.dtd rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/report.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/report.dtd rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/sgml.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/voicexml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/voicexml.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/vxml.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/vxml.dtd rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/xml11.xml.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/xml11.xml.data rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java index 0cd9466dbf3..7a426c93f8d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java index 2d45aa2f603..b3148c60502 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; import java.io.OutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java index 3b22705100a..f34b559f86c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java index a22580670a0..e52fb4acbd4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java index a15b7a6142f..7c1e50264d5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java index 674e00dc193..f59ef011018 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.IOException; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java index 76d5c981bd3..d2c2491e36e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java index 475c3edb323..b813ef5607c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java index d79a2331374..50973152487 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java index 7f036defb2f..24d89a08ba6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java index 9dbb40cec11..3eb0222cbaf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java index fa53214f633..90ca0f313a2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java index c4174cf10fa..5e05fd82394 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java index 05f777d9327..adb43d95e0a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java index 4fa782130f9..2bc71a315ce 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.stream.XMLStreamWriterTest; +package stream.XMLStreamWriterTest; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/message_12.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/message_12.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testEight.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testEight.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFive.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFive.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFour.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFour.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testOne.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testOne.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSeven.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSeven.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSix.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSix.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testThree.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testThree.xml.org rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/basic-form.vxml b/jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/basic-form.vxml rename to jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/report.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/report.dtd rename to jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml-bad-systemId.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml-bad-systemId.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml_Bug6509774.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml_Bug6509774.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile1.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile1.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile2.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile3.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile3.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile4.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile4.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/toys.xml rename to jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/vxml.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/vxml.dtd rename to jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/5368141.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/5368141.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.dtd rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.out b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.out similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.out rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.out diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java index 605baf81ef5..f0dc71feb5a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import java.io.FileInputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.dtd rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java index c4b54f80cd0..e65bdaf6058 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; @@ -32,16 +32,17 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXResult; import javax.xml.transform.stax.StAXResult; import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.util.DOMUtil; -import javax.xml.transform.util.SAXUtil; -import javax.xml.transform.util.StAXUtil; -import javax.xml.transform.util.StreamUtil; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import transform.util.DOMUtil; +import transform.util.SAXUtil; +import transform.util.StAXUtil; +import transform.util.StreamUtil; + /* * @bug 4892774 * @summary Test identity transformer with all possible types of Source and Result combinations for doucment version and encoding information. diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java index 7d061c2c2c0..4d406747c8a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java index ae568341344..bb3c7d61a29 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java index 9b508796ac9..eaaa3f77908 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491_2.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491_2.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java similarity index 91% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java index ec856b7116f..275fd8c5af1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java @@ -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 @@ -21,11 +21,13 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import java.io.StringReader; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java index 5b395170918..db6925d00e4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java index c59b9555f0a..680398bf037 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.util.Iterator; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java index 3a261092f0e..80d5139e7c3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringReader; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java index e32947c1814..7a7fb1aa074 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java index 5ec65e81110..4385fb245bf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringWriter; import java.net.URL; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java index b8ec881fdc6..38f72d5a89f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java index 931bf6dc34b..d3fa4fd30f4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringWriter; import java.util.HashMap; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java index ac9fab16438..da26d64e2ec 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java index f64c67213b5..c75ff71b584 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java index e9ddaee53a7..2c76ad694fa 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java index 1c568b1b86c..162c92a2e8a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringReader; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java index d6a548bff68..3b0f6361b1d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java index 5c881e10089..41f7279506a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java index 6099296b73f..5f5fa0e8fdd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -33,6 +33,12 @@ import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; +import javax.xml.transform.Result; +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.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java index c74fb355e89..7a2c5427633 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,6 +29,10 @@ import java.io.File; import java.io.FileReader; import java.io.InputStream; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600.policy b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600.policy rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java index 4211bdf5d8d..f364f5d2332 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java @@ -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 @@ -21,12 +21,14 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java similarity index 90% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java index b6039c120e1..70767a47d3b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java @@ -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 @@ -21,10 +21,12 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.InputStream; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java index afec16489fd..9be065fb038 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java @@ -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 @@ -21,12 +21,14 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java index dec6b4eb799..91da2f6d4fd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java @@ -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 @@ -21,10 +21,11 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.CharArrayWriter; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Inc.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Inc.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java similarity index 91% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java index 9a77ed1a1bf..60de73f31e0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java @@ -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 @@ -21,11 +21,13 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import java.io.StringWriter; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java similarity index 89% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java index 646043feaa6..6742d3fe47e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java @@ -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 @@ -21,10 +21,15 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.FileOutputStream; +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; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java index d2e6eba9b41..07a18b6ad14 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java @@ -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 @@ -21,11 +21,13 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.File; import java.io.StringWriter; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java similarity index 88% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java index 2a8460a10a7..3d9a74012b1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java @@ -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 @@ -21,12 +21,20 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.StringWriter; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.SourceLocator; +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.stream.StreamResult; import javax.xml.transform.stream.StreamSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java similarity index 90% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java index 5b3e71c18a2..d67a58ad847 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java @@ -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 @@ -21,10 +21,15 @@ * questions. */ -package javax.xml.transform; +package transform; 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; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java index b08d532bd09..b21fadd8724 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java @@ -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 @@ -21,10 +21,11 @@ * questions. */ -package javax.xml.transform; +package transform; import org.testng.annotations.Test; import org.testng.Assert; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -33,6 +34,10 @@ 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.TransformerException; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java index 44976edcc1a..81227c7d691 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java index 370f0fff2ac..c0f17b8d5c0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java @@ -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 @@ -21,11 +21,13 @@ * questions. */ -package javax.xml.transform; +package transform; import java.net.URL; import java.net.URLClassLoader; +import javax.xml.transform.TransformerFactory; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java index 35bcab3dc23..b0912eb8479 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java index 1c63d974bb0..b2be968bea6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform; +package transform; import java.io.StringReader; import java.io.StringWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data b/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data similarity index 99% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data rename to jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data index 9ba08025521..07e954144c8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data @@ -1,7 +1,7 @@ " - + "" + + "" + "" - + "" + + "" + ""; static final String documentTesteExpectedResult = "" diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xsd b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xsd rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog_10.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog_10.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.dtd rename to jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/config.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/config.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/default-layout.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/default-layout.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global-variables.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global-variables.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/home.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/home.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/in.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/in.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/in.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/in.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/inner.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/inner.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/logon.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/logon.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/maps.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/maps.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/msgAttach.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/msgAttach.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/outer.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/outer.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java index 855fa6ee1e6..a299656033e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform.sax; +package transform.sax; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/src.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/src.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/src.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/src.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/template.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/template.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/template.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/template.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest-in.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest-in.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tmp.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tmp.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/toys.xml rename to jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/transform.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/transform.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media-form.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media-form.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util.xsl rename to jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java index 1881299a7c6..988da74f834 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform.util; +package transform.util; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java index fd7421c23ff..9e257ebf9a6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java @@ -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 @@ -21,19 +21,20 @@ * questions. */ -package javax.xml.transform.util; +package transform.util; import java.io.InputStream; import javax.xml.transform.Result; import javax.xml.transform.Source; -import javax.xml.transform.VersionDefaultHandler; import javax.xml.transform.sax.SAXResult; import javax.xml.transform.sax.SAXSource; import org.testng.Assert; import org.xml.sax.InputSource; +import transform.VersionDefaultHandler; + public class SAXUtil extends TransformerUtil { private static SAXUtil instance = null; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java index 6c17ffa7829..26374d76ab0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform.util; +package transform.util; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -34,13 +34,14 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; import javax.xml.transform.Source; -import javax.xml.transform.TransformerUtilFactory; -import javax.xml.transform.VersionEventWriter; import javax.xml.transform.stax.StAXResult; import javax.xml.transform.stax.StAXSource; import org.testng.Assert; +import transform.TransformerUtilFactory; +import transform.VersionEventWriter; + public class StAXUtil extends TransformerUtil { private static StAXUtil instance = null; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java index 7bbf93f4359..019c2f16b1e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform.util; +package transform.util; import java.io.File; import java.io.FileInputStream; @@ -33,13 +33,14 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Result; import javax.xml.transform.Source; -import javax.xml.transform.VersionDefaultHandler; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; import org.w3c.dom.Document; +import transform.VersionDefaultHandler; + public class StreamUtil extends TransformerUtil { DocumentBuilder docBuilder = null; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java index 5a92fe77069..61d7bfe09db 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.transform.util; +package transform.util; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java deleted file mode 100644 index 2088452af58..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java +++ /dev/null @@ -1,80 +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 util; - -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; - -public class BOMInputStream { - public static InputStream createStream(String charset, InputStream input) { - - try { - byte[] content = read(input).getBytes(charset); - byte[] head = bom.get(charset); - if (head == null) - return null; - byte[] result = new byte[head.length + content.length]; - System.arraycopy(head, 0, result, 0, head.length); - System.arraycopy(content, 0, result, head.length, content.length); - return new ByteArrayInputStream(result); - } catch (UnsupportedEncodingException e) { - return null; - } - } - - private static String read(InputStream input) - { - try { - StringBuffer sb = new StringBuffer(); - InputStreamReader r = new InputStreamReader(new BufferedInputStream(input)); - int c = 0; - while ((c = r.read()) != -1) - sb.append((char)c); - return sb.toString(); - } catch (IOException e) { - return ""; - } finally { - try { - input.close(); - } catch (IOException e) - {} - } - } - - - private final static Map bom = new HashMap(); - private final static byte[][] bomBytes = {{(byte)0xEF, (byte)0xBB, (byte)0xBF}, - {(byte)0xFE, (byte)0xFF}}; - - static { - bom.put("UTF-8", bomBytes[0]); - bom.put("UTF-16BE", bomBytes[1]); - } - -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java deleted file mode 100644 index 86a54335249..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java +++ /dev/null @@ -1,559 +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 util; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.StringReader; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; - -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLResolver; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.events.XMLEvent; - -import org.testng.Assert; - -/** - * Base class for all StaxTest unit test classes. Contains shared - * functionality for many common set up tasks, as well as for - * outputting diagnostics. - * - */ -public class BaseStAXUT implements XMLStreamConstants { - /** - * This is the de facto standard property that enables accurate reporting of - * CDATA events. - */ - final static String PROP_REPORT_CDATA = "http://java.sun.com/xml/stream/properties/report-cdata-event"; - - final static HashMap mTokenTypes = new HashMap(); - static { - mTokenTypes.put(new Integer(START_ELEMENT), "START_ELEMENT"); - mTokenTypes.put(new Integer(END_ELEMENT), "END_ELEMENT"); - mTokenTypes.put(new Integer(START_DOCUMENT), "START_DOCUMENT"); - mTokenTypes.put(new Integer(END_DOCUMENT), "END_DOCUMENT"); - mTokenTypes.put(new Integer(CHARACTERS), "CHARACTERS"); - mTokenTypes.put(new Integer(CDATA), "CDATA"); - mTokenTypes.put(new Integer(COMMENT), "COMMENT"); - mTokenTypes.put(new Integer(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION"); - mTokenTypes.put(new Integer(DTD), "DTD"); - mTokenTypes.put(new Integer(SPACE), "SPACE"); - mTokenTypes.put(new Integer(ENTITY_REFERENCE), "ENTITY_REFERENCE"); - mTokenTypes.put(new Integer(NAMESPACE), "NAMESPACE_DECLARATION"); - mTokenTypes.put(new Integer(NOTATION_DECLARATION), "NOTATION_DECLARATION"); - mTokenTypes.put(new Integer(ENTITY_DECLARATION), "ENTITY_DECLARATION"); - } - - /* - * /////////////////////////////////////////////////// // Consts for - * expected values /////////////////////////////////////////////////// - */ - - /** - * Expected return value for streamReader.getNamespaceURI() in - * non-namespace-aware mode. - */ - protected final String DEFAULT_URI_NON_NS = ""; - - protected final String DEFAULT_URI_NS = ""; - - /* - * /////////////////////////////////////////////////// // Other consts - * /////////////////////////////////////////////////// - */ - - /* - * /////////////////////////////////////////////////// // Cached instances - * /////////////////////////////////////////////////// - */ - - XMLInputFactory mInputFactory; - XMLOutputFactory mOutputFactory; - XMLEventFactory mEventFactory; - - protected XMLInputFactory getInputFactory() { - if (mInputFactory == null) { - mInputFactory = getNewInputFactory(); - } - return mInputFactory; - } - - protected static XMLInputFactory getNewInputFactory() { - return XMLInputFactory.newInstance(); - } - - protected XMLOutputFactory getOutputFactory() { - if (mOutputFactory == null) { - mOutputFactory = getNewOutputFactory(); - } - return mOutputFactory; - } - - protected static XMLOutputFactory getNewOutputFactory() { - return XMLOutputFactory.newInstance(); - } - - protected XMLEventFactory getEventFactory() { - if (mEventFactory == null) { - mEventFactory = XMLEventFactory.newInstance(); - } - return mEventFactory; - } - - protected static XMLStreamReader constructStreamReader(XMLInputFactory f, String content) throws XMLStreamException { - // return f.createXMLStreamReader(new StringReader(content)); - try { - byte[] data = content.getBytes("UTF-8"); - return constructStreamReader(f, data); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } - - protected static XMLStreamReader constructStreamReader(XMLInputFactory f, byte[] b) throws XMLStreamException { - return f.createXMLStreamReader(new ByteArrayInputStream(b)); - } - - protected static XMLStreamReader constructStreamReaderForFile(XMLInputFactory f, String filename) throws IOException, XMLStreamException { - File inf = new File(filename); - XMLStreamReader sr = f.createXMLStreamReader(inf.toURL().toString(), new FileReader(inf)); - Assert.assertEquals(START_DOCUMENT, sr.getEventType()); - return sr; - } - - protected XMLStreamReader constructNsStreamReader(String content) throws XMLStreamException { - XMLInputFactory f = getInputFactory(); - setNamespaceAware(f, true); - return f.createXMLStreamReader(new StringReader(content)); - } - - protected XMLStreamReader constructNsStreamReader(String content, boolean coal) throws XMLStreamException { - XMLInputFactory f = getInputFactory(); - setNamespaceAware(f, true); - setCoalescing(f, coal); - return f.createXMLStreamReader(new StringReader(content)); - } - - /* - * ////////////////////////////////////////////////// // Configuring input - * factory ////////////////////////////////////////////////// - */ - - protected static boolean isCoalescing(XMLInputFactory f) throws XMLStreamException { - return ((Boolean) f.getProperty(XMLInputFactory.IS_COALESCING)).booleanValue(); - } - - protected static void setCoalescing(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.IS_COALESCING, b); - // Let's just double-check it... - Assert.assertEquals(state, isCoalescing(f)); - } - - protected static boolean isValidating(XMLInputFactory f) throws XMLStreamException { - return ((Boolean) f.getProperty(XMLInputFactory.IS_VALIDATING)).booleanValue(); - } - - protected static void setValidating(XMLInputFactory f, boolean state) throws XMLStreamException { - try { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.IS_VALIDATING, b); - } catch (IllegalArgumentException iae) { - Assert.fail("Could not set DTD validating mode to " + state + ": " + iae); - // throw new XMLStreamException(iae.getMessage(), iae); - } - Assert.assertEquals(state, isValidating(f)); - } - - protected static boolean isNamespaceAware(XMLInputFactory f) throws XMLStreamException { - return ((Boolean) f.getProperty(XMLInputFactory.IS_NAMESPACE_AWARE)).booleanValue(); - } - - /** - * @return True if setting succeeded, and property supposedly was - * succesfully set to the value specified; false if there was a - * problem. - */ - protected static boolean setNamespaceAware(XMLInputFactory f, boolean state) throws XMLStreamException { - try { - f.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, state ? Boolean.TRUE : Boolean.FALSE); - - /* - * 07-Sep-2005, TSa: Let's not assert, but instead let's see if it - * sticks. Some implementations might choose to silently ignore - * setting, at least for 'false'? - */ - return (isNamespaceAware(f) == state); - } catch (IllegalArgumentException e) { - /* - * Let's assume, then, that the property (or specific value for it) - * is NOT supported... - */ - return false; - } - } - - protected static void setReplaceEntities(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, b); - Assert.assertEquals(b, f.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)); - } - - protected static void setSupportDTD(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - f.setProperty(XMLInputFactory.SUPPORT_DTD, b); - Assert.assertEquals(b, f.getProperty(XMLInputFactory.SUPPORT_DTD)); - } - - protected static boolean setSupportExternalEntities(XMLInputFactory f, boolean state) throws XMLStreamException { - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - try { - f.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, b); - Object act = f.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES); - return (act instanceof Boolean) && ((Boolean) act).booleanValue() == state; - } catch (IllegalArgumentException e) { - /* - * Let's assume, then, that the property (or specific value for it) - * is NOT supported... - */ - return false; - } - } - - protected static void setResolver(XMLInputFactory f, XMLResolver resolver) throws XMLStreamException { - f.setProperty(XMLInputFactory.RESOLVER, resolver); - } - - protected static boolean setReportCData(XMLInputFactory f, boolean state) throws XMLStreamException { - - Boolean b = state ? Boolean.TRUE : Boolean.FALSE; - if (f.isPropertySupported(PROP_REPORT_CDATA)) { - f.setProperty(PROP_REPORT_CDATA, b); - return true; - } - return false; - } - - /* - * ////////////////////////////////////////////////// // Stream reader - * accessors ////////////////////////////////////////////////// - */ - - /** - * Method that not only gets currently available text from the reader, but - * also checks that its consistenly accessible using different StAX methods. - */ - protected static String getAndVerifyText(XMLStreamReader sr) throws XMLStreamException { - String text = sr.getText(); - - /* - * 05-Apr-2006, TSa: Although getText() is available for DTD and - * ENTITY_REFERENCE, getTextXxx() are not. Thus, can not do more checks - * for those types. - */ - int type = sr.getEventType(); - if (type != ENTITY_REFERENCE && type != DTD) { - Assert.assertNotNull("getText() should never return null.", text); - int expLen = sr.getTextLength(); - /* - * Hmmh. Can only return empty text for CDATA (since empty blocks - * are legal). - */ - /* - * !!! 01-Sep-2004, TSa: note: theoretically, in coalescing mode, it - * could be possible to have empty CDATA section(s) get converted to - * CHARACTERS, which would be empty... may need to enhance this to - * check that mode is not coalescing? Or something - */ - if (sr.getEventType() == CHARACTERS) { - if (expLen == 0) { - Assert.fail("Stream reader should never return empty Strings."); - } - } - Assert.assertEquals(expLen, text.length(), "Expected text length of " + expLen + ", got " + text.length()); - char[] textChars = sr.getTextCharacters(); - int start = sr.getTextStart(); - String text2 = new String(textChars, start, expLen); - Assert.assertEquals("Expected getText() and getTextCharacters() to return same value for event of type (" + tokenTypeDesc(sr.getEventType()) + ")", - text, text2); - } else { // DTD or ENTITY_REFERENCE - // not sure if null is legal for these either, but... - if (text == null) { // let's prevent an NPE at caller - text = ""; - } - } - return text; - } - - protected static String getAllText(XMLStreamReader sr) throws XMLStreamException { - StringBuffer sb = new StringBuffer(); - while (true) { - int tt = sr.getEventType(); - if (tt != CHARACTERS && tt != SPACE) { - break; - } - sb.append(getAndVerifyText(sr)); - sr.next(); - } - return sb.toString(); - } - - protected static String getAllCData(XMLStreamReader sr) throws XMLStreamException { - StringBuffer sb = new StringBuffer(); - while (true) { - /* - * Note: CDATA sections CAN be reported as CHARACTERS, but not as - * SPACE - */ - int tt = sr.getEventType(); - if (tt != CHARACTERS && tt != CDATA) { - break; - } - sb.append(getAndVerifyText(sr)); - sr.next(); - } - return sb.toString(); - } - - /* - * ////////////////////////////////////////////////// // Derived assert/fail - * methods ////////////////////////////////////////////////// - */ - - protected static void assertTokenType(int expType, int actType) { - if (expType == actType) { - return; - } - Assert.fail("Expected token " + tokenTypeDesc(expType) + "; got " + tokenTypeDesc(actType) + "."); - } - - protected static void assertTokenType(int expType, int actType, XMLStreamReader sr) { - if (expType == actType) { - return; - } - Assert.fail("Expected token " + tokenTypeDesc(expType) + "; got " + tokenTypeDesc(actType, sr) + "."); - } - - protected static void assertTextualTokenType(int actType) { - if (actType != CHARACTERS && actType != SPACE && actType != CDATA) { - Assert.fail("Expected textual token (CHARACTERS, SPACE or CDATA)" + "; got " + tokenTypeDesc(actType) + "."); - } - } - - protected static void failStrings(String msg, String exp, String act) { - // !!! TODO: Indicate position where Strings differ - Assert.fail(msg + ": expected " + quotedPrintable(exp) + ", got " + quotedPrintable(act)); - } - - /** - * Specific method makes sense, since earlier it was not clear whether null - * or empty string (or perhaps both) would be the right answer when there is - * no prefix. - *

- * However: as per javadocs of {@link XMLStreamReader#getPrefix}, from JDK - * 1.6 indicate, the current understanding is that null is the - * ultimate right answer here. - */ - protected static void assertNoPrefix(XMLStreamReader sr) throws XMLStreamException { - String prefix = sr.getPrefix(); - if (prefix != null) { - if (prefix.length() != 0) { - Assert.fail("Current element should not have a prefix: got '" + prefix + "'"); - } else { - Assert.fail("Expected null to signify missing prefix (see XMLStreamReader#getPrefix() JavaDocs): got empty String"); - } - } - } - - protected static void assertNoAttrPrefix(String attrPrefix) throws XMLStreamException { - if (attrPrefix != null) { - if (attrPrefix.length() != 0) { - Assert.fail("Attribute should not have a prefix: got '" + attrPrefix + "'"); - } else { - Assert.fail("Expected null to signify missing attribute prefix (see XMLStreamReader#getAttributePrefix() JavaDocs): got empty String"); - } - } - } - - /** - * Similar to {@link #assertNoPrefix}, but here we do know that unbound - * namespace URI should be indicated as empty String. - */ - protected static void assertNoNsURI(XMLStreamReader sr) throws XMLStreamException { - String uri = sr.getNamespaceURI(); - if (uri == null) { - Assert.fail("Expected empty String to indicate \"no namespace\": got null"); - } else if (uri.length() != 0) { - Assert.fail("Expected empty String to indicate \"no namespace\": got '" + uri + "'"); - } - } - - protected static void assertNoAttrNamespace(String attrNsURI) throws XMLStreamException { - if (attrNsURI == null) { - // refer to 6903561; accept null for now. - // fail("Expected empty String to indicate \"no namespace\" (for attribute): got null"); - } else if (attrNsURI.length() != 0) { - Assert.fail("Expected empty String to indicate \"no namespace\" (for attribute): got '" + attrNsURI + "'"); - } - } - - protected static void assertNoPrefixOrNs(XMLStreamReader sr) throws XMLStreamException { - assertNoPrefix(sr); - assertNoNsURI(sr); - } - - /** - * Helper assertion that assert that the String is either null or empty - * (""). - */ - protected static void assertNullOrEmpty(String str) { - if (str != null && str.length() > 0) { - Assert.fail("Expected String to be empty or null; was '" + str + "' (length " + str.length() + ")"); - } - } - - /* - * ////////////////////////////////////////////////// // Debug/output - * helpers ////////////////////////////////////////////////// - */ - - protected static String tokenTypeDesc(int tt) { - String desc = (String) mTokenTypes.get(new Integer(tt)); - if (desc == null) { - return "[" + tt + "]"; - } - return desc; - } - - protected static String tokenTypeDesc(XMLEvent evt) { - return tokenTypeDesc(evt.getEventType()); - } - - final static int MAX_DESC_TEXT_CHARS = 8; - - protected static String tokenTypeDesc(int tt, XMLStreamReader sr) { - String desc = tokenTypeDesc(tt); - // Let's show first 8 chars or so... - if (tt == CHARACTERS || tt == SPACE || tt == CDATA) { - String str = sr.getText(); - if (str.length() > MAX_DESC_TEXT_CHARS) { - desc = "\"" + str.substring(0, MAX_DESC_TEXT_CHARS) + "\"[...]"; - } else { - desc = "\"" + desc + "\""; - } - desc = " (" + desc + ")"; - } - return desc; - } - - protected static String valueDesc(String value) { - if (value == null) { - return "[NULL]"; - } - return "\"" + value + "\""; - } - - protected static String printable(char ch) { - if (ch == '\n') { - return "\\n"; - } - if (ch == '\r') { - return "\\r"; - } - if (ch == '\t') { - return "\\t"; - } - if (ch == ' ') { - return "_"; - } - if (ch > 127 || ch < 32) { - StringBuffer sb = new StringBuffer(6); - sb.append("\\u"); - String hex = Integer.toHexString((int) ch); - for (int i = 0, len = 4 - hex.length(); i < len; i++) { - sb.append('0'); - } - sb.append(hex); - return sb.toString(); - } - return null; - } - - protected static String printable(String str) { - if (str == null || str.length() == 0) { - return str; - } - - int len = str.length(); - StringBuffer sb = new StringBuffer(len + 64); - for (int i = 0; i < len; ++i) { - char c = str.charAt(i); - String res = printable(c); - if (res == null) { - sb.append(c); - } else { - sb.append(res); - } - } - return sb.toString(); - } - - protected static String quotedPrintable(String str) { - if (str == null || str.length() == 0) { - return "[0]''"; - } - return "[len: " + str.length() + "] '" + printable(str) + "'"; - } - - protected void reportNADueToProperty(String method, String prop) { - String clsName = getClass().getName(); - /* - * 27-Sep-2005, TSa: Should probably use some other mechanism for - * reporting this. Does JUnit have something applicable? - */ - System.err.println("Skipping " + clsName + "#" + method + ": property '" + prop + "' (or one of its values) not supported."); - } - - protected void reportNADueToNS(String method) { - reportNADueToProperty(method, "IS_NAMESPACE_AWARE"); - } - - protected void reportNADueToExtEnt(String method) { - reportNADueToProperty(method, "IS_SUPPORTING_EXTERNAL_ENTITIES"); - } - - protected void reportNADueToEntityExpansion(String method, int type) { - String clsName = getClass().getName(); - String msg = (type > 0) ? " (next event: " + tokenTypeDesc(type) + ")" : ""; - System.err.println("Skipping " + clsName + "#" + method + ": entity expansion does not seem to be functioning properly" + msg + "."); - } -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java deleted file mode 100644 index 5a408d1278a..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/util/DraconianErrorHandler.java +++ /dev/null @@ -1,37 +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 util; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.DefaultHandler; - -public final class DraconianErrorHandler extends DefaultHandler { - public void error(SAXParseException e) throws SAXException { - throw e; - } - - public void fatalError(SAXParseException e) throws SAXException { - throw e; - } -} diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/6773084.policy b/jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/6773084.policy rename to jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java index f37f0bfab28..a1218b1616e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package javax.xml.validation; +package validation; /* * @bug 8080907 @@ -31,6 +31,8 @@ import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; import java.net.URISyntaxException; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java index 925bf2c9123..1e9d473fb5c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.dom.DOMSource; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java index 6d1f0ad2374..e081f37f072 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java index 71ad30d61c9..d04395e6615 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java index 32477a246b5..4b7f0b53078 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java index f9fb0f4adb9..ace534e2c53 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java index 6790321bdbf..85cc249fefb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java index e19372242a3..2e146123869 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java index 026da4a3ebf..18512dde195 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java index 39ea1b7be03..db6941673d5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java index 5f298af454d..3fe2dcfb9bf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java index b9a0656b002..b9d055547e5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java index 3ac15277ec4..f53615333c4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java index d0c57b20765..c4575679ca5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java index 55f3d1d9d3d..e66e01062ed 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java index 4f986a8920a..e033d499078 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java index 09cd588489a..566f17c0c1a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java index e33b040a778..870e7a7bc38 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java index 8e84e840626..8b3ce663eca 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java index 73049545f24..f98f6d5b768 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java index a56806a61c8..d479455524a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.FileWriter; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java index 4c372f5ad7a..ef57585545d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java index d99960674b0..0005f17e51c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java index 9ca25216ec6..b7b889b90fb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java index e381e65f59c..4ea0afe938e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.net.URL; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java index 7330d49358b..b46bf36eea7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java index bc65b4de23b..6d79fb2cc7b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.ByteArrayInputStream; import java.io.InputStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java index 327a387e51a..9769d1dc8f3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java index 6078724f89c..c561bb12ecf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java index ca24b94281f..3b797edc0b3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java @@ -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 @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package javax.xml.validation; +package validation; import javax.xml.XMLConstants; import javax.xml.validation.SchemaFactory; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java index 84bfa2681f3..3518a0e7267 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.FileOutputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java index 76cf2a30699..4ebce561e3f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.IOException; @@ -38,6 +38,9 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java index 848a545bec8..f5947130ee7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.net.URL; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java index 5034d3d29f6..2da6c45a1fb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import org.testng.annotations.Test; import org.w3c.dom.Document; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java similarity index 98% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java index 094c8a6eac9..2c9906c9711 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java index dfbf550e560..e737d7514fc 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java index 7c682dbd4fb..53cea01f5d8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.StringReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java index fde9fb2e420..e70dbff8a11 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; @@ -30,6 +30,9 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.dom.DOMSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_1.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_1.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_10.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_10.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_11.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_11.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_12.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_12.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_13.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_13.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_14.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_14.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_15.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_15.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_16.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_16.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_17.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_17.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_18.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_18.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_19.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_19.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_2.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_2.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_20.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_20.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_21.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_21.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_22.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_22.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_23.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_23.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_24.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_24.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_25.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_25.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_3.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_3.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_4.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_4.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_5.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_5.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_6.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_6.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_7.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_7.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_8.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_8.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_9.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_9.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java index 41103d20b13..98737edebaf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.FileFilter; @@ -38,6 +38,9 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.BeforeClass; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java index 322a7dc4fa2..1bb0d046499 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java index 03b2efd3a53..b3fad32adb0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -35,6 +35,9 @@ import java.security.PrivilegedAction; import javax.xml.XMLConstants; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java index b93c1ac8f62..5f0b19d50dc 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.InputStream; @@ -31,6 +31,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java similarity index 92% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java index da5bb1a4cab..5118754af73 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java @@ -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 @@ -21,12 +21,15 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import javax.xml.XMLConstants; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java index 932c8fb43b8..7c9b0bd83e1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.FileWriter; @@ -33,6 +33,9 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.stax.StAXSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java index 7ef779eb0a9..26a239b2854 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java similarity index 94% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java index 6fbd8570d88..95806ed3f21 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java index 9301f3bd6b8..e1753f06817 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.InputStream; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java index afde0f092a4..765fa1329c5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-error.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-ok.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-error.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-ok.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java index 5a451ca7a6e..e590b221330 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.FileInputStream; import java.util.ArrayList; @@ -34,6 +34,9 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.annotations.Test; import org.w3c.dom.Document; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java index 85522e9503d..aec363119a1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.FileInputStream; @@ -33,6 +33,9 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java index 4a4e06235d2..d78322723c7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java @@ -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 @@ -21,11 +21,14 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import javax.xml.XMLConstants; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java index 7f0dbddebee..014e8af7dad 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java index 8d7d5163756..b6069c26a3b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java index be3ed12bf0f..0cb9177760c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java index 47d1ba9af91..df0e07829dd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java index 36b21cdf8bd..36b97cf9361 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java index e11fa92fd47..b454db97b22 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java index 429ea2d9d83..74169f4af09 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java similarity index 88% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java index c1618505e34..2fe1a305e2a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java @@ -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 @@ -21,11 +21,14 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import javax.xml.XMLConstants; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java similarity index 96% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java index ef589d13847..33e73d5ce80 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd similarity index 100% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java similarity index 89% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java index e097422fbdf..c88c09b85f5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java @@ -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 @@ -21,10 +21,14 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; + import org.testng.Assert; import org.testng.annotations.Test; import org.xml.sax.SAXException; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java index 5a84c5211a7..9dd421a4a26 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.File; import java.io.FileInputStream; @@ -34,6 +34,9 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.stax.StAXResult; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java similarity index 97% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java index f0513bb3683..de9b0d935e4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.InputStreamReader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java similarity index 95% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java rename to jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java index c1722a190e5..beb05e56afb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java @@ -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 @@ -21,7 +21,7 @@ * questions. */ -package javax.xml.validation; +package validation; import java.io.IOException; import java.io.Reader; diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml similarity index 93% rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml index a3071b50bab..ce13a8848a3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml @@ -1,7 +1,7 @@