You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/08/20 21:26:19 UTC
[tika] branch branch_2x updated: builds up through
tika-parser-modules including the integration tests. I have to fix the
iworks13 integration test much more to do.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_2x by this push:
new 0319d7e builds up through tika-parser-modules including the integration tests. I have to fix the iworks13 integration test much more to do.
0319d7e is described below
commit 0319d7e95697551529d19b363f6f98d8e9fe9d25
Author: tallison <ta...@apache.org>
AuthorDate: Thu Aug 20 17:25:51 2020 -0400
builds up through tika-parser-modules including the integration tests.
I have to fix the iworks13 integration test
much more to do.
---
pom.xml | 5 +-
tika-advanced-parser-modules/pom.xml | 2 +-
.../tika-parser-advancedmedia-module/pom.xml | 4 +-
.../tika-parser-nlp-module/pom.xml | 2 +-
.../org/apache/tika/parser/geo}/GeoParserTest.java | 2 +-
.../tika/parser/journal/JournalParserTest.java | 0
.../org/apache/tika/parser/journal/TEITest.java | 0
.../tika/parser/ner/NamedEntityParserTest.java | 0
.../tika/parser/ner/nltk/NLTKNERecogniserTest.java | 0
.../parser/ner/regex/RegexNERecogniserTest.java | 0
.../sentiment/SentimentAnalysisParserTest.java | 0
.../tika/parser/ner/opennlp/ModelGetter.groovy | 1 +
.../apache/tika/parser/ner/opennlp/get-models.sh | 0
.../org/apache/tika/parser/ner/regex/ner-regex.txt | 0
.../apache/tika/parser/ner/regex}/tika-config.xml | 0
.../tika-config-sentiment-opennlp-cat.xml | 0
.../sentiment/tika-config-sentiment-opennlp.xml | 0
.../services/org.apache.tika.detect.Detector | 4 +-
.../org/apache/tika/mime/tika-mimetypes.xml | 6 +-
tika-parent/pom.xml | 7 +
{tika-parsers => tika-parser-modules}/.gitignore | 0
tika-parser-modules/pom.xml | 11 +-
.../apache/tika/parser/iwork/IWorkParserTest.java | 1 -
tika-parser-modules/tika-parser-cad-module/pom.xml | 22 +
.../tika-parser-code-module/pom.xml | 12 +
.../java/org/apache/tika/parser/mat/MatParser.java | 0
.../org/apache/tika/parser/sas/SAS7BDATParser.java | 0
.../services/org.apache.tika.parser.Parser | 2 +
.../parser/executable/ExecutableParserTest.java | 0
.../org/apache/tika/parser/mat/MatParserTest.java | 0
.../apache/tika/parser/sas/SAS7BDATParserTest.java | 0
.../breidamerkurjokull_radar_profiles_2009.mat | Bin
.../resources/test-documents/test-columnar.sas.xml | 0
.../test-documents/test-columnar.sas7bdat | Bin
.../resources/test-documents/testLinux-arm-32le | Bin
.../resources/test-documents/testLinux-mips-32be | Bin
.../resources/test-documents/testLinux-mips-32le | Bin
.../resources/test-documents/testLinux-ppc-32be | Bin
.../test/resources/test-documents/testLinux-x86-32 | Bin
.../test/resources/test-documents/testLinux-x86-64 | Bin
.../src/test/resources/test-documents/testMATLAB.m | 0
.../resources/test-documents/testMATLAB_barcast.m | 0
.../resources/test-documents/testMATLAB_wtsgaus.m | 0
.../src/test/resources/test-documents/testSAS.sas | 0
.../test/resources/test-documents/testSAS.sas7bdat | Bin
.../src/test/resources/test-documents/testSAS.sd2 | Bin
.../src/test/resources/test-documents/testSAS.xpt | Bin
.../src/test/resources/test-documents/testSAS2.sas | 0
.../test-documents/testWindows-x86-32.exe | Bin
.../resources/test-documents/test_mat_text.mat | Bin
.../tika-parser-crypto-module/pom.xml | 35 +-
.../org/apache/tika/parser/crypto/Pkcs7Parser.java | 2 +-
.../services/org.apache.tika.parser.Parser | 4 +-
.../apache/tika/parser/crypto/Pkcs7ParserTest.java | 0
.../apache/tika/parser/crypto/TSDParserTest.java | 18 -
.../test/resources/test-documents/MANIFEST.XML.TSD | Bin
.../test/resources/test-documents/Test1.txt.tsd | Bin
.../test/resources/test-documents/Test2.txt.tsd | Bin
.../test/resources/test-documents/Test3.docx.tsd | Bin
.../test/resources/test-documents/Test4.pdf.tsd | Bin
.../test/resources/test-documents/Test5.PNG.tsd | Bin
.../test/resources/test-documents/testDetached.p7s | Bin
.../test-documents/testTSD_broken_pdf.tsd | Bin
tika-parser-modules/tika-parser-db-module/pom.xml | 22 +
.../{sqlite => sqlite3}/SQLite3DBParser.java | 2 +-
.../parser/{sqlite => sqlite3}/SQLite3Parser.java | 2 +-
.../{sqlite => sqlite3}/SQLite3TableReader.java | 2 +-
.../services/org.apache.tika.parser.Parser | 3 +-
.../tika/parser/sqlite3/SQLite3ParserTest.java | 192 +
.../test/resources/test-documents/testSQLITE3.db | Bin
.../test/resources/test-documents/testSqlite3b.db | Bin
.../tika-parser-digest-commons/pom.xml | 18 +
.../tika-parser-font-module/pom.xml | 23 +
.../tika/parser/html}/DataURISchemeParserTest.java | 2 +-
.../tika-parser-integration-tests/pom.xml | 162 +-
.../apache/tika/config/TikaDetectorConfigTest.java | 32 +-
.../tika/config/TikaEncodingDetectorTest.java | 12 +-
.../apache/tika/config/TikaParserConfigTest.java | 0
.../tika/config/TikaTranslatorConfigTest.java | 0
.../tika/detect/TestContainerAwareDetector.java | 4 +-
.../tika/extractor/EmbeddedDocumentUtilTest.java | 0
.../java/org/apache/tika/mime/MimeTypeTest.java | 0
.../java/org/apache/tika/mime/MimeTypesTest.java | 0
.../java/org/apache/tika/mime/TestMimeTypes.java | 13 +-
.../apache/tika/parser/AutoDetectParserTest.java | 0
.../tika/parser/AutoDetectReaderParserTest.java | 0
.../parser/BouncyCastleDigestingParserTest.java | 2 +-
.../apache/tika/parser/DigestingParserTest.java | 2 +-
.../org/apache/tika/parser/ParsingReaderTest.java | 0
.../tika/parser/RecursiveParserWrapperTest.java | 2 +-
.../org/apache/tika/parser/TabularFormatsTest.java | 0
.../java/org/apache/tika/parser}/TestParsers.java | 54 +-
.../tika/parser}/TestXMLEntityExpansion.java | 4 +-
.../java/org/apache/tika/parser}/TestXXEInXML.java | 94 +-
.../java/org/apache/tika/parser}/XMLTestBase.java | 3 +-
.../apple/AppleSingleFileParserTest.java | 2 +-
.../parser/{tests => }/apple/PListParserTest.java | 2 +-
.../apache/tika/parser/crypto/TSDParserTest.java | 31 +
.../parser/fork/ForkParserIntegrationTest.java | 0
.../parser/{tests => }/html/HtmlParserTest.java | 2 +-
.../parser/{tests => }/mail/MboxParserTest.java | 2 +-
.../parser/{tests => }/mail/RFC822ParserTest.java | 2 +-
.../{tests => }/microsoft/EMFParserTest.java | 2 +-
.../{tests => }/microsoft/ExcelParserTest.java | 2 +-
.../microsoft/POIContainerExtractionTest.java | 2 +-
.../microsoft/PowerPointParserTest.java | 2 +-
.../{tests => }/microsoft/XML2003ParserTest.java | 2 +-
.../microsoft/ooxml/OOXMLParserTest.java | 2 +-
.../microsoft/ooxml/TruncatedOOXMLTest.java | 2 +-
.../{tests => }/microsoft/rtf/RTFParserTest.java | 2 +-
.../apache/tika/parser/mock/MockParserTest.java | 0
.../{tests => }/ocr/TesseractOCRParserTest.java | 5 +-
.../tika/parser/{tests => }/odf/ODFParserTest.java | 2 +-
.../tika/parser/{tests => }/pdf/PDFParserTest.java | 4 +-
.../tika/parser/{tests => }/pkg/ArParserTest.java | 3 +-
.../parser/{tests => }/pkg/Bzip2ParserTest.java | 5 +-
.../pkg/CompositeZipContainerDetectorTest.java | 2 +-
.../parser/{tests => }/pkg/CompressParserTest.java | 2 +-
.../{tests => }/pkg/CompressorParserTest.java | 2 +-
.../parser/{tests => }/pkg/GzipParserTest.java | 5 +-
.../tika/parser/{tests => }/pkg/RarParserTest.java | 3 +-
.../parser/{tests => }/pkg/Seven7ParserTest.java | 3 +-
.../tika/parser/{tests => }/pkg/TarParserTest.java | 4 +-
.../tika/parser/{tests => }/pkg/ZipParserTest.java | 10 +-
.../parser/{tests => }/pkg/ZlibParserTest.java | 3 +-
.../tika/parser/sqlite3}/SQLite3ParserTest.java | 253 +-
.../{tests => }/xml/FictionBookParserTest.java | 2 +-
.../sax/PhoneExtractingContentHandlerTest.java | 0
.../sax/StandardsExtractingContentHandlerTest.java | 0
.../apache/tika/utils/ServiceLoaderUtilsTest.java | 0
.../src/test/resources/log4j.properties | 0
.../org/apache/tika/config/TIKA-1558-exclude.xml | 0
.../apache/tika/config/TIKA-1558-excludesub.xml | 0
.../tika/config/TIKA-1702-detector-exclude.xml | 4 +-
.../tika/config/TIKA-1702-translator-default.xml | 0
.../config/TIKA-1702-translator-empty-default.xml | 0
.../tika/config/TIKA-1702-translator-empty.xml | 0
.../tika/config/TIKA-1708-detector-composite.xml | 2 +-
.../tika/config/TIKA-1708-detector-default.xml | 2 +-
...-2273-encoding-detector-outside-static-init.xml | 6 +-
...TIKA-2273-exclude-encoding-detector-default.xml | 0
.../TIKA-2273-no-icu4j-encoding-detector.xml | 2 +-
.../TIKA-2273-non-detecting-params-bad-charset.xml | 0
.../tika/config/TIKA-2273-non-detecting-params.xml | 0
.../TIKA-2273-parameterize-encoding-detector.xml | 2 +-
.../TIKA-2485-encoding-detector-mark-limits.xml | 4 +-
.../tika/config/TIKA-3078-geo.topic.GeoParser.xml | 0
.../org/apache/tika/parser/TIKA-3137-include.xml | 0
.../apache/tika/parser/odf/tika-config-macros.xml | 10 +-
.../CVLKRA-KYC_Download_File_Structure_V3.1.xlsx | Bin
.../test/resources/test-documents/NUTCH-1997.cbor | 0
.../active_layer_arcss_grid_barrow_alaska_2012.dif | 0
.../src/test/resources/test-documents/baseball.gif | Bin
.../src/test/resources/test-documents/baseball.jpg | Bin
.../src/test/resources/test-documents/baseball.png | Bin
..._values_of_alkanes_extracted_from_paleosols.dif | 0
.../test-documents/mock/embedded_then_npe.xml | 0
.../test/resources/test-documents/mock/example.xml | 0
.../resources/test-documents/mock/fake_oom.xml | 0
.../resources/test-documents/mock/heavy_hang.xml | 0
.../resources/test-documents/mock/nothing_bad.xml | 0
.../resources/test-documents/mock/null_pointer.xml | 0
.../test-documents/mock/null_pointer_no_msg.xml | 0
.../resources/test-documents/mock/real_oom.xml | 0
.../test/resources/test-documents/mock/sleep.xml | 0
.../test-documents/mock/sleep_interruptible.xml | 0
.../mock/sleep_not_interruptible.xml | 0
.../resources/test-documents/mock/system_exit.xml | 0
.../test-documents/mock/thread_interrupt.xml | 0
.../resources/test-documents/test-columnar.csv | 24 +-
.../resources/test-documents/test-columnar.ods | Bin
.../resources/test-documents/test-columnar.xpt | Bin
.../src/test/resources/test-documents/test1.swf | Bin
.../src/test/resources/test-documents/test2.swf | Bin
.../src/test/resources/test-documents/test3.swf | Bin
.../src/test/resources/test-documents/testAC3.ac3 | Bin
.../test/resources/test-documents/testAMR-WB.amr | Bin
.../src/test/resources/test-documents/testAMR.amr | Bin
.../src/test/resources/test-documents/testAPK.apk | Bin
.../src/test/resources/test-documents/testASF.asf | Bin
.../test/resources/test-documents/testASiCE.asice | Bin
.../test/resources/test-documents/testASiCS.asics | Bin
.../src/test/resources/test-documents/testBAT.bat | 0
.../test/resources/test-documents/testBATUpper.bat | 0
.../resources/test-documents/testBDB_btree_2.db | Bin
.../resources/test-documents/testBDB_btree_3.db | Bin
.../resources/test-documents/testBDB_btree_4.db | Bin
.../resources/test-documents/testBDB_btree_5.db | Bin
.../resources/test-documents/testBDB_hash_2.db | Bin
.../resources/test-documents/testBDB_hash_3.db | Bin
.../resources/test-documents/testBDB_hash_4.db | Bin
.../resources/test-documents/testBDB_hash_5.db | Bin
.../test/resources/test-documents/testBIBTEX.bib | 0
.../test/resources/test-documents/testBMPfp.txt | 6 +-
.../test/resources/test-documents/testCOREL.shw | Bin
.../src/test/resources/test-documents/testCSS.css | 0
.../src/test/resources/test-documents/testCSV.csv | 0
.../test/resources/test-documents/testComment.pdf | Bin
.../src/test/resources/test-documents/testDCX.dcx | Bin
.../test/resources/test-documents/testDITA.dita | 0
.../test/resources/test-documents/testDITA.ditamap | 0
.../test/resources/test-documents/testDITA2.dita | 0
.../test/resources/test-documents/testDJVU.djvu | Bin
.../test/resources/test-documents/testDWF2010.dwf | Bin
.../resources/test-documents/testDXF_ascii.dxf | 74708 +++++++++----------
.../test/resources/test-documents/testDigilite.fdf | 0
.../src/test/resources/test-documents/testEAC3.ac3 | Bin
.../src/test/resources/test-documents/testEAR.ear | Bin
.../test-documents/testEndNoteImportFile.enw | 0
.../test/resources/test-documents/testFITS.fits | 0
.../test-documents/testFITS_ShorterHeader.fits | 0
.../test/resources/test-documents/testFLAC.flac | Bin
.../src/test/resources/test-documents/testFLAC.oga | Bin
.../test/resources/test-documents/testFOXMAIL.box | 2654 +-
.../resources/test-documents/testFreeBSD-x86-64 | Bin
.../resources/test-documents/testGRAPHVIZd.dot | 0
.../resources/test-documents/testGRAPHVIZdc.dot | 0
.../resources/test-documents/testGRAPHVIZg.dot | 0
.../src/test/resources/test-documents/testH.h | 0
.../src/test/resources/test-documents/testHFA.hfa | Bin
.../resources/test-documents/testICalendar.ics | 0
.../test/resources/test-documents/testINDD.indd | Bin
.../src/test/resources/test-documents/testIPA.ipa | Bin
.../test-documents/testJAVAPROPS.properties | 0
.../resources/test-documents/testJNILIB.jnilib | Bin
.../resources/test-documents/testJavaHprofBinary | Bin
.../resources/test-documents/testJavaHprofText | 0
.../src/test/resources/test-documents/testKML.kml | 0
.../test-documents/testLotus123-lotusftp.123 | Bin
.../test-documents/testLotus123-lotusftp.wk4 | Bin
.../test/resources/test-documents/testLotus123.wk1 | Bin
.../test/resources/test-documents/testLotus123.wk3 | Bin
.../test/resources/test-documents/testLotus123.wks | Bin
.../test/resources/test-documents/testLotusEml.eml | 140 +-
.../test-documents/testMHTMLFirefox.mhtml | 910 +-
.../src/test/resources/test-documents/testMIF.mif | Bin
.../src/test/resources/test-documents/testMKV.mkv | Bin
.../resources/test-documents/testMSWriteFile.wri | Bin
.../test/resources/test-documents/testMYSQL.MYD | Bin
.../test/resources/test-documents/testMYSQL.MYI | Bin
.../test/resources/test-documents/testMYSQL.frm | Bin
.../resources/test-documents/testMemgraph.memgraph | Bin
.../resources/test-documents/testMessageNews.txt | 0
.../src/test/resources/test-documents/testNLS1.nls | Bin
.../src/test/resources/test-documents/testNLS2.nls | Bin
.../test/resources/test-documents/testOPUS.opus | Bin
.../test-documents/testOptionalHyphen.doc | Bin
.../test-documents/testOptionalHyphen.docx | Bin
.../test-documents/testOptionalHyphen.ppt | Bin
.../test-documents/testOptionalHyphen.pptx | Bin
.../test-documents/testOptionalHyphen.rtf | 0
.../src/test/resources/test-documents/testPBM.pbm | 0
.../src/test/resources/test-documents/testPCX.pcx | Bin
.../src/test/resources/test-documents/testPGM.pgm | 0
.../src/test/resources/test-documents/testPICT.pct | Bin
.../test-documents/testPKCS17Sig-v2.xml.p7m | Bin
.../test-documents/testPKCS17Sig-v3.xml.p7m | 0
.../test-documents/testPKCS17Sig-v4.xml.p7m | 0
.../resources/test-documents/testPKCS17Sig.xml.p7m | 0
.../test-documents/testPhoneNumberExtractor.odt | Bin
.../src/test/resources/test-documents/testRDF.rdf | 0
.../test/resources/test-documents/testRotated.png | Bin
.../resources/test-documents/testSolaris-x86-32 | Bin
.../test-documents/testStarOffice-5.2-calc.sdc | Bin
.../test-documents/testStarOffice-5.2-draw.sda | Bin
.../test-documents/testStarOffice-5.2-impress.sdd | Bin
.../test-documents/testStarOffice-5.2-writer.sdw | Bin
.../test-documents/testStarOffice-6.0-calc.sxc | Bin
.../test-documents/testStarOffice-6.0-draw.sxd | Bin
.../test-documents/testStarOffice-6.0-draw.sxi | Bin
.../testStarOffice-6.0-writer-template.stw | Bin
.../test-documents/testStarOffice-6.0-writer.sxw | Bin
.../test/resources/test-documents/testStataDTA.dta | Bin
.../test/resources/test-documents/testStataDTA.txt | 0
.../resources/test-documents/testTAR_no_magic.tar | Bin
.../src/test/resources/test-documents/testTEI.xml | 0
.../test/resources/test-documents/testTXT-tika.axx | Bin
.../src/test/resources/test-documents/testTXT.txt | 0
.../test-documents/testTXTNonASCIIUTF8.txt | 0
.../test-documents/testThunderbirdEml.eml | 0
.../test/resources/test-documents/testTinyPE.exe | Bin
.../test/resources/test-documents/testVORBIS.ogg | Bin
.../test-documents/testVORCalcTemplate.vor | Bin
.../test-documents/testVORDrawTemplate.vor | Bin
.../test-documents/testVORImpressTemplate.vor | Bin
.../test-documents/testVORWriterTemplate.vor | Bin
.../test/resources/test-documents/testVideoMp4.mp4 | Bin
.../src/test/resources/test-documents/testWAR.war | Bin
.../test/resources/test-documents/testWEBM.webm | Bin
.../src/test/resources/test-documents/testWMA.wma | Bin
.../src/test/resources/test-documents/testWMV.wmv | Bin
.../test/resources/test-documents/testWMV_WMV2.wmv | Bin
.../test/resources/test-documents/testWORKS.wps | Bin
.../resources/test-documents/testWORKS2000.wps | Bin
.../test-documents/testWORKSWordProcessor3.0.wps | Bin
.../test-documents/testWORKSWordProcessor4.0.wps | Bin
.../test/resources/test-documents/testWebVTT.vtt | 64 +-
.../resources/test-documents/testWebVTT_header.vtt | 0
.../resources/test-documents/testWebVTT_simple.vtt | 0
.../test-documents/testWindowsMediaMeta.asx | 0
.../src/test/resources/test-documents/testXDP.xdp | 0
.../test/resources/test-documents/testXFDF.xfdf | 0
.../tika-parser-math-module/pom.xml | 27 -
.../tika-parser-microsoft-module/pom.xml | 3 +-
.../microsoft/POIFSContainerDetector.java | 6 +-
.../apache/tika/parser/microsoft/OfficeParser.java | 1 +
.../services/org.apache.tika.detect.Detector | 2 +-
.../microsoft/POIContainerExtractionTest.java | 1 +
.../parser/microsoft}/SolidworksParserTest.java | 2 +-
.../ooxml/OOXMLContainerExtractionTest.java | 2 +-
.../testsolidworksAssembly2013SP2.SLDASM | Bin
.../testsolidworksAssembly2014SP0.SLDASM | Bin
.../testsolidworksDrawing2013SP2.SLDDRW | Bin
.../testsolidworksDrawing2014SP0.SLDDRW | Bin
.../testsolidworksPart2013SP2.SLDPRT | Bin
.../testsolidworksPart2014SP0.SLDPRT | Bin
.../tika-parser-miscoffice-module/pom.xml | 27 +
.../java/org/apache/tika/parser/dbf/DBFCell.java | 2 +-
.../org/apache/tika/parser/dbf/DBFFileHeader.java | 2 +-
.../apache/tika/parser/epub/EpubContentParser.java | 2 +-
.../org/apache/tika/parser/epub/EpubParser.java | 6 +-
.../services/org.apache.tika.parser.Parser | 3 +
.../org/apache/tika/parser/dbf/DBFParserTest.java | 0
.../apache/tika/parser/epub/EpubParserTest.java | 0
.../tika/parser/ibooks/iBooksParserTest.java | 0
.../org/apache/tika/parser/epub/tika-config.xml | 0
.../test/resources/test-documents/Zamora2010.dif | 0
.../src/test/resources/test-documents/testDBF.dbf | Bin
.../resources/test-documents/testDBF_gb18030.dbf | Bin
.../test/resources/test-documents/testEPUB.epub | Bin
.../resources/test-documents/testEPUB_xml_ext.epub | Bin
.../resources/test-documents/testiBooks.ibooks | Bin
.../tika-parser-news-module/pom.xml | 23 +-
.../services/org.apache.tika.parser.Parser | 4 +-
.../apache/tika/parser/feed/FeedParserTest.java | 0
.../test/resources/test-documents/rsstest_091.rss | 0
.../test/resources/test-documents/rsstest_20.rss | 0
.../test/resources/test-documents/testATOM.atom | 0
.../org/apache/tika/parser/pkg/PackageParser.java | 1 +
.../org/apache/tika/parser/pkg/tika-config.xml | 0
.../tika-parser-scientific-module/pom.xml | 174 +
.../apache/tika/parser/envi/EnviHeaderParser.java | 2 +-
.../java/org/apache/tika/parser/hdf/HDFParser.java | 2 +-
.../org/apache/tika/parser/isatab/ISATabUtils.java | 2 +-
.../services/org.apache.tika.parser.Parser | 10 +-
.../tika/parser/envi/EnviHeaderParserTest.java | 0
.../apache/tika/parser/gdal/TestGDALParser.java | 0
.../geoinfo/GeographicInformationParserTest.java | 0
.../apache/tika/parser/grib/GribParserTest.java | 0
.../org/apache/tika/parser/hdf/HDFParserTest.java | 0
.../tika/parser/isatab/ISArchiveParserTest.java | 1 -
.../tika/parser/netcdf/NetCDFParserTest.java | 0
.../GLDAS_CLM10SUBP_3H.A19790202.0000.001.grb | Bin
.../test-documents/WFPC2u5780205r_c0fx.fits | 0
.../ang20150420t182050_corr_v1e_img.hdr | 0
.../test-documents/egyl03.gdas.200811.00Z.grb2 | Bin
.../resources/test-documents/envi_test_header.hdr | 0
.../test-documents/gdas1.forecmwf.2014062612.grib2 | Bin
.../resources/test-documents/sampleFile.iso19139 | 0
.../sresa1b_ncar_ccsm3_0_run1_200001.nc | Bin
.../src/test/resources/test-documents/test.hdf | Bin
.../src/test/resources/test-documents/test.he5 | Bin
...i-s-2_metabolite profiling_NMR spectroscopy.txt | 0
.../testISATab_BII-I-1/a_metabolome.txt | 0
.../testISATab_BII-I-1/a_microarray.txt | 0
.../testISATab_BII-I-1/a_proteome.txt | 0
.../testISATab_BII-I-1/a_transcriptome.txt | 0
.../testISATab_BII-I-1/i_investigation.txt | 0
.../testISATab_BII-I-1/s_BII-S-1.txt | 0
.../testISATab_BII-I-1/s_BII-S-2.txt | 0
.../tika-parser-text-module/pom.xml | 6 +-
.../services/org.apache.tika.parser.Parser | 2 +-
.../apache/tika/parser/strings/FileConfigTest.java | 0
.../parser/strings/Latin1StringsParserTest.java | 0
.../tika/parser/strings/StringsConfigTest.java | 0
.../tika/parser/strings/StringsParserTest.java | 0
.../test-documents/testOCTET_header.dbase3 | Bin
.../test-properties/StringsConfig-full.properties | 18 +
.../StringsConfig-partial.properties | 16 +
tika-parser-modules/tika-parser-xml-module/pom.xml | 5 +
.../detect/zip/DefaultZipContainerDetector.java | 18 +-
.../tika/detect/zip/OpenDocumentDetector.java | 20 +-
.../apache/tika/detect/zip/StarOfficeDetector.java | 19 +-
.../detect/zip/StreamingZipContainerDetector.java | 88 +
.../tika/detect/zip/ZipContainerDetector.java | 5 +-
.../services/org.apache.tika.detect.Detector | 1 +
tika-parsers/pom.xml | 948 +-
.../src/main/appended-resources/META-INF/LICENSE | 94 -
.../org/apache/tika/parser/internal/Activator.java | 55 -
.../services/org.apache.tika.detect.Detector | 19 -
.../services/org.apache.tika.parser.Parser | 79 -
.../java/org/apache/tika/TestCorruptedFiles.java | 377 -
.../apache/tika/embedder/ExternalEmbedderTest.java | 292 -
393 files changed, 40569 insertions(+), 41491 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6443f46..9f714e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
<module>tika-parent</module>
<module>tika-core</module>
<module>tika-parser-modules</module>
- <module>tika-parser-integration-tests</module>
- <module>tika-bundle</module>
+
+<!-- <module>tika-bundle</module> turn this off for now -->
<module>tika-xmp</module>
<module>tika-serialization</module>
<module>tika-batch</module>
@@ -52,6 +52,7 @@
<module>tika-java7</module>
<module>tika-eval</module>
<module>tika-advanced-parser-modules</module>
+ <module>tika-parsers</module>
</modules>
<profiles>
diff --git a/tika-advanced-parser-modules/pom.xml b/tika-advanced-parser-modules/pom.xml
index 72c6511..41409e3 100644
--- a/tika-advanced-parser-modules/pom.xml
+++ b/tika-advanced-parser-modules/pom.xml
@@ -11,7 +11,7 @@
<artifactId>tika-advanced-parser-modules</artifactId>
-
+ <packaging>pom</packaging>
<modules>
<module>tika-dl</module>
<module>tika-nlp</module>
diff --git a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml
index 6aaa9ae..5a63fa2 100644
--- a/tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml
+++ b/tika-advanced-parser-modules/tika-parser-advancedmedia-module/pom.xml
@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika-parser-modules</artifactId>
+ <artifactId>tika-advanced-parser-modules</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-parser-advancedvideo-modules</artifactId>
+ <artifactId>tika-parser-advancedmedia-module</artifactId>
<dependencies>
<dependency>
diff --git a/tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml b/tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml
index 5c13952..2528d4a 100644
--- a/tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml
+++ b/tika-advanced-parser-modules/tika-parser-nlp-module/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika-parser-modules</artifactId>
+ <artifactId>tika-advanced-parser-modules</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
similarity index 99%
rename from tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
index f936367..0a55a02 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
+++ b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/GeoParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.geo.topic;
+package org.apache.tika.parser.geo;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/JournalParserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/journal/TEITest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/journal/TEITest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/journal/TEITest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/nltk/NLTKNERecogniserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/regex/RegexNERecogniserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/sentiment/SentimentAnalysisParserTest.java
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
similarity index 99%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
index 7560ee7..9657ac1 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
+++ b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
@@ -1,3 +1,4 @@
+package org.apache.tika.parser.ner.opennlp
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/opennlp/get-models.sh
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/ner-regex.txt
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/tika-config.xml b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/ner/tika-config.xml
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml b/tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
rename to tika-advanced-parser-modules/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
diff --git a/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector b/tika-core/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
similarity index 89%
rename from tika-parsers/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
rename to tika-core/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
index f922694..2db13ee 100644
--- a/tika-parsers/src/main/resources/META-INF/services/org.apache.tika.detect.EncodingDetector
+++ b/tika-core/src/main/resources/META-INF/services/org.apache.tika.detect.Detector
@@ -13,6 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.parser.html.HtmlEncodingDetector
-UniversalEncodingDetector
-Icu4jEncodingDetector
+org.apache.tika.detect.OverrideDetector
\ No newline at end of file
diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 8442692..1b11023 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -1058,7 +1058,9 @@
<mime-type type="application/vnd.apple.installer+xml">
<glob pattern="*.mpkg"/>
</mime-type>
-
+ <mime-type type="application/vnd.apple.unknown.13">
+ <sub-class-of type="application/zip"/>
+ </mime-type>
<mime-type type="application/vnd.apple.iwork">
<sub-class-of type="application/zip"/>
</mime-type>
@@ -4199,6 +4201,8 @@
<glob pattern="*.wb1"/>
<glob pattern="*.wb2"/>
<glob pattern="*.wb3"/>
+ <!-- this is true of qp2 and wb3; not for wb2 and wb1 -->
+ <sub-class-of type="application/x-tika-msoffice"/>
</mime-type>
<mime-type type="application/x-quattro-pro;version=1-4">
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 6c1b1a6..8a147de 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -352,6 +352,13 @@
<lucene.version>8.5.1</lucene.version>
<mockito.version>3.3.3</mockito.version>
<opennlp.version>1.9.2</opennlp.version>
+ <httpcomponents.version>4.5.12</httpcomponents.version>
+ <commons.exec.version>1.3</commons.exec.version>
+ <javax.annotation.version>1.3.2</javax.annotation.version>
+ <codec.version>1.13</codec.version>
+ <json.simple.version>1.1.1</json.simple.version>
+ <openjson.version>1.0.12</openjson.version>
+
</properties>
<build>
diff --git a/tika-parsers/.gitignore b/tika-parser-modules/.gitignore
similarity index 100%
rename from tika-parsers/.gitignore
rename to tika-parser-modules/.gitignore
diff --git a/tika-parser-modules/pom.xml b/tika-parser-modules/pom.xml
index fc1dda3..cf0feff 100644
--- a/tika-parser-modules/pom.xml
+++ b/tika-parser-modules/pom.xml
@@ -35,22 +35,18 @@
<url>http://tika.apache.org/</url>
<properties>
- <codec.version>1.13</codec.version>
<jempbox.version>1.8.16</jempbox.version>
<mime4j.version>0.8.3</mime4j.version>
<pdfbox.version>2.0.20</pdfbox.version>
<jempbox.version>1.8.16</jempbox.version>
<tagsoup.version>1.2.1</tagsoup.version>
- <commons.exec.version>1.3</commons.exec.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.collections4.version>4.4</commons.collections4.version>
+ <commons.csv.version>1.8</commons.csv.version>
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
<bouncycastle.version>1.65</bouncycastle.version>
<parso.version>2.0.11</parso.version>
- <httpcomponents.version>4.5.12</httpcomponents.version>
- <openjson.version>1.0.12</openjson.version>
- <javax.annotation.version>1.3.2</javax.annotation.version>
- <json.simple.version>1.1.1</json.simple.version>
+ <vorbis.version>0.8</vorbis.version>
</properties>
<dependencies>
@@ -90,15 +86,14 @@
<module>tika-parser-pkg-module</module>
<module>tika-parser-xml-module</module>
<module>tika-parser-pdf-module</module>
- <module>tika-parser-math-module</module>
<module>tika-parser-apple-module</module>
<module>tika-parser-cad-module</module>
<module>tika-parser-mail-module</module>
<module>tika-parser-miscoffice-module</module>
<module>tika-parser-news-module</module>
- <module>tika-parser-scientific-module</module>
<module>tika-parser-db-module</module>
<module>tika-parser-crypto-module</module>
+ <module>tika-parser-scientific-module</module>
<module>tika-parser-integration-tests</module>
</modules>
diff --git a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java b/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
index 95ef375..cefc5ef 100644
--- a/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
+++ b/tika-parser-modules/tika-parser-apple-module/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
@@ -179,7 +179,6 @@ public class IWorkParserTest extends TikaTest {
// TIKA-904
@Test
public void testPagesLayoutMode() throws Exception {
- debug(getRecursiveMetadata("testPagesLayout.pages"));
String content = getText("testPagesLayout.pages");
assertContains("text box 1 - here is some text", content);
assertContains("created in a text box in layout mode", content);
diff --git a/tika-parser-modules/tika-parser-cad-module/pom.xml b/tika-parser-modules/tika-parser-cad-module/pom.xml
index 3a96b6d..f0ae940 100644
--- a/tika-parser-modules/tika-parser-cad-module/pom.xml
+++ b/tika-parser-modules/tika-parser-cad-module/pom.xml
@@ -19,4 +19,26 @@
<version>${poi.version}</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.code</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-code-module/pom.xml b/tika-parser-modules/tika-parser-code-module/pom.xml
index a2de5f1..03c93ba 100644
--- a/tika-parser-modules/tika-parser-code-module/pom.xml
+++ b/tika-parser-modules/tika-parser-code-module/pom.xml
@@ -48,6 +48,18 @@
<artifactId>asm</artifactId>
<version>8.0.1</version>
</dependency>
+
+ <dependency>
+ <groupId>com.epam</groupId>
+ <artifactId>parso</artifactId>
+ <version>${parso.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.tallison</groupId>
+ <artifactId>jmatio</artifactId>
+ <version>1.5</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/tika-parser-modules/tika-parser-math-module/src/main/java/org/apache/tika/parser/mat/MatParser.java b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/mat/MatParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/main/java/org/apache/tika/parser/mat/MatParser.java
rename to tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/mat/MatParser.java
diff --git a/tika-parser-modules/tika-parser-math-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
rename to tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parser-modules/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
index 63604e1..d15be7a 100644
--- a/tika-parser-modules/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
+++ b/tika-parser-modules/tika-parser-code-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
@@ -16,4 +16,6 @@
org.apache.tika.parser.asm.ClassParser
org.apache.tika.parser.code.SourceCodeParser
org.apache.tika.parser.executable.ExecutableParser
+org.apache.tika.parser.mat.MatParser
+org.apache.tika.parser.sas.SAS7BDATParser
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
rename to tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/executable/ExecutableParserTest.java
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
rename to tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/mat/MatParserTest.java
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
rename to tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/breidamerkurjokull_radar_profiles_2009.mat
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/test-columnar.sas.xml b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas.xml
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/test-columnar.sas.xml
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas.xml
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/test-columnar.sas7bdat b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas7bdat
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/test-columnar.sas7bdat
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test-columnar.sas7bdat
diff --git a/tika-parsers/src/test/resources/test-documents/testLinux-arm-32le b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-arm-32le
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testLinux-arm-32le
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-arm-32le
diff --git a/tika-parsers/src/test/resources/test-documents/testLinux-mips-32be b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32be
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testLinux-mips-32be
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32be
diff --git a/tika-parsers/src/test/resources/test-documents/testLinux-mips-32le b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32le
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testLinux-mips-32le
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-mips-32le
diff --git a/tika-parsers/src/test/resources/test-documents/testLinux-ppc-32be b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-ppc-32be
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testLinux-ppc-32be
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-ppc-32be
diff --git a/tika-parsers/src/test/resources/test-documents/testLinux-x86-32 b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-32
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testLinux-x86-32
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-32
diff --git a/tika-parsers/src/test/resources/test-documents/testLinux-x86-64 b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-64
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testLinux-x86-64
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testLinux-x86-64
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testMATLAB.m b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB.m
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testMATLAB.m
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB.m
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testMATLAB_barcast.m b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_barcast.m
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testMATLAB_barcast.m
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_barcast.m
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testMATLAB_wtsgaus.m
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.sas b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.sas
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.sas7bdat b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas7bdat
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.sas7bdat
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sas7bdat
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.sd2 b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sd2
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.sd2
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.sd2
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.xpt b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.xpt
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS.xpt
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS.xpt
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS2.sas b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS2.sas
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/testSAS2.sas
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testSAS2.sas
diff --git a/tika-parsers/src/test/resources/test-documents/testWindows-x86-32.exe b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testWindows-x86-32.exe
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testWindows-x86-32.exe
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/testWindows-x86-32.exe
diff --git a/tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/test_mat_text.mat b/tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test_mat_text.mat
similarity index 100%
rename from tika-parser-modules/tika-parser-math-module/src/test/resources/test-documents/test_mat_text.mat
rename to tika-parser-modules/tika-parser-code-module/src/test/resources/test-documents/test_mat_text.mat
diff --git a/tika-parser-modules/tika-parser-crypto-module/pom.xml b/tika-parser-modules/tika-parser-crypto-module/pom.xml
index bd5fc7b..0aae2a4 100644
--- a/tika-parser-modules/tika-parser-crypto-module/pom.xml
+++ b/tika-parser-modules/tika-parser-crypto-module/pom.xml
@@ -11,5 +11,38 @@
<artifactId>tika-parser-crypto-module</artifactId>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.code</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java b/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
index 372c015..631ff8d 100644
--- a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
+++ b/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
-import org.apache.commons.io.input.CloseShieldInputStream;
import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AbstractParser;
diff --git a/tika-parser-modules/tika-parser-math-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parser-modules/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 90%
copy from tika-parser-modules/tika-parser-math-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
copy to tika-parser-modules/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
index fe394ef..a4e54ab 100644
--- a/tika-parser-modules/tika-parser-math-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
+++ b/tika-parser-modules/tika-parser-crypto-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.parser.mat.MatParser
-org.apache.tika.parser.sas.SAS7BDATParser
\ No newline at end of file
+org.apache.tika.parser.crypto.Pkcs7Parser
+org.apache.tika.parser.crypto.TSDParser
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
rename to tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/Pkcs7ParserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
similarity index 90%
rename from tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
rename to tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
index 9cb594a..6253316 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
+++ b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
@@ -165,22 +165,4 @@ public class TSDParserTest extends TikaTest {
assertContains(TSDParser.class.getName(),
Arrays.asList(list.get(0).getValues("X-Parsed-By")));
}
-
- @Test
- public void testBrokenPdf() throws Exception {
- //make sure that embedded file appears in list
- //and make sure embedded exception is recorded
- List<Metadata> list = getRecursiveMetadata("testTSD_broken_pdf.tsd");
- assertEquals(2, list.size());
- assertEquals("application/pdf", list.get(1).get(Metadata.CONTENT_TYPE));
- assertNotNull(list.get(1).get(ParserUtils.EMBEDDED_EXCEPTION));
- assertContains("org.apache.pdfbox.pdmodel.PDDocument.load", list.get(1).get(ParserUtils.EMBEDDED_EXCEPTION));
- }
-
- @Test
- public void testToXML() throws Exception {
- String xml = getXML("Test4.pdf.tsd").xml;
- assertContains("Empty doc",
- xml);
- }
}
diff --git a/tika-parsers/src/test/resources/test-documents/MANIFEST.XML.TSD b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/MANIFEST.XML.TSD
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/MANIFEST.XML.TSD
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/MANIFEST.XML.TSD
diff --git a/tika-parsers/src/test/resources/test-documents/Test1.txt.tsd b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test1.txt.tsd
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/Test1.txt.tsd
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test1.txt.tsd
diff --git a/tika-parsers/src/test/resources/test-documents/Test2.txt.tsd b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test2.txt.tsd
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/Test2.txt.tsd
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test2.txt.tsd
diff --git a/tika-parsers/src/test/resources/test-documents/Test3.docx.tsd b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test3.docx.tsd
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/Test3.docx.tsd
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test3.docx.tsd
diff --git a/tika-parsers/src/test/resources/test-documents/Test4.pdf.tsd b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test4.pdf.tsd
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/Test4.pdf.tsd
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test4.pdf.tsd
diff --git a/tika-parsers/src/test/resources/test-documents/Test5.PNG.tsd b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test5.PNG.tsd
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/Test5.PNG.tsd
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/Test5.PNG.tsd
diff --git a/tika-parsers/src/test/resources/test-documents/testDetached.p7s b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testDetached.p7s
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDetached.p7s
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testDetached.p7s
diff --git a/tika-parsers/src/test/resources/test-documents/testTSD_broken_pdf.tsd b/tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testTSD_broken_pdf.tsd
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testTSD_broken_pdf.tsd
rename to tika-parser-modules/tika-parser-crypto-module/src/test/resources/test-documents/testTSD_broken_pdf.tsd
diff --git a/tika-parser-modules/tika-parser-db-module/pom.xml b/tika-parser-modules/tika-parser-db-module/pom.xml
index 3f5caa2..90d53a6 100644
--- a/tika-parser-modules/tika-parser-db-module/pom.xml
+++ b/tika-parser-modules/tika-parser-db-module/pom.xml
@@ -24,4 +24,26 @@
<version>3.31.1</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.sqlite3</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3DBParser.java b/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java
similarity index 99%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3DBParser.java
rename to tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java
index bb33ad4..a8d7e26 100644
--- a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3DBParser.java
+++ b/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3DBParser.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.sqlite;
+package org.apache.tika.parser.sqlite3;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3Parser.java b/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java
similarity index 99%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3Parser.java
rename to tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java
index 878f1ee..da35f26 100644
--- a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3Parser.java
+++ b/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3Parser.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.sqlite;
+package org.apache.tika.parser.sqlite3;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3TableReader.java b/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java
similarity index 98%
rename from tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3TableReader.java
rename to tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java
index 659b9e0..b919e34 100644
--- a/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite/SQLite3TableReader.java
+++ b/tika-parser-modules/tika-parser-db-module/src/main/java/org/apache/tika/parser/sqlite3/SQLite3TableReader.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.sqlite;
+package org.apache.tika.parser.sqlite3;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/tika-parser-modules/tika-parser-math-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-parser-modules/tika-parser-db-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
similarity index 91%
copy from tika-parser-modules/tika-parser-math-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
copy to tika-parser-modules/tika-parser-db-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
index fe394ef..790f868 100644
--- a/tika-parser-modules/tika-parser-math-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
+++ b/tika-parser-modules/tika-parser-db-module/src/main/resources/META-INF/services/org.apache.tika.parser.Parser
@@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.tika.parser.mat.MatParser
-org.apache.tika.parser.sas.SAS7BDATParser
\ No newline at end of file
+org.apache.tika.parser.sqlite3.SQLite3Parser
diff --git a/tika-parser-modules/tika-parser-db-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java b/tika-parser-modules/tika-parser-db-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
new file mode 100644
index 0000000..600a53b
--- /dev/null
+++ b/tika-parser-modules/tika-parser-db-module/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
@@ -0,0 +1,192 @@
+package org.apache.tika.parser.sqlite3;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tika.TikaTest;
+import org.apache.tika.extractor.EmbeddedResourceHandler;
+import org.apache.tika.extractor.ParserContainerExtractor;
+import org.apache.tika.io.TikaInputStream;
+import org.apache.tika.metadata.Database;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.EmptyParser;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.parser.RecursiveParserWrapper;
+import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
+import org.apache.tika.sax.BasicContentHandlerFactory;
+import org.apache.tika.sax.BodyContentHandler;
+import org.apache.tika.sax.RecursiveParserWrapperHandler;
+import org.apache.tika.sax.ToXMLContentHandler;
+import org.junit.Test;
+import org.xml.sax.ContentHandler;
+
+public class SQLite3ParserTest extends TikaTest {
+ private final static String TEST_FILE_NAME = "testSqlite3b.db";
+ private final static String TEST_FILE1 = "/test-documents/" + TEST_FILE_NAME;
+
+ //make sure that table cells and rows are properly marked to
+ //yield \t and \n at the appropriate places
+ @Test
+ public void testSpacesInBodyContentHandler() throws Exception {
+ Metadata metadata = new Metadata();
+ metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, TEST_FILE_NAME);
+ ContentHandler handler = new BodyContentHandler(-1);
+ ParseContext ctx = new ParseContext();
+ try (InputStream stream = getResourceAsStream(TEST_FILE1)) {
+ AUTO_DETECT_PARSER.parse(stream, handler, metadata, ctx);
+ }
+ String s = handler.toString();
+ assertContains("0\t2.3\t2.4\tlorem", s);
+ assertContains("tempor\n", s);
+ }
+
+ @Test
+ public void testNulls() throws Exception {
+ String xml = getXML(TEST_FILE_NAME).xml.replaceAll("\\s+", "");
+ //everything except for the first key column should be empty
+ assertContains("<tr><td>2</td><td/><td/><td/><td/><td/><td/><td/><td/><td/></tr>", xml);
+ }
+
+ //code used for creating the test file
+/*
+ private Connection getConnection(String dbFileName) throws Exception {
+ File testDirectory = new File(this.getClass().getResource("/test-documents").toURI());
+ System.out.println("Writing to: " + testDirectory.getAbsolutePath());
+ File testDB = new File(testDirectory, dbFileName);
+ Connection c = null;
+ try {
+ Class.forName("org.sqlite.JDBC");
+ c = DriverManager.getConnection("jdbc:sqlite:" + testDB.getAbsolutePath());
+ } catch ( Exception e ) {
+ System.err.println( e.getClass().getName() + ": " + e.getMessage() );
+ System.exit(0);
+ }
+ return c;
+ }
+
+ @Test
+ public void testCreateDB() throws Exception {
+ Connection c = getConnection("testSqlite3d.db");
+ Statement st = c.createStatement();
+ String sql = "DROP TABLE if exists my_table1";
+ st.execute(sql);
+ sql = "CREATE TABLE my_table1 (" +
+ "PK INT PRIMARY KEY, "+
+ "INT_COL INTEGER, "+
+ "FLOAT_COL FLOAT, " +
+ "DOUBLE_COL DOUBLE, " +
+ "CHAR_COL CHAR(30), "+
+ "VARCHAR_COL VARCHAR(30), "+
+ "BOOLEAN_COL BOOLEAN,"+
+ "DATE_COL DATE,"+
+ "TIME_STAMP_COL TIMESTAMP,"+
+ "CLOB_COL CLOB, "+
+ "BYTES_COL BYTES" +
+ ")";
+ st.execute(sql);
+ sql = "insert into my_table1 (PK, INT_COL, FLOAT_COL, DOUBLE_COL, CHAR_COL, " +
+ "VARCHAR_COL, BOOLEAN_COL, DATE_COL, TIME_STAMP_COL, CLOB_COL, BYTES_COL) " +
+ "values (?,?,?,?,?,?,?,?,?,?,?)";
+ SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ java.util.Date d = f.parse("2015-01-03 15:17:03");
+ System.out.println(d.getTime());
+ long d1Long = 1420229823000L;// 2015-01-02 15:17:03
+ long d2Long = 1420316223000L;// 2015-01-03 15:17:03
+ PreparedStatement ps = c.prepareStatement(sql);
+ ps.setInt(1, 0);
+ ps.setInt(2, 10);
+ ps.setFloat(3, 2.3f);
+ ps.setDouble(4, 2.4d);
+ ps.setString(5, "lorem");
+ ps.setString(6, "普林斯顿大学");
+ ps.setBoolean(7, true);
+ ps.setString(8, "2015-01-02");
+ ps.setString(9, "2015-01-03 15:17:03");
+// ps.setClob(10, new StringReader(sql));
+ ps.setBytes(10, getByteArray(this.getClass().getResourceAsStream("/test-documents/testWORD_1img.doc")));//contains "quick brown fox"
+ ps.executeUpdate();
+ ps.clearParameters();
+
+ ps.setInt(1, 1);
+ ps.setInt(2, 20);
+ ps.setFloat(3, 4.6f);
+ ps.setDouble(4, 4.8d);
+ ps.setString(5, "dolor");
+ ps.setString(6, "sit");
+ ps.setBoolean(7, false);
+ ps.setString(8, "2015-01-04");
+ ps.setString(9, "2015-01-03 15:17:03");
+ //ps.setClob(9, new StringReader("consectetur adipiscing elit"));
+ ps.setBytes(10, getByteArray(this.getClass().getResourceAsStream("/test-documents/testWORD_1img.docx")));//contains "The end!"
+
+ ps.executeUpdate();
+ //now add a fully null row
+ ps.clearParameters();
+ ps.setInt(1, 2);
+ ps.setNull(2, Types.INTEGER);
+ ps.setNull(3, Types.FLOAT);
+ ps.setNull(4, Types.DOUBLE);
+ ps.setNull(5, Types.CHAR);
+ ps.setNull(6, Types.VARCHAR);
+ ps.setNull(7, Types.BOOLEAN);
+ ps.setNull(8, Types.DATE);
+ ps.setNull(9, Types.TIMESTAMP);
+ ps.setNull(10, Types.BLOB);
+ ps.executeUpdate();
+
+ //build table2
+ sql = "DROP TABLE if exists my_table2";
+ st.execute(sql);
+
+ sql = "CREATE TABLE my_table2 (" +
+ "INT_COL2 INT PRIMARY KEY, "+
+ "VARCHAR_COL2 VARCHAR(64))";
+ st.execute(sql);
+ sql = "INSERT INTO my_table2 values(0,'sed, do eiusmod tempor')";
+ st.execute(sql);
+ sql = "INSERT INTO my_table2 values(1,'incididunt \nut labore')";
+ st.execute(sql);
+
+ c.close();
+ }
+
+ private byte[] getByteArray(InputStream is) throws IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ byte[] buff = new byte[1024];
+ for (int bytesRead; (bytesRead = is.read(buff)) != -1;) {
+ bos.write(buff, 0, bytesRead);
+ }
+ return bos.toByteArray();
+ }
+
+*/
+
+}
diff --git a/tika-parsers/src/test/resources/test-documents/testSQLITE3.db b/tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSQLITE3.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testSQLITE3.db
rename to tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSQLITE3.db
diff --git a/tika-parsers/src/test/resources/test-documents/testSqlite3b.db b/tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSqlite3b.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testSqlite3b.db
rename to tika-parser-modules/tika-parser-db-module/src/test/resources/test-documents/testSqlite3b.db
diff --git a/tika-parser-modules/tika-parser-digest-commons/pom.xml b/tika-parser-modules/tika-parser-digest-commons/pom.xml
index 12f5292..d1f7df2 100644
--- a/tika-parser-modules/tika-parser-digest-commons/pom.xml
+++ b/tika-parser-modules/tika-parser-digest-commons/pom.xml
@@ -11,5 +11,23 @@
<artifactId>tika-parser-digest-commons</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/tika-parser-modules/tika-parser-font-module/pom.xml b/tika-parser-modules/tika-parser-font-module/pom.xml
index a2d941d..fe6891f 100644
--- a/tika-parser-modules/tika-parser-font-module/pom.xml
+++ b/tika-parser-modules/tika-parser-font-module/pom.xml
@@ -19,4 +19,27 @@
<version>${pdfbox.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.font</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/utils/DataURISchemeParserTest.java b/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
similarity index 98%
rename from tika-parsers/src/test/java/org/apache/tika/parser/utils/DataURISchemeParserTest.java
rename to tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
index 5bca70f..10d9f1f 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/utils/DataURISchemeParserTest.java
+++ b/tika-parser-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/DataURISchemeParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.utils;
+package org.apache.tika.parser.html;
import org.apache.tika.TikaTest;
import org.apache.tika.io.IOUtils;
diff --git a/tika-parser-modules/tika-parser-integration-tests/pom.xml b/tika-parser-modules/tika-parser-integration-tests/pom.xml
index 5d2ef15..dc32735 100644
--- a/tika-parser-modules/tika-parser-integration-tests/pom.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/pom.xml
@@ -3,10 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika-parent</artifactId>
+ <artifactId>tika-parser-modules</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../tika-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,12 +33,54 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-crypto-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-db-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-digest-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-audiovideo-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-apple-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-cad-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-code-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-font-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-html-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -58,12 +99,24 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-miscoffice-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-microsoft-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-news-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-ocr-module</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -80,6 +133,20 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <!-- pkg module brings this in as provided
+ we need to bring it in literally-->
+ <dependency>
+ <groupId>com.github.luben</groupId>
+ <artifactId>zstd-jni</artifactId>
+ <version>1.4.5-4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-scientific-module</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-parser-text-module</artifactId>
@@ -102,6 +169,13 @@
<!-- include the test-documents -->
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-zip-commons</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-apple-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -109,6 +183,48 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-audiovideo-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-cad-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-code-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-crypto-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-db-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-font-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-html-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -144,6 +260,20 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-miscoffice-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-news-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-ocr-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -165,12 +295,40 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-scientific-module</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>tika-parser-text-module</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!-- Externally Maintained Parsers -->
+ <!-- TODO make sure this is included in whatever we're calling tika-parsers -->
+ <dependency>
+ <groupId>org.gagravarr</groupId>
+ <artifactId>vorbis-java-tika</artifactId>
+ <version>${vorbis.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.gagravarr</groupId>
+ <artifactId>vorbis-java-core</artifactId>
+ <version>${vorbis.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/tika-parsers/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
similarity index 86%
rename from tika-parsers/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
index 2b58191..a8809df 100644
--- a/tika-parsers/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java
@@ -25,11 +25,11 @@ import org.apache.tika.detect.CompositeDetector;
import org.apache.tika.detect.DefaultDetector;
import org.apache.tika.detect.Detector;
import org.apache.tika.detect.EmptyDetector;
+import org.apache.tika.detect.zip.DefaultZipContainerDetector;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.mbox.OutlookPSTParser;
-import org.apache.tika.parser.microsoft.POIFSContainerDetector;
-import org.apache.tika.parser.pkg.ZipContainerDetector;
+import org.apache.tika.detect.microsoft.POIFSContainerDetector;
+import org.apache.tika.parser.microsoft.pst.OutlookPSTParser;
import org.junit.Test;
/**
@@ -105,16 +105,20 @@ public class TikaDetectorConfigTest extends AbstractTikaConfigTest {
// Now check they detect PST files correctly
- TikaInputStream stream = TikaInputStream.get(
- getResourceAsFile("/test-documents/testPST.pst"));
- assertEquals(
- OutlookPSTParser.MS_OUTLOOK_PST_MIMETYPE,
- detectorWX.detect(stream, new Metadata())
- );
- assertEquals(
- OutlookPSTParser.MS_OUTLOOK_PST_MIMETYPE,
- detectorCL.detect(stream, new Metadata())
- );
+ try (TikaInputStream outer = TikaInputStream.get(
+ getResourceAsStream("/test-documents/testPST.pst"))) {
+ try (TikaInputStream stream = TikaInputStream.get(outer.getFile())) {
+
+ assertEquals(
+ OutlookPSTParser.MS_OUTLOOK_PST_MIMETYPE,
+ detectorWX.detect(stream, new Metadata())
+ );
+ assertEquals(
+ OutlookPSTParser.MS_OUTLOOK_PST_MIMETYPE,
+ detectorCL.detect(stream, new Metadata())
+ );
+ }
+ }
}
private void assertDetectors(CompositeDetector detector, boolean shouldHavePOIFS,
@@ -122,7 +126,7 @@ public class TikaDetectorConfigTest extends AbstractTikaConfigTest {
boolean hasZip = false;
boolean hasPOIFS = false;
for (Detector d : detector.getDetectors()) {
- if (d instanceof ZipContainerDetector) {
+ if (d instanceof DefaultZipContainerDetector) {
if (shouldHaveZip) {
hasZip = true;
} else {
diff --git a/tika-parsers/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
similarity index 96%
rename from tika-parsers/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
index dfbc8f7..8f83960 100644
--- a/tika-parsers/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java
@@ -22,6 +22,9 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
@@ -108,12 +111,17 @@ public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
}
Tika tika = new Tika(tikaConfig);
+ Path tmp = null;
try {
- String txt = tika.parseToString(
- getResourceAsFile("/test-documents/english.cp500.txt"));
+ tmp = Files.createTempFile("tika-encoding-test", ".txt");
+ Files.copy(getResourceAsStream("/test-documents/english.cp500.txt"), tmp,
+ StandardCopyOption.REPLACE_EXISTING);
+ String txt = tika.parseToString(tmp);
fail("can't detect w/out ICU");
} catch (TikaException e) {
assertContains("Failed to detect", e.getMessage());
+ } finally {
+ Files.delete(tmp);
}
}
diff --git a/tika-parsers/src/test/java/org/apache/tika/config/TikaParserConfigTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaParserConfigTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/config/TikaTranslatorConfigTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
similarity index 99%
rename from tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
index 18d8697..676811d 100644
--- a/tika-parsers/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/detect/TestContainerAwareDetector.java
@@ -32,6 +32,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.tika.MultiThreadedTikaTest;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
+import org.apache.tika.detect.zip.StreamingZipContainerDetector;
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
@@ -41,9 +42,9 @@ import org.apache.tika.mime.MediaTypeRegistry;
import org.apache.tika.mime.MimeTypes;
import org.apache.tika.parser.iwork.iwana.IWork13PackageParser;
import org.apache.tika.parser.iwork.iwana.IWork18PackageParser;
-import org.apache.tika.parser.pkg.StreamingZipContainerDetector;
import org.apache.tika.utils.XMLReaderUtils;
import org.junit.After;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -382,6 +383,7 @@ public class TestContainerAwareDetector extends MultiThreadedTikaTest {
}
@Test
+ @Ignore("TODO -- fix this")
public void testDetectIWork2013() throws Exception {
assertTypeByData("testKeynote2013.key",
IWork13PackageParser.IWork13DocumentType.KEYNOTE13.getType().toString());
diff --git a/tika-parsers/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/extractor/EmbeddedDocumentUtilTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypeTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/mime/MimeTypeTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypeTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/MimeTypesTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
similarity index 99%
rename from tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index 78f36da..ae425d8 100644
--- a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -20,6 +20,7 @@ package org.apache.tika.mime;
import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
+import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.junit.Before;
@@ -1250,8 +1251,8 @@ public class TestMimeTypes {
}
private void assertType(String expected, String filename) throws Exception {
- try (InputStream stream = TestMimeTypes.class.getResourceAsStream(
- "/test-documents/" + filename)) {
+ try (InputStream stream = TikaInputStream.get(TestMimeTypes.class.getResourceAsStream(
+ "/test-documents/" + filename))) {
assertNotNull("Test file not found: " + filename, stream);
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
@@ -1268,8 +1269,8 @@ public class TestMimeTypes {
private void assertTypeByData(String expected, String filename)
throws IOException {
- try (InputStream stream = TestMimeTypes.class.getResourceAsStream(
- "/test-documents/" + filename)) {
+ try (InputStream stream = TikaInputStream.get(TestMimeTypes.class.getResourceAsStream(
+ "/test-documents/" + filename))) {
assertNotNull("Test file not found: " + filename, stream);
Metadata metadata = new Metadata();
assertEquals(expected, repo.detect(stream, metadata).toString());
@@ -1302,8 +1303,8 @@ public class TestMimeTypes {
}
private MediaType getTypeByNameAndData(String filename) throws IOException {
- try (InputStream stream = TestMimeTypes.class.getResourceAsStream(
- "/test-documents/" + filename)) {
+ try (InputStream stream = TikaInputStream.get(TestMimeTypes.class.getResourceAsStream(
+ "/test-documents/" + filename))) {
assertNotNull("Test document not found: " + filename, stream);
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/AutoDetectReaderParserTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
similarity index 99%
rename from tika-parsers/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
index a255c80..3fd23e9 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
@@ -38,7 +38,7 @@ import org.apache.tika.TikaTest;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.parser.utils.BouncyCastleDigester;
+import org.apache.tika.parser.digestutils.BouncyCastleDigester;
import org.junit.Test;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
similarity index 99%
rename from tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
index 2ebaa0f..761e985 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/DigestingParserTest.java
@@ -38,7 +38,7 @@ import org.apache.tika.TikaTest;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.parser.utils.CommonsDigester;
+import org.apache.tika.parser.digestutils.CommonsDigester;
import org.junit.Test;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ParsingReaderTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
similarity index 99%
rename from tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
index 6f43255..be9f950 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
@@ -38,7 +38,7 @@ import org.apache.tika.io.ProxyInputStream;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.parser.utils.CommonsDigester;
+import org.apache.tika.parser.digestutils.CommonsDigester;
import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
import org.apache.tika.sax.BasicContentHandlerFactory;
import org.apache.tika.sax.ContentHandlerFactory;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/TabularFormatsTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TabularFormatsTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/TestParsers.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
similarity index 65%
rename from tika-parsers/src/test/java/org/apache/tika/TestParsers.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
index a30fa85..27b7841 100644
--- a/tika-parsers/src/test/java/org/apache/tika/TestParsers.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestParsers.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika;
+package org.apache.tika.parser;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -24,7 +24,10 @@ import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.InputStream;
+import org.apache.tika.MultiThreadedTikaTest;
+import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
+import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.ParseContext;
@@ -51,11 +54,13 @@ public class TestParsers extends MultiThreadedTikaTest {
@Test
public void testWORDxtraction() throws Exception {
- File file = getResourceAsFile("/test-documents/testWORD.doc");
Parser parser = tika.getParser();
Metadata metadata = new Metadata();
- try (InputStream stream = new FileInputStream(file)) {
- parser.parse(stream, new DefaultHandler(), metadata, new ParseContext());
+ try (TikaInputStream tis = TikaInputStream.get(
+ getResourceAsStream("/test-documents/testWORD.doc"))) {
+ try (InputStream stream = new FileInputStream(tis.getFile())) {
+ parser.parse(stream, new DefaultHandler(), metadata, new ParseContext());
+ }
}
assertEquals("Sample Word Document", metadata.get(TikaCoreProperties.TITLE));
}
@@ -63,14 +68,17 @@ public class TestParsers extends MultiThreadedTikaTest {
@Test
public void testEXCELExtraction() throws Exception {
final String expected = "Numbers and their Squares";
- File file = getResourceAsFile("/test-documents/testEXCEL.xls");
- String s1 = tika.parseToString(file);
- assertTrue("Text does not contain '" + expected + "'", s1
- .contains(expected));
- Parser parser = tika.getParser();
Metadata metadata = new Metadata();
- try (InputStream stream = new FileInputStream(file)) {
- parser.parse(stream, new DefaultHandler(), metadata, new ParseContext());
+ try (TikaInputStream tis =
+ TikaInputStream.get(getResourceAsStream("/test-documents/testEXCEL.xls"))) {
+ File file = tis.getFile();
+ String s1 = tika.parseToString(file);
+ assertTrue("Text does not contain '" + expected + "'", s1
+ .contains(expected));
+ Parser parser = tika.getParser();
+ try (InputStream stream = new FileInputStream(file)) {
+ parser.parse(stream, new DefaultHandler(), metadata, new ParseContext());
+ }
}
assertEquals("Simple Excel document", metadata.get(TikaCoreProperties.TITLE));
}
@@ -80,20 +88,26 @@ public class TestParsers extends MultiThreadedTikaTest {
String[] extensions =
new String[]{"ppt", "pptx", "doc", "docx", "rtf", "pdf"};
for (String extension : extensions) {
- File file = getResourceAsFile("/test-documents/testOptionalHyphen." + extension);
- String content = tika.parseToString(file);
- assertTrue("optional hyphen was not handled for '" + extension + "' file type: " + content,
- content.contains("optionalhyphen") ||
- content.contains("optional\u00adhyphen") || // soft hyphen
- content.contains("optional\u200bhyphen") || // zero width space
- content.contains("optional\u2027")); // hyphenation point
+ try (TikaInputStream tis = TikaInputStream.get(
+ getResourceAsStream("/test-documents/testOptionalHyphen." + extension))) {
+ String content = tika.parseToString(tis.getFile());
+ assertTrue("optional hyphen was not handled for '" + extension + "' file type: " + content,
+ content.contains("optionalhyphen") ||
+ content.contains("optional\u00adhyphen") || // soft hyphen
+ content.contains("optional\u200bhyphen") || // zero width space
+ content.contains("optional\u2027")); // hyphenation point
+ }
}
+
}
private void verifyComment(String extension, String fileName) throws Exception {
- File file = getResourceAsFile("/test-documents/" + fileName + "." + extension);
- String content = tika.parseToString(file);
+ String content = null;
+ try (TikaInputStream tis = TikaInputStream.get(
+ getResourceAsStream("/test-documents/" + fileName + "." + extension))) {
+ content = tika.parseToString(tis.getFile());
+ }
assertTrue(extension + ": content=" + content + " did not extract text",
content.contains("Here is some text"));
assertTrue(extension + ": content=" + content + " did not extract comment",
diff --git a/tika-parsers/src/test/java/org/apache/tika/TestXMLEntityExpansion.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
similarity index 98%
rename from tika-parsers/src/test/java/org/apache/tika/TestXMLEntityExpansion.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
index 3f74590..26593f8 100644
--- a/tika-parsers/src/test/java/org/apache/tika/TestXMLEntityExpansion.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXMLEntityExpansion.java
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika;
+package org.apache.tika.parser;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.utils.XMLReaderUtils;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
similarity index 75%
rename from tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
index eeac98a..5a08cb1 100644
--- a/tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/TestXXEInXML.java
@@ -14,15 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika;
+package org.apache.tika.parser;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.IOUtils;
+import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.parser.microsoft.OfficeParserConfig;
import org.apache.tika.sax.ToHTMLContentHandler;
import org.apache.tika.utils.XMLReaderUtils;
@@ -127,42 +126,47 @@ public class TestXXEInXML extends XMLTestBase {
}
private void _testPOIOOXMLs(String fileName) throws Exception {
- Path originalOOXML = getResourceAsFile("/test-documents/"+fileName).toPath();
- Path injected = injectZippedXMLs(originalOOXML, XXE, false);
-
- ContentHandler xhtml = new ToHTMLContentHandler();
- ParseContext parseContext = new ParseContext();
- //if the SafeContentHandler is turned off, this will throw an FNFE
- Metadata metadata = new Metadata();
- try {
- AUTO_DETECT_PARSER.parse(Files.newInputStream(injected), xhtml, metadata, parseContext);
- } catch (TikaException e) {
- Throwable cause = e.getCause();
- if (!(cause instanceof InvalidFormatException)) {
- //as of POI 4.1.x
- fail("POI should have thrown an IFE complaining about " +
- "not being able to read content types part !");
+ Path injected = null;
+ try (TikaInputStream tis =
+ TikaInputStream.get(getResourceAsStream("/test-documents/"+fileName))) {
+ Path originalOOXML = tis.getPath();
+ injected = injectZippedXMLs(originalOOXML, XXE, false);
+
+
+ ContentHandler xhtml = new ToHTMLContentHandler();
+ ParseContext parseContext = new ParseContext();
+ //if the SafeContentHandler is turned off, this will throw an FNFE
+ Metadata metadata = new Metadata();
+ try {
+ AUTO_DETECT_PARSER.parse(Files.newInputStream(injected), xhtml, metadata, parseContext);
+ } catch (TikaException e) {
+ Throwable cause = e.getCause();
+ if (!(cause instanceof InvalidFormatException)) {
+ //as of POI 4.1.x
+ fail("POI should have thrown an IFE complaining about " +
+ "not being able to read content types part !");
+ }
+ } finally {
+ Files.delete(injected);
}
- } finally {
- Files.delete(injected);
- }
-
- try {
- metadata = new Metadata();
- xhtml = new ToHTMLContentHandler();
-
- OfficeParserConfig officeParserConfig = new OfficeParserConfig();
- parseContext.set(OfficeParserConfig.class, officeParserConfig);
- officeParserConfig.setUseSAXDocxExtractor(true);
- officeParserConfig.setUseSAXPptxExtractor(true);
- injected = injectZippedXMLs(originalOOXML, XXE, true);
- AUTO_DETECT_PARSER.parse(Files.newInputStream(injected), xhtml, metadata, parseContext);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- fail("problem with SAX-based: "+fileName + ": "+ e.getMessage());
- } finally {
- Files.delete(injected);
+ try {
+ metadata = new Metadata();
+ xhtml = new ToHTMLContentHandler();
+
+ OfficeParserConfig officeParserConfig = new OfficeParserConfig();
+ parseContext.set(OfficeParserConfig.class, officeParserConfig);
+ officeParserConfig.setUseSAXDocxExtractor(true);
+ officeParserConfig.setUseSAXPptxExtractor(true);
+ injected = injectZippedXMLs(originalOOXML, XXE, true);
+
+ AUTO_DETECT_PARSER.parse(Files.newInputStream(injected), xhtml, metadata, parseContext);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ fail("problem with SAX-based: " + fileName + ": " + e.getMessage());
+ } finally {
+ Files.delete(injected);
+ }
}
}
@@ -176,9 +180,11 @@ public class TestXXEInXML extends XMLTestBase {
}
private void _testXMLInZips(String fileName) throws Exception {
- Path originalOOXML = getResourceAsFile("/test-documents/"+fileName).toPath();
- Path injected = injectZippedXMLs(originalOOXML, XXE, false);
-
+ Path injected = null;
+ try (TikaInputStream tis =
+ TikaInputStream.get(getResourceAsStream("/test-documents/"+fileName))) {
+ injected = injectZippedXMLs(tis.getPath(), XXE, false);
+ }
Parser p = AUTO_DETECT_PARSER;
ContentHandler xhtml = new ToHTMLContentHandler();
ParseContext parseContext = new ParseContext();
@@ -206,8 +212,12 @@ public class TestXXEInXML extends XMLTestBase {
//by manually turning off the SafeContentHandler in SXWPFWordExtractorDecorator's
//handlePart
public void testDocxWithIncorrectSAXConfiguration() throws Exception {
- Path originalDocx = getResourceAsFile("/test-documents/testWORD_macros.docm").toPath();
- Path injected = injectZippedXMLs(originalDocx, XXE,true);
+ Path injected = null;
+
+ try (TikaInputStream tis = TikaInputStream.get(
+ getResourceAsStream("/test-documents/testWORD_macros.docm"))) {
+ injected = injectZippedXMLs(tis.getPath(), XXE, true);
+ }
ContentHandler xhtml = new ToHTMLContentHandler();
ParseContext parseContext = new ParseContext();
diff --git a/tika-parsers/src/test/java/org/apache/tika/XMLTestBase.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
similarity index 98%
rename from tika-parsers/src/test/java/org/apache/tika/XMLTestBase.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
index aea7fa3..9d29ef4 100644
--- a/tika-parsers/src/test/java/org/apache/tika/XMLTestBase.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/XMLTestBase.java
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika;
+package org.apache.tika.parser;
+import org.apache.tika.TikaTest;
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
similarity index 97%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
index 134d21e..dfbb408 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/AppleSingleFileParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/AppleSingleFileParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.tests.apple;
+package org.apache.tika.parser.apple;
import static org.junit.Assert.assertEquals;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
similarity index 94%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
index 79f7862..619ae08 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/apple/PListParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/apple/PListParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.apple;
+package org.apache.tika.parser.apple;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
new file mode 100644
index 0000000..a383159
--- /dev/null
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
@@ -0,0 +1,31 @@
+package org.apache.tika.parser.crypto;
+
+import org.apache.tika.TikaTest;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.utils.ParserUtils;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class TSDParserTest extends TikaTest {
+ @Test
+ public void testBrokenPdf() throws Exception {
+ //make sure that embedded file appears in list
+ //and make sure embedded exception is recorded
+ List<Metadata> list = getRecursiveMetadata("testTSD_broken_pdf.tsd");
+ assertEquals(2, list.size());
+ assertEquals("application/pdf", list.get(1).get(Metadata.CONTENT_TYPE));
+ assertNotNull(list.get(1).get(ParserUtils.EMBEDDED_EXCEPTION));
+ assertContains("org.apache.pdfbox.pdmodel.PDDocument.load", list.get(1).get(ParserUtils.EMBEDDED_EXCEPTION));
+ }
+
+ @Test
+ public void testToXML() throws Exception {
+ String xml = getXML("Test4.pdf.tsd").xml;
+ assertContains("Empty doc",
+ xml);
+ }
+}
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
similarity index 98%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index cacecea..51ef541 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/html/HtmlParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.html;
+package org.apache.tika.parser.html;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
similarity index 97%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
index 061c687..4087c99 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/MboxParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/MboxParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.mail;
+package org.apache.tika.parser.mail;
import org.apache.tika.TikaTest;
import org.apache.tika.detect.TypeDetector;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
index bf9f269..ff8d7fd 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/mail/RFC822ParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.mail;
+package org.apache.tika.parser.mail;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
similarity index 96%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
index 7ebde82..5d3e0ef 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/EMFParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/EMFParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft;
+package org.apache.tika.parser.microsoft;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
similarity index 91%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
index 53bcd39..bc3fa64 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ExcelParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft;
+package org.apache.tika.parser.microsoft;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
index c01b78a..c5434f1 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/POIContainerExtractionTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft;
+package org.apache.tika.parser.microsoft;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.ContainerExtractor;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
similarity index 94%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
index 71da57e..1406a08 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/PowerPointParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/PowerPointParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft;
+package org.apache.tika.parser.microsoft;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
similarity index 98%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
index 8ebe759..db3e9b5 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/XML2003ParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/XML2003ParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft;
+package org.apache.tika.parser.microsoft;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
similarity index 97%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
index 79d9d2d..2619207 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/OOXMLParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft.ooxml;
+package org.apache.tika.parser.microsoft.ooxml;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
similarity index 95%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
index f4a26ad..ded1ede 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/ooxml/TruncatedOOXMLTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft.ooxml;
+package org.apache.tika.parser.microsoft.ooxml;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
index a8f6c96..27478d0 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/microsoft/rtf/RTFParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/microsoft/rtf/RTFParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.microsoft.rtf;
+package org.apache.tika.parser.microsoft.rtf;
import org.apache.commons.io.FilenameUtils;
import org.apache.tika.TikaTest;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
similarity index 98%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
index 27900bf..2ff3dcd 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/ocr/TesseractOCRParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.ocr;
+package org.apache.tika.parser.ocr;
-import static org.apache.tika.parser.ocr.TesseractOCRParser.getTesseractProg;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -37,8 +36,6 @@ import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.external.ExternalParser;
import org.apache.tika.parser.image.ImageParser;
-import org.apache.tika.parser.ocr.TesseractOCRConfig;
-import org.apache.tika.parser.ocr.TesseractOCRParser;
import org.apache.tika.parser.pdf.PDFParserConfig;
import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
import org.apache.tika.sax.BasicContentHandlerFactory;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
index dd0225e..a8a4132 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/odf/ODFParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.odf;
+package org.apache.tika.parser.odf;
import org.apache.tika.TikaTest;
import org.apache.tika.config.TikaConfig;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index ad9cb8e..eb87436 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pdf/PDFParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.pdf;
+package org.apache.tika.parser.pdf;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -249,7 +249,7 @@ public class PDFParserTest extends TikaTest {
@Test
public void testEmbeddedFilesInAnnotations() throws Exception {
- String xml = getXML("/testPDFFileEmbInAnnotation.pdf").xml;
+ String xml = getXML("testPDFFileEmbInAnnotation.pdf").xml;
assertTrue(xml.contains("This is a Excel"));
}
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
similarity index 95%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
index d977b64..8a20d3b 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ArParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ArParserTest.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
similarity index 93%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
index 3b03eea..6362b59 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Bzip2ParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Bzip2ParserTest.java
@@ -14,18 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
-import org.apache.tika.parser.pkg.ZipParserTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
import java.io.InputStream;
-import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
/**
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
similarity index 99%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
index ebdda9e..8e2d112 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompositeZipContainerDetectorTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompositeZipContainerDetectorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import static org.junit.Assert.assertEquals;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
similarity index 98%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
index 76050de..9e75507 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.exception.TikaMemoryLimitException;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
similarity index 98%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
index 8618f2b..b93d777 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/CompressorParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/CompressorParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.TikaTest;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
similarity index 94%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
index 58ca3f9..1fec770 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/GzipParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/GzipParserTest.java
@@ -14,18 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
-import org.apache.tika.parser.pkg.ZipParserTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
import java.io.InputStream;
-import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
/**
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
similarity index 96%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
index 66facd0..0e003cf 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/RarParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/RarParserTest.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
similarity index 98%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
index 829f7ee..180dffd 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/Seven7ParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/Seven7ParserTest.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.exception.EncryptedDocumentException;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.PasswordProvider;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
similarity index 95%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
index c523f11..c3057ea 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/TarParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/TarParserTest.java
@@ -14,11 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
-import org.apache.tika.parser.pkg.ZipParserTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
similarity index 93%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
index a3ca42c..3566f49 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZipParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
@@ -14,24 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.apache.tika.Tika;
-import org.apache.tika.exception.TikaException;
import org.apache.tika.extractor.EmbeddedDocumentExtractor;
-import org.apache.tika.io.TikaInputStream;
-import org.apache.tika.metadata.HttpHeaders;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
-import org.xml.sax.helpers.DefaultHandler;
import java.io.InputStream;
import java.util.HashSet;
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
similarity index 95%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
index f7cd7a3..40890f1 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/pkg/ZlibParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.parser.tests.pkg;
+package org.apache.tika.parser.pkg;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.pkg.AbstractPkgTest;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
similarity index 50%
rename from tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
index 9aea9a2..42bd12c 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/jdbc/SQLite3ParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/sqlite3/SQLite3ParserTest.java
@@ -1,31 +1,4 @@
-package org.apache.tika.parser.jdbc;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+package org.apache.tika.parser.sqlite3;
import org.apache.commons.io.IOUtils;
import org.apache.tika.TikaTest;
@@ -42,12 +15,21 @@ import org.apache.tika.parser.Parser;
import org.apache.tika.parser.RecursiveParserWrapper;
import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
import org.apache.tika.sax.BasicContentHandlerFactory;
-import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.RecursiveParserWrapperHandler;
import org.apache.tika.sax.ToXMLContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+
public class SQLite3ParserTest extends TikaTest {
private final static String TEST_FILE_NAME = "testSqlite3b.db";
private final static String TEST_FILE1 = "/test-documents/" + TEST_FILE_NAME;
@@ -57,62 +39,50 @@ public class SQLite3ParserTest extends TikaTest {
//test different types of input streams
//actual inputstream, memory buffered bytearray and literal file
- InputStream[] streams = new InputStream[3];
- streams[0] = getResourceAsStream(TEST_FILE1);
+ try (InputStream stream = getResourceAsStream(TEST_FILE1)) {
+ _testBasic(stream);
+ }
ByteArrayOutputStream bos = new ByteArrayOutputStream();
IOUtils.copy(getResourceAsStream(TEST_FILE1), bos);
- streams[1] = new ByteArrayInputStream(bos.toByteArray());
- streams[2] = TikaInputStream.get(getResourceAsFile(TEST_FILE1));
- int tests = 0;
- for (InputStream stream : streams) {
- Metadata metadata = new Metadata();
- metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, TEST_FILE_NAME);
- //1) getXML closes the stream
- //2) getXML runs recursively on the contents, so the embedded docs should show up
- XMLResult result = getXML(stream, AUTO_DETECT_PARSER, metadata);
- stream.close();
- String x = result.xml;
- //first table name
- assertContains("<table name=\"my_table1\"><thead><tr>\t<th>PK</th>", x);
- //non-ascii
- assertContains("<td>普林斯顿大学</td>", x);
- //boolean
- assertContains("<td>true</td>\t<td>2015-01-02</td>", x);
- //date test
- assertContains("2015-01-04", x);
- //timestamp test
- assertContains("2015-01-03 15:17:03", x);
- //first embedded doc's image tag
- assertContains("alt=\"image1.png\"", x);
- //second embedded doc's image tag
- assertContains("alt=\"A description...\"", x);
- //second table name
- assertContains("<table name=\"my_table2\"><thead><tr>\t<th>INT_COL2</th>", x);
-
- Metadata post = result.metadata;
- String[] tableNames = post.getValues(Database.TABLE_NAME);
- assertEquals(2, tableNames.length);
- assertEquals("my_table1", tableNames[0]);
- assertEquals("my_table2", tableNames[1]);
- tests++;
+ try (InputStream stream = new ByteArrayInputStream(bos.toByteArray())) {
+ _testBasic(stream);
+ }
+ try (TikaInputStream outer = TikaInputStream.get(getResourceAsStream(TEST_FILE1))) {
+ try (TikaInputStream inner = TikaInputStream.get(outer.getFile())) {
+ _testBasic(inner);
+ }
}
- assertEquals(3, tests);
}
- //make sure that table cells and rows are properly marked to
- //yield \t and \n at the appropriate places
- @Test
- public void testSpacesInBodyContentHandler() throws Exception {
+ private void _testBasic(InputStream stream) throws Exception {
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, TEST_FILE_NAME);
- ContentHandler handler = new BodyContentHandler(-1);
- ParseContext ctx = new ParseContext();
- try (InputStream stream = getResourceAsStream(TEST_FILE1)) {
- AUTO_DETECT_PARSER.parse(stream, handler, metadata, ctx);
- }
- String s = handler.toString();
- assertContains("0\t2.3\t2.4\tlorem", s);
- assertContains("tempor\n", s);
+ //1) getXML closes the stream
+ //2) getXML runs recursively on the contents, so the embedded docs should show up
+ XMLResult result = getXML(stream, AUTO_DETECT_PARSER, metadata);
+ String x = result.xml;
+ //first table name
+ assertContains("<table name=\"my_table1\"><thead><tr>\t<th>PK</th>", x);
+ //non-ascii
+ assertContains("<td>普林斯顿大学</td>", x);
+ //boolean
+ assertContains("<td>true</td>\t<td>2015-01-02</td>", x);
+ //date test
+ assertContains("2015-01-04", x);
+ //timestamp test
+ assertContains("2015-01-03 15:17:03", x);
+ //first embedded doc's image tag
+ assertContains("alt=\"image1.png\"", x);
+ //second embedded doc's image tag
+ assertContains("alt=\"A description...\"", x);
+ //second table name
+ assertContains("<table name=\"my_table2\"><thead><tr>\t<th>INT_COL2</th>", x);
+
+ Metadata post = result.metadata;
+ String[] tableNames = post.getValues(Database.TABLE_NAME);
+ assertEquals(2, tableNames.length);
+ assertEquals("my_table1", tableNames[0]);
+ assertEquals("my_table2", tableNames[1]);
}
//test what happens if the user does not want embedded docs handled
@@ -226,21 +196,16 @@ public class SQLite3ParserTest extends TikaTest {
InputStreamResettingHandler byteCopier = new InputStreamResettingHandler();
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, TEST_FILE_NAME);
- try (InputStream is = getResourceAsStream(TEST_FILE1)) {
- try (TikaInputStream tis = TikaInputStream.get(is)) {
+ try (TikaInputStream outer = TikaInputStream.get(getResourceAsStream(TEST_FILE1))) {
+ try (TikaInputStream tis = TikaInputStream.get(outer.getPath())) {
ex.extract(tis, ex, byteCopier);
- is.reset();
+ tis.reset();
}
}
assertEquals(8, byteCopier.bytes.size());
}
- @Test
- public void testNulls() throws Exception {
- String xml = getXML(TEST_FILE_NAME).xml.replaceAll("\\s+", "");
- //everything except for the first key column should be empty
- assertContains("<tr><td>2</td><td/><td/><td/><td/><td/><td/><td/><td/><td/></tr>", xml);
- }
+
public static class InputStreamResettingHandler implements EmbeddedResourceHandler {
@@ -269,118 +234,4 @@ public class SQLite3ParserTest extends TikaTest {
}
}
- //code used for creating the test file
-/*
- private Connection getConnection(String dbFileName) throws Exception {
- File testDirectory = new File(this.getClass().getResource("/test-documents").toURI());
- System.out.println("Writing to: " + testDirectory.getAbsolutePath());
- File testDB = new File(testDirectory, dbFileName);
- Connection c = null;
- try {
- Class.forName("org.sqlite.JDBC");
- c = DriverManager.getConnection("jdbc:sqlite:" + testDB.getAbsolutePath());
- } catch ( Exception e ) {
- System.err.println( e.getClass().getName() + ": " + e.getMessage() );
- System.exit(0);
- }
- return c;
- }
-
- @Test
- public void testCreateDB() throws Exception {
- Connection c = getConnection("testSqlite3d.db");
- Statement st = c.createStatement();
- String sql = "DROP TABLE if exists my_table1";
- st.execute(sql);
- sql = "CREATE TABLE my_table1 (" +
- "PK INT PRIMARY KEY, "+
- "INT_COL INTEGER, "+
- "FLOAT_COL FLOAT, " +
- "DOUBLE_COL DOUBLE, " +
- "CHAR_COL CHAR(30), "+
- "VARCHAR_COL VARCHAR(30), "+
- "BOOLEAN_COL BOOLEAN,"+
- "DATE_COL DATE,"+
- "TIME_STAMP_COL TIMESTAMP,"+
- "CLOB_COL CLOB, "+
- "BYTES_COL BYTES" +
- ")";
- st.execute(sql);
- sql = "insert into my_table1 (PK, INT_COL, FLOAT_COL, DOUBLE_COL, CHAR_COL, " +
- "VARCHAR_COL, BOOLEAN_COL, DATE_COL, TIME_STAMP_COL, CLOB_COL, BYTES_COL) " +
- "values (?,?,?,?,?,?,?,?,?,?,?)";
- SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- java.util.Date d = f.parse("2015-01-03 15:17:03");
- System.out.println(d.getTime());
- long d1Long = 1420229823000L;// 2015-01-02 15:17:03
- long d2Long = 1420316223000L;// 2015-01-03 15:17:03
- PreparedStatement ps = c.prepareStatement(sql);
- ps.setInt(1, 0);
- ps.setInt(2, 10);
- ps.setFloat(3, 2.3f);
- ps.setDouble(4, 2.4d);
- ps.setString(5, "lorem");
- ps.setString(6, "普林斯顿大学");
- ps.setBoolean(7, true);
- ps.setString(8, "2015-01-02");
- ps.setString(9, "2015-01-03 15:17:03");
-// ps.setClob(10, new StringReader(sql));
- ps.setBytes(10, getByteArray(this.getClass().getResourceAsStream("/test-documents/testWORD_1img.doc")));//contains "quick brown fox"
- ps.executeUpdate();
- ps.clearParameters();
-
- ps.setInt(1, 1);
- ps.setInt(2, 20);
- ps.setFloat(3, 4.6f);
- ps.setDouble(4, 4.8d);
- ps.setString(5, "dolor");
- ps.setString(6, "sit");
- ps.setBoolean(7, false);
- ps.setString(8, "2015-01-04");
- ps.setString(9, "2015-01-03 15:17:03");
- //ps.setClob(9, new StringReader("consectetur adipiscing elit"));
- ps.setBytes(10, getByteArray(this.getClass().getResourceAsStream("/test-documents/testWORD_1img.docx")));//contains "The end!"
-
- ps.executeUpdate();
- //now add a fully null row
- ps.clearParameters();
- ps.setInt(1, 2);
- ps.setNull(2, Types.INTEGER);
- ps.setNull(3, Types.FLOAT);
- ps.setNull(4, Types.DOUBLE);
- ps.setNull(5, Types.CHAR);
- ps.setNull(6, Types.VARCHAR);
- ps.setNull(7, Types.BOOLEAN);
- ps.setNull(8, Types.DATE);
- ps.setNull(9, Types.TIMESTAMP);
- ps.setNull(10, Types.BLOB);
- ps.executeUpdate();
-
- //build table2
- sql = "DROP TABLE if exists my_table2";
- st.execute(sql);
-
- sql = "CREATE TABLE my_table2 (" +
- "INT_COL2 INT PRIMARY KEY, "+
- "VARCHAR_COL2 VARCHAR(64))";
- st.execute(sql);
- sql = "INSERT INTO my_table2 values(0,'sed, do eiusmod tempor')";
- st.execute(sql);
- sql = "INSERT INTO my_table2 values(1,'incididunt \nut labore')";
- st.execute(sql);
-
- c.close();
- }
-
- private byte[] getByteArray(InputStream is) throws IOException {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- byte[] buff = new byte[1024];
- for (int bytesRead; (bytesRead = is.read(buff)) != -1;) {
- bos.write(buff, 0, bytesRead);
- }
- return bos.toByteArray();
- }
-
-*/
-
}
diff --git a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
similarity index 95%
rename from tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
index 925bd05..d19422c 100644
--- a/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/tests/xml/FictionBookParserTest.java
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.tika.parser.tests.xml;
+package org.apache.tika.parser.xml;
import org.apache.tika.TikaTest;
import org.apache.tika.extractor.ContainerExtractor;
diff --git a/tika-parsers/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/sax/StandardsExtractingContentHandlerTest.java
diff --git a/tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java b/tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
similarity index 100%
rename from tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
rename to tika-parser-modules/tika-parser-integration-tests/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
diff --git a/tika-parsers/src/test/resources/log4j.properties b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/log4j.properties
similarity index 100%
rename from tika-parsers/src/test/resources/log4j.properties
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/log4j.properties
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-exclude.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1558-excludesub.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
similarity index 88%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
index 8247c3f..e59af56 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-detector-exclude.xml
@@ -21,8 +21,8 @@
<detectors>
<!-- All detectors except built-in container ones -->
<detector class="org.apache.tika.detect.DefaultDetector">
- <detector-exclude class="ZipContainerDetector"/>
- <detector-exclude class="org.apache.tika.parser.microsoft.POIFSContainerDetector"/>
+ <detector-exclude class="org.apache.tika.detect.zip.DefaultZipContainerDetector"/>
+ <detector-exclude class="org.apache.tika.detect.microsoft.POIFSContainerDetector"/>
</detector>
<!-- One other detector, to check ordering -->
<detector class="org.apache.tika.detect.EmptyDetector">
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-default.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty-default.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1702-translator-empty.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
similarity index 94%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
index b4d8118..48901e6 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-composite.xml
@@ -18,7 +18,7 @@
<properties>
<parsers/>
<detectors>
- <detector class="org.apache.tika.parser.microsoft.POIFSContainerDetector"/>
+ <detector class="org.apache.tika.detect.microsoft.POIFSContainerDetector"/>
<detector class="org.apache.tika.mime.MimeTypes"/>
</detectors>
<translator class="org.apache.tika.language.translate.DefaultTranslator"/>
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
similarity index 92%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
index 616bead..7358c37 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
@@ -19,7 +19,7 @@
<parsers/>
<detectors>
<detector class="org.apache.tika.detect.DefaultDetector">
- <detector-exclude class="ZipContainerDetector"/>
+ <detector-exclude class="org.apache.tika.detect.zip.DefaultZipContainerDetector"/>
</detector>
</detectors>
<translator class="org.apache.tika.language.translate.DefaultTranslator"/>
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
similarity index 83%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
index 8fdee5e..6f70448 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-encoding-detector-outside-static-init.xml
@@ -20,15 +20,15 @@
and confirm that correct charset detector was added -->
<parsers>
<parser class="org.apache.tika.parser.DefaultParser">
- <parser-exclude class="TXTParser"/>
+ <parser-exclude class="org.apache.tika.parser.txt.TXTParser"/>
</parser>
- <parser class="TXTParser">
+ <parser class="org.apache.tika.parser.txt.TXTParser">
</parser>
</parsers>
<encodingDetectors>
<!-- All detectors except Icu4jEncodingDetector-->
<encodingDetector class="org.apache.tika.detect.DefaultEncodingDetector">
- <encodingDetector-exclude class="Icu4jEncodingDetector"/>
+ <encodingDetector-exclude class="org.apache.tika.parser.txt.Icu4jEncodingDetector"/>
</encodingDetector>
</encodingDetectors>
</properties>
\ No newline at end of file
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-exclude-encoding-detector-default.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
similarity index 91%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
index 9cc55a1..a0ec343 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-no-icu4j-encoding-detector.xml
@@ -21,7 +21,7 @@
<encodingDetectors>
<!-- All detectors except Icu4jEncodingDetector-->
<encodingDetector class="org.apache.tika.detect.DefaultEncodingDetector">
- <encodingDetector-exclude class="Icu4jEncodingDetector"/>
+ <encodingDetector-exclude class="org.apache.tika.parser.txt.Icu4jEncodingDetector"/>
</encodingDetector>
</encodingDetectors>
</properties>
\ No newline at end of file
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params-bad-charset.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-non-detecting-params.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
similarity index 92%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
index 379598f..3e5c936 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2273-parameterize-encoding-detector.xml
@@ -20,7 +20,7 @@
<parsers/>
<encodingDetectors>
<!-- One other detector, to check ordering -->
- <encodingDetector class="Icu4jEncodingDetector">
+ <encodingDetector class="org.apache.tika.parser.txt.Icu4jEncodingDetector">
<params>
<param name="stripMarkup" type="bool">true</param>
</params>
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
similarity index 88%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
index ee72015..7ff326d 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-2485-encoding-detector-mark-limits.xml
@@ -24,12 +24,12 @@
<param name="markLimit" type="int">64000</param>
</params>
</encodingDetector>
- <encodingDetector class="UniversalEncodingDetector">
+ <encodingDetector class="org.apache.tika.parser.txt.UniversalEncodingDetector">
<params>
<param name="markLimit" type="int">64001</param>
</params>
</encodingDetector>
- <encodingDetector class="Icu4jEncodingDetector">
+ <encodingDetector class="org.apache.tika.parser.txt.Icu4jEncodingDetector">
<params>
<param name="markLimit" type="int">64002</param>
</params>
diff --git a/tika-parsers/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
similarity index 100%
rename from tika-parsers/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/epub/tika-config.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
similarity index 69%
copy from tika-parsers/src/test/resources/org/apache/tika/parser/epub/tika-config.xml
copy to tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
index 5dbd625..a448d1d 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/parser/epub/tika-config.xml
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
@@ -17,9 +17,15 @@
-->
<properties>
<parsers>
- <parser class="org.apache.tika.parser.epub.EpubParser">
+ <parser class="org.apache.tika.parser.DefaultParser"/>
+ <parser class="org.apache.tika.parser.odf.OpenDocumentParser">
<params>
- <param name="streaming" type="bool">true</param>
+ <param name="extractMacros" type="bool">true</param>
+ </params>
+ </parser>
+ <parser class="org.apache.tika.parser.odf.FlatOpenDocumentParser">
+ <params>
+ <param name="extractMacros" type="bool">true</param>
</params>
</parser>
</parsers>
diff --git a/tika-parsers/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/CVLKRA-KYC_Download_File_Structure_V3.1.xlsx
diff --git a/tika-parsers/src/test/resources/test-documents/NUTCH-1997.cbor b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/NUTCH-1997.cbor
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/NUTCH-1997.cbor
diff --git a/tika-parsers/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/active_layer_arcss_grid_barrow_alaska_2012.dif
diff --git a/tika-parsers/src/test/resources/test-documents/baseball.gif b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/baseball.gif
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.gif
diff --git a/tika-parsers/src/test/resources/test-documents/baseball.jpg b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/baseball.jpg
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.jpg
diff --git a/tika-parsers/src/test/resources/test-documents/baseball.png b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/baseball.png
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/baseball.png
diff --git a/tika-parsers/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/carbon_isotopic_values_of_alkanes_extracted_from_paleosols.dif
diff --git a/tika-parsers/src/test/resources/test-documents/mock/embedded_then_npe.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/embedded_then_npe.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/embedded_then_npe.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/example.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/example.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/example.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/fake_oom.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/fake_oom.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/fake_oom.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/heavy_hang.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/heavy_hang.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/heavy_hang.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/nothing_bad.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/nothing_bad.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/nothing_bad.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/null_pointer.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/null_pointer.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/null_pointer_no_msg.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/null_pointer_no_msg.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/real_oom.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/real_oom.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/real_oom.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/sleep.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/sleep.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/sleep_interruptible.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/sleep_interruptible.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_interruptible.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/sleep_not_interruptible.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/sleep_not_interruptible.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/system_exit.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/system_exit.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/system_exit.xml
diff --git a/tika-parsers/src/test/resources/test-documents/mock/thread_interrupt.xml b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/mock/thread_interrupt.xml
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/mock/thread_interrupt.xml
diff --git a/tika-parsers/src/test/resources/test-documents/test-columnar.csv b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
similarity index 98%
rename from tika-parsers/src/test/resources/test-documents/test-columnar.csv
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
index 5ef57bb..b786419 100644
--- a/tika-parsers/src/test/resources/test-documents/test-columnar.csv
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.csv
@@ -1,12 +1,12 @@
-"Record Number","Square of the Record Number","Description of the Row","Percent Done","Percent Increment","date","datetime","time"
-0,0,This is row 0 of 10,0%,M,01-01-1960,01JAN60:00:00:01,0:00:01
-1,1,This is row 1 of 10,10%,0.0%,02-01-1960,01JAN60:00:00:10,0:00:03
-2,4,This is row 2 of 10,20%,50.0%,17-01-1960,01JAN60:00:01:40,0:00:09
-3,9,This is row 3 of 10,30%,66.7%,22-03-1960,01JAN60:00:16:40,0:00:27
-4,16,This is row 4 of 10,40%,75.0%,13-09-1960,01JAN60:02:46:40,0:01:21
-5,25,This is row 5 of 10,50%,80.0%,17-09-1961,02JAN60:03:46:40,0:04:03
-6,36,This is row 6 of 10,60%,83.3%,20-07-1963,12JAN60:13:46:40,0:12:09
-7,49,This is row 7 of 10,70%,85.7%,29-07-1966,25APR60:17:46:40,0:36:27
-8,64,This is row 8 of 10,80%,87.5%,20-03-1971,03MAR63:09:46:40,1:49:21
-9,81,This is row 9 of 10,90%,88.9%,18-12-1977,09SEP91:01:46:40,5:28:03
-10,100,This is row 10 of 10,100%,90.0%,19-05-1987,19NOV76:17:46:40,16:24:09
+"Record Number","Square of the Record Number","Description of the Row","Percent Done","Percent Increment","date","datetime","time"
+0,0,This is row 0 of 10,0%,M,01-01-1960,01JAN60:00:00:01,0:00:01
+1,1,This is row 1 of 10,10%,0.0%,02-01-1960,01JAN60:00:00:10,0:00:03
+2,4,This is row 2 of 10,20%,50.0%,17-01-1960,01JAN60:00:01:40,0:00:09
+3,9,This is row 3 of 10,30%,66.7%,22-03-1960,01JAN60:00:16:40,0:00:27
+4,16,This is row 4 of 10,40%,75.0%,13-09-1960,01JAN60:02:46:40,0:01:21
+5,25,This is row 5 of 10,50%,80.0%,17-09-1961,02JAN60:03:46:40,0:04:03
+6,36,This is row 6 of 10,60%,83.3%,20-07-1963,12JAN60:13:46:40,0:12:09
+7,49,This is row 7 of 10,70%,85.7%,29-07-1966,25APR60:17:46:40,0:36:27
+8,64,This is row 8 of 10,80%,87.5%,20-03-1971,03MAR63:09:46:40,1:49:21
+9,81,This is row 9 of 10,90%,88.9%,18-12-1977,09SEP91:01:46:40,5:28:03
+10,100,This is row 10 of 10,100%,90.0%,19-05-1987,19NOV76:17:46:40,16:24:09
diff --git a/tika-parsers/src/test/resources/test-documents/test-columnar.ods b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/test-columnar.ods
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.ods
diff --git a/tika-parsers/src/test/resources/test-documents/test-columnar.xpt b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/test-columnar.xpt
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test-columnar.xpt
diff --git a/tika-parsers/src/test/resources/test-documents/test1.swf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/test1.swf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test1.swf
diff --git a/tika-parsers/src/test/resources/test-documents/test2.swf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/test2.swf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test2.swf
diff --git a/tika-parsers/src/test/resources/test-documents/test3.swf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/test3.swf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/test3.swf
diff --git a/tika-parsers/src/test/resources/test-documents/testAC3.ac3 b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testAC3.ac3
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAC3.ac3
diff --git a/tika-parsers/src/test/resources/test-documents/testAMR-WB.amr b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testAMR-WB.amr
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR-WB.amr
diff --git a/tika-parsers/src/test/resources/test-documents/testAMR.amr b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testAMR.amr
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAMR.amr
diff --git a/tika-parsers/src/test/resources/test-documents/testAPK.apk b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testAPK.apk
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testAPK.apk
diff --git a/tika-parsers/src/test/resources/test-documents/testASF.asf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testASF.asf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASF.asf
diff --git a/tika-parsers/src/test/resources/test-documents/testASiCE.asice b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testASiCE.asice
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCE.asice
diff --git a/tika-parsers/src/test/resources/test-documents/testASiCS.asics b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testASiCS.asics
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testASiCS.asics
diff --git a/tika-parsers/src/test/resources/test-documents/testBAT.bat b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBAT.bat
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBAT.bat
diff --git a/tika-parsers/src/test/resources/test-documents/testBATUpper.bat b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBATUpper.bat
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBATUpper.bat
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_btree_2.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_btree_2.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_2.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_btree_3.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_btree_3.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_3.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_btree_4.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_btree_4.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_4.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_btree_5.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_btree_5.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_btree_5.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_hash_2.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_hash_2.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_2.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_hash_3.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_hash_3.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_3.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_hash_4.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_hash_4.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_4.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBDB_hash_5.db b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBDB_hash_5.db
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBDB_hash_5.db
diff --git a/tika-parsers/src/test/resources/test-documents/testBIBTEX.bib b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testBIBTEX.bib
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBIBTEX.bib
diff --git a/tika-parsers/src/test/resources/test-documents/testBMPfp.txt b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
similarity index 99%
rename from tika-parsers/src/test/resources/test-documents/testBMPfp.txt
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
index b0f1a68..1da2966 100644
--- a/tika-parsers/src/test/resources/test-documents/testBMPfp.txt
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testBMPfp.txt
@@ -1,3 +1,3 @@
-BMW to Make Hybrid Sports Car
- By CHRISTOPH RAUWALD .
-LEIPZIG, Germany—German car maker BMW AG said Friday it will start series production of a new plug-in hybrid sports car in 2013, to be based on the Vision EfficientDynamics Concept car shown at the Frankfurt auto show in September last year. Chief Executive Norbert Reithofer said the car will be produced in Germany but didn't provide details on the price. The BMW Vision EfficientDynamics Concept car is a sporty plug-in, full hybrid with a turbo-diesel engine, four seats and upward-pivoti [...]
+BMW to Make Hybrid Sports Car
+ By CHRISTOPH RAUWALD .
+LEIPZIG, Germany—German car maker BMW AG said Friday it will start series production of a new plug-in hybrid sports car in 2013, to be based on the Vision EfficientDynamics Concept car shown at the Frankfurt auto show in September last year. Chief Executive Norbert Reithofer said the car will be produced in Germany but didn't provide details on the price. The BMW Vision EfficientDynamics Concept car is a sporty plug-in, full hybrid with a turbo-diesel engine, four seats and upward-pivoti [...]
diff --git a/tika-parsers/src/test/resources/test-documents/testCOREL.shw b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testCOREL.shw
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCOREL.shw
diff --git a/tika-parsers/src/test/resources/test-documents/testCSS.css b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testCSS.css
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSS.css
diff --git a/tika-parsers/src/test/resources/test-documents/testCSV.csv b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testCSV.csv
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testCSV.csv
diff --git a/tika-parsers/src/test/resources/test-documents/testComment.pdf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testComment.pdf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testComment.pdf
diff --git a/tika-parsers/src/test/resources/test-documents/testDCX.dcx b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDCX.dcx
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDCX.dcx
diff --git a/tika-parsers/src/test/resources/test-documents/testDITA.dita b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDITA.dita
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.dita
diff --git a/tika-parsers/src/test/resources/test-documents/testDITA.ditamap b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDITA.ditamap
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA.ditamap
diff --git a/tika-parsers/src/test/resources/test-documents/testDITA2.dita b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDITA2.dita
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDITA2.dita
diff --git a/tika-parsers/src/test/resources/test-documents/testDJVU.djvu b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDJVU.djvu
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDJVU.djvu
diff --git a/tika-parsers/src/test/resources/test-documents/testDWF2010.dwf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf
similarity index 100%
rename from tika-parsers/src/test/resources/test-documents/testDWF2010.dwf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDWF2010.dwf
diff --git a/tika-parsers/src/test/resources/test-documents/testDXF_ascii.dxf b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
similarity index 83%
rename from tika-parsers/src/test/resources/test-documents/testDXF_ascii.dxf
rename to tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
index 1267876..20e17cd 100644
--- a/tika-parsers/src/test/resources/test-documents/testDXF_ascii.dxf
+++ b/tika-parser-modules/tika-parser-integration-tests/src/test/resources/test-documents/testDXF_ascii.dxf
@@ -1,37354 +1,37354 @@
- 0
-SECTION
- 2
-HEADER
- 9
-$ACADVER
- 1
-AC1009
- 0
-ENDSEC
- 0
-SECTION
- 2
-ENTITIES
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- -2.5400
- 20
- 2.5400
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-347.2180
- 20
- 2.5400
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-347.2180
- 20
-212.3440
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- -2.5400
- 20
-212.3440
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 0.0000
- 20
- 5.0800
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-344.6780
- 20
- 5.0800
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-344.6780
- 20
-209.8040
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 0.0000
- 20
-209.8040
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 72.8980
- 20
- 5.0800
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 72.8980
- 20
- 2.5400
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 72.8980
- 20
-209.8040
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 72.8980
- 20
-212.3440
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-140.7160
- 20
- 5.0800
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-140.7160
- 20
- 2.5400
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-140.7160
- 20
-209.8040
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-140.7160
- 20
-212.3440
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-208.5340
- 20
- 5.0800
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-208.5340
- 20
- 2.5400
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-208.5340
- 20
-209.8040
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-208.5340
- 20
-212.3440
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-276.3520
- 20
- 5.0800
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-276.3520
- 20
- 2.5400
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-276.3520
- 20
-209.8040
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-276.3520
- 20
-212.3440
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-TEXT
- 8
-TITLE
- 10
- 38.8620
- 20
- 3.0480
- 30
-0.0
- 40
- 1.2700
- 1
-5
- 0
-TEXT
- 8
-TITLE
- 10
- 38.8620
- 20
-210.3120
- 30
-0.0
- 40
- 1.2700
- 1
-5
- 0
-TEXT
- 8
-TITLE
- 10
-106.6800
- 20
- 3.0480
- 30
-0.0
- 40
- 1.2700
- 1
-4
- 0
-TEXT
- 8
-TITLE
- 10
-106.6800
- 20
-210.3120
- 30
-0.0
- 40
- 1.2700
- 1
-4
- 0
-TEXT
- 8
-TITLE
- 10
-174.4980
- 20
- 3.0480
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-TEXT
- 8
-TITLE
- 10
-174.4980
- 20
-210.3120
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-TEXT
- 8
-TITLE
- 10
-242.3160
- 20
- 3.0480
- 30
-0.0
- 40
- 1.2700
- 1
-2
- 0
-TEXT
- 8
-TITLE
- 10
-242.3160
- 20
-210.3120
- 30
-0.0
- 40
- 1.2700
- 1
-2
- 0
-TEXT
- 8
-TITLE
- 10
-310.1340
- 20
- 3.0480
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-TEXT
- 8
-TITLE
- 10
-310.1340
- 20
-210.3120
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- -2.5400
- 20
-154.9400
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 0.0000
- 20
-154.9400
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-344.6780
- 20
-154.9400
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-347.2180
- 20
-154.9400
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-SOLID
- 8
-TITLE
- 10
- 0.0000
- 20
-105.1560
- 30
-0.0
- 11
- -1.2700
- 21
-105.6640
- 31
-0.0
- 12
- -1.2700
- 22
-104.6480
- 32
-0.0
- 13
- -1.2700
- 23
-105.1560
- 33
-0.0
- 0
-SOLID
- 8
-TITLE
- 10
-344.6780
- 20
-105.1560
- 30
-0.0
- 11
-345.9480
- 21
-105.6640
- 31
-0.0
- 12
-345.9480
- 22
-104.6480
- 32
-0.0
- 13
-345.9480
- 23
-105.1560
- 33
-0.0
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- -2.5400
- 20
-105.1560
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 0.0000
- 20
-105.1560
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-344.6780
- 20
-105.1560
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-347.2180
- 20
-105.1560
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-SOLID
- 8
-TITLE
- 10
- 0.0000
- 20
-105.1560
- 30
-0.0
- 11
- -1.2700
- 21
-105.6640
- 31
-0.0
- 12
- -1.2700
- 22
-104.6480
- 32
-0.0
- 13
- -1.2700
- 23
-105.1560
- 33
-0.0
- 0
-SOLID
- 8
-TITLE
- 10
-344.6780
- 20
-105.1560
- 30
-0.0
- 11
-345.9480
- 21
-105.6640
- 31
-0.0
- 12
-345.9480
- 22
-104.6480
- 32
-0.0
- 13
-345.9480
- 23
-105.1560
- 33
-0.0
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- -2.5400
- 20
- 55.3720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
- 0.0000
- 20
- 55.3720
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-344.6780
- 20
- 55.3720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-347.2180
- 20
- 55.3720
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-SOLID
- 8
-TITLE
- 10
- 0.0000
- 20
-105.1560
- 30
-0.0
- 11
- -1.2700
- 21
-105.6640
- 31
-0.0
- 12
- -1.2700
- 22
-104.6480
- 32
-0.0
- 13
- -1.2700
- 23
-105.1560
- 33
-0.0
- 0
-SOLID
- 8
-TITLE
- 10
-344.6780
- 20
-105.1560
- 30
-0.0
- 11
-345.9480
- 21
-105.6640
- 31
-0.0
- 12
-345.9480
- 22
-104.6480
- 32
-0.0
- 13
-345.9480
- 23
-105.1560
- 33
-0.0
- 0
-TEXT
- 8
-TITLE
- 10
- -2.0320
- 20
-179.8320
- 30
-0.0
- 40
- 1.2700
- 1
-D
- 0
-TEXT
- 8
-TITLE
- 10
-345.1860
- 20
-179.8320
- 30
-0.0
- 40
- 1.2700
- 1
-D
- 0
-TEXT
- 8
-TITLE
- 10
- -2.0320
- 20
-130.0480
- 30
-0.0
- 40
- 1.2700
- 1
-C
- 0
-TEXT
- 8
-TITLE
- 10
-345.1860
- 20
-130.0480
- 30
-0.0
- 40
- 1.2700
- 1
-C
- 0
-TEXT
- 8
-TITLE
- 10
- -2.0320
- 20
- 80.2640
- 30
-0.0
- 40
- 1.2700
- 1
-B
- 0
-TEXT
- 8
-TITLE
- 10
-345.1860
- 20
- 80.2640
- 30
-0.0
- 40
- 1.2700
- 1
-B
- 0
-TEXT
- 8
-TITLE
- 10
- -2.0320
- 20
- 30.4800
- 30
-0.0
- 40
- 1.2700
- 1
-A
- 0
-TEXT
- 8
-TITLE
- 10
-345.1860
- 20
- 30.4800
- 30
-0.0
- 40
- 1.2700
- 1
-A
- 0
-TEXT
- 8
-TITLE
- 10
-261.3660
- 20
- 13.3963
- 30
-0.0
- 40
- 1.3057
- 1
-<Doc>
- 0
-TEXT
- 8
-TITLE
- 10
-327.4060
- 20
- 13.3963
- 30
-0.0
- 40
- 1.3057
- 1
-<RevCode>
- 0
-TEXT
- 8
-TITLE
- 10
-266.4460
- 20
- 21.0163
- 30
-0.0
- 40
- 1.3057
- 1
-Power supply for LIPCA ROBOT - Biorobotics Lab
- 0
-TEXT
- 8
-TITLE
- 10
-253.7460
- 20
- 13.3963
- 30
-0.0
- 40
- 1.3057
- 1
-Custom
- 0
-TEXT
- 8
-TITLE
- 10
-314.7060
- 20
- 8.3163
- 30
-0.0
- 40
- 1.3057
- 1
-1
- 0
-TEXT
- 8
-TITLE
- 10
-329.9460
- 20
- 8.3163
- 30
-0.0
- 40
- 1.3057
- 1
-2
- 0
-TEXT
- 8
-TITLE
- 10
-264.4140
- 20
- 8.3163
- 30
-0.0
- 40
- 1.3057
- 1
-Saturday, October 08, 2011
- 0
-TEXT
- 8
-PARTTEXT
- 10
-251.2060
- 20
- 23.5563
- 30
-0.0
- 40
- 1.3057
- 1
-Title
- 0
-TEXT
- 8
-PARTTEXT
- 10
-251.2060
- 20
- 15.9363
- 30
-0.0
- 40
- 1.3057
- 1
-Size
- 0
-TEXT
- 8
-PARTTEXT
- 10
-261.3660
- 20
- 15.9363
- 30
-0.0
- 40
- 1.3057
- 1
-Document Number
- 0
-TEXT
- 8
-PARTTEXT
- 10
-335.0260
- 20
- 15.9363
- 30
-0.0
- 40
- 1.3057
- 1
-Rev
- 0
-TEXT
- 8
-PARTTEXT
- 10
-251.2060
- 20
- 8.3163
- 30
-0.0
- 40
- 1.3057
- 1
-Date:
- 0
-TEXT
- 8
-PARTTEXT
- 10
-302.0060
- 20
- 8.3163
- 30
-0.0
- 40
- 1.3057
- 1
-Sheet
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 29.9720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 29.9720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 24.8920
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 24.8920
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 24.8920
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 24.8920
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 17.2720
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-258.8260
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-258.8260
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 9.6520
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-258.8260
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-335.0260
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-335.0260
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-258.8260
- 20
- 9.6520
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-335.0260
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 17.2720
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-335.0260
- 20
- 9.6520
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-302.0060
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-302.0060
- 20
- 7.1120
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-251.2060
- 20
- 7.1120
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-POLYLINE
- 8
-TITLE
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-302.0060
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 9.6520
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-342.6460
- 20
- 7.1120
- 30
-0.0
- 0
-VERTEX
- 8
-TITLE
- 10
-302.0060
- 20
- 7.1120
- 30
-0.0
- 0
-SEQEND
- 8
-TITLE
- 0
-TEXT
- 8
-PARTTEXT
- 10
-322.3260
- 20
- 8.3163
- 30
-0.0
- 40
- 1.3057
- 1
-of
- 0
-TEXT
- 8
-PARTTEXT
- 10
- 48.0060
- 20
-165.7963
- 30
-0.0
- 40
- 1.3057
- 1
-U21
- 0
-TEXT
- 8
-PARTTEXT
- 10
- 48.0060
- 20
-137.8563
- 30
-0.0
- 40
- 1.3057
- 1
-ACCEL
- 0
-LINE
- 8
-PARTS
- 10
- 40.3860
- 20
-149.3520
- 30
-0.0
- 11
- 48.0060
- 21
-149.3520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 50.2920
- 20
-148.7170
- 30
-0.0
- 40
- 1.2700
- 1
-/SLP
- 0
-TEXT
- 8
-PARTS
- 10
- 45.4660
- 20
-150.1140
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-LINE
- 8
-PARTS
- 10
- 40.3860
- 20
-144.2720
- 30
-0.0
- 11
- 48.0060
- 21
-144.2720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 50.2920
- 20
-143.6370
- 30
-0.0
- 40
- 1.2700
- 1
-GND
- 0
-TEXT
- 8
-PARTS
- 10
- 45.4660
- 20
-145.0340
- 30
-0.0
- 40
- 1.2700
- 1
-4
- 0
-LINE
- 8
-PARTS
- 10
- 83.5660
- 20
-159.5120
- 30
-0.0
- 11
- 75.9460
- 21
-159.5120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 70.6120
- 20
-158.8770
- 30
-0.0
- 40
- 1.2700
- 1
-VCC
- 0
-TEXT
- 8
-PARTS
- 10
- 77.4700
- 20
-160.2740
- 30
-0.0
- 40
- 1.2700
- 1
-8
- 0
-LINE
- 8
-PARTS
- 10
- 40.3860
- 20
-159.5120
- 30
-0.0
- 11
- 48.0060
- 21
-159.5120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 50.2920
- 20
-158.8770
- 30
-0.0
- 40
- 1.2700
- 1
-gSelect1
- 0
-TEXT
- 8
-PARTS
- 10
- 45.4660
- 20
-160.2740
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-LINE
- 8
-PARTS
- 10
- 83.5660
- 20
-144.2720
- 30
-0.0
- 11
- 75.9460
- 21
-144.2720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 68.5800
- 20
-143.6370
- 30
-0.0
- 40
- 1.2700
- 1
-Z-out
- 0
-TEXT
- 8
-PARTS
- 10
- 77.4700
- 20
-145.0340
- 30
-0.0
- 40
- 1.2700
- 1
-5
- 0
-LINE
- 8
-PARTS
- 10
- 40.3860
- 20
-154.4320
- 30
-0.0
- 11
- 48.0060
- 21
-154.4320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 50.2920
- 20
-153.7970
- 30
-0.0
- 40
- 1.2700
- 1
-gSelect2
- 0
-TEXT
- 8
-PARTS
- 10
- 45.4660
- 20
-155.1940
- 30
-0.0
- 40
- 1.2700
- 1
-2
- 0
-LINE
- 8
-PARTS
- 10
- 83.5660
- 20
-149.3520
- 30
-0.0
- 11
- 75.9460
- 21
-149.3520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 68.5800
- 20
-148.7170
- 30
-0.0
- 40
- 1.2700
- 1
-Y-out
- 0
-TEXT
- 8
-PARTS
- 10
- 77.4700
- 20
-150.1140
- 30
-0.0
- 40
- 1.2700
- 1
-6
- 0
-LINE
- 8
-PARTS
- 10
- 83.5660
- 20
-154.4320
- 30
-0.0
- 11
- 75.9460
- 21
-154.4320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
- 68.5800
- 20
-153.7970
- 30
-0.0
- 40
- 1.2700
- 1
-X-out
- 0
-TEXT
- 8
-PARTS
- 10
- 77.4700
- 20
-155.1940
- 30
-0.0
- 40
- 1.2700
- 1
-7
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 48.0060
- 20
-162.0520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 75.9460
- 20
-162.0520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 75.9460
- 20
-141.7320
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 48.0060
- 20
-141.7320
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-101.3460
- 20
-183.5763
- 30
-0.0
- 40
- 1.3057
- 1
-J1
- 0
-TEXT
- 8
-PARTTEXT
- 10
-101.3460
- 20
-155.6363
- 30
-0.0
- 40
- 1.3057
- 1
-AVR_PROGRAMMER
- 0
-LINE
- 8
-PARTS
- 10
-114.0460
- 20
-174.7520
- 30
-0.0
- 11
-106.4260
- 21
-174.7520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-107.9500
- 20
-175.5140
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-LINE
- 8
-PARTS
- 10
-114.0460
- 20
-172.2120
- 30
-0.0
- 11
-106.4260
- 21
-172.2120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-107.9500
- 20
-172.9740
- 30
-0.0
- 40
- 1.2700
- 1
-2
- 0
-LINE
- 8
-PARTS
- 10
-114.0460
- 20
-169.6720
- 30
-0.0
- 11
-106.4260
- 21
-169.6720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-107.9500
- 20
-170.4340
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-LINE
- 8
-PARTS
- 10
-114.0460
- 20
-167.1320
- 30
-0.0
- 11
-106.4260
- 21
-167.1320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-107.9500
- 20
-167.8940
- 30
-0.0
- 40
- 1.2700
- 1
-4
- 0
-LINE
- 8
-PARTS
- 10
-114.0460
- 20
-164.5920
- 30
-0.0
- 11
-106.4260
- 21
-164.5920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-107.9500
- 20
-165.3540
- 30
-0.0
- 40
- 1.2700
- 1
-5
- 0
-LINE
- 8
-PARTS
- 10
-114.0460
- 20
-162.0520
- 30
-0.0
- 11
-106.4260
- 21
-162.0520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-107.9500
- 20
-162.8140
- 30
-0.0
- 40
- 1.2700
- 1
-6
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-101.3460
- 20
-177.2920
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-106.4260
- 20
-177.2920
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-106.4260
- 20
-159.5120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-101.3460
- 20
-159.5120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-105.1560
- 20
-177.2920
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-105.1560
- 20
-177.2920
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-105.1560
- 20
-178.3080
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-102.6160
- 20
-178.3080
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-102.6160
- 20
-177.2920
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-102.6160
- 20
-159.5120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-102.6160
- 20
-159.2580
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-102.6160
- 20
-158.2420
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-105.1560
- 20
-158.2420
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-105.1560
- 20
-159.5120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-129.2860
- 20
-125.1563
- 30
-0.0
- 40
- 1.3057
- 1
-C6
- 0
-TEXT
- 8
-PARTTEXT
- 10
-126.7460
- 20
-120.0763
- 30
-0.0
- 40
- 1.3057
- 1
-20
- 0
-LINE
- 8
-PARTS
- 10
-126.7460
- 20
-121.4120
- 30
-0.0
- 11
-129.2860
- 21
-121.4120
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-134.3660
- 20
-121.4120
- 30
-0.0
- 11
-131.8260
- 21
-121.4120
- 31
-0.0
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-129.2860
- 20
-121.4120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-129.7940
- 20
-121.4120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-131.0640
- 20
-119.1260
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-131.0640
- 20
-123.6980
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-129.7940
- 20
-119.1260
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-129.7940
- 20
-123.6980
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-131.8260
- 20
-121.4120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-131.0640
- 20
-121.4120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-156.7180
- 20
- 81.9763
- 30
-0.0
- 40
- 1.3057
- 1
-U15
- 0
-TEXT
- 8
-PARTTEXT
- 10
-162.3060
- 20
- 81.9763
- 30
-0.0
- 40
- 1.3057
- 1
-LM7805C/TO_0
- 0
-LINE
- 8
-PARTS
- 10
-149.6060
- 20
- 75.6920
- 30
-0.0
- 11
-157.2260
- 21
- 75.6920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-159.5120
- 20
- 75.0570
- 30
-0.0
- 40
- 1.2700
- 1
-IN
- 0
-TEXT
- 8
-PARTS
- 10
-154.6860
- 20
- 76.4540
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-LINE
- 8
-PARTS
- 10
-180.0860
- 20
- 75.6920
- 30
-0.0
- 11
-172.4660
- 21
- 75.6920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-167.1320
- 20
- 75.0570
- 30
-0.0
- 40
- 1.2700
- 1
-OUT
- 0
-TEXT
- 8
-PARTS
- 10
-173.9900
- 20
- 76.4540
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-LINE
- 8
-PARTS
- 10
-164.8460
- 20
- 62.9920
- 30
-0.0
- 11
-164.8460
- 21
- 70.6120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-165.4810
- 20
- 72.8980
- 30
-0.0
- 40
- 1.2700
- 50
- 90.0000
- 1
-GND
- 0
-TEXT
- 8
-PARTS
- 10
-164.0840
- 20
- 67.5640
- 30
-0.0
- 40
- 1.2700
- 50
- 90.0000
- 1
-2
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-157.2260
- 20
- 78.2320
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-172.4660
- 20
- 78.2320
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-172.4660
- 20
- 70.6120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-157.2260
- 20
- 70.6120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-116.5860
- 20
-150.5563
- 30
-0.0
- 40
- 1.3057
- 1
-J0
- 0
-TEXT
- 8
-PARTTEXT
- 10
-116.5860
- 20
-130.2363
- 30
-0.0
- 40
- 1.3057
- 1
-UART
- 0
-LINE
- 8
-PARTS
- 10
-108.9660
- 20
-144.2720
- 30
-0.0
- 11
-116.5860
- 21
-144.2720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-114.0460
- 20
-145.0340
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-LINE
- 8
-PARTS
- 10
-108.9660
- 20
-141.7320
- 30
-0.0
- 11
-116.5860
- 21
-141.7320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-114.0460
- 20
-142.4940
- 30
-0.0
- 40
- 1.2700
- 1
-2
- 0
-LINE
- 8
-PARTS
- 10
-108.9660
- 20
-139.1920
- 30
-0.0
- 11
-116.5860
- 21
-139.1920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-114.0460
- 20
-139.9540
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-LINE
- 8
-PARTS
- 10
-108.9660
- 20
-136.6520
- 30
-0.0
- 11
-116.5860
- 21
-136.6520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-114.0460
- 20
-137.4140
- 30
-0.0
- 40
- 1.2700
- 1
-4
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-124.2060
- 20
-146.8120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-116.5860
- 20
-146.8120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-116.5860
- 20
-134.1120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-124.2060
- 20
-134.1120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-121.6660
- 20
-134.1120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-121.6660
- 20
-134.1120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-121.6660
- 20
-133.0960
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-118.6180
- 20
-133.0960
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-118.6180
- 20
-134.1120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-118.6180
- 20
-146.8120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-118.6180
- 20
-146.8120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-118.6180
- 20
-147.8280
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-121.6660
- 20
-147.8280
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-121.6660
- 20
-146.8120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
- 63.2460
- 20
-177.2263
- 30
-0.0
- 40
- 1.3057
- 1
-C9
- 0
-TEXT
- 8
-PARTTEXT
- 10
- 63.2460
- 20
-166.8123
- 30
-0.0
- 40
- 1.3057
- 1
-100u
- 0
-LINE
- 8
-PARTS
- 10
- 60.7060
- 20
-172.2120
- 30
-0.0
- 11
- 63.2460
- 21
-172.2120
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
- 68.3260
- 20
-172.2120
- 30
-0.0
- 11
- 65.7860
- 21
-172.2120
- 31
-0.0
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 63.2460
- 20
-169.6720
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 63.2460
- 20
-174.7520
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 64.2620
- 20
-172.2120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 65.7860
- 20
-172.2120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 65.0240
- 20
-174.7520
- 30
-0.0
- 42
- 0.1654
- 0
-VERTEX
- 8
-PARTS
- 10
- 64.2620
- 20
-172.2120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
- 64.2620
- 20
-172.2120
- 30
-0.0
- 42
- 0.1654
- 0
-VERTEX
- 8
-PARTS
- 10
- 65.0240
- 20
-169.6720
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-319.7860
- 20
-142.9363
- 30
-0.0
- 40
- 1.3057
- 1
-J5
- 0
-TEXT
- 8
-PARTTEXT
- 10
-317.2460
- 20
-112.4563
- 30
-0.0
- 40
- 1.3057
- 1
-To SMA
- 0
-LINE
- 8
-PARTS
- 10
-312.1660
- 20
-134.1120
- 30
-0.0
- 11
-319.7860
- 21
-134.1120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-317.2460
- 20
-134.8740
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-LINE
- 8
-PARTS
- 10
-312.1660
- 20
-131.5720
- 30
-0.0
- 11
-319.7860
- 21
-131.5720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-317.2460
- 20
-132.3340
- 30
-0.0
- 40
- 1.2700
- 1
-2
- 0
-LINE
- 8
-PARTS
- 10
-312.1660
- 20
-129.0320
- 30
-0.0
- 11
-319.7860
- 21
-129.0320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-317.2460
- 20
-129.7940
- 30
-0.0
- 40
- 1.2700
- 1
-3
- 0
-LINE
- 8
-PARTS
- 10
-312.1660
- 20
-126.4920
- 30
-0.0
- 11
-319.7860
- 21
-126.4920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-317.2460
- 20
-127.2540
- 30
-0.0
- 40
- 1.2700
- 1
-4
- 0
-LINE
- 8
-PARTS
- 10
-312.1660
- 20
-123.9520
- 30
-0.0
- 11
-319.7860
- 21
-123.9520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-317.2460
- 20
-124.7140
- 30
-0.0
- 40
- 1.2700
- 1
-5
- 0
-LINE
- 8
-PARTS
- 10
-312.1660
- 20
-121.4120
- 30
-0.0
- 11
-319.7860
- 21
-121.4120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-317.2460
- 20
-122.1740
- 30
-0.0
- 40
- 1.2700
- 1
-6
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 70
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-324.8660
- 20
-136.6520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-319.7860
- 20
-136.6520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-319.7860
- 20
-118.8720
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-324.8660
- 20
-118.8720
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-321.0560
- 20
-136.6520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-321.0560
- 20
-136.6520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-321.0560
- 20
-137.6680
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-323.5960
- 20
-137.6680
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-323.5960
- 20
-136.6520
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-323.5960
- 20
-118.8720
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-323.5960
- 20
-118.6180
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-323.5960
- 20
-117.6020
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-321.0560
- 20
-117.6020
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-321.0560
- 20
-118.8720
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-144.2720
- 20
- 69.2763
- 30
-0.0
- 40
- 1.3057
- 1
-C4
- 0
-TEXT
- 8
-PARTTEXT
- 10
-144.2720
- 20
- 66.9903
- 30
-0.0
- 40
- 1.3057
- 1
-470u
- 0
-LINE
- 8
-PARTS
- 10
-139.4460
- 20
- 73.1520
- 30
-0.0
- 11
-139.4460
- 21
- 70.6120
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-139.4460
- 20
- 65.5320
- 30
-0.0
- 11
-139.4460
- 21
- 68.0720
- 31
-0.0
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-136.9060
- 20
- 70.6120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-141.9860
- 20
- 70.6120
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-139.4460
- 20
- 69.5960
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-139.4460
- 20
- 68.0720
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-141.9860
- 20
- 68.8340
- 30
-0.0
- 42
- 0.1654
- 0
-VERTEX
- 8
-PARTS
- 10
-139.4460
- 20
- 69.5960
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-139.4460
- 20
- 69.5960
- 30
-0.0
- 42
- 0.1654
- 0
-VERTEX
- 8
-PARTS
- 10
-136.9060
- 20
- 68.8340
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-248.6660
- 20
- 69.2763
- 30
-0.0
- 40
- 1.3057
- 1
-R90
- 0
-TEXT
- 8
-PARTTEXT
- 10
-253.7460
- 20
- 69.2763
- 30
-0.0
- 40
- 1.3057
- 1
-56
- 0
-LINE
- 8
-PARTS
- 10
-246.1260
- 20
- 65.5320
- 30
-0.0
- 11
-248.6660
- 21
- 65.5320
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-258.8260
- 20
- 65.5320
- 30
-0.0
- 11
-256.2860
- 21
- 65.5320
- 31
-0.0
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-248.6660
- 20
- 65.5320
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-249.4280
- 20
- 66.2940
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-249.4280
- 20
- 66.2940
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-250.9520
- 20
- 64.7700
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-250.9520
- 20
- 64.7700
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-252.4760
- 20
- 66.2940
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-252.4760
- 20
- 66.2940
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-254.0000
- 20
- 64.7700
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-254.0000
- 20
- 64.7700
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-255.5240
- 20
- 66.2940
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-255.5240
- 20
- 66.2940
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-256.2860
- 20
- 65.5320
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-253.7460
- 20
-183.5763
- 30
-0.0
- 40
- 1.3057
- 1
-R81
- 0
-TEXT
- 8
-PARTTEXT
- 10
-253.7460
- 20
-178.4963
- 30
-0.0
- 40
- 1.3057
- 1
-10k
- 0
-LINE
- 8
-PARTS
- 10
-258.8260
- 20
-187.4520
- 30
-0.0
- 11
-258.8260
- 21
-184.9120
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-258.8260
- 20
-174.7520
- 30
-0.0
- 11
-258.8260
- 21
-177.2920
- 31
-0.0
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-258.8260
- 20
-184.9120
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-259.5880
- 20
-184.1500
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-259.5880
- 20
-184.1500
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-258.0640
- 20
-182.6260
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-258.0640
- 20
-182.6260
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-259.5880
- 20
-181.1020
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-259.5880
- 20
-181.1020
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-258.0640
- 20
-179.5780
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-258.0640
- 20
-179.5780
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-259.5880
- 20
-178.0540
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-259.5880
- 20
-178.0540
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-258.8260
- 20
-177.2920
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-248.6660
- 20
- 89.5963
- 30
-0.0
- 40
- 1.3057
- 1
-R89
- 0
-TEXT
- 8
-PARTTEXT
- 10
-253.7460
- 20
- 89.5963
- 30
-0.0
- 40
- 1.3057
- 1
-56
- 0
-LINE
- 8
-PARTS
- 10
-246.1260
- 20
- 85.8520
- 30
-0.0
- 11
-248.6660
- 21
- 85.8520
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-258.8260
- 20
- 85.8520
- 30
-0.0
- 11
-256.2860
- 21
- 85.8520
- 31
-0.0
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-248.6660
- 20
- 85.8520
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-249.4280
- 20
- 86.6140
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-249.4280
- 20
- 86.6140
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-250.9520
- 20
- 85.0900
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-250.9520
- 20
- 85.0900
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-252.4760
- 20
- 86.6140
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-252.4760
- 20
- 86.6140
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-254.0000
- 20
- 85.0900
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-254.0000
- 20
- 85.0900
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-255.5240
- 20
- 86.6140
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-POLYLINE
- 8
-PARTS
- 66
-1
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-255.5240
- 20
- 86.6140
- 30
-0.0
- 0
-VERTEX
- 8
-PARTS
- 10
-256.2860
- 20
- 85.8520
- 30
-0.0
- 0
-SEQEND
- 8
-PARTS
- 0
-TEXT
- 8
-PARTTEXT
- 10
-144.5260
- 20
-196.2763
- 30
-0.0
- 40
- 1.3057
- 1
-U10
- 0
-TEXT
- 8
-PARTTEXT
- 10
-162.3060
- 20
- 97.2163
- 30
-0.0
- 40
- 1.3057
- 1
-ATMEGA128
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-108.7120
- 30
-0.0
- 11
-144.5260
- 21
-108.7120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-108.0770
- 30
-0.0
- 40
- 1.2700
- 1
-OC0B/PG5
- 0
-TEXT
- 8
-PARTS
- 10
-141.9860
- 20
-109.4740
- 30
-0.0
- 40
- 1.2700
- 1
-1
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-189.9920
- 30
-0.0
- 11
-144.5260
- 21
-189.9920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-189.3570
- 30
-0.0
- 40
- 1.2700
- 1
-PA0/AD0
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-190.7540
- 30
-0.0
- 40
- 1.2700
- 1
-51
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-187.4520
- 30
-0.0
- 11
-144.5260
- 21
-187.4520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-186.8170
- 30
-0.0
- 40
- 1.2700
- 1
-PA1/AD1
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-188.2140
- 30
-0.0
- 40
- 1.2700
- 1
-50
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-184.9120
- 30
-0.0
- 11
-144.5260
- 21
-184.9120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-184.2770
- 30
-0.0
- 40
- 1.2700
- 1
-PA2/AD2
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-185.6740
- 30
-0.0
- 40
- 1.2700
- 1
-49
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-182.3720
- 30
-0.0
- 11
-144.5260
- 21
-182.3720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-181.7370
- 30
-0.0
- 40
- 1.2700
- 1
-PA3/AD3
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-183.1340
- 30
-0.0
- 40
- 1.2700
- 1
-48
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-179.8320
- 30
-0.0
- 11
-144.5260
- 21
-179.8320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-179.1970
- 30
-0.0
- 40
- 1.2700
- 1
-PA4/AD4
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-180.5940
- 30
-0.0
- 40
- 1.2700
- 1
-47
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-177.2920
- 30
-0.0
- 11
-144.5260
- 21
-177.2920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-176.6570
- 30
-0.0
- 40
- 1.2700
- 1
-PA5/AD5
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-178.0540
- 30
-0.0
- 40
- 1.2700
- 1
-46
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-174.7520
- 30
-0.0
- 11
-144.5260
- 21
-174.7520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-174.1170
- 30
-0.0
- 40
- 1.2700
- 1
-PA6/AD6
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-175.5140
- 30
-0.0
- 40
- 1.2700
- 1
-45
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-172.2120
- 30
-0.0
- 11
-144.5260
- 21
-172.2120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-171.5770
- 30
-0.0
- 40
- 1.2700
- 1
-PA7/AD7
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-172.9740
- 30
-0.0
- 40
- 1.2700
- 1
-44
- 0
-CIRCLE
- 8
-PARTS
- 10
-143.7640
- 20
-167.1320
- 30
-0.0
- 40
- 0.7620
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-167.1320
- 30
-0.0
- 11
-143.0020
- 21
-167.1320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-166.4970
- 30
-0.0
- 40
- 1.2700
- 1
-(%%oSS%%o/PCINT0)/PB0
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-167.8940
- 30
-0.0
- 40
- 1.2700
- 1
-10
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-164.5920
- 30
-0.0
- 11
-144.5260
- 21
-164.5920
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-144.5260
- 20
-166.1160
- 30
-0.0
- 11
-146.0500
- 21
-164.5920
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-146.0500
- 20
-164.5920
- 30
-0.0
- 11
-144.5260
- 21
-163.0680
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-163.9570
- 30
-0.0
- 40
- 1.2700
- 1
-(SCK/PCINT1)/PB1
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-165.3540
- 30
-0.0
- 40
- 1.2700
- 1
-11
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-162.0520
- 30
-0.0
- 11
-144.5260
- 21
-162.0520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-161.4170
- 30
-0.0
- 40
- 1.2700
- 1
-(MOSI/PCINT2)/PB2
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-162.8140
- 30
-0.0
- 40
- 1.2700
- 1
-12
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-159.5120
- 30
-0.0
- 11
-144.5260
- 21
-159.5120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-158.8770
- 30
-0.0
- 40
- 1.2700
- 1
-(MISO/PCINT3)/PB3
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-160.2740
- 30
-0.0
- 40
- 1.2700
- 1
-13
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-156.9720
- 30
-0.0
- 11
-144.5260
- 21
-156.9720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-156.3370
- 30
-0.0
- 40
- 1.2700
- 1
-(OC2A/PCINT4)/PB4
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-157.7340
- 30
-0.0
- 40
- 1.2700
- 1
-14
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-154.4320
- 30
-0.0
- 11
-144.5260
- 21
-154.4320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-153.7970
- 30
-0.0
- 40
- 1.2700
- 1
-(OC1A/PCINT5)/PB5
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-155.1940
- 30
-0.0
- 40
- 1.2700
- 1
-15
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-151.8920
- 30
-0.0
- 11
-144.5260
- 21
-151.8920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-151.2570
- 30
-0.0
- 40
- 1.2700
- 1
-(OC1B/PCINT6)/PB6
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-152.6540
- 30
-0.0
- 40
- 1.2700
- 1
-16
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-149.3520
- 30
-0.0
- 11
-144.5260
- 21
-149.3520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-148.7170
- 30
-0.0
- 40
- 1.2700
- 1
-(OC0A/PCINT7)/OC1C/PB7
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-150.1140
- 30
-0.0
- 40
- 1.2700
- 1
-17
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-144.2720
- 30
-0.0
- 11
-144.5260
- 21
-144.2720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-143.6370
- 30
-0.0
- 40
- 1.2700
- 1
-PC0/A8
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-145.0340
- 30
-0.0
- 40
- 1.2700
- 1
-35
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-141.7320
- 30
-0.0
- 11
-144.5260
- 21
-141.7320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-141.0970
- 30
-0.0
- 40
- 1.2700
- 1
-PC1/A9
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-142.4940
- 30
-0.0
- 40
- 1.2700
- 1
-36
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-139.1920
- 30
-0.0
- 11
-144.5260
- 21
-139.1920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-138.5570
- 30
-0.0
- 40
- 1.2700
- 1
-PC2/A10
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-139.9540
- 30
-0.0
- 40
- 1.2700
- 1
-37
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-136.6520
- 30
-0.0
- 11
-144.5260
- 21
-136.6520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-136.0170
- 30
-0.0
- 40
- 1.2700
- 1
-PC3/A11
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-137.4140
- 30
-0.0
- 40
- 1.2700
- 1
-38
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-134.1120
- 30
-0.0
- 11
-144.5260
- 21
-134.1120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-133.4770
- 30
-0.0
- 40
- 1.2700
- 1
-PC4/A12
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-134.8740
- 30
-0.0
- 40
- 1.2700
- 1
-39
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-131.5720
- 30
-0.0
- 11
-144.5260
- 21
-131.5720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-130.9370
- 30
-0.0
- 40
- 1.2700
- 1
-PC5/A13
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-132.3340
- 30
-0.0
- 40
- 1.2700
- 1
-40
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-129.0320
- 30
-0.0
- 11
-144.5260
- 21
-129.0320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-128.3970
- 30
-0.0
- 40
- 1.2700
- 1
-PC6/A14
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-129.7940
- 30
-0.0
- 40
- 1.2700
- 1
-41
- 0
-LINE
- 8
-PARTS
- 10
-136.9060
- 20
-126.4920
- 30
-0.0
- 11
-144.5260
- 21
-126.4920
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-146.8120
- 20
-125.8570
- 30
-0.0
- 40
- 1.2700
- 1
-PC7/A15
- 0
-TEXT
- 8
-PARTS
- 10
-140.9700
- 20
-127.2540
- 30
-0.0
- 40
- 1.2700
- 1
-42
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-177.2920
- 30
-0.0
- 11
-202.9460
- 21
-177.2920
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-202.9460
- 20
-178.8160
- 30
-0.0
- 11
-201.4220
- 21
-177.2920
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-201.4220
- 20
-177.2920
- 30
-0.0
- 11
-202.9460
- 21
-175.7680
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-188.4680
- 20
-176.6570
- 30
-0.0
- 40
- 1.2700
- 1
-SCL/INT0/PD0
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-178.0540
- 30
-0.0
- 40
- 1.2700
- 1
-25
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-174.7520
- 30
-0.0
- 11
-202.9460
- 21
-174.7520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-188.4680
- 20
-174.1170
- 30
-0.0
- 40
- 1.2700
- 1
-SDA/INT1/PD1
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-175.5140
- 30
-0.0
- 40
- 1.2700
- 1
-26
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-172.2120
- 30
-0.0
- 11
-202.9460
- 21
-172.2120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-187.4520
- 20
-171.5770
- 30
-0.0
- 40
- 1.2700
- 1
-RXD1/INT2/PD2
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-172.9740
- 30
-0.0
- 40
- 1.2700
- 1
-27
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-169.6720
- 30
-0.0
- 11
-202.9460
- 21
-169.6720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-187.4520
- 20
-169.0370
- 30
-0.0
- 40
- 1.2700
- 1
-TXD1/INT3/PD3
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-170.4340
- 30
-0.0
- 40
- 1.2700
- 1
-28
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-167.1320
- 30
-0.0
- 11
-202.9460
- 21
-167.1320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-192.5320
- 20
-166.4970
- 30
-0.0
- 40
- 1.2700
- 1
-ICP1/PD4
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-167.8940
- 30
-0.0
- 40
- 1.2700
- 1
-29
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-164.5920
- 30
-0.0
- 11
-202.9460
- 21
-164.5920
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-202.9460
- 20
-166.1160
- 30
-0.0
- 11
-201.4220
- 21
-164.5920
- 31
-0.0
- 0
-LINE
- 8
-PARTS
- 10
-201.4220
- 20
-164.5920
- 30
-0.0
- 11
-202.9460
- 21
-163.0680
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-192.5320
- 20
-163.9570
- 30
-0.0
- 40
- 1.2700
- 1
-XCK1/PD5
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-165.3540
- 30
-0.0
- 40
- 1.2700
- 1
-30
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-162.0520
- 30
-0.0
- 11
-202.9460
- 21
-162.0520
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-194.5640
- 20
-161.4170
- 30
-0.0
- 40
- 1.2700
- 1
-T1/PD6
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-162.8140
- 30
-0.0
- 40
- 1.2700
- 1
-31
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-159.5120
- 30
-0.0
- 11
-202.9460
- 21
-159.5120
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-194.5640
- 20
-158.8770
- 30
-0.0
- 40
- 1.2700
- 1
-T2/PD7
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-160.2740
- 30
-0.0
- 40
- 1.2700
- 1
-32
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-131.5720
- 30
-0.0
- 11
-202.9460
- 21
-131.5720
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-192.5320
- 20
-130.9370
- 30
-0.0
- 40
- 1.2700
- 1
-PF0/ADC0
- 0
-TEXT
- 8
-PARTS
- 10
-204.4700
- 20
-132.3340
- 30
-0.0
- 40
- 1.2700
- 1
-61
- 0
-LINE
- 8
-PARTS
- 10
-210.5660
- 20
-129.0320
- 30
-0.0
- 11
-202.9460
- 21
-129.0320
- 31
-0.0
- 0
-TEXT
- 8
-PARTS
- 10
-192.5320
- 20
-128.3970
- 30
-0.0
- 40
... 75448 lines suppressed ...