svn commit: r1466258 - in /jena/Experimental/jena-text/src: main/java/examples/ main/java/org/apache/jena/dsg/ main/java/org/apache/jena/query/text/ test/java/org/apache/jena/dsg/

[an...@apache.org]

Author: andy
Date: Tue Apr  9 21:55:32 2013
New Revision: 1466258

URL: http://svn.apache.org/r1466258
Log:
Migrate dataset machinery to jena-arq.

Removed:
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/DSGViewGraphs.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/DatasetChanges.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/DatasetChangesBatched.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/DatasetChangesCapture.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/DatasetChangesCounter.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/DatasetGraphMonitor.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/GLib.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/GraphViewDataset.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/dsg/QuadAction.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/AbstractTestGraphOverDataset.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/TS_ViewGraphs.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/TestDSGViewGraphs.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/TestDatasetGraphsRegular.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/TestDatasetMonitor.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/TestGraphOverDatasetMem.java
    jena/Experimental/jena-text/src/test/java/org/apache/jena/dsg/TestGraphOverDatasetTDB.java
Modified:
    jena/Experimental/jena-text/src/main/java/examples/JenaTextSearchEx1.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducer.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
    jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java

Modified: jena/Experimental/jena-text/src/main/java/examples/JenaTextSearchEx1.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-text/src/main/java/examples/JenaTextSearchEx1.java?rev=1466258&r1=1466257&r2=1466258&view=diff
==============================================================================
--- jena/Experimental/jena-text/src/main/java/examples/JenaTextSearchEx1.java (original)
+++ jena/Experimental/jena-text/src/main/java/examples/JenaTextSearchEx1.java Tue Apr  9 21:55:32 2013
@@ -20,7 +20,6 @@ package examples;
 
 import org.apache.jena.atlas.lib.FileOps ;
 import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.dsg.DatasetGraphMonitor ;
 import org.apache.jena.query.text.* ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.lucene.store.Directory ;
@@ -30,6 +29,7 @@ import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.query.* ;
 import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphMonitor ;
 import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;

Modified: jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java?rev=1466258&r1=1466257&r2=1466258&view=diff
==============================================================================
--- jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java (original)
+++ jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java Tue Apr  9 21:55:32 2013
@@ -21,8 +21,6 @@ package org.apache.jena.query.text;
 import java.util.Iterator ;
 import java.util.List ;
 
-import org.apache.jena.dsg.DatasetGraphMonitor ;
-import org.apache.jena.dsg.GraphViewDataset ;
 import org.apache.lucene.queryparser.classic.QueryParser ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
@@ -30,9 +28,7 @@ import org.slf4j.LoggerFactory ;
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphWithLock ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
+import com.hp.hpl.jena.sparql.core.* ;
 
 public class DatasetGraphText extends DatasetGraphMonitor implements Transactional 
 {

Modified: jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducer.java?rev=1466258&r1=1466257&r2=1466258&view=diff
==============================================================================
--- jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducer.java (original)
+++ jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducer.java Tue Apr  9 21:55:32 2013
@@ -18,7 +18,7 @@
 
 package org.apache.jena.query.text;
 
-import org.apache.jena.dsg.DatasetChanges ;
+import com.hp.hpl.jena.sparql.core.DatasetChanges ;
 
 public interface TextDocProducer extends DatasetChanges
 {

Modified: jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java?rev=1466258&r1=1466257&r2=1466258&view=diff
==============================================================================
--- jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java (original)
+++ jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java Tue Apr  9 21:55:32 2013
@@ -22,14 +22,14 @@ import java.util.List ;
 
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.iterator.Transform ;
-import org.apache.jena.dsg.DatasetChangesBatched ;
-import org.apache.jena.dsg.QuadAction ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.DatasetChangesBatched ;
 import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.core.QuadAction ;
 import com.hp.hpl.jena.sparql.util.FmtUtils ;
 
 public class TextDocProducerEntities extends DatasetChangesBatched implements TextDocProducer

Modified: jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java?rev=1466258&r1=1466257&r2=1466258&view=diff
==============================================================================
--- jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java (original)
+++ jena/Experimental/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java Tue Apr  9 21:55:32 2013
@@ -22,13 +22,13 @@ import java.util.List ;
 
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.iterator.Transform ;
-import org.apache.jena.dsg.QuadAction ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.core.QuadAction ;
 import com.hp.hpl.jena.sparql.util.FmtUtils ;
 
 public class TextDocProducerTriples implements TextDocProducer