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/12/29 20:56:10 UTC

svn commit: r1426815 - in /jena/trunk: jena-arq/ jena-fuseki/ jena-fuseki/src/main/java/org/apache/jena/fuseki/http/ jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/ jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ jena-fuseki/src/ma...

Author: andy
Date: Sat Dec 29 19:56:10 2012
New Revision: 1426815

URL: http://svn.apache.org/viewvc?rev=1426815&view=rev
Log:
SinkRDF -> StreamRDF

Added:
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkStreamRDF.java
      - copied, changed from r1426294, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkSinkRDF.java
Removed:
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkSinkRDF.java
Modified:
    jena/trunk/jena-arq/log4j.properties
    jena/trunk/jena-fuseki/log4j.properties
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
    jena/trunk/jena-tdb/log4j.properties
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java

Modified: jena/trunk/jena-arq/log4j.properties
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/log4j.properties?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-arq/log4j.properties (original)
+++ jena/trunk/jena-arq/log4j.properties Sat Dec 29 19:56:10 2012
@@ -11,8 +11,8 @@ log4j.logger.com.hp.hpl.jena.arq.exec=IN
 
 # Everything else in Jena
 log4j.logger.com.hp.hpl.jena=WARN
-log4j.logger.org.openjena=WARN
-log4j.logger.org.openjena.riot=INFO
+log4j.logger.org.apache.jena=WARN
+log4j.logger.org.apache.jena.riot=INFO
 
 # Joseki server
 log4j.logger.org.joseki=INFO

Modified: jena/trunk/jena-fuseki/log4j.properties
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/log4j.properties?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/log4j.properties (original)
+++ jena/trunk/jena-fuseki/log4j.properties Sat Dec 29 19:56:10 2012
@@ -23,8 +23,8 @@ log4j.logger.com.hp.hpl.jena.arq.exec=IN
 # Everything else in Jena
 log4j.logger.com.hp.hpl.jena=WARN
 log4j.logger.org.apache.jena=WARN
-log4j.logger.org.openjena=WARN
-log4j.logger.org.openjena.riot=INFO
+log4j.logger.org.apache.jena=WARN
+log4j.logger.org.apache.jena.riot=INFO
 
 # TDB
 # TDB syslog.

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java Sat Dec 29 19:56:10 2012
@@ -45,8 +45,8 @@ import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.WebContent ;
 import org.apache.jena.riot.lang.LangRIOT ;
-import org.apache.jena.riot.system.SinkRDF ;
-import org.apache.jena.riot.system.SinkRDFLib ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
@@ -295,7 +295,7 @@ public class DatasetGraphAccessorHTTP im
         Lang lang = FusekiLib.langFromContentType(ts.getContentType()) ;
         if ( lang == null )
             throw new FusekiException("Unknown lang for "+ts.getMediaType()) ;
-        SinkRDF dest = SinkRDFLib.graph(graph) ;
+        StreamRDF dest = StreamRDFLib.graph(graph) ;
         LangRIOT parser = RiotReader.createParser(ts, lang, base, dest) ;
         parser.parse() ;
         IO.close(ts) ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java Sat Dec 29 19:56:10 2012
@@ -25,8 +25,8 @@ import org.apache.jena.fuseki.Fuseki ;
 import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.system.SinkRDF ;
-import org.apache.jena.riot.system.SinkRDFLib ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
 
 import com.hp.hpl.jena.graph.Factory ;
 import com.hp.hpl.jena.graph.Graph ;
@@ -70,10 +70,10 @@ public class GraphLoadUtils
     private static void readUtil(Graph graph, String uri, int limit)
     {
         Lang lang = RDFLanguages.filenameToLang(uri, RDFLanguages.RDFXML) ;
-        SinkRDF sink = SinkRDFLib.graph(graph) ;
+        StreamRDF sink = StreamRDFLib.graph(graph) ;
         sink = new SinkRDFLimited(sink, limit) ;
 
         InputStream input = Fuseki.webFileManager.open(uri) ;
-        RDFDataMgr.read(sink, input, uri, lang, null) ;
+        RDFDataMgr.parse(sink, input, uri, lang, null) ;
     }
 }

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java Sat Dec 29 19:56:10 2012
@@ -19,19 +19,19 @@
 package org.apache.jena.fuseki.migrate;
 
 import org.apache.jena.atlas.lib.Tuple ;
