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 11:48:20 UTC
svn commit: r1410866 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/query/ main/java/org/apache/
main/java/org/apache/jena/ main/java/org/openjena/riot/
test/java/com/hp/hpl/jena/sparql/ test/java/org/apache/
test/java/org/apache/jena/ test/j...
Author: andy
Date: Sun Nov 18 10:48:18 2012
New Revision: 1410866
URL: http://svn.apache.org/viewvc?rev=1410866&view=rev
Log:
Merge RIOT reader
Added:
jena/trunk/jena-arq/src/main/java/org/apache/
jena/trunk/jena-arq/src/main/java/org/apache/jena/
jena/trunk/jena-arq/src/test/java/org/apache/
jena/trunk/jena-arq/src/test/java/org/apache/jena/
Removed:
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TC_Riot.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/FactoryTestRDFJSONFactory.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/FactoryTestRiotTriG.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/FactoryTestRiotTurtle.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/TestSuiteRDFJSON.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/TestSuiteTrig.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/TestSuiteTurtle.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestRDFJSON.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestRDFJSONBadSyntax.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestRDFJSONSyntax.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestSupressed.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestTrig.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestTrigBadSyntax.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestTrigSyntax.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestTurtle.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestTurtleBadSyntax.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/langsuite/UnitTestTurtleSyntax.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1410866&r1=1410865&r2=1410866&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Sun Nov 18 10:48:18 2012
@@ -36,8 +36,7 @@ import com.hp.hpl.jena.sparql.util.Conte
import com.hp.hpl.jena.sparql.util.MappingRegistry ;
import com.hp.hpl.jena.sparql.util.Symbol ;
-/** ARQ - miscellaneous settings
- */
+/** ARQ - miscellaneous settings */
public class ARQ
{
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java?rev=1410866&r1=1410865&r2=1410866&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java Sun Nov 18 10:48:18 2012
@@ -18,6 +18,8 @@
package org.openjena.riot;
+import org.apache.jena.riot.WebReader2 ;
+
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
@@ -65,5 +67,6 @@ public class RIOT
SystemARQ.registerSubSystem(sysInfo2) ;
SysRIOT.wireIntoJena() ;
+ WebReader2.wireIntoJena() ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1410866&r1=1410865&r2=1410866&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Sun Nov 18 10:48:18 2012
@@ -18,12 +18,11 @@
package com.hp.hpl.jena.sparql;
-
import junit.framework.JUnit4TestAdapter ;
import junit.framework.TestSuite ;
+import org.apache.jena.riot.TC_Riot ;
import org.openjena.atlas.TC_Atlas ;
import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.riot.TC_Riot ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java?rev=1410866&r1=1410865&r2=1410866&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java Sun Nov 18 10:48:18 2012
@@ -24,9 +24,6 @@ import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.riot.lang.* ;
-import org.openjena.riot.langsuite.TestSuiteRDFJSON ;
-import org.openjena.riot.langsuite.TestSuiteTrig ;
-import org.openjena.riot.langsuite.TestSuiteTurtle ;
import org.openjena.riot.out.* ;
import org.openjena.riot.process.TestNormalization ;
import org.openjena.riot.tokens.TestTokenForNode ;
@@ -43,19 +40,11 @@ import org.openjena.riot.tokens.TestToke
, TestNodeAllocator.class
, TestTurtleTerms.class
-
, TestLangNTriples.class
, TestLangNQuads.class
-
, TestLangTurtle.class
- , TestSuiteTurtle.class
-
, TestLangTrig.class
- , TestSuiteTrig.class
-
, TestLangRdfJson.class
- , TestSuiteRDFJSON.class
-
, TestParserFactory.class
, TestNodeFmt.class