svn commit: r1520894 - in /jena/trunk/jena-arq: ReleaseNotes.txt log4j.properties src/main/java/org/apache/jena/riot/lang/LangTriG.java src/test/java/org/apache/jena/riot/lang/TestLangTrig.java

[an...@apache.org]

Author: andy
Date: Sun Sep  8 18:45:56 2013
New Revision: 1520894

URL: http://svn.apache.org/r1520894
Log:
Switch to TriG that follows the draft RDF 1.1 syntax.

Modified:
    jena/trunk/jena-arq/ReleaseNotes.txt
    jena/trunk/jena-arq/log4j.properties
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java

Modified: jena/trunk/jena-arq/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/ReleaseNotes.txt?rev=1520894&r1=1520893&r2=1520894&view=diff
==============================================================================
--- jena/trunk/jena-arq/ReleaseNotes.txt (original)
+++ jena/trunk/jena-arq/ReleaseNotes.txt Sun Sep  8 18:45:56 2013
@@ -4,6 +4,8 @@ ChangeLog for ARQ
 
 ==== Jena 2.11.0
 
++ Support draft RDF 1.1 TriG
+  GRAPH keyword, bnodes for graph labels, no "<g> = {}".
 + JENA-500 : Substitution for an initial binding is now done 
              on the algrebra before optimzation is attempted.
 + JENA-470 : Enable optimization of mixtures of disjunctions with equality 

Modified: jena/trunk/jena-arq/log4j.properties
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/log4j.properties?rev=1520894&r1=1520893&r2=1520894&view=diff
==============================================================================
--- jena/trunk/jena-arq/log4j.properties (original)
+++ jena/trunk/jena-arq/log4j.properties Sun Sep  8 18:45:56 2013
@@ -14,9 +14,6 @@ log4j.logger.com.hp.hpl.jena=WARN
 log4j.logger.org.apache.jena=WARN
 log4j.logger.org.apache.jena.riot=INFO
 
-# Joseki server
-log4j.logger.org.joseki=INFO
-
 # Apache Commons HTTP
 # May be useful to turn up to DEBUG if debugging HTTP communication issues
 log4j.logger.org.apache.http=WARN

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java?rev=1520894&r1=1520893&r2=1520894&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java Sun Sep  8 18:45:56 2013
@@ -43,8 +43,8 @@ public class LangTriG extends LangTurtle
 
     @Override
     protected final void oneTopLevelElement() {
-        oneNamedGraphBlock() ;
-        //oneNamedGraphBlock2() ;
+        //oneNamedGraphBlock() ;
+        oneNamedGraphBlock2() ;
     }
 
     // Version for proposed Turtle-in-TriG and keyword GRAPH
@@ -145,6 +145,7 @@ public class LangTriG extends LangTurtle
         triplesSameSubject() ;
     }
 
+    // Old version , tradition trig with RDF 1.1 Turtle tokens.
     protected final void oneNamedGraphBlock() {
         // Directives are only between graph blocks.
         Node graphNode = null ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java?rev=1520894&r1=1520893&r2=1520894&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java Sun Sep  8 18:45:56 2013
@@ -20,6 +20,7 @@ package org.apache.jena.riot.lang;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.ErrorHandlerTestLib ;
 import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
 import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
@@ -41,8 +42,11 @@ public class TestLangTrig extends BaseTe
     @Test public void trig_01()     { parse("{}") ; } 
     @Test public void trig_02()     { parse("{}.") ; }
     @Test public void trig_03()     { parse("<g> {}") ; }
-    @Test public void trig_04()     { parse("<g> = {}") ; }
-    @Test public void trig_05()     { parse("<g> = {} .") ; }
+    
+    @Test(expected=ErrorHandlerTestLib.ExFatal.class) 
+    public void trig_04()     { parse("<g> = {}") ; }
+    @Test(expected=ErrorHandlerTestLib.ExFatal.class)
+    public void trig_05()     { parse("<g> = {} .") ; }
     
     // Need to check we get resolved URIs.
     @Test public void trig_10()     //{ parse("{ <x> <p> <q> }") ; }