You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by an...@apache.org on 2017/01/13 22:26:03 UTC

[24/25] any23 git commit: Merge branch 'version2'

Merge branch 'version2'


Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/711ea092
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/711ea092
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/711ea092

Branch: refs/heads/master
Commit: 711ea092fad2975394e59f24cd7900e5a50b1300
Parents: e324ea6 5fd7877
Author: Peter Ansell <p_...@yahoo.com>
Authored: Sat Jan 14 09:10:25 2017 +1100
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Sat Jan 14 09:10:25 2017 +1100

----------------------------------------------------------------------
 NOTICE.txt                                      |   6 +-
 api/pom.xml                                     |  10 +-
 .../main/java/org/apache/any23/cli/Tool.java    |   1 +
 .../any23/configuration/Configuration.java      |   2 +-
 .../apache/any23/encoding/EncodingDetector.java |   2 +-
 .../any23/extractor/ExtractionContext.java      |  28 +-
 .../any23/extractor/ExtractionParameters.java   |   2 +-
 .../any23/extractor/ExtractionResult.java       |  14 +-
 .../org/apache/any23/extractor/Extractor.java   |   4 +-
 .../any23/extractor/ExtractorFactory.java       |   2 +-
 .../org/apache/any23/extractor/IssueReport.java |  16 +-
 .../apache/any23/plugin/Any23PluginManager.java |   2 +-
 .../java/org/apache/any23/rdf/Prefixes.java     |  50 +-
 .../org/apache/any23/source/DocumentSource.java |   6 +-
 .../main/java/org/apache/any23/vocab/CSV.java   |  18 +-
 .../java/org/apache/any23/vocab/DCTerms.java    |  18 +-
 .../main/java/org/apache/any23/vocab/DOAC.java  |  68 +-
 .../main/java/org/apache/any23/vocab/DOAP.java  | 100 +--
 .../main/java/org/apache/any23/vocab/FOAF.java  | 132 ++--
 .../java/org/apache/any23/vocab/GeoNames.java   |   8 +-
 .../main/java/org/apache/any23/vocab/HCard.java |  80 +--
 .../java/org/apache/any23/vocab/HEntry.java     |  32 +-
 .../java/org/apache/any23/vocab/HEvent.java     |  24 +-
 .../main/java/org/apache/any23/vocab/HItem.java |  10 +-
 .../java/org/apache/any23/vocab/HListing.java   |  90 +--
 .../java/org/apache/any23/vocab/HProduct.java   |  22 +-
 .../java/org/apache/any23/vocab/HRecipe.java    |  46 +-
 .../java/org/apache/any23/vocab/HResume.java    |  18 +-
 .../main/java/org/apache/any23/vocab/ICAL.java  | 340 +++++-----
 .../org/apache/any23/vocab/LKIFCoreAction.java  |  52 +-
 .../apache/any23/vocab/LKIFCoreExpression.java  | 132 ++--
 .../apache/any23/vocab/LKIFCoreLegalAction.java |  46 +-
 .../apache/any23/vocab/LKIFCoreLegalRole.java   |   8 +-
 .../apache/any23/vocab/LKIFCoreMereology.java   |  40 +-
 .../org/apache/any23/vocab/LKIFCoreNorm.java    | 134 ++--
 .../org/apache/any23/vocab/LKIFCoreProcess.java |  38 +-
 .../any23/vocab/LKIFCoreRelativePlaces.java     |  42 +-
 .../org/apache/any23/vocab/LKIFCoreRole.java    |  26 +-
 .../org/apache/any23/vocab/LKIFCoreRules.java   |  16 +-
 .../org/apache/any23/vocab/LKIFCoreTime.java    |  32 +-
 .../any23/vocab/LKIFCoreTimeModification.java   | 114 ++--
 .../org/apache/any23/vocab/LKIFCoreTop.java     |  14 +-
 .../main/java/org/apache/any23/vocab/OGP.java   |  62 +-
 .../java/org/apache/any23/vocab/Programme.java  | 178 ++---
 .../java/org/apache/any23/vocab/Review.java     |  40 +-
 .../org/apache/any23/vocab/ReviewAggregate.java |  20 +-
 .../java/org/apache/any23/vocab/SINDICE.java    |  22 +-
 .../main/java/org/apache/any23/vocab/VCard.java | 132 ++--
 .../java/org/apache/any23/vocab/Vocabulary.java | 101 ++-
 .../main/java/org/apache/any23/vocab/WO.java    | 178 ++---
 .../main/java/org/apache/any23/vocab/XFN.java   |  62 +-
 .../main/java/org/apache/any23/vocab/XHTML.java |  10 +-
 .../org/apache/any23/writer/TripleHandler.java  |  18 +-
 .../org/apache/any23/writer/WriterFactory.java  |   2 +-
 .../resources/default-configuration.properties  |   8 +-
 cli/pom.xml                                     | 255 ++++++++
 .../any23/cli/ExtractorDocumentation.java       | 186 ++++++
 .../org/apache/any23/cli/MicrodataParser.java   |  99 +++
 .../java/org/apache/any23/cli/MimeDetector.java | 101 +++
 .../org/apache/any23/cli/PluginVerifier.java    |  86 +++
 .../main/java/org/apache/any23/cli/Rover.java   | 265 ++++++++
 .../java/org/apache/any23/cli/ToolRunner.java   | 263 ++++++++
 .../java/org/apache/any23/cli/VocabPrinter.java |  54 ++
 .../java/org/apache/any23/cli/package-info.java |  22 +
 .../any23/cli/ExtractorDocumentationTest.java   |  57 ++
 .../apache/any23/cli/MicrodataParserTest.java   |  46 ++
 .../org/apache/any23/cli/MimeDetectorTest.java  |  51 ++
 .../apache/any23/cli/PluginVerifierTest.java    |  38 ++
 .../java/org/apache/any23/cli/RoverTest.java    | 139 ++++
 .../org/apache/any23/cli/ToolRunnerTest.java    |  65 ++
 .../java/org/apache/any23/cli/ToolTestBase.java |  91 +++
 .../org/apache/any23/cli/VocabPrinterTest.java  |  38 ++
 core/pom.xml                                    |  57 +-
 core/src/main/java/org/apache/any23/Any23.java  |  64 +-
 .../any23/cli/ExtractorDocumentation.java       | 186 ------
 .../org/apache/any23/cli/MicrodataParser.java   |  99 ---
 .../java/org/apache/any23/cli/MimeDetector.java | 101 ---
 .../org/apache/any23/cli/PluginVerifier.java    |  88 ---
 .../main/java/org/apache/any23/cli/Rover.java   | 265 --------
 .../java/org/apache/any23/cli/ToolRunner.java   | 263 --------
 .../java/org/apache/any23/cli/VocabPrinter.java |  57 --
 .../java/org/apache/any23/cli/package-info.java |  22 -
 .../any23/extractor/ExampleInputOutput.java     |   6 +-
 .../any23/extractor/ExtractionResultImpl.java   |  28 +-
 .../any23/extractor/ExtractorRegistryImpl.java  |  11 +-
 .../extractor/SingleDocumentExtraction.java     | 170 ++---
 .../extractor/TagSoupExtractionResult.java      |   6 +-
 .../any23/extractor/csv/CSVExtractor.java       |  93 ++-
 .../any23/extractor/html/AdrExtractor.java      |   4 +-
 .../extractor/html/EmbeddedJSONLDExtractor.java |  46 +-
 .../html/EntityBasedMicroformatExtractor.java   |   4 +-
 .../any23/extractor/html/GeoExtractor.java      |   4 +-
 .../extractor/html/HCalendarExtractor.java      |  18 +-
 .../any23/extractor/html/HCardExtractor.java    |  32 +-
 .../any23/extractor/html/HListingExtractor.java |  26 +-
 .../any23/extractor/html/HRecipeExtractor.java  |  16 +-
 .../any23/extractor/html/HResumeExtractor.java  |   6 +-
 .../html/HReviewAggregateExtractor.java         |  12 +-
 .../any23/extractor/html/HReviewExtractor.java  |  10 +-
 .../any23/extractor/html/HTMLDocument.java      |  30 +-
 .../any23/extractor/html/HTMLMetaExtractor.java |  88 +--
 .../any23/extractor/html/HeadLinkExtractor.java |  14 +-
 .../any23/extractor/html/ICBMExtractor.java     |  14 +-
 .../any23/extractor/html/LicenseExtractor.java  |  10 +-
 .../extractor/html/MicroformatExtractor.java    |  52 +-
 .../any23/extractor/html/SpeciesExtractor.java  |  12 +-
 .../any23/extractor/html/TagSoupParser.java     |  28 +-
 .../any23/extractor/html/TitleExtractor.java    |   6 +-
 .../extractor/html/TurtleHTMLExtractor.java     |  30 +-
 .../any23/extractor/html/XFNExtractor.java      |  30 +-
 .../html/microformats2/HAdrExtractor.java       |   8 +-
 .../html/microformats2/HCardExtractor.java      |  29 +-
 .../html/microformats2/HEntryExtractor.java     |  22 +-
 .../html/microformats2/HEventExtractor.java     |  17 +-
 .../html/microformats2/HGeoExtractor.java       |   4 +-
 .../html/microformats2/HItemExtractor.java      |  12 +-
 .../html/microformats2/HProductExtractor.java   |  18 +-
 .../html/microformats2/HRecipeExtractor.java    |  10 +-
 .../html/microformats2/HResumeExtractor.java    |  14 +-
 .../extractor/microdata/ItemPropValue.java      |   2 +-
 .../extractor/microdata/MicrodataExtractor.java | 155 +++--
 .../extractor/microdata/MicrodataParser.java    |   8 +-
 .../any23/extractor/rdf/BaseRDFExtractor.java   |  12 +-
 .../any23/extractor/rdf/JSONLDExtractor.java    |   2 +-
 .../any23/extractor/rdf/NQuadsExtractor.java    |   2 +-
 .../extractor/rdf/NQuadsExtractorFactory.java   |   2 +
 .../any23/extractor/rdf/NTriplesExtractor.java  |   2 +-
 .../any23/extractor/rdf/RDFHandlerAdapter.java  |  14 +-
 .../any23/extractor/rdf/RDFParserFactory.java   |  51 +-
 .../any23/extractor/rdf/RDFXMLExtractor.java    |   2 +-
 .../any23/extractor/rdf/TriXExtractor.java      |   2 +-
 .../any23/extractor/rdf/TurtleExtractor.java    |   2 +-
 .../any23/extractor/rdfa/RDFa11Extractor.java   |   2 +-
 .../any23/extractor/rdfa/RDFa11Parser.java      | 375 ++++++-----
 .../any23/extractor/rdfa/RDFaExtractor.java     |   2 +-
 .../any23/extractor/rdfa/XSLTStylesheet.java    |   4 +-
 .../any23/extractor/xpath/QuadTemplate.java     |  10 +-
 .../any23/extractor/xpath/TemplateGraph.java    |  12 +-
 .../any23/extractor/xpath/TemplateObject.java   |  15 +-
 .../extractor/xpath/TemplatePredicate.java      |  12 +-
 .../any23/extractor/xpath/TemplateSubject.java  |  10 +-
 .../xpath/TemplateXPathExtractionRuleImpl.java  |   4 +-
 .../org/apache/any23/extractor/xpath/Term.java  |   2 +-
 .../extractor/xpath/XPathExtractionRule.java    |   8 +-
 .../any23/extractor/xpath/XPathExtractor.java   |   6 +-
 .../any23/filter/ExtractionContextBlocker.java  |  24 +-
 .../any23/filter/IgnoreAccidentalRDFa.java      |  17 +-
 .../filter/IgnoreTitlesOfEmptyDocuments.java    |  16 +-
 .../apache/any23/http/DefaultHTTPClient.java    |  14 +-
 .../java/org/apache/any23/http/HTTPClient.java  |  20 +-
 .../any23/rdf/Any23ValueFactoryWrapper.java     |  81 ++-
 .../org/apache/any23/rdf/PopularPrefixes.java   |  12 +-
 .../java/org/apache/any23/rdf/RDFUtils.java     | 248 ++++---
 .../any23/source/ByteArrayDocumentSource.java   |  14 +-
 .../apache/any23/source/FileDocumentSource.java |   6 +-
 .../apache/any23/source/HTTPDocumentSource.java |   6 +-
 .../org/apache/any23/source/MemCopyFactory.java |   2 +-
 .../any23/source/StringDocumentSource.java      |   2 +-
 .../org/apache/any23/validator/DOMDocument.java |   4 +-
 .../any23/validator/DefaultDOMDocument.java     |  14 +-
 .../any23/validator/DefaultValidator.java       |   4 +-
 .../org/apache/any23/validator/Validator.java   |   5 +-
 .../any23/validator/rule/AboutNotURIRule.java   |   4 +-
 .../MissingItemscopeAttributeValueRule.java     |   2 +-
 .../org/apache/any23/vocab/RDFSchemaUtils.java  |  26 +-
 .../any23/writer/BenchmarkTripleHandler.java    |  16 +-
 .../any23/writer/CompositeTripleHandler.java    |  16 +-
 .../any23/writer/CountingTripleHandler.java     |  12 +-
 .../org/apache/any23/writer/JSONWriter.java     |  52 +-
 .../apache/any23/writer/JSONWriterFactory.java  |   2 +-
 .../any23/writer/LoggingTripleHandler.java      |  20 +-
 .../org/apache/any23/writer/NQuadsWriter.java   |   4 +-
 .../any23/writer/NQuadsWriterFactory.java       |   2 +-
 .../org/apache/any23/writer/NTriplesWriter.java |   2 +-
 .../any23/writer/NTriplesWriterFactory.java     |   2 +-
 .../any23/writer/RDFWriterTripleHandler.java    |  20 +-
 .../org/apache/any23/writer/RDFXMLWriter.java   |   2 +-
 .../any23/writer/RDFXMLWriterFactory.java       |   2 +-
 .../any23/writer/ReportingTripleHandler.java    |  18 +-
 .../apache/any23/writer/RepositoryWriter.java   |  32 +-
 .../org/apache/any23/writer/TriXWriter.java     |   2 +-
 .../apache/any23/writer/TriXWriterFactory.java  |   2 +-
 .../org/apache/any23/writer/TurtleWriter.java   |   2 +-
 .../any23/writer/TurtleWriterFactory.java       |   2 +-
 .../org/apache/any23/writer/URIListWriter.java  |  14 +-
 .../any23/writer/URIListWriterFactory.java      |   2 +-
 .../org/apache/any23/extractor/rdfa/rdfa.xslt   |  12 +-
 .../test/java/org/apache/any23/Any23Test.java   |  25 +-
 .../test/java/org/apache/any23/SesameTest.java  |  12 +-
 .../any23/cli/ExtractorDocumentationTest.java   |  57 --
 .../apache/any23/cli/MicrodataParserTest.java   |  46 --
 .../org/apache/any23/cli/MimeDetectorTest.java  |  51 --
 .../apache/any23/cli/PluginVerifierTest.java    |  38 --
 .../java/org/apache/any23/cli/RoverTest.java    | 137 ----
 .../org/apache/any23/cli/ToolRunnerTest.java    |  65 --
 .../java/org/apache/any23/cli/ToolTestBase.java |  91 ---
 .../org/apache/any23/cli/VocabPrinterTest.java  |  38 --
 .../any23/extractor/ExtractionAPITest.java      |   4 +-
 .../extractor/ExtractionResultImplTest.java     |  20 +-
 .../any23/extractor/MockTripleHandler.java      |  40 +-
 .../extractor/SingleDocumentExtractionTest.java |  38 +-
 .../any23/extractor/csv/CSVExtractorTest.java   |  39 +-
 .../extractor/example/ExampleExtractor.java     |   8 +-
 .../html/AbstractExtractorTestCase.java         |  94 +--
 .../any23/extractor/html/AdrExtractorTest.java  |   6 +-
 .../html/EmbeddedJSONLDExtractorTest.java       |   3 -
 .../extractor/html/HCalendarExtractorTest.java  |  55 +-
 .../extractor/html/HCardExtractorTest.java      |  90 ++-
 .../extractor/html/HListingExtractorTest.java   |  51 +-
 .../extractor/html/HRecipeExtractorTest.java    |   3 +-
 .../extractor/html/HResumeExtractorTest.java    |  11 +-
 .../extractor/html/HReviewExtractorTest.java    |  20 +-
 .../any23/extractor/html/HTMLFixture.java       |   4 +-
 .../extractor/html/HTMLMetaExtractorTest.java   |  19 +-
 .../extractor/html/HeadLinkExtractorTest.java   |  26 +-
 .../extractor/html/LicenseExtractorTest.java    |  30 +-
 .../any23/extractor/html/RDFMergerTest.java     |  44 +-
 .../extractor/html/SpeciesExtractorTest.java    |   4 +-
 .../any23/extractor/html/TagSoupParserTest.java |   4 +-
 .../extractor/html/TitleExtractorTest.java      |  14 +-
 .../extractor/html/TurtleHTMLExtractorTest.java |   5 +-
 .../any23/extractor/html/XFNExtractorTest.java  |  44 +-
 .../html/microformats2/HAdrExtractorTest.java   |   4 +-
 .../html/microformats2/HCardExtractorTest.java  |   4 +-
 .../html/microformats2/HEntryExtractorTest.java |   4 +-
 .../html/microformats2/HEventExtractorTest.java |   4 +-
 .../html/microformats2/HGeoExtractorTest.java   |  10 +-
 .../html/microformats2/HItemExtractorTest.java  |   4 +-
 .../microformats2/HProductExtractorTest.java    |   4 +-
 .../microformats2/HRecipeExtractorTest.java     |   4 +-
 .../microformats2/HResumeExtractorTest.java     |   4 +-
 .../microdata/MicrodataExtractorTest.java       |  20 +-
 .../microdata/MicrodataParserTest.java          |   9 +-
 .../extractor/rdf/JSONLDExtractorTest.java      |   7 +-
 .../extractor/rdf/TurtleExtractorTest.java      |   4 +-
 .../rdfa/AbstractRDFaExtractorTestCase.java     |  60 +-
 .../extractor/rdfa/ExtractionExceptionTest.java |  11 +-
 .../extractor/rdfa/RDFa11ExtractorTest.java     |  64 +-
 .../any23/extractor/rdfa/RDFa11ParserTest.java  |   8 +-
 .../any23/extractor/rdfa/RDFaExtractorTest.java |  14 +-
 .../TemplateXPathExtractorRuleImplTest.java     |  32 +-
 .../filter/ExtractionContextBlockerTest.java    |  24 +-
 .../any23/filter/IgnoreAccidentalRDFaTest.java  |  28 +-
 .../any23/plugin/Any23PluginManagerTest.java    |   1 -
 .../java/org/apache/any23/rdf/PrefixesTest.java |  44 +-
 .../java/org/apache/any23/rdf/RDFUtilsTest.java |  20 +-
 .../apache/any23/util/DiscoveryUtilsTest.java   |   4 +-
 .../any23/validator/DefaultValidatorTest.java   |  10 +-
 .../apache/any23/vocab/RDFSchemaUtilsTest.java  |   2 +-
 .../org/apache/any23/vocab/VocabularyTest.java  |  42 +-
 .../org/apache/any23/writer/JSONWriterTest.java |  65 +-
 .../apache/any23/writer/WriterRegistryTest.java |   1 -
 csvutils/pom.xml                                |   2 +-
 encoding/pom.xml                                |   2 +-
 mime/pom.xml                                    |  19 +-
 .../any23/mime/NaiveMIMETypeDetector.java       |  11 +-
 .../apache/any23/mime/TikaMIMETypeDetector.java |  22 +-
 .../org/apache/any23/mime/mimetypes.xml         |   3 +-
 .../any23/mime/TikaMIMETypeDetectorTest.java    |   4 +-
 nquads/pom.xml                                  | 131 ----
 .../apache/any23/io/nquads/NQuadsParser.java    |  52 --
 .../any23/io/nquads/NQuadsParserFactory.java    |  43 --
 .../apache/any23/io/nquads/NQuadsWriter.java    |  40 --
 .../any23/io/nquads/NQuadsWriterFactory.java    |  49 --
 .../apache/any23/io/nquads/package-info.java    |  22 -
 .../any23/io/nquads/NQuadsParserTest.java       | 654 -------------------
 .../any23/io/nquads/NQuadsWriterTest.java       | 177 -----
 nquads/src/test/resources/log4j.properties      |  35 -
 plugins/basic-crawler/pom.xml                   |  26 +-
 .../main/java/org/apache/any23/cli/Crawler.java |   4 +-
 .../java/org/apache/any23/cli/CrawlerTest.java  |   8 +-
 plugins/html-scraper/pom.xml                    |   9 +-
 .../htmlscraper/HTMLScraperExtractor.java       |  32 +-
 .../htmlscraper/HTMLScraperExtractorTest.java   |  18 +-
 .../html-scraper-extractor-test.html            |   6 +-
 plugins/integration-test/pom.xml                |   2 +-
 .../java/org/apache/any23/plugin/PluginIT.java  |  21 +-
 plugins/office-scraper/pom.xml                  |   9 +-
 .../plugin/officescraper/ExcelExtractor.java    |  86 ++-
 .../main/java/org/apache/any23/vocab/Excel.java |  32 +-
 .../officescraper/ExcelExtractorTest.java       |  18 +-
 pom.xml                                         | 138 ++--
 service/pom.xml                                 |   7 +-
 .../java/org/apache/any23/servlet/Servlet.java  |  28 +-
 service/src/main/resources/form.html            |  12 +-
 .../org/apache/any23/servlet/ServletTest.java   |  66 +-
 src/site/apt/configuration.apt                  |   2 +-
 src/site/apt/dev-csv-extractor.apt              |   6 +-
 src/site/apt/dev-data-conversion.apt            |   6 +-
 src/site/apt/dev-microformat-extractors.apt     |   2 +-
 src/site/apt/getting-started.apt                |   4 +-
 src/site/apt/service.apt                        |   8 +-
 test-resources/pom.xml                          |   2 +-
 .../application/rdfa/london-gazette.html        |   2 +-
 .../test/resources/application/rdfa/mic.xhtml   |   2 +-
 .../src/test/resources/application/rdfn3/test1  |   2 +-
 .../src/test/resources/application/rdfxml/test1 |   2 +-
 .../src/test/resources/application/turtle/test1 |   2 +-
 .../test/resources/application/xhtml/index.html |   4 +-
 .../src/test/resources/application/xhtml/test1  |   4 +-
 .../test/resources/html/mixed/01-xfn-foaf.html  |   2 +-
 .../html/rdfa/ansa_2010-02-26_12645863.html     |   2 +-
 .../resources/html/rdfa/rdfa-issue186-2.xhtml   |   4 +-
 .../microformats/hcard/infinite-loop.html       |   2 +-
 .../microformats/hcard/performance.html         |   2 +-
 .../any23/extractor/rdf/embedded_json-ld.html   |   2 +-
 306 files changed, 5483 insertions(+), 6268 deletions(-)
----------------------------------------------------------------------