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 2012/02/06 15:14:01 UTC
svn commit: r1241015 - in /incubator/jena/Jena2/TDB/trunk/src/main/java/tdb:
tdbbackup.java tdbclean.java tdbconfig.java tdbdump.java tdbloader.java
tdbnode.java tdbquery.java tdbrecovery.java tdbstats.java tdbupdate.java
Author: andy
Date: Mon Feb 6 14:14:00 2012
New Revision: 1241015
URL: http://svn.apache.org/viewvc?rev=1241015&view=rev
Log:
Temporary fix to JENA-208 (log4j setup for commands).
Modified:
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbbackup.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbclean.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbconfig.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbdump.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbloader.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbnode.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbquery.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbrecovery.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbstats.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbupdate.java
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbbackup.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbbackup.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbbackup.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbbackup.java Mon Feb 6 14:14:00 2012
@@ -18,17 +18,15 @@
package tdb;
-import org.openjena.atlas.logging.Log ;
import tdb.cmdline.CmdTDB ;
import com.hp.hpl.jena.tdb.TDBBackup ;
public class tdbbackup extends CmdTDB
{
-
static public void main(String... argv)
{
- Log.setLog4j() ;
+ CmdTDB.init() ;
new tdbdump(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbclean.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbclean.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbclean.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbclean.java Mon Feb 6 14:14:00 2012
@@ -19,14 +19,13 @@
package tdb;
import org.openjena.atlas.lib.FileOps ;
-import org.openjena.atlas.logging.Log ;
import tdb.cmdline.CmdTDB;
public class tdbclean extends CmdTDB
{
static public void main(String... argv)
{
- Log.setLog4j() ;
+ CmdTDB.init() ;
new tdbclean(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbconfig.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbconfig.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbconfig.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbconfig.java Mon Feb 6 14:14:00 2012
@@ -54,6 +54,7 @@ public class tdbconfig extends CmdSub
static public void main(String... argv)
{
+ CmdTDB.init() ;
new tdbconfig(argv).exec();
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbdump.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbdump.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbdump.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbdump.java Mon Feb 6 14:14:00 2012
@@ -18,7 +18,6 @@
package tdb;
-import org.openjena.atlas.logging.Log ;
import org.openjena.riot.RiotWriter ;
import tdb.cmdline.CmdTDB ;
@@ -28,7 +27,7 @@ public class tdbdump extends CmdTDB
{
static public void main(String... argv)
{
- Log.setLog4j() ;
+ CmdTDB.init() ;
new tdbdump(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbloader.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbloader.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbloader.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbloader.java Mon Feb 6 14:14:00 2012
@@ -21,6 +21,7 @@ package tdb;
import java.util.List ;
import org.openjena.riot.Lang ;
+import tdb.cmdline.CmdTDB ;
import tdb.cmdline.CmdTDBGraph ;
import tdb.cmdline.ModModel ;
@@ -47,6 +48,7 @@ public class tdbloader extends CmdTDBGra
static public void main(String... argv)
{
+ CmdTDB.init() ;
TDB.setOptimizerWarningFlag(false) ;
new tdbloader(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbnode.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbnode.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbnode.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbnode.java Mon Feb 6 14:14:00 2012
@@ -21,7 +21,6 @@ package tdb;
import java.util.Iterator ;
import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.logging.Log ;
import tdb.cmdline.CmdTDB ;
import com.hp.hpl.jena.graph.Node ;
@@ -37,7 +36,7 @@ public class tdbnode extends CmdTDB
// Debugging tool.
static public void main(String... argv)
{
- Log.setLog4j() ;
+ CmdTDB.init() ;
new tdbnode(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbquery.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbquery.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbquery.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbquery.java Mon Feb 6 14:14:00 2012
@@ -30,6 +30,7 @@ public class tdbquery extends arq.query
// Inherits from arq.query so is not a CmdTDB. Mixins for Java!
public static void main(String...argv)
{
+ CmdTDB.init() ;
new tdbquery(argv).mainRun() ;
}
@@ -37,7 +38,6 @@ public class tdbquery extends arq.query
{
super(argv) ;
// Because this inherits from an ARQ command
- CmdTDB.init() ;
super.modVersion.addClass(TDB.class) ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbrecovery.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbrecovery.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbrecovery.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbrecovery.java Mon Feb 6 14:14:00 2012
@@ -18,7 +18,6 @@
package tdb;
-import org.openjena.atlas.logging.Log ;
import tdb.cmdline.CmdTDB ;
import com.hp.hpl.jena.tdb.TDB ;
@@ -29,8 +28,8 @@ public class tdbrecovery extends CmdTDB
{
static public void main(String... argv)
{
+ CmdTDB.init() ;
TDB.setOptimizerWarningFlag(false) ;
- Log.setLog4j() ;
new tdbrecovery(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbstats.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbstats.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbstats.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbstats.java Mon Feb 6 14:14:00 2012
@@ -18,10 +18,9 @@
package tdb;
-import org.openjena.atlas.logging.Log ;
+import tdb.cmdline.CmdTDB ;
import tdb.cmdline.CmdTDBGraph ;
-import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.solver.stats.Stats ;
import com.hp.hpl.jena.tdb.solver.stats.StatsCollector ;
import com.hp.hpl.jena.tdb.store.GraphTDB ;
@@ -32,8 +31,7 @@ public class tdbstats extends CmdTDBGrap
// tdbconfig?
static public void main(String... argv)
{
- TDB.setOptimizerWarningFlag(false) ;
- Log.setLog4j() ;
+ CmdTDB.init() ;
new tdbstats(argv).mainRun() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbupdate.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbupdate.java?rev=1241015&r1=1241014&r2=1241015&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbupdate.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tdbupdate.java Mon Feb 6 14:14:00 2012
@@ -29,6 +29,7 @@ public class tdbupdate extends arq.updat
// Inherits from arq.update so is not a CmdTDB. Mixins for Java!
public static void main(String...argv)
{
+ CmdTDB.init() ;
new tdbupdate(argv).mainRun() ;
}