-import org.apache.jena.riot.system.SinkRDF ;
-import org.apache.jena.riot.system.SinkRDFWrapper ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFWarpper ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 
-public class SinkRDFLimited extends SinkRDFWrapper
+public class SinkRDFLimited extends StreamRDFWarpper
 {
    private long count = 0 ;
    private final long limit ;
     
-    public SinkRDFLimited(SinkRDF output, long limit)
+    public SinkRDFLimited(StreamRDF output, long limit)
     {
         super(output) ;
         this.limit = limit ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Sat Dec 29 19:56:10 2012
@@ -35,8 +35,8 @@ import org.apache.jena.riot.RDFLanguages
 import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.RiotWriter ;
 import org.apache.jena.riot.lang.LangRIOT ;
-import org.apache.jena.riot.system.SinkRDF ;
-import org.apache.jena.riot.system.SinkRDFLib ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
@@ -141,7 +141,7 @@ public class REST_Quads extends SPARQL_R
             name = name+(++counter) ;
             Node gn = Node.createURI(name) ;
             Graph g = dsg.getGraph(gn) ;
-            SinkRDF dest = SinkRDFLib.graph(g) ;
+            StreamRDF dest = StreamRDFLib.graph(g) ;
             LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang, name , dest) ;
             parser.parse() ;
             log.info(format("[%d] Location: %s", action.id, name)) ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Sat Dec 29 19:56:10 2012
@@ -359,7 +359,7 @@ public abstract class SPARQL_REST extend
     {
         Graph graphTmp = GraphFactory.createGraphMem() ;
         
-        SinkRDF dest = SinkRDFLib.graph(graphTmp) ;
+        StreamRDF dest = StreamRDFLib.graph(graphTmp) ;
         LangRIOT parser = RiotReader.createParser(input, lang, base, dest) ;
         parser.getProfile().setHandler(errorHandler) ;
         try { parser.parse() ; } 

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Sat Dec 29 19:56:10 2012
@@ -204,7 +204,7 @@ public class SPARQL_Upload extends SPARQ
 
                     // We read into a in-memory graph, then (if successful) update the dataset.
                     // This isolates errors.
-                    SinkRDF dest = SinkRDFLib.graph(graphDst) ;
+                    StreamRDF dest = StreamRDFLib.graph(graphDst) ;
                     LangRIOT parser = RiotReader.createParser(stream, lang, base, dest) ;
                     parser.getProfile().setHandler(errorHandler) ;
                     log.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => %s", 

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java Sat Dec 29 19:56:10 2012
@@ -39,8 +39,8 @@ import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.system.ErrorHandler ;
 import org.apache.jena.riot.system.RiotLib ;
-import org.apache.jena.riot.system.SinkRDF ;
-import org.apache.jena.riot.system.SinkRDFLib ;
+import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.StreamRDFLib ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
 
@@ -166,7 +166,7 @@ public class DataValidator extends Valid
             String formatNode(Node n) { return FmtUtils.stringForNode(n, sCxt) ; }
         } ;
 
-        SinkRDF dest = SinkRDFLib.sinkQuads(sink) ;
+        StreamRDF dest = StreamRDFLib.sinkQuads(sink) ;
         LangRIOT parser = RiotReader.createParser(tokenizer, language, null, dest) ;
         // Don't resolve IRIs.  Do checking.
         parser.setProfile(RiotLib.profile(null, false, true, errorHandler)) ;

Modified: jena/trunk/jena-tdb/log4j.properties
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/log4j.properties?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-tdb/log4j.properties (original)
+++ jena/trunk/jena-tdb/log4j.properties Sat Dec 29 19:56:10 2012
@@ -14,7 +14,7 @@ log4j.logger.org.apache.jena.tdb.loader=
 
 # Everything else in Jena
 log4j.logger.com.hp.hpl.jena=WARN
-log4j.logger.org.openjena.riot=INFO
+log4j.logger.org.apache.jena.riot=INFO
 
 # TDB 
 # TDB syslog.

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java Sat Dec 29 19:56:10 2012
@@ -83,18 +83,18 @@ public class BulkLoader
     /** Load into default graph */
     public static void loadDefaultGraph(DatasetGraphTDB dsg, List<String> urls, boolean showProgress)
     {
-        BulkSinkRDF dest = destinationDefaultGraph(dsg, showProgress) ;
+        BulkStreamRDF dest = destinationDefaultGraph(dsg, showProgress) ;
         loadTriples$(dest, urls) ;
     }
 
     /** Load into default graph */
     public static void loadDefaultGraph(DatasetGraphTDB dsg, InputStream input, boolean showProgress)
     {
-        BulkSinkRDF dest = destinationDefaultGraph(dsg, showProgress) ;
+        BulkStreamRDF dest = destinationDefaultGraph(dsg, showProgress) ;
         loadTriples$(dest, input) ;
     }
 
-    private static BulkSinkRDF destinationDefaultGraph(DatasetGraphTDB dsg, boolean showProgress)
+    private static BulkStreamRDF destinationDefaultGraph(DatasetGraphTDB dsg, boolean showProgress)
     {
         NodeTupleTable ntt = dsg.getTripleTable().getNodeTupleTable() ;
         return destinationGraph(dsg, ntt, showProgress) ;
@@ -103,34 +103,34 @@ public class BulkLoader
     /** Load into named graph */
     public static void loadNamedGraph(DatasetGraphTDB dsg, Node graphNode, List<String> urls, boolean showProgress)
     {
-        BulkSinkRDF dest = destinationNamedGraph(dsg, graphNode, showProgress) ;
+        BulkStreamRDF dest = destinationNamedGraph(dsg, graphNode, showProgress) ;
         loadTriples$(dest, urls) ;
     }
     
     /** Load into named graph */
     public static void loadNamedGraph(DatasetGraphTDB dsg, Node graphNode, InputStream input, boolean showProgress)
     {
-        BulkSinkRDF dest = destinationNamedGraph(dsg, graphNode, showProgress) ;
+        BulkStreamRDF dest = destinationNamedGraph(dsg, graphNode, showProgress) ;
         loadTriples$(dest, input) ;
     }
 
     /** Load into a dataset */
     public static void loadDataset(DatasetGraphTDB dsg, List<String> urls, boolean showProgress)
     {
-        BulkSinkRDF dest = destinationDataset(dsg, showProgress) ;
+        BulkStreamRDF dest = destinationDataset(dsg, showProgress) ;
         loadQuads$(dest, urls) ;
     }
     
     /** Load into a dataset */
     public static void loadDataset(DatasetGraphTDB dsg, InputStream input, boolean showProgress)
     {
-        BulkSinkRDF dest = destinationDataset(dsg, showProgress) ;
+        BulkStreamRDF dest = destinationDataset(dsg, showProgress) ;
         loadQuads$(dest, input) ;
     }
     
 
     /** Load into a graph */
-    private static void loadTriples$(BulkSinkRDF dest, List<String> urls)
+    private static void loadTriples$(BulkStreamRDF dest, List<String> urls)
     {
         dest.startBulk() ;
         for ( String url : urls )
@@ -142,7 +142,7 @@ public class BulkLoader
     }
 
     /** Load into a graph */
-    private static void loadTriples$(BulkSinkRDF dest, InputStream input)
+    private static void loadTriples$(BulkStreamRDF dest, InputStream input)
     {
         loadLogger.info("Load: from input stream -- "+Utils.nowAsString()) ;
         dest.startBulk() ;
@@ -151,7 +151,7 @@ public class BulkLoader
     }
     
     /** Load quads into a dataset */
-    private static void loadQuads$(BulkSinkRDF dest, List<String> urls)
+    private static void loadQuads$(BulkStreamRDF dest, List<String> urls)
     {
         dest.startBulk() ;
         for ( String url : urls )
@@ -163,7 +163,7 @@ public class BulkLoader
     }
 
     /** Load quads into a dataset */
-    private static void loadQuads$(BulkSinkRDF dest, InputStream input)
+    private static void loadQuads$(BulkStreamRDF dest, InputStream input)
     {
         loadLogger.info("Load: from input stream -- "+Utils.nowAsString()) ;
         dest.startBulk() ;
@@ -171,7 +171,7 @@ public class BulkLoader
         dest.finishBulk() ;
     }
     
-    private static BulkSinkRDF destinationNamedGraph(DatasetGraphTDB dsg, Node graphName, boolean showProgress)
+    private static BulkStreamRDF destinationNamedGraph(DatasetGraphTDB dsg, Node graphName, boolean showProgress)
     {
         if ( graphName == null )
             return destinationDefaultGraph(dsg,showProgress) ;
@@ -189,18 +189,18 @@ public class BulkLoader
             return new LoadMonitor(dsg, null, itemName, DataTickPoint, IndexTickPoint) ; 
     }
 
-    private static BulkSinkRDF destinationDataset(DatasetGraphTDB dsg, boolean showProgress)
+    private static BulkStreamRDF destinationDataset(DatasetGraphTDB dsg, boolean showProgress)
     {
         return new DestinationDSG(dsg, showProgress) ;
     }
     
-    private static BulkSinkRDF destinationGraph(DatasetGraphTDB dsg, NodeTupleTable nodeTupleTable, boolean showProgress)
+    private static BulkStreamRDF destinationGraph(DatasetGraphTDB dsg, NodeTupleTable nodeTupleTable, boolean showProgress)
     {
         return new DestinationGraph(dsg, nodeTupleTable, showProgress) ;
     }
 
     // Load triples and quads into a dataset.
-    private static final class DestinationDSG implements BulkSinkRDF
+    private static final class DestinationDSG implements BulkStreamRDF
     {
         final private DatasetGraphTDB dsg ; 
         final private boolean startedEmpty ;
@@ -302,7 +302,7 @@ public class BulkLoader
     }
 
     // Load triples into a specific NodeTupleTable
-    private static final class DestinationGraph implements BulkSinkRDF
+    private static final class DestinationGraph implements BulkStreamRDF
     {
         final private DatasetGraphTDB dsg ;
         final private LoadMonitor monitor ;

Copied: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkStreamRDF.java (from r1426294, jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkSinkRDF.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkStreamRDF.java?p2=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkStreamRDF.java&p1=jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkSinkRDF.java&r1=1426294&r2=1426815&rev=1426815&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkSinkRDF.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkStreamRDF.java Sat Dec 29 19:56:10 2012
@@ -18,9 +18,9 @@
 
 package com.hp.hpl.jena.tdb.store.bulkloader;
 
-import org.apache.jena.riot.system.SinkRDF ;
+import org.apache.jena.riot.system.StreamRDF ;
 
-public interface BulkSinkRDF extends SinkRDF
+public interface BulkStreamRDF extends StreamRDF
 {
     public void startBulk() ;
     public void finishBulk() ;

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java?rev=1426815&r1=1426814&r2=1426815&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java Sat Dec 29 19:56:10 2012
@@ -56,7 +56,7 @@ import com.hp.hpl.jena.tdb.solver.stats.
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
 import com.hp.hpl.jena.tdb.store.NodeId ;
 import com.hp.hpl.jena.tdb.store.bulkloader.BulkLoader ;
-import com.hp.hpl.jena.tdb.store.bulkloader.BulkSinkRDF ;
+import com.hp.hpl.jena.tdb.store.bulkloader.BulkStreamRDF ;
 
 /** Build node table - write triples/quads as text file */
 public class CmdNodeTableBuilder extends CmdGeneral
@@ -181,7 +181,7 @@ public class CmdNodeTableBuilder extends
         cmdLog.info(str) ;
     }
 
-    static class NodeTableBuilder implements BulkSinkRDF
+    static class NodeTableBuilder implements BulkStreamRDF
     {
         private DatasetGraphTDB dsg ;
         private NodeTable nodeTable ;