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/19 00:29:41 UTC
[1/6] jena git commit: JENA-1029: RIOT.init() becomes
JenaSystem.init() where needed.
Repository: jena
Updated Branches:
refs/heads/Jena-1029_subsystem d5a021a0f -> 59d507025
JENA-1029: RIOT.init() becomes JenaSystem.init() where needed.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8d0c2dbb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8d0c2dbb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8d0c2dbb
Branch: refs/heads/Jena-1029_subsystem
Commit: 8d0c2dbb75869a63f195d74d3acae30d42c1acfa
Parents: d5a021a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 18:26:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 18:26:29 2015 +0100
----------------------------------------------------------------------
.../src-examples/arq/examples/riot/ExRIOT_out3.java | 2 --
.../src/main/java/arq/cmdline/ModLangOutput.java | 2 +-
.../java/org/apache/jena/riot/RDFWriterRegistry.java | 3 ++-
jena-arq/src/main/java/riotcmd/CmdLangParse.java | 3 ++-
jena-arq/src/main/java/riotcmd/dumpthrift.java | 6 +++---
.../src/test/java/org/apache/jena/riot/TC_Riot.java | 3 ++-
.../test/java/org/apache/jena/riot/TS_LangSuite.java | 3 ++-
.../java/org/apache/jena/riot/TS_ReaderRIOT.java | 3 ++-
.../org/apache/jena/riot/TestJenaReaderRIOT.java | 12 ------------
.../test/java/org/apache/jena/riot/TestReadData.java | 12 ------------
.../org/apache/jena/riot/lang/TestLangRdfJson.java | 15 +++------------
.../apache/jena/riot/thrift/TestStreamRDFThrift.java | 5 +----
.../org/apache/jena/riot/thrift/TestThriftSetup.java | 4 +---
.../org/apache/jena/riot/writer/TS_RiotWriter.java | 4 ++--
.../org/apache/jena/riot/writer/TestJenaWriters.java | 2 --
jena-arq/src/test/java/riotcmd/rdflangtest.java | 3 ++-
16 files changed, 23 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src-examples/arq/examples/riot/ExRIOT_out3.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/riot/ExRIOT_out3.java b/jena-arq/src-examples/arq/examples/riot/ExRIOT_out3.java
index 2e1e12e..7c74cb9 100644
--- a/jena-arq/src-examples/arq/examples/riot/ExRIOT_out3.java
+++ b/jena-arq/src-examples/arq/examples/riot/ExRIOT_out3.java
@@ -38,8 +38,6 @@ public class ExRIOT_out3
// See also ExRIOT_5
public static void main(String[] args)
{
- RIOT.init() ;
-
System.out.println("## Example of a registering a new language with RIOT") ;
System.out.println() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java b/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
index a4ed89d..ecc82ca 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
@@ -50,7 +50,7 @@ public class ModLangOutput extends ModBase
cmdLine.add(argOutput, "--output=FMT", "Output in the given format, streaming if possible.") ;
cmdLine.add(argPretty, "--formatted=FMT", "Output, using pretty printing (consumes memory)") ;
cmdLine.add(argStream, "--stream=FMT", "Output, using a streaming format") ;
- cmdLine.add(argCompress, "--compress=FMT", "Compress the output with gzip") ;
+ cmdLine.add(argCompress, "--compress", "Compress the output with gzip") ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
index aeb37fc..139c3fe 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
@@ -26,6 +26,7 @@ import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.thrift.WriterDatasetThrift ;
import org.apache.jena.riot.thrift.WriterGraphThrift ;
import org.apache.jena.riot.writer.* ;
+import org.apache.jena.system.JenaSystem ;
public class RDFWriterRegistry
{
@@ -34,7 +35,7 @@ public class RDFWriterRegistry
// Let the serializer deal with the character issues.
// UTF-8 is universal - but UTF-8 is not the default in Java ("platform encoding" is).
- static { RIOT.init() ; }
+ static { JenaSystem.init() ; }
private static Map<RDFFormat, WriterGraphRIOTFactory> registryGraph = new HashMap<>() ;
private static Map<RDFFormat, WriterDatasetRIOTFactory> registryDataset = new HashMap<>() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index d961f15..cb83416 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -48,11 +48,12 @@ import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphFactory ;
+import org.apache.jena.system.JenaSystem ;
/** Common framework for running RIOT parsers */
public abstract class CmdLangParse extends CmdGeneral
{
- static { RIOT.init(); }
+ static { JenaSystem.init(); }
protected ModTime modTime = new ModTime() ;
protected ModLangParse modLangParse = new ModLangParse() ;
protected ModLangOutput modLangOutput = new ModLangOutput() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/main/java/riotcmd/dumpthrift.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/dumpthrift.java b/jena-arq/src/main/java/riotcmd/dumpthrift.java
index 2e827bb..cfadd38 100644
--- a/jena-arq/src/main/java/riotcmd/dumpthrift.java
+++ b/jena-arq/src/main/java/riotcmd/dumpthrift.java
@@ -23,15 +23,15 @@ import java.io.InputStream ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.LogCtl ;
-import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.thrift.BinRDF ;
+import org.apache.jena.system.JenaSystem ;
/** Dump an rdf-thrift file to show structure */
public class dumpthrift {
static { LogCtl.setCmdLogging(); }
-
+ static { JenaSystem.init() ; }
+
public static void main(String[] args) {
- RIOT.init() ;
if ( args.length == 0 ) {
args = new String[] {"-"} ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java b/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
index b43cc2f..cecad13 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
@@ -29,6 +29,7 @@ import org.apache.jena.riot.thrift.TS_RDFThrift ;
import org.apache.jena.riot.tokens.TS_Tokens ;
import org.apache.jena.riot.web.TS_RiotWeb ;
import org.apache.jena.riot.writer.TS_RiotWriter ;
+import org.apache.jena.system.JenaSystem ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
@@ -55,6 +56,6 @@ public class TC_Riot
{
@BeforeClass public static void beforeClass()
{
- RIOT.init() ;
+ JenaSystem.init() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java b/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
index a84fe47..bba194a 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TS_LangSuite.java
@@ -20,6 +20,7 @@ package org.apache.jena.riot;
import junit.framework.TestSuite ;
import org.apache.jena.riot.langsuite.FactoryTestRiot ;
+import org.apache.jena.system.JenaSystem ;
import org.junit.runner.RunWith ;
import org.junit.runners.AllTests ;
@@ -32,7 +33,7 @@ public class TS_LangSuite
static public TestSuite suite()
{
- RIOT.init() ;
+ JenaSystem.init() ;
TestSuite ts = new TestSuite("RIOT Lang") ;
ts.addTest(FactoryTestRiot.make(manifest1, null, null)) ;
return ts ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java b/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
index 86cfd02..5cc8098 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
@@ -19,6 +19,7 @@
package org.apache.jena.riot;
import org.apache.jena.riot.stream.TestStreamManager ;
+import org.apache.jena.system.JenaSystem ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
@@ -40,7 +41,7 @@ public class TS_ReaderRIOT
{
@BeforeClass public static void beforeClass()
{
- RIOT.init() ;
+ JenaSystem.init() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java b/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
index 43de994..5e90bd9 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
@@ -31,8 +31,6 @@ import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.riot.adapters.RDFReaderFactoryRIOT ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.util.FileUtils ;
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
/* Test of integration with Jena via model.read.
@@ -43,16 +41,6 @@ public class TestJenaReaderRIOT extends BaseTest
private static Context context = new Context() ;
- @BeforeClass static public void beforeClass()
- {
- RIOT.init() ;
- }
-
- @AfterClass static public void afterClass()
- {
- // Unwire?
- }
-
@Test public void read_01() { jenaread("D.nt") ; }
@Test public void read_02() { jenaread("D.ttl") ; }
@Test public void read_03() { jenaread("D.rdf") ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java b/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
index e503f64..4b7a8fe 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
@@ -31,8 +31,6 @@ import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
/* Tests of RDFDataMgr.
@@ -44,16 +42,6 @@ public class TestReadData extends BaseTest
private static Context context = new Context() ;
- @BeforeClass static public void beforeClass()
- {
- RIOT.init() ;
- }
-
- @AfterClass static public void afterClass()
- {
- // Unwire?
- }
-
// Model, graph
@Test public void read_01() { read("D.nq") ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
index d0a47b6..950d6c3 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
@@ -26,26 +26,17 @@ import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.ModelFactory ;
-import org.apache.jena.riot.* ;
import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.system.StreamRDFLib ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
public class TestLangRdfJson extends BaseTest
{
- @BeforeClass
- public static void setup()
- {
- RIOT.init();
- }
-
-// @AfterClass
-// public static void teardown()
-// { }
-
@Test
public void rdfjson_get_jena_reader()
{
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
index 192953f..2fbc3fe 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
@@ -21,6 +21,7 @@ package org.apache.jena.riot.thrift;
import java.io.ByteArrayInputStream ;
import java.io.ByteArrayOutputStream ;
import java.util.Iterator ;
+
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
@@ -29,7 +30,6 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
@@ -40,15 +40,12 @@ import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.graph.GraphFactory ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.util.IsoMatcher ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
public class TestStreamRDFThrift extends BaseTest {
private static final String DIR = TS_RDFThrift.TestingDir ;
- @BeforeClass public static void beforeClassInit() { RIOT.init(); }
-
static String gs = StrUtils.strjoinNL(
"(graph",
" (_:a :p 123) ",
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftSetup.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftSetup.java b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftSetup.java
index 27f8339..4f6d5c1 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftSetup.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftSetup.java
@@ -19,15 +19,13 @@
package org.apache.jena.riot.thrift;
import static org.apache.jena.riot.RDFLanguages.THRIFT ;
+
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.riot.* ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
public class TestThriftSetup extends BaseTest {
- @BeforeClass public static void beforeClass() { RIOT.init() ; }
-
@Test public void setup_01() {
assertTrue(RDFLanguages.isRegistered(THRIFT)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java
index 8bbc242..bb45ac4 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TS_RiotWriter.java
@@ -18,7 +18,7 @@
package org.apache.jena.riot.writer;
-import org.apache.jena.riot.RIOT ;
+import org.apache.jena.system.JenaSystem ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
@@ -40,6 +40,6 @@ public class TS_RiotWriter
{
@BeforeClass public static void beforeClass()
{
- RIOT.init() ;
+ JenaSystem.init() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJenaWriters.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJenaWriters.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJenaWriters.java
index 285574f..3f0d5f0 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJenaWriters.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJenaWriters.java
@@ -25,7 +25,6 @@ import java.util.List ;
import org.apache.jena.atlas.lib.Bytes ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.system.IO_JenaWriters ;
import org.junit.Test ;
import org.junit.runner.RunWith ;
@@ -37,7 +36,6 @@ public class TestJenaWriters extends AbstractWriterTest
{
@Parameters(name = "{index}: {0}")
public static Iterable<Object[]> data() {
- RIOT.init();
List<Object[]> x = new ArrayList<>() ;
for ( String wname : IO_JenaWriters.getJenaWriterNames() )
x.add(new Object[]{wname}) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d0c2dbb/jena-arq/src/test/java/riotcmd/rdflangtest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/riotcmd/rdflangtest.java b/jena-arq/src/test/java/riotcmd/rdflangtest.java
index 4d89c64..2db4df7 100644
--- a/jena-arq/src/test/java/riotcmd/rdflangtest.java
+++ b/jena-arq/src/test/java/riotcmd/rdflangtest.java
@@ -42,6 +42,7 @@ import org.apache.jena.sparql.junit.SimpleTestRunner ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
import org.apache.jena.sparql.vocabulary.DOAP ;
import org.apache.jena.sparql.vocabulary.FOAF ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.DC ;
import org.apache.jena.vocabulary.DCTerms ;
import org.apache.jena.vocabulary.RDF ;
@@ -60,6 +61,7 @@ import arq.cmdline.ModSymbol ;
public class rdflangtest extends CmdGeneral
{
+ static { JenaSystem.init() ; }
protected ModSymbol modSymbol = new ModSymbol() ;
protected ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict") ;
protected boolean cmdStrictMode = false ;
@@ -71,7 +73,6 @@ public class rdflangtest extends CmdGeneral
public static void main (String... argv)
{
- RIOT.init() ;
try { new rdflangtest(argv).mainRun() ; }
catch (TerminationException ex) { System.exit(ex.getCode()) ; }
}
[2/6] jena git commit: JENA-1029: TDB.init or RIOT.init becomes
JenaSystem.init where needed.
Posted by an...@apache.org.
JENA-1029: TDB.init or RIOT.init becomes JenaSystem.init where needed.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8cbde67e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8cbde67e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8cbde67e
Branch: refs/heads/Jena-1029_subsystem
Commit: 8cbde67e6b58e75ddb528c432f3876ec8aabd85a
Parents: 8d0c2db
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 18:27:26 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 18:27:26 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java | 4 ++--
jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8cbde67e/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
index 12f0858..c302c32 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
@@ -34,17 +34,17 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.sparql.core.assembler.DatasetAssembler ;
import org.apache.jena.sparql.expr.NodeValue ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.tdb.TDB ;
import org.apache.jena.tdb.TDBFactory ;
import org.apache.jena.tdb.base.file.Location ;
public class DatasetAssemblerTDB extends DatasetAssembler
{
- static { TDB.init(); }
+ static { JenaSystem.init(); }
@Override
public Dataset createDataset(Assembler a, Resource root, Mode mode) {
- TDB.init() ;
return make(root) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8cbde67e/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java b/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
index db98678..86feed6 100644
--- a/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
+++ b/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
@@ -52,7 +52,6 @@ public abstract class CmdTDB extends CmdARQ
// attempt once.
initialized = true ;
LogCtl.setCmdLogging() ;
- TDB.init() ;
DatasetBuilderStd.setOptimizerWarningFlag(false) ;
}
[4/6] jena git commit: Minor tidying.
Posted by an...@apache.org.
Minor tidying.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d60933e9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d60933e9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d60933e9
Branch: refs/heads/Jena-1029_subsystem
Commit: d60933e90c8f10dc3bfe80555c47db7e98532ee3
Parents: 23a01e9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 22:11:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 22:11:41 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/query/ARQ.java | 1 -
jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java | 3 ---
.../src/test/java/org/apache/jena/sdb/test/SDBQueryTestSuite.java | 1 -
jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java | 1 -
4 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d60933e9/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 adbf742..c9d2f84 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
@@ -545,7 +545,6 @@ public class ARQ
System.err.println("ARQ.init - skip") ;
return ;
}
-
initialized = true ;
if ( JenaSystem.DEBUG_INIT )
System.err.println("ARQ.init - start") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d60933e9/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
index 544bbe6..39e7634 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
@@ -95,9 +95,6 @@ public class SDB
initialized = true ;
if ( JenaSystem.DEBUG_INIT )
System.err.println("SDB.init - start") ;
- // Set this immediately in case code below causes init() to be called.
- // (It's better if there are no dependences but ...)
- initialized = true ;
// Better not to break up BGPs too much.
ARQ.getContext().set(ARQ.optFilterPlacement, false) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d60933e9/jena-sdb/src/test/java/org/apache/jena/sdb/test/SDBQueryTestSuite.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/test/java/org/apache/jena/sdb/test/SDBQueryTestSuite.java b/jena-sdb/src/test/java/org/apache/jena/sdb/test/SDBQueryTestSuite.java
index f451a07..71dd11b 100644
--- a/jena-sdb/src/test/java/org/apache/jena/sdb/test/SDBQueryTestSuite.java
+++ b/jena-sdb/src/test/java/org/apache/jena/sdb/test/SDBQueryTestSuite.java
@@ -22,7 +22,6 @@ import junit.framework.TestSuite;
import org.apache.jena.query.ARQ ;
import org.apache.jena.sdb.SDB ;
import org.apache.jena.sdb.test.junit.QueryTestSDBFactory ;
-import org.apache.jena.system.JenaSystem ;
import org.junit.runner.RunWith;
import org.junit.runners.AllTests;
http://git-wip-us.apache.org/repos/asf/jena/blob/d60933e9/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
index 5e57341..f78fea9 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQuery.java
@@ -59,7 +59,6 @@ public class TextQuery
initialized = true ;
if ( JenaSystem.DEBUG_INIT )
System.err.println("TextQuery.init - start") ;
- initialized = true ;
TextAssembler.init() ;
SystemInfo sysInfo = new SystemInfo(IRI, PATH, VERSION, BUILD_DATE) ;
[3/6] jena git commit: rename set/1 as setSubsystemRegistry/1
Posted by an...@apache.org.
rename set/1 as setSubsystemRegistry/1
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/23a01e90
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/23a01e90
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/23a01e90
Branch: refs/heads/Jena-1029_subsystem
Commit: 23a01e90deead368ed90335f76a056e5eaae1989
Parents: 8cbde67
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 21:47:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 21:47:10 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/system/JenaSystem.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/23a01e90/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
index f8dd17b..899a344 100644
--- a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
+++ b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
@@ -61,7 +61,7 @@ public class JenaSystem {
* <p>
* By default, initialization happens by using {@code ServiceLoader.load} to find
* {@link JenaSubsystemLifecycle} objects.
- * See {@link #set} to intercept that choice.
+ * See {@link #setSubsystemRegistry} to intercept that choice.
*/
public static void init() {
if ( initialized )
@@ -78,7 +78,7 @@ public class JenaSystem {
System.err.println("JenaSystem.init - start");
if ( get() == null )
- set(new JenaSubsystemRegistryBasic()) ;
+ setSubsystemRegistry(new JenaSubsystemRegistryBasic()) ;
get().load() ;
@@ -117,7 +117,7 @@ public class JenaSystem {
* must be called before any other Jena code,
* and especially before calling {@code JenaSystem.init()}.
*/
- public static void set(JenaSubsystemRegistry thing) {
+ public static void setSubsystemRegistry(JenaSubsystemRegistry thing) {
singleton = thing;
}
[5/6] jena git commit: JENA_1029: Comment about threading and about
recursive initialization.
Posted by an...@apache.org.
JENA_1029: Comment about threading and about recursive initialization.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a0a2d0d0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a0a2d0d0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a0a2d0d0
Branch: refs/heads/Jena-1029_subsystem
Commit: a0a2d0d009e2740f042599bc5f228717bd0d62d4
Parents: d60933e
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 22:21:22 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 22:21:22 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/system/JenaSystem.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a0a2d0d0/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
index 899a344..953e63b 100644
--- a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
+++ b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
@@ -64,6 +64,22 @@ public class JenaSystem {
* See {@link #setSubsystemRegistry} to intercept that choice.
*/
public static void init() {
+ // Any other thread attempting to initialize as well will
+ // first test the volatile outside the lock; if it's
+ // not INITIALIZED, the thread will attempt to grab the lock
+ // and hence wait, then see initialized as true.
+
+ // But we need to cope with recursive calls of JenaSystem.init() as well.
+ // The same thread will not stop at the lock.
+ // Set initialized to true before a recursive call is possible
+ // handles this. The recursive call will see initialized true and
+ // and returnn on the first test.
+
+ // Net effect:
+ // After a top level call of JenaSystem.init() returns, tjena has
+ // finishes initialization.
+ // Rececursive calls do not have this property.
+
if ( initialized )
return ;
synchronized(initLock) {
@@ -72,7 +88,7 @@ public class JenaSystem {
System.err.println("JenaSystem.init - return");
return ;
}
- // Catchs recursive calls, same thread.
+ // Catches recursive calls, same thread.
initialized = true ;
if ( DEBUG_INIT )
System.err.println("JenaSystem.init - start");
[6/6] jena git commit: Tidy comments.
Posted by an...@apache.org.
Tidy comments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/59d50702
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/59d50702
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/59d50702
Branch: refs/heads/Jena-1029_subsystem
Commit: 59d5070255e45d488cacf49eec0923b199cbd141
Parents: a0a2d0d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 18 23:26:24 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 18 23:26:24 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/system/JenaSubsystemRegistry.java | 2 +-
jena-core/src/main/java/org/apache/jena/system/JenaSystem.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/59d50702/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemRegistry.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemRegistry.java b/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemRegistry.java
index 3e7a2cb..f052ee3 100644
--- a/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemRegistry.java
+++ b/jena-core/src/main/java/org/apache/jena/system/JenaSubsystemRegistry.java
@@ -21,7 +21,7 @@ package org.apache.jena.system;
import java.util.List ;
/**
- * A {@code JenaSubsystemCollector} is a set of objects implementing {@link JenaSubsystemLifecycle}.
+ * A {@code JenaSubsystemRegistry} is a set of objects implementing {@link JenaSubsystemLifecycle}.
* <p>
* It is a set - at most one entry.
* <p>Discovered in some way.
http://git-wip-us.apache.org/repos/asf/jena/blob/59d50702/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
index 953e63b..a3917c3 100644
--- a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
+++ b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
@@ -176,8 +176,9 @@ public class JenaSystem {
x.forEach(action);
}
- /** The level 0 subsystem - inserted without using
- * should be only one such level 0 handler. */
+ /** The level 0 subsystem - inserted without using the Registry load function.
+ * There should be only one such level 0 handler.
+ */
private static class JenaInitLevel0 implements JenaSubsystemLifecycle {
private static Logger log = Logger.getLogger("Jena") ;
@Override