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 2013/03/05 00:36:06 UTC
svn commit: r1452598 - in /jena/Experimental/riot-output: ./
src/main/java/dev/ src/main/java/riot/ src/test/java/riot/
Author: andy
Date: Mon Mar 4 23:36:06 2013
New Revision: 1452598
URL: http://svn.apache.org/r1452598
Log:
Clear up after starting branch arq-riot-output
Removed:
jena/Experimental/riot-output/src/main/java/dev/ExRIOT_out1.java
jena/Experimental/riot-output/src/main/java/dev/ExRIOT_out2.java
jena/Experimental/riot-output/src/main/java/dev/ExRIOT_out3.java
jena/Experimental/riot-output/src/main/java/riot/
jena/Experimental/riot-output/src/test/java/riot/
Modified:
jena/Experimental/riot-output/ (props changed)
jena/Experimental/riot-output/.classpath
jena/Experimental/riot-output/src/main/java/dev/MainOutput.java
jena/Experimental/riot-output/src/main/java/dev/MainWriter.java
jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java
Propchange: jena/Experimental/riot-output/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 4 23:36:06 2013
@@ -1 +1,2 @@
classes
+snap*
Modified: jena/Experimental/riot-output/.classpath
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-output/.classpath?rev=1452598&r1=1452597&r2=1452598&view=diff
==============================================================================
--- jena/Experimental/riot-output/.classpath (original)
+++ jena/Experimental/riot-output/.classpath Mon Mar 4 23:36:06 2013
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry including="**/*.java" kind="src" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jena-arq"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jena-core"/>
- <classpathentry kind="lib" path="/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.6-SNAPSHOT/jena-iri-0.9.6-SNAPSHOT.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jena-tdb"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry including="**/*.java" kind="src" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jena-core"/>
+ <classpathentry kind="lib" path="/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.6-SNAPSHOT/jena-iri-0.9.6-SNAPSHOT.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jena-tdb"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/arq-riot-output"/>
+ <classpathentry kind="output" path="classes"/>
</classpath>
Modified: jena/Experimental/riot-output/src/main/java/dev/MainOutput.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-output/src/main/java/dev/MainOutput.java?rev=1452598&r1=1452597&r2=1452598&view=diff
==============================================================================
--- jena/Experimental/riot-output/src/main/java/dev/MainOutput.java (original)
+++ jena/Experimental/riot-output/src/main/java/dev/MainOutput.java Mon Mar 4 23:36:06 2013
@@ -21,7 +21,7 @@ package dev;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.StreamRDF ;
-import riot.writer.WriterStreamRDFBlocks ;
+import org.apache.jena.riot.writer.WriterStreamRDFBlocks ;
public class MainOutput
{
Modified: jena/Experimental/riot-output/src/main/java/dev/MainWriter.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-output/src/main/java/dev/MainWriter.java?rev=1452598&r1=1452597&r2=1452598&view=diff
==============================================================================
--- jena/Experimental/riot-output/src/main/java/dev/MainWriter.java (original)
+++ jena/Experimental/riot-output/src/main/java/dev/MainWriter.java Mon Mar 4 23:36:06 2013
@@ -26,16 +26,11 @@ import java.util.Map.Entry ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.* ;
+import org.apache.jena.riot.system.IO_Jena2 ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
import org.apache.jena.riot.system.StreamRDF ;
-import riot.RDFFormat ;
-import riot.RDFWriterMgr ;
-import riot.WriterGraphRIOT ;
-import riot.system.IO_Jena2 ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java?rev=1452598&r1=1452597&r2=1452598&view=diff
==============================================================================
--- jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java (original)
+++ jena/Experimental/riot-output/src/main/java/dev/PROJECT_RiotWriter.java Mon Mar 4 23:36:06 2013
@@ -18,19 +18,33 @@
package dev;
-
-
public class PROJECT_RiotWriter
{
- // ready to migrate.
- // Migration
+ // MIGRATION
// - RIOT.init to call RDFWriterRegistry.init()
// - RDFWriter -> RDFDataMgr
// riot --out FMT (later?)
// - Remove some RIOT.init calls.
- // - IO_Jena2 to JenaReadersWriters
+ // - IO_Jena2 to JenaReadersWriters (IO_Jena, IO_Ctl)
// - RiotWriteLib to RiotLib
// - Writer names in FusekiLib
+ // - Remove old RDF/JSON writer, NQuadsWriter, NTriplesWriter, out.Sink*
+ // - Organise tests
+ // See RIOT.init
+ // MIGRATION
+
+ // Tests:
+ // - all registrations (implict current because they are used)
+ // WriterStreamTuples - use NodeFormatterNT?
+
+ // Trig reading - prefixes to default graph.
+
+ // Add RDFDataMgr.createParser(Lang) -> ReaderRIOT
+
+ // ready to migrate.
+
+ // NodeToLabel vs NodeToLabelMap
+ // LabelToNode vs LabelToNodeMap
// RiotWriter
// Iterator to triples/quads into RDFWriterMgr.