jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1425327 - in /jena/trunk: jena-fuseki/src/main/java/org/apache/jena/fuseki/ jena-fuseki/src/main/java/org/apache/jena/fuseki/http/ jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ jena-fuseki/src/main/java/org/apache/jena/fuseki/migra...
Date Sat, 22 Dec 2012 17:54:16 GMT
Author: andy
Date: Sat Dec 22 17:54:15 2012
New Revision: 1425327

URL: http://svn.apache.org/viewvc?rev=1425327&view=rev
Log:
Align to the migration from org.openjena.riot to org.apache.jena.riot.

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
    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/mgt/ActionBackup.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/SinkLimited.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.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/ResponseModel.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.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_REST_R.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.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-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
    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
    jena/trunk/jena-tdb/src/main/java/tdb/tdbdump.java
    jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java Sat Dec 22 17:54:15
2012
@@ -20,7 +20,7 @@ package org.apache.jena.fuseki;
 
 import org.apache.jena.atlas.web.AcceptList ;
 import org.apache.jena.atlas.web.MediaType ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.WebContent ;
 
 public class DEF
 {

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java Sat Dec 22 17:54:15
2012
@@ -19,7 +19,7 @@
 package org.apache.jena.fuseki;
 
 import org.apache.jena.fuseki.server.SPARQLServer ;
-import org.openjena.riot.RIOT ;
+import org.apache.jena.riot.RIOT ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
@@ -46,7 +46,6 @@ public class Fuseki
     // TEMPORARY
     static public boolean graphStoreProtocolMode = false ;
     
-    //static private String metadataDevLocation = "org/openjena/fuseki/fuseki-properties-dev.xml"
;
     static private String metadataLocation = "org/apache/jena/fuseki/fuseki-properties.xml"
;
     static private Metadata metadata = initMetadata() ;
     private static Metadata initMetadata()

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Sat Dec 22
17:54:15 2012
@@ -27,31 +27,27 @@ import java.util.List ;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.fuseki.mgt.ManagementServer ;
 import org.apache.jena.fuseki.server.FusekiConfig ;
 import org.apache.jena.fuseki.server.SPARQLServer ;
 import org.apache.jena.fuseki.server.ServerConfig ;
-import org.apache.jena.riot.lang.SinkQuadsToDataset ;
-import org.apache.jena.riot.lang.SinkTriplesToGraph ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.SysRIOT ;
 import org.eclipse.jetty.server.Server ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotLoader ;
-import org.openjena.riot.SysRIOT ;
 import org.slf4j.Logger ;
 import arq.cmd.CmdException ;
 import arq.cmdline.ArgDecl ;
 import arq.cmdline.CmdARQ ;
 import arq.cmdline.ModDatasetAssembler ;
 
-import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.core.Quad ;
 import com.hp.hpl.jena.tdb.TDB ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.transaction.TransactionManager ;
@@ -248,21 +244,15 @@ public class FusekiCmd extends CmdARQ
             if ( ! FileOps.exists(filename) )
                 throw new CmdException("File not found: "+filename) ;
 
-            Lang language = Lang.guess(filename) ;
+            Lang language = RDFLanguages.filenameToLang(filename) ;
             if ( language == null )
                 throw new CmdException("Can't guess language for file: "+filename) ;
             InputStream input = IO.openFile(filename) ; 
             
-            if ( language.isQuads() )
-            {
-                Sink<Quad> sink = new SinkQuadsToDataset(dsg) ;
-                RiotLoader.readQuads(input, language, filename, sink) ;
-            }
+            if ( RDFLanguages.isQuads(language) )
+                RDFDataMgr.read(dsg, filename) ;
             else
-            {
-                Sink<Triple> sink = new SinkTriplesToGraph(dsg.getDefaultGraph()) ;
-                RiotLoader.readTriples(input, language, filename, sink) ;
-            }
+                RDFDataMgr.read(dsg.getDefaultGraph(), filename) ;
         }
         
         if ( contains(argMemTDB) )

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java Sat Dec 22
17:54:15 2012
@@ -26,9 +26,10 @@ import javax.servlet.http.HttpServletReq
 import org.apache.commons.lang.StringUtils ;
 import org.apache.jena.atlas.lib.MultiMap ;
 import org.apache.jena.atlas.web.MediaType ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.WebContent ;
 
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -45,31 +46,9 @@ public class FusekiLib
     { 
         if ( mimeType == null )
             return null ;
-        return mapContentTypeToLang.get(mimeType.toLowerCase()) ;
+        return WebContent.contentTypeToLang(mimeType.toLowerCase()) ;
     }
     
