ANY23-304 merge with master branch
Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/d4008bc8 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/d4008bc8 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/d4008bc8 Branch: refs/heads/master Commit: d4008bc800a4ae9e2cfdcda4fec8c519fbee8ca2 Parents: a2d07fc 72035bf Author: Lewis John McGibbney <[email protected]> Authored: Wed Jul 26 14:10:34 2017 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Jul 26 14:10:34 2017 -0700 ---------------------------------------------------------------------- README.md | 34 ++-- .../main/java/org/apache/any23/vocab/CSV.java | 2 +- .../java/org/apache/any23/vocab/SINDICE.java | 1 - .../main/java/org/apache/any23/cli/Rover.java | 4 +- .../org/apache/any23/cli/SimpleRoverTest.java | 126 +++++++++++++++ .../org/apache/any23/cli/YAMLRoverTest.java | 79 +++++++++ cli/src/test/resources/log4j.properties | 26 +++ core/pom.xml | 12 +- .../extractor/SingleDocumentExtraction.java | 3 +- .../rdf/FunctionalSyntaxExtractor.java | 53 ++++++ .../rdf/FunctionalSyntaxExtractorFactory.java | 59 +++++++ .../rdf/ManchesterSyntaxExtractor.java | 53 ++++++ .../rdf/ManchesterSyntaxExtractorFactory.java | 59 +++++++ .../any23/extractor/rdf/RDFParserFactory.java | 41 +++++ .../any23/extractor/yaml/YAMLExtractor.java | 3 +- .../any23/writer/CompositeTripleHandler.java | 4 +- .../any23/writer/LoggingTripleHandler.java | 31 ++-- .../org.apache.any23.extractor.ExtractorFactory | 2 + .../extractor/rdf/example-functionalsyntax.ofn | 5 + .../extractor/rdf/example-manchestersyntax.omn | 5 + .../apache/any23/prefixes/prefixes.properties | 21 +-- .../rdf/FunctionalSyntaxExtractorTest.java | 80 +++++++++ .../rdf/ManchesterSyntaxExtractorTest.java | 80 +++++++++ .../extractor/yaml/YAMLTikaParserTest.java | 72 +++++++++ .../apache/any23/mime/TikaMIMETypeDetector.java | 3 +- .../main/java/org/apache/any23/vocab/Excel.java | 2 +- pom.xml | 162 ++++++++++++++----- service/pom.xml | 5 +- .../org/apache/any23/servlet/ServletTest.java | 2 +- src/site/xdoc/download.xml.vm | 14 +- .../owl-functional/example-functionalsyntax.ofn | 5 + .../owl-manchester/example-manchestersyntax.omn | 5 + 32 files changed, 951 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/d4008bc8/cli/src/main/java/org/apache/any23/cli/Rover.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/d4008bc8/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/d4008bc8/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java index 19bccd1,5c73082..1e968c0 --- a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java +++ b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java @@@ -60,10 -61,10 +60,11 @@@ public class YAMLExtractor implements E public void run(ExtractionParameters extractionParameters, ExtractionContext context, InputStream in, ExtractionResult out) throws IOException, ExtractionException { - IRI documentURI = context.getDocumentIRI(); - documentRoot = makeUri("root", documentURI, false); + - log.debug("process: {}", documentURI.toString()); + IRI documentIRI = context.getDocumentIRI(); + documentRoot = RDFUtils.iri(documentIRI.toString() + "root"); + + log.debug("Processing: {}", documentIRI.toString()); out.writeNamespace(vocab.PREFIX, vocab.NS); out.writeNamespace(RDF.PREFIX, RDF.NAMESPACE); out.writeNamespace(RDFS.PREFIX, RDFS.NAMESPACE); http://git-wip-us.apache.org/repos/asf/any23/blob/d4008bc8/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/d4008bc8/service/pom.xml ----------------------------------------------------------------------
