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/11/18 17:37:04 UTC

svn commit: r1410920 - in /jena/Experimental/riot-reader: .classpath .project src/main/java/dev/MainWebReader.java src/main/java/dev/PROJECT_RiotReader.java

Author: andy
Date: Sun Nov 18 16:37:03 2012
New Revision: 1410920

URL: http://svn.apache.org/viewvc?rev=1410920&view=rev
Log:
Convert to an auxillary development project.

Modified:
    jena/Experimental/riot-reader/.classpath
    jena/Experimental/riot-reader/.project
    jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java
    jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java

Modified: jena/Experimental/riot-reader/.classpath
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/.classpath?rev=1410920&r1=1410919&r2=1410920&view=diff
==============================================================================
--- jena/Experimental/riot-reader/.classpath (original)
+++ jena/Experimental/riot-reader/.classpath Sun Nov 18 16:37:03 2012
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+	<classpathentry excluding="META-INF/NOTICE|META-INF/LICENSE|META-INF/DEPENDENCIES|**/*.java|arq-properties.xml" kind="src" path="src/main/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.5-SNAPSHOT/jena-core-2.7.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.5-SNAPSHOT/jena-core-2.7.5-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.5-SNAPSHOT/jena-iri-0.9.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.5-SNAPSHOT/jena-iri-0.9.5-SNAPSHOT-sources.jar"/>
+	<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/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.5-SNAPSHOT/jena-core-2.7.5-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.5-SNAPSHOT/jena-core-2.7.5-SNAPSHOT-test-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3-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.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jena-arq"/>
+	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: jena/Experimental/riot-reader/.project
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/.project?rev=1410920&r1=1410919&r2=1410920&view=diff
==============================================================================
--- jena/Experimental/riot-reader/.project (original)
+++ jena/Experimental/riot-reader/.project Sun Nov 18 16:37:03 2012
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>riot-reader</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
+  <name>riot-reader</name>
+  <comment>RIOT Reader</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
 </projectDescription>

Modified: jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java?rev=1410920&r1=1410919&r2=1410920&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java Sun Nov 18 16:37:03 2012
@@ -20,8 +20,7 @@ package dev;
 
 import org.apache.jena.riot.Langs ;
 import org.apache.jena.riot.WebReader2 ;
-import org.apache.jena.riot.adapters.AdapterFileManager ;
-import org.openjena.atlas.logging.Log ;
+import org.openjena.riot.RIOT ;
 import org.openjena.riot.WebContent ;
 
 import com.hp.hpl.jena.rdf.model.Model ;
@@ -29,31 +28,23 @@ import com.hp.hpl.jena.rdf.model.ModelFa
 
 public class MainWebReader
 {
-    static { Log.setLog4j() ; }
+    //static { Log.setLog4j() ; }
     
     public static void main(String ... argv)
     {
-        WebReader2.wireIntoJena() ;
-        {
-            Model m = AdapterFileManager.get().loadModel("http://jena.apache.org/about_jena/jena.rdf") ;
-            System.out.println(m.size()) ;
-        }
-        System.out.println("DONE") ;
-        System.exit(0) ;
-        
+        //
+        RIOT.init() ;
+
+        //WebReader2.wireIntoJena() ;
+//        dwim("http://people.apache.org/~andy/RIOT-test/D.x") ;
         dwim("http://people.apache.org/~andy/RIOT-test/D.ttl") ;
-        dwim("http://people.apache.org/~andy/RIOT-test/D.nt") ;
-        dwim("http://people.apache.org/~andy/RIOT-test/D.rdf") ;
-        dwim("http://people.apache.org/~andy/RIOT-test/D.trig") ;
-        dwim("http://people.apache.org/~andy/RIOT-test/elephant") ;
-        
-        
-        
-        System.out.println("DONE") ;
+//        dwim("http://people.apache.org/~andy/RIOT-test/D.nt") ;
+//        dwim("http://people.apache.org/~andy/RIOT-test/D.rdf") ;
+//        //dwim("http://people.apache.org/~andy/RIOT-test/D.trig") ;
+//        dwim("http://people.apache.org/~andy/RIOT-test/elephant") ;
+//        System.out.println("DONE") ;
         System.exit(0) ;
         
-        
-        
         Model m = ModelFactory.createDefaultModel() ;
         WebReader2.read(m, "http://localhost:3030/ds/data?default", Langs.nameToLang(WebContent.contentTypeTurtle), null) ;
         WebReader2.read(m, "file:./D.ttl", null, null, null) ;
@@ -67,12 +58,14 @@ public class MainWebReader
         try {
             Model m = ModelFactory.createDefaultModel() ;
             m.read(uri) ;
+            m.write(System.out, "TTL") ;
         } catch (RuntimeException ex)
         {
             System.out.flush() ;
             ex.printStackTrace(System.err) ;
         }
         System.out.println() ;
+        System.out.flush() ;
     }
 }
 

Modified: jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java?rev=1410920&r1=1410919&r2=1410920&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java Sun Nov 18 16:37:03 2012
@@ -21,9 +21,11 @@ package dev;
 
 public class PROJECT_RiotReader
 {
-    // Replace all manifest test suites in ARQ/RIOT with new code.
-    // Separate out manifest and junit-direct tests (two packages)  
-
+    // Integration
+    //    Check used!
+    //    Check AdaptiveFileManager
+    
+    
     // Work out the dependencies on ARQ for splitting out RIOT
     
     // Check ContentType vs MediaType => MediaType (code) , correct name is ?