-    private static Model dummy = ModelFactory.createDefaultModel() ;
-    private static Map<String, Lang> mapContentTypeToLang = new HashMap<String,
Lang>() ;
-    // Use riot.WebContent on next ARQ update.
-    static {
-        mapContentTypeToLang.put(WebContent.contentTypeRDFXML, Lang.RDFXML) ;
-        mapContentTypeToLang.put(WebContent.contentTypeRDFJSON, Lang.RDFJSON) ;
-        mapContentTypeToLang.put(WebContent.contentTypeTurtle, Lang.TURTLE) ;
-        mapContentTypeToLang.put(WebContent.contentTypeTurtleAlt1, Lang.TURTLE) ;
-        mapContentTypeToLang.put(WebContent.contentTypeTurtleAlt2, Lang.TURTLE) ;
-        mapContentTypeToLang.put(WebContent.contentTypeNTriples, Lang.NTRIPLES) ;   // text/plain
-        mapContentTypeToLang.put(WebContent.contentTypeNTriplesAlt, Lang.NTRIPLES) ;
-        
-        
-        mapContentTypeToLang.put(WebContent.contentTypeTriG, Lang.TRIG) ;
-        mapContentTypeToLang.put(WebContent.contentTypeTriGAlt1, Lang.TRIG) ;
-        mapContentTypeToLang.put(WebContent.contentTypeTriGAlt2, Lang.TRIG) ;
-        mapContentTypeToLang.put(WebContent.contentTypeNQuads, Lang.NQUADS) ;
-        mapContentTypeToLang.put(WebContent.contentTypeNQuadsAlt1, Lang.NQUADS) ;
-        mapContentTypeToLang.put(WebContent.contentTypeNQuadsAlt2, Lang.NQUADS) ;
-    }
-    // ---- 
-
     public static MediaType contentType(HttpServletRequest request)
     {
         String x = request.getHeader(HttpNames.hContentType) ;
@@ -80,48 +59,24 @@ public class FusekiLib
 
     private static Map<Lang, String> mapLangToWriterName =  new HashMap<Lang, String>()
;
     static {
-        mapLangToWriterName.put(Lang.N3, WebContent.langN3) ;
-        mapLangToWriterName.put(Lang.RDFJSON, WebContent.langRdfJson) ;
-        mapLangToWriterName.put(Lang.TURTLE, WebContent.langTurtle) ;
-        mapLangToWriterName.put(Lang.NTRIPLES, WebContent.langNTriples) ;
-        mapLangToWriterName.put(Lang.RDFXML, WebContent.langRDFXML) ;
+        mapLangToWriterName.put(RDFLanguages.N3, WebContent.langN3) ;
+        mapLangToWriterName.put(RDFLanguages.RDFJSON, WebContent.langRdfJson) ;
+        mapLangToWriterName.put(RDFLanguages.Turtle, WebContent.langTurtle) ;
+        mapLangToWriterName.put(RDFLanguages.NTriples, WebContent.langNTriples) ;
+        mapLangToWriterName.put(RDFLanguages.RDFXML, WebContent.langRDFXML) ;
     }
     
+    private static Model dummy = ModelFactory.createDefaultModel() ;
     public static RDFWriter chooseWriter(Lang lang)        
     {
         if ( lang == null )
-            lang = Lang.RDFXML ;
+            lang = RDFLanguages.RDFXML ;
         String name = mapLangToWriterName.get(lang) ;
-        
         if ( name == null )
             throw new RiotException("Not a triples language: "+lang) ;
         return dummy.getWriter(name) ;
     }
 
-//    static public MediaType match(String headerString, AcceptList offerList)
-//    {
-//        AcceptList l = new AcceptList(headerString) ;
-//        return AcceptList.match(l, offerList) ;
-//    }
-//
-//    public static String match(String headerString, String str)
-//    {
-//        AcceptList l = new AcceptList(headerString) ;
-//        MediaType aItem = new MediaType(str) ;   
-//    
-//        MediaType m = l.match(aItem) ;
-//        if ( m == null )
-//            return null ;
-//        return m.toHeaderString() ;
-//    }
-//
-//    public static boolean accept(String headerString, String str)
-//    {
-//        AcceptList l = new AcceptList(headerString) ;
-//        MediaType aItem = new MediaType(str) ;
-//        return l.accepts(aItem) ;
-//    }
-
     static String fmtRequest(HttpServletRequest request)
     {
         StringBuffer sbuff = new StringBuffer() ;

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -41,12 +41,12 @@ import org.apache.jena.atlas.logging.Log
 import org.apache.jena.atlas.web.TypedInputStream ;
 import org.apache.jena.fuseki.* ;
 import org.apache.jena.fuseki.migrate.UnmodifiableGraph ;
+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.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.WebContent ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Sat
Dec 22 17:54:15 2012
@@ -39,7 +39,7 @@ import org.apache.jena.fuseki.server.Dat
 import org.apache.jena.fuseki.server.DatasetRegistry ;
 import org.apache.jena.fuseki.servlets.HttpAction ;
 import org.apache.jena.fuseki.servlets.ServletBase ;
-import org.openjena.riot.out.NQuadsWriter ;
+import org.apache.jena.riot.out.NQuadsWriter ;
 
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.util.Utils ;

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -23,13 +23,14 @@ import java.io.InputStream ;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
 import org.apache.jena.riot.lang.SinkTriplesToGraph ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
 
 import com.hp.hpl.jena.graph.Factory ;
 import com.hp.hpl.jena.graph.Graph ;
@@ -73,7 +74,7 @@ public class GraphLoadUtils
     // ** Worker.
     private static void readUtil(Graph graph, String uri, int limit)
     {
-        Lang lang = Lang.guess(uri, Lang.RDFXML) ;
+        Lang lang = RDFLanguages.filenameToLang(uri, RDFLanguages.RDFXML) ;
         
         Sink<Triple> sink = new SinkTriplesToGraph(graph) ;
         sink = new SinkLimited<Triple>(sink, limit) ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java Sat
Dec 22 17:54:15 2012
@@ -20,7 +20,7 @@ package org.apache.jena.fuseki.migrate;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.SinkWrapper ;
-import org.openjena.riot.RiotException ;
+import org.apache.jena.riot.RiotException ;
 
 public class SinkLimited<T> extends SinkWrapper<T>
 {

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Sat
Dec 22 17:54:15 2012
@@ -36,6 +36,7 @@ import org.apache.jena.fuseki.validation
 import org.apache.jena.fuseki.validation.IRIValidator ;
 import org.apache.jena.fuseki.validation.QueryValidator ;
 import org.apache.jena.fuseki.validation.UpdateValidator ;
+import org.apache.jena.riot.WebContent ;
 import org.eclipse.jetty.http.MimeTypes ;
 import org.eclipse.jetty.server.Connector ;
 import org.eclipse.jetty.server.Server ;
@@ -44,7 +45,6 @@ import org.eclipse.jetty.servlet.Default
 import org.eclipse.jetty.servlet.ServletContextHandler ;
 import org.eclipse.jetty.servlet.ServletHolder ;
 import org.eclipse.jetty.xml.XmlConfiguration ;
-import org.openjena.riot.WebContent ;
 
 import org.eclipse.jetty.server.DispatcherType;
 import org.eclipse.jetty.servlets.GzipFilter;

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -30,12 +30,13 @@ import org.apache.jena.atlas.web.TypedOu
 import org.apache.jena.fuseki.Fuseki ;
 import org.apache.jena.fuseki.FusekiLib ;
 import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.Lang ;
+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.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.RiotWriter ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
@@ -67,21 +68,21 @@ public class REST_Quads extends SPARQL_R
         TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
         Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
         if ( lang == null )
-            lang = Lang.TRIG ;
+            lang = RDFLanguages.TriG ;
 
         if ( action.verbose )
             log.info(format("[%d]   Get: Content-Type=%s, Charset=%s => %s", 
                                   action.id, mediaType.getContentType(), mediaType.getCharset(),
lang.getName())) ;
-        if ( ! lang.isQuads() )
+        if ( ! RDFLanguages.isQuads(lang) )
             errorBadRequest("Not a quads format: "+mediaType) ;
         
         action.beginRead() ;
         try {
             DatasetGraph dsg = action.getActiveDSG() ;
             
-            if ( lang == Lang.NQUADS )
+            if ( lang == RDFLanguages.NQuads )
                 RiotWriter.writeNQuads(out, dsg) ;
-            else if ( lang == Lang.TRIG )
+            else if ( lang == RDFLanguages.TriG )
                 errorBadRequest("TriG - Not implemented (yet) : "+mediaType) ;
             else
                 errorBadRequest("No handled: "+mediaType) ;
@@ -121,13 +122,13 @@ public class REST_Quads extends SPARQL_R
         MediaType mediaType = MediaType.create(x) ;
         Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
         if ( lang == null )
-            lang = Lang.TRIG ;
+            lang = RDFLanguages.TriG ;
 
         if ( action.verbose )
             log.info(format("[%d]   Post: Content-Type=%s, Charset=%s => %s", 
                                   action.id, mediaType.getContentType(), mediaType.getCharset(),
lang.getName())) ;
-        if ( lang.isQuads() )
-            errorBadRequest("Quads format: "+mediaType) ;
+        if ( ! RDFLanguages.isQuads(lang) )
+            errorBadRequest("Not a quads format: "+mediaType) ;
         
         action.beginWrite() ;
         try {

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
Sat Dec 22 17:54:15 2012
@@ -32,8 +32,8 @@ import org.apache.jena.fuseki.FusekiLib 
 import org.apache.jena.fuseki.conneg.ConNeg ;
 import org.apache.jena.fuseki.conneg.WebLib ;
 import org.apache.jena.fuseki.http.HttpSC ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.WebContent ;
 
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.RDFWriter ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
Sat Dec 22 17:54:15 2012
@@ -33,8 +33,8 @@ import org.apache.jena.fuseki.DEF ;
 import org.apache.jena.fuseki.FusekiException ;
 import org.apache.jena.fuseki.conneg.ConNeg ;
 import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.riot.WebContent ;
 import static org.apache.jena.atlas.lib.Lib.equal ;
-import org.openjena.riot.WebContent ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
Sat Dec 22 17:54:15 2012
@@ -47,7 +47,7 @@ import org.apache.jena.fuseki.HttpNames 
 import org.apache.jena.fuseki.http.HttpSC ;
 import org.apache.jena.fuseki.migrate.WebIO ;
 import org.apache.jena.fuseki.server.DatasetRef ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.WebContent ;
 
 import com.hp.hpl.jena.query.* ;
 import com.hp.hpl.jena.rdf.model.Model ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
Sat Dec 22 17:54:15 2012
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletReq
 
 import org.apache.jena.atlas.lib.InternalErrorException ;
 import org.apache.jena.fuseki.migrate.GraphLoadUtils ;
-import org.openjena.riot.RiotException ;
+import org.apache.jena.riot.RiotException ;
 
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.query.DatasetFactory ;

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -43,11 +43,16 @@ import org.apache.jena.fuseki.FusekiLib 
 import org.apache.jena.fuseki.HttpNames ;
 import org.apache.jena.fuseki.http.HttpSC ;
 import org.apache.jena.fuseki.server.DatasetRef ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.WebContent ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
 import org.apache.jena.riot.system.IRIResolver ;
-import org.openjena.riot.* ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
Sat Dec 22 17:54:15 2012
@@ -30,8 +30,8 @@ import org.apache.jena.atlas.web.TypedOu
 import org.apache.jena.fuseki.FusekiLib ;
 import org.apache.jena.fuseki.HttpNames ;
 import org.apache.jena.fuseki.server.DatasetRegistry ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.WebContent ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.rdf.model.Model ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
Sat Dec 22 17:54:15 2012
@@ -36,7 +36,7 @@ import org.apache.jena.fuseki.conneg.Con
 import org.apache.jena.fuseki.http.HttpSC ;
 import org.apache.jena.fuseki.server.DatasetRef ;
 import org.apache.jena.fuseki.server.DatasetRegistry ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.WebContent ;
 
 /** This servlet can be attached to a dataset location
  *  and acts as a falserouter for all SPARQL operations

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
Sat Dec 22 17:54:15 2012
@@ -43,8 +43,8 @@ import org.apache.jena.fuseki.HttpNames 
 import org.apache.jena.fuseki.http.HttpSC ;
 import org.apache.jena.fuseki.server.DatasetRef ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.WebContent ;
 import org.apache.jena.riot.system.IRIResolver ;
-import org.openjena.riot.WebContent ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.QueryParseException ;

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -37,11 +37,16 @@ import org.apache.jena.fuseki.HttpNames 
 import org.apache.jena.fuseki.http.HttpSC ;
 import org.apache.jena.fuseki.server.DatasetRef ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
 import org.apache.jena.riot.system.IRIResolver ;
-import org.openjena.riot.* ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.GraphUtil ;
@@ -196,10 +201,10 @@ public class SPARQL_Upload extends SPARQ
 
                     lang = FusekiLib.langFromContentType(ct.getContentType()) ;
                     if ( lang == null )
-                        lang = Lang.guess(name) ;
+                        lang = RDFLanguages.filenameToLang(name) ;
                     if ( lang == null )
                         // Desperate.
-                        lang = Lang.RDFXML ;
+                        lang = RDFLanguages.RDFXML ;
 
                     // We read into a in-memory graph, then (if successful) update the dataset.
                     // This isolates errors.

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -18,7 +18,7 @@
 
 package org.apache.jena.fuseki.validation;
 
-import static org.openjena.riot.SysRIOT.fmtMessage ;
+import static org.apache.jena.riot.SysRIOT.fmtMessage ;
 
 import java.io.IOException ;
 import java.io.PrintStream ;
@@ -32,16 +32,17 @@ import javax.servlet.http.HttpServletRes
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.system.ErrorHandler ;
 import org.apache.jena.riot.system.RiotLib ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.core.Quad ;
@@ -73,9 +74,9 @@ public class DataValidator extends Valid
             
             String syntax = FusekiLib.safeParameter(httpRequest, paramSyntax) ;
             if ( syntax == null || syntax.equals("") )
-                syntax = Lang.NQUADS.getName() ;
+                syntax = RDFLanguages.NQuads.getName() ;
 
-            Lang language = Lang.get(syntax) ;
+            Lang language = RDFLanguages.shortnameToLang(syntax) ;
             if ( language == null )
             {
                 httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "Unknown syntax:
"+syntax) ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
Sat Dec 22 17:54:15 2012
@@ -64,7 +64,7 @@ public abstract class ValidatorBase exte
     {
         httpResponse.setCharacterEncoding("UTF-8") ;
         httpResponse.setContentType("text/html") ;
-        httpResponse.setHeader(respService, "Fuseki/ARQ SPARQL Query Validator: http://openjena.org/ARQ")
;
+        httpResponse.setHeader(respService, "Fuseki/ARQ SPARQL Query Validator: http://jena.apache.org/")
;
     }
     
     protected static String htmlQuote(String str)

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Sat Dec 22 17:54:15 2012
@@ -22,8 +22,8 @@ import java.util.Iterator ;
 
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.lib.Sync ;
+import org.apache.jena.riot.RIOT ;
 import org.apache.jena.riot.lang.LangRDFXML ;
-import org.openjena.riot.SysRIOT ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
@@ -188,7 +188,7 @@ public class TDB
             return ;
         initialized = true ;
      
-        SysRIOT.wireIntoJena() ;
+        RIOT.init() ;
         SystemTDB.init() ;
         ARQ.init() ;
         LangRDFXML.RiotUniformCompatibility = true ;

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java Sat Dec 22 17:54:15
2012
@@ -26,7 +26,7 @@ import java.io.OutputStream ;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.logging.Log ;
-import org.openjena.riot.out.NQuadsWriter ;
+import org.apache.jena.riot.out.NQuadsWriter ;
 
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.query.ReadWrite ;

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java Sat Dec 22 17:54:15
2012
@@ -22,7 +22,8 @@ import java.io.InputStream ;
 import java.util.ArrayList ;
 import java.util.List ;
 
-import org.openjena.riot.Lang ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
 import org.slf4j.Logger ;
 
 import com.hp.hpl.jena.graph.Node ;
@@ -234,8 +235,8 @@ public class TDBLoader
         {
             for ( String url : urls )
             {
-                Lang lang = Lang.guess(url) ;
-                if ( lang != null && ! lang.isQuads() )
+                Lang lang = RDFLanguages.filenameToLang(url) ;
+                if ( lang != null && RDFLanguages.isQuads(lang) )
                     throw new TDBException("Not a triples language") ;
             }
         }

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java Sat Dec
22 17:54:15 2012
@@ -22,11 +22,11 @@ import java.nio.ByteBuffer ;
 
 import org.apache.jena.atlas.io.BlockUTF8 ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.tokens.Token ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.apache.jena.riot.web.LangTag ;
-import org.openjena.riot.RiotException ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.rdf.model.AnonId ;

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -18,14 +18,12 @@
 
 package com.hp.hpl.jena.tdb.store.bulkloader;
 
-import static org.openjena.riot.Lang.NQUADS ;
-import static org.openjena.riot.Lang.NTRIPLES ;
-
 import java.io.InputStream ;
 import java.util.List ;
 
 import org.apache.jena.atlas.event.EventType ;
-import org.openjena.riot.RiotReader ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader ;
 import org.slf4j.Logger ;
 
 import com.hp.hpl.jena.graph.Node ;
@@ -146,7 +144,7 @@ public class BulkLoader
     {
         loadLogger.info("Load: from input stream -- "+Utils.nowAsString()) ;
         dest.start() ;
-        RiotReader.parseTriples(input, NTRIPLES, null, dest) ;
+        RiotReader.parseTriples(input, RDFLanguages.NTriples, null, dest) ;
         dest.finish() ;
     }
     
@@ -167,7 +165,7 @@ public class BulkLoader
     {
         loadLogger.info("Load: from input stream -- "+Utils.nowAsString()) ;
         dest.start() ;
-        RiotReader.parseQuads(input, NQUADS, null, dest) ;
+        RiotReader.parseQuads(input, RDFLanguages.NQuads, null, dest) ;
         dest.finish() ;
     }
     

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=1425327&r1=1425326&r2=1425327&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 22 17:54:15 2012
@@ -33,9 +33,10 @@ import org.apache.jena.atlas.lib.FileOps
 import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.system.SinkExtendTriplesToQuads ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotLoader ;
 import org.slf4j.Logger ;
 import tdb.cmdline.CmdTDB ;
 import arq.cmd.CmdException ;
@@ -119,7 +120,7 @@ public class CmdNodeTableBuilder extends
 
         for( String filename : datafiles)
         {
-            Lang lang = Lang.guess(filename, Lang.NQUADS) ;
+            Lang lang = RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
             if ( lang == null )
                 // Does not happen due to default above.
                 cmdError("File suffix not recognized: " +filename) ;
@@ -161,11 +162,11 @@ public class CmdNodeTableBuilder extends
                 cmdLog.info("Load: "+filename+" -- "+Utils.nowAsString()) ;
             
             InputStream in = IO.openFile(filename) ;
-            Lang lang = Lang.guess(filename, Lang.NQUADS) ;
-            if ( lang.isTriples() )
-                RiotLoader.readTriples(in, lang, null, sink2) ;
+            Lang lang = RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
+            if ( RDFLanguages.isTriples(lang) )
+                RiotReader.parseTriples(in, lang, null, sink2) ;
             else
-                RiotLoader.readQuads(in, lang, null, sink) ;
+                RiotReader.parseQuads(in, lang, null, sink) ;
         }
         sink.close() ;
         IO.close(outputTriples) ;

Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbdump.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbdump.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbdump.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbdump.java Sat Dec 22 17:54:15 2012
@@ -18,7 +18,7 @@
 
 package tdb;
 
-import org.openjena.riot.RiotWriter ;
+import org.apache.jena.riot.RiotWriter ;
 import tdb.cmdline.CmdTDB ;
 
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;

Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java?rev=1425327&r1=1425326&r2=1425327&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java Sat Dec 22 17:54:15 2012
@@ -20,7 +20,8 @@ package tdb;
 
 import java.util.List ;
 
-import org.openjena.riot.Lang ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
 import tdb.cmdline.CmdTDB ;
 import tdb.cmdline.CmdTDBGraph ;
 import tdb.cmdline.ModModel ;
@@ -103,8 +104,8 @@ public class tdbloader extends CmdTDBGra
         boolean allTriples = true ;
         for ( String url : urls )
         {
-            Lang lang = Lang.guess(url, Lang.NQUADS) ;
-            if ( lang != null && lang.isQuads() )
+            Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQuads) ;
+            if ( lang != null && RDFLanguages.isQuads(lang) )
             {
                 allTriples = false ;
                 break ; 
@@ -128,11 +129,11 @@ public class tdbloader extends CmdTDBGra
         {
             for ( String url : urls )
             {
-                Lang lang = Lang.guess(url, Lang.NQUADS) ;
+                Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQuads) ;
                 if ( lang == null )
                     // Does not happen due to default above.
                     cmdError("File suffix not recognized: " +url) ;
-                if ( lang != null && ! lang.isTriples() )
+                if ( lang != null && ! RDFLanguages.isTriples(lang) )
                     cmdError("Can only load triples into a named model: "+url) ;
             }
             cmdError("Internal error: deteched quad input but can't find it again") ;



Mime
View raw message