Merge commit 'refs/pull/53/head' of github.com:apache/jena This closes #53.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9e93ae9b Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9e93ae9b Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9e93ae9b Branch: refs/heads/master Commit: 9e93ae9bb31455f80877ca16d97c45345a14162f Parents: 6570c25 454af09 Author: Andy Seaborne <[email protected]> Authored: Wed Jun 17 21:54:31 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed Jun 17 21:54:31 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/jena/query/text/Entity.java | 9 +- .../jena/query/text/EntityDefinition.java | 9 ++ .../jena/query/text/TextDocProducerTriples.java | 24 +++- .../org/apache/jena/query/text/TextIndex.java | 1 + .../apache/jena/query/text/TextIndexLucene.java | 27 ++++- .../apache/jena/query/text/TextIndexSolr.java | 8 +- .../apache/jena/query/text/TextQueryFuncs.java | 8 +- .../assembler/EntityDefinitionAssembler.java | 5 + .../jena/query/text/assembler/TextVocab.java | 1 + ...tasetWithLuceneTextIndexDeletionSupport.java | 53 +++++++++ .../AbstractTestDatasetWithTextIndexBase.java | 56 ++++++++-- .../org/apache/jena/query/text/TS_Text.java | 3 +- ...tDatasetWithLuceneMultilingualTextIndex.java | 2 +- ...tasetWithLuceneTextIndexDeletionSupport.java | 109 +++++++++++++++++++ ...DatasetWithLuceneTextIndexWithLangField.java | 2 +- 15 files changed, 288 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
