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 2011/09/04 14:16:59 UTC
svn commit: r1165001 - in /incubator/jena:
Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/
Experimental/TxTDB/trunk/src/main/java/tdb/cmdline/ Jena2/SDB/trunk/
Jena2/SDB/trunk/lib-src/ Jena2/SDB/trunk/lib/
Jena2/SDB/trunk/src/com/hp/hpl/jen...
Author: andy
Date: Sun Sep 4 12:16:58 2011
New Revision: 1165001
URL: http://svn.apache.org/viewvc?rev=1165001&view=rev
Log:
Misc updates to align with ARQ.
Added:
incubator/jena/Jena2/SDB/trunk/lib/commons-codec-1.4.jar (with props)
incubator/jena/Jena2/SDB/trunk/lib/httpclient-4.1.2.jar (with props)
incubator/jena/Jena2/SDB/trunk/lib/httpcore-4.1.2.jar (with props)
incubator/jena/Jena2/SDB/trunk/mvn-update (with props)
incubator/jena/Jena2/TDB/trunk/lib/commons-codec-1.4.jar (with props)
incubator/jena/Jena2/TDB/trunk/lib/httpclient-4.1.2.jar (with props)
incubator/jena/Jena2/TDB/trunk/lib/httpcore-4.1.2.jar (with props)
Modified:
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java
incubator/jena/Jena2/SDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-sources.jar
incubator/jena/Jena2/SDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar
incubator/jena/Jena2/SDB/trunk/lib/arq-2.8.9-SNAPSHOT-tests.jar
incubator/jena/Jena2/SDB/trunk/lib/arq-2.8.9-SNAPSHOT.jar
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/SDB.java
incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/CmdArgsDB.java
incubator/jena/Jena2/TDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-sources.jar
incubator/jena/Jena2/TDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar
incubator/jena/Jena2/TDB/trunk/lib/arq-2.8.9-SNAPSHOT-tests.jar
incubator/jena/Jena2/TDB/trunk/lib/arq-2.8.9-SNAPSHOT.jar
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDB.java Sun Sep 4 12:16:58 2011
@@ -14,6 +14,8 @@ import org.openjena.riot.SysRIOT ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
+import arq.cmdline.ModSymbol ;
+
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.ARQ ;
@@ -29,6 +31,7 @@ import com.hp.hpl.jena.sparql.lib.Metada
import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.util.Context ;
+import com.hp.hpl.jena.sparql.util.MappingRegistry ;
import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.tdb.assembler.AssemblerTDB ;
import com.hp.hpl.jena.tdb.modify.UpdateEngineTDB ;
@@ -165,6 +168,7 @@ public class TDB
ARQ.init() ;
EnvTDB.processGlobalSystemProperties() ;
+ MappingRegistry.addPrefixMapping(SystemTDB.tdbSymbolPrefix, SystemTDB.symbolNamespace) ;
AssemblerUtils.init() ;
AssemblerTDB.init();
QueryEngineTDB.register() ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java Sun Sep 4 12:16:58 2011
@@ -15,7 +15,6 @@ import org.apache.log4j.PropertyConfigur
import org.openjena.atlas.lib.StrUtils ;
import org.openjena.riot.SysRIOT ;
import arq.cmdline.CmdARQ ;
-import arq.cmdline.ModSymbol ;
import com.hp.hpl.jena.Jena ;
import com.hp.hpl.jena.query.ARQ ;
@@ -25,7 +24,6 @@ import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.sys.SetupTDB ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
public abstract class CmdTDB extends CmdARQ
{
@@ -81,7 +79,6 @@ public abstract class CmdTDB extends Cmd
// This sets context based on system properties.
// ModSymbol can then override.
TDB.init() ;
- ModSymbol.addPrefixMapping(SystemTDB.tdbSymbolPrefix, SystemTDB.symbolNamespace) ;
}
/** Reset the logging to be good for command line tools */
Modified: incubator/jena/Jena2/SDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-sources.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-sources.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/SDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/SDB/trunk/lib/arq-2.8.9-SNAPSHOT-tests.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib/arq-2.8.9-SNAPSHOT-tests.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/SDB/trunk/lib/arq-2.8.9-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib/arq-2.8.9-SNAPSHOT.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/jena/Jena2/SDB/trunk/lib/commons-codec-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib/commons-codec-1.4.jar?rev=1165001&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/SDB/trunk/lib/commons-codec-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/SDB/trunk/lib/httpclient-4.1.2.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib/httpclient-4.1.2.jar?rev=1165001&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/SDB/trunk/lib/httpclient-4.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/SDB/trunk/lib/httpcore-4.1.2.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/lib/httpcore-4.1.2.jar?rev=1165001&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/SDB/trunk/lib/httpcore-4.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/SDB/trunk/mvn-update
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/mvn-update?rev=1165001&view=auto
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/mvn-update (added)
+++ incubator/jena/Jena2/SDB/trunk/mvn-update Sun Sep 4 12:16:58 2011
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -e "lib-src" ]
+then
+ mvn dependency:copy-dependencies \
+ -Dclassifier="sources" \
+ -DoutputDirectory=lib-src \
+ -DincludeGroupIds="com.hp.hpl.jena"
+
+ mvn dependency:copy-dependencies \
+ -Dclassifier="test-sources" \
+ -DincludeScope="test" \
+ -DoutputDirectory=lib-src \
+ -DincludeArtifactIds="jena,arq" \
+ -DincludeGroupIds="com.hp.hpl.jena"
+fi
+
+mvn dependency:copy-dependencies -DoutputDirectory=lib
+
+# This is a fix for Jena 2.6.3 and ARQ 2.8.5 which depends on IRI sources.
+rm -f lib/*-sources*
Propchange: incubator/jena/Jena2/SDB/trunk/mvn-update
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/SDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/SDB.java?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/SDB.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/SDB.java Sun Sep 4 12:16:58 2011
@@ -35,6 +35,7 @@ import com.hp.hpl.jena.sparql.lib.Metada
import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
import com.hp.hpl.jena.sparql.mgt.SystemInfo ;
import com.hp.hpl.jena.sparql.util.Context ;
+import com.hp.hpl.jena.sparql.util.MappingRegistry ;
import com.hp.hpl.jena.sparql.util.Symbol ;
import com.hp.hpl.jena.vocabulary.OWL ;
import com.hp.hpl.jena.vocabulary.RDF ;
@@ -97,10 +98,11 @@ public class SDB
// Better not to break up BGPs too much.
ARQ.getContext().set(ARQ.optFilterPlacement, false) ;
-
+ MappingRegistry.addPrefixMapping(SDB.symbolPrefix, SDB.symbolSpace) ;
+
// Default is 1000 4Kpages.
DerbyUtils.setDerbyPageCacheSize(10000) ;
-
+
// Wire in the SDB query engine
QueryEngineSDB.register() ;
// Wire in the SDB update engine
Modified: incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/CmdArgsDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/CmdArgsDB.java?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/CmdArgsDB.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/sdb/cmd/CmdArgsDB.java Sun Sep 4 12:16:58 2011
@@ -30,6 +30,7 @@ import com.hp.hpl.jena.sdb.SDB;
import com.hp.hpl.jena.sdb.Store;
import com.hp.hpl.jena.sdb.StoreDesc;
import com.hp.hpl.jena.sdb.assembler.AssemblerVocab;
+import com.hp.hpl.jena.sparql.util.MappingRegistry ;
public abstract class CmdArgsDB extends CmdGeneral
{
@@ -53,7 +54,6 @@ public abstract class CmdArgsDB extends
addModule(modStore) ;
addModule(modLogSQL) ;
addModule(modTime) ;
- ModSymbol.addPrefixMapping(SDB.symbolPrefix, SDB.symbolSpace) ;
ARQ.init() ;
super.modVersion.addClass(Jena.class) ;
super.modVersion.addClass(ARQ.class) ;
Modified: incubator/jena/Jena2/TDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-sources.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-sources.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/TDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib-src/arq-2.8.9-SNAPSHOT-test-sources.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/TDB/trunk/lib/arq-2.8.9-SNAPSHOT-tests.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/arq-2.8.9-SNAPSHOT-tests.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/TDB/trunk/lib/arq-2.8.9-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/arq-2.8.9-SNAPSHOT.jar?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/jena/Jena2/TDB/trunk/lib/commons-codec-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/commons-codec-1.4.jar?rev=1165001&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/commons-codec-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/TDB/trunk/lib/httpclient-4.1.2.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/httpclient-4.1.2.jar?rev=1165001&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/httpclient-4.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/TDB/trunk/lib/httpcore-4.1.2.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/httpcore-4.1.2.jar?rev=1165001&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/httpcore-4.1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java?rev=1165001&r1=1165000&r2=1165001&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/cmdline/CmdTDB.java Sun Sep 4 12:16:58 2011
@@ -17,7 +17,6 @@ import org.openjena.riot.SysRIOT ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdARQ ;
-import arq.cmdline.ModSymbol ;
import com.hp.hpl.jena.Jena ;
import com.hp.hpl.jena.query.ARQ ;
@@ -29,7 +28,6 @@ import com.hp.hpl.jena.tdb.base.file.Loc
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.GraphTDB ;
import com.hp.hpl.jena.tdb.sys.SetupTDB ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
public abstract class CmdTDB extends CmdARQ
{
@@ -89,7 +87,6 @@ public abstract class CmdTDB extends Cmd
// This sets context based on system properties.
// ModSymbol can then override.
TDB.init() ;
- ModSymbol.addPrefixMapping(SystemTDB.tdbSymbolPrefix, SystemTDB.symbolNamespace) ;
}
/** Reset the logging to be good for command line tools */