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 2013/02/11 16:42:46 UTC
svn commit: r1444833 - in /jena/trunk/jena-sdb/src/main/java/sdb:
sdbconfig.java sdbdelete.java sdbdump.java sdbinfo.java sdbload.java
sdbmeta.java sdbprint.java sdbquery.java sdbscript.java sdbsql.java
sdbtruncate.java sdbtuple.java
Author: andy
Date: Mon Feb 11 15:42:45 2013
New Revision: 1444833
URL: http://svn.apache.org/r1444833
Log:
Call SDB.init() very early
Modified:
jena/trunk/jena-sdb/src/main/java/sdb/sdbconfig.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbdelete.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbdump.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbinfo.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbload.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbmeta.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbprint.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbquery.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbscript.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbsql.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbtruncate.java
jena/trunk/jena-sdb/src/main/java/sdb/sdbtuple.java
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbconfig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbconfig.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbconfig.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbconfig.java Mon Feb 11 15:42:45 2013
@@ -27,6 +27,7 @@ import sdb.cmd.ModConfig;
import com.hp.hpl.jena.sparql.util.Utils;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.Store;
/** Configure an SDB database. Destroys all existing data permanently. */
@@ -37,6 +38,7 @@ public class sdbconfig extends CmdArgsDB
public static void main(String ... argv)
{
+ SDB.init();
new sdbconfig(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbdelete.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbdelete.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbdelete.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbdelete.java Mon Feb 11 15:42:45 2013
@@ -25,6 +25,7 @@ import sdb.cmd.CmdArgsDB;
import arq.cmdline.ArgDecl;
import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.SDBFactory;
import com.hp.hpl.jena.sdb.store.StoreBaseHSQL;
import com.hp.hpl.jena.sparql.util.Utils;
@@ -46,6 +47,7 @@ public class sdbdelete extends CmdArgsDB
public static void main(String... argv)
{
+ SDB.init();
new sdbdelete(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbdump.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbdump.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbdump.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbdump.java Mon Feb 11 15:42:45 2013
@@ -25,6 +25,7 @@ import sdb.cmd.ModGraph;
import arq.cmdline.ArgDecl;
import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sparql.util.Utils;
/** Write out the data from an SDB model. Only works for small models
@@ -49,6 +50,7 @@ public class sdbdump extends CmdArgsDB
public static void main(String ... argv)
{
+ SDB.init();
new sdbdump(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbinfo.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbinfo.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbinfo.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbinfo.java Mon Feb 11 15:42:45 2013
@@ -24,6 +24,7 @@ import sdb.cmd.CmdArgsDB ;
import arq.cmdline.ArgDecl ;
import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.store.StoreConfig ;
import com.hp.hpl.jena.sparql.util.Utils ;
@@ -48,6 +49,7 @@ public class sdbinfo extends CmdArgsDB
public static void main(String ... argv)
{
+ SDB.init();
new sdbinfo(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbload.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbload.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbload.java Mon Feb 11 15:42:45 2013
@@ -30,6 +30,7 @@ import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.GraphListener;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.store.StoreBaseHSQL;
import com.hp.hpl.jena.sparql.util.Timer;
import com.hp.hpl.jena.sparql.util.Utils;
@@ -55,6 +56,7 @@ public class sdbload extends CmdArgsDB
public static void main(String... argv)
{
+ SDB.init();
new sdbload(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbmeta.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbmeta.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbmeta.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbmeta.java Mon Feb 11 15:42:45 2013
@@ -34,6 +34,7 @@ import com.hp.hpl.jena.util.FileManager;
import com.hp.hpl.jena.sparql.util.Utils;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.sql.SDBConnection;
import com.hp.hpl.jena.sdb.store.StoreConfig;
@@ -45,10 +46,11 @@ public class sdbmeta extends CmdArgsDB
// subcommands via first positional argument
- String format = "N3" ;
+ String format = "TTL" ;
public static void main (String... argv)
{
+ SDB.init();
new sdbmeta(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbprint.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbprint.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbprint.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbprint.java Mon Feb 11 15:42:45 2013
@@ -59,6 +59,7 @@ public class sdbprint extends CmdArgsDB
boolean printSQL = false ;
public static void main (String... argv)
{
+ SDB.init();
new sdbprint(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbquery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbquery.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbquery.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbquery.java Mon Feb 11 15:42:45 2013
@@ -30,6 +30,7 @@ import com.hp.hpl.jena.query.Query;
import com.hp.hpl.jena.query.QueryException;
import com.hp.hpl.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.compiler.SDB_QC;
import com.hp.hpl.jena.sdb.engine.QueryEngineSDB;
import com.hp.hpl.jena.sdb.util.PrintSDB;
@@ -64,6 +65,7 @@ public class sdbquery extends CmdArgsDB
public static void main (String... argv)
{
+ SDB.init();
new sdbquery(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbscript.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbscript.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbscript.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbscript.java Mon Feb 11 15:42:45 2013
@@ -20,6 +20,8 @@ package sdb;
import java.lang.reflect.Method;
+import com.hp.hpl.jena.sdb.SDB ;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,6 +31,7 @@ public class sdbscript
public static void main(String... a)
{
+ SDB.init();
if ( a.length == 0 )
a = new String[]{ "script.rb" } ;
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbsql.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbsql.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbsql.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbsql.java Mon Feb 11 15:42:45 2013
@@ -25,6 +25,7 @@ import sdb.cmd.CmdArgsDB;
import arq.cmd.TerminationException;
import arq.cmdline.ArgDecl;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.sql.RS;
import com.hp.hpl.jena.sdb.sql.ResultSetJDBC;
import com.hp.hpl.jena.sparql.util.Utils;
@@ -38,6 +39,7 @@ public class sdbsql extends CmdArgsDB
public static void main (String... argv)
{
+ SDB.init();
new sdbsql(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbtruncate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbtruncate.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbtruncate.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbtruncate.java Mon Feb 11 15:42:45 2013
@@ -25,6 +25,7 @@ import sdb.cmd.CmdArgsDB;
import arq.cmd.CmdException;
import arq.cmdline.ArgDecl;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sparql.util.Utils;
/** Format an SDB database. Destroys all existing data permanently.
@@ -37,6 +38,7 @@ public class sdbtruncate extends CmdArgs
public static void main (String... argv)
{
+ SDB.init();
new sdbtruncate(argv).mainRun() ;
}
Modified: jena/trunk/jena-sdb/src/main/java/sdb/sdbtuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/sdb/sdbtuple.java?rev=1444833&r1=1444832&r2=1444833&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/sdb/sdbtuple.java (original)
+++ jena/trunk/jena-sdb/src/main/java/sdb/sdbtuple.java Mon Feb 11 15:42:45 2013
@@ -27,6 +27,7 @@ import arq.cmdline.CmdArgModule;
import arq.cmdline.CmdGeneral;
import arq.cmdline.ModBase;
+import com.hp.hpl.jena.sdb.SDB ;
import com.hp.hpl.jena.sdb.Store;
import com.hp.hpl.jena.sdb.store.TableDesc;
import com.hp.hpl.jena.sdb.store.TupleTable;
@@ -70,7 +71,11 @@ public class sdbtuple extends CmdArgsDB
String loadFile = null ;
- public static void main(String ... args) { new sdbtuple(args).mainRun() ; }
+ public static void main(String... args)
+ {
+ SDB.init() ;
+ new sdbtuple(args).mainRun() ;
+ }
public List<String> tables = new ArrayList<String>() ;
public sdbtuple(String... argv)