You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/09/23 23:18:04 UTC
[1/2] jena git commit: fix for JENA-1034
Repository: jena
Updated Branches:
refs/heads/master df335ab28 -> 663733ba7
fix for JENA-1034
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f7effc4e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f7effc4e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f7effc4e
Branch: refs/heads/master
Commit: f7effc4e12d1f9fe73e07b7a6c0f123be80b66d3
Parents: 53ceeaf
Author: Claude Warren <cl...@apache.org>
Authored: Wed Sep 23 22:15:39 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Wed Sep 23 22:15:39 2015 +0100
----------------------------------------------------------------------
.../jena/arq/querybuilder/AskBuilder.java | 7 ++++++
.../jena/arq/querybuilder/ConstructBuilder.java | 7 ++++++
.../jena/arq/querybuilder/SelectBuilder.java | 7 ++++++
.../arq/querybuilder/clauses/WhereClause.java | 11 ++++++++-
.../arq/querybuilder/handlers/WhereHandler.java | 24 ++++++++++++------
.../querybuilder/clauses/WhereClauseTest.java | 26 ++++++++++++++++++++
.../querybuilder/handlers/WhereHandlerTest.java | 25 +++++++++++++++++++
7 files changed, 98 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
index 42c213c..cd737f5 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
@@ -121,6 +121,13 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
whereHandler.addOptional(t);
return this;
}
+
+ @Override
+ public AskBuilder addOptional(SelectBuilder t)
+ {
+ whereHandler.addOptional(t.getWhereHandler());
+ return this;
+ }
@Override
public AskBuilder addOptional(FrontsTriple t) {
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
index f935e2b..0eae69a 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
@@ -168,6 +168,13 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
whereHandler.addOptional(t);
return this;
}
+
+ @Override
+ public ConstructBuilder addOptional(SelectBuilder t)
+ {
+ whereHandler.addOptional(t.getWhereHandler());
+ return this;
+ }
@Override
public ConstructBuilder addOptional(FrontsTriple t) {
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
index 8ca8de3..3c1fb2c 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
@@ -266,6 +266,13 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
@Override
+ public SelectBuilder addOptional(SelectBuilder t)
+ {
+ whereHandler.addOptional(t.getWhereHandler());
+ return this;
+ }
+
+ @Override
public SelectBuilder addFilter(String s) throws ParseException {
whereHandler.addFilter(s);
return this;
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
index 2e814ad..6626c46 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
@@ -68,7 +68,7 @@ public interface WhereClause<T extends AbstractQueryBuilder<T>> {
public T addWhere(Object s, Object p, Object o);
/**
- * Adds an optional triple as to the where clause.
+ * Adds an optional triple to the where clause.
*
* @param t
* The triple to add
@@ -99,6 +99,15 @@ public interface WhereClause<T extends AbstractQueryBuilder<T>> {
* @return The Builder for chaining.
*/
public T addOptional(Object s, Object p, Object o);
+
+ /**
+ * Adds an optional group pattern to the where clause.
+ *
+ * @param t
+ * The select builder to add as a group pattern
+ * @return The Builder for chaining.
+ */
+ public T addOptional(SelectBuilder t);
/**
* Adds a filter to the where clause
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
index d7e4ba4..1215c4c 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
@@ -34,7 +34,8 @@ import org.apache.jena.sparql.syntax.* ;
import org.apache.jena.sparql.util.ExprUtils ;
/**
- * The where handler
+ * The where handler. Generally handles GroupGraphPattern.
+ * @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#rGroupGraphPattern
*
*/
public class WhereHandler implements Handler {
@@ -151,16 +152,19 @@ public class WhereHandler implements Handler {
ElementGroup eg = getClause();
List<Element> lst = eg.getElements();
if (lst.isEmpty()) {
- ElementTriplesBlock etb = new ElementTriplesBlock();
- etb.addTriple(t);
- eg.addElement(etb);
+ ElementPathBlock epb = new ElementPathBlock();
+ epb.addTriple(t);
+ eg.addElement(epb);
} else {
Element e = lst.get(lst.size() - 1);
if (e instanceof ElementTriplesBlock) {
ElementTriplesBlock etb = (ElementTriplesBlock) e;
etb.addTriple(t);
+ } else if (e instanceof ElementPathBlock) {
+ ElementPathBlock epb = (ElementPathBlock) e;
+ epb.addTriple(t);
} else {
- ElementTriplesBlock etb = new ElementTriplesBlock();
+ ElementPathBlock etb = new ElementPathBlock();
etb.addTriple(t);
eg.addElement(etb);
}
@@ -175,11 +179,15 @@ public class WhereHandler implements Handler {
*/
public void addOptional(Triple t) throws IllegalArgumentException {
testTriple(t);
- ElementTriplesBlock etb = new ElementTriplesBlock();
- etb.addTriple(t);
- ElementOptional opt = new ElementOptional(etb);
+ ElementPathBlock epb = new ElementPathBlock();
+ epb.addTriple(t);
+ ElementOptional opt = new ElementOptional(epb);
getClause().addElement(opt);
}
+
+ public void addOptional(WhereHandler whereHandler) {
+ getClause().addElement( new ElementOptional( whereHandler.getClause()));
+ }
/**
* Add an expression string as a filter.
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
index 50e6420..7f03387 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
@@ -21,10 +21,13 @@ import java.util.List;
import org.apache.jena.arq.querybuilder.AbstractQueryBuilder;
import org.apache.jena.arq.querybuilder.SelectBuilder;
+import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
+import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.graph.impl.LiteralLabelFactory;
import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.E_Random;
import org.apache.jena.sparql.lang.sparql_11.ParseException;
@@ -32,6 +35,7 @@ import org.apache.jena.sparql.syntax.Element;
import org.apache.jena.sparql.syntax.ElementGroup;
import org.apache.jena.sparql.syntax.ElementTriplesBlock;
import org.junit.After;
+import org.junit.Assert;
import static org.junit.Assert.*;
@@ -107,6 +111,28 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
+ uri("three") + OPT_SPACE + CLOSE_CURLY,
builder.buildString());
}
+
+ @ContractTest
+ public void testAddOptionalGroupPattern() throws ParseException {
+
+ Var s = Var.alloc("s" );
+ Node q = NodeFactory.createURI( "urn:q" );
+ Node v = NodeFactory.createURI( "urn:v" );
+ Var x = Var.alloc("x");
+ Node n123 = NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral(123));
+
+ SelectBuilder pattern = new SelectBuilder();
+ pattern.addWhere( new Triple( s, q, n123 ) );
+ pattern.addWhere( new Triple( s, v, x));
+ pattern.addFilter( "?x>56");
+
+ WhereClause<?> whereClause = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = whereClause.addOptional( pattern );
+
+ Query expected = QueryFactory.create( "SELECT * WHERE { OPTIONAL { ?s <urn:q> '123'^^<http://www.w3.org/2001/XMLSchema#int> . ?s <urn:v> ?x . FILTER(?x>56) }}");
+
+ Assert.assertEquals( expected.getQueryPattern(), builder.build().getQueryPattern());
+ }
@ContractTest
public void testAddFilter() throws ParseException {
http://git-wip-us.apache.org/repos/asf/jena/blob/f7effc4e/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
index f1bc12d..9ef1a55 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
@@ -27,11 +27,13 @@ import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.graph.impl.LiteralLabelFactory;
import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
import org.apache.jena.rdf.model.ResourceFactory;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.E_Random;
import org.apache.jena.sparql.lang.sparql_11.ParseException;
import org.apache.jena.vocabulary.RDF;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -107,6 +109,29 @@ public class WhereHandlerTest extends AbstractHandlerTest {
query.toString());
}
+
+ @Test
+ public void testAddOptionalWhereHandler() throws ParseException {
+
+ WhereHandler pattern = new WhereHandler(new Query());
+ Var s = Var.alloc("s" );
+ Node q = NodeFactory.createURI( "urn:q" );
+ Node v = NodeFactory.createURI( "urn:v" );
+ Var x = Var.alloc("x");
+ Node n123 = NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral(123));
+
+ pattern.addWhere( new Triple( s, q, n123 ) );
+ pattern.addWhere( new Triple( s, v, x));
+ pattern.addFilter( "?x>56");
+
+ handler.addOptional( pattern );
+
+ Query expected = QueryFactory.create( "SELECT * WHERE { OPTIONAL { ?s <urn:q> '123'^^<http://www.w3.org/2001/XMLSchema#int> . ?s <urn:v> ?x . FILTER(?x>56) }}");
+
+ Assert.assertEquals( expected.getQueryPattern(), query.getQueryPattern());
+
+ }
+
@Test
public void testAddOptionalObjects() {
handler.addOptional(new Triple(NodeFactory.createURI("one"),
[2/2] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by cl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/663733ba
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/663733ba
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/663733ba
Branch: refs/heads/master
Commit: 663733ba7e65c095c47ef0ecd75f3b71a655eb92
Parents: f7effc4 df335ab
Author: Claude Warren <cl...@apache.org>
Authored: Wed Sep 23 22:16:53 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Wed Sep 23 22:16:53 2015 +0100
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi-test/pom.xml | 4 +-
jena-arq/pom.xml | 2 +-
.../arq/examples/riot/ExRIOT_5.java | 22 +-
.../arq/examples/riot/ExRIOT_out3.java | 14 +-
jena-arq/src/main/java/arq/cmdline/CmdARQ.java | 3 +-
.../main/java/arq/cmdline/ModLangOutput.java | 2 +-
.../src/main/java/arq/cmdline/ModSymbol.java | 6 +-
.../main/java/org/apache/jena/query/ARQ.java | 137 ++++++------
.../main/java/org/apache/jena/query/Query.java | 3 +-
.../main/java/org/apache/jena/riot/IO_Jena.java | 31 +--
.../java/org/apache/jena/riot/RDFDataMgr.java | 6 +-
.../org/apache/jena/riot/RDFWriterRegistry.java | 42 +++-
.../main/java/org/apache/jena/riot/RIOT.java | 12 +-
.../java/org/apache/jena/riot/RiotReader.java | 2 +
.../jena/riot/adapters/JenaReadersWriters.java | 50 -----
.../riot/adapters/RDFReaderFactoryRIOT.java | 53 ++---
.../jena/riot/adapters/RDFReaderRIOT.java | 2 +-
.../jena/riot/adapters/RDFReaderRIOT_ARP.java | 94 --------
.../jena/riot/adapters/RDFReaderRIOT_CSV.java | 62 ------
.../jena/riot/adapters/RDFReaderRIOT_Web.java | 99 ---------
.../riot/adapters/RDFWriterFactoryRIOT.java | 53 +++++
.../jena/riot/adapters/RDFWriterRIOT.java | 92 ++++----
.../apache/jena/riot/system/IO_JenaReaders.java | 76 +++----
.../apache/jena/riot/system/IO_JenaWriters.java | 122 ++--------
.../org/apache/jena/riot/system/InitRIOT.java | 39 ++++
.../org/apache/jena/sparql/ARQConstants.java | 34 +--
.../java/org/apache/jena/sparql/SystemARQ.java | 17 ++
.../jena/sparql/algebra/optimize/Optimize.java | 3 +-
.../sparql/algebra/optimize/TransformTopN.java | 4 +-
.../sparql/core/assembler/AssemblerUtils.java | 3 +-
.../apache/jena/sparql/engine/http/Service.java | 16 +-
.../engine/join/AbstractIterHashJoin.java | 5 +-
.../jena/sparql/engine/main/JoinClassifier.java | 28 ++-
.../jena/sparql/engine/main/StageBuilder.java | 18 +-
.../jena/sparql/engine/main/VarFinder.java | 33 ++-
.../engine/optimizer/reorder/ReorderFixed.java | 1 +
.../apache/jena/sparql/lang/ParserSPARQL11.java | 1 +
.../java/org/apache/jena/sparql/sse/SSE.java | 3 +
.../org/apache/jena/sparql/system/InitARQ.java | 39 ++++
.../src/main/java/riotcmd/CmdLangParse.java | 3 +-
jena-arq/src/main/java/riotcmd/dumpthrift.java | 6 +-
...rg.apache.jena.system.JenaSubsystemLifecycle | 2 +
jena-arq/src/test/java/arq/qtest.java | 7 +-
.../test/java/org/apache/jena/riot/TC_Riot.java | 3 +-
.../java/org/apache/jena/riot/TS_LangSuite.java | 3 +-
.../org/apache/jena/riot/TS_ReaderRIOT.java | 3 +-
.../apache/jena/riot/TestJenaReaderRIOT.java | 12 -
.../java/org/apache/jena/riot/TestReadData.java | 12 -
.../apache/jena/riot/lang/TestLangRdfJson.java | 15 +-
.../jena/riot/system/TestIO_JenaReaders.java | 97 ++++----
.../jena/riot/system/TestIO_JenaWriters.java | 111 ++++------
.../jena/riot/thrift/TestStreamRDFThrift.java | 5 +-
.../jena/riot/thrift/TestThriftSetup.java | 4 +-
.../apache/jena/riot/writer/TS_RiotWriter.java | 4 +-
.../jena/riot/writer/TestJenaWriters.java | 8 +-
.../org/apache/jena/sparql/ARQTestSuite.java | 6 +-
.../jena/sparql/algebra/TestClassify.java | 5 +
jena-arq/src/test/java/riotcmd/rdflangtest.java | 3 +-
.../org/apache/jena/atlas/lib/Registry.java | 1 +
jena-core/src/main/java/jena/rdfcat.java | 14 +-
.../org/apache/jena/assembler/Assembler.java | 1 +
.../assembler/assemblers/AssemblerBase.java | 4 +-
.../org/apache/jena/rdf/model/ModelFactory.java | 2 +
.../org/apache/jena/rdf/model/impl/IO_Ctl.java | 71 ------
.../apache/jena/rdf/model/impl/ModelCom.java | 10 +-
.../jena/rdf/model/impl/RDFReaderFImpl.java | 218 +++++++++---------
.../jena/rdf/model/impl/RDFWriterFImpl.java | 222 ++++++++++---------
.../org/apache/jena/system/InitJenaCore.java | 72 ++++++
.../jena/system/JenaSubsystemLifecycle.java | 35 +++
.../jena/system/JenaSubsystemRegistry.java | 53 +++++
.../jena/system/JenaSubsystemRegistryBasic.java | 88 ++++++++
.../java/org/apache/jena/system/JenaSystem.java | 201 +++++++++++++++++
.../java/org/apache/jena/util/FileManager.java | 12 +-
...rg.apache.jena.system.JenaSubsystemLifecycle | 2 +
.../jena/propertytable/impl/InitJenaCSV.java | 34 +++
...rg.apache.jena.system.JenaSubsystemLifecycle | 1 +
.../java/org/apache/jena/fuseki/Fuseki.java | 6 +-
.../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +-
.../apache/jena/fuseki/migrate/Registry.java | 42 ----
.../jena/fuseki/server/DatasetRegistry.java | 4 +-
.../apache/jena/fuseki/server/FusekiConfig.java | 5 +-
.../java/org/apache/jena/fuseki/ServerTest.java | 2 +
.../java/org/apache/jena/fuseki/Fuseki.java | 33 ++-
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 6 +-
.../server/FusekiServerEnvironmentInit.java | 6 +-
.../jena/fuseki/servlets/ServletBase.java | 3 +
.../jena/jdbc/AbstractJenaDriverTests.java | 3 +-
.../AbstractJenaConnectionTests.java | 3 +-
.../results/AbstractDatabaseMetadataTests.java | 3 +-
.../jdbc/results/AbstractResultSetTests.java | 4 +-
.../org/apache/jena/jdbc/mem/MemDriver.java | 3 +-
.../jena/jdbc/remote/RemoteEndpointDriver.java | 11 +-
.../AbstractRemoteEndpointResultSetTests.java | 3 +-
.../org/apache/jena/jdbc/tdb/TDBDriver.java | 6 +-
jena-parent/pom.xml | 3 +-
.../model/impl/SecuredResourceImpl.java | 22 +-
.../jena/permissions/graph/TDBGraphTest.java | 1 -
.../jena/permissions/SecuredAssemblerTest.ttl | 2 +-
.../src/main/java/org/apache/jena/sdb/SDB.java | 86 +++----
.../java/org/apache/jena/sdb/SDBFactory.java | 2 +
.../jena/sdb/assembler/StoreDescAssembler.java | 3 -
.../java/org/apache/jena/sdb/core/InitSDB.java | 39 ++++
jena-sdb/src/main/java/sdb/cmd/CmdArgsDB.java | 1 -
...rg.apache.jena.system.JenaSubsystemLifecycle | 1 +
.../apache/jena/sdb/test/SDBQueryTestSuite.java | 6 +-
.../main/java/examples/JenaSpatialExample1.java | 2 -
.../src/main/java/jena/spatialindexdump.java | 8 +-
.../src/main/java/jena/spatialindexer.java | 8 +-
.../jena/query/spatial/InitJenaSpatial.java | 32 +++
.../query/spatial/SpatialDatasetFactory.java | 3 +-
.../apache/jena/query/spatial/SpatialQuery.java | 28 ++-
...rg.apache.jena.system.JenaSubsystemLifecycle | 1 +
.../jena/query/spatial/SpatialSearchUtil.java | 3 -
.../src/main/java/org/apache/jena/tdb/TDB.java | 74 ++++---
.../java/org/apache/jena/tdb/TDBFactory.java | 3 +
.../jena/tdb/assembler/DatasetAssemblerTDB.java | 4 +-
.../jena/tdb/assembler/TDBGraphAssembler.java | 18 +-
.../org/apache/jena/tdb/store/GraphTDB.java | 4 +-
.../store/bulkloader2/CmdNodeTableBuilder.java | 12 +-
.../java/org/apache/jena/tdb/sys/InitTDB.java | 42 ++++
.../java/org/apache/jena/tdb/sys/SystemTDB.java | 6 +-
jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java | 4 +-
...rg.apache.jena.system.JenaSubsystemLifecycle | 1 +
.../main/java/examples/JenaTextExample1.java | 2 -
jena-text/src/main/java/jena/textindexdump.java | 1 -
jena-text/src/main/java/jena/textindexer.java | 1 -
.../apache/jena/query/text/InitJenaText.java | 33 +++
.../jena/query/text/TextDatasetFactory.java | 3 +-
.../org/apache/jena/query/text/TextQuery.java | 23 +-
...rg.apache.jena.system.JenaSubsystemLifecycle | 1 +
.../jena/query/text/TestBuildTextDataset.java | 7 -
.../TestDatasetWithEmbeddedSolrTextIndex.java | 1 -
132 files changed, 1747 insertions(+), 1483 deletions(-)
----------------------------------------------------------------------