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 2015/01/27 12:58:01 UTC

[1/4] jena git commit: Better error message.

Repository: jena
Updated Branches:
  refs/heads/master 0e135b58a -> 9213a355f


Better error message.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/cf4056a2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/cf4056a2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/cf4056a2

Branch: refs/heads/master
Commit: cf4056a236e7ccb7eaa340ee0128cfcbdeaaaad6
Parents: 0e135b5
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jan 27 11:37:57 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 27 11:37:57 2015 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/riot/tokens/TokenizerText.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/cf4056a2/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
index 1c0c26d..f312ff7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
@@ -491,7 +491,7 @@ public final class TokenizerText implements Tokenizer
         // If we made no progress, nothing found, not even a keyword -- it's an
         // error.
         if ( posn == reader.getPosition() )
-            exception("Unknown char: %c(%d;0x%04X)", ch, ch, ch) ;
+            exception("Failed to find a prefix name or keyword: %c(%d;0x%04X)", ch, ch, ch) ;
 
         if ( Checking )
             checkKeyword(token.getImage()) ;


[4/4] jena git commit: Comments about possible setting changes.

Posted by an...@apache.org.
Comments about possible setting changes.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9213a355
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9213a355
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9213a355

Branch: refs/heads/master
Commit: 9213a355f4be0e83d95743fdaf8cc118f3f50eb5
Parents: 333a554
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jan 27 11:57:50 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 27 11:57:50 2015 +0000

----------------------------------------------------------------------
 .../apache/jena/riot/system/IRIResolver.java    | 27 ++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/9213a355/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index de2ac09..5e01130 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -44,24 +44,25 @@ public abstract class IRIResolver
         // Allow relative references for file: URLs.
         iriFactory.setSameSchemeRelativeReferences("file") ;
 
+        iriFactory.setIsError(ViolationCodes.UNREGISTERED_IANA_SCHEME, false) ;
+        iriFactory.setIsWarning(ViolationCodes.UNREGISTERED_IANA_SCHEME, false) ;
+
         // iriFactory.shouldViolation(false,true);
+        
+        // ** Consider not applying NFC tests
+        //iriFactory.setIsError(ViolationCodes.NOT_NFC, false) ;
+        //iriFactory.setIsError(ViolationCodes.NOT_NFKC, false) ;
+
+        // ** Consider not applying -- applies to various unicode blocks. 
+        // iriFactory.setIsError(ViolationCodes.COMPATIBILITY_CHARACTER, false) ;
 
         // Moderate it -- allow unwise chars and any scheme name.
         // iriFactory.setIsError(ViolationCodes.UNWISE_CHARACTER,false);
         // iriFactory.setIsWarning(ViolationCodes.UNWISE_CHARACTER,false);
-
-        // Various errors for unicode conditions.
-        // iriFactory.setIsError(ViolationCodes.NOT_NFC, false) ;
-        // iriFactory.setIsError(ViolationCodes.NOT_NFKC, false) ;
-        // iriFactory.setIsError(ViolationCodes.UNDEFINED_UNICODE_CHARACTER,
-        // false) ;
-        // iriFactory.setIsError(ViolationCodes.UNASSIGNED_UNICODE_CHARACTER,
-        // false) ;
-        // iriFactory.setIsError(ViolationCodes.COMPATIBILITY_CHARACTER, false)
-        // ;
-
-        iriFactory.setIsError(ViolationCodes.UNREGISTERED_IANA_SCHEME, false) ;
-        iriFactory.setIsWarning(ViolationCodes.UNREGISTERED_IANA_SCHEME, false) ;
+        
+        // iriFactory.setIsError(ViolationCodes.UNDEFINED_UNICODE_CHARACTER, false) ;
+        // iriFactory.setIsError(ViolationCodes.UNASSIGNED_UNICODE_CHARACTER, false) ;
+        
     }
 
     /** Check an IRI string (does not resolve it) */


[2/4] jena git commit: Replace TODO with some text

Posted by an...@apache.org.
Replace TODO with some text

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/cd0ade04
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/cd0ade04
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/cd0ade04

Branch: refs/heads/master
Commit: cd0ade04aacbe5dc3a9f00887660541e76ef0cf8
Parents: cf4056a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jan 27 11:56:58 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 27 11:56:58 2015 +0000

----------------------------------------------------------------------
 jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/cd0ade04/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java b/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
index 1174302..97d0853 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/ViolationCodes.java
@@ -5177,8 +5177,8 @@ This class is not part of the API.
             new ViolationCodeInfo(
                 COMPATIBILITY_CHARACTER,
                 "COMPATIBILITY_CHARACTER",
-                "TODO",
-                "<p>TODO</p>",
+                "Bad character",
+                "<p>Bad character</p>",
                 0,
                 new InSpec[]{
                   


[3/4] jena git commit: Remove overwritten assignment.

Posted by an...@apache.org.
Remove overwritten assignment.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/333a5548
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/333a5548
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/333a5548

Branch: refs/heads/master
Commit: 333a5548f2d466c346afdccf1de3aada36895e40
Parents: cd0ade0
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jan 27 11:57:28 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 27 11:57:28 2015 +0000

----------------------------------------------------------------------
 jena-arq/src/main/java/arq/iri.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/333a5548/jena-arq/src/main/java/arq/iri.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/iri.java b/jena-arq/src/main/java/arq/iri.java
index 253df0b..2d5232c 100644
--- a/jena-arq/src/main/java/arq/iri.java
+++ b/jena-arq/src/main/java/arq/iri.java
@@ -31,8 +31,8 @@ public class iri
 
     public static void main(String[] args)
     {
-        IRIFactory iriFactory = IRIFactory.iriImplementation() ;
-        iriFactory = IRIResolver.iriFactory ;
+        //IRIFactory iriFactory = IRIFactory.iriImplementation() ;
+        IRIFactory iriFactory = IRIResolver.iriFactory ;
         
         boolean first = true ;
         for ( String iriStr : args )