You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/06/28 16:57:23 UTC

[14/18] jena git commit: Merge branch 'master' 3.3.0+ of https://github.com/apache/jena into generic-text-analyzers

Merge branch 'master' 3.3.0+ of https://github.com/apache/jena into generic-text-analyzers


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6ac75fea
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6ac75fea
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6ac75fea

Branch: refs/heads/master
Commit: 6ac75fea9a36d7d195d7cf4d9d5d2b4505252932
Parents: fef4d22 f1f50bd
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Tue May 23 13:12:39 2017 -0500
Committer: Chris Tomlinson <ct...@moonvine.org>
Committed: Tue May 23 13:12:39 2017 -0500

----------------------------------------------------------------------
 apache-jena-libs/pom.xml                        |   8 +-
 apache-jena-osgi/jena-osgi-features/pom.xml     |   2 +-
 apache-jena-osgi/jena-osgi/pom.xml              |  14 +-
 apache-jena-osgi/pom.xml                        |   4 +-
 apache-jena/pom.xml                             |  34 +-
 jena-arq/pom.xml                                |  12 +-
 .../apache/jena/atlas/data/SortedDataBag.java   |   1 +
 .../jena/query/QueryExecutionFactory.java       |  96 +++-
 .../java/org/apache/jena/riot/RDFDataMgr.java   |  14 +-
 .../java/org/apache/jena/riot/RDFWriter.java    | 220 +++++++++
 .../org/apache/jena/riot/RDFWriterBuilder.java  | 165 +++++++
 .../jena/riot/adapters/AdapterFileManager.java  |   3 +-
 .../apache/jena/riot/adapters/AdapterLib.java   |  51 +--
 .../apache/jena/riot/lang/ReaderRIOTRDFXML.java |  59 ++-
 .../jena/sparql/algebra/TableFactory.java       |   7 +-
 .../java/org/apache/jena/sparql/core/Quad.java  |   3 +
 .../jena/sparql/engine/QueryIterator.java       |   6 +
 .../jena/sparql/engine/binding/BindingRoot.java |   2 -
 .../jena/sparql/engine/http/HttpQuery.java      |  33 +-
 .../sparql/engine/http/QueryEngineHTTP.java     |  35 +-
 .../sparql/engine/iterator/QueryIterRoot.java   |  20 +-
 .../sparql/engine/iterator/QueryIterSort.java   |  14 +-
 .../sparql/engine/iterator/QueryIterTopN.java   |  46 +-
 .../jena/sparql/engine/main/OpExecutor.java     |   6 +-
 .../sparql/engine/main/QueryEngineMain.java     |   6 +-
 .../engine/main/StageGeneratorGeneric.java      |  11 +-
 .../org/apache/jena/sparql/engine/ref/Eval.java |   4 +-
 .../jena/sparql/engine/ref/EvaluatorSimple.java |   4 +-
 .../jena/sparql/modify/UpdateProcessRemote.java |   5 +-
 .../sparql/modify/UpdateProcessRemoteForm.java  |   7 +-
 .../jena/sparql/path/eval/PathEngine.java       |   2 +-
 .../jena/sparql/pfunction/PFuncListAndList.java |  51 +++
 .../sparql/pfunction/PFuncListAndSimple.java    |  59 +++
 .../jena/sparql/pfunction/PFuncSimple.java      |   3 +-
 .../sparql/pfunction/PFuncSimpleAndList.java    |   4 +-
 .../sparql/pfunction/PropertyFunctionEval.java  |   8 +
 .../jena/update/UpdateExecutionFactory.java     | 114 ++++-
 .../org/apache/jena/riot/TS_RiotGeneral.java    |   5 +-
 .../org/apache/jena/riot/TestRDFWriter.java     |  88 ++++
 .../engine/iterator/TestQueryIterSort.java      |  91 +++-
 jena-base/pom.xml                               |   6 +-
 .../apache/jena/atlas/lib/ByteBufferLib.java    |   4 +-
 jena-cmds/pom.xml                               |  12 +-
 jena-core/pom.xml                               |  10 +-
 jena-csv/pom.xml                                |  10 +-
 jena-elephas/jena-elephas-common/pom.xml        |   2 +-
 jena-elephas/jena-elephas-io/pom.xml            |   2 +-
 jena-elephas/jena-elephas-mapreduce/pom.xml     |   2 +-
 jena-elephas/jena-elephas-stats/pom.xml         |   2 +-
 jena-elephas/pom.xml                            |   6 +-
 jena-extras/jena-querybuilder/pom.xml           |   2 +-
 jena-extras/pom.xml                             |   6 +-
 jena-fuseki1/pom.xml                            |  18 +-
 jena-fuseki2/apache-jena-fuseki/pom.xml         |   4 +-
 jena-fuseki2/jena-fuseki-core/pom.xml           |  14 +-
 .../jena/fuseki/servlets/ResponseResultSet.java | 151 +++----
 .../src/main/webapp/dataset.html                |   4 +-
 jena-fuseki2/jena-fuseki-embedded/pom.xml       |   4 +-
 jena-fuseki2/jena-fuseki-server/pom.xml         |   4 +-
 jena-fuseki2/jena-fuseki-war/pom.xml            |   2 +-
 jena-fuseki2/pom.xml                            |   4 +-
 jena-integration-tests/pom.xml                  |  18 +-
 .../rdfconnection/TestRDFConnectionRemote.java  |  20 +-
 jena-iri/pom.xml                                |   4 +-
 jena-jdbc/jena-jdbc-core/pom.xml                |   4 +-
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml       |  20 +-
 jena-jdbc/jena-jdbc-driver-mem/pom.xml          |   6 +-
 jena-jdbc/jena-jdbc-driver-remote/pom.xml       |  10 +-
 jena-jdbc/jena-jdbc-driver-tdb/pom.xml          |  10 +-
 jena-jdbc/pom.xml                               |   4 +-
 jena-parent/pom.xml                             |   2 +-
 jena-permissions/pom.xml                        |   4 +-
 jena-rdfconnection/pom.xml                      |  12 +-
 .../org/apache/jena/rdfconnection/RDFConn.java  |  41 +-
 .../rdfconnection/RDFConnectionFactory.java     |   3 +-
 .../jena/rdfconnection/RDFConnectionRemote.java |  70 +--
 .../jena/rdfconnection/TS_RDFConnection.java    |   3 +-
 .../apache/jena/rdfconnection/TestRDFConn.java  | 127 ++++++
 jena-sdb/pom.xml                                |  14 +-
 .../apache/jena/sdb/engine/QueryEngineSDB.java  |   2 +-
 jena-shaded-guava/pom.xml                       |   4 +-
 jena-spatial/pom.xml                            |  10 +-
 .../jena/query/spatial/SpatialIndexContext.java |   4 +-
 .../assembler/SpatialIndexLuceneAssembler.java  |   1 +
 .../query/spatial/pfunction/SpatialMatch.java   |   6 +-
 .../pfunction/SpatialOperationPFBase.java       |   7 +-
 .../jena/query/spatial/SpatialSearchUtil.java   |   4 +-
 jena-tdb/pom.xml                                |  12 +-
 jena-text-es/.gitignore                         |   0
 jena-text-es/LICENSE                            | 202 +++++++++
 jena-text-es/NOTICE                             |   5 +
 jena-text-es/pom.xml                            | 226 ++++++++++
 .../main/java/examples/JenaESTextExample.java   |  95 ++++
 .../apache/jena/query/text/es/ESSettings.java   | 177 ++++++++
 .../jena/query/text/es/InitJenaTextES.java      |  34 ++
 .../query/text/es/TextESDatasetFactory.java     |  57 +++
 .../apache/jena/query/text/es/TextIndexES.java  | 451 +++++++++++++++++++
 .../text/es/assembler/TextIndexESAssembler.java | 117 +++++
 .../src/main/resources/META-INF/LICENSE         | 202 +++++++++
 jena-text-es/src/main/resources/META-INF/NOTICE |   5 +
 ...rg.apache.jena.system.JenaSubsystemLifecycle |   1 +
 jena-text-es/src/main/resources/data-es.ttl     |  46 ++
 .../org/apache/jena/query/text/properties.xml   |   9 +
 .../src/main/resources/text-config-es.ttl       |  64 +++
 .../jena/query/text/es/it/BaseESTest.java       | 111 +++++
 .../jena/query/text/es/it/TextIndexESIT.java    | 306 +++++++++++++
 .../src/test/resources/log4j.properties         |  10 +
 jena-text-es/testing/TextQuery/data.skos        |  36 ++
 jena-text-es/testing/TextQuery/data1.ttl        |  26 ++
 .../testing/TextQuery/text-config-union.ttl     |  44 ++
 jena-text-es/testing/TextQuery/text-config.ttl  |  43 ++
 jena-text-es/text-config.ttl                    |  62 +++
 jena-text/pom.xml                               | 107 +----
 .../main/java/examples/JenaESTextExample.java   |  99 ----
 .../jena/query/text/DatasetGraphText.java       |   2 -
 .../org/apache/jena/query/text/ESSettings.java  | 177 --------
 .../jena/query/text/TextDatasetFactory.java     |  25 -
 .../org/apache/jena/query/text/TextIndexES.java | 450 ------------------
 .../org/apache/jena/query/text/TextQueryPF.java |  20 +-
 .../query/text/assembler/TextAssembler.java     |   1 -
 .../text/assembler/TextIndexESAssembler.java    | 113 -----
 .../jena/query/text/assembler/TextVocab.java    |   2 -
 .../apache/jena/query/text/it/BaseESTest.java   | 111 -----
 .../jena/query/text/it/TextIndexESIT.java       | 306 -------------
 pom.xml                                         |  11 +-
 125 files changed, 3875 insertions(+), 1886 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6ac75fea/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextAssembler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/jena/blob/6ac75fea/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
----------------------------------------------------------------------