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/15 19:03:00 UTC

svn commit: r1422300 [2/2] - in /jena: Scratch/AFS/Dev/trunk/src-archive/riot/comms/ Scratch/AFS/Dev/trunk/src-archive/riot/io/section/ Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/ Scr...

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java Sat Dec 15 18:02:38 2012
@@ -16,9 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
 import org.openjena.riot.system.PrefixMap ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java Sat Dec 15 18:02:38 2012
@@ -16,19 +16,19 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens ;
+package org.apache.jena.riot.tokens ;
 
 
 import java.io.ByteArrayInputStream ;
 
-import com.hp.hpl.jena.sparql.ARQConstants ;
-
 import org.apache.jena.atlas.io.PeekReader ;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
 import org.openjena.riot.RiotParseException ;
 
+import com.hp.hpl.jena.sparql.ARQConstants ;
+
 
 public class TestTokenizer extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java Sat Dec 15 18:02:38 2012
@@ -26,15 +26,11 @@ import org.junit.runners.Suite ;
 import org.openjena.riot.lang.* ;
 import org.openjena.riot.out.* ;
 import org.openjena.riot.process.TestNormalization ;
-import org.openjena.riot.tokens.TestTokenForNode ;
-import org.openjena.riot.tokens.TestTokenizer ;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
     TestWebContent.class
     
-    , TestTokenizer.class
-    , TestTokenForNode.class
     , TestPrefixMap.class
     , TestIRI.class
     , TestChecker.class

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestIRI.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestIRI.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestIRI.java Sat Dec 15 18:02:38 2012
@@ -23,11 +23,11 @@ import com.hp.hpl.jena.graph.Node ;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.iri.IRI ;
 import org.apache.jena.iri.IRIFactory ;
+import org.apache.jena.riot.checker.CheckerIRI ;
 import org.junit.Test ;
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.ErrorHandlerTestLib ;
 import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
-import org.openjena.riot.checker.CheckerIRI ;
 import org.openjena.riot.system.Checker ;
 import org.openjena.riot.system.RiotLib ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNQuads.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNQuads.java Sat Dec 15 18:02:38 2012
@@ -22,13 +22,13 @@ import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.SinkCounting ;
 import org.apache.jena.atlas.lib.SinkNull ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 import org.junit.Test ;
 import org.openjena.riot.RiotLoader ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
 import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.system.RiotLib ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTriples.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTriples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTriples.java Sat Dec 15 18:02:38 2012
@@ -22,6 +22,7 @@ import java.io.StringReader ;
 
 import org.apache.jena.atlas.lib.SinkCounting ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 import org.junit.Test ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.RiotReader ;
@@ -29,7 +30,6 @@ import org.openjena.riot.ErrorHandlerTes
 import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.system.JenaReaderNTriples2 ;
 import org.openjena.riot.system.RiotLib ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTuples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTuples.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTuples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTuples.java Sat Dec 15 18:02:38 2012
@@ -22,13 +22,13 @@ import java.io.ByteArrayInputStream ;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.Test ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.ErrorHandlerTestLib.ExError ;
 import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 /** Test of syntax by a tuples parser (does not include node validitiy checking) */ 
 

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java Sat Dec 15 18:02:38 2012
@@ -26,6 +26,8 @@ import org.apache.jena.atlas.json.io.par
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.SinkCounting ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test ;
@@ -35,8 +37,6 @@ import org.openjena.riot.ErrorHandlerTes
 import org.openjena.riot.SysRIOT;
 import org.openjena.riot.system.JenaReaderNTriples2 ;
 import org.openjena.riot.system.JenaReaderRdfJson ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.rdf.model.Model ;

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTrig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTrig.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTrig.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTrig.java Sat Dec 15 18:02:38 2012
@@ -21,13 +21,13 @@ package org.openjena.riot.lang;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.Test ;
 import org.openjena.riot.RiotLoader ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
 import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java Sat Dec 15 18:02:38 2012
@@ -28,6 +28,8 @@ import java.io.StringReader ;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
@@ -39,8 +41,6 @@ import org.openjena.riot.ErrorHandlerTes
 import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.openjena.riot.system.JenaReaderTurtle2 ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestParserFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestParserFactory.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestParserFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestParserFactory.java Sat Dec 15 18:02:38 2012
@@ -23,10 +23,10 @@ import java.util.List ;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.Test ;
 import org.openjena.riot.RiotReader ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestTurtleTerms.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestTurtleTerms.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestTurtleTerms.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestTurtleTerms.java Sat Dec 15 18:02:38 2012
@@ -21,11 +21,11 @@ package org.openjena.riot.lang;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.SinkNull ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.Test ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Triple ;
 

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=1422300&r1=1422299&r2=1422300&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 15 18:02:38 2012
@@ -33,14 +33,14 @@ import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.SinkWrapper ;
 import org.apache.jena.fuseki.FusekiLib ;
+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 org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.system.RiotLib ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.core.Quad ;

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=1422300&r1=1422299&r2=1422300&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 15 18:02:38 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.tokens.Token ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.LangTag ;
 import org.openjena.riot.RiotException ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.rdf.model.AnonId ;