Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9B7C5200CD2 for ; Thu, 13 Jul 2017 07:51:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9A25F16A982; Thu, 13 Jul 2017 05:51:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E93FD16A978 for ; Thu, 13 Jul 2017 07:51:22 +0200 (CEST) Received: (qmail 63527 invoked by uid 500); 13 Jul 2017 05:51:22 -0000 Mailing-List: contact commits-help@any23.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: any23-dev@any23.apache.org Delivered-To: mailing list commits@any23.apache.org Received: (qmail 63437 invoked by uid 99); 13 Jul 2017 05:51:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jul 2017 05:51:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 756D8E97E9; Thu, 13 Jul 2017 05:51:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ansell@apache.org To: commits@any23.apache.org Date: Thu, 13 Jul 2017 05:51:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] any23 git commit: Merge branch 'master' into ANY23-308 archived-at: Thu, 13 Jul 2017 05:51:23 -0000 Merge branch 'master' into ANY23-308 - resolve conflicts: README.md Signed-off-by:Jacek Grzebyta Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/c4c75a0c Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/c4c75a0c Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/c4c75a0c Branch: refs/heads/master Commit: c4c75a0c3bb09b190985ec6796f4cca34ed3f6fb Parents: ae036a7 5bc7e46 Author: Jacek Grzebyta Authored: Tue Jul 11 12:11:56 2017 +0100 Committer: Jacek Grzebyta Committed: Tue Jul 11 12:11:56 2017 +0100 ---------------------------------------------------------------------- README.md | 24 +-- core/pom.xml | 11 ++ .../rdf/FunctionalSyntaxExtractor.java | 53 +++++++ .../rdf/FunctionalSyntaxExtractorFactory.java | 59 +++++++ .../rdf/ManchesterSyntaxExtractor.java | 53 +++++++ .../rdf/ManchesterSyntaxExtractorFactory.java | 59 +++++++ .../any23/extractor/rdf/RDFParserFactory.java | 41 +++++ .../org.apache.any23.extractor.ExtractorFactory | 2 + .../extractor/rdf/example-functionalsyntax.ofn | 5 + .../extractor/rdf/example-manchestersyntax.omn | 5 + .../rdf/FunctionalSyntaxExtractorTest.java | 80 ++++++++++ .../rdf/ManchesterSyntaxExtractorTest.java | 80 ++++++++++ .../java/org/apache/any23/plugin/PluginIT.java | 3 +- pom.xml | 157 ++++++++++++++----- service/pom.xml | 5 +- .../owl-functional/example-functionalsyntax.ofn | 5 + .../owl-manchester/example-manchestersyntax.omn | 5 + 17 files changed, 590 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/c4c75a0c/README.md ---------------------------------------------------------------------- diff --cc README.md index 6c52061,6a7f135..e895e4f --- a/README.md +++ b/README.md @@@ -13,18 -13,18 +13,18 @@@ Any23 documentation can be found on th # Distribution Content - * [api](https://github.com/lewismc/any23/tree/master/api): Any23 library external API. - * [core](https://github.com/lewismc/any23/tree/master/core): The library core codebase. - * [utils](https://github.com/lewismc/any23/tree/master/utils): An utilities package - * [encoding](https://github.com/lewismc/any23/tree/master/encoding): Encoding detection library. - * [mime](https://github.com/lewismc/any23/tree/master/mime): MIME Type detection library. - * [nquads](https://github.com/lewismc/any23/tree/master/nquads): NQuads parsing and serialization library. - * [plugins](https://github.com/lewismc/any23/tree/master/plugins): Library plugins codebase (read [plugins/README.txt](https://github.com/lewismc/any23/blob/master/plugins/README.md) for further details). - * [service](https://github.com/lewismc/any23/tree/master/service): The library HTTP service codebase. - * [src](https://github.com/lewismc/any23/tree/master/src): Packaging for Any23 artifacts. - * [test-resources](https://github.com/lewismc/any23/tree/master/test-resources): Material relating to Any23 JUnit test cases. - * [RELEASE-NOTES.txt](https://github.com/lewismc/any23/blob/master/RELEASE-NOTES.txt): File reporting main release notes for every version. - * [LICENSE.txt](https://github.com/lewismc/any23/blob/master/LICENSE.txt): Applicable project license. + * [api](https://github.com/apache/any23/tree/master/api): Any23 library external API. + * [core](https://github.com/apache/any23/tree/master/core): The library core codebase. - * [csvutils](https://github.com/apache/any23/tree/master/csvutils): A CSV specific package ++ * [utils](https://github.com/apache/any23/tree/master/utils): A CSV specific package + * [encoding](https://github.com/apache/any23/tree/master/encoding): Encoding detection library. + * [mime](https://github.com/apache/any23/tree/master/mime): MIME Type detection library. + * [nquads](https://github.com/apache/any23/tree/master/nquads): NQuads parsing and serialization library. + * [plugins](https://github.com/apache/any23/tree/master/plugins): Library plugins codebase (read [plugins/README.md](https://github.com/apache/any23/blob/master/plugins/README.md) for further details). + * [service](https://github.com/apache/any23/tree/master/service): The library HTTP service codebase. + * [src](https://github.com/apache/any23/tree/master/src): Packaging for Any23 artifacts. + * [test-resources](https://github.com/apache/any23/tree/master/test-resources): Material relating to Any23 JUnit test cases. + * [RELEASE-NOTES.txt](https://github.com/apache/any23/blob/master/RELEASE-NOTES.txt): File reporting main release notes for every version. + * [LICENSE.txt](https://github.com/apache/any23/blob/master/LICENSE.txt): Applicable project license. * README.md: This file. # Online Documentation http://git-wip-us.apache.org/repos/asf/any23/blob/c4c75a0c/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/c4c75a0c/pom.xml ----------------------------------------------------------------------