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 2015/09/18 11:21:27 UTC
[6/8] jena git commit: JENA-1029: Remove unnecessary .init() calls
JENA-1029: Remove unnecessary .init() calls
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/15ced7e8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/15ced7e8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/15ced7e8
Branch: refs/heads/Jena-1029_subsystem
Commit: 15ced7e893926d5d71481e27701c37fb2f1c5870
Parents: 55a8eab
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 08:35:15 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 08:35:15 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/ARQ.java | 1 -
.../jena/system/JenaSubsystemLifecycle.java | 3 +++
.../java/org/apache/jena/fuseki/FusekiCmd.java | 13 +++++--------
.../apache/jena/fuseki/server/FusekiConfig.java | 5 +----
.../main/java/org/apache/jena/fuseki/Fuseki.java | 9 ---------
.../jena/permissions/graph/TDBGraphTest.java | 1 -
.../main/java/examples/JenaSpatialExample1.java | 2 --
.../src/main/java/jena/spatialindexdump.java | 8 +++-----
.../src/main/java/jena/spatialindexer.java | 8 +++-----
.../jena/query/spatial/SpatialDatasetFactory.java | 3 ++-
.../jena/query/spatial/SpatialSearchUtil.java | 3 ---
.../src/main/java/org/apache/jena/tdb/TDB.java | 4 ++--
.../jena/tdb/assembler/TDBGraphAssembler.java | 18 +++++++++---------
.../src/main/java/examples/JenaTextExample1.java | 2 --
jena-text/src/main/java/jena/textindexdump.java | 1 -
jena-text/src/main/java/jena/textindexer.java | 1 -
.../jena/query/text/TextDatasetFactory.java | 3 ++-
.../jena/query/text/TestBuildTextDataset.java | 7 -------
.../TestDatasetWithEmbeddedSolrTextIndex.java | 1 -
19 files changed, 30 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
index dfef428..adbf742 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -530,7 +530,6 @@ public class ARQ
/** Ensure things have started - applications do not need call this.
* The method is public so any part of ARQ can call it.
- * Note the final static initializer call
*/
static { JenaSystem.init(); }
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemLifecycle.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemLifecycle.java b/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemLifecycle.java
index daf6b2a..a3cd771 100644
--- a/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemLifecycle.java
+++ b/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemLifecycle.java
@@ -20,10 +20,13 @@ package org.apache.jena.system;
/** Lifecycle interface for jena modules and subsystems. */
public interface JenaSubsystemLifecycle {
+
/** start - a module should be ready to oeprate when this returns */
public void start() ;
+
/** stop - a module should have preformed any shutdown operations by the time this returns */
public void stop() ;
+
/** Provide a marker as to the level to order initialization, 10,20,30,...
* See {@link JenaSystem} for details.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
index 6baf5d9..5598073 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
@@ -25,6 +25,10 @@ import java.io.InputStream ;
import java.util.List ;
import java.util.Objects;
+import arq.cmdline.CmdARQ ;
+import arq.cmdline.ModDatasetAssembler ;
+import jena.cmd.ArgDecl ;
+import jena.cmd.CmdException ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.lib.StrUtils ;
@@ -48,11 +52,6 @@ import org.apache.jena.tdb.transaction.TransactionManager ;
import org.eclipse.jetty.server.Server ;
import org.slf4j.Logger ;
-import jena.cmd.ArgDecl ;
-import jena.cmd.CmdException ;
-import arq.cmdline.CmdARQ ;
-import arq.cmdline.ModDatasetAssembler ;
-
public class FusekiCmd extends CmdARQ
{
private static String log4Jsetup = StrUtils.strjoinNL(
@@ -157,9 +156,7 @@ public class FusekiCmd extends CmdARQ
static public void main(String...argv)
{
- // Just to make sure ...
- ARQ.init() ;
- TDB.init() ;
+ // Just to make sure ...s
Fuseki.init() ;
new FusekiCmd(argv).mainRun() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
index 18efa5d..0eb7b5d 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
@@ -37,7 +37,6 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphFactory ;
import org.apache.jena.sparql.core.DatasetGraphReadOnly ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
-import org.apache.jena.tdb.TDB ;
import org.apache.jena.util.FileManager ;
import org.apache.jena.vocabulary.RDF ;
import org.apache.jena.vocabulary.RDFS ;
@@ -103,9 +102,7 @@ public class FusekiConfig
public static ServerConfig configure(String filename)
{
// Be absolutely sure everything has initialized.
- // Some initialization registers assemblers and sets abbreviation vocabulary.
- ARQ.init();
- TDB.init() ;
+ // Some initialization registers assemblers and sets abbreviation vocabulary.
Fuseki.init() ;
Model m = FileManager.get().loadModel(filename) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
index 991c673..8472422 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
@@ -220,15 +220,6 @@ public class Fuseki {
FusekiLogging.setLogging() ;
SystemInfo sysInfo = new SystemInfo(FusekiIRI, PATH, VERSION, BUILD_DATE) ;
SystemARQ.registerSubSystem(sysInfo) ;
- TDB.init() ;
- // Initialize anyway (e.g. not to rely on assembler magic).
- try {
- TextQuery.init() ;
- SpatialQuery.init() ;
- } catch ( Exception ex ) {
- // In case jars are missing.
- }
-
MappingRegistry.addPrefixMapping("fuseki", FusekiSymbolIRI) ;
TDB.setOptimizerWarningFlag(false) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java
index 09488b9..49326a3 100644
--- a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java
+++ b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java
@@ -36,7 +36,6 @@ public class TDBGraphTest extends MemGraphTest {
@Override
protected Graph createGraph() throws IOException {
- TDB.init();
dsGraph = TDBFactory.createDataset().asDatasetGraph();
return dsGraph.getDefaultGraph();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/examples/JenaSpatialExample1.java b/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
index 1bdabee..5adc33d 100644
--- a/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
+++ b/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
@@ -95,14 +95,12 @@ public class JenaSpatialExample1 {
}
private static Dataset initInMemoryDatasetWithLuceneSpatitalIndex(File indexDir) throws IOException{
- SpatialQuery.init();
deleteOldFiles(indexDir);
indexDir.mkdirs();
return createDatasetByCode(indexDir);
}
private static Dataset initTDBDatasetWithLuceneSpatitalIndex(File indexDir, File TDBDir) throws IOException{
- SpatialQuery.init();
deleteOldFiles(indexDir);
deleteOldFiles(TDBDir);
indexDir.mkdirs();
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-spatial/src/main/java/jena/spatialindexdump.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/jena/spatialindexdump.java b/jena-spatial/src/main/java/jena/spatialindexdump.java
index 65b51bc..904637c 100644
--- a/jena-spatial/src/main/java/jena/spatialindexdump.java
+++ b/jena-spatial/src/main/java/jena/spatialindexdump.java
@@ -18,11 +18,13 @@
package jena ;
+import arq.cmdline.CmdARQ ;
+import jena.cmd.ArgDecl ;
+import jena.cmd.CmdException ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.spatial.SpatialIndex ;
import org.apache.jena.query.spatial.SpatialIndexException ;
import org.apache.jena.query.spatial.SpatialIndexLucene ;
-import org.apache.jena.query.spatial.SpatialQuery ;
import org.apache.jena.query.spatial.assembler.SpatialVocab ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.lucene.analysis.Analyzer ;
@@ -37,9 +39,6 @@ import org.apache.lucene.search.ScoreDoc ;
import org.apache.lucene.store.Directory ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-import jena.cmd.ArgDecl ;
-import jena.cmd.CmdException ;
-import arq.cmdline.CmdARQ ;
/**
* Text index development tool - dump the index.
@@ -52,7 +51,6 @@ public class spatialindexdump extends CmdARQ {
protected SpatialIndex spatialIndex = null ;
static public void main(String... argv) {
- SpatialQuery.init() ;
new spatialindexdump(argv).mainRun() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-spatial/src/main/java/jena/spatialindexer.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/jena/spatialindexer.java b/jena-spatial/src/main/java/jena/spatialindexer.java
index d9a55bd..af8ed56 100644
--- a/jena-spatial/src/main/java/jena/spatialindexer.java
+++ b/jena-spatial/src/main/java/jena/spatialindexer.java
@@ -20,19 +20,18 @@ package jena;
import java.util.Iterator;
+import arq.cmdline.CmdARQ;
+import jena.cmd.ArgDecl ;
+import jena.cmd.CmdException ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.spatial.DatasetGraphSpatial;
import org.apache.jena.query.spatial.SpatialDatasetFactory;
import org.apache.jena.query.spatial.SpatialIndex;
import org.apache.jena.query.spatial.SpatialIndexContext;
-import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.sparql.core.Quad ;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jena.cmd.ArgDecl ;
-import jena.cmd.CmdException ;
-import arq.cmdline.CmdARQ;
/**
* Spatial indexer application that will read a dataset and index its triples in
@@ -51,7 +50,6 @@ public class spatialindexer extends CmdARQ {
protected ProgressMonitor progressMonitor;
static public void main(String... argv) {
- SpatialQuery.init();
new spatialindexer(argv).mainRun();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
index beb0cf9..890a4f4 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
@@ -24,12 +24,13 @@ import org.apache.jena.query.spatial.assembler.SpatialVocab;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.lucene.store.Directory;
import org.apache.solr.client.solrj.SolrServer;
public class SpatialDatasetFactory
{
- static { SpatialQuery.init(); }
+ static { JenaSystem.init(); }
/** Use an assembler file to build a dataset with spatial search capabilities */
public static Dataset create(String assemblerFile)
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
index 6c4fba7..493ad11 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
@@ -76,7 +76,6 @@ public class SpatialSearchUtil {
public static Dataset initInMemoryDatasetWithSolrSpatitalIndex() {
SpatialSearchUtil.deleteOldFiles(SOLR_DATA_DIR );
SOLR_INDEX_DIR.mkdirs();
- SpatialQuery.init() ;
SpatialSearchUtil.createEmptyIndex(SOLR_INDEX_DIR);
return SpatialDatasetFactory.create(SOLR_TEST_ASSEM) ;
}
@@ -86,14 +85,12 @@ public class SpatialSearchUtil {
}
public static Dataset initInMemoryDatasetWithLuceneSpatitalIndex(File indexDir) throws IOException{
- SpatialQuery.init();
deleteOldFiles(indexDir);
indexDir.mkdirs();
return createDatasetByCode(indexDir);
}
public static Dataset initTDBDatasetWithLuceneSpatitalIndex(File indexDir, File TDBDir) throws IOException{
- SpatialQuery.init();
deleteOldFiles(indexDir);
deleteOldFiles(TDBDir);
indexDir.mkdirs();
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-tdb/src/main/java/org/apache/jena/tdb/TDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/TDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/TDB.java
index 1c08724..cbb497f 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/TDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/TDB.java
@@ -205,7 +205,7 @@ public class TDB {
/**
* TDB System initialization - normally, this is not explicitly called
- * because all routes to use TDB will cause initialization to occur.
+ * because Jena system wide initialization occurs automatically.
* However, calling it repeatedly is safe and low cost.
*/
public static void init() {
@@ -223,7 +223,7 @@ public class TDB {
initialized = true ;
if ( JenaSystem.DEBUG_INIT )
System.err.println("TDB.init - start") ;
- ARQ.init() ;
+ // ARQ.init() ; // Init level settings mean this is already done.
SystemTDB.init() ;
LangRDFXML.RiotUniformCompatibility = true ;
EnvTDB.processGlobalSystemProperties() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/TDBGraphAssembler.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/TDBGraphAssembler.java b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/TDBGraphAssembler.java
index ad3dc53..9dffe04 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/TDBGraphAssembler.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/TDBGraphAssembler.java
@@ -18,8 +18,15 @@
package org.apache.jena.tdb.assembler;
-import static org.apache.jena.sparql.util.graph.GraphUtils.* ;
-import static org.apache.jena.tdb.assembler.VocabTDB.* ;
+import static org.apache.jena.sparql.util.graph.GraphUtils.getAsStringValue ;
+import static org.apache.jena.sparql.util.graph.GraphUtils.getResourceValue ;
+import static org.apache.jena.sparql.util.graph.GraphUtils.getStringValue ;
+import static org.apache.jena.tdb.assembler.VocabTDB.pDataset ;
+import static org.apache.jena.tdb.assembler.VocabTDB.pGraphName1 ;
+import static org.apache.jena.tdb.assembler.VocabTDB.pGraphName2 ;
+import static org.apache.jena.tdb.assembler.VocabTDB.pIndex ;
+import static org.apache.jena.tdb.assembler.VocabTDB.pLocation ;
+
import org.apache.jena.assembler.Assembler ;
import org.apache.jena.assembler.Mode ;
import org.apache.jena.assembler.assemblers.AssemblerBase ;
@@ -28,10 +35,8 @@ import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.riot.out.NodeFmtLib ;
-import org.apache.jena.tdb.TDB ;
import org.apache.jena.tdb.TDBException ;
import org.apache.jena.tdb.TDBFactory ;
-import org.apache.jena.tdb.assembler.IndexAssembler ;
import org.apache.jena.tdb.base.file.Location ;
public class TDBGraphAssembler extends AssemblerBase implements Assembler
@@ -41,11 +46,6 @@ public class TDBGraphAssembler extends AssemblerBase implements Assembler
@Override
public Model open(Assembler a, Resource root, Mode mode)
{
- // In case we go via explicit index construction,
- // although given we got here, the assembler is wired in
- // and that probably means TDB.init
- TDB.init() ;
-
// Make a model - the default model of the TDB dataset
// [] rdf:type tdb:GraphTDB ;
// tdb:location "dir" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-text/src/main/java/examples/JenaTextExample1.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/examples/JenaTextExample1.java b/jena-text/src/main/java/examples/JenaTextExample1.java
index c273540..a4a75f5 100644
--- a/jena-text/src/main/java/examples/JenaTextExample1.java
+++ b/jena-text/src/main/java/examples/JenaTextExample1.java
@@ -24,7 +24,6 @@ import org.apache.jena.query.* ;
import org.apache.jena.query.text.EntityDefinition ;
import org.apache.jena.query.text.TextDatasetFactory ;
import org.apache.jena.query.text.TextIndexConfig;
-import org.apache.jena.query.text.TextQuery ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.util.QueryExecUtils ;
@@ -42,7 +41,6 @@ public class JenaTextExample1
public static void main(String ... argv)
{
- TextQuery.init();
Dataset ds = createCode() ;
//Dataset ds = createAssembler() ;
loadData(ds , "data.ttl") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-text/src/main/java/jena/textindexdump.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/jena/textindexdump.java b/jena-text/src/main/java/jena/textindexdump.java
index 930a0fc..0226094 100644
--- a/jena-text/src/main/java/jena/textindexdump.java
+++ b/jena-text/src/main/java/jena/textindexdump.java
@@ -49,7 +49,6 @@ public class textindexdump extends CmdARQ {
protected TextIndex textIndex = null ;
static public void main(String... argv) {
- TextQuery.init() ;
new textindexdump(argv).mainRun() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-text/src/main/java/jena/textindexer.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/jena/textindexer.java b/jena-text/src/main/java/jena/textindexer.java
index c4111e4..6d2edb6 100644
--- a/jena-text/src/main/java/jena/textindexer.java
+++ b/jena-text/src/main/java/jena/textindexer.java
@@ -48,7 +48,6 @@ public class textindexer extends CmdARQ {
protected ProgressMonitor progressMonitor ;
static public void main(String... argv) {
- TextQuery.init() ;
new textindexer(argv).mainRun() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java b/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
index 7b7b0d1..71bc1fa 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
@@ -24,13 +24,14 @@ import org.apache.jena.query.text.assembler.TextVocab ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.store.Directory ;
import org.apache.solr.client.solrj.SolrServer ;
public class TextDatasetFactory
{
- static { TextQuery.init(); }
+ static { JenaSystem.init(); }
/** Use an assembler file to build a dataset with text search capabilities */
public static Dataset create(String assemblerFile)
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
index 2335e40..ce50907 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
@@ -27,7 +27,6 @@ import org.apache.jena.tdb.TDB ;
import org.apache.jena.vocabulary.RDFS ;
import org.apache.lucene.store.Directory ;
import org.apache.lucene.store.RAMDirectory ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
/** Test the examples of building a test dataset */
@@ -35,12 +34,6 @@ public class TestBuildTextDataset extends BaseTest
{
static final String DIR = "testing/TextQuery" ;
- // Ensure assembler initialized.
- @BeforeClass
- public static void setupClass() {
- TextQuery.init() ;
- }
-
@Test
public void buildText_01() {
createAssembler("text-config.ttl") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/15ced7e8/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
index a462e0a..b33b200 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithEmbeddedSolrTextIndex.java
@@ -35,7 +35,6 @@ public class TestDatasetWithEmbeddedSolrTextIndex extends AbstractTestDatasetWit
public void before() {
//deleteOldFiles();
INDEX_DIR.mkdirs();
- TextQuery.init() ;
TextSearchUtil.createEmptyIndex(INDEX_DIR);
dataset = TextDatasetFactory.create(TEST_ASSEM) ;
}