You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2015/09/09 09:44:12 UTC

[01/50] [abbrv] jena git commit: Broken example

Repository: jena
Updated Branches:
  refs/heads/JENA-507 153a05e7f -> 7da685a94
  refs/heads/master 4105775df -> 3f9f9f357


Broken example


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

Branch: refs/heads/JENA-507
Commit: 84d40b9983020c10a176ce0a714eb66d0c60d371
Parents: c74a042
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 21 15:35:03 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 21 15:35:03 2015 +0100

----------------------------------------------------------------------
 jena-fuseki2/examples/jetty-fuseki.xml | 48 -----------------------------
 1 file changed, 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/84d40b99/jena-fuseki2/examples/jetty-fuseki.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/examples/jetty-fuseki.xml b/jena-fuseki2/examples/jetty-fuseki.xml
deleted file mode 100644
index cb1f385..0000000
--- a/jena-fuseki2/examples/jetty-fuseki.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
- 
-<!-- 
-Simple example of using a jetty configuration file for setting up a Jetty server.
--->
-
-<!-- 
-http://www.eclipse.org/jetty/documentation/current/configuring-connectors.html
--->
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-	<Arg name="server"><Ref refid="Server" /></Arg>
-	<Arg name="factories">
-	  <Array type="org.eclipse.jetty.server.ConnectionFactory">
-	    <Item>
-	      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-		<Arg name="config"><Ref refid="httpConfig" /></Arg>
-	      </New>
-	    </Item>
-	  </Array>
-	</Arg>
-        <Set name="port"><Property name="jetty.port" default="3535" /></Set>
-	<!--<Set name="host"><Property name="jetty.host" default="localhost" /></Set>-->
-      </New>
-    </Arg>
-  </Call>
-</Configure>


[39/50] [abbrv] jena git commit: Fix javadoc typos

Posted by rv...@apache.org.
Fix javadoc typos

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

Branch: refs/heads/JENA-507
Commit: 657593b84b0d1f7994bef6de1409fd80b305e917
Parents: 9210628
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:42:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:42:35 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/657593b8/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
index f9567c6..9a4f815 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpQuadBlock.java
@@ -34,7 +34,7 @@ import org.apache.jena.sparql.util.NodeIsomorphismMap ;
 
 /** A list of quads. 
  * 
- * <code>OpQuadBlock</code> is anny colelction of quads, whereas
+ * <code>OpQuadBlock</code> is any collection of quads, whereas
  * {@link OpQuadPattern} is quads with the same graph node.  
  * The flip in naming is historical. 
  */


[27/50] [abbrv] jena git commit: Remove restriction on ARQ syntax.

Posted by rv...@apache.org.
Remove restriction on ARQ syntax.

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

Branch: refs/heads/JENA-507
Commit: 4fc76ddf06edf6dd6b9d53b49852e253a74ce5c9
Parents: fbc0dd0
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 28 10:44:25 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 28 10:44:25 2015 +0100

----------------------------------------------------------------------
 .../jena/sparql/engine/QueryExecutionBase.java  | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/4fc76ddf/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
index c04675b..c72cd18 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
@@ -28,21 +28,8 @@ import org.apache.jena.atlas.lib.AlarmClock;
 import org.apache.jena.atlas.logging.Log;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.Triple;
-import org.apache.jena.query.ARQ;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.DatasetFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryCancelledException;
-import org.apache.jena.query.QueryExecException;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.Syntax;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.query.* ;
+import org.apache.jena.rdf.model.* ;
 import org.apache.jena.riot.system.IRIResolver;
 import org.apache.jena.shared.PrefixMapping;
 import org.apache.jena.sparql.ARQConstants;
@@ -265,9 +252,6 @@ public class QueryExecutionBase implements QueryExecution
             throw new QueryExecException("Attempt to get a CONSTRUCT model from a "+labelForQuery(query)+" query") ;
         // This causes there to be no PROJECT around the pattern.
         // That in turn, exposes the initial bindings.  
-        if ( ! Syntax.syntaxARQ.equals( query.getSyntax() ) )
-        	throw new QueryExecException("Attempt to CONSTRUCT quads from a "+labelForQuery(query)+" query, which is not ARQ Syntax") ;
-        	
         query.setQueryResultStar(true) ;
 
         startQueryIterator() ;


[04/50] [abbrv] jena git commit: Merge master

Posted by rv...@apache.org.
Merge master


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

Branch: refs/heads/JENA-507
Commit: d030947e2038741e4c02867091d604db2211dcdb
Parents: 0bd45a5 123cf4c
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 23 16:54:46 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 23 16:54:46 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/riot/RDFDataMgr.java   | 47 ++++++++++++++-
 .../java/org/apache/jena/riot/RiotReader.java   | 61 ++++----------------
 .../sparql/engine/http/QueryEngineHTTP.java     |  4 +-
 .../org/apache/jena/riot/TestRiotReader.java    |  8 +--
 .../AbstractNodeTupleInputFormatTests.java      |  9 +--
 jena-fuseki2/examples/jetty-fuseki.xml          | 48 ---------------
 6 files changed, 65 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d030947e/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
----------------------------------------------------------------------
diff --cc jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index 933c8e7,e20efd2..46d7f7b
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@@ -444,37 -433,12 +444,37 @@@ public class QueryEngineHTTP implement
          return model;
      }
  
 +    private Dataset execDataset(Dataset dataset) {
 +        Pair<InputStream, Lang> p = execConstructWorker(datasetContentType);
 +        InputStream in = p.getLeft() ;
 +        Lang lang = p.getRight() ;
 +        try { RDFDataMgr.read(dataset, in, lang); }
 +        finally { this.close(); }
 +        return dataset;
 +    }
 +
      private Iterator<Triple> execTriples() {
 +        Pair<InputStream, Lang> p = execConstructWorker(modelContentType) ;
 +        InputStream in = p.getLeft() ;
 +        Lang lang = p.getRight() ;
 +        // Base URI?
-         return RiotReader.createIteratorTriples(in, lang, null);
++        return RDFDataMgr.createIteratorTriples(in, lang, null);
 +    }
 +    
 +    private Iterator<Quad> execQuads() {
 +        Pair<InputStream, Lang> p = execConstructWorker(datasetContentType) ;
 +        InputStream in = p.getLeft() ;
 +        Lang lang = p.getRight() ;
 +        // Base URI?
-         return RiotReader.createIteratorQuads(in, lang, null);
++        return RDFDataMgr.createIteratorQuads(in, lang, null);
 +    }
 +
 +    private Pair<InputStream, Lang> execConstructWorker(String contentType) {
          checkNotClosed() ;
          HttpQuery httpQuery = makeHttpQuery();
 -        httpQuery.setAccept(modelContentType);
 +        httpQuery.setAccept(contentType);
          InputStream in = httpQuery.exec();
 -
 +        
          // Don't assume the endpoint actually gives back the content type we
          // asked for
          String actualContentType = httpQuery.getContentType();


[23/50] [abbrv] jena git commit: JENA-1014: CORS Filter

Posted by rv...@apache.org.
JENA-1014: CORS Filter


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

Branch: refs/heads/JENA-507
Commit: 3b2de09605f4cad193c55104c3a42bd608386e2c
Parents: b8aba8b
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 27 12:44:30 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 27 12:44:51 2015 +0100

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/web.xml             | 39 ++++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/3b2de096/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml b/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
index 4c3c415..b3ba1c3 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
+++ b/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
@@ -30,12 +30,42 @@
 
   <!-- Apache Shiro setup -->
   <listener>
-    <!--<listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>-->
-    <!-- Support multiple locations, looks in Fuseki-relevant places -->
+    <!-- This replaces org.apache.shiro.web.env.EnvironmentLoaderListener
+         Support multiple locations and looks in Fuseki-relevant places.
+     -->
     <listener-class>org.apache.jena.fuseki.server.ShiroEnvironmentLoader</listener-class>
   </listener>
 
-  <!-- First filter -->
+  <!-- CORS -->
+  <filter>
+    <filter-name>cross-origin</filter-name>
+    <!-- Ported and standalone version of org.eclipse.jetty.servlets.CrossOriginFilter -->
+    <filter-class>org.apache.jena.fuseki.servlets.CrossOriginFilter</filter-class>
+    <!-- Defaults may be fine --> 
+    <init-param>
+      <param-name>allowedOrigins</param-name>
+      <param-value>*</param-value>
+    </init-param>
+    <init-param>
+      <param-name>allowedMethods</param-name>
+      <param-value>GET,POST,DELETE,PUT,HEAD,OPTIONS,PATCH</param-value>
+    </init-param>
+    <init-param>
+      <param-name>allowedHeaders</param-name>
+      <param-value>Accept, Origin, X-Requested-With, Content-Type, Last-Modified, Authorization</param-value>
+    </init-param>
+    <init-param>
+      <param-name>exposedHeaders</param-name>
+      <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
+    </init-param>
+  </filter>
+  
+  <filter-mapping>
+    <filter-name>cross-origin</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <!-- Before FusekiFilter -->
   <filter>
     <filter-name>ShiroFilter</filter-name>
     <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
@@ -57,13 +87,14 @@
     -->
     <param-value>shiro.ini</param-value>
   </context-param>
-
+  
   <!-- Apache Jena Fuseki setup -->
 
   <listener>
     <listener-class>org.apache.jena.fuseki.server.FusekiServerListener</listener-class>
   </listener>
 
+  <!-- Fuseki datatset serviced calls -->
   <filter>
     <filter-name>Fuseki</filter-name>
     <filter-class>org.apache.jena.fuseki.servlets.FusekiFilter</filter-class>


[41/50] [abbrv] jena git commit: Cope with null pointers.

Posted by rv...@apache.org.
Cope with null pointers.

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

Branch: refs/heads/JENA-507
Commit: 699306160076a99fbf4d617f31e8a84cadc4077e
Parents: 964e10f
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:46:49 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:46:49 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/69930616/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
index e2e73e6..166293d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
@@ -61,6 +61,8 @@ public class VarUtils {
 
     // Name to avoid erasure clash
     public static void addVarNodes(Collection<Var> acc, Collection<Node> nodes) {
+        if ( nodes == null )
+            return ;
         for ( Node n : nodes )
             addVar(acc, n) ;
     }


[08/50] [abbrv] jena git commit: Return after finishing GET/HEAD quad operation.

Posted by rv...@apache.org.
Return after finishing GET/HEAD quad operation.

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

Branch: refs/heads/JENA-507
Commit: 3895bd4e4d643f72cbf7e77576e271e338fc7340
Parents: e2a076d
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 10:23:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 10:23:32 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/3895bd4e/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
index d7e44e4..650e0fb 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
@@ -205,6 +205,7 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
                     restQuads_R.executeLifecycle(action) ;
                 else
                     ServletOps.errorForbidden("Forbidden: "+method+" on dataset") ;
+                return ; 
             }
             if ( allowREST_W(action) )
                 restQuads_RW.executeLifecycle(action) ;


[24/50] [abbrv] jena git commit: JENA-1014: Copy of CrossOriginFilter from Jetty.

Posted by rv...@apache.org.
JENA-1014: Copy of CrossOriginFilter from Jetty.

Needed so that Fuseki can provide CORS from a WAR file when Jetty jars
not on the classpath.

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

Branch: refs/heads/JENA-507
Commit: f62c53e64a3db005c482fdb8e8a27695a33dda81
Parents: 3b2de09
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 27 12:45:34 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 27 12:45:34 2015 +0100

----------------------------------------------------------------------
 .../jena/fuseki/servlets/CrossOriginFilter.java | 466 +++++++++++++++++++
 1 file changed, 466 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f62c53e6/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java
new file mode 100644
index 0000000..b68c7f4
--- /dev/null
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java
@@ -0,0 +1,466 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.fuseki.servlets;
+
+// This is a copy of Jettys CrossOriginFilter - Fuseki need something
+// that works without Jetty on the classpath when running as a WAR file.
+
+
+// We elect to use and distribute under The Apache License v2.0.
+
+// Changes:
+//   Logger switched to SLF4j
+//   Add @Overides
+//   Suppress warnings.
+//   POST removed from SIMPLE_HTTP_HEADERS (NB it's the same code effect either way). 
+
+//========================================================================
+//Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//------------------------------------------------------------------------
+//All rights reserved. This program and the accompanying materials
+//are made available under the terms of the Eclipse Public License v1.0
+//and Apache License v2.0 which accompanies this distribution.
+//
+//  The Eclipse Public License is available at
+//  http://www.eclipse.org/legal/epl-v10.html
+//
+//  The Apache License v2.0 is available at
+//  http://www.opensource.org/licenses/apache2.0.php
+//
+//You may elect to redistribute this code under either of these licenses.
+//========================================================================
+//
+
+//package org.eclipse.jetty.servlets;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+//import org.eclipse.jetty.util.log.Log;
+//import org.eclipse.jetty.util.log.Logger;
+
+/**
+* <p>Implementation of the
+* <a href="http://www.w3.org/TR/cors/">cross-origin resource sharing</a>.</p>
+* <p>A typical example is to use this filter to allow cross-domain
+* <a href="http://cometd.org">cometd</a> communication using the standard
+* long polling transport instead of the JSONP transport (that is less
+* efficient and less reactive to failures).</p>
+* <p>This filter allows the following configuration parameters:
+* <ul>
+* <li><b>allowedOrigins</b>, a comma separated list of origins that are
+* allowed to access the resources. Default value is <b>*</b>, meaning all
+* origins.<br />
+* If an allowed origin contains one or more * characters (for example
+* http://*.domain.com), then "*" characters are converted to ".*", "."
+* characters are escaped to "\." and the resulting allowed origin
+* interpreted as a regular expression.<br />
+* Allowed origins can therefore be more complex expressions such as
+* https?://*.domain.[a-z]{3} that matches http or https, multiple subdomains
+* and any 3 letter top-level domain (.com, .net, .org, etc.).</li>
+* <li><b>allowedMethods</b>, a comma separated list of HTTP methods that
+* are allowed to be used when accessing the resources. Default value is
+* <b>GET,POST,HEAD</b></li>
+* <li><b>allowedHeaders</b>, a comma separated list of HTTP headers that
+* are allowed to be specified when accessing the resources. Default value
+* is <b>X-Requested-With,Content-Type,Accept,Origin</b></li>
+* <li><b>preflightMaxAge</b>, the number of seconds that preflight requests
+* can be cached by the client. Default value is <b>1800</b> seconds, or 30
+* minutes</li>
+* <li><b>allowCredentials</b>, a boolean indicating if the resource allows
+* requests with credentials. Default value is <b>false</b></li>
+* <li><b>exposeHeaders</b>, a comma separated list of HTTP headers that
+* are allowed to be exposed on the client. Default value is the
+* <b>empty list</b></li>
+* <li><b>chainPreflight</b>, if true preflight requests are chained to their
+* target resource for normal handling (as an OPTION request).  Otherwise the
+* filter will response to the preflight. Default is true.</li>
+* </ul></p>
+* <p>A typical configuration could be:
+* <pre>
+* &lt;web-app ...&gt;
+*     ...
+*     &lt;filter&gt;
+*         &lt;filter-name&gt;cross-origin&lt;/filter-name&gt;
+*         &lt;filter-class&gt;org.eclipse.jetty.servlets.CrossOriginFilter&lt;/filter-class&gt;
+*     &lt;/filter&gt;
+*     &lt;filter-mapping&gt;
+*         &lt;filter-name&gt;cross-origin&lt;/filter-name&gt;
+*         &lt;url-pattern&gt;/cometd/*&lt;/url-pattern&gt;
+*     &lt;/filter-mapping&gt;
+*     ...
+* &lt;/web-app&gt;
+* </pre></p>
+*/
+public class CrossOriginFilter implements Filter
+{
+    //private static final Logger LOG = Log.getLogger(CrossOriginFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CrossOriginFilter.class) ;
+
+    // Request headers
+    private static final String ORIGIN_HEADER = "Origin";
+    public static final String ACCESS_CONTROL_REQUEST_METHOD_HEADER = "Access-Control-Request-Method";
+    public static final String ACCESS_CONTROL_REQUEST_HEADERS_HEADER = "Access-Control-Request-Headers";
+    // Response headers
+    public static final String ACCESS_CONTROL_ALLOW_ORIGIN_HEADER = "Access-Control-Allow-Origin";
+    public static final String ACCESS_CONTROL_ALLOW_METHODS_HEADER = "Access-Control-Allow-Methods";
+    public static final String ACCESS_CONTROL_ALLOW_HEADERS_HEADER = "Access-Control-Allow-Headers";
+    public static final String ACCESS_CONTROL_MAX_AGE_HEADER = "Access-Control-Max-Age";
+    public static final String ACCESS_CONTROL_ALLOW_CREDENTIALS_HEADER = "Access-Control-Allow-Credentials";
+    public static final String ACCESS_CONTROL_EXPOSE_HEADERS_HEADER = "Access-Control-Expose-Headers";
+    // Implementation constants
+    public static final String ALLOWED_ORIGINS_PARAM = "allowedOrigins";
+    public static final String ALLOWED_METHODS_PARAM = "allowedMethods";
+    public static final String ALLOWED_HEADERS_PARAM = "allowedHeaders";
+    public static final String PREFLIGHT_MAX_AGE_PARAM = "preflightMaxAge";
+    public static final String ALLOW_CREDENTIALS_PARAM = "allowCredentials";
+    public static final String EXPOSED_HEADERS_PARAM = "exposedHeaders";
+    public static final String OLD_CHAIN_PREFLIGHT_PARAM = "forwardPreflight";
+    public static final String CHAIN_PREFLIGHT_PARAM = "chainPreflight";
+    private static final String ANY_ORIGIN = "*";
+    private static final List<String> SIMPLE_HTTP_METHODS = Arrays.asList("GET", /*"POST",*/ "HEAD");
+
+    private boolean anyOriginAllowed;
+    private List<String> allowedOrigins = new ArrayList<String>();
+    private List<String> allowedMethods = new ArrayList<String>();
+    private List<String> allowedHeaders = new ArrayList<String>();
+    private List<String> exposedHeaders = new ArrayList<String>();
+    private int preflightMaxAge;
+    private boolean allowCredentials;
+    private boolean chainPreflight;
+
+    @Override
+    public void init(FilterConfig config) throws ServletException
+    {
+        String allowedOriginsConfig = config.getInitParameter(ALLOWED_ORIGINS_PARAM);
+        if (allowedOriginsConfig == null)
+            allowedOriginsConfig = "*";
+        String[] allowedOrigins = allowedOriginsConfig.split(",");
+        for (String allowedOrigin : allowedOrigins)
+        {
+            allowedOrigin = allowedOrigin.trim();
+            if (allowedOrigin.length() > 0)
+            {
+                if (ANY_ORIGIN.equals(allowedOrigin))
+                {
+                    anyOriginAllowed = true;
+                    this.allowedOrigins.clear();
+                    break;
+                }
+                else
+                {
+                    this.allowedOrigins.add(allowedOrigin);
+                }
+            }
+        }
+
+        String allowedMethodsConfig = config.getInitParameter(ALLOWED_METHODS_PARAM);
+        if (allowedMethodsConfig == null)
+            allowedMethodsConfig = "GET,POST,HEAD";
+        allowedMethods.addAll(Arrays.asList(allowedMethodsConfig.split(",")));
+
+        String allowedHeadersConfig = config.getInitParameter(ALLOWED_HEADERS_PARAM);
+        if (allowedHeadersConfig == null)
+            allowedHeadersConfig = "X-Requested-With,Content-Type,Accept,Origin";
+        allowedHeaders.addAll(Arrays.asList(allowedHeadersConfig.split(",")));
+
+        String preflightMaxAgeConfig = config.getInitParameter(PREFLIGHT_MAX_AGE_PARAM);
+        if (preflightMaxAgeConfig == null)
+            preflightMaxAgeConfig = "1800"; // Default is 30 minutes
+        try
+        {
+            preflightMaxAge = Integer.parseInt(preflightMaxAgeConfig);
+        }
+        catch (NumberFormatException x)
+        {
+            LOG.info("Cross-origin filter, could not parse '{}' parameter as integer: {}", PREFLIGHT_MAX_AGE_PARAM, preflightMaxAgeConfig);
+        }
+
+        String allowedCredentialsConfig = config.getInitParameter(ALLOW_CREDENTIALS_PARAM);
+        if (allowedCredentialsConfig == null)
+            allowedCredentialsConfig = "true";
+        allowCredentials = Boolean.parseBoolean(allowedCredentialsConfig);
+
+        String exposedHeadersConfig = config.getInitParameter(EXPOSED_HEADERS_PARAM);
+        if (exposedHeadersConfig == null)
+            exposedHeadersConfig = "";
+        exposedHeaders.addAll(Arrays.asList(exposedHeadersConfig.split(",")));
+
+        String chainPreflightConfig = config.getInitParameter(OLD_CHAIN_PREFLIGHT_PARAM);
+        if (chainPreflightConfig!=null) // TODO remove this
+            LOG.warn("DEPRECATED CONFIGURATION: Use "+CHAIN_PREFLIGHT_PARAM+ " instead of "+OLD_CHAIN_PREFLIGHT_PARAM);
+        else
+            chainPreflightConfig = config.getInitParameter(CHAIN_PREFLIGHT_PARAM);
+        if (chainPreflightConfig == null)
+            chainPreflightConfig = "true";
+        chainPreflight = Boolean.parseBoolean(chainPreflightConfig);
+
+        if (LOG.isDebugEnabled())
+        {
+            LOG.debug("Cross-origin filter configuration: " +
+                ALLOWED_ORIGINS_PARAM + " = " + allowedOriginsConfig + ", " +
+                ALLOWED_METHODS_PARAM + " = " + allowedMethodsConfig + ", " +
+                ALLOWED_HEADERS_PARAM + " = " + allowedHeadersConfig + ", " +
+                PREFLIGHT_MAX_AGE_PARAM + " = " + preflightMaxAgeConfig + ", " +
+                ALLOW_CREDENTIALS_PARAM + " = " + allowedCredentialsConfig + "," +
+                EXPOSED_HEADERS_PARAM + " = " + exposedHeadersConfig + "," +
+                CHAIN_PREFLIGHT_PARAM + " = " + chainPreflightConfig
+                );
+        }
+    }
+    
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
+    {
+        handle((HttpServletRequest)request, (HttpServletResponse)response, chain);
+    }
+
+    private void handle(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException
+    {
+        String origin = request.getHeader(ORIGIN_HEADER);
+        // Is it a cross origin request ?
+        if (origin != null && isEnabled(request))
+        {
+            if (originMatches(origin))
+            {
+                if (isSimpleRequest(request))
+                {
+                    LOG.debug("Cross-origin request to {} is a simple cross-origin request", request.getRequestURI());
+                    handleSimpleResponse(request, response, origin);
+                }
+                else if (isPreflightRequest(request))
+                {
+                    LOG.debug("Cross-origin request to {} is a preflight cross-origin request", request.getRequestURI());
+                    handlePreflightResponse(request, response, origin);
+                    if (chainPreflight)
+                        LOG.debug("Preflight cross-origin request to {} forwarded to application", request.getRequestURI());
+                    else
+                        return;
+                }
+                else
+                {
+                    LOG.debug("Cross-origin request to {} is a non-simple cross-origin request", request.getRequestURI());
+                    handleSimpleResponse(request, response, origin);
+                }
+            }
+            else
+            {
+                LOG.debug("Cross-origin request to " + request.getRequestURI() + " with origin " + origin + " does not match allowed origins " + allowedOrigins);
+            }
+        }
+
+        chain.doFilter(request, response);
+    }
+
+    @SuppressWarnings("rawtypes")
+    protected boolean isEnabled(HttpServletRequest request)
+    {
+        // WebSocket clients such as Chrome 5 implement a version of the WebSocket
+        // protocol that does not accept extra response headers on the upgrade response
+        for (Enumeration connections = request.getHeaders("Connection"); connections.hasMoreElements();)
+        {
+            String connection = (String)connections.nextElement();
+            if ("Upgrade".equalsIgnoreCase(connection))
+            {
+                for (Enumeration upgrades = request.getHeaders("Upgrade"); upgrades.hasMoreElements();)
+                {
+                    String upgrade = (String)upgrades.nextElement();
+                    if ("WebSocket".equalsIgnoreCase(upgrade))
+                        return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private boolean originMatches(String originList)
+    {
+        if (anyOriginAllowed)
+            return true;
+
+        if (originList.trim().length() == 0)
+            return false;
+
+        String[] origins = originList.split(" ");
+        for (String origin : origins)
+        {
+            if (origin.trim().length() == 0)
+                continue;
+
+            for (String allowedOrigin : allowedOrigins)
+            {
+                if (allowedOrigin.contains("*"))
+                {
+                    Matcher matcher = createMatcher(origin,allowedOrigin);
+                    if (matcher.matches())
+                        return true;
+                }
+                else if (allowedOrigin.equals(origin))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private Matcher createMatcher(String origin, String allowedOrigin)
+    {
+        String regex = parseAllowedWildcardOriginToRegex(allowedOrigin);
+        Pattern pattern = Pattern.compile(regex);
+        return pattern.matcher(origin);
+    }
+
+    private String parseAllowedWildcardOriginToRegex(String allowedOrigin)
+    {
+        String regex = allowedOrigin.replace(".","\\.");
+        return regex.replace("*",".*"); // we want to be greedy here to match multiple subdomains, thus we use .*
+    }
+
+    private boolean isSimpleRequest(HttpServletRequest request)
+    {
+        String method = request.getMethod();
+        if (SIMPLE_HTTP_METHODS.contains(method))
+        {
+            // TODO: implement better detection of simple headers
+            // The specification says that for a request to be simple, custom request headers must be simple.
+            // Here for simplicity I just check if there is a Access-Control-Request-Method header,
+            // which is required for preflight requests
+            return request.getHeader(ACCESS_CONTROL_REQUEST_METHOD_HEADER) == null;
+        }
+        return false;
+    }
+
+    private boolean isPreflightRequest(HttpServletRequest request)
+    {
+        String method = request.getMethod();
+        if (!"OPTIONS".equalsIgnoreCase(method))
+            return false;
+        if (request.getHeader(ACCESS_CONTROL_REQUEST_METHOD_HEADER) == null)
+            return false;
+        return true;
+    }
+
+    private void handleSimpleResponse(HttpServletRequest request, HttpServletResponse response, String origin)
+    {
+        response.setHeader(ACCESS_CONTROL_ALLOW_ORIGIN_HEADER, origin);
+        if (allowCredentials)
+            response.setHeader(ACCESS_CONTROL_ALLOW_CREDENTIALS_HEADER, "true");
+        if (!exposedHeaders.isEmpty())
+            response.setHeader(ACCESS_CONTROL_EXPOSE_HEADERS_HEADER, commify(exposedHeaders));
+    }
+
+    private void handlePreflightResponse(HttpServletRequest request, HttpServletResponse response, String origin)
+    {
+        boolean methodAllowed = isMethodAllowed(request);
+        if (!methodAllowed)
+            return;
+        boolean headersAllowed = areHeadersAllowed(request);
+        if (!headersAllowed)
+            return;
+        response.setHeader(ACCESS_CONTROL_ALLOW_ORIGIN_HEADER, origin);
+        if (allowCredentials)
+            response.setHeader(ACCESS_CONTROL_ALLOW_CREDENTIALS_HEADER, "true");
+        if (preflightMaxAge > 0)
+            response.setHeader(ACCESS_CONTROL_MAX_AGE_HEADER, String.valueOf(preflightMaxAge));
+        response.setHeader(ACCESS_CONTROL_ALLOW_METHODS_HEADER, commify(allowedMethods));
+        response.setHeader(ACCESS_CONTROL_ALLOW_HEADERS_HEADER, commify(allowedHeaders));
+    }
+
+    private boolean isMethodAllowed(HttpServletRequest request)
+    {
+        String accessControlRequestMethod = request.getHeader(ACCESS_CONTROL_REQUEST_METHOD_HEADER);
+        LOG.debug("{} is {}", ACCESS_CONTROL_REQUEST_METHOD_HEADER, accessControlRequestMethod);
+        boolean result = false;
+        if (accessControlRequestMethod != null)
+            result = allowedMethods.contains(accessControlRequestMethod);
+        LOG.debug("Method {} is" + (result ? "" : " not") + " among allowed methods {}", accessControlRequestMethod, allowedMethods);
+        return result;
+    }
+
+    private boolean areHeadersAllowed(HttpServletRequest request)
+    {
+        String accessControlRequestHeaders = request.getHeader(ACCESS_CONTROL_REQUEST_HEADERS_HEADER);
+        LOG.debug("{} is {}", ACCESS_CONTROL_REQUEST_HEADERS_HEADER, accessControlRequestHeaders);
+        boolean result = true;
+        if (accessControlRequestHeaders != null)
+        {
+            String[] headers = accessControlRequestHeaders.split(",");
+            for (String header : headers)
+            {
+                boolean headerAllowed = false;
+                for (String allowedHeader : allowedHeaders)
+                {
+                    if (header.trim().equalsIgnoreCase(allowedHeader.trim()))
+                    {
+                        headerAllowed = true;
+                        break;
+                    }
+                }
+                if (!headerAllowed)
+                {
+                    result = false;
+                    break;
+                }
+            }
+        }
+        LOG.debug("Headers [{}] are" + (result ? "" : " not") + " among allowed headers {}", accessControlRequestHeaders, allowedHeaders);
+        return result;
+    }
+
+    private String commify(List<String> strings)
+    {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < strings.size(); ++i)
+        {
+            if (i > 0) builder.append(",");
+            String string = strings.get(i);
+            builder.append(string);
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public void destroy()
+    {
+        anyOriginAllowed = false;
+        allowedOrigins.clear();
+        allowedMethods.clear();
+        allowedHeaders.clear();
+        preflightMaxAge = 0;
+        allowCredentials = false;
+    }
+}


[45/50] [abbrv] jena git commit: Merge commit 'refs/pull/92/head' of github.com:apache/jena

Posted by rv...@apache.org.
Merge commit 'refs/pull/92/head' of github.com:apache/jena

This closes #92.


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

Branch: refs/heads/JENA-507
Commit: 0cc6b6bc64bfd496fc15a2636a7d5b090b7b6d9d
Parents: e82509b d0f9daa
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Sep 6 16:51:36 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Sep 6 16:51:36 2015 +0100

----------------------------------------------------------------------
 jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java      | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java        | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java    | 2 +-
 .../main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java   | 2 +-
 .../src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java   | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java       | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java     | 2 +-
 .../src/main/java/org/apache/jena/vocabulary/TestManifest.java     | 2 +-
 .../src/main/java/org/apache/jena/vocabulary/TestManifestX.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java      | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------



[40/50] [abbrv] jena git commit: Add various utility operations to find variables in structures.

Posted by rv...@apache.org.
Add various utility operations to find variables in structures.

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

Branch: refs/heads/JENA-507
Commit: 964e10f1205223c966da10779f37024a8e092120
Parents: 657593b
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:43:15 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:43:15 2015 +0100

----------------------------------------------------------------------
 .../org/apache/jena/sparql/util/VarUtils.java   | 86 ++++++++++++--------
 1 file changed, 51 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/964e10f1/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
index 18b55c8..e2e73e6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
@@ -18,56 +18,72 @@
 
 package org.apache.jena.sparql.util;
 
-import java.util.Collection ;
-import java.util.HashSet ;
-import java.util.Set ;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.sparql.core.BasicPattern ;
-import org.apache.jena.sparql.core.TriplePath ;
-import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.core.* ;
 
-public class VarUtils
-{
-    public static Set<Var> getVars(Triple triple)
-    {
-        Set<Var> x = new HashSet<>() ;
-        addVarsFromTriple(x, triple) ;
-        return x ;
+public class VarUtils {
+    public static Set<Var> getVars(Triple triple) {
+        Set<Var> x = new HashSet<>();
+        addVarsFromTriple(x, triple);
+        return x;
     }
-    
-    public static void addVarsFromTriple(Collection<Var> acc, Triple t)
-    {
-        addVar(acc, t.getSubject()) ;
-        addVar(acc, t.getPredicate()) ;
-        addVar(acc, t.getObject()) ;
+
+    public static void addVarsFromTriple(Collection<Var> acc, Triple triple) {
+        addVar(acc, triple.getSubject());
+        addVar(acc, triple.getPredicate());
+        addVar(acc, triple.getObject());
+    }
+
+    public static void addVarsFromQuad(Collection<Var> acc, Quad quad) {
+        addVar(acc, quad.getGraph());
+        addVar(acc, quad.getSubject());
+        addVar(acc, quad.getPredicate());
+        addVar(acc, quad.getObject());
     }
 
-    public static void addVarsFromTriplePath(Collection<Var> acc, TriplePath tpath)
-    {
-        addVar(acc, tpath.getSubject()) ;
-        addVar(acc, tpath.getObject()) ;
+    public static void addVarsFromTriplePath(Collection<Var> acc, TriplePath tpath) {
+        addVar(acc, tpath.getSubject());
+        addVar(acc, tpath.getObject());
     }
 
-    public static void addVar(Collection<Var> acc, Node n)
-    {
+    public static void addVar(Collection<Var> acc, Node n) {
         if ( n == null )
-            return ;
+            return;
 
         if ( n.isVariable() )
-            acc.add(Var.alloc(n)) ;
+            acc.add(Var.alloc(n));
     }
 
-    public static void addVars(Collection<Var> acc, BasicPattern pattern)
-    {
-        addVars(acc, pattern.getList()) ;
+    // Name to avoid erasure clash
+    public static void addVarNodes(Collection<Var> acc, Collection<Node> nodes) {
+        for ( Node n : nodes )
+            addVar(acc, n) ;
     }
 
-    public static void addVars(Collection<Var> acc, Collection<Triple> triples)
-    {
+    public static void addVarsTriples(Collection<Var> acc, Collection<Triple> triples) {
         for ( Triple triple : triples )
-            addVarsFromTriple(acc, triple) ;
+            addVarsFromTriple(acc, triple);
+    }
+
+    public static void addVars(Collection<Var> acc, BasicPattern pattern) {
+        addVarsTriples(acc, pattern.getList());
     }
 
+    public static void addVars(Collection<Var> acc, Node graphNode, BasicPattern triples) {
+        addVar(acc, graphNode) ;
+        addVars(acc, triples) ; 
+    }
+    
+    public static void addVars(Collection<Var> acc, QuadPattern quadPattern) {
+        for ( Quad quad : quadPattern.getList() ) {
+            addVarsFromQuad(acc, quad) ;
+        }
+    }
+
+
 }


[26/50] [abbrv] jena git commit: Better formatting of the rebuild message

Posted by rv...@apache.org.
Better formatting of the rebuild message


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

Branch: refs/heads/JENA-507
Commit: fbc0dd0bfb4a02231f605bf29e9069fef8647f01
Parents: a03b48f
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 27 17:01:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 27 17:01:13 2015 +0100

----------------------------------------------------------------------
 jena-fuseki2/jena-fuseki-core/fuseki-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/fbc0dd0b/jena-fuseki2/jena-fuseki-core/fuseki-dev
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/fuseki-dev b/jena-fuseki2/jena-fuseki-core/fuseki-dev
index cd27cf2..b027fff 100755
--- a/jena-fuseki2/jena-fuseki-core/fuseki-dev
+++ b/jena-fuseki2/jena-fuseki-core/fuseki-dev
@@ -43,7 +43,7 @@ CPF="$FUSEKI_HOME/fuseki.classpath"
 if [ ! -e "$CPF" ]; then
     echo "Need to create Fuseki classpath file"
     echo "Ensure maven is upto date with the latest snapshots and then run"
-    echo -e "cd $FUSEKI_HOME ; \nmvn dependency:build-classpath -Dmdep.outputFile=fuseki.classpath"
+    echo -e "( cd $FUSEKI_HOME ; \n  mvn dependency:build-classpath -Dmdep.outputFile=fuseki.classpath )"
     exit 1
 fi
 CP="$(cat $CPF)"


[28/50] [abbrv] jena git commit: JENA-1016: old: -> owl:

Posted by rv...@apache.org.
JENA-1016: old: -> owl:


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

Branch: refs/heads/JENA-507
Commit: b3846cbd865412e78a894b30b94a4a9d90045d67
Parents: 4fc76dd
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 28 12:18:05 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 28 12:18:05 2015 +0100

----------------------------------------------------------------------
 jena-core/src/main/resources/etc/owl-b.rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b3846cbd/jena-core/src/main/resources/etc/owl-b.rules
----------------------------------------------------------------------
diff --git a/jena-core/src/main/resources/etc/owl-b.rules b/jena-core/src/main/resources/etc/owl-b.rules
index 86c2d4a..1680c78 100644
--- a/jena-core/src/main/resources/etc/owl-b.rules
+++ b/jena-core/src/main/resources/etc/owl-b.rules
@@ -307,7 +307,7 @@
 [sameIndividualAs2: (?P rdf:type owl:InverseFunctionalProperty), (?A ?P ?B), (?C ?P ?B) 
                     -> (?A owl:sameIndividualAs ?C) ]
                     
-[sameIndividualAs3: (?X owl:sameAs ?Y), (?X rdf:type owl:Thing), (?Y rdf:type old:Thing) 
+[sameIndividualAs3: (?X owl:sameAs ?Y), (?X rdf:type owl:Thing), (?Y rdf:type owl:Thing) 
                     -> (?X owl:sameIndividualAs ?Y) ]
                     
 


[33/50] [abbrv] jena git commit: Typo

Posted by rv...@apache.org.
Typo

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

Branch: refs/heads/JENA-507
Commit: 0b8c50b41ea945231b1890c3738ced0e75db976d
Parents: 7370989
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:08:59 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:08:59 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/fuseki/servlets/ResponseModel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/0b8c50b4/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
index e46fbe6..831e42c 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
@@ -37,7 +37,7 @@ import org.apache.jena.riot.RDFLanguages ;
 import static org.apache.jena.riot.WebContent.* ;
 import org.apache.jena.web.HttpSC ;
 
-// REPLACED by RssponseDataset
+// REPLACED by ResponseDataset
 // Kept here in case we need to revert it (Aug 2015)
 // Delete after release of Fusek 2.3.1 or earlier if specific confirmation
 // the new code is OK.


[10/50] [abbrv] jena git commit: Wrong order of JUnit assert arguments.

Posted by rv...@apache.org.
Wrong order of JUnit assert arguments.

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

Branch: refs/heads/JENA-507
Commit: 5cd90aaa860afe9ac109f77b7057686b3f5708a4
Parents: abd2ca5
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 11:21:34 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 11:21:34 2015 +0100

----------------------------------------------------------------------
 .../src/test/java/org/apache/jena/fuseki/TestDatasetOps.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5cd90aaa/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
index 132f237..7107310 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
@@ -122,7 +122,7 @@ public class TestDatasetOps extends AbstractFusekiTest
         HttpEntity e = datasetToHttpEntity(data) ;
         HttpOp.execHttpPut(urlDataset, e);
         TypedInputStream in = HttpOp.execHttpGet(urlDataset, acceptheader) ;
-        assertEqualsIgnoreCase(in.getContentType(), contentTypeResponse) ;
+        assertEqualsIgnoreCase(contentTypeResponse, in.getContentType()) ;
         DatasetGraph dsg = DatasetGraphFactory.createMem() ;
         StreamRDF dest = StreamRDFLib.dataset(dsg) ;
         RDFDataMgr.parse(dest, in) ;


[15/50] [abbrv] jena git commit: JENA-803 : Support AGG(DISTNCT ...)

Posted by rv...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
index 801238b..3d41145 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
@@ -1,633 +1,633 @@
-/* Generated By:JavaCC: Do not edit this line. ARQParserConstants.java */
-package org.apache.jena.sparql.lang.arq ;
-
-
-/**
- * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGen#start()
- */
-public interface ARQParserConstants {
-
-  /** End of File. */
-  int EOF = 0;
-  /** RegularExpression Id. */
-  int SINGLE_LINE_COMMENT = 6;
-  /** RegularExpression Id. */
-  int WS = 7;
-  /** RegularExpression Id. */
-  int WSC = 8;
-  /** RegularExpression Id. */
-  int BOM = 9;
-  /** RegularExpression Id. */
-  int IRIref = 10;
-  /** RegularExpression Id. */
-  int PNAME_NS = 11;
-  /** RegularExpression Id. */
-  int PNAME_LN = 12;
-  /** RegularExpression Id. */
-  int BLANK_NODE_LABEL = 13;
-  /** RegularExpression Id. */
-  int VAR1 = 14;
-  /** RegularExpression Id. */
-  int VAR2 = 15;
-  /** RegularExpression Id. */
-  int LANGTAG = 16;
-  /** RegularExpression Id. */
-  int A2Z = 17;
-  /** RegularExpression Id. */
-  int A2ZN = 18;
-  /** RegularExpression Id. */
-  int KW_A = 19;
-  /** RegularExpression Id. */
-  int BASE = 20;
-  /** RegularExpression Id. */
-  int PREFIX = 21;
-  /** RegularExpression Id. */
-  int SELECT = 22;
-  /** RegularExpression Id. */
-  int DISTINCT = 23;
-  /** RegularExpression Id. */
-  int REDUCED = 24;
-  /** RegularExpression Id. */
-  int DESCRIBE = 25;
-  /** RegularExpression Id. */
-  int CONSTRUCT = 26;
-  /** RegularExpression Id. */
-  int ASK = 27;
-  /** RegularExpression Id. */
-  int LIMIT = 28;
-  /** RegularExpression Id. */
-  int OFFSET = 29;
-  /** RegularExpression Id. */
-  int ORDER = 30;
-  /** RegularExpression Id. */
-  int BY = 31;
-  /** RegularExpression Id. */
-  int VALUES = 32;
-  /** RegularExpression Id. */
-  int UNDEF = 33;
-  /** RegularExpression Id. */
-  int ASC = 34;
-  /** RegularExpression Id. */
-  int DESC = 35;
-  /** RegularExpression Id. */
-  int NAMED = 36;
-  /** RegularExpression Id. */
-  int FROM = 37;
-  /** RegularExpression Id. */
-  int WHERE = 38;
-  /** RegularExpression Id. */
-  int AND = 39;
-  /** RegularExpression Id. */
-  int GRAPH = 40;
-  /** RegularExpression Id. */
-  int OPTIONAL = 41;
-  /** RegularExpression Id. */
-  int UNION = 42;
-  /** RegularExpression Id. */
-  int MINUS_P = 43;
-  /** RegularExpression Id. */
-  int BIND = 44;
-  /** RegularExpression Id. */
-  int SERVICE = 45;
-  /** RegularExpression Id. */
-  int LET = 46;
-  /** RegularExpression Id. */
-  int EXISTS = 47;
-  /** RegularExpression Id. */
-  int NOT = 48;
-  /** RegularExpression Id. */
-  int AS = 49;
-  /** RegularExpression Id. */
-  int GROUP = 50;
-  /** RegularExpression Id. */
-  int HAVING = 51;
-  /** RegularExpression Id. */
-  int SEPARATOR = 52;
-  /** RegularExpression Id. */
-  int AGG = 53;
-  /** RegularExpression Id. */
-  int COUNT = 54;
-  /** RegularExpression Id. */
-  int MIN = 55;
-  /** RegularExpression Id. */
-  int MAX = 56;
-  /** RegularExpression Id. */
-  int SUM = 57;
-  /** RegularExpression Id. */
-  int AVG = 58;
-  /** RegularExpression Id. */
-  int STDDEV = 59;
-  /** RegularExpression Id. */
-  int SAMPLE = 60;
-  /** RegularExpression Id. */
-  int GROUP_CONCAT = 61;
-  /** RegularExpression Id. */
-  int FILTER = 62;
-  /** RegularExpression Id. */
-  int BOUND = 63;
-  /** RegularExpression Id. */
-  int COALESCE = 64;
-  /** RegularExpression Id. */
-  int IN = 65;
-  /** RegularExpression Id. */
-  int IF = 66;
-  /** RegularExpression Id. */
-  int BNODE = 67;
-  /** RegularExpression Id. */
-  int IRI = 68;
-  /** RegularExpression Id. */
-  int URI = 69;
-  /** RegularExpression Id. */
-  int CAST = 70;
-  /** RegularExpression Id. */
-  int CALL = 71;
-  /** RegularExpression Id. */
-  int MULTI = 72;
-  /** RegularExpression Id. */
-  int SHORTEST = 73;
-  /** RegularExpression Id. */
-  int STR = 74;
-  /** RegularExpression Id. */
-  int STRLANG = 75;
-  /** RegularExpression Id. */
-  int STRDT = 76;
-  /** RegularExpression Id. */
-  int DTYPE = 77;
-  /** RegularExpression Id. */
-  int LANG = 78;
-  /** RegularExpression Id. */
-  int LANGMATCHES = 79;
-  /** RegularExpression Id. */
-  int IS_URI = 80;
-  /** RegularExpression Id. */
-  int IS_IRI = 81;
-  /** RegularExpression Id. */
-  int IS_BLANK = 82;
-  /** RegularExpression Id. */
-  int IS_LITERAL = 83;
-  /** RegularExpression Id. */
-  int IS_NUMERIC = 84;
-  /** RegularExpression Id. */
-  int REGEX = 85;
-  /** RegularExpression Id. */
-  int SAME_TERM = 86;
-  /** RegularExpression Id. */
-  int RAND = 87;
-  /** RegularExpression Id. */
-  int ABS = 88;
-  /** RegularExpression Id. */
-  int CEIL = 89;
-  /** RegularExpression Id. */
-  int FLOOR = 90;
-  /** RegularExpression Id. */
-  int ROUND = 91;
-  /** RegularExpression Id. */
-  int CONCAT = 92;
-  /** RegularExpression Id. */
-  int SUBSTR = 93;
-  /** RegularExpression Id. */
-  int STRLEN = 94;
-  /** RegularExpression Id. */
-  int REPLACE = 95;
-  /** RegularExpression Id. */
-  int UCASE = 96;
-  /** RegularExpression Id. */
-  int LCASE = 97;
-  /** RegularExpression Id. */
-  int ENCODE_FOR_URI = 98;
-  /** RegularExpression Id. */
-  int CONTAINS = 99;
-  /** RegularExpression Id. */
-  int STRSTARTS = 100;
-  /** RegularExpression Id. */
-  int STRENDS = 101;
-  /** RegularExpression Id. */
-  int STRBEFORE = 102;
-  /** RegularExpression Id. */
-  int STRAFTER = 103;
-  /** RegularExpression Id. */
-  int YEAR = 104;
-  /** RegularExpression Id. */
-  int MONTH = 105;
-  /** RegularExpression Id. */
-  int DAY = 106;
-  /** RegularExpression Id. */
-  int HOURS = 107;
-  /** RegularExpression Id. */
-  int MINUTES = 108;
-  /** RegularExpression Id. */
-  int SECONDS = 109;
-  /** RegularExpression Id. */
-  int TIMEZONE = 110;
-  /** RegularExpression Id. */
-  int TZ = 111;
-  /** RegularExpression Id. */
-  int NOW = 112;
-  /** RegularExpression Id. */
-  int UUID = 113;
-  /** RegularExpression Id. */
-  int STRUUID = 114;
-  /** RegularExpression Id. */
-  int VERSION = 115;
-  /** RegularExpression Id. */
-  int MD5 = 116;
-  /** RegularExpression Id. */
-  int SHA1 = 117;
-  /** RegularExpression Id. */
-  int SHA224 = 118;
-  /** RegularExpression Id. */
-  int SHA256 = 119;
-  /** RegularExpression Id. */
-  int SHA384 = 120;
-  /** RegularExpression Id. */
-  int SHA512 = 121;
-  /** RegularExpression Id. */
-  int TRUE = 122;
-  /** RegularExpression Id. */
-  int FALSE = 123;
-  /** RegularExpression Id. */
-  int DATA = 124;
-  /** RegularExpression Id. */
-  int INSERT = 125;
-  /** RegularExpression Id. */
-  int DELETE = 126;
-  /** RegularExpression Id. */
-  int INSERT_DATA = 127;
-  /** RegularExpression Id. */
-  int DELETE_DATA = 128;
-  /** RegularExpression Id. */
-  int DELETE_WHERE = 129;
-  /** RegularExpression Id. */
-  int LOAD = 130;
-  /** RegularExpression Id. */
-  int CLEAR = 131;
-  /** RegularExpression Id. */
-  int CREATE = 132;
-  /** RegularExpression Id. */
-  int ADD = 133;
-  /** RegularExpression Id. */
-  int MOVE = 134;
-  /** RegularExpression Id. */
-  int COPY = 135;
-  /** RegularExpression Id. */
-  int META = 136;
-  /** RegularExpression Id. */
-  int SILENT = 137;
-  /** RegularExpression Id. */
-  int DROP = 138;
-  /** RegularExpression Id. */
-  int INTO = 139;
-  /** RegularExpression Id. */
-  int TO = 140;
-  /** RegularExpression Id. */
-  int DFT = 141;
-  /** RegularExpression Id. */
-  int ALL = 142;
-  /** RegularExpression Id. */
-  int WITH = 143;
-  /** RegularExpression Id. */
-  int USING = 144;
-  /** RegularExpression Id. */
-  int DIGITS = 145;
-  /** RegularExpression Id. */
-  int INTEGER = 146;
-  /** RegularExpression Id. */
-  int DECIMAL = 147;
-  /** RegularExpression Id. */
-  int DOUBLE = 148;
-  /** RegularExpression Id. */
-  int INTEGER_POSITIVE = 149;
-  /** RegularExpression Id. */
-  int DECIMAL_POSITIVE = 150;
-  /** RegularExpression Id. */
-  int DOUBLE_POSITIVE = 151;
-  /** RegularExpression Id. */
-  int INTEGER_NEGATIVE = 152;
-  /** RegularExpression Id. */
-  int DECIMAL_NEGATIVE = 153;
-  /** RegularExpression Id. */
-  int DOUBLE_NEGATIVE = 154;
-  /** RegularExpression Id. */
-  int EXPONENT = 155;
-  /** RegularExpression Id. */
-  int QUOTE_3D = 156;
-  /** RegularExpression Id. */
-  int QUOTE_3S = 157;
-  /** RegularExpression Id. */
-  int ECHAR = 158;
-  /** RegularExpression Id. */
-  int STRING_LITERAL1 = 159;
-  /** RegularExpression Id. */
-  int STRING_LITERAL2 = 160;
-  /** RegularExpression Id. */
-  int STRING_LITERAL_LONG1 = 161;
-  /** RegularExpression Id. */
-  int STRING_LITERAL_LONG2 = 162;
-  /** RegularExpression Id. */
-  int LPAREN = 163;
-  /** RegularExpression Id. */
-  int RPAREN = 164;
-  /** RegularExpression Id. */
-  int NIL = 165;
-  /** RegularExpression Id. */
-  int LBRACE = 166;
-  /** RegularExpression Id. */
-  int RBRACE = 167;
-  /** RegularExpression Id. */
-  int LBRACKET = 168;
-  /** RegularExpression Id. */
-  int RBRACKET = 169;
-  /** RegularExpression Id. */
-  int ANON = 170;
-  /** RegularExpression Id. */
-  int SEMICOLON = 171;
-  /** RegularExpression Id. */
-  int COMMA = 172;
-  /** RegularExpression Id. */
-  int DOT = 173;
-  /** RegularExpression Id. */
-  int EQ = 174;
-  /** RegularExpression Id. */
-  int NE = 175;
-  /** RegularExpression Id. */
-  int GT = 176;
-  /** RegularExpression Id. */
-  int LT = 177;
-  /** RegularExpression Id. */
-  int LE = 178;
-  /** RegularExpression Id. */
-  int GE = 179;
-  /** RegularExpression Id. */
-  int BANG = 180;
-  /** RegularExpression Id. */
-  int TILDE = 181;
-  /** RegularExpression Id. */
-  int COLON = 182;
-  /** RegularExpression Id. */
-  int SC_OR = 183;
-  /** RegularExpression Id. */
-  int SC_AND = 184;
-  /** RegularExpression Id. */
-  int PLUS = 185;
-  /** RegularExpression Id. */
-  int MINUS = 186;
-  /** RegularExpression Id. */
-  int STAR = 187;
-  /** RegularExpression Id. */
-  int SLASH = 188;
-  /** RegularExpression Id. */
-  int DATATYPE = 189;
-  /** RegularExpression Id. */
-  int AT = 190;
-  /** RegularExpression Id. */
-  int ASSIGN = 191;
-  /** RegularExpression Id. */
-  int VBAR = 192;
-  /** RegularExpression Id. */
-  int CARAT = 193;
-  /** RegularExpression Id. */
-  int FPATH = 194;
-  /** RegularExpression Id. */
-  int RPATH = 195;
-  /** RegularExpression Id. */
-  int QMARK = 196;
-  /** RegularExpression Id. */
-  int PN_CHARS_BASE = 197;
-  /** RegularExpression Id. */
-  int PN_CHARS_U = 198;
-  /** RegularExpression Id. */
-  int PN_CHARS = 199;
-  /** RegularExpression Id. */
-  int PN_PREFIX = 200;
-  /** RegularExpression Id. */
-  int PN_LOCAL = 201;
-  /** RegularExpression Id. */
-  int VARNAME = 202;
-  /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 203;
-  /** RegularExpression Id. */
-  int PLX = 204;
-  /** RegularExpression Id. */
-  int HEX = 205;
-  /** RegularExpression Id. */
-  int PERCENT = 206;
-  /** RegularExpression Id. */
-  int UNKNOWN = 207;
-
-  /** Lexical state. */
-  int DEFAULT = 0;
-
-  /** Literal token values. */
-  String[] tokenImage = {
-    "<EOF>",
-    "\" \"",
-    "\"\\t\"",
-    "\"\\n\"",
-    "\"\\r\"",
-    "\"\\f\"",
-    "<SINGLE_LINE_COMMENT>",
-    "<WS>",
-    "<WSC>",
-    "\"\\ufeff\"",
-    "<IRIref>",
-    "<PNAME_NS>",
-    "<PNAME_LN>",
-    "<BLANK_NODE_LABEL>",
-    "<VAR1>",
-    "<VAR2>",
-    "<LANGTAG>",
-    "<A2Z>",
-    "<A2ZN>",
-    "\"a\"",
-    "\"base\"",
-    "\"prefix\"",
-    "\"select\"",
-    "\"distinct\"",
-    "\"reduced\"",
-    "\"describe\"",
-    "\"construct\"",
-    "\"ask\"",
-    "\"limit\"",
-    "\"offset\"",
-    "\"order\"",
-    "\"by\"",
-    "\"values\"",
-    "\"undef\"",
-    "\"asc\"",
-    "\"desc\"",
-    "\"named\"",
-    "\"from\"",
-    "\"where\"",
-    "\"and\"",
-    "\"graph\"",
-    "\"optional\"",
-    "\"union\"",
-    "\"minus\"",
-    "\"bind\"",
-    "\"service\"",
-    "\"let\"",
-    "\"exists\"",
-    "\"not\"",
-    "\"as\"",
-    "\"group\"",
-    "\"having\"",
-    "\"separator\"",
-    "\"agg\"",
-    "\"count\"",
-    "\"min\"",
-    "\"max\"",
-    "\"sum\"",
-    "\"avg\"",
-    "\"stdev\"",
-    "\"sample\"",
-    "\"group_concat\"",
-    "\"filter\"",
-    "\"bound\"",
-    "\"coalesce\"",
-    "\"in\"",
-    "\"if\"",
-    "\"bnode\"",
-    "\"iri\"",
-    "\"uri\"",
-    "\"cast\"",
-    "\"call\"",
-    "\"multi\"",
-    "\"shortest\"",
-    "\"str\"",
-    "\"strlang\"",
-    "\"strdt\"",
-    "\"datatype\"",
-    "\"lang\"",
-    "\"langmatches\"",
-    "\"isURI\"",
-    "\"isIRI\"",
-    "\"isBlank\"",
-    "\"isLiteral\"",
-    "\"isNumeric\"",
-    "\"regex\"",
-    "\"sameTerm\"",
-    "\"RAND\"",
-    "\"ABS\"",
-    "\"CEIL\"",
-    "\"FLOOR\"",
-    "\"ROUND\"",
-    "\"CONCAT\"",
-    "\"SUBSTR\"",
-    "\"STRLEN\"",
-    "\"REPLACE\"",
-    "\"UCASE\"",
-    "\"LCASE\"",
-    "\"ENCODE_FOR_URI\"",
-    "\"CONTAINS\"",
-    "\"STRSTARTS\"",
-    "\"STRENDS\"",
-    "\"STRBEFORE\"",
-    "\"STRAFTER\"",
-    "\"YEAR\"",
-    "\"MONTH\"",
-    "\"DAY\"",
-    "\"HOURS\"",
-    "\"MINUTES\"",
-    "\"SECONDS\"",
-    "\"TIMEZONE\"",
-    "\"TZ\"",
-    "\"NOW\"",
-    "\"UUID\"",
-    "\"STRUUID\"",
-    "\"VERSION\"",
-    "\"MD5\"",
-    "\"SHA1\"",
-    "\"SHA224\"",
-    "\"SHA256\"",
-    "\"SHA384\"",
-    "\"SHA512\"",
-    "\"true\"",
-    "\"false\"",
-    "\"data\"",
-    "\"insert\"",
-    "\"delete\"",
-    "<INSERT_DATA>",
-    "<DELETE_DATA>",
-    "<DELETE_WHERE>",
-    "\"load\"",
-    "\"clear\"",
-    "\"create\"",
-    "\"add\"",
-    "\"move\"",
-    "\"copy\"",
-    "\"meta\"",
-    "\"silent\"",
-    "\"drop\"",
-    "\"into\"",
-    "\"to\"",
-    "\"default\"",
-    "\"all\"",
-    "\"with\"",
-    "\"using\"",
-    "<DIGITS>",
-    "<INTEGER>",
-    "<DECIMAL>",
-    "<DOUBLE>",
-    "<INTEGER_POSITIVE>",
-    "<DECIMAL_POSITIVE>",
-    "<DOUBLE_POSITIVE>",
-    "<INTEGER_NEGATIVE>",
-    "<DECIMAL_NEGATIVE>",
-    "<DOUBLE_NEGATIVE>",
-    "<EXPONENT>",
-    "\"\\\"\\\"\\\"\"",
-    "\"\\\'\\\'\\\'\"",
-    "<ECHAR>",
-    "<STRING_LITERAL1>",
-    "<STRING_LITERAL2>",
-    "<STRING_LITERAL_LONG1>",
-    "<STRING_LITERAL_LONG2>",
-    "\"(\"",
-    "\")\"",
-    "<NIL>",
-    "\"{\"",
-    "\"}\"",
-    "\"[\"",
-    "\"]\"",
-    "<ANON>",
-    "\";\"",
-    "\",\"",
-    "\".\"",
-    "\"=\"",
-    "\"!=\"",
-    "\">\"",
-    "\"<\"",
-    "\"<=\"",
-    "\">=\"",
-    "\"!\"",
-    "\"~\"",
-    "\":\"",
-    "\"||\"",
-    "\"&&\"",
-    "\"+\"",
-    "\"-\"",
-    "\"*\"",
-    "\"/\"",
-    "\"^^\"",
-    "\"@\"",
-    "\":=\"",
-    "\"|\"",
-    "\"^\"",
-    "\"->\"",
-    "\"<-\"",
-    "\"?\"",
-    "<PN_CHARS_BASE>",
-    "<PN_CHARS_U>",
-    "<PN_CHARS>",
-    "<PN_PREFIX>",
-    "<PN_LOCAL>",
-    "<VARNAME>",
-    "<PN_LOCAL_ESC>",
-    "<PLX>",
-    "<HEX>",
-    "<PERCENT>",
-    "<UNKNOWN>",
-  };
-
-}
+/* Generated By:JavaCC: Do not edit this line. ARQParserConstants.java */
+package org.apache.jena.sparql.lang.arq ;
+
+
+/**
+ * Token literal values and constants.
+ * Generated by org.javacc.parser.OtherFilesGen#start()
+ */
+public interface ARQParserConstants {
+
+  /** End of File. */
+  int EOF = 0;
+  /** RegularExpression Id. */
+  int SINGLE_LINE_COMMENT = 6;
+  /** RegularExpression Id. */
+  int WS = 7;
+  /** RegularExpression Id. */
+  int WSC = 8;
+  /** RegularExpression Id. */
+  int BOM = 9;
+  /** RegularExpression Id. */
+  int IRIref = 10;
+  /** RegularExpression Id. */
+  int PNAME_NS = 11;
+  /** RegularExpression Id. */
+  int PNAME_LN = 12;
+  /** RegularExpression Id. */
+  int BLANK_NODE_LABEL = 13;
+  /** RegularExpression Id. */
+  int VAR1 = 14;
+  /** RegularExpression Id. */
+  int VAR2 = 15;
+  /** RegularExpression Id. */
+  int LANGTAG = 16;
+  /** RegularExpression Id. */
+  int A2Z = 17;
+  /** RegularExpression Id. */
+  int A2ZN = 18;
+  /** RegularExpression Id. */
+  int KW_A = 19;
+  /** RegularExpression Id. */
+  int BASE = 20;
+  /** RegularExpression Id. */
+  int PREFIX = 21;
+  /** RegularExpression Id. */
+  int SELECT = 22;
+  /** RegularExpression Id. */
+  int DISTINCT = 23;
+  /** RegularExpression Id. */
+  int REDUCED = 24;
+  /** RegularExpression Id. */
+  int DESCRIBE = 25;
+  /** RegularExpression Id. */
+  int CONSTRUCT = 26;
+  /** RegularExpression Id. */
+  int ASK = 27;
+  /** RegularExpression Id. */
+  int LIMIT = 28;
+  /** RegularExpression Id. */
+  int OFFSET = 29;
+  /** RegularExpression Id. */
+  int ORDER = 30;
+  /** RegularExpression Id. */
+  int BY = 31;
+  /** RegularExpression Id. */
+  int VALUES = 32;
+  /** RegularExpression Id. */
+  int UNDEF = 33;
+  /** RegularExpression Id. */
+  int ASC = 34;
+  /** RegularExpression Id. */
+  int DESC = 35;
+  /** RegularExpression Id. */
+  int NAMED = 36;
+  /** RegularExpression Id. */
+  int FROM = 37;
+  /** RegularExpression Id. */
+  int WHERE = 38;
+  /** RegularExpression Id. */
+  int AND = 39;
+  /** RegularExpression Id. */
+  int GRAPH = 40;
+  /** RegularExpression Id. */
+  int OPTIONAL = 41;
+  /** RegularExpression Id. */
+  int UNION = 42;
+  /** RegularExpression Id. */
+  int MINUS_P = 43;
+  /** RegularExpression Id. */
+  int BIND = 44;
+  /** RegularExpression Id. */
+  int SERVICE = 45;
+  /** RegularExpression Id. */
+  int LET = 46;
+  /** RegularExpression Id. */
+  int EXISTS = 47;
+  /** RegularExpression Id. */
+  int NOT = 48;
+  /** RegularExpression Id. */
+  int AS = 49;
+  /** RegularExpression Id. */
+  int GROUP = 50;
+  /** RegularExpression Id. */
+  int HAVING = 51;
+  /** RegularExpression Id. */
+  int SEPARATOR = 52;
+  /** RegularExpression Id. */
+  int AGG = 53;
+  /** RegularExpression Id. */
+  int COUNT = 54;
+  /** RegularExpression Id. */
+  int MIN = 55;
+  /** RegularExpression Id. */
+  int MAX = 56;
+  /** RegularExpression Id. */
+  int SUM = 57;
+  /** RegularExpression Id. */
+  int AVG = 58;
+  /** RegularExpression Id. */
+  int STDDEV = 59;
+  /** RegularExpression Id. */
+  int SAMPLE = 60;
+  /** RegularExpression Id. */
+  int GROUP_CONCAT = 61;
+  /** RegularExpression Id. */
+  int FILTER = 62;
+  /** RegularExpression Id. */
+  int BOUND = 63;
+  /** RegularExpression Id. */
+  int COALESCE = 64;
+  /** RegularExpression Id. */
+  int IN = 65;
+  /** RegularExpression Id. */
+  int IF = 66;
+  /** RegularExpression Id. */
+  int BNODE = 67;
+  /** RegularExpression Id. */
+  int IRI = 68;
+  /** RegularExpression Id. */
+  int URI = 69;
+  /** RegularExpression Id. */
+  int CAST = 70;
+  /** RegularExpression Id. */
+  int CALL = 71;
+  /** RegularExpression Id. */
+  int MULTI = 72;
+  /** RegularExpression Id. */
+  int SHORTEST = 73;
+  /** RegularExpression Id. */
+  int STR = 74;
+  /** RegularExpression Id. */
+  int STRLANG = 75;
+  /** RegularExpression Id. */
+  int STRDT = 76;
+  /** RegularExpression Id. */
+  int DTYPE = 77;
+  /** RegularExpression Id. */
+  int LANG = 78;
+  /** RegularExpression Id. */
+  int LANGMATCHES = 79;
+  /** RegularExpression Id. */
+  int IS_URI = 80;
+  /** RegularExpression Id. */
+  int IS_IRI = 81;
+  /** RegularExpression Id. */
+  int IS_BLANK = 82;
+  /** RegularExpression Id. */
+  int IS_LITERAL = 83;
+  /** RegularExpression Id. */
+  int IS_NUMERIC = 84;
+  /** RegularExpression Id. */
+  int REGEX = 85;
+  /** RegularExpression Id. */
+  int SAME_TERM = 86;
+  /** RegularExpression Id. */
+  int RAND = 87;
+  /** RegularExpression Id. */
+  int ABS = 88;
+  /** RegularExpression Id. */
+  int CEIL = 89;
+  /** RegularExpression Id. */
+  int FLOOR = 90;
+  /** RegularExpression Id. */
+  int ROUND = 91;
+  /** RegularExpression Id. */
+  int CONCAT = 92;
+  /** RegularExpression Id. */
+  int SUBSTR = 93;
+  /** RegularExpression Id. */
+  int STRLEN = 94;
+  /** RegularExpression Id. */
+  int REPLACE = 95;
+  /** RegularExpression Id. */
+  int UCASE = 96;
+  /** RegularExpression Id. */
+  int LCASE = 97;
+  /** RegularExpression Id. */
+  int ENCODE_FOR_URI = 98;
+  /** RegularExpression Id. */
+  int CONTAINS = 99;
+  /** RegularExpression Id. */
+  int STRSTARTS = 100;
+  /** RegularExpression Id. */
+  int STRENDS = 101;
+  /** RegularExpression Id. */
+  int STRBEFORE = 102;
+  /** RegularExpression Id. */
+  int STRAFTER = 103;
+  /** RegularExpression Id. */
+  int YEAR = 104;
+  /** RegularExpression Id. */
+  int MONTH = 105;
+  /** RegularExpression Id. */
+  int DAY = 106;
+  /** RegularExpression Id. */
+  int HOURS = 107;
+  /** RegularExpression Id. */
+  int MINUTES = 108;
+  /** RegularExpression Id. */
+  int SECONDS = 109;
+  /** RegularExpression Id. */
+  int TIMEZONE = 110;
+  /** RegularExpression Id. */
+  int TZ = 111;
+  /** RegularExpression Id. */
+  int NOW = 112;
+  /** RegularExpression Id. */
+  int UUID = 113;
+  /** RegularExpression Id. */
+  int STRUUID = 114;
+  /** RegularExpression Id. */
+  int VERSION = 115;
+  /** RegularExpression Id. */
+  int MD5 = 116;
+  /** RegularExpression Id. */
+  int SHA1 = 117;
+  /** RegularExpression Id. */
+  int SHA224 = 118;
+  /** RegularExpression Id. */
+  int SHA256 = 119;
+  /** RegularExpression Id. */
+  int SHA384 = 120;
+  /** RegularExpression Id. */
+  int SHA512 = 121;
+  /** RegularExpression Id. */
+  int TRUE = 122;
+  /** RegularExpression Id. */
+  int FALSE = 123;
+  /** RegularExpression Id. */
+  int DATA = 124;
+  /** RegularExpression Id. */
+  int INSERT = 125;
+  /** RegularExpression Id. */
+  int DELETE = 126;
+  /** RegularExpression Id. */
+  int INSERT_DATA = 127;
+  /** RegularExpression Id. */
+  int DELETE_DATA = 128;
+  /** RegularExpression Id. */
+  int DELETE_WHERE = 129;
+  /** RegularExpression Id. */
+  int LOAD = 130;
+  /** RegularExpression Id. */
+  int CLEAR = 131;
+  /** RegularExpression Id. */
+  int CREATE = 132;
+  /** RegularExpression Id. */
+  int ADD = 133;
+  /** RegularExpression Id. */
+  int MOVE = 134;
+  /** RegularExpression Id. */
+  int COPY = 135;
+  /** RegularExpression Id. */
+  int META = 136;
+  /** RegularExpression Id. */
+  int SILENT = 137;
+  /** RegularExpression Id. */
+  int DROP = 138;
+  /** RegularExpression Id. */
+  int INTO = 139;
+  /** RegularExpression Id. */
+  int TO = 140;
+  /** RegularExpression Id. */
+  int DFT = 141;
+  /** RegularExpression Id. */
+  int ALL = 142;
+  /** RegularExpression Id. */
+  int WITH = 143;
+  /** RegularExpression Id. */
+  int USING = 144;
+  /** RegularExpression Id. */
+  int DIGITS = 145;
+  /** RegularExpression Id. */
+  int INTEGER = 146;
+  /** RegularExpression Id. */
+  int DECIMAL = 147;
+  /** RegularExpression Id. */
+  int DOUBLE = 148;
+  /** RegularExpression Id. */
+  int INTEGER_POSITIVE = 149;
+  /** RegularExpression Id. */
+  int DECIMAL_POSITIVE = 150;
+  /** RegularExpression Id. */
+  int DOUBLE_POSITIVE = 151;
+  /** RegularExpression Id. */
+  int INTEGER_NEGATIVE = 152;
+  /** RegularExpression Id. */
+  int DECIMAL_NEGATIVE = 153;
+  /** RegularExpression Id. */
+  int DOUBLE_NEGATIVE = 154;
+  /** RegularExpression Id. */
+  int EXPONENT = 155;
+  /** RegularExpression Id. */
+  int QUOTE_3D = 156;
+  /** RegularExpression Id. */
+  int QUOTE_3S = 157;
+  /** RegularExpression Id. */
+  int ECHAR = 158;
+  /** RegularExpression Id. */
+  int STRING_LITERAL1 = 159;
+  /** RegularExpression Id. */
+  int STRING_LITERAL2 = 160;
+  /** RegularExpression Id. */
+  int STRING_LITERAL_LONG1 = 161;
+  /** RegularExpression Id. */
+  int STRING_LITERAL_LONG2 = 162;
+  /** RegularExpression Id. */
+  int LPAREN = 163;
+  /** RegularExpression Id. */
+  int RPAREN = 164;
+  /** RegularExpression Id. */
+  int NIL = 165;
+  /** RegularExpression Id. */
+  int LBRACE = 166;
+  /** RegularExpression Id. */
+  int RBRACE = 167;
+  /** RegularExpression Id. */
+  int LBRACKET = 168;
+  /** RegularExpression Id. */
+  int RBRACKET = 169;
+  /** RegularExpression Id. */
+  int ANON = 170;
+  /** RegularExpression Id. */
+  int SEMICOLON = 171;
+  /** RegularExpression Id. */
+  int COMMA = 172;
+  /** RegularExpression Id. */
+  int DOT = 173;
+  /** RegularExpression Id. */
+  int EQ = 174;
+  /** RegularExpression Id. */
+  int NE = 175;
+  /** RegularExpression Id. */
+  int GT = 176;
+  /** RegularExpression Id. */
+  int LT = 177;
+  /** RegularExpression Id. */
+  int LE = 178;
+  /** RegularExpression Id. */
+  int GE = 179;
+  /** RegularExpression Id. */
+  int BANG = 180;
+  /** RegularExpression Id. */
+  int TILDE = 181;
+  /** RegularExpression Id. */
+  int COLON = 182;
+  /** RegularExpression Id. */
+  int SC_OR = 183;
+  /** RegularExpression Id. */
+  int SC_AND = 184;
+  /** RegularExpression Id. */
+  int PLUS = 185;
+  /** RegularExpression Id. */
+  int MINUS = 186;
+  /** RegularExpression Id. */
+  int STAR = 187;
+  /** RegularExpression Id. */
+  int SLASH = 188;
+  /** RegularExpression Id. */
+  int DATATYPE = 189;
+  /** RegularExpression Id. */
+  int AT = 190;
+  /** RegularExpression Id. */
+  int ASSIGN = 191;
+  /** RegularExpression Id. */
+  int VBAR = 192;
+  /** RegularExpression Id. */
+  int CARAT = 193;
+  /** RegularExpression Id. */
+  int FPATH = 194;
+  /** RegularExpression Id. */
+  int RPATH = 195;
+  /** RegularExpression Id. */
+  int QMARK = 196;
+  /** RegularExpression Id. */
+  int PN_CHARS_BASE = 197;
+  /** RegularExpression Id. */
+  int PN_CHARS_U = 198;
+  /** RegularExpression Id. */
+  int PN_CHARS = 199;
+  /** RegularExpression Id. */
+  int PN_PREFIX = 200;
+  /** RegularExpression Id. */
+  int PN_LOCAL = 201;
+  /** RegularExpression Id. */
+  int VARNAME = 202;
+  /** RegularExpression Id. */
+  int PN_LOCAL_ESC = 203;
+  /** RegularExpression Id. */
+  int PLX = 204;
+  /** RegularExpression Id. */
+  int HEX = 205;
+  /** RegularExpression Id. */
+  int PERCENT = 206;
+  /** RegularExpression Id. */
+  int UNKNOWN = 207;
+
+  /** Lexical state. */
+  int DEFAULT = 0;
+
+  /** Literal token values. */
+  String[] tokenImage = {
+    "<EOF>",
+    "\" \"",
+    "\"\\t\"",
+    "\"\\n\"",
+    "\"\\r\"",
+    "\"\\f\"",
+    "<SINGLE_LINE_COMMENT>",
+    "<WS>",
+    "<WSC>",
+    "\"\\ufeff\"",
+    "<IRIref>",
+    "<PNAME_NS>",
+    "<PNAME_LN>",
+    "<BLANK_NODE_LABEL>",
+    "<VAR1>",
+    "<VAR2>",
+    "<LANGTAG>",
+    "<A2Z>",
+    "<A2ZN>",
+    "\"a\"",
+    "\"base\"",
+    "\"prefix\"",
+    "\"select\"",
+    "\"distinct\"",
+    "\"reduced\"",
+    "\"describe\"",
+    "\"construct\"",
+    "\"ask\"",
+    "\"limit\"",
+    "\"offset\"",
+    "\"order\"",
+    "\"by\"",
+    "\"values\"",
+    "\"undef\"",
+    "\"asc\"",
+    "\"desc\"",
+    "\"named\"",
+    "\"from\"",
+    "\"where\"",
+    "\"and\"",
+    "\"graph\"",
+    "\"optional\"",
+    "\"union\"",
+    "\"minus\"",
+    "\"bind\"",
+    "\"service\"",
+    "\"let\"",
+    "\"exists\"",
+    "\"not\"",
+    "\"as\"",
+    "\"group\"",
+    "\"having\"",
+    "\"separator\"",
+    "\"agg\"",
+    "\"count\"",
+    "\"min\"",
+    "\"max\"",
+    "\"sum\"",
+    "\"avg\"",
+    "\"stdev\"",
+    "\"sample\"",
+    "\"group_concat\"",
+    "\"filter\"",
+    "\"bound\"",
+    "\"coalesce\"",
+    "\"in\"",
+    "\"if\"",
+    "\"bnode\"",
+    "\"iri\"",
+    "\"uri\"",
+    "\"cast\"",
+    "\"call\"",
+    "\"multi\"",
+    "\"shortest\"",
+    "\"str\"",
+    "\"strlang\"",
+    "\"strdt\"",
+    "\"datatype\"",
+    "\"lang\"",
+    "\"langmatches\"",
+    "\"isURI\"",
+    "\"isIRI\"",
+    "\"isBlank\"",
+    "\"isLiteral\"",
+    "\"isNumeric\"",
+    "\"regex\"",
+    "\"sameTerm\"",
+    "\"RAND\"",
+    "\"ABS\"",
+    "\"CEIL\"",
+    "\"FLOOR\"",
+    "\"ROUND\"",
+    "\"CONCAT\"",
+    "\"SUBSTR\"",
+    "\"STRLEN\"",
+    "\"REPLACE\"",
+    "\"UCASE\"",
+    "\"LCASE\"",
+    "\"ENCODE_FOR_URI\"",
+    "\"CONTAINS\"",
+    "\"STRSTARTS\"",
+    "\"STRENDS\"",
+    "\"STRBEFORE\"",
+    "\"STRAFTER\"",
+    "\"YEAR\"",
+    "\"MONTH\"",
+    "\"DAY\"",
+    "\"HOURS\"",
+    "\"MINUTES\"",
+    "\"SECONDS\"",
+    "\"TIMEZONE\"",
+    "\"TZ\"",
+    "\"NOW\"",
+    "\"UUID\"",
+    "\"STRUUID\"",
+    "\"VERSION\"",
+    "\"MD5\"",
+    "\"SHA1\"",
+    "\"SHA224\"",
+    "\"SHA256\"",
+    "\"SHA384\"",
+    "\"SHA512\"",
+    "\"true\"",
+    "\"false\"",
+    "\"data\"",
+    "\"insert\"",
+    "\"delete\"",
+    "<INSERT_DATA>",
+    "<DELETE_DATA>",
+    "<DELETE_WHERE>",
+    "\"load\"",
+    "\"clear\"",
+    "\"create\"",
+    "\"add\"",
+    "\"move\"",
+    "\"copy\"",
+    "\"meta\"",
+    "\"silent\"",
+    "\"drop\"",
+    "\"into\"",
+    "\"to\"",
+    "\"default\"",
+    "\"all\"",
+    "\"with\"",
+    "\"using\"",
+    "<DIGITS>",
+    "<INTEGER>",
+    "<DECIMAL>",
+    "<DOUBLE>",
+    "<INTEGER_POSITIVE>",
+    "<DECIMAL_POSITIVE>",
+    "<DOUBLE_POSITIVE>",
+    "<INTEGER_NEGATIVE>",
+    "<DECIMAL_NEGATIVE>",
+    "<DOUBLE_NEGATIVE>",
+    "<EXPONENT>",
+    "\"\\\"\\\"\\\"\"",
+    "\"\\\'\\\'\\\'\"",
+    "<ECHAR>",
+    "<STRING_LITERAL1>",
+    "<STRING_LITERAL2>",
+    "<STRING_LITERAL_LONG1>",
+    "<STRING_LITERAL_LONG2>",
+    "\"(\"",
+    "\")\"",
+    "<NIL>",
+    "\"{\"",
+    "\"}\"",
+    "\"[\"",
+    "\"]\"",
+    "<ANON>",
+    "\";\"",
+    "\",\"",
+    "\".\"",
+    "\"=\"",
+    "\"!=\"",
+    "\">\"",
+    "\"<\"",
+    "\"<=\"",
+    "\">=\"",
+    "\"!\"",
+    "\"~\"",
+    "\":\"",
+    "\"||\"",
+    "\"&&\"",
+    "\"+\"",
+    "\"-\"",
+    "\"*\"",
+    "\"/\"",
+    "\"^^\"",
+    "\"@\"",
+    "\":=\"",
+    "\"|\"",
+    "\"^\"",
+    "\"->\"",
+    "\"<-\"",
+    "\"?\"",
+    "<PN_CHARS_BASE>",
+    "<PN_CHARS_U>",
+    "<PN_CHARS>",
+    "<PN_PREFIX>",
+    "<PN_LOCAL>",
+    "<VARNAME>",
+    "<PN_LOCAL_ESC>",
+    "<PLX>",
+    "<HEX>",
+    "<PERCENT>",
+    "<UNKNOWN>",
+  };
+
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/JavaCharStream.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/JavaCharStream.java
index acabbc0..e0cdb86 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/JavaCharStream.java
@@ -1,617 +1,617 @@
-/* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 5.0 */
-/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package org.apache.jena.sparql.lang.arq ;
-
-/**
- * An implementation of interface CharStream, where the stream is assumed to
- * contain only ASCII characters (with java-like unicode escape processing).
- */
-
-public
-class JavaCharStream
-{
-  /** Whether parser is static. */
-  public static final boolean staticFlag = false;
-
-  static final int hexval(char c) throws java.io.IOException {
-    switch(c)
-    {
-       case '0' :
-          return 0;
-       case '1' :
-          return 1;
-       case '2' :
-          return 2;
-       case '3' :
-          return 3;
-       case '4' :
-          return 4;
-       case '5' :
-          return 5;
-       case '6' :
-          return 6;
-       case '7' :
-          return 7;
-       case '8' :
-          return 8;
-       case '9' :
-          return 9;
-
-       case 'a' :
-       case 'A' :
-          return 10;
-       case 'b' :
-       case 'B' :
-          return 11;
-       case 'c' :
-       case 'C' :
-          return 12;
-       case 'd' :
-       case 'D' :
-          return 13;
-       case 'e' :
-       case 'E' :
-          return 14;
-       case 'f' :
-       case 'F' :
-          return 15;
-    }
-
-    throw new java.io.IOException(); // Should never come here
-  }
-
-/** Position in buffer. */
-  public int bufpos = -1;
-  int bufsize;
-  int available;
-  int tokenBegin;
-  protected int bufline[];
-  protected int bufcolumn[];
-
-  protected int column = 0;
-  protected int line = 1;
-
-  protected boolean prevCharIsCR = false;
-  protected boolean prevCharIsLF = false;
-
-  protected java.io.Reader inputStream;
-
-  protected char[] nextCharBuf;
-  protected char[] buffer;
-  protected int maxNextCharInd = 0;
-  protected int nextCharInd = -1;
-  protected int inBuf = 0;
-  protected int tabSize = 8;
-
-  protected void setTabSize(int i) { tabSize = i; }
-  protected int getTabSize(int i) { return tabSize; }
-
-  protected void ExpandBuff(boolean wrapAround)
-  {
-    char[] newbuffer = new char[bufsize + 2048];
-    int newbufline[] = new int[bufsize + 2048];
-    int newbufcolumn[] = new int[bufsize + 2048];
-
-    try
-    {
-      if (wrapAround)
-      {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-        bufcolumn = newbufcolumn;
-
-        bufpos += (bufsize - tokenBegin);
-    }
-    else
-    {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        bufcolumn = newbufcolumn;
-
-        bufpos -= tokenBegin;
-      }
-    }
-    catch (Throwable t)
-    {
-      throw new Error(t.getMessage());
-    }
-
-    available = (bufsize += 2048);
-    tokenBegin = 0;
-  }
-
-  protected void FillBuff() throws java.io.IOException
-  {
-    int i;
-    if (maxNextCharInd == 4096)
-      maxNextCharInd = nextCharInd = 0;
-
-    try {
-      if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
-                                          4096 - maxNextCharInd)) == -1)
-      {
-        inputStream.close();
-        throw new java.io.IOException();
-      }
-      else
-         maxNextCharInd += i;
-      return;
-    }
-    catch(java.io.IOException e) {
-      if (bufpos != 0)
-      {
-        --bufpos;
-        backup(0);
-      }
-      else
-      {
-        bufline[bufpos] = line;
-        bufcolumn[bufpos] = column;
-      }
-      throw e;
-    }
-  }
-
-  protected char ReadByte() throws java.io.IOException
-  {
-    if (++nextCharInd >= maxNextCharInd)
-      FillBuff();
-
-    return nextCharBuf[nextCharInd];
-  }
-
-/** @return starting character for token. */
-  public char BeginToken() throws java.io.IOException
-  {
-    if (inBuf > 0)
-    {
-      --inBuf;
-
-      if (++bufpos == bufsize)
-        bufpos = 0;
-
-      tokenBegin = bufpos;
-      return buffer[bufpos];
-    }
-
-    tokenBegin = 0;
-    bufpos = -1;
-
-    return readChar();
-  }
-
-  protected void AdjustBuffSize()
-  {
-    if (available == bufsize)
-    {
-      if (tokenBegin > 2048)
-      {
-        bufpos = 0;
-        available = tokenBegin;
-      }
-      else
-        ExpandBuff(false);
-    }
-    else if (available > tokenBegin)
-      available = bufsize;
-    else if ((tokenBegin - available) < 2048)
-      ExpandBuff(true);
-    else
-      available = tokenBegin;
-  }
-
-  protected void UpdateLineColumn(char c)
-  {
-    column++;
-
-    if (prevCharIsLF)
-    {
-      prevCharIsLF = false;
-      line += (column = 1);
-    }
-    else if (prevCharIsCR)
-    {
-      prevCharIsCR = false;
-      if (c == '\n')
-      {
-        prevCharIsLF = true;
-      }
-      else
-        line += (column = 1);
-    }
-
-    switch (c)
-    {
-      case '\r' :
-        prevCharIsCR = true;
-        break;
-      case '\n' :
-        prevCharIsLF = true;
-        break;
-      case '\t' :
-        column--;
-        column += (tabSize - (column % tabSize));
-        break;
-      default :
-        break;
-    }
-
-    bufline[bufpos] = line;
-    bufcolumn[bufpos] = column;
-  }
-
-/** Read a character. */
-  public char readChar() throws java.io.IOException
-  {
-    if (inBuf > 0)
-    {
-      --inBuf;
-
-      if (++bufpos == bufsize)
-        bufpos = 0;
-
-      return buffer[bufpos];
-    }
-
-    char c;
-
-    if (++bufpos == available)
-      AdjustBuffSize();
-
-    if ((buffer[bufpos] = c = ReadByte()) == '\\')
-    {
-      UpdateLineColumn(c);
-
-      int backSlashCnt = 1;
-
-      for (;;) // Read all the backslashes
-      {
-        if (++bufpos == available)
-          AdjustBuffSize();
-
-        try
-        {
-          if ((buffer[bufpos] = c = ReadByte()) != '\\')
-          {
-            UpdateLineColumn(c);
-            // found a non-backslash char.
-            if ((c == 'u') && ((backSlashCnt & 1) == 1))
-            {
-              if (--bufpos < 0)
-                bufpos = bufsize - 1;
-
-              break;
-            }
-
-            backup(backSlashCnt);
-            return '\\';
-          }
-        }
-        catch(java.io.IOException e)
-        {
-	  // We are returning one backslash so we should only backup (count-1)
-          if (backSlashCnt > 1)
-            backup(backSlashCnt-1);
-
-          return '\\';
-        }
-
-        UpdateLineColumn(c);
-        backSlashCnt++;
-      }
-
-      // Here, we have seen an odd number of backslash's followed by a 'u'
-      try
-      {
-        while ((c = ReadByte()) == 'u')
-          ++column;
-
-        buffer[bufpos] = c = (char)(hexval(c) << 12 |
-                                    hexval(ReadByte()) << 8 |
-                                    hexval(ReadByte()) << 4 |
-                                    hexval(ReadByte()));
-
-        column += 4;
-      }
-      catch(java.io.IOException e)
-      {
-        throw new Error("Invalid escape character at line " + line +
-                                         " column " + column + ".");
-      }
-
-      if (backSlashCnt == 1)
-        return c;
-      else
-      {
-        backup(backSlashCnt - 1);
-        return '\\';
-      }
-    }
-    else
-    {
-      UpdateLineColumn(c);
-      return c;
-    }
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndColumn
-   */
-  public int getColumn() {
-    return bufcolumn[bufpos];
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndLine
-   */
-  public int getLine() {
-    return bufline[bufpos];
-  }
-
-/** Get end column. */
-  public int getEndColumn() {
-    return bufcolumn[bufpos];
-  }
-
-/** Get end line. */
-  public int getEndLine() {
-    return bufline[bufpos];
-  }
-
-/** @return column of token start */
-  public int getBeginColumn() {
-    return bufcolumn[tokenBegin];
-  }
-
-/** @return line number of token start */
-  public int getBeginLine() {
-    return bufline[tokenBegin];
-  }
-
-/** Retreat. */
-  public void backup(int amount) {
-
-    inBuf += amount;
-    if ((bufpos -= amount) < 0)
-      bufpos += bufsize;
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.Reader dstream,
-                 int startline, int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    available = bufsize = buffersize;
-    buffer = new char[buffersize];
-    bufline = new int[buffersize];
-    bufcolumn = new int[buffersize];
-    nextCharBuf = new char[4096];
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.Reader dstream,
-                                        int startline, int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.Reader dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.Reader dstream,
-                 int startline, int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    if (buffer == null || buffersize != buffer.length)
-    {
-      available = bufsize = buffersize;
-      buffer = new char[buffersize];
-      bufline = new int[buffersize];
-      bufcolumn = new int[buffersize];
-      nextCharBuf = new char[4096];
-    }
-    prevCharIsLF = prevCharIsCR = false;
-    tokenBegin = inBuf = maxNextCharInd = 0;
-    nextCharInd = bufpos = -1;
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.Reader dstream,
-                                        int startline, int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.Reader dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-                        int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, int startline,
-                        int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, 1, 1, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                     int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, startline, startcolumn, 4096);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-                     int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, 1, 1, 4096);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-
-  /** @return token image as String */
-  public String GetImage()
-  {
-    if (bufpos >= tokenBegin)
-      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
-    else
-      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                              new String(buffer, 0, bufpos + 1);
-  }
-
-  /** @return suffix */
-  public char[] GetSuffix(int len)
-  {
-    char[] ret = new char[len];
-
-    if ((bufpos + 1) >= len)
-      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-    else
-    {
-      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                                                        len - bufpos - 1);
-      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-    }
-
-    return ret;
-  }
-
-  /** Set buffers back to null when finished. */
-  public void Done()
-  {
-    nextCharBuf = null;
-    buffer = null;
-    bufline = null;
-    bufcolumn = null;
-  }
-
-  /**
-   * Method to adjust line and column numbers for the start of a token.
-   */
-  public void adjustBeginLineColumn(int newLine, int newCol)
-  {
-    int start = tokenBegin;
-    int len;
-
-    if (bufpos >= tokenBegin)
-    {
-      len = bufpos - tokenBegin + inBuf + 1;
-    }
-    else
-    {
-      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-    }
-
-    int i = 0, j = 0, k = 0;
-    int nextColDiff = 0, columnDiff = 0;
-
-    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
-    {
-      bufline[j] = newLine;
-      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-      bufcolumn[j] = newCol + columnDiff;
-      columnDiff = nextColDiff;
-      i++;
-    }
-
-    if (i < len)
-    {
-      bufline[j] = newLine++;
-      bufcolumn[j] = newCol + columnDiff;
-
-      while (i++ < len)
-      {
-        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-          bufline[j] = newLine++;
-        else
-          bufline[j] = newLine;
-      }
-    }
-
-    line = bufline[j];
-    column = bufcolumn[j];
-  }
-
-}
-/* JavaCC - OriginalChecksum=a998d62a33c8c380f8e4549b1a77ca0f (do not edit this line) */
+/* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 5.0 */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package org.apache.jena.sparql.lang.arq ;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (with java-like unicode escape processing).
+ */
+
+public
+class JavaCharStream
+{
+  /** Whether parser is static. */
+  public static final boolean staticFlag = false;
+
+  static final int hexval(char c) throws java.io.IOException {
+    switch(c)
+    {
+       case '0' :
+          return 0;
+       case '1' :
+          return 1;
+       case '2' :
+          return 2;
+       case '3' :
+          return 3;
+       case '4' :
+          return 4;
+       case '5' :
+          return 5;
+       case '6' :
+          return 6;
+       case '7' :
+          return 7;
+       case '8' :
+          return 8;
+       case '9' :
+          return 9;
+
+       case 'a' :
+       case 'A' :
+          return 10;
+       case 'b' :
+       case 'B' :
+          return 11;
+       case 'c' :
+       case 'C' :
+          return 12;
+       case 'd' :
+       case 'D' :
+          return 13;
+       case 'e' :
+       case 'E' :
+          return 14;
+       case 'f' :
+       case 'F' :
+          return 15;
+    }
+
+    throw new java.io.IOException(); // Should never come here
+  }
+
+/** Position in buffer. */
+  public int bufpos = -1;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected java.io.Reader inputStream;
+
+  protected char[] nextCharBuf;
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int nextCharInd = -1;
+  protected int inBuf = 0;
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+    char[] newbuffer = new char[bufsize + 2048];
+    int newbufline[] = new int[bufsize + 2048];
+    int newbufcolumn[] = new int[bufsize + 2048];
+
+    try
+    {
+      if (wrapAround)
+      {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+        bufcolumn = newbufcolumn;
+
+        bufpos += (bufsize - tokenBegin);
+    }
+    else
+    {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        bufcolumn = newbufcolumn;
+
+        bufpos -= tokenBegin;
+      }
+    }
+    catch (Throwable t)
+    {
+      throw new Error(t.getMessage());
+    }
+
+    available = (bufsize += 2048);
+    tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+    int i;
+    if (maxNextCharInd == 4096)
+      maxNextCharInd = nextCharInd = 0;
+
+    try {
+      if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
+                                          4096 - maxNextCharInd)) == -1)
+      {
+        inputStream.close();
+        throw new java.io.IOException();
+      }
+      else
+         maxNextCharInd += i;
+      return;
+    }
+    catch(java.io.IOException e) {
+      if (bufpos != 0)
+      {
+        --bufpos;
+        backup(0);
+      }
+      else
+      {
+        bufline[bufpos] = line;
+        bufcolumn[bufpos] = column;
+      }
+      throw e;
+    }
+  }
+
+  protected char ReadByte() throws java.io.IOException
+  {
+    if (++nextCharInd >= maxNextCharInd)
+      FillBuff();
+
+    return nextCharBuf[nextCharInd];
+  }
+
+/** @return starting character for token. */
+  public char BeginToken() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
+
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      tokenBegin = bufpos;
+      return buffer[bufpos];
+    }
+
+    tokenBegin = 0;
+    bufpos = -1;
+
+    return readChar();
+  }
+
+  protected void AdjustBuffSize()
+  {
+    if (available == bufsize)
+    {
+      if (tokenBegin > 2048)
+      {
+        bufpos = 0;
+        available = tokenBegin;
+      }
+      else
+        ExpandBuff(false);
+    }
+    else if (available > tokenBegin)
+      available = bufsize;
+    else if ((tokenBegin - available) < 2048)
+      ExpandBuff(true);
+    else
+      available = tokenBegin;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+    column++;
+
+    if (prevCharIsLF)
+    {
+      prevCharIsLF = false;
+      line += (column = 1);
+    }
+    else if (prevCharIsCR)
+    {
+      prevCharIsCR = false;
+      if (c == '\n')
+      {
+        prevCharIsLF = true;
+      }
+      else
+        line += (column = 1);
+    }
+
+    switch (c)
+    {
+      case '\r' :
+        prevCharIsCR = true;
+        break;
+      case '\n' :
+        prevCharIsLF = true;
+        break;
+      case '\t' :
+        column--;
+        column += (tabSize - (column % tabSize));
+        break;
+      default :
+        break;
+    }
+
+    bufline[bufpos] = line;
+    bufcolumn[bufpos] = column;
+  }
+
+/** Read a character. */
+  public char readChar() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
+
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      return buffer[bufpos];
+    }
+
+    char c;
+
+    if (++bufpos == available)
+      AdjustBuffSize();
+
+    if ((buffer[bufpos] = c = ReadByte()) == '\\')
+    {
+      UpdateLineColumn(c);
+
+      int backSlashCnt = 1;
+
+      for (;;) // Read all the backslashes
+      {
+        if (++bufpos == available)
+          AdjustBuffSize();
+
+        try
+        {
+          if ((buffer[bufpos] = c = ReadByte()) != '\\')
+          {
+            UpdateLineColumn(c);
+            // found a non-backslash char.
+            if ((c == 'u') && ((backSlashCnt & 1) == 1))
+            {
+              if (--bufpos < 0)
+                bufpos = bufsize - 1;
+
+              break;
+            }
+
+            backup(backSlashCnt);
+            return '\\';
+          }
+        }
+        catch(java.io.IOException e)
+        {
+	  // We are returning one backslash so we should only backup (count-1)
+          if (backSlashCnt > 1)
+            backup(backSlashCnt-1);
+
+          return '\\';
+        }
+
+        UpdateLineColumn(c);
+        backSlashCnt++;
+      }
+
+      // Here, we have seen an odd number of backslash's followed by a 'u'
+      try
+      {
+        while ((c = ReadByte()) == 'u')
+          ++column;
+
+        buffer[bufpos] = c = (char)(hexval(c) << 12 |
+                                    hexval(ReadByte()) << 8 |
+                                    hexval(ReadByte()) << 4 |
+                                    hexval(ReadByte()));
+
+        column += 4;
+      }
+      catch(java.io.IOException e)
+      {
+        throw new Error("Invalid escape character at line " + line +
+                                         " column " + column + ".");
+      }
+
+      if (backSlashCnt == 1)
+        return c;
+      else
+      {
+        backup(backSlashCnt - 1);
+        return '\\';
+      }
+    }
+    else
+    {
+      UpdateLineColumn(c);
+      return c;
+    }
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndColumn
+   */
+  public int getColumn() {
+    return bufcolumn[bufpos];
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndLine
+   */
+  public int getLine() {
+    return bufline[bufpos];
+  }
+
+/** Get end column. */
+  public int getEndColumn() {
+    return bufcolumn[bufpos];
+  }
+
+/** Get end line. */
+  public int getEndLine() {
+    return bufline[bufpos];
+  }
+
+/** @return column of token start */
+  public int getBeginColumn() {
+    return bufcolumn[tokenBegin];
+  }
+
+/** @return line number of token start */
+  public int getBeginLine() {
+    return bufline[tokenBegin];
+  }
+
+/** Retreat. */
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+      bufpos += bufsize;
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+    nextCharBuf = new char[4096];
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream,
+                                        int startline, int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+      nextCharBuf = new char[4096];
+    }
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    nextCharInd = bufpos = -1;
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream,
+                                        int startline, int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
+                        int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+    this(dstream, encoding, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, int startline,
+                        int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+    this(dstream, encoding, 1, 1, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                     int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(dstream, encoding, startline, startcolumn, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, int startline,
+                     int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(dstream, encoding, 1, 1, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+
+  /** @return token image as String */
+  public String GetImage()
+  {
+    if (bufpos >= tokenBegin)
+      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+    else
+      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  /** @return suffix */
+  public char[] GetSuffix(int len)
+  {
+    char[] ret = new char[len];
+
+    if ((bufpos + 1) >= len)
+      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+    else
+    {
+      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                        len - bufpos - 1);
+      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+    }
+
+    return ret;
+  }
+
+  /** Set buffers back to null when finished. */
+  public void Done()
+  {
+    nextCharBuf = null;
+    buffer = null;
+    bufline = null;
+    bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+    int start = tokenBegin;
+    int len;
+
+    if (bufpos >= tokenBegin)
+    {
+      len = bufpos - tokenBegin + inBuf + 1;
+    }
+    else
+    {
+      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+    }
+
+    int i = 0, j = 0, k = 0;
+    int nextColDiff = 0, columnDiff = 0;
+
+    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+    {
+      bufline[j] = newLine;
+      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+      bufcolumn[j] = newCol + columnDiff;
+      columnDiff = nextColDiff;
+      i++;
+    }
+
+    if (i < len)
+    {
+      bufline[j] = newLine++;
+      bufcolumn[j] = newCol + columnDiff;
+
+      while (i++ < len)
+      {
+        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+          bufline[j] = newLine++;
+        else
+          bufline[j] = newLine;
+      }
+    }
+
+    line = bufline[j];
+    column = bufcolumn[j];
+  }
+
+}
+/* JavaCC - OriginalChecksum=b0062bbcf1b890f58413a4e69d4dc950 (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java
index cef35d8..b41e002 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java
@@ -1,187 +1,187 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
-/* JavaCCOptions:KEEP_LINE_COL=null */
-package org.apache.jena.sparql.lang.arq ;
-
-/**
- * This exception is thrown when parse errors are encountered.
- * You can explicitly create objects of this exception type by
- * calling the method generateParseException in the generated
- * parser.
- *
- * You can modify this class to customize your error reporting
- * mechanisms so long as you retain the public fields.
- */
-public class ParseException extends Exception {
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * This constructor is used by the method "generateParseException"
-   * in the generated parser.  Calling this constructor generates
-   * a new object of this type with the fields "currentToken",
-   * "expectedTokenSequences", and "tokenImage" set.
-   */
-  public ParseException(Token currentTokenVal,
-                        int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
-                       )
-  {
-    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
-    currentToken = currentTokenVal;
-    expectedTokenSequences = expectedTokenSequencesVal;
-    tokenImage = tokenImageVal;
-  }
-
-  /**
-   * The following constructors are for use by you for whatever
-   * purpose you can think of.  Constructing the exception in this
-   * manner makes the exception behave in the normal way - i.e., as
-   * documented in the class "Throwable".  The fields "errorToken",
-   * "expectedTokenSequences", and "tokenImage" do not contain
-   * relevant information.  The JavaCC generated code does not use
-   * these constructors.
-   */
-
-  public ParseException() {
-    super();
-  }
-
-  /** Constructor with message. */
-  public ParseException(String message) {
-    super(message);
-  }
-
-
-  /**
-   * This is the last token that has been consumed successfully.  If
-   * this object has been created due to a parse error, the token
-   * followng this token will (therefore) be the first error token.
-   */
-  public Token currentToken;
-
-  /**
-   * Each entry in this array is an array of integers.  Each array
-   * of integers represents a sequence of tokens (by their ordinal
-   * values) that is expected at this point of the parse.
-   */
-  public int[][] expectedTokenSequences;
-
-  /**
-   * This is a reference to the "tokenImage" array of the generated
-   * parser within which the parse error occurred.  This array is
-   * defined in the generated ...Constants interface.
-   */
-  public String[] tokenImage;
-
-  /**
-   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-   * error message and returns it.  If this object has been created
-   * due to a parse error, and you do not catch it (it gets thrown
-   * from the parser) the correct error message
-   * gets displayed.
-   */
-  private static String initialise(Token currentToken,
-                           int[][] expectedTokenSequences,
-                           String[] tokenImage) {
-    String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
-    int maxSize = 0;
-    for (int i = 0; i < expectedTokenSequences.length; i++) {
-      if (maxSize < expectedTokenSequences[i].length) {
-        maxSize = expectedTokenSequences[i].length;
-      }
-      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
-      }
-      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected.append("...");
-      }
-      expected.append(eol).append("    ");
-    }
-    String retval = "Encountered \"";
-    Token tok = currentToken.next;
-    for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += " ";
-      if (tok.kind == 0) {
-        retval += tokenImage[0];
-        break;
-      }
-      retval += " " + tokenImage[tok.kind];
-      retval += " \"";
-      retval += add_escapes(tok.image);
-      retval += " \"";
-      tok = tok.next;
-    }
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    retval += "." + eol;
-    if (expectedTokenSequences.length == 1) {
-      retval += "Was expecting:" + eol + "    ";
-    } else {
-      retval += "Was expecting one of:" + eol + "    ";
-    }
-    retval += expected.toString();
-    return retval;
-  }
-
-  /**
-   * The end of line string for this machine.
-   */
-  protected String eol = System.getProperty("line.separator", "\n");
-
-  /**
-   * Used to convert raw characters to their escaped version
-   * when these raw version cannot be used as part of an ASCII
-   * string literal.
-   */
-  static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
-      }
-      return retval.toString();
-   }
-
-}
-/* JavaCC - OriginalChecksum=15a9c1dcf732eb71243f022768ba6725 (do not edit this line) */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
+/* JavaCCOptions:KEEP_LINE_COL=null */
+package org.apache.jena.sparql.lang.arq ;
+
+/**
+ * This exception is thrown when parse errors are encountered.
+ * You can explicitly create objects of this exception type by
+ * calling the method generateParseException in the generated
+ * parser.
+ *
+ * You can modify this class to customize your error reporting
+ * mechanisms so long as you retain the public fields.
+ */
+public class ParseException extends Exception {
+
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal
+                       )
+  {
+    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
+
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
+
+  public ParseException() {
+    super();
+  }
+
+  /** Constructor with message. */
+  public ParseException(String message) {
+    super(message);
+  }
+
+
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
+
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
+
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
+
+  /**
+   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser) the correct error message
+   * gets displayed.
+   */
+  private static String initialise(Token currentToken,
+                           int[][] expectedTokenSequences,
+                           String[] tokenImage) {
+    String eol = System.getProperty("line.separator", "\n");
+    StringBuffer expected = new StringBuffer();
+    int maxSize = 0;
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+      }
+      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+        expected.append("...");
+      }
+      expected.append(eol).append("    ");
+    }
+    String retval = "Encountered \"";
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      if (i != 0) retval += " ";
+      if (tok.kind == 0) {
+        retval += tokenImage[0];
+        break;
+      }
+      retval += " " + tokenImage[tok.kind];
+      retval += " \"";
+      retval += add_escapes(tok.image);
+      retval += " \"";
+      tok = tok.next;
+    }
+    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
+    } else {
+      retval += "Was expecting one of:" + eol + "    ";
+    }
+    retval += expected.toString();
+    return retval;
+  }
+
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
+
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  static String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+}
+/* JavaCC - OriginalChecksum=48a48010f2f271416e60bbfb8cf25e4b (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java
index cd93539..b4dd76f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java
@@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=335d1922781852977208d5cdca0fc164 (do not edit this line) */
+/* JavaCC - OriginalChecksum=d9b4c8c9332fa3054a004615fdb22b89 (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java
index 1a90eae..11bdbb0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java
@@ -144,4 +144,4 @@ public class TokenMgrError extends Error
     this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=40dd5a50628172020d125efba41c4b63 (do not edit this line) */
+/* JavaCC - OriginalChecksum=8f945f6081b6c05a3722e27c60c90cda (do not edit this line) */


[48/50] [abbrv] jena git commit: Merge branch 'master' into JENA-507

Posted by rv...@apache.org.
Merge branch 'master' into JENA-507


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

Branch: refs/heads/JENA-507
Commit: f7a660e832fdc9072d8c2bd6391a9c919f6f044f
Parents: 153a05e 5bf54c3
Author: Rob Vesse <rv...@apache.org>
Authored: Mon Sep 7 12:47:09 2015 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Mon Sep 7 12:47:09 2015 +0100

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 LICENSE                                         |    6 +-
 apache-jena-libs/pom.xml                        |    6 +-
 apache-jena-osgi/jena-osgi-test/pom.xml         |   50 +-
 .../org/apache/jena/osgi/test/JenaOSGITest.java |   36 +-
 apache-jena-osgi/jena-osgi/pom.xml              |   27 +-
 apache-jena-osgi/pom.xml                        |    7 +-
 apache-jena/LICENSE                             |    6 +-
 apache-jena/README                              |    9 +-
 apache-jena/assembly-jena-zip.xml               |   32 -
 apache-jena/bin/arq                             |   75 +-
 apache-jena/bin/infer                           |   75 +-
 apache-jena/bin/iri                             |   75 +-
 apache-jena/bin/juuid                           |   75 +-
 apache-jena/bin/nquads                          |   75 +-
 apache-jena/bin/ntriples                        |   75 +-
 apache-jena/bin/qparse                          |   75 +-
 apache-jena/bin/rdfcat                          |   75 +-
 apache-jena/bin/rdfcompare                      |   75 +-
 apache-jena/bin/rdfcopy                         |   75 +-
 apache-jena/bin/rdfparse                        |   75 +-
 apache-jena/bin/rdfxml                          |   75 +-
 apache-jena/bin/riot                            |   75 +-
 apache-jena/bin/rset                            |   75 +-
 apache-jena/bin/rsparql                         |   75 +-
 apache-jena/bin/rupdate                         |   75 +-
 apache-jena/bin/schemagen                       |   75 +-
 apache-jena/bin/sparql                          |   75 +-
 apache-jena/bin/tdbbackup                       |   75 +-
 apache-jena/bin/tdbdump                         |   75 +-
 apache-jena/bin/tdbloader                       |   75 +-
 apache-jena/bin/tdbloader2                      |  333 +-
 apache-jena/bin/tdbloader2common                |  214 +
 apache-jena/bin/tdbloader2data                  |  289 +
 apache-jena/bin/tdbloader2index                 |  439 ++
 apache-jena/bin/tdbloader2worker                |  154 -
 apache-jena/bin/tdbquery                        |   75 +-
 apache-jena/bin/tdbstats                        |   75 +-
 apache-jena/bin/tdbupdate                       |   75 +-
 apache-jena/bin/trig                            |   75 +-
 apache-jena/bin/turtle                          |   75 +-
 apache-jena/bin/uparse                          |   75 +-
 apache-jena/bin/update                          |   75 +-
 apache-jena/bin/utf8                            |   75 +-
 apache-jena/bin/wwwdec                          |   75 +-
 apache-jena/bin/wwwenc                          |   75 +-
 apache-jena/cmd-maker                           |   12 +-
 apache-jena/jena-log4j.properties               |   37 +-
 apache-jena/pom.xml                             |  110 +-
 apache-jena/template.bin                        |   75 +-
 jena-arq/Grammar/BinaryRDF.thrift               |    2 +-
 jena-arq/Grammar/JSON/json                      |   11 +-
 jena-arq/Grammar/JSON/json.jj                   |    2 +-
 jena-arq/Grammar/Notes                          |    8 +-
 jena-arq/Grammar/arq.jj                         |   81 +-
 jena-arq/Grammar/grammar                        |    2 +-
 jena-arq/Grammar/master.jj                      |  137 +-
 jena-arq/Grammar/sparql_11.jj                   |   32 +-
 jena-arq/Grammar/sse/.gitignore                 |    1 +
 jena-arq/Grammar/sse/grammar-sse                |    9 +-
 jena-arq/Grammar/sse/sse.jj                     |    5 +-
 jena-arq/ReleaseNotes.txt                       |  649 --
 jena-arq/bat/arq.bat                            |   13 -
 jena-arq/bat/check_root.bat                     |    7 -
 jena-arq/bat/make_classpath.bat                 |   55 -
 jena-arq/bat/qexpr.bat                          |   13 -
 jena-arq/bat/qparse.bat                         |   13 -
 jena-arq/bat/qtest.bat                          |   13 -
 jena-arq/bat/query.bat                          |   13 -
 jena-arq/bat/rset.bat                           |   13 -
 jena-arq/bat/sparql.bat                         |   13 -
 jena-arq/bin/arq                                |   12 -
 jena-arq/bin/arq_init                           |   36 -
 jena-arq/bin/arq_path                           |   16 -
 jena-arq/bin/arq_version                        |   12 -
 jena-arq/bin/infer                              |   20 -
 jena-arq/bin/iri                                |   20 -
 jena-arq/bin/json                               |   20 -
 jena-arq/bin/junit                              |   30 -
 jena-arq/bin/juuid                              |   14 -
 jena-arq/bin/langtag                            |   19 -
 jena-arq/bin/load                               |   12 -
 jena-arq/bin/make_classpath                     |   98 -
 jena-arq/bin/make_classpath_mvn                 |   68 -
 jena-arq/bin/nquads                             |   20 -
 jena-arq/bin/ntriples                           |   20 -
 jena-arq/bin/opexec                             |   12 -
 jena-arq/bin/opquery                            |   12 -
 jena-arq/bin/perftokens                         |   20 -
 jena-arq/bin/printtokens                        |   20 -
 jena-arq/bin/qexpr                              |   11 -
 jena-arq/bin/qparse                             |   11 -
 jena-arq/bin/qtest                              |   14 -
 jena-arq/bin/query                              |   12 -
 jena-arq/bin/rdflangtest                        |   19 -
 jena-arq/bin/rdfload                            |   12 -
 jena-arq/bin/rdfxml                             |   19 -
 jena-arq/bin/riot                               |   20 -
 jena-arq/bin/rset                               |    5 -
 jena-arq/bin/rsparql                            |   14 -
 jena-arq/bin/rupdate                            |   14 -
 jena-arq/bin/sparql                             |   19 -
 jena-arq/bin/sse                                |   12 -
 jena-arq/bin/ssequery                           |   12 -
 jena-arq/bin/trig                               |   20 -
 jena-arq/bin/turtle                             |   19 -
 jena-arq/bin/uparse                             |   12 -
 jena-arq/bin/update                             |   12 -
 jena-arq/bin/utf8                               |   20 -
 jena-arq/bin/wwwdec                             |   20 -
 jena-arq/bin/wwwenc                             |   20 -
 jena-arq/bin2/arq                               |   11 -
 jena-arq/bin2/infer                             |    6 -
 jena-arq/bin2/iri                               |    6 -
 jena-arq/bin2/json                              |    6 -
 jena-arq/bin2/juuid                             |    6 -
 jena-arq/bin2/nquads                            |   11 -
 jena-arq/bin2/ntriples                          |   11 -
 jena-arq/bin2/perftokens                        |    6 -
 jena-arq/bin2/printtokens                       |    6 -
 jena-arq/bin2/qexpr                             |   11 -
 jena-arq/bin2/qparse                            |   11 -
 jena-arq/bin2/qtest                             |   11 -
 jena-arq/bin2/query                             |   11 -
 jena-arq/bin2/rdfxml                            |   11 -
 jena-arq/bin2/riot                              |   11 -
 jena-arq/bin2/rset                              |   11 -
 jena-arq/bin2/rupdate                           |   11 -
 jena-arq/bin2/sparql                            |   11 -
 jena-arq/bin2/sse                               |   11 -
 jena-arq/bin2/ssequery                          |   11 -
 jena-arq/bin2/trig                              |   11 -
 jena-arq/bin2/turtle                            |   11 -
 jena-arq/bin2/uparse                            |   11 -
 jena-arq/bin2/update                            |   11 -
 jena-arq/bin2/utf8                              |    6 -
 jena-arq/bin2/wwwdec                            |   11 -
 jena-arq/bin2/wwwenc                            |   11 -
 jena-arq/binTemplates/arq_cmd                   |   21 -
 jena-arq/binTemplates/cmd_template              |    9 -
 jena-arq/binTemplates/riot_cmd                  |   21 -
 jena-arq/log4j.properties                       |    6 +-
 jena-arq/pom.xml                                |   26 +-
 .../src-examples/arq/examples/AlgebraEx.java    |   12 +-
 .../src-examples/arq/examples/AlgebraExec.java  |   41 +-
 jena-arq/src-examples/arq/examples/ExProg1.java |   22 +-
 jena-arq/src-examples/arq/examples/ExProg2.java |   30 +-
 .../arq/examples/ExQuerySelect1.java            |   16 +-
 .../arq/examples/ExQuerySelect2.java            |   17 +-
 .../arq/examples/ExampleDBpedia1.java           |    9 +-
 .../arq/examples/ExampleDBpedia2.java           |    9 +-
 .../arq/examples/ExampleDBpedia3.java           |   10 +-
 .../examples/aggregates/CustomAggregate.java    |   31 +-
 .../arq/examples/bgpmatching/OpExecutorAlt.java |   16 +-
 .../arq/examples/bgpmatching/StageAltMain.java  |   19 +-
 .../examples/bgpmatching/StageGeneratorAlt.java |   14 +-
 .../constructquads/ExampleConstructQuads.java   |  186 +
 .../arq/examples/engine/MyQueryEngine.java      |   30 +-
 .../arq/examples/filter/classify.java           |    4 +-
 .../examples/propertyfunction/labelSearch.java  |   70 +-
 .../examples/propertyfunction/localname.java    |   32 +-
 .../examples/propertyfunction/uppercase.java    |    6 +-
 .../arq/examples/riot/ExRIOT_1.java             |    8 +-
 .../arq/examples/riot/ExRIOT_2.java             |   10 +-
 .../arq/examples/riot/ExRIOT_3.java             |    5 +-
 .../arq/examples/riot/ExRIOT_4.java             |    9 +-
 .../arq/examples/riot/ExRIOT_5.java             |   17 +-
 .../arq/examples/riot/ExRIOT_6.java             |    3 +-
 .../arq/examples/riot/ExRIOT_7.java             |    3 +-
 .../arq/examples/riot/ExRIOT_out1.java          |    3 +-
 .../arq/examples/riot/ExRIOT_out2.java          |    5 +-
 .../arq/examples/riot/ExRIOT_out3.java          |    9 +-
 .../update/UpdateExecuteOperations.java         |   20 +-
 .../arq/examples/update/UpdateProgrammatic.java |   17 +-
 .../arq/examples/update/UpdateReadFromFile.java |    9 +-
 jena-arq/src/main/java/arq/arq.java             |    2 +-
 jena-arq/src/main/java/arq/bindings.java        |    4 +-
 .../src/main/java/arq/cmd/CmdException.java     |   29 -
 jena-arq/src/main/java/arq/cmd/CmdUtils.java    |   34 -
 .../main/java/arq/cmd/TerminationException.java |   30 -
 jena-arq/src/main/java/arq/cmdline/Arg.java     |   69 -
 jena-arq/src/main/java/arq/cmdline/ArgDecl.java |   97 -
 .../src/main/java/arq/cmdline/ArgModule.java    |   26 -
 .../main/java/arq/cmdline/ArgModuleGeneral.java |   26 -
 jena-arq/src/main/java/arq/cmdline/ArgProc.java |   27 -
 .../src/main/java/arq/cmdline/CallbackHelp.java |   24 -
 .../main/java/arq/cmdline/CallbackVersion.java  |   24 -
 jena-arq/src/main/java/arq/cmdline/CmdARQ.java  |   26 +-
 .../src/main/java/arq/cmdline/CmdARQ_SSE.java   |    2 +-
 .../src/main/java/arq/cmdline/CmdArgModule.java |   68 -
 .../src/main/java/arq/cmdline/CmdGeneral.java   |   91 -
 .../src/main/java/arq/cmdline/CmdLineArgs.java  |  415 -
 .../src/main/java/arq/cmdline/CmdLineTest.java  |   39 -
 jena-arq/src/main/java/arq/cmdline/CmdMain.java |  117 -
 .../src/main/java/arq/cmdline/CmdUpdate.java    |   37 +-
 .../main/java/arq/cmdline/CommandLineBase.java  |  137 -
 .../src/main/java/arq/cmdline/ModAlgebra.java   |   13 +-
 .../src/main/java/arq/cmdline/ModAssembler.java |   16 +-
 jena-arq/src/main/java/arq/cmdline/ModBase.java |   23 -
 .../src/main/java/arq/cmdline/ModDataset.java   |   15 +-
 .../java/arq/cmdline/ModDatasetAssembler.java   |   18 +-
 .../java/arq/cmdline/ModDatasetGeneral.java     |   21 +-
 .../arq/cmdline/ModDatasetGeneralAssembler.java |    5 +-
 .../src/main/java/arq/cmdline/ModEngine.java    |  101 +-
 .../src/main/java/arq/cmdline/ModFormat.java    |   15 +-
 .../src/main/java/arq/cmdline/ModGeneral.java   |   60 -
 .../main/java/arq/cmdline/ModGraphStore.java    |   94 -
 jena-arq/src/main/java/arq/cmdline/ModItem.java |   15 +-
 .../main/java/arq/cmdline/ModLangOutput.java    |   42 +-
 .../src/main/java/arq/cmdline/ModLangParse.java |   16 +-
 .../src/main/java/arq/cmdline/ModQueryIn.java   |   26 +-
 .../src/main/java/arq/cmdline/ModQueryOut.java  |   14 +-
 .../src/main/java/arq/cmdline/ModRemote.java    |    9 +-
 .../src/main/java/arq/cmdline/ModResultsIn.java |   18 +-
 .../main/java/arq/cmdline/ModResultsOut.java    |   15 +-
 .../src/main/java/arq/cmdline/ModSymbol.java    |   21 +-
 jena-arq/src/main/java/arq/cmdline/ModTime.java |   12 +-
 .../src/main/java/arq/cmdline/ModVersion.java   |   68 -
 jena-arq/src/main/java/arq/cmdline/Usage.java   |  105 -
 jena-arq/src/main/java/arq/juuid.java           |   14 +-
 jena-arq/src/main/java/arq/load.java            |   34 +-
 jena-arq/src/main/java/arq/qexpr.java           |   42 +-
 jena-arq/src/main/java/arq/qparse.java          |   32 +-
 jena-arq/src/main/java/arq/query.java           |   38 +-
 jena-arq/src/main/java/arq/rset.java            |    3 +-
 jena-arq/src/main/java/arq/rsparql.java         |   19 +-
 jena-arq/src/main/java/arq/rupdate.java         |   15 +-
 jena-arq/src/main/java/arq/sparql.java          |    2 +-
 jena-arq/src/main/java/arq/sse.java             |   21 +-
 jena-arq/src/main/java/arq/sse_exec.java        |    9 +-
 jena-arq/src/main/java/arq/sse_query.java       |   31 +-
 jena-arq/src/main/java/arq/uparse.java          |   73 +-
 jena-arq/src/main/java/arq/update.java          |  104 +-
 jena-arq/src/main/java/arq/version.java         |    2 +-
 .../main/java/com/hp/hpl/jena/query/ARQ.java    |  583 --
 .../java/com/hp/hpl/jena/query/BIOInput.java    |   59 -
 .../java/com/hp/hpl/jena/query/Dataset.java     |   94 -
 .../com/hp/hpl/jena/query/DatasetAccessor.java  |   66 -
 .../hpl/jena/query/DatasetAccessorFactory.java  |   91 -
 .../com/hp/hpl/jena/query/DatasetFactory.java   |  268 -
 .../hp/hpl/jena/query/LabelExistsException.java |   32 -
 .../jena/query/ParameterizedSparqlString.java   | 1712 -----
 .../main/java/com/hp/hpl/jena/query/Query.java  |  892 ---
 .../hp/hpl/jena/query/QueryBuildException.java  |   31 -
 .../hpl/jena/query/QueryCancelledException.java |   25 -
 .../com/hp/hpl/jena/query/QueryException.java   |   33 -
 .../hp/hpl/jena/query/QueryExecException.java   |   31 -
 .../com/hp/hpl/jena/query/QueryExecution.java   |  204 -
 .../hpl/jena/query/QueryExecutionFactory.java   |  578 --
 .../com/hp/hpl/jena/query/QueryFactory.java     |  233 -
 .../hp/hpl/jena/query/QueryFatalException.java  |   32 -
 .../hp/hpl/jena/query/QueryParseException.java  |   60 -
 .../com/hp/hpl/jena/query/QuerySolution.java    |   64 -
 .../com/hp/hpl/jena/query/QuerySolutionMap.java |   86 -
 .../com/hp/hpl/jena/query/QueryVisitor.java     |   47 -
 .../java/com/hp/hpl/jena/query/ReadWrite.java   |   25 -
 .../java/com/hp/hpl/jena/query/ResultSet.java   |   66 -
 .../com/hp/hpl/jena/query/ResultSetFactory.java |  466 --
 .../hp/hpl/jena/query/ResultSetFormatter.java   |  786 --
 .../hp/hpl/jena/query/ResultSetRewindable.java  |   28 -
 .../com/hp/hpl/jena/query/SortCondition.java    |  156 -
 .../main/java/com/hp/hpl/jena/query/Syntax.java |  170 -
 .../java/com/hp/hpl/jena/query/package.html     |   11 -
 .../com/hp/hpl/jena/sparql/ARQConstants.java    |  267 -
 .../com/hp/hpl/jena/sparql/ARQException.java    |   31 -
 .../jena/sparql/ARQInternalErrorException.java  |   33 -
 .../hp/hpl/jena/sparql/ARQNotImplemented.java   |   39 -
 .../com/hp/hpl/jena/sparql/AlreadyExists.java   |   29 -
 .../com/hp/hpl/jena/sparql/DoesNotExist.java    |   29 -
 .../jena/sparql/JenaTransactionException.java   |   29 -
 .../java/com/hp/hpl/jena/sparql/SystemARQ.java  |  160 -
 .../com/hp/hpl/jena/sparql/algebra/Algebra.java |  219 -
 .../jena/sparql/algebra/AlgebraGenerator.java   |  676 --
 .../hp/hpl/jena/sparql/algebra/AlgebraQuad.java |  115 -
 .../jena/sparql/algebra/BeforeAfterVisitor.java |   82 -
 .../hp/hpl/jena/sparql/algebra/JoinType.java    |   21 -
 .../java/com/hp/hpl/jena/sparql/algebra/Op.java |   31 -
 .../hp/hpl/jena/sparql/algebra/OpAsQuery.java   |  727 --
 .../hpl/jena/sparql/algebra/OpExtBuilder.java   |   30 -
 .../hpl/jena/sparql/algebra/OpExtRegistry.java  |   89 -
 .../com/hp/hpl/jena/sparql/algebra/OpLib.java   |   53 -
 .../hpl/jena/sparql/algebra/OpPrefixesUsed.java |  112 -
 .../com/hp/hpl/jena/sparql/algebra/OpVars.java  |  428 --
 .../hp/hpl/jena/sparql/algebra/OpVisitor.java   |   71 -
 .../hpl/jena/sparql/algebra/OpVisitorBase.java  |   94 -
 .../jena/sparql/algebra/OpVisitorByType.java    |  181 -
 .../sparql/algebra/OpVisitorByTypeBase.java     |   50 -
 .../hp/hpl/jena/sparql/algebra/OpWalker.java    |  131 -
 .../algebra/PropertyFunctionGenerator.java      |  241 -
 .../com/hp/hpl/jena/sparql/algebra/Table.java   |   42 -
 .../hpl/jena/sparql/algebra/TableFactory.java   |   58 -
 .../hp/hpl/jena/sparql/algebra/Transform.java   |   72 -
 .../hpl/jena/sparql/algebra/TransformBase.java  |  103 -
 .../hpl/jena/sparql/algebra/TransformCopy.java  |  164 -
 .../jena/sparql/algebra/TransformQuadGraph.java |  124 -
 .../sparql/algebra/TransformUnionQuery.java     |  119 -
 .../jena/sparql/algebra/TransformWrapper.java   |  111 -
 .../hp/hpl/jena/sparql/algebra/Transformer.java |  498 --
 .../com/hp/hpl/jena/sparql/algebra/op/Op0.java  |   30 -
 .../com/hp/hpl/jena/sparql/algebra/op/Op1.java  |   40 -
 .../com/hp/hpl/jena/sparql/algebra/op/Op2.java  |   55 -
 .../hp/hpl/jena/sparql/algebra/op/OpAssign.java |  126 -
 .../hp/hpl/jena/sparql/algebra/op/OpBGP.java    |   70 -
 .../hp/hpl/jena/sparql/algebra/op/OpBase.java   |   80 -
 .../jena/sparql/algebra/op/OpConditional.java   |   65 -
 .../jena/sparql/algebra/op/OpDatasetNames.java  |   60 -
 .../hp/hpl/jena/sparql/algebra/op/OpDiff.java   |   55 -
 .../jena/sparql/algebra/op/OpDisjunction.java   |   97 -
 .../hpl/jena/sparql/algebra/op/OpDistinct.java  |   61 -
 .../sparql/algebra/op/OpDistinctReduced.java    |   28 -
 .../hp/hpl/jena/sparql/algebra/op/OpExt.java    |   98 -
 .../hp/hpl/jena/sparql/algebra/op/OpExtend.java |  130 -
 .../jena/sparql/algebra/op/OpExtendAssign.java  |   55 -
 .../hp/hpl/jena/sparql/algebra/op/OpFilter.java |  124 -
 .../hp/hpl/jena/sparql/algebra/op/OpGraph.java  |   63 -
 .../hp/hpl/jena/sparql/algebra/op/OpGroup.java  |   83 -
 .../hp/hpl/jena/sparql/algebra/op/OpJoin.java   |   91 -
 .../hp/hpl/jena/sparql/algebra/op/OpLabel.java  |   90 -
 .../hpl/jena/sparql/algebra/op/OpLeftJoin.java  |   75 -
 .../hp/hpl/jena/sparql/algebra/op/OpList.java   |   60 -
 .../hp/hpl/jena/sparql/algebra/op/OpMinus.java  |   55 -
 .../hpl/jena/sparql/algebra/op/OpModifier.java  |   38 -
 .../com/hp/hpl/jena/sparql/algebra/op/OpN.java  |   76 -
 .../hp/hpl/jena/sparql/algebra/op/OpNull.java   |   58 -
 .../hp/hpl/jena/sparql/algebra/op/OpOrder.java  |   72 -
 .../hp/hpl/jena/sparql/algebra/op/OpPath.java   |   75 -
 .../hpl/jena/sparql/algebra/op/OpProcedure.java |  111 -
 .../hpl/jena/sparql/algebra/op/OpProject.java   |   71 -
 .../hpl/jena/sparql/algebra/op/OpPropFunc.java  |   96 -
 .../hp/hpl/jena/sparql/algebra/op/OpQuad.java   |  100 -
 .../hpl/jena/sparql/algebra/op/OpQuadBlock.java |  141 -
 .../jena/sparql/algebra/op/OpQuadPattern.java   |  113 -
 .../hpl/jena/sparql/algebra/op/OpReduced.java   |   61 -
 .../hpl/jena/sparql/algebra/op/OpSequence.java  |   94 -
 .../hpl/jena/sparql/algebra/op/OpService.java   |   78 -
 .../hp/hpl/jena/sparql/algebra/op/OpSlice.java  |   73 -
 .../hp/hpl/jena/sparql/algebra/op/OpTable.java  |   81 -
 .../hp/hpl/jena/sparql/algebra/op/OpTopN.java   |   74 -
 .../hp/hpl/jena/sparql/algebra/op/OpTriple.java |  103 -
 .../hp/hpl/jena/sparql/algebra/op/OpUnion.java  |   60 -
 .../optimize/ExprTransformApplyTransform.java   |   65 -
 .../optimize/ExprTransformConstantFold.java     |  110 -
 .../optimize/ExprVisitorApplyVisitor.java       |   41 -
 .../algebra/optimize/OpVisitorExprPrepare.java  |   48 -
 .../jena/sparql/algebra/optimize/Optimize.java  |  305 -
 .../jena/sparql/algebra/optimize/Rewrite.java   |   26 -
 .../optimize/TransformDistinctToReduced.java    |  168 -
 .../algebra/optimize/TransformExpandOneOf.java  |  133 -
 .../optimize/TransformExtendCombine.java        |   84 -
 .../optimize/TransformFilterConjunction.java    |   53 -
 .../optimize/TransformFilterDisjunction.java    |  188 -
 .../optimize/TransformFilterEquality.java       |  412 -
 .../optimize/TransformFilterImplicitJoin.java   |  489 --
 .../optimize/TransformFilterInequality.java     |  421 --
 .../optimize/TransformFilterPlacement.java      |  787 --
 .../TransformFilterPlacementConservative.java   |  283 -
 .../optimize/TransformImplicitLeftJoin.java     |  427 --
 .../algebra/optimize/TransformJoinStrategy.java |   86 -
 .../algebra/optimize/TransformMergeBGPs.java    |  119 -
 .../TransformOrderByDistinctApplication.java    |  173 -
 .../algebra/optimize/TransformPathFlattern.java |   61 -
 .../optimize/TransformPathFlatternStd.java      |  224 -
 .../algebra/optimize/TransformPattern2Join.java |   91 -
 .../optimize/TransformPromoteTableEmpty.java    |  173 -
 .../optimize/TransformPropertyFunction.java     |  105 -
 .../algebra/optimize/TransformRemoveLabels.java |   33 -
 .../algebra/optimize/TransformReorder.java      |   82 -
 .../algebra/optimize/TransformScopeRename.java  |  119 -
 .../algebra/optimize/TransformSimplify.java     |   65 -
 .../sparql/algebra/optimize/TransformTopN.java  |  223 -
 .../hpl/jena/sparql/algebra/table/Table1.java   |   91 -
 .../jena/sparql/algebra/table/TableBase.java    |  125 -
 .../jena/sparql/algebra/table/TableData.java    |   40 -
 .../jena/sparql/algebra/table/TableEmpty.java   |   67 -
 .../hpl/jena/sparql/algebra/table/TableN.java   |  104 -
 .../jena/sparql/algebra/table/TableUnit.java    |   72 -
 .../jena/sparql/algebra/table/TableWriter.java  |   75 -
 .../hp/hpl/jena/sparql/core/BasicPattern.java   |  122 -
 .../jena/sparql/core/ComparisonException.java   |   25 -
 .../hp/hpl/jena/sparql/core/DatasetChanges.java |   38 -
 .../jena/sparql/core/DatasetChangesBatched.java |  108 -
 .../jena/sparql/core/DatasetChangesCapture.java |   95 -
 .../jena/sparql/core/DatasetChangesCounter.java |   71 -
 .../jena/sparql/core/DatasetDescription.java    |  109 -
 .../hp/hpl/jena/sparql/core/DatasetGraph.java   |  136 -
 .../core/DatasetGraphAltDefaultGraph.java       |   65 -
 .../hpl/jena/sparql/core/DatasetGraphBase.java  |  206 -
 .../jena/sparql/core/DatasetGraphBaseFind.java  |   82 -
 .../jena/sparql/core/DatasetGraphCaching.java   |  174 -
 .../sparql/core/DatasetGraphCollection.java     |  109 -
 .../jena/sparql/core/DatasetGraphFactory.java   |   97 -
 .../hpl/jena/sparql/core/DatasetGraphMaker.java |   49 -
 .../hpl/jena/sparql/core/DatasetGraphMap.java   |  125 -
 .../jena/sparql/core/DatasetGraphMonitor.java   |  203 -
 .../hpl/jena/sparql/core/DatasetGraphOne.java   |  167 -
 .../hpl/jena/sparql/core/DatasetGraphQuad.java  |   64 -
 .../jena/sparql/core/DatasetGraphReadOnly.java  |   89 -
 .../jena/sparql/core/DatasetGraphSimpleMem.java |  242 -
 .../sparql/core/DatasetGraphTrackActive.java    |  179 -
 .../sparql/core/DatasetGraphTriplesQuads.java   |   65 -
 .../sparql/core/DatasetGraphViewGraphs.java     |   48 -
 .../jena/sparql/core/DatasetGraphWithLock.java  |  174 -
 .../jena/sparql/core/DatasetGraphWrapper.java   |  159 -
 .../hp/hpl/jena/sparql/core/DatasetImpl.java    |  283 -
 .../jena/sparql/core/DatasetPrefixStorage.java  |   58 -
 .../hpl/jena/sparql/core/DynamicDatasets.java   |  133 -
 .../com/hp/hpl/jena/sparql/core/GraphView.java  |  162 -
 .../com/hp/hpl/jena/sparql/core/PathBlock.java  |   83 -
 .../com/hp/hpl/jena/sparql/core/Prologue.java   |  228 -
 .../java/com/hp/hpl/jena/sparql/core/Quad.java  |  219 -
 .../com/hp/hpl/jena/sparql/core/QuadAction.java |   40 -
 .../hp/hpl/jena/sparql/core/QuadPattern.java    |  104 -
 .../jena/sparql/core/QueryCheckException.java   |   29 -
 .../hp/hpl/jena/sparql/core/QueryCompare.java   |  190 -
 .../hp/hpl/jena/sparql/core/QueryHashCode.java  |  145 -
 .../hpl/jena/sparql/core/QuerySolutionBase.java |   50 -
 .../hp/hpl/jena/sparql/core/ResultBinding.java  |   98 -
 .../com/hp/hpl/jena/sparql/core/Substitute.java |  294 -
 .../hp/hpl/jena/sparql/core/Transactional.java  |   46 -
 .../hpl/jena/sparql/core/TransactionalNull.java |   58 -
 .../com/hp/hpl/jena/sparql/core/TriplePath.java |  139 -
 .../java/com/hp/hpl/jena/sparql/core/Var.java   |  196 -
 .../com/hp/hpl/jena/sparql/core/VarAlloc.java   |   58 -
 .../hp/hpl/jena/sparql/core/VarExprList.java    |  153 -
 .../java/com/hp/hpl/jena/sparql/core/Vars.java  |   51 -
 .../sparql/core/assembler/AssemblerUtils.java   |  130 -
 .../sparql/core/assembler/DatasetAssembler.java |  105 -
 .../assembler/DatasetAssemblerException.java    |   31 -
 .../core/assembler/DatasetAssemblerVocab.java   |   48 -
 .../assembler/DatasetDescriptionAssembler.java  |   54 -
 .../core/assembler/DatasetNullAssembler.java    |   62 -
 .../core/assembler/GraphStoreAssembler.java     |   47 -
 .../core/describe/DescribeBNodeClosure.java     |  100 -
 .../describe/DescribeBNodeClosureFactory.java   |   28 -
 .../sparql/core/describe/DescribeHandler.java   |   51 -
 .../core/describe/DescribeHandlerFactory.java   |   27 -
 .../core/describe/DescribeHandlerRegistry.java  |  101 -
 .../jena/sparql/engine/ExecutionContext.java    |  131 -
 .../com/hp/hpl/jena/sparql/engine/OpEval.java   |   31 -
 .../com/hp/hpl/jena/sparql/engine/Plan.java     |   38 -
 .../com/hp/hpl/jena/sparql/engine/PlanBase.java |   81 -
 .../com/hp/hpl/jena/sparql/engine/PlanOp.java   |   75 -
 .../hpl/jena/sparql/engine/QueryEngineBase.java |  162 -
 .../jena/sparql/engine/QueryEngineFactory.java  |   36 -
 .../engine/QueryEngineFactoryWrapper.java       |   69 -
 .../jena/sparql/engine/QueryEngineRegistry.java |  151 -
 .../jena/sparql/engine/QueryExecutionBase.java  |  616 --
 .../hpl/jena/sparql/engine/QueryIterator.java   |   39 -
 .../com/hp/hpl/jena/sparql/engine/Rename.java   |  189 -
 .../sparql/engine/ResultSetCheckCondition.java  |  111 -
 .../hpl/jena/sparql/engine/ResultSetStream.java |  147 -
 .../hp/hpl/jena/sparql/engine/TableJoin.java    |  104 -
 .../hpl/jena/sparql/engine/binding/Binding.java |   45 -
 .../jena/sparql/engine/binding/Binding0.java    |   52 -
 .../jena/sparql/engine/binding/Binding1.java    |   71 -
 .../jena/sparql/engine/binding/BindingBase.java |  231 -
 .../engine/binding/BindingComparator.java       |  178 -
 .../sparql/engine/binding/BindingFactory.java   |   64 -
 .../sparql/engine/binding/BindingFixed.java     |   80 -
 .../sparql/engine/binding/BindingHashMap.java   |  119 -
 .../engine/binding/BindingInputStream.java      |  239 -
 .../jena/sparql/engine/binding/BindingMap.java  |   38 -
 .../engine/binding/BindingOutputStream.java     |  194 -
 .../sparql/engine/binding/BindingProject.java   |   38 -
 .../engine/binding/BindingProjectBase.java      |   87 -
 .../engine/binding/BindingProjectNamed.java     |   36 -
 .../jena/sparql/engine/binding/BindingRoot.java |   35 -
 .../sparql/engine/binding/BindingUtils.java     |   98 -
 .../sparql/engine/binding/BindingWrapped.java   |   75 -
 .../sparql/engine/http/HttpContentType.java     |  112 -
 .../hpl/jena/sparql/engine/http/HttpParams.java |   52 -
 .../hpl/jena/sparql/engine/http/HttpQuery.java  |  468 --
 .../hp/hpl/jena/sparql/engine/http/Params.java  |  163 -
 .../sparql/engine/http/QueryEngineHTTP.java     |  810 --
 .../sparql/engine/http/QueryExceptionHTTP.java  |  116 -
 .../hp/hpl/jena/sparql/engine/http/Service.java |  287 -
 .../sparql/engine/index/HashIndexTable.java     |  219 -
 .../jena/sparql/engine/index/IndexFactory.java  |   46 -
 .../jena/sparql/engine/index/IndexTable.java    |   35 -
 .../jena/sparql/engine/index/LinearIndex.java   |  113 -
 .../jena/sparql/engine/index/SetIndexTable.java |   70 -
 .../jena/sparql/engine/iterator/QueryIter.java  |  104 -
 .../jena/sparql/engine/iterator/QueryIter1.java |   88 -
 .../jena/sparql/engine/iterator/QueryIter2.java |   94 -
 .../engine/iterator/QueryIter2LoopOnLeft.java   |   82 -
 .../sparql/engine/iterator/QueryIterAssign.java |  101 -
 .../iterator/QueryIterAssignVarValue.java       |   84 -
 .../engine/iterator/QueryIterBlockTriples.java  |   97 -
 .../engine/iterator/QueryIterCommonParent.java  |   82 -
 .../sparql/engine/iterator/QueryIterConcat.java |  144 -
 .../engine/iterator/QueryIterConvert.java       |   73 -
 .../engine/iterator/QueryIterDefaulting.java    |   99 -
 .../sparql/engine/iterator/QueryIterDiff.java   |   55 -
 .../engine/iterator/QueryIterDistinct.java      |   68 -
 .../engine/iterator/QueryIterDistinctMem.java   |   50 -
 .../iterator/QueryIterDistinctReduced.java      |   80 -
 .../iterator/QueryIterDistinguishedVars.java    |   47 -
 .../engine/iterator/QueryIterExtendByVar.java   |   73 -
 .../engine/iterator/QueryIterFilterExpr.java    |   73 -
 .../sparql/engine/iterator/QueryIterGroup.java  |  204 -
 .../sparql/engine/iterator/QueryIterMinus.java  |   89 -
 .../engine/iterator/QueryIterNullIterator.java  |   59 -
 .../sparql/engine/iterator/QueryIterPath.java   |   61 -
 .../sparql/engine/iterator/QueryIterPeek.java   |   80 -
 .../engine/iterator/QueryIterPlainWrapper.java  |   78 -
 .../engine/iterator/QueryIterProcedure.java     |   91 -
 .../iterator/QueryIterProcessBinding.java       |   99 -
 .../engine/iterator/QueryIterProject.java       |   76 -
 .../engine/iterator/QueryIterProjectMerge.java  |  105 -
 .../engine/iterator/QueryIterReduced.java       |   53 -
 .../engine/iterator/QueryIterRepeatApply.java   |  128 -
 .../sparql/engine/iterator/QueryIterRoot.java   |   49 -
 .../engine/iterator/QueryIterSingleton.java     |   64 -
 .../sparql/engine/iterator/QueryIterSlice.java  |   97 -
 .../sparql/engine/iterator/QueryIterSort.java   |  109 -
 .../sparql/engine/iterator/QueryIterSub.java    |   60 -
 .../sparql/engine/iterator/QueryIterTopN.java   |  119 -
 .../engine/iterator/QueryIterTracked.java       |   63 -
 .../engine/iterator/QueryIterTriplePattern.java |  186 -
 .../sparql/engine/iterator/QueryIterYieldN.java |   85 -
 .../engine/iterator/QueryIteratorBase.java      |  266 -
 .../engine/iterator/QueryIteratorCaching.java   |   78 -
 .../engine/iterator/QueryIteratorCheck.java     |  108 -
 .../engine/iterator/QueryIteratorCloseable.java |   41 -
 .../engine/iterator/QueryIteratorCopy.java      |   91 -
 .../engine/iterator/QueryIteratorLogging.java   |   71 -
 .../engine/iterator/QueryIteratorMapped.java    |   80 -
 .../engine/iterator/QueryIteratorResultSet.java |   47 -
 .../engine/iterator/QueryIteratorTiming.java    |   87 -
 .../engine/iterator/QueryIteratorWrapper.java   |   74 -
 .../sparql/engine/main/ExecutionDispatch.java   |  335 -
 .../jena/sparql/engine/main/JoinClassifier.java |  181 -
 .../sparql/engine/main/LeftJoinClassifier.java  |  122 -
 .../hpl/jena/sparql/engine/main/OpExecutor.java |  471 --
 .../sparql/engine/main/OpExecutorFactory.java   |   23 -
 .../com/hp/hpl/jena/sparql/engine/main/QC.java  |   66 -
 .../sparql/engine/main/QueryEngineMain.java     |  105 -
 .../sparql/engine/main/QueryEngineMainQuad.java |   79 -
 .../jena/sparql/engine/main/StageBuilder.java   |  118 -
 .../jena/sparql/engine/main/StageGenerator.java |   49 -
 .../engine/main/StageGeneratorGeneric.java      |   86 -
 .../hpl/jena/sparql/engine/main/VarFinder.java  |  273 -
 .../engine/main/iterator/QueryIterGraph.java    |  209 -
 .../engine/main/iterator/QueryIterJoin.java     |   32 -
 .../engine/main/iterator/QueryIterJoinBase.java |   79 -
 .../engine/main/iterator/QueryIterLeftJoin.java |   32 -
 .../main/iterator/QueryIterOptionalIndex.java   |   65 -
 .../engine/main/iterator/QueryIterService.java  |   78 -
 .../engine/main/iterator/QueryIterUnion.java    |   77 -
 .../jena/sparql/engine/optimizer/Pattern.java   |   64 -
 .../sparql/engine/optimizer/StatsMatcher.java   |  512 --
 .../optimizer/reorder/PatternElements.java      |   55 -
 .../engine/optimizer/reorder/PatternTriple.java |   75 -
 .../engine/optimizer/reorder/ReorderFixed.java  |  109 -
 .../optimizer/reorder/ReorderFixedAlt.java      |   80 -
 .../engine/optimizer/reorder/ReorderLib.java    |   79 -
 .../engine/optimizer/reorder/ReorderProc.java   |   31 -
 .../optimizer/reorder/ReorderProcIndexes.java   |   70 -
 .../reorder/ReorderTransformation.java          |   30 -
 .../ReorderTransformationSubstitution.java      |  311 -
 .../optimizer/reorder/ReorderWeighted.java      |   37 -
 .../engine/optimizer/reorder/Reorderable.java   |   25 -
 .../com/hp/hpl/jena/sparql/engine/ref/Eval.java |  283 -
 .../hpl/jena/sparql/engine/ref/Evaluator.java   |   68 -
 .../sparql/engine/ref/EvaluatorDispatch.java    |  347 -
 .../sparql/engine/ref/EvaluatorFactory.java     |   29 -
 .../jena/sparql/engine/ref/EvaluatorSimple.java |  343 -
 .../jena/sparql/engine/ref/QueryEngineRef.java  |  111 -
 .../sparql/engine/ref/QueryEngineRefQuad.java   |   82 -
 .../java/com/hp/hpl/jena/sparql/expr/E_Add.java |   47 -
 .../com/hp/hpl/jena/sparql/expr/E_BNode.java    |   99 -
 .../com/hp/hpl/jena/sparql/expr/E_Bound.java    |   52 -
 .../com/hp/hpl/jena/sparql/expr/E_Call.java     |  132 -
 .../com/hp/hpl/jena/sparql/expr/E_Cast.java     |   49 -
 .../com/hp/hpl/jena/sparql/expr/E_Coalesce.java |   61 -
 .../hp/hpl/jena/sparql/expr/E_Conditional.java  |   68 -
 .../com/hp/hpl/jena/sparql/expr/E_Datatype.java |   38 -
 .../hp/hpl/jena/sparql/expr/E_DateTimeDay.java  |   38 -
 .../hpl/jena/sparql/expr/E_DateTimeHours.java   |   38 -
 .../hpl/jena/sparql/expr/E_DateTimeMinutes.java |   38 -
 .../hpl/jena/sparql/expr/E_DateTimeMonth.java   |   38 -
 .../hpl/jena/sparql/expr/E_DateTimeSeconds.java |   38 -
 .../hp/hpl/jena/sparql/expr/E_DateTimeTZ.java   |   38 -
 .../jena/sparql/expr/E_DateTimeTimezone.java    |   38 -
 .../hp/hpl/jena/sparql/expr/E_DateTimeYear.java |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_Divide.java   |   47 -
 .../com/hp/hpl/jena/sparql/expr/E_Equals.java   |   46 -
 .../com/hp/hpl/jena/sparql/expr/E_Exists.java   |   93 -
 .../com/hp/hpl/jena/sparql/expr/E_Function.java |  137 -
 .../hpl/jena/sparql/expr/E_FunctionDynamic.java |   43 -
 .../hp/hpl/jena/sparql/expr/E_GreaterThan.java  |   42 -
 .../jena/sparql/expr/E_GreaterThanOrEqual.java  |   43 -
 .../java/com/hp/hpl/jena/sparql/expr/E_IRI.java |   64 -
 .../com/hp/hpl/jena/sparql/expr/E_IsBlank.java  |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_IsIRI.java    |   43 -
 .../hp/hpl/jena/sparql/expr/E_IsLiteral.java    |   43 -
 .../hp/hpl/jena/sparql/expr/E_IsNumeric.java    |   43 -
 .../com/hp/hpl/jena/sparql/expr/E_IsURI.java    |   40 -
 .../com/hp/hpl/jena/sparql/expr/E_Lang.java     |   38 -
 .../hp/hpl/jena/sparql/expr/E_LangMatches.java  |   41 -
 .../com/hp/hpl/jena/sparql/expr/E_LessThan.java |   42 -
 .../hpl/jena/sparql/expr/E_LessThanOrEqual.java |   42 -
 .../hp/hpl/jena/sparql/expr/E_LogicalAnd.java   |   95 -
 .../hp/hpl/jena/sparql/expr/E_LogicalNot.java   |   45 -
 .../hp/hpl/jena/sparql/expr/E_LogicalOr.java    |  110 -
 .../java/com/hp/hpl/jena/sparql/expr/E_MD5.java |   36 -
 .../com/hp/hpl/jena/sparql/expr/E_Multiply.java |   46 -
 .../hp/hpl/jena/sparql/expr/E_NotEquals.java    |   46 -
 .../hp/hpl/jena/sparql/expr/E_NotExists.java    |   94 -
 .../com/hp/hpl/jena/sparql/expr/E_NotOneOf.java |   58 -
 .../java/com/hp/hpl/jena/sparql/expr/E_Now.java |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_NumAbs.java   |   38 -
 .../hp/hpl/jena/sparql/expr/E_NumCeiling.java   |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_NumFloor.java |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_NumRound.java |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_OneOf.java    |   59 -
 .../hp/hpl/jena/sparql/expr/E_OneOfBase.java    |   92 -
 .../com/hp/hpl/jena/sparql/expr/E_Random.java   |   47 -
 .../com/hp/hpl/jena/sparql/expr/E_Regex.java    |  130 -
 .../com/hp/hpl/jena/sparql/expr/E_SHA1.java     |   36 -
 .../com/hp/hpl/jena/sparql/expr/E_SHA224.java   |   36 -
 .../com/hp/hpl/jena/sparql/expr/E_SHA256.java   |   36 -
 .../com/hp/hpl/jena/sparql/expr/E_SHA384.java   |   36 -
 .../com/hp/hpl/jena/sparql/expr/E_SHA512.java   |   36 -
 .../com/hp/hpl/jena/sparql/expr/E_SameTerm.java |   41 -
 .../java/com/hp/hpl/jena/sparql/expr/E_Str.java |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_StrAfter.java |   38 -
 .../hp/hpl/jena/sparql/expr/E_StrBefore.java    |   38 -
 .../hp/hpl/jena/sparql/expr/E_StrConcat.java    |   48 -
 .../hp/hpl/jena/sparql/expr/E_StrContains.java  |   38 -
 .../hp/hpl/jena/sparql/expr/E_StrDatatype.java  |   44 -
 .../hpl/jena/sparql/expr/E_StrEncodeForURI.java |   41 -
 .../hp/hpl/jena/sparql/expr/E_StrEndsWith.java  |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_StrLang.java  |   43 -
 .../hp/hpl/jena/sparql/expr/E_StrLength.java    |   38 -
 .../hp/hpl/jena/sparql/expr/E_StrLowerCase.java |   38 -
 .../hp/hpl/jena/sparql/expr/E_StrReplace.java   |   82 -
 .../hpl/jena/sparql/expr/E_StrStartsWith.java   |   38 -
 .../hp/hpl/jena/sparql/expr/E_StrSubstring.java |   52 -
 .../com/hp/hpl/jena/sparql/expr/E_StrUUID.java  |   45 -
 .../hp/hpl/jena/sparql/expr/E_StrUpperCase.java |   38 -
 .../com/hp/hpl/jena/sparql/expr/E_Subtract.java |   47 -
 .../java/com/hp/hpl/jena/sparql/expr/E_URI.java |   43 -
 .../com/hp/hpl/jena/sparql/expr/E_UUID.java     |   45 -
 .../hp/hpl/jena/sparql/expr/E_UnaryMinus.java   |   39 -
 .../hp/hpl/jena/sparql/expr/E_UnaryPlus.java    |   39 -
 .../com/hp/hpl/jena/sparql/expr/E_Version.java  |   45 -
 .../java/com/hp/hpl/jena/sparql/expr/Expr.java  |   93 -
 .../hp/hpl/jena/sparql/expr/ExprAggregator.java |  147 -
 .../com/hp/hpl/jena/sparql/expr/ExprBuild.java  |   44 -
 .../com/hp/hpl/jena/sparql/expr/ExprDigest.java |  128 -
 .../hpl/jena/sparql/expr/ExprEvalException.java |   33 -
 .../jena/sparql/expr/ExprEvalTypeException.java |   29 -
 .../hp/hpl/jena/sparql/expr/ExprException.java  |   32 -
 .../hp/hpl/jena/sparql/expr/ExprFunction.java   |  131 -
 .../hp/hpl/jena/sparql/expr/ExprFunction0.java  |   73 -
 .../hp/hpl/jena/sparql/expr/ExprFunction1.java  |   99 -
 .../hp/hpl/jena/sparql/expr/ExprFunction2.java  |  113 -
 .../hp/hpl/jena/sparql/expr/ExprFunction3.java  |  123 -
 .../hp/hpl/jena/sparql/expr/ExprFunctionN.java  |  125 -
 .../hp/hpl/jena/sparql/expr/ExprFunctionOp.java |   98 -
 .../com/hp/hpl/jena/sparql/expr/ExprLib.java    |  162 -
 .../com/hp/hpl/jena/sparql/expr/ExprList.java   |  148 -
 .../com/hp/hpl/jena/sparql/expr/ExprNode.java   |  121 -
 .../sparql/expr/ExprNotComparableException.java |   25 -
 .../com/hp/hpl/jena/sparql/expr/ExprSystem.java |   53 -
 .../hp/hpl/jena/sparql/expr/ExprTransform.java  |   34 -
 .../hpl/jena/sparql/expr/ExprTransformBase.java |   34 -
 .../hpl/jena/sparql/expr/ExprTransformCopy.java |  154 -
 .../hpl/jena/sparql/expr/ExprTransformOp.java   |   26 -
 .../sparql/expr/ExprTransformSubstitute.java    |   68 -
 .../hpl/jena/sparql/expr/ExprTransformer.java   |  209 -
 .../hpl/jena/sparql/expr/ExprTypeException.java |   31 -
 .../jena/sparql/expr/ExprUndefException.java    |   31 -
 .../com/hp/hpl/jena/sparql/expr/ExprVar.java    |  134 -
 .../com/hp/hpl/jena/sparql/expr/ExprVars.java   |  127 -
 .../hp/hpl/jena/sparql/expr/ExprVisitor.java    |   38 -
 .../hpl/jena/sparql/expr/ExprVisitorBase.java   |   47 -
 .../jena/sparql/expr/ExprVisitorFunction.java   |   36 -
 .../com/hp/hpl/jena/sparql/expr/ExprWalker.java |  119 -
 .../hp/hpl/jena/sparql/expr/FunctionLabel.java  |   27 -
 .../com/hp/hpl/jena/sparql/expr/NodeValue.java  | 1268 ----
 .../hp/hpl/jena/sparql/expr/RegexEngine.java    |   27 -
 .../com/hp/hpl/jena/sparql/expr/RegexJava.java  |   83 -
 .../hp/hpl/jena/sparql/expr/RegexXerces.java    |   49 -
 .../sparql/expr/ValueSpaceClassification.java   |   40 -
 .../sparql/expr/VariableNotBoundException.java  |   31 -
 .../jena/sparql/expr/aggregate/Accumulator.java |   34 -
 .../expr/aggregate/AccumulatorDistinctAll.java  |   43 -
 .../expr/aggregate/AccumulatorDistinctExpr.java |   75 -
 .../sparql/expr/aggregate/AccumulatorExpr.java  |   75 -
 .../expr/aggregate/AccumulatorFactory.java      |   31 -
 .../hpl/jena/sparql/expr/aggregate/AggAvg.java  |  110 -
 .../sparql/expr/aggregate/AggAvgDistinct.java   |  103 -
 .../jena/sparql/expr/aggregate/AggCount.java    |   85 -
 .../sparql/expr/aggregate/AggCountDistinct.java |   88 -
 .../jena/sparql/expr/aggregate/AggCountVar.java |   80 -
 .../expr/aggregate/AggCountVarDistinct.java     |   82 -
 .../jena/sparql/expr/aggregate/AggCustom.java   |  171 -
 .../sparql/expr/aggregate/AggGroupConcat.java   |  164 -
 .../expr/aggregate/AggGroupConcatDistinct.java  |  115 -
 .../hpl/jena/sparql/expr/aggregate/AggMax.java  |   45 -
 .../jena/sparql/expr/aggregate/AggMaxBase.java  |   77 -
 .../sparql/expr/aggregate/AggMaxDistinct.java   |   46 -
 .../hpl/jena/sparql/expr/aggregate/AggMin.java  |   45 -
 .../jena/sparql/expr/aggregate/AggMinBase.java  |   77 -
 .../sparql/expr/aggregate/AggMinDistinct.java   |   44 -
 .../hpl/jena/sparql/expr/aggregate/AggNull.java |   74 -
 .../jena/sparql/expr/aggregate/AggSample.java   |   85 -
 .../expr/aggregate/AggSampleDistinct.java       |   81 -
 .../hpl/jena/sparql/expr/aggregate/AggSum.java  |   91 -
 .../sparql/expr/aggregate/AggSumDistinct.java   |   91 -
 .../expr/aggregate/AggregateRegistry.java       |   70 -
 .../jena/sparql/expr/aggregate/Aggregator.java  |   58 -
 .../sparql/expr/aggregate/AggregatorBase.java   |  179 -
 .../expr/aggregate/AggregatorFactory.java       |   72 -
 .../sparql/expr/nodevalue/NodeFunctions.java    |  479 --
 .../sparql/expr/nodevalue/NodeValueBoolean.java |   52 -
 .../jena/sparql/expr/nodevalue/NodeValueDT.java |   91 -
 .../sparql/expr/nodevalue/NodeValueDecimal.java |   73 -
 .../sparql/expr/nodevalue/NodeValueDouble.java  |   68 -
 .../expr/nodevalue/NodeValueDuration.java       |   55 -
 .../sparql/expr/nodevalue/NodeValueFloat.java   |   64 -
 .../sparql/expr/nodevalue/NodeValueInteger.java |   79 -
 .../sparql/expr/nodevalue/NodeValueNode.java    |   40 -
 .../sparql/expr/nodevalue/NodeValueOps.java     |  316 -
 .../sparql/expr/nodevalue/NodeValueString.java  |   62 -
 .../sparql/expr/nodevalue/NodeValueVisitor.java |   41 -
 .../jena/sparql/expr/nodevalue/NumericType.java |   21 -
 .../jena/sparql/expr/nodevalue/XSDFuncOp.java   | 1414 ----
 .../hp/hpl/jena/sparql/function/CastXSD.java    |  135 -
 .../jena/sparql/function/CastXSD_Boolean.java   |   82 -
 .../jena/sparql/function/CastXSD_DateTime.java  |   54 -
 .../jena/sparql/function/CastXSD_Numeric.java   |   64 -
 .../hp/hpl/jena/sparql/function/Function.java   |   50 -
 .../hpl/jena/sparql/function/FunctionBase.java  |   87 -
 .../hpl/jena/sparql/function/FunctionBase0.java |   55 -
 .../hpl/jena/sparql/function/FunctionBase1.java |   57 -
 .../hpl/jena/sparql/function/FunctionBase2.java |   59 -
 .../hpl/jena/sparql/function/FunctionBase3.java |   59 -
 .../hpl/jena/sparql/function/FunctionBase4.java |   61 -
 .../hpl/jena/sparql/function/FunctionEnv.java   |   41 -
 .../jena/sparql/function/FunctionEnvBase.java   |   83 -
 .../jena/sparql/function/FunctionFactory.java   |   35 -
 .../sparql/function/FunctionFactoryAuto.java    |   45 -
 .../jena/sparql/function/FunctionRegistry.java  |  125 -
 .../jena/sparql/function/StandardFunctions.java |  142 -
 .../jena/sparql/function/library/FN_Abs.java    |   34 -
 .../jena/sparql/function/library/FN_BEV.java    |   34 -
 .../sparql/function/library/FN_Ceiling.java     |   34 -
 .../function/library/FN_DayFromDateTime.java    |   33 -
 .../function/library/FN_DaysFromDuration.java   |   33 -
 .../jena/sparql/function/library/FN_Floor.java  |   35 -
 .../function/library/FN_HoursFromDateTime.java  |   33 -
 .../function/library/FN_HoursFromDuration.java  |   33 -
 .../sparql/function/library/FN_Matches.java     |   78 -
 .../library/FN_MinutesFromDateTime.java         |   33 -
 .../library/FN_MinutesFromDuration.java         |   33 -
 .../function/library/FN_MonthFromDateTime.java  |   33 -
 .../function/library/FN_MonthsFromDuration.java |   33 -
 .../jena/sparql/function/library/FN_Not.java    |   34 -
 .../jena/sparql/function/library/FN_Round.java  |   34 -
 .../library/FN_SecondsFromDateTime.java         |   33 -
 .../library/FN_SecondsFromDuration.java         |   33 -
 .../sparql/function/library/FN_StrAfter.java    |   36 -
 .../sparql/function/library/FN_StrBefore.java   |   36 -
 .../sparql/function/library/FN_StrConcat.java   |   51 -
 .../sparql/function/library/FN_StrContains.java |   36 -
 .../function/library/FN_StrEncodeForURI.java    |   33 -
 .../sparql/function/library/FN_StrEndsWith.java |   36 -
 .../sparql/function/library/FN_StrLength.java   |   36 -
 .../function/library/FN_StrLowerCase.java       |   36 -
 .../function/library/FN_StrStartsWith.java      |   36 -
 .../function/library/FN_StrSubstring.java       |   63 -
 .../function/library/FN_StrUpperCase.java       |   36 -
 .../library/FN_TimezoneFromDateTime.java        |   33 -
 .../function/library/FN_YearFromDateTime.java   |   33 -
 .../function/library/FN_YearsFromDuration.java  |   34 -
 .../jena/sparql/function/library/SystemVar.java |   61 -
 .../hpl/jena/sparql/function/library/bnode.java |   41 -
 .../hpl/jena/sparql/function/library/date.java  |   61 -
 .../hp/hpl/jena/sparql/function/library/e.java  |   33 -
 .../hpl/jena/sparql/function/library/eval.java  |   71 -
 .../sparql/function/library/evenInteger.java    |   42 -
 .../jena/sparql/function/library/langeq.java    |   34 -
 .../library/leviathan/LeviathanConstants.java   |   39 -
 .../function/library/leviathan/cartesian.java   |   62 -
 .../sparql/function/library/leviathan/cos.java  |   31 -
 .../sparql/function/library/leviathan/cos1.java |   31 -
 .../function/library/leviathan/cosec.java       |   32 -
 .../function/library/leviathan/cosec1.java      |   32 -
 .../sparql/function/library/leviathan/cot.java  |   33 -
 .../sparql/function/library/leviathan/cot1.java |   32 -
 .../sparql/function/library/leviathan/cube.java |   49 -
 .../library/leviathan/degreesToRadians.java     |   31 -
 .../sparql/function/library/leviathan/e.java    |   31 -
 .../function/library/leviathan/factorial.java   |   53 -
 .../sparql/function/library/leviathan/ln.java   |   31 -
 .../sparql/function/library/leviathan/log.java  |   57 -
 .../function/library/leviathan/md5hash.java     |   35 -
 .../sparql/function/library/leviathan/pow.java  |   49 -
 .../function/library/leviathan/pythagoras.java  |   34 -
 .../library/leviathan/radiansToDegrees.java     |   31 -
 .../function/library/leviathan/reciprocal.java  |   31 -
 .../sparql/function/library/leviathan/rnd.java  |   70 -
 .../sparql/function/library/leviathan/root.java |   34 -
 .../sparql/function/library/leviathan/sec.java  |   32 -
 .../sparql/function/library/leviathan/sec1.java |   32 -
 .../function/library/leviathan/sha256hash.java  |   35 -
 .../sparql/function/library/leviathan/sin.java  |   31 -
 .../sparql/function/library/leviathan/sin1.java |   31 -
 .../sparql/function/library/leviathan/sq.java   |   49 -
 .../sparql/function/library/leviathan/sqrt.java |   31 -
 .../sparql/function/library/leviathan/tan.java  |   31 -
 .../sparql/function/library/leviathan/tan1.java |   31 -
 .../sparql/function/library/leviathan/ten.java  |   31 -
 .../jena/sparql/function/library/localname.java |   42 -
 .../hpl/jena/sparql/function/library/max.java   |   36 -
 .../hpl/jena/sparql/function/library/min.java   |   36 -
 .../jena/sparql/function/library/namespace.java |   42 -
 .../hpl/jena/sparql/function/library/now.java   |   30 -
 .../hp/hpl/jena/sparql/function/library/pi.java |   32 -
 .../hpl/jena/sparql/function/library/print.java |   35 -
 .../jena/sparql/function/library/sha1sum.java   |   48 -
 .../hpl/jena/sparql/function/library/sqrt.java  |   35 -
 .../jena/sparql/function/library/strjoin.java   |   70 -
 .../jena/sparql/function/library/strlen.java    |   23 -
 .../jena/sparql/function/library/struuid.java   |   36 -
 .../jena/sparql/function/library/substr.java    |   24 -
 .../jena/sparql/function/library/substring.java |   63 -
 .../hpl/jena/sparql/function/library/uuid.java  |   36 -
 .../hpl/jena/sparql/function/library/wait.java  |   39 -
 .../function/user/ExprTransformExpand.java      |   94 -
 .../function/user/UserDefinedFunction.java      |   95 -
 .../user/UserDefinedFunctionDefinition.java     |  107 -
 .../user/UserDefinedFunctionFactory.java        |  243 -
 .../hp/hpl/jena/sparql/graph/GraphDataBag.java  |  123 -
 .../jena/sparql/graph/GraphDefaultDataBag.java  |   44 -
 .../jena/sparql/graph/GraphDistinctDataBag.java |   45 -
 .../hp/hpl/jena/sparql/graph/GraphFactory.java  |   92 -
 .../hp/hpl/jena/sparql/graph/GraphMemPlain.java |  181 -
 .../com/hp/hpl/jena/sparql/graph/GraphOps.java  |   89 -
 .../sparql/graph/GraphPrefixesProjection.java   |  111 -
 .../hp/hpl/jena/sparql/graph/GraphReadOnly.java |   65 -
 .../hp/hpl/jena/sparql/graph/GraphSPARQL.java   |  207 -
 .../jena/sparql/graph/GraphSPARQLService.java   |  131 -
 .../hpl/jena/sparql/graph/GraphUnionRead.java   |   77 -
 .../hp/hpl/jena/sparql/graph/GraphWrapper.java  |  161 -
 .../com/hp/hpl/jena/sparql/graph/NodeConst.java |   48 -
 .../hp/hpl/jena/sparql/graph/NodeTransform.java |   30 -
 .../hpl/jena/sparql/graph/NodeTransformLib.java |  249 -
 .../hpl/jena/sparql/graph/NodeTransformOp.java  |  219 -
 .../jena/sparql/graph/UnmodifiableGraph.java    |   44 -
 .../com/hp/hpl/jena/sparql/lang/ParserARQ.java  |  126 -
 .../hpl/jena/sparql/lang/ParserARQUpdate.java   |   92 -
 .../com/hp/hpl/jena/sparql/lang/ParserBase.java |  686 --
 .../hp/hpl/jena/sparql/lang/ParserSPARQL10.java |  125 -
 .../hp/hpl/jena/sparql/lang/ParserSPARQL11.java |  126 -
 .../jena/sparql/lang/ParserSPARQL11Update.java  |   90 -
 .../hp/hpl/jena/sparql/lang/SPARQLParser.java   |   55 -
 .../hpl/jena/sparql/lang/SPARQLParserBase.java  |  320 -
 .../jena/sparql/lang/SPARQLParserFactory.java   |   30 -
 .../jena/sparql/lang/SPARQLParserRegistry.java  |  145 -
 .../hp/hpl/jena/sparql/lang/SyntaxVarScope.java |  311 -
 .../hp/hpl/jena/sparql/lang/UpdateParser.java   |   62 -
 .../jena/sparql/lang/UpdateParserFactory.java   |   30 -
 .../jena/sparql/lang/UpdateParserRegistry.java  |  136 -
 .../hp/hpl/jena/sparql/lang/arq/ARQParser.java  | 6891 -----------------
 .../hpl/jena/sparql/lang/arq/ARQParserBase.java |   71 -
 .../sparql/lang/arq/ARQParserConstants.java     |  633 --
 .../sparql/lang/arq/ARQParserTokenManager.java  | 3895 ----------
 .../jena/sparql/lang/arq/JavaCharStream.java    |  617 --
 .../jena/sparql/lang/arq/ParseException.java    |  187 -
 .../com/hp/hpl/jena/sparql/lang/arq/Token.java  |  131 -
 .../hpl/jena/sparql/lang/arq/TokenMgrError.java |  147 -
 .../sparql/lang/sparql_10/JavaCharStream.java   |  635 --
 .../sparql/lang/sparql_10/ParseException.java   |  209 -
 .../sparql/lang/sparql_10/SPARQLParser10.java   | 2323 ------
 .../lang/sparql_10/SPARQLParser10Base.java      |   26 -
 .../lang/sparql_10/SPARQLParser10Constants.java |  351 -
 .../sparql_10/SPARQLParser10TokenManager.java   | 2459 ------
 .../hpl/jena/sparql/lang/sparql_10/Token.java   |  149 -
 .../sparql/lang/sparql_10/TokenMgrError.java    |  165 -
 .../sparql/lang/sparql_11/JavaCharStream.java   |  617 --
 .../sparql/lang/sparql_11/ParseException.java   |  187 -
 .../sparql/lang/sparql_11/SPARQLParser11.java   | 5092 -------------
 .../lang/sparql_11/SPARQLParser11Base.java      |   26 -
 .../lang/sparql_11/SPARQLParser11Constants.java |  612 --
 .../sparql_11/SPARQLParser11TokenManager.java   | 3830 ----------
 .../hpl/jena/sparql/lang/sparql_11/Token.java   |  131 -
 .../sparql/lang/sparql_11/TokenMgrError.java    |  147 -
 .../com/hp/hpl/jena/sparql/lib/DatasetLib.java  |   69 -
 .../com/hp/hpl/jena/sparql/lib/Metadata.java    |  112 -
 .../java/com/hp/hpl/jena/sparql/mgt/ARQMgt.java |   27 -
 .../com/hp/hpl/jena/sparql/mgt/ARQMgt_X.java    |  136 -
 .../hp/hpl/jena/sparql/mgt/ContextMBean.java    |  132 -
 .../com/hp/hpl/jena/sparql/mgt/Explain.java     |  374 -
 .../hp/hpl/jena/sparql/mgt/QueryEngineInfo.java |   68 -
 .../jena/sparql/mgt/QueryEngineInfoMBean.java   |   38 -
 .../hp/hpl/jena/sparql/mgt/QueryExecMBean.java  |   35 -
 .../com/hp/hpl/jena/sparql/mgt/SystemInfo.java  |   71 -
 .../hp/hpl/jena/sparql/mgt/SystemInfoMBean.java |   26 -
 .../jena/sparql/modify/GraphStoreAction.java    |   23 -
 .../hpl/jena/sparql/modify/GraphStoreBasic.java |   56 -
 .../hpl/jena/sparql/modify/GraphStoreNull.java  |   85 -
 .../modify/GraphStoreNullTransactional.java     |   62 -
 .../jena/sparql/modify/GraphStoreWrapper.java   |   47 -
 .../modify/NodeTransformBNodesToVariables.java  |   54 -
 .../hp/hpl/jena/sparql/modify/TemplateLib.java  |  198 -
 .../hpl/jena/sparql/modify/UpdateCompare.java   |   57 -
 .../hp/hpl/jena/sparql/modify/UpdateEngine.java |   43 -
 .../jena/sparql/modify/UpdateEngineBase.java    |   57 -
 .../jena/sparql/modify/UpdateEngineFactory.java |   35 -
 .../jena/sparql/modify/UpdateEngineMain.java    |   96 -
 .../sparql/modify/UpdateEngineNonStreaming.java |  109 -
 .../sparql/modify/UpdateEngineRegistry.java     |   97 -
 .../jena/sparql/modify/UpdateEngineWorker.java  |  639 --
 .../jena/sparql/modify/UpdateProcessRemote.java |   84 -
 .../sparql/modify/UpdateProcessRemoteBase.java  |  319 -
 .../sparql/modify/UpdateProcessRemoteForm.java  |   91 -
 .../jena/sparql/modify/UpdateProcessorBase.java |   78 -
 .../modify/UpdateProcessorStreamingBase.java    |   73 -
 .../jena/sparql/modify/UpdateRequestSink.java   |   75 -
 .../hp/hpl/jena/sparql/modify/UpdateSink.java   |   42 -
 .../jena/sparql/modify/UpdateVisitorSink.java   |   68 -
 .../hp/hpl/jena/sparql/modify/UsingList.java    |   44 -
 .../hpl/jena/sparql/modify/UsingUpdateSink.java |   93 -
 .../hpl/jena/sparql/modify/request/QuadAcc.java |   65 -
 .../jena/sparql/modify/request/QuadAccSink.java |   73 -
 .../jena/sparql/modify/request/QuadDataAcc.java |   84 -
 .../sparql/modify/request/QuadDataAccSink.java  |   58 -
 .../hpl/jena/sparql/modify/request/Target.java  |   97 -
 .../jena/sparql/modify/request/UpdateAdd.java   |   30 -
 .../sparql/modify/request/UpdateBinaryOp.java   |   66 -
 .../jena/sparql/modify/request/UpdateClear.java |   36 -
 .../jena/sparql/modify/request/UpdateCopy.java  |   30 -
 .../sparql/modify/request/UpdateCreate.java     |   74 -
 .../jena/sparql/modify/request/UpdateData.java  |   49 -
 .../sparql/modify/request/UpdateDataDelete.java |   28 -
 .../sparql/modify/request/UpdateDataInsert.java |   28 -
 .../sparql/modify/request/UpdateDataWriter.java |   58 -
 .../modify/request/UpdateDeleteInsert.java      |   25 -
 .../modify/request/UpdateDeleteWhere.java       |   51 -
 .../jena/sparql/modify/request/UpdateDrop.java  |   36 -
 .../sparql/modify/request/UpdateDropClear.java  |   63 -
 .../jena/sparql/modify/request/UpdateLoad.java  |   80 -
 .../sparql/modify/request/UpdateModify.java     |  125 -
 .../jena/sparql/modify/request/UpdateMove.java  |   30 -
 .../sparql/modify/request/UpdateSerializer.java |   66 -
 .../sparql/modify/request/UpdateVisitor.java    |   44 -
 .../sparql/modify/request/UpdateWithUsing.java  |   66 -
 .../sparql/modify/request/UpdateWriter.java     |  280 -
 .../modify/request/UpdateWriterVisitor.java     |  295 -
 .../java/com/hp/hpl/jena/sparql/path/P_Alt.java |   43 -
 .../com/hp/hpl/jena/sparql/path/P_Distinct.java |   50 -
 .../hp/hpl/jena/sparql/path/P_FixedLength.java  |   52 -
 .../com/hp/hpl/jena/sparql/path/P_Inverse.java  |   50 -
 .../com/hp/hpl/jena/sparql/path/P_Link.java     |   52 -
 .../java/com/hp/hpl/jena/sparql/path/P_Mod.java |   92 -
 .../com/hp/hpl/jena/sparql/path/P_Multi.java    |   51 -
 .../hp/hpl/jena/sparql/path/P_NegPropSet.java   |   73 -
 .../hp/hpl/jena/sparql/path/P_OneOrMore1.java   |   47 -
 .../hp/hpl/jena/sparql/path/P_OneOrMoreN.java   |   47 -
 .../com/hp/hpl/jena/sparql/path/P_Path0.java    |   30 -
 .../com/hp/hpl/jena/sparql/path/P_Path1.java    |   34 -
 .../com/hp/hpl/jena/sparql/path/P_Path2.java    |   57 -
 .../hp/hpl/jena/sparql/path/P_ReverseLink.java  |   52 -
 .../java/com/hp/hpl/jena/sparql/path/P_Seq.java |   45 -
 .../com/hp/hpl/jena/sparql/path/P_Shortest.java |   50 -
 .../hp/hpl/jena/sparql/path/P_ZeroOrMore1.java  |   47 -
 .../hp/hpl/jena/sparql/path/P_ZeroOrMoreN.java  |   47 -
 .../hp/hpl/jena/sparql/path/P_ZeroOrOne.java    |   47 -
 .../java/com/hp/hpl/jena/sparql/path/Path.java  |   29 -
 .../com/hp/hpl/jena/sparql/path/PathBase.java   |   75 -
 .../hp/hpl/jena/sparql/path/PathCompiler.java   |  195 -
 .../hp/hpl/jena/sparql/path/PathFactory.java    |   45 -
 .../com/hp/hpl/jena/sparql/path/PathLib.java    |  257 -
 .../com/hp/hpl/jena/sparql/path/PathParser.java |   75 -
 .../jena/sparql/path/PathPropertyFunction.java  |   49 -
 .../hp/hpl/jena/sparql/path/PathVisitor.java    |   44 -
 .../hpl/jena/sparql/path/PathVisitorBase.java   |   44 -
 .../hpl/jena/sparql/path/PathVisitorByType.java |   76 -
 .../com/hp/hpl/jena/sparql/path/PathWriter.java |  311 -
 .../hpl/jena/sparql/path/eval/PathEngine.java   |  266 -
 .../hpl/jena/sparql/path/eval/PathEngine1.java  |  246 -
 .../hpl/jena/sparql/path/eval/PathEngineN.java  |  227 -
 .../jena/sparql/path/eval/PathEngineSPARQL.java |  271 -
 .../hp/hpl/jena/sparql/path/eval/PathEval.java  |   81 -
 .../jena/sparql/path/eval/PathEvaluator.java    |  190 -
 .../jena/sparql/pfunction/PFuncAssignBase.java  |   63 -
 .../sparql/pfunction/PFuncAssignToObject.java   |   29 -
 .../sparql/pfunction/PFuncAssignToSubject.java  |   40 -
 .../hpl/jena/sparql/pfunction/PFuncSimple.java  |   58 -
 .../sparql/pfunction/PFuncSimpleAndList.java    |   58 -
 .../hpl/jena/sparql/pfunction/ProcedurePF.java  |   73 -
 .../hpl/jena/sparql/pfunction/PropFuncArg.java  |  135 -
 .../jena/sparql/pfunction/PropFuncArgType.java  |   38 -
 .../jena/sparql/pfunction/PropertyFunction.java |   57 -
 .../sparql/pfunction/PropertyFunctionBase.java  |  127 -
 .../sparql/pfunction/PropertyFunctionEval.java  |   47 -
 .../pfunction/PropertyFunctionFactory.java      |   27 -
 .../pfunction/PropertyFunctionFactoryAuto.java  |   47 -
 .../pfunction/PropertyFunctionRegistry.java     |  161 -
 .../jena/sparql/pfunction/library/ListBase.java |  148 -
 .../sparql/pfunction/library/ListBase1.java     |   62 -
 .../sparql/pfunction/library/ListBaseList.java  |   58 -
 .../hpl/jena/sparql/pfunction/library/alt.java  |   29 -
 .../jena/sparql/pfunction/library/assign.java   |   55 -
 .../hpl/jena/sparql/pfunction/library/bag.java  |   29 -
 .../sparql/pfunction/library/blankNode.java     |   52 -
 .../jena/sparql/pfunction/library/bnode.java    |   24 -
 .../jena/sparql/pfunction/library/concat.java   |   54 -
 .../sparql/pfunction/library/container.java     |  182 -
 .../sparql/pfunction/library/listIndex.java     |  156 -
 .../sparql/pfunction/library/listLength.java    |   80 -
 .../sparql/pfunction/library/listMember.java    |   93 -
 .../hpl/jena/sparql/pfunction/library/seq.java  |   29 -
 .../jena/sparql/pfunction/library/splitIRI.java |  143 -
 .../jena/sparql/pfunction/library/splitURI.java |   23 -
 .../hpl/jena/sparql/pfunction/library/str.java  |   77 -
 .../jena/sparql/pfunction/library/strSplit.java |   75 -
 .../jena/sparql/pfunction/library/version.java  |   79 -
 .../sparql/pfunction/library/versionARQ.java    |   69 -
 .../hp/hpl/jena/sparql/procedure/ProcEval.java  |   82 -
 .../hp/hpl/jena/sparql/procedure/Procedure.java |   53 -
 .../jena/sparql/procedure/ProcedureBase.java    |   93 -
 .../jena/sparql/procedure/ProcedureEval.java    |   59 -
 .../jena/sparql/procedure/ProcedureFactory.java |   27 -
 .../sparql/procedure/ProcedureFactoryAuto.java  |   45 -
 .../sparql/procedure/ProcedureRegistry.java     |  126 -
 .../sparql/procedure/StandardProcedures.java    |   30 -
 .../jena/sparql/procedure/library/debug.java    |   37 -
 .../hp/hpl/jena/sparql/resultset/CSVInput.java  |  140 -
 .../jena/sparql/resultset/CSVInputIterator.java |  202 -
 .../hp/hpl/jena/sparql/resultset/CSVOutput.java |  155 -
 .../hp/hpl/jena/sparql/resultset/JSONInput.java |  274 -
 .../sparql/resultset/JSONInputIterator.java     |  759 --
 .../hpl/jena/sparql/resultset/JSONOutput.java   |   45 -
 .../jena/sparql/resultset/JSONOutputASK.java    |   57 -
 .../sparql/resultset/JSONOutputResultSet.java   |  272 -
 .../jena/sparql/resultset/JSONResultsKW.java    |   42 -
 .../hpl/jena/sparql/resultset/OutputBase.java   |   55 -
 .../jena/sparql/resultset/OutputFormatter.java  |   46 -
 .../hpl/jena/sparql/resultset/PlainFormat.java  |   89 -
 .../hp/hpl/jena/sparql/resultset/RDFInput.java  |  204 -
 .../hp/hpl/jena/sparql/resultset/RDFOutput.java |  286 -
 .../jena/sparql/resultset/ResultSetApply.java   |   61 -
 .../jena/sparql/resultset/ResultSetCompare.java |  351 -
 .../sparql/resultset/ResultSetException.java    |   28 -
 .../hpl/jena/sparql/resultset/ResultSetMem.java |  207 -
 .../sparql/resultset/ResultSetPeekable.java     |   46 -
 .../jena/sparql/resultset/ResultSetPeeking.java |  183 -
 .../sparql/resultset/ResultSetProcessor.java    |   48 -
 .../sparql/resultset/ResultSetRewindable.java   |   29 -
 .../jena/sparql/resultset/ResultsFormat.java    |  184 -
 .../hpl/jena/sparql/resultset/SPARQLResult.java |  132 -
 .../jena/sparql/resultset/SortedResultSet.java  |  145 -
 .../hp/hpl/jena/sparql/resultset/TSVInput.java  |  128 -
 .../jena/sparql/resultset/TSVInputIterator.java |  156 -
 .../hp/hpl/jena/sparql/resultset/TSVOutput.java |  123 -
 .../hpl/jena/sparql/resultset/TextOutput.java   |  238 -
 .../hp/hpl/jena/sparql/resultset/XMLInput.java  |  103 -
 .../hpl/jena/sparql/resultset/XMLInputSAX.java  |  378 -
 .../hpl/jena/sparql/resultset/XMLInputStAX.java |  519 --
 .../hp/hpl/jena/sparql/resultset/XMLOutput.java |   77 -
 .../hpl/jena/sparql/resultset/XMLOutputASK.java |   84 -
 .../sparql/resultset/XMLOutputResultSet.java    |  315 -
 .../hpl/jena/sparql/resultset/XMLResults.java   |   50 -
 .../jena/sparql/serializer/FmtExprSPARQL.java   |  232 -
 .../hpl/jena/sparql/serializer/FmtTemplate.java |   67 -
 .../jena/sparql/serializer/FormatterBase.java   |   62 -
 .../sparql/serializer/FormatterElement.java     |  655 --
 .../sparql/serializer/FormatterTemplate.java    |   28 -
 .../sparql/serializer/PrologueSerializer.java   |   82 -
 .../jena/sparql/serializer/QuerySerializer.java |  409 -
 .../serializer/QuerySerializerFactory.java      |   44 -
 .../sparql/serializer/SerializationContext.java |  157 -
 .../hpl/jena/sparql/serializer/Serializer.java  |  216 -
 .../sparql/serializer/SerializerRegistry.java   |  230 -
 .../serializer/UpdateSerializerFactory.java     |   44 -
 .../java/com/hp/hpl/jena/sparql/sse/Item.java   |  382 -
 .../hp/hpl/jena/sparql/sse/ItemException.java   |   25 -
 .../com/hp/hpl/jena/sparql/sse/ItemList.java    |  155 -
 .../hp/hpl/jena/sparql/sse/ItemLocation.java    |   46 -
 .../hp/hpl/jena/sparql/sse/ItemTransform.java   |   29 -
 .../hpl/jena/sparql/sse/ItemTransformBase.java  |   43 -
 .../hp/hpl/jena/sparql/sse/ItemTransformer.java |   84 -
 .../com/hp/hpl/jena/sparql/sse/ItemVisitor.java |   29 -
 .../com/hp/hpl/jena/sparql/sse/ItemWalker.java  |   62 -
 .../com/hp/hpl/jena/sparql/sse/ItemWriter.java  |  214 -
 .../java/com/hp/hpl/jena/sparql/sse/SSE.java    |  514 --
 .../hpl/jena/sparql/sse/SSEParseException.java  |   48 -
 .../java/com/hp/hpl/jena/sparql/sse/Tags.java   |  235 -
 .../com/hp/hpl/jena/sparql/sse/WriterSSE.java   |   69 -
 .../sparql/sse/builders/BuildException.java     |   29 -
 .../sparql/sse/builders/BuilderBinding.java     |   76 -
 .../jena/sparql/sse/builders/BuilderExec.java   |   56 -
 .../jena/sparql/sse/builders/BuilderExpr.java   | 1419 ----
 .../jena/sparql/sse/builders/BuilderGraph.java  |  248 -
 .../jena/sparql/sse/builders/BuilderLib.java    |  185 -
 .../jena/sparql/sse/builders/BuilderNode.java   |  182 -
 .../hpl/jena/sparql/sse/builders/BuilderOp.java |  791 --
 .../jena/sparql/sse/builders/BuilderPath.java   |  338 -
 .../sse/builders/BuilderPrefixMapping.java      |  111 -
 .../sparql/sse/builders/BuilderResultSet.java   |   57 -
 .../jena/sparql/sse/builders/BuilderTable.java  |   89 -
 .../sparql/sse/builders/ExprBuildException.java |   29 -
 .../sparql/sse/builders/OpBuildException.java   |   29 -
 .../hpl/jena/sparql/sse/lang/ParseHandler.java  |   41 -
 .../hpl/jena/sparql/sse/lang/ParseHandler2.java |  118 -
 .../jena/sparql/sse/lang/ParseHandlerDebug.java |  118 -
 .../jena/sparql/sse/lang/ParseHandlerForm.java  |  198 -
 .../jena/sparql/sse/lang/ParseHandlerLink.java  |   98 -
 .../jena/sparql/sse/lang/ParseHandlerPlain.java |  225 -
 .../sparql/sse/lang/ParseHandlerResolver.java   |  194 -
 .../sparql/sse/lang/ParseHandlerWrapper.java    |  101 -
 .../hpl/jena/sparql/sse/lang/ParserSSEBase.java |   96 -
 .../hp/hpl/jena/sparql/sse/lang/SSE_Parser.java |   75 -
 .../sparql/sse/lang/parser/JavaCharStream.java  |  635 --
 .../sparql/sse/lang/parser/ParseException.java  |  209 -
 .../sparql/sse/lang/parser/SSE_ParserCore.java  |  564 --
 .../lang/parser/SSE_ParserCoreConstants.java    |  166 -
 .../lang/parser/SSE_ParserCoreTokenManager.java | 1198 ---
 .../hpl/jena/sparql/sse/lang/parser/Token.java  |  149 -
 .../sparql/sse/lang/parser/TokenMgrError.java   |  165 -
 .../sparql/sse/writers/WriterBasePrefix.java    |  116 -
 .../hpl/jena/sparql/sse/writers/WriterExpr.java |  214 -
 .../jena/sparql/sse/writers/WriterGraph.java    |  133 -
 .../hpl/jena/sparql/sse/writers/WriterLib.java  |  113 -
 .../hpl/jena/sparql/sse/writers/WriterNode.java |  104 -
 .../hpl/jena/sparql/sse/writers/WriterOp.java   |  691 --
 .../hpl/jena/sparql/sse/writers/WriterPath.java |  305 -
 .../jena/sparql/sse/writers/WriterTable.java    |   73 -
 .../com/hp/hpl/jena/sparql/syntax/Element.java  |   64 -
 .../com/hp/hpl/jena/sparql/syntax/Element1.java |   36 -
 .../hpl/jena/sparql/syntax/ElementAssign.java   |   70 -
 .../hp/hpl/jena/sparql/syntax/ElementBind.java  |   70 -
 .../hp/hpl/jena/sparql/syntax/ElementData.java  |   93 -
 .../hpl/jena/sparql/syntax/ElementDataset.java  |   79 -
 .../hpl/jena/sparql/syntax/ElementExists.java   |   47 -
 .../hpl/jena/sparql/syntax/ElementFilter.java   |   52 -
 .../hp/hpl/jena/sparql/syntax/ElementGroup.java |  114 -
 .../hp/hpl/jena/sparql/syntax/ElementMinus.java |   58 -
 .../jena/sparql/syntax/ElementNamedGraph.java   |   73 -
 .../jena/sparql/syntax/ElementNotExists.java    |   47 -
 .../hpl/jena/sparql/syntax/ElementOptional.java |   58 -
 .../jena/sparql/syntax/ElementPathBlock.java    |   90 -
 .../hpl/jena/sparql/syntax/ElementService.java  |   81 -
 .../hpl/jena/sparql/syntax/ElementSubQuery.java |   53 -
 .../jena/sparql/syntax/ElementTriplesBlock.java |   90 -
 .../hp/hpl/jena/sparql/syntax/ElementUnion.java |   74 -
 .../hpl/jena/sparql/syntax/ElementVisitor.java  |   39 -
 .../jena/sparql/syntax/ElementVisitorBase.java  |   74 -
 .../hpl/jena/sparql/syntax/ElementWalker.java   |  216 -
 .../hp/hpl/jena/sparql/syntax/PatternVars.java  |   63 -
 .../jena/sparql/syntax/PatternVarsVisitor.java  |  105 -
 .../sparql/syntax/RecursiveElementVisitor.java  |  242 -
 .../com/hp/hpl/jena/sparql/syntax/Template.java |  116 -
 .../hpl/jena/sparql/syntax/TripleCollector.java |   30 -
 .../jena/sparql/syntax/TripleCollectorBGP.java  |   52 -
 .../jena/sparql/syntax/TripleCollectorMark.java |   34 -
 .../com/hp/hpl/jena/sparql/util/Closure.java    |  247 -
 .../hp/hpl/jena/sparql/util/ClosureTest.java    |   45 -
 .../com/hp/hpl/jena/sparql/util/Context.java    |  317 -
 .../com/hp/hpl/jena/sparql/util/Convert.java    |   85 -
 .../hp/hpl/jena/sparql/util/DatasetUtils.java   |  191 -
 .../hp/hpl/jena/sparql/util/DateTimeStruct.java |  418 -
 .../com/hp/hpl/jena/sparql/util/ExprUtils.java  |  282 -
 .../com/hp/hpl/jena/sparql/util/FmtUtils.java   |  632 --
 .../java/com/hp/hpl/jena/sparql/util/Iso.java   |  137 -
 .../com/hp/hpl/jena/sparql/util/IsoMatcher.java |  265 -
 .../com/hp/hpl/jena/sparql/util/IterLib.java    |   45 -
 .../hp/hpl/jena/sparql/util/LabelToNodeMap.java |   97 -
 .../com/hp/hpl/jena/sparql/util/Loader.java     |  152 -
 .../hp/hpl/jena/sparql/util/MappedLoader.java   |   94 -
 .../hpl/jena/sparql/util/MappingRegistry.java   |   43 -
 .../com/hp/hpl/jena/sparql/util/ModelUtils.java |  157 -
 .../java/com/hp/hpl/jena/sparql/util/Named.java |   24 -
 .../hp/hpl/jena/sparql/util/NodeComparator.java |   34 -
 .../hpl/jena/sparql/util/NodeFactoryExtra.java  |  250 -
 .../jena/sparql/util/NodeIsomorphismMap.java    |   51 -
 .../hp/hpl/jena/sparql/util/NodeToLabelMap.java |  102 -
 .../jena/sparql/util/NodeToLabelMapBNode.java   |   42 -
 .../com/hp/hpl/jena/sparql/util/NodeUtils.java  |  282 -
 .../jena/sparql/util/NotUniqueException.java    |   46 -
 .../hp/hpl/jena/sparql/util/PrefixMapping2.java |  216 -
 .../hpl/jena/sparql/util/PrintSerializable.java |   32 -
 .../jena/sparql/util/PrintSerializableBase.java |   46 -
 .../sparql/util/PropertyRequiredException.java  |   52 -
 .../hp/hpl/jena/sparql/util/QueryExecUtils.java |  369 -
 .../hpl/jena/sparql/util/QueryOutputUtils.java  |  117 -
 .../com/hp/hpl/jena/sparql/util/QueryUtils.java |  120 -
 .../hp/hpl/jena/sparql/util/ResultSetUtils.java |   95 -
 .../hp/hpl/jena/sparql/util/RomanNumeral.java   |  205 -
 .../jena/sparql/util/RomanNumeralDatatype.java  |   72 -
 .../hp/hpl/jena/sparql/util/StringUtils.java    |   78 -
 .../com/hp/hpl/jena/sparql/util/Symbol.java     |   63 -
 .../java/com/hp/hpl/jena/sparql/util/Timer.java |   71 -
 .../hpl/jena/sparql/util/TranslationTable.java  |   73 -
 .../hpl/jena/sparql/util/TripleComparator.java  |   44 -
 .../sparql/util/TypeNotUniqueException.java     |   31 -
 .../java/com/hp/hpl/jena/sparql/util/Utils.java |  184 -
 .../com/hp/hpl/jena/sparql/util/VarUtils.java   |   73 -
 .../com/hp/hpl/jena/sparql/util/Version.java    |  147 -
 .../hp/hpl/jena/sparql/util/graph/Findable.java |   30 -
 .../sparql/util/graph/FindableBasicPattern.java |   89 -
 .../jena/sparql/util/graph/FindableGraph.java   |   50 -
 .../hp/hpl/jena/sparql/util/graph/GNode.java    |   42 -
 .../sparql/util/graph/GraphContainerUtils.java  |  203 -
 .../hpl/jena/sparql/util/graph/GraphList.java   |  396 -
 .../sparql/util/graph/GraphListenerBase.java    |  123 -
 .../sparql/util/graph/GraphListenerCounter.java |  105 -
 .../sparql/util/graph/GraphLoadMonitor.java     |  148 -
 .../hpl/jena/sparql/util/graph/GraphSink.java   |   35 -
 .../hpl/jena/sparql/util/graph/GraphUtils.java  |  216 -
 .../com/hp/hpl/jena/sparql/vocabulary/DOAP.java |  229 -
 .../com/hp/hpl/jena/sparql/vocabulary/EARL.java |  137 -
 .../com/hp/hpl/jena/sparql/vocabulary/FOAF.java |  260 -
 .../jena/sparql/vocabulary/ListPFunction.java   |   75 -
 .../sparql/vocabulary/ResultSetGraphVocab.java  |   80 -
 .../hp/hpl/jena/sparql/vocabulary/TestDAWG.java |  113 -
 .../jena/sparql/vocabulary/TestManifest.java    |  131 -
 .../vocabulary/TestManifestUpdate_11.java       |   81 -
 .../jena/sparql/vocabulary/TestManifestX.java   |   79 -
 .../jena/sparql/vocabulary/TestManifest_11.java |   68 -
 .../jena/sparql/vocabulary/VocabTestQuery.java  |   59 -
 .../java/com/hp/hpl/jena/update/GraphStore.java |   39 -
 .../hp/hpl/jena/update/GraphStoreFactory.java   |   69 -
 .../java/com/hp/hpl/jena/update/Update.java     |   60 -
 .../com/hp/hpl/jena/update/UpdateAction.java    |  450 --
 .../com/hp/hpl/jena/update/UpdateException.java |   30 -
 .../hpl/jena/update/UpdateExecutionFactory.java |  412 -
 .../com/hp/hpl/jena/update/UpdateFactory.java   |  291 -
 .../com/hp/hpl/jena/update/UpdateProcessor.java |   42 -
 .../jena/update/UpdateProcessorStreaming.java   |   49 -
 .../com/hp/hpl/jena/update/UpdateRequest.java   |  102 -
 .../org/apache/jena/atlas/AtlasException.java   |   27 -
 .../apache/jena/atlas/RuntimeIOException.java   |   34 -
 .../org/apache/jena/atlas/csv/CSVParser.java    |    9 +-
 .../apache/jena/atlas/data/DistinctDataNet.java |    5 +-
 .../jena/atlas/data/ThresholdPolicyCount.java   |   10 -
 .../jena/atlas/data/ThresholdPolicyFactory.java |    8 +-
 .../jena/atlas/data/ThresholdPolicyMemory.java  |    5 -
 .../org/apache/jena/atlas/event/EventType.java  |    2 +-
 .../java/org/apache/jena/atlas/io/AWriter.java  |   43 -
 .../org/apache/jena/atlas/io/AWriterBase.java   |   33 -
 .../org/apache/jena/atlas/io/BlockUTF8.java     |  281 -
 .../apache/jena/atlas/io/BufferingWriter.java   |  180 -
 .../org/apache/jena/atlas/io/CharStream.java    |   31 -
 .../apache/jena/atlas/io/CharStreamBasic.java   |   58 -
 .../jena/atlas/io/CharStreamBuffered.java       |  166 -
 .../apache/jena/atlas/io/CharStreamReader.java  |   56 -
 .../jena/atlas/io/CharStreamSequence.java       |   47 -
 .../main/java/org/apache/jena/atlas/io/IO.java  |  335 -
 .../org/apache/jena/atlas/io/InStreamASCII.java |   89 -
 .../org/apache/jena/atlas/io/InStreamUTF8.java  |  254 -
 .../jena/atlas/io/IndentedLineBuffer.java       |   50 -
 .../apache/jena/atlas/io/IndentedWriter.java    |  366 -
 .../jena/atlas/io/InputStreamBuffered.java      |  104 -
 .../apache/jena/atlas/io/NullOutputStream.java  |   40 -
 .../org/apache/jena/atlas/io/OutStreamUTF8.java |  179 -
 .../org/apache/jena/atlas/io/OutputUtils.java   |   63 -
 .../apache/jena/atlas/io/PeekInputStream.java   |  234 -
 .../org/apache/jena/atlas/io/PeekReader.java    |  275 -
 .../org/apache/jena/atlas/io/PrintUtils.java    |   31 -
 .../org/apache/jena/atlas/io/Printable.java     |   24 -
 .../org/apache/jena/atlas/io/PrintableBase.java |   26 -
 .../org/apache/jena/atlas/io/StringWriterI.java |   30 -
 .../java/org/apache/jena/atlas/io/Writer2.java  |   97 -
 .../apache/jena/atlas/iterator/AccString.java   |   66 -
 .../apache/jena/atlas/iterator/Accumulate.java  |   27 -
 .../org/apache/jena/atlas/iterator/Action.java  |   24 -
 .../apache/jena/atlas/iterator/ActionCount.java |   31 -
 .../jena/atlas/iterator/ActionNothing.java      |   26 -
 .../apache/jena/atlas/iterator/ActionPrint.java |   41 -
 .../org/apache/jena/atlas/iterator/Filter.java  |   21 -
 .../atlas/iterator/FilterDistinctAdjacent.java  |   40 -
 .../jena/atlas/iterator/FilterOutNulls.java     |   32 -
 .../apache/jena/atlas/iterator/FilterStack.java |   67 -
 .../jena/atlas/iterator/FilterUnique.java       |   39 -
 .../org/apache/jena/atlas/iterator/Iter.java    |  954 ---
 .../jena/atlas/iterator/IteratorArray.java      |   92 -
 .../atlas/iterator/IteratorBlockingQueue.java   |   73 -
 .../jena/atlas/iterator/IteratorConcat.java     |  104 -
 .../jena/atlas/iterator/IteratorCons.java       |  122 -
 .../iterator/IteratorDelayedInitialization.java |   78 -
 .../jena/atlas/iterator/IteratorInteger.java    |   61 -
 .../atlas/iterator/IteratorResourceClosing.java |  107 -
 .../jena/atlas/iterator/IteratorSlotted.java    |  117 -
 .../jena/atlas/iterator/IteratorTruncate.java   |   79 -
 .../jena/atlas/iterator/IteratorWithBuffer.java |  132 -
 .../atlas/iterator/IteratorWithHistory.java     |  109 -
 .../jena/atlas/iterator/IteratorWrapper.java    |   41 -
 .../apache/jena/atlas/iterator/MapUtils.java    |   36 -
 .../jena/atlas/iterator/NullIterator.java       |   49 -
 .../jena/atlas/iterator/PeekIterator.java       |  100 -
 .../jena/atlas/iterator/PushbackIterator.java   |   62 -
 .../atlas/iterator/RepeatApplyIterator.java     |   87 -
 .../jena/atlas/iterator/SingletonIterator.java  |   51 -
 .../apache/jena/atlas/iterator/Transform.java   |   21 -
 .../jena/atlas/iterator/WrapperIterator.java    |   45 -
 .../org/apache/jena/atlas/json/JsonAccess.java  |  111 +-
 .../org/apache/jena/atlas/json/JsonArray.java   |    2 +-
 .../org/apache/jena/atlas/json/JsonBuilder.java |    4 +-
 .../atlas/json/io/parser/TokenizerJSON.java     |  697 +-
 .../io/parserjavacc/javacc/JSON_Parser.java     |    2 +-
 .../io/parserjavacc/javacc/JavaCharStream.java  |    2 +-
 .../io/parserjavacc/javacc/ParseException.java  |   30 +-
 .../json/io/parserjavacc/javacc/Token.java      |    2 +-
 .../io/parserjavacc/javacc/TokenMgrError.java   |    4 +-
 .../apache/jena/atlas/lib/ActionKeyValue.java   |   24 -
 .../org/apache/jena/atlas/lib/AlarmClock.java   |   69 -
 .../java/org/apache/jena/atlas/lib/Alg.java     |  239 -
 .../org/apache/jena/atlas/lib/Allocator.java    |   28 -
 .../org/apache/jena/atlas/lib/ArrayUtils.java   |   64 -
 .../java/org/apache/jena/atlas/lib/BitsInt.java |  309 -
 .../org/apache/jena/atlas/lib/BitsLong.java     |  311 -
 .../apache/jena/atlas/lib/ByteBufferLib.java    |  211 -
 .../java/org/apache/jena/atlas/lib/Bytes.java   |  393 -
 .../java/org/apache/jena/atlas/lib/Cache.java   |   51 -
 .../org/apache/jena/atlas/lib/CacheFactory.java |  107 -
 .../org/apache/jena/atlas/lib/CacheSet.java     |   30 -
 .../org/apache/jena/atlas/lib/CacheStats.java   |   28 -
 .../org/apache/jena/atlas/lib/Callback.java     |   24 -
 .../java/org/apache/jena/atlas/lib/Cell.java    |   99 -
 .../java/org/apache/jena/atlas/lib/Chars.java   |  261 -
 .../org/apache/jena/atlas/lib/Closeable.java    |   24 -
 .../apache/jena/atlas/lib/CollectionUtils.java  |   52 -
 .../org/apache/jena/atlas/lib/ColumnMap.java    |  254 -
 .../main/java/org/apache/jena/atlas/lib/DS.java |   45 -
 .../java/org/apache/jena/atlas/lib/FileOps.java |  239 -
 .../java/org/apache/jena/atlas/lib/Hex.java     |   97 -
 .../jena/atlas/lib/InternalErrorException.java  |   27 -
 .../java/org/apache/jena/atlas/lib/Lib.java     |  125 -
 .../org/apache/jena/atlas/lib/ListUtils.java    |  150 -
 .../java/org/apache/jena/atlas/lib/Map2.java    |  104 -
 .../org/apache/jena/atlas/lib/MapUtils.java     |   45 -
 .../org/apache/jena/atlas/lib/MultiMap.java     |  146 -
 .../apache/jena/atlas/lib/MultiMapToList.java   |   43 -
 .../apache/jena/atlas/lib/MultiMapToSet.java    |   47 -
 .../org/apache/jena/atlas/lib/MultiSet.java     |  218 -
 .../apache/jena/atlas/lib/NotImplemented.java   |   27 -
 .../org/apache/jena/atlas/lib/NumberUtils.java  |  133 -
 .../java/org/apache/jena/atlas/lib/Pair.java    |   62 -
 .../org/apache/jena/atlas/lib/Pingback.java     |   38 -
 .../java/org/apache/jena/atlas/lib/Pool.java    |   30 -
 .../org/apache/jena/atlas/lib/PoolBase.java     |   57 -
 .../jena/atlas/lib/PoolFiniteBlocking.java      |   52 -
 .../org/apache/jena/atlas/lib/PoolSync.java     |   53 -
 .../java/org/apache/jena/atlas/lib/Problem.java |   25 -
 .../apache/jena/atlas/lib/PropertiesSorted.java |   87 -
 .../apache/jena/atlas/lib/PropertyUtils.java    |  158 -
 .../org/apache/jena/atlas/lib/RandomLib.java    |   41 -
 .../java/org/apache/jena/atlas/lib/Ref.java     |   54 -
 .../java/org/apache/jena/atlas/lib/RefLong.java |   38 -
 .../org/apache/jena/atlas/lib/Registry.java     |   39 -
 .../jena/atlas/lib/ReverseComparator.java       |   38 -
 .../org/apache/jena/atlas/lib/SetUtils.java     |   84 -
 .../java/org/apache/jena/atlas/lib/Sink.java    |   29 -
 .../org/apache/jena/atlas/lib/SinkCounting.java |   41 -
 .../org/apache/jena/atlas/lib/SinkLogging.java  |   41 -
 .../org/apache/jena/atlas/lib/SinkNull.java     |   33 -
 .../org/apache/jena/atlas/lib/SinkPrint.java    |   45 -
 .../org/apache/jena/atlas/lib/SinkSplit.java    |   55 -
 .../apache/jena/atlas/lib/SinkToCollection.java |   38 -
 .../org/apache/jena/atlas/lib/SinkToQueue.java  |   52 -
 .../org/apache/jena/atlas/lib/SinkWrapper.java  |   44 -
 .../org/apache/jena/atlas/lib/StrUtils.java     |  295 -
 .../java/org/apache/jena/atlas/lib/Sync.java    |   24 -
 .../org/apache/jena/atlas/lib/SystemUtils.java  |   57 -
 .../java/org/apache/jena/atlas/lib/Trie.java    |  407 -
 .../java/org/apache/jena/atlas/lib/Tuple.java   |  153 -
 .../org/apache/jena/atlas/lib/TupleBuilder.java |   50 -
 .../java/org/apache/jena/atlas/lib/XMLLib.java  |   62 -
 .../org/apache/jena/atlas/lib/cache/Cache0.java |   80 -
 .../org/apache/jena/atlas/lib/cache/Cache1.java |  130 -
 .../apache/jena/atlas/lib/cache/CacheImpl.java  |   70 -
 .../apache/jena/atlas/lib/cache/CacheLRU.java   |   94 -
 .../jena/atlas/lib/cache/CacheSetLRU.java       |  115 -
 .../jena/atlas/lib/cache/CacheSetSync.java      |   55 -
 .../jena/atlas/lib/cache/CacheSetWrapper.java   |   59 -
 .../jena/atlas/lib/cache/CacheSimple.java       |  158 -
 .../jena/atlas/lib/cache/CacheStatsAtomic.java  |  120 -
 .../jena/atlas/lib/cache/CacheStatsSimple.java  |  109 -
 .../jena/atlas/lib/cache/CacheUnbounded.java    |   97 -
 .../jena/atlas/lib/cache/CacheWithGetter.java   |   47 -
 .../jena/atlas/lib/cache/CacheWrapper.java      |   62 -
 .../org/apache/jena/atlas/lib/cache/Getter.java |   25 -
 .../org/apache/jena/atlas/logging/FmtLog.java   |  162 -
 .../java/org/apache/jena/atlas/logging/Log.java |  116 -
 .../org/apache/jena/atlas/logging/LogCtl.java   |  284 -
 .../jena/atlas/logging/ProgressLogger.java      |  134 -
 .../logging/java/ConsoleHandlerStdout.java      |   75 -
 .../jena/atlas/logging/java/TextFormatter.java  |   53 -
 .../org/apache/jena/atlas/web/AcceptList.java   |  145 +-
 .../org/apache/jena/atlas/web/MediaType.java    |    4 +-
 .../atlas/web/auth/ServiceAuthenticator.java    |    6 +-
 .../main/java/org/apache/jena/query/ARQ.java    |  594 ++
 .../java/org/apache/jena/query/BIOInput.java    |   59 +
 .../java/org/apache/jena/query/Dataset.java     |   99 +
 .../org/apache/jena/query/DatasetAccessor.java  |   66 +
 .../jena/query/DatasetAccessorFactory.java      |   90 +
 .../org/apache/jena/query/DatasetFactory.java   |  268 +
 .../apache/jena/query/LabelExistsException.java |   32 +
 .../jena/query/ParameterizedSparqlString.java   | 1710 +++++
 .../main/java/org/apache/jena/query/Query.java  |  869 +++
 .../apache/jena/query/QueryBuildException.java  |   31 +
 .../jena/query/QueryCancelledException.java     |   25 +
 .../org/apache/jena/query/QueryException.java   |   33 +
 .../apache/jena/query/QueryExecException.java   |   31 +
 .../org/apache/jena/query/QueryExecution.java   |  227 +
 .../jena/query/QueryExecutionFactory.java       |  577 ++
 .../org/apache/jena/query/QueryFactory.java     |  232 +
 .../apache/jena/query/QueryFatalException.java  |   32 +
 .../apache/jena/query/QueryParseException.java  |   60 +
 .../org/apache/jena/query/QuerySolution.java    |   64 +
 .../org/apache/jena/query/QuerySolutionMap.java |   96 +
 .../org/apache/jena/query/QueryVisitor.java     |   47 +
 .../java/org/apache/jena/query/ReadWrite.java   |   25 +
 .../java/org/apache/jena/query/ResultSet.java   |   66 +
 .../org/apache/jena/query/ResultSetFactory.java |  451 ++
 .../apache/jena/query/ResultSetFormatter.java   |  683 ++
 .../apache/jena/query/ResultSetRewindable.java  |   28 +
 .../org/apache/jena/query/SortCondition.java    |  156 +
 .../main/java/org/apache/jena/query/Syntax.java |  170 +
 .../java/org/apache/jena/query/package.html     |   11 +
 .../main/java/org/apache/jena/riot/IO_Jena.java |    5 +-
 .../java/org/apache/jena/riot/RDFDataMgr.java   |  518 +-
 .../java/org/apache/jena/riot/RDFFormat.java    |    7 +-
 .../org/apache/jena/riot/RDFFormatVariant.java  |    6 +-
 .../java/org/apache/jena/riot/RDFLanguages.java |    5 +-
 .../org/apache/jena/riot/RDFParserRegistry.java |   22 +-
 .../org/apache/jena/riot/RDFWriterRegistry.java |   29 +-
 .../main/java/org/apache/jena/riot/RIOT.java    |    8 +-
 .../java/org/apache/jena/riot/ReaderRIOT.java   |    7 +-
 .../org/apache/jena/riot/ReaderRIOTBase.java    |    3 +-
 .../java/org/apache/jena/riot/ResultSetMgr.java |   53 +-
 .../org/apache/jena/riot/RiotException.java     |    2 +-
 .../java/org/apache/jena/riot/RiotReader.java   |  308 +-
 .../java/org/apache/jena/riot/RiotWriter.java   |    5 +-
 .../main/java/org/apache/jena/riot/SysRIOT.java |    5 +-
 .../java/org/apache/jena/riot/WebContent.java   |    6 +-
 .../org/apache/jena/riot/WriterDatasetRIOT.java |    5 +-
 .../org/apache/jena/riot/WriterGraphRIOT.java   |    5 +-
 .../java/org/apache/jena/riot/WriterRIOT.java   |    3 +-
 .../jena/riot/adapters/AdapterFileManager.java  |   21 +-
 .../apache/jena/riot/adapters/AdapterLib.java   |   27 +-
 .../riot/adapters/AdapterLocationMapper.java    |    5 +-
 .../jena/riot/adapters/AdapterLocator.java      |    4 +-
 .../jena/riot/adapters/AdapterRDFWriter.java    |    9 +-
 .../riot/adapters/FileManagerModelCache.java    |    5 +-
 .../jena/riot/adapters/JenaReadersWriters.java  |    6 +-
 .../riot/adapters/RDFReaderFactoryRIOT.java     |    5 +-
 .../jena/riot/adapters/RDFReaderRIOT.java       |   15 +-
 .../jena/riot/adapters/RDFReaderRIOT_ARP.java   |   15 +-
 .../jena/riot/adapters/RDFReaderRIOT_CSV.java   |    6 +-
 .../jena/riot/adapters/RDFReaderRIOT_Web.java   |    9 +-
 .../jena/riot/adapters/RDFWriterRIOT.java       |   15 +-
 .../jena/riot/checker/CheckerBlankNodes.java    |    3 +-
 .../apache/jena/riot/checker/CheckerIRI.java    |    4 +-
 .../jena/riot/checker/CheckerLiterals.java      |   17 +-
 .../apache/jena/riot/checker/CheckerVar.java    |    5 +-
 .../jena/riot/checker/CheckerVisitor.java       |   12 +-
 .../apache/jena/riot/checker/NodeChecker.java   |    2 +-
 .../jena/riot/checker/NodeCheckerNull.java      |    2 +-
 .../jena/riot/lang/BlankNodeAllocator.java      |    2 +-
 .../jena/riot/lang/BlankNodeAllocatorHash.java  |   34 +-
 .../jena/riot/lang/BlankNodeAllocatorLabel.java |    8 +-
 .../lang/BlankNodeAllocatorLabelEncoded.java    |   10 +-
 .../lang/BlankNodeAllocatorTraditional.java     |    6 +-
 .../jena/riot/lang/CollectorStreamBase.java     |    5 +-
 .../jena/riot/lang/CollectorStreamQuads.java    |    3 +-
 .../jena/riot/lang/CollectorStreamRDF.java      |    5 +-
 .../jena/riot/lang/CollectorStreamTriples.java  |    3 +-
 .../org/apache/jena/riot/lang/JsonLDReader.java |  128 +-
 .../org/apache/jena/riot/lang/LabelToNode.java  |    3 +-
 .../java/org/apache/jena/riot/lang/LangCSV.java |   11 +-
 .../org/apache/jena/riot/lang/LangEngine.java   |   12 +-
 .../org/apache/jena/riot/lang/LangNQuads.java   |    5 +-
 .../org/apache/jena/riot/lang/LangNTriples.java |    5 +-
 .../org/apache/jena/riot/lang/LangNTuple.java   |    3 +-
 .../org/apache/jena/riot/lang/LangRDFJSON.java  |    9 +-
 .../org/apache/jena/riot/lang/LangRDFXML.java   |   19 +-
 .../org/apache/jena/riot/lang/LangTriG.java     |    5 +-
 .../org/apache/jena/riot/lang/LangTurtle.java   |    5 +-
 .../apache/jena/riot/lang/LangTurtleBase.java   |   11 +-
 .../apache/jena/riot/lang/PipedQuadsStream.java |    5 +-
 .../apache/jena/riot/lang/PipedRDFIterator.java |    2 +
 .../jena/riot/lang/PipedTriplesStream.java      |    5 +-
 .../jena/riot/lang/PipedTuplesStream.java       |    7 +-
 .../org/apache/jena/riot/lang/ReaderTriX.java   |   27 +-
 .../org/apache/jena/riot/lang/RiotParsers.java  |  230 +
 .../jena/riot/lang/SinkQuadsToDataset.java      |    7 +-
 .../jena/riot/lang/SinkTriplesToGraph.java      |    9 +-
 .../jena/riot/other/BatchedStreamRDF.java       |   13 +-
 .../java/org/apache/jena/riot/other/GLib.java   |   69 +-
 .../jena/riot/other/StreamRDFBatchHandler.java  |    6 +-
 .../org/apache/jena/riot/out/EscapeProc.java    |   49 +
 .../org/apache/jena/riot/out/EscapeStr.java     |  117 -
 .../apache/jena/riot/out/JenaRDF2JSONLD.java    |    8 +-
 .../org/apache/jena/riot/out/JsonLDWriter.java  |   23 +-
 .../org/apache/jena/riot/out/NodeFmtLib.java    |   13 +-
 .../org/apache/jena/riot/out/NodeFormatter.java |    3 +-
 .../apache/jena/riot/out/NodeFormatterBase.java |   13 +-
 .../apache/jena/riot/out/NodeFormatterNT.java   |    4 +-
 .../apache/jena/riot/out/NodeFormatterTTL.java  |    5 +-
 .../org/apache/jena/riot/out/NodeToLabel.java   |    3 +-
 .../org/apache/jena/riot/out/OutputUtils.java   |   78 -
 .../jena/riot/out/SinkQuadBracedOutput.java     |   15 +-
 .../apache/jena/riot/out/SinkQuadOutput.java    |    5 +-
 .../apache/jena/riot/out/SinkTripleOutput.java  |    5 +-
 .../jena/riot/process/inf/InfFactory.java       |    3 +-
 .../process/inf/InferenceProcessorRDFS.java     |    4 +-
 .../inf/InferenceProcessorStreamRDF.java        |    7 +-
 .../riot/process/inf/InferenceSetupRDFS.java    |   13 +-
 .../process/normalize/CanonicalizeLiteral.java  |   19 +-
 .../riot/process/normalize/DatatypeHandler.java |    4 +-
 .../riot/process/normalize/NormalizeValue.java  |   14 +-
 .../riot/process/normalize/NormalizeValue2.java |    7 +-
 .../jena/riot/resultset/ResultSetReader.java    |    6 +-
 .../riot/resultset/ResultSetReaderRegistry.java |   13 +-
 .../jena/riot/resultset/ResultSetWriter.java    |    4 +-
 .../riot/resultset/ResultSetWriterRegistry.java |   11 +-
 .../org/apache/jena/riot/system/Checker.java    |    4 +-
 .../apache/jena/riot/system/IO_JenaReaders.java |   11 +-
 .../apache/jena/riot/system/IO_JenaWriters.java |   35 +-
 .../org/apache/jena/riot/system/IRILib.java     |  245 -
 .../apache/jena/riot/system/IRIResolver.java    |   36 +-
 .../jena/riot/system/IteratorStreamRDFText.java |    3 +-
 .../apache/jena/riot/system/JenaWriterBase.java |    9 +-
 .../jena/riot/system/LoggingStreamRDF.java      |    5 +-
 .../apache/jena/riot/system/ParserProfile.java  |    9 +-
 .../jena/riot/system/ParserProfileBase.java     |   13 +-
 .../jena/riot/system/ParserProfileChecker.java  |   13 +-
 .../org/apache/jena/riot/system/PrefixMap.java  |    3 +-
 .../apache/jena/riot/system/PrefixMapBase.java  |   28 +-
 .../jena/riot/system/PrefixMapFactory.java      |    2 +-
 .../apache/jena/riot/system/PrefixMapNull.java  |    3 +-
 .../jena/riot/system/PrefixMapUnmodifiable.java |    3 +-
 .../jena/riot/system/PrefixMapWrapper.java      |    3 +-
 .../org/apache/jena/riot/system/Prologue.java   |    2 +-
 .../org/apache/jena/riot/system/RiotChars.java  |   51 +-
 .../org/apache/jena/riot/system/RiotLib.java    |   28 +-
 .../riot/system/SerializationFactoryFinder.java |   11 +-
 .../org/apache/jena/riot/system/StreamOps.java  |   10 +-
 .../org/apache/jena/riot/system/StreamRDF.java  |    4 +-
 .../org/apache/jena/riot/system/StreamRDF2.java |    4 +-
 .../apache/jena/riot/system/StreamRDFBase.java  |    4 +-
 .../jena/riot/system/StreamRDFCollectOne.java   |    4 +-
 .../jena/riot/system/StreamRDFCountingBase.java |    5 +-
 .../apache/jena/riot/system/StreamRDFLib.java   |   28 +-
 .../jena/riot/system/StreamRDFWrapper.java      |    4 +-
 .../jena/riot/system/StreamRDFWriter.java       |    9 +-
 .../apache/jena/riot/system/StreamRowRDF.java   |    5 +-
 .../jena/riot/system/StreamRowRDFBase.java      |    4 +-
 .../riot/system/stream/JenaIOEnvironment.java   |   11 +-
 .../jena/riot/system/stream/LocationMapper.java |    9 +-
 .../riot/system/stream/LocatorClassLoader.java  |    4 +
 .../jena/riot/system/stream/LocatorFTP.java     |    1 +
 .../jena/riot/system/stream/LocatorFile.java    |    5 +-
 .../jena/riot/system/stream/LocatorHTTP.java    |    3 +-
 .../jena/riot/system/stream/LocatorStdin.java   |    1 +
 .../jena/riot/system/stream/LocatorURL.java     |    3 +-
 .../jena/riot/system/stream/LocatorZip.java     |    5 +-
 .../org/apache/jena/riot/thrift/BinRDF.java     |   21 +-
 .../apache/jena/riot/thrift/Binding2Thrift.java |    7 +-
 .../jena/riot/thrift/StreamRDF2Thrift.java      |    7 +-
 .../apache/jena/riot/thrift/Thift2Binding.java  |   11 +-
 .../jena/riot/thrift/Thrift2StreamRDF.java      |    5 +-
 .../apache/jena/riot/thrift/ThriftConvert.java  |   26 +-
 .../jena/riot/thrift/WriterDatasetThrift.java   |    5 +-
 .../jena/riot/thrift/WriterGraphThrift.java     |    5 +-
 .../java/org/apache/jena/riot/tokens/Token.java |   56 +-
 .../org/apache/jena/riot/tokens/Tokenizer.java  |    1 -
 .../jena/riot/tokens/TokenizerFactory.java      |   40 +-
 .../apache/jena/riot/tokens/TokenizerText.java  |  128 +-
 .../java/org/apache/jena/riot/web/HttpOp.java   |  109 +-
 .../apache/jena/riot/web/HttpResponseLib.java   |   14 +-
 .../apache/jena/riot/writer/NQuadsWriter.java   |    7 +-
 .../apache/jena/riot/writer/NTriplesWriter.java |    7 +-
 .../org/apache/jena/riot/writer/NullWriter.java |    5 +-
 .../apache/jena/riot/writer/RDFJSONWriter.java  |   15 +-
 .../jena/riot/writer/RDFXMLAbbrevWriter.java    |    5 +-
 .../jena/riot/writer/RDFXMLPlainWriter.java     |    5 +-
 .../jena/riot/writer/StreamWriterTriX.java      |   35 +-
 .../org/apache/jena/riot/writer/TriGWriter.java |    7 +-
 .../apache/jena/riot/writer/TriGWriterBase.java |    5 +-
 .../jena/riot/writer/TriGWriterBlocks.java      |    3 +-
 .../apache/jena/riot/writer/TriGWriterFlat.java |    3 +-
 .../apache/jena/riot/writer/TurtleShell.java    |  188 +-
 .../apache/jena/riot/writer/TurtleWriter.java   |   28 +-
 .../jena/riot/writer/TurtleWriterBase.java      |    5 +-
 .../jena/riot/writer/TurtleWriterBlocks.java    |    3 +-
 .../jena/riot/writer/TurtleWriterFlat.java      |    3 +-
 .../apache/jena/riot/writer/WriterConst.java    |    4 +-
 .../jena/riot/writer/WriterDatasetRIOTBase.java |    5 +-
 .../jena/riot/writer/WriterGraphRIOTBase.java   |    5 +-
 .../jena/riot/writer/WriterStreamRDFBase.java   |    7 +-
 .../riot/writer/WriterStreamRDFBatched.java     |   13 +-
 .../jena/riot/writer/WriterStreamRDFBlocks.java |   15 +-
 .../jena/riot/writer/WriterStreamRDFFlat.java   |    7 +-
 .../jena/riot/writer/WriterStreamRDFPlain.java  |    7 +-
 .../org/apache/jena/riot/writer/WriterTriX.java |    9 +-
 .../org/apache/jena/sparql/ARQConstants.java    |  279 +
 .../org/apache/jena/sparql/ARQException.java    |   31 +
 .../jena/sparql/ARQInternalErrorException.java  |   33 +
 .../apache/jena/sparql/ARQNotImplemented.java   |   39 +
 .../org/apache/jena/sparql/AlreadyExists.java   |   29 +
 .../org/apache/jena/sparql/DoesNotExist.java    |   29 +
 .../jena/sparql/JenaTransactionException.java   |   29 +
 .../java/org/apache/jena/sparql/SystemARQ.java  |  159 +
 .../org/apache/jena/sparql/algebra/Algebra.java |  219 +
 .../jena/sparql/algebra/AlgebraGenerator.java   |  675 ++
 .../apache/jena/sparql/algebra/AlgebraQuad.java |  115 +
 .../jena/sparql/algebra/BeforeAfterVisitor.java |   82 +
 .../apache/jena/sparql/algebra/JoinType.java    |   21 +
 .../java/org/apache/jena/sparql/algebra/Op.java |   30 +
 .../apache/jena/sparql/algebra/OpAsQuery.java   |  898 +++
 .../jena/sparql/algebra/OpExtBuilder.java       |   30 +
 .../jena/sparql/algebra/OpExtRegistry.java      |   89 +
 .../org/apache/jena/sparql/algebra/OpLib.java   |   48 +
 .../jena/sparql/algebra/OpPrefixesUsed.java     |  112 +
 .../org/apache/jena/sparql/algebra/OpVars.java  |  427 ++
 .../apache/jena/sparql/algebra/OpVisitor.java   |   71 +
 .../jena/sparql/algebra/OpVisitorBase.java      |   94 +
 .../jena/sparql/algebra/OpVisitorByType.java    |  181 +
 .../sparql/algebra/OpVisitorByTypeBase.java     |   50 +
 .../apache/jena/sparql/algebra/OpWalker.java    |  131 +
 .../algebra/PropertyFunctionGenerator.java      |  241 +
 .../org/apache/jena/sparql/algebra/Table.java   |   42 +
 .../jena/sparql/algebra/TableFactory.java       |   58 +
 .../apache/jena/sparql/algebra/Transform.java   |   72 +
 .../jena/sparql/algebra/TransformBase.java      |  103 +
 .../jena/sparql/algebra/TransformCopy.java      |  164 +
 .../jena/sparql/algebra/TransformQuadGraph.java |  124 +
 .../sparql/algebra/TransformUnionQuery.java     |  119 +
 .../jena/sparql/algebra/TransformWrapper.java   |  111 +
 .../apache/jena/sparql/algebra/Transformer.java |  497 ++
 .../org/apache/jena/sparql/algebra/op/Op0.java  |   30 +
 .../org/apache/jena/sparql/algebra/op/Op1.java  |   40 +
 .../org/apache/jena/sparql/algebra/op/Op2.java  |   55 +
 .../apache/jena/sparql/algebra/op/OpAssign.java |  126 +
 .../apache/jena/sparql/algebra/op/OpBGP.java    |   70 +
 .../apache/jena/sparql/algebra/op/OpBase.java   |   79 +
 .../jena/sparql/algebra/op/OpConditional.java   |   65 +
 .../jena/sparql/algebra/op/OpDatasetNames.java  |   60 +
 .../apache/jena/sparql/algebra/op/OpDiff.java   |   55 +
 .../jena/sparql/algebra/op/OpDisjunction.java   |   97 +
 .../jena/sparql/algebra/op/OpDistinct.java      |   61 +
 .../sparql/algebra/op/OpDistinctReduced.java    |   28 +
 .../apache/jena/sparql/algebra/op/OpExt.java    |   97 +
 .../apache/jena/sparql/algebra/op/OpExtend.java |  130 +
 .../jena/sparql/algebra/op/OpExtendAssign.java  |   55 +
 .../apache/jena/sparql/algebra/op/OpFilter.java |  124 +
 .../apache/jena/sparql/algebra/op/OpGraph.java  |   63 +
 .../apache/jena/sparql/algebra/op/OpGroup.java  |   82 +
 .../apache/jena/sparql/algebra/op/OpJoin.java   |   91 +
 .../apache/jena/sparql/algebra/op/OpLabel.java  |   91 +
 .../jena/sparql/algebra/op/OpLeftJoin.java      |   75 +
 .../apache/jena/sparql/algebra/op/OpList.java   |   60 +
 .../apache/jena/sparql/algebra/op/OpMinus.java  |   55 +
 .../jena/sparql/algebra/op/OpModifier.java      |   38 +
 .../org/apache/jena/sparql/algebra/op/OpN.java  |   76 +
 .../apache/jena/sparql/algebra/op/OpNull.java   |   58 +
 .../apache/jena/sparql/algebra/op/OpOrder.java  |   72 +
 .../apache/jena/sparql/algebra/op/OpPath.java   |   75 +
 .../jena/sparql/algebra/op/OpProcedure.java     |  111 +
 .../jena/sparql/algebra/op/OpProject.java       |   70 +
 .../jena/sparql/algebra/op/OpPropFunc.java      |  113 +
 .../apache/jena/sparql/algebra/op/OpQuad.java   |  100 +
 .../jena/sparql/algebra/op/OpQuadBlock.java     |  141 +
 .../jena/sparql/algebra/op/OpQuadPattern.java   |  113 +
 .../jena/sparql/algebra/op/OpReduced.java       |   61 +
 .../jena/sparql/algebra/op/OpSequence.java      |   94 +
 .../jena/sparql/algebra/op/OpService.java       |   78 +
 .../apache/jena/sparql/algebra/op/OpSlice.java  |   73 +
 .../apache/jena/sparql/algebra/op/OpTable.java  |   77 +
 .../apache/jena/sparql/algebra/op/OpTopN.java   |   74 +
 .../apache/jena/sparql/algebra/op/OpTriple.java |  103 +
 .../apache/jena/sparql/algebra/op/OpUnion.java  |   60 +
 .../optimize/ExprTransformApplyTransform.java   |   60 +
 .../optimize/ExprTransformConstantFold.java     |  110 +
 .../optimize/ExprVisitorApplyVisitor.java       |   41 +
 .../algebra/optimize/OpVisitorExprPrepare.java  |   48 +
 .../jena/sparql/algebra/optimize/Optimize.java  |  307 +
 .../jena/sparql/algebra/optimize/Rewrite.java   |   26 +
 .../optimize/TransformDistinctToReduced.java    |  168 +
 .../optimize/TransformEliminateAssignments.java |  618 ++
 .../algebra/optimize/TransformExpandOneOf.java  |  126 +
 .../optimize/TransformExtendCombine.java        |   84 +
 .../optimize/TransformFilterConjunction.java    |   53 +
 .../optimize/TransformFilterDisjunction.java    |  187 +
 .../optimize/TransformFilterEquality.java       |  411 +
 .../optimize/TransformFilterImplicitJoin.java   |  488 ++
 .../optimize/TransformFilterInequality.java     |  416 +
 .../optimize/TransformFilterPlacement.java      |  787 ++
 .../TransformFilterPlacementConservative.java   |  278 +
 .../optimize/TransformImplicitLeftJoin.java     |  426 ++
 .../algebra/optimize/TransformJoinStrategy.java |   86 +
 .../algebra/optimize/TransformMergeBGPs.java    |  119 +
 .../TransformOrderByDistinctApplication.java    |  173 +
 .../algebra/optimize/TransformPathFlattern.java |   61 +
 .../optimize/TransformPathFlatternStd.java      |  224 +
 .../algebra/optimize/TransformPattern2Join.java |   91 +
 .../optimize/TransformPromoteTableEmpty.java    |  166 +
 .../optimize/TransformPropertyFunction.java     |  105 +
 .../optimize/TransformRemoveAssignment.java     |  143 +
 .../algebra/optimize/TransformRemoveLabels.java |   33 +
 .../algebra/optimize/TransformReorder.java      |   82 +
 .../algebra/optimize/TransformScopeRename.java  |  119 +
 .../algebra/optimize/TransformSimplify.java     |   65 +
 .../sparql/algebra/optimize/TransformTopN.java  |  225 +
 .../algebra/optimize/VariableUsagePopper.java   |   57 +
 .../algebra/optimize/VariableUsagePusher.java   |   59 +
 .../algebra/optimize/VariableUsageTracker.java  |   92 +
 .../algebra/optimize/VariableUsageVisitor.java  |  206 +
 .../jena/sparql/algebra/table/Table1.java       |   90 +
 .../jena/sparql/algebra/table/TableBase.java    |  125 +
 .../jena/sparql/algebra/table/TableData.java    |   40 +
 .../jena/sparql/algebra/table/TableEmpty.java   |   66 +
 .../jena/sparql/algebra/table/TableN.java       |  104 +
 .../jena/sparql/algebra/table/TableUnit.java    |   71 +
 .../jena/sparql/algebra/table/TableWriter.java  |   74 +
 .../apache/jena/sparql/core/BasicPattern.java   |  121 +
 .../jena/sparql/core/ComparisonException.java   |   25 +
 .../apache/jena/sparql/core/DatasetChanges.java |   42 +
 .../jena/sparql/core/DatasetChangesBatched.java |  101 +
 .../jena/sparql/core/DatasetChangesCapture.java |  115 +
 .../jena/sparql/core/DatasetChangesCounter.java |   72 +
 .../jena/sparql/core/DatasetDescription.java    |  109 +
 .../apache/jena/sparql/core/DatasetGraph.java   |  135 +
 .../core/DatasetGraphAltDefaultGraph.java       |   65 +
 .../jena/sparql/core/DatasetGraphBase.java      |  195 +
 .../jena/sparql/core/DatasetGraphBaseFind.java  |   81 +
 .../jena/sparql/core/DatasetGraphCaching.java   |  175 +
 .../sparql/core/DatasetGraphCollection.java     |  108 +
 .../jena/sparql/core/DatasetGraphFactory.java   |   97 +
 .../jena/sparql/core/DatasetGraphMaker.java     |   49 +
 .../jena/sparql/core/DatasetGraphMap.java       |  125 +
 .../jena/sparql/core/DatasetGraphMonitor.java   |  203 +
 .../jena/sparql/core/DatasetGraphOne.java       |  166 +
 .../jena/sparql/core/DatasetGraphQuad.java      |   54 +
 .../jena/sparql/core/DatasetGraphReadOnly.java  |   89 +
 .../jena/sparql/core/DatasetGraphSimpleMem.java |  242 +
 .../sparql/core/DatasetGraphTrackActive.java    |  179 +
 .../sparql/core/DatasetGraphTriplesQuads.java   |   65 +
 .../sparql/core/DatasetGraphViewGraphs.java     |   48 +
 .../jena/sparql/core/DatasetGraphWithLock.java  |  173 +
 .../jena/sparql/core/DatasetGraphWrapper.java   |  158 +
 .../apache/jena/sparql/core/DatasetImpl.java    |  282 +
 .../jena/sparql/core/DatasetPrefixStorage.java  |   57 +
 .../jena/sparql/core/DynamicDatasets.java       |  133 +
 .../org/apache/jena/sparql/core/GraphView.java  |  161 +
 .../org/apache/jena/sparql/core/PathBlock.java  |   83 +
 .../org/apache/jena/sparql/core/Prologue.java   |  237 +
 .../java/org/apache/jena/sparql/core/Quad.java  |  219 +
 .../org/apache/jena/sparql/core/QuadAction.java |   40 +
 .../apache/jena/sparql/core/QuadPattern.java    |  103 +
 .../jena/sparql/core/QueryCheckException.java   |   29 +
 .../apache/jena/sparql/core/QueryCompare.java   |  191 +
 .../apache/jena/sparql/core/QueryHashCode.java  |  145 +
 .../jena/sparql/core/QuerySolutionBase.java     |   50 +
 .../apache/jena/sparql/core/ResultBinding.java  |   98 +
 .../org/apache/jena/sparql/core/Substitute.java |  294 +
 .../apache/jena/sparql/core/Transactional.java  |   46 +
 .../jena/sparql/core/TransactionalNull.java     |   58 +
 .../org/apache/jena/sparql/core/TriplePath.java |  138 +
 .../java/org/apache/jena/sparql/core/Var.java   |  196 +
 .../org/apache/jena/sparql/core/VarAlloc.java   |   58 +
 .../apache/jena/sparql/core/VarExprList.java    |  162 +
 .../java/org/apache/jena/sparql/core/Vars.java  |   51 +
 .../sparql/core/assembler/AssemblerUtils.java   |  128 +
 .../sparql/core/assembler/DatasetAssembler.java |  104 +
 .../assembler/DatasetAssemblerException.java    |   31 +
 .../core/assembler/DatasetAssemblerVocab.java   |   48 +
 .../assembler/DatasetDescriptionAssembler.java  |   54 +
 .../core/assembler/DatasetNullAssembler.java    |   61 +
 .../core/describe/DescribeBNodeClosure.java     |  100 +
 .../describe/DescribeBNodeClosureFactory.java   |   28 +
 .../sparql/core/describe/DescribeHandler.java   |   51 +
 .../core/describe/DescribeHandlerFactory.java   |   27 +
 .../core/describe/DescribeHandlerRegistry.java  |  101 +
 .../jena/sparql/engine/ExecutionContext.java    |  131 +
 .../org/apache/jena/sparql/engine/OpEval.java   |   31 +
 .../org/apache/jena/sparql/engine/Plan.java     |   37 +
 .../org/apache/jena/sparql/engine/PlanBase.java |   80 +
 .../org/apache/jena/sparql/engine/PlanOp.java   |   74 +
 .../jena/sparql/engine/QueryEngineBase.java     |  161 +
 .../jena/sparql/engine/QueryEngineFactory.java  |   92 +
 .../engine/QueryEngineFactoryWrapper.java       |   69 +
 .../jena/sparql/engine/QueryEngineRegistry.java |  151 +
 .../jena/sparql/engine/QueryExecutionBase.java  |  647 ++
 .../jena/sparql/engine/QueryIterator.java       |   38 +
 .../org/apache/jena/sparql/engine/Rename.java   |  188 +
 .../sparql/engine/ResultSetCheckCondition.java  |  111 +
 .../jena/sparql/engine/ResultSetStream.java     |  146 +
 .../apache/jena/sparql/engine/TableJoin.java    |  104 +
 .../jena/sparql/engine/binding/Binding.java     |   45 +
 .../jena/sparql/engine/binding/Binding0.java    |   51 +
 .../jena/sparql/engine/binding/Binding1.java    |   70 +
 .../jena/sparql/engine/binding/BindingBase.java |  229 +
 .../engine/binding/BindingComparator.java       |  177 +
 .../sparql/engine/binding/BindingFactory.java   |   64 +
 .../sparql/engine/binding/BindingFixed.java     |   80 +
 .../sparql/engine/binding/BindingHashMap.java   |  118 +
 .../engine/binding/BindingInputStream.java      |  235 +
 .../jena/sparql/engine/binding/BindingMap.java  |   38 +
 .../engine/binding/BindingOutputStream.java     |  193 +
 .../sparql/engine/binding/BindingProject.java   |   38 +
 .../engine/binding/BindingProjectBase.java      |   87 +
 .../engine/binding/BindingProjectNamed.java     |   36 +
 .../jena/sparql/engine/binding/BindingRoot.java |   35 +
 .../sparql/engine/binding/BindingUtils.java     |   97 +
 .../sparql/engine/binding/BindingWrapped.java   |   75 +
 .../sparql/engine/http/HttpContentType.java     |  112 +
 .../jena/sparql/engine/http/HttpParams.java     |   52 +
 .../jena/sparql/engine/http/HttpQuery.java      |  465 ++
 .../apache/jena/sparql/engine/http/Params.java  |  163 +
 .../sparql/engine/http/QueryEngineHTTP.java     |  895 +++
 .../sparql/engine/http/QueryExceptionHTTP.java  |  116 +
 .../apache/jena/sparql/engine/http/Service.java |  284 +
 .../sparql/engine/index/HashIndexTable.java     |  219 +
 .../jena/sparql/engine/index/IndexFactory.java  |   46 +
 .../jena/sparql/engine/index/IndexTable.java    |   35 +
 .../jena/sparql/engine/index/LinearIndex.java   |  113 +
 .../jena/sparql/engine/index/SetIndexTable.java |   70 +
 .../jena/sparql/engine/iterator/QueryIter.java  |  103 +
 .../jena/sparql/engine/iterator/QueryIter1.java |   87 +
 .../jena/sparql/engine/iterator/QueryIter2.java |   93 +
 .../engine/iterator/QueryIter2LoopOnLeft.java   |   82 +
 .../sparql/engine/iterator/QueryIterAssign.java |  100 +
 .../iterator/QueryIterAssignVarValue.java       |   83 +
 .../engine/iterator/QueryIterBlockTriples.java  |   96 +
 .../engine/iterator/QueryIterCommonParent.java  |   81 +
 .../sparql/engine/iterator/QueryIterConcat.java |  143 +
 .../engine/iterator/QueryIterConvert.java       |   72 +
 .../engine/iterator/QueryIterDefaulting.java    |   99 +
 .../sparql/engine/iterator/QueryIterDiff.java   |   55 +
 .../engine/iterator/QueryIterDistinct.java      |  148 +
 .../engine/iterator/QueryIterDistinctMem.java   |   53 +
 .../iterator/QueryIterDistinctReduced.java      |   80 +
 .../iterator/QueryIterDistinguishedVars.java    |   47 +
 .../engine/iterator/QueryIterExtendByVar.java   |   73 +
 .../engine/iterator/QueryIterFilterExpr.java    |   72 +
 .../sparql/engine/iterator/QueryIterGroup.java  |  202 +
 .../sparql/engine/iterator/QueryIterMinus.java  |   89 +
 .../engine/iterator/QueryIterNullIterator.java  |   58 +
 .../sparql/engine/iterator/QueryIterPath.java   |   60 +
 .../sparql/engine/iterator/QueryIterPeek.java   |   80 +
 .../engine/iterator/QueryIterPlainWrapper.java  |   77 +
 .../engine/iterator/QueryIterProcedure.java     |   90 +
 .../iterator/QueryIterProcessBinding.java       |   99 +
 .../engine/iterator/QueryIterProject.java       |   75 +
 .../engine/iterator/QueryIterProjectMerge.java  |  104 +
 .../engine/iterator/QueryIterReduced.java       |   53 +
 .../engine/iterator/QueryIterRepeatApply.java   |  126 +
 .../sparql/engine/iterator/QueryIterRoot.java   |   48 +
 .../engine/iterator/QueryIterSingleton.java     |   63 +
 .../sparql/engine/iterator/QueryIterSlice.java  |   97 +
 .../sparql/engine/iterator/QueryIterSort.java   |  108 +
 .../sparql/engine/iterator/QueryIterSub.java    |   60 +
 .../sparql/engine/iterator/QueryIterTopN.java   |  118 +
 .../engine/iterator/QueryIterTracked.java       |   63 +
 .../engine/iterator/QueryIterTriplePattern.java |  170 +
 .../sparql/engine/iterator/QueryIterYieldN.java |   84 +
 .../engine/iterator/QueryIteratorBase.java      |  265 +
 .../engine/iterator/QueryIteratorCaching.java   |   77 +
 .../engine/iterator/QueryIteratorCheck.java     |  107 +
 .../engine/iterator/QueryIteratorCloseable.java |   40 +
 .../engine/iterator/QueryIteratorCopy.java      |   90 +
 .../engine/iterator/QueryIteratorLogging.java   |   70 +
 .../engine/iterator/QueryIteratorMapped.java    |   80 +
 .../engine/iterator/QueryIteratorResultSet.java |   46 +
 .../engine/iterator/QueryIteratorTiming.java    |   86 +
 .../engine/iterator/QueryIteratorWrapper.java   |   73 +
 .../sparql/engine/main/ExecutionDispatch.java   |  334 +
 .../jena/sparql/engine/main/JoinClassifier.java |  185 +
 .../sparql/engine/main/LeftJoinClassifier.java  |  121 +
 .../jena/sparql/engine/main/OpExecutor.java     |  465 ++
 .../sparql/engine/main/OpExecutorFactory.java   |   23 +
 .../org/apache/jena/sparql/engine/main/QC.java  |   66 +
 .../sparql/engine/main/QueryEngineMain.java     |  105 +
 .../sparql/engine/main/QueryEngineMainQuad.java |   79 +
 .../jena/sparql/engine/main/StageBuilder.java   |  118 +
 .../jena/sparql/engine/main/StageGenerator.java |   49 +
 .../engine/main/StageGeneratorGeneric.java      |   85 +
 .../jena/sparql/engine/main/VarFinder.java      |  320 +
 .../engine/main/iterator/QueryIterGraph.java    |  208 +
 .../engine/main/iterator/QueryIterJoin.java     |   32 +
 .../engine/main/iterator/QueryIterJoinBase.java |   79 +
 .../engine/main/iterator/QueryIterLeftJoin.java |   32 +
 .../main/iterator/QueryIterOptionalIndex.java   |   64 +
 .../engine/main/iterator/QueryIterService.java  |   77 +
 .../engine/main/iterator/QueryIterUnion.java    |   76 +
 .../jena/sparql/engine/optimizer/Pattern.java   |   63 +
 .../sparql/engine/optimizer/StatsMatcher.java   |  511 ++
 .../optimizer/reorder/PatternElements.java      |   55 +
 .../engine/optimizer/reorder/PatternTriple.java |   75 +
 .../engine/optimizer/reorder/ReorderFixed.java  |  109 +
 .../optimizer/reorder/ReorderFixedAlt.java      |   79 +
 .../engine/optimizer/reorder/ReorderLib.java    |   79 +
 .../engine/optimizer/reorder/ReorderProc.java   |   31 +
 .../optimizer/reorder/ReorderProcIndexes.java   |   69 +
 .../reorder/ReorderTransformation.java          |   30 +
 .../ReorderTransformationSubstitution.java      |  300 +
 .../optimizer/reorder/ReorderWeighted.java      |   37 +
 .../engine/optimizer/reorder/Reorderable.java   |   25 +
 .../org/apache/jena/sparql/engine/ref/Eval.java |  287 +
 .../jena/sparql/engine/ref/Evaluator.java       |   68 +
 .../sparql/engine/ref/EvaluatorDispatch.java    |  346 +
 .../sparql/engine/ref/EvaluatorFactory.java     |   29 +
 .../jena/sparql/engine/ref/EvaluatorSimple.java |  343 +
 .../jena/sparql/engine/ref/QueryEngineRef.java  |  106 +
 .../sparql/engine/ref/QueryEngineRefQuad.java   |   82 +
 .../java/org/apache/jena/sparql/expr/E_Add.java |   47 +
 .../org/apache/jena/sparql/expr/E_BNode.java    |   99 +
 .../org/apache/jena/sparql/expr/E_Bound.java    |   52 +
 .../org/apache/jena/sparql/expr/E_Call.java     |  132 +
 .../org/apache/jena/sparql/expr/E_Cast.java     |   49 +
 .../org/apache/jena/sparql/expr/E_Coalesce.java |   61 +
 .../apache/jena/sparql/expr/E_Conditional.java  |   68 +
 .../org/apache/jena/sparql/expr/E_Datatype.java |   38 +
 .../apache/jena/sparql/expr/E_DateTimeDay.java  |   38 +
 .../jena/sparql/expr/E_DateTimeHours.java       |   38 +
 .../jena/sparql/expr/E_DateTimeMinutes.java     |   38 +
 .../jena/sparql/expr/E_DateTimeMonth.java       |   38 +
 .../jena/sparql/expr/E_DateTimeSeconds.java     |   38 +
 .../apache/jena/sparql/expr/E_DateTimeTZ.java   |   38 +
 .../jena/sparql/expr/E_DateTimeTimezone.java    |   38 +
 .../apache/jena/sparql/expr/E_DateTimeYear.java |   38 +
 .../org/apache/jena/sparql/expr/E_Divide.java   |   47 +
 .../org/apache/jena/sparql/expr/E_Equals.java   |   46 +
 .../org/apache/jena/sparql/expr/E_Exists.java   |   91 +
 .../org/apache/jena/sparql/expr/E_Function.java |  137 +
 .../jena/sparql/expr/E_FunctionDynamic.java     |   43 +
 .../apache/jena/sparql/expr/E_GreaterThan.java  |   42 +
 .../jena/sparql/expr/E_GreaterThanOrEqual.java  |   43 +
 .../java/org/apache/jena/sparql/expr/E_IRI.java |   64 +
 .../org/apache/jena/sparql/expr/E_IsBlank.java  |   38 +
 .../org/apache/jena/sparql/expr/E_IsIRI.java    |   43 +
 .../apache/jena/sparql/expr/E_IsLiteral.java    |   43 +
 .../apache/jena/sparql/expr/E_IsNumeric.java    |   43 +
 .../org/apache/jena/sparql/expr/E_IsURI.java    |   40 +
 .../org/apache/jena/sparql/expr/E_Lang.java     |   38 +
 .../apache/jena/sparql/expr/E_LangMatches.java  |   41 +
 .../org/apache/jena/sparql/expr/E_LessThan.java |   42 +
 .../jena/sparql/expr/E_LessThanOrEqual.java     |   42 +
 .../apache/jena/sparql/expr/E_LogicalAnd.java   |   95 +
 .../apache/jena/sparql/expr/E_LogicalNot.java   |   45 +
 .../apache/jena/sparql/expr/E_LogicalOr.java    |  110 +
 .../java/org/apache/jena/sparql/expr/E_MD5.java |   36 +
 .../org/apache/jena/sparql/expr/E_Multiply.java |   46 +
 .../apache/jena/sparql/expr/E_NotEquals.java    |   46 +
 .../apache/jena/sparql/expr/E_NotExists.java    |   98 +
 .../org/apache/jena/sparql/expr/E_NotOneOf.java |   58 +
 .../java/org/apache/jena/sparql/expr/E_Now.java |   38 +
 .../org/apache/jena/sparql/expr/E_NumAbs.java   |   38 +
 .../apache/jena/sparql/expr/E_NumCeiling.java   |   38 +
 .../org/apache/jena/sparql/expr/E_NumFloor.java |   38 +
 .../org/apache/jena/sparql/expr/E_NumRound.java |   38 +
 .../org/apache/jena/sparql/expr/E_OneOf.java    |   59 +
 .../apache/jena/sparql/expr/E_OneOfBase.java    |   92 +
 .../org/apache/jena/sparql/expr/E_Random.java   |   46 +
 .../org/apache/jena/sparql/expr/E_Regex.java    |  129 +
 .../org/apache/jena/sparql/expr/E_SHA1.java     |   36 +
 .../org/apache/jena/sparql/expr/E_SHA224.java   |   36 +
 .../org/apache/jena/sparql/expr/E_SHA256.java   |   36 +
 .../org/apache/jena/sparql/expr/E_SHA384.java   |   36 +
 .../org/apache/jena/sparql/expr/E_SHA512.java   |   36 +
 .../org/apache/jena/sparql/expr/E_SameTerm.java |   41 +
 .../java/org/apache/jena/sparql/expr/E_Str.java |   38 +
 .../org/apache/jena/sparql/expr/E_StrAfter.java |   38 +
 .../apache/jena/sparql/expr/E_StrBefore.java    |   38 +
 .../apache/jena/sparql/expr/E_StrConcat.java    |   48 +
 .../apache/jena/sparql/expr/E_StrContains.java  |   38 +
 .../apache/jena/sparql/expr/E_StrDatatype.java  |   44 +
 .../jena/sparql/expr/E_StrEncodeForURI.java     |   41 +
 .../apache/jena/sparql/expr/E_StrEndsWith.java  |   38 +
 .../org/apache/jena/sparql/expr/E_StrLang.java  |   43 +
 .../apache/jena/sparql/expr/E_StrLength.java    |   38 +
 .../apache/jena/sparql/expr/E_StrLowerCase.java |   38 +
 .../apache/jena/sparql/expr/E_StrReplace.java   |   82 +
 .../jena/sparql/expr/E_StrStartsWith.java       |   38 +
 .../apache/jena/sparql/expr/E_StrSubstring.java |   52 +
 .../org/apache/jena/sparql/expr/E_StrUUID.java  |   45 +
 .../apache/jena/sparql/expr/E_StrUpperCase.java |   38 +
 .../org/apache/jena/sparql/expr/E_Subtract.java |   47 +
 .../java/org/apache/jena/sparql/expr/E_URI.java |   43 +
 .../org/apache/jena/sparql/expr/E_UUID.java     |   45 +
 .../apache/jena/sparql/expr/E_UnaryMinus.java   |   39 +
 .../apache/jena/sparql/expr/E_UnaryPlus.java    |   39 +
 .../org/apache/jena/sparql/expr/E_Version.java  |   45 +
 .../java/org/apache/jena/sparql/expr/Expr.java  |  125 +
 .../apache/jena/sparql/expr/ExprAggregator.java |  147 +
 .../org/apache/jena/sparql/expr/ExprBuild.java  |   44 +
 .../org/apache/jena/sparql/expr/ExprDigest.java |  128 +
 .../jena/sparql/expr/ExprEvalException.java     |   33 +
 .../jena/sparql/expr/ExprEvalTypeException.java |   29 +
 .../apache/jena/sparql/expr/ExprException.java  |   32 +
 .../apache/jena/sparql/expr/ExprFunction.java   |  126 +
 .../apache/jena/sparql/expr/ExprFunction0.java  |   73 +
 .../apache/jena/sparql/expr/ExprFunction1.java  |   98 +
 .../apache/jena/sparql/expr/ExprFunction2.java  |  112 +
 .../apache/jena/sparql/expr/ExprFunction3.java  |  122 +
 .../apache/jena/sparql/expr/ExprFunctionN.java  |  124 +
 .../apache/jena/sparql/expr/ExprFunctionOp.java |   99 +
 .../org/apache/jena/sparql/expr/ExprLib.java    |  162 +
 .../org/apache/jena/sparql/expr/ExprList.java   |  159 +
 .../org/apache/jena/sparql/expr/ExprNode.java   |  125 +
 .../sparql/expr/ExprNotComparableException.java |   25 +
 .../org/apache/jena/sparql/expr/ExprSystem.java |   53 +
 .../apache/jena/sparql/expr/ExprTransform.java  |   34 +
 .../jena/sparql/expr/ExprTransformBase.java     |   34 +
 .../jena/sparql/expr/ExprTransformCopy.java     |  154 +
 .../jena/sparql/expr/ExprTransformOp.java       |   26 +
 .../sparql/expr/ExprTransformSubstitute.java    |   68 +
 .../jena/sparql/expr/ExprTransformer.java       |  208 +
 .../jena/sparql/expr/ExprTypeException.java     |   31 +
 .../jena/sparql/expr/ExprUndefException.java    |   31 +
 .../org/apache/jena/sparql/expr/ExprVar.java    |  132 +
 .../org/apache/jena/sparql/expr/ExprVars.java   |  155 +
 .../apache/jena/sparql/expr/ExprVisitor.java    |   38 +
 .../jena/sparql/expr/ExprVisitorBase.java       |   47 +
 .../jena/sparql/expr/ExprVisitorFunction.java   |   36 +
 .../org/apache/jena/sparql/expr/ExprWalker.java |  119 +
 .../apache/jena/sparql/expr/FunctionLabel.java  |   27 +
 .../org/apache/jena/sparql/expr/NodeValue.java  | 1232 +++
 .../apache/jena/sparql/expr/RegexEngine.java    |   27 +
 .../org/apache/jena/sparql/expr/RegexJava.java  |   83 +
 .../apache/jena/sparql/expr/RegexXerces.java    |   49 +
 .../sparql/expr/ValueSpaceClassification.java   |   40 +
 .../sparql/expr/VariableNotBoundException.java  |   31 +
 .../jena/sparql/expr/aggregate/Accumulator.java |   34 +
 .../expr/aggregate/AccumulatorDistinctAll.java  |   43 +
 .../expr/aggregate/AccumulatorDistinctExpr.java |   75 +
 .../sparql/expr/aggregate/AccumulatorExpr.java  |   75 +
 .../expr/aggregate/AccumulatorFactory.java      |   31 +
 .../jena/sparql/expr/aggregate/AggAvg.java      |  110 +
 .../sparql/expr/aggregate/AggAvgDistinct.java   |  103 +
 .../jena/sparql/expr/aggregate/AggCount.java    |   84 +
 .../sparql/expr/aggregate/AggCountDistinct.java |   87 +
 .../jena/sparql/expr/aggregate/AggCountVar.java |   80 +
 .../expr/aggregate/AggCountVarDistinct.java     |   82 +
 .../jena/sparql/expr/aggregate/AggCustom.java   |  171 +
 .../sparql/expr/aggregate/AggGroupConcat.java   |  165 +
 .../expr/aggregate/AggGroupConcatDistinct.java  |  116 +
 .../jena/sparql/expr/aggregate/AggMax.java      |   43 +
 .../jena/sparql/expr/aggregate/AggMaxBase.java  |   77 +
 .../sparql/expr/aggregate/AggMaxDistinct.java   |   43 +
 .../jena/sparql/expr/aggregate/AggMin.java      |   43 +
 .../jena/sparql/expr/aggregate/AggMinBase.java  |   77 +
 .../sparql/expr/aggregate/AggMinDistinct.java   |   44 +
 .../jena/sparql/expr/aggregate/AggNull.java     |   74 +
 .../jena/sparql/expr/aggregate/AggSample.java   |   83 +
 .../expr/aggregate/AggSampleDistinct.java       |   81 +
 .../jena/sparql/expr/aggregate/AggSum.java      |   91 +
 .../sparql/expr/aggregate/AggSumDistinct.java   |   91 +
 .../expr/aggregate/AggregateRegistry.java       |   70 +
 .../jena/sparql/expr/aggregate/Aggregator.java  |   61 +
 .../sparql/expr/aggregate/AggregatorBase.java   |  183 +
 .../expr/aggregate/AggregatorFactory.java       |   71 +
 .../sparql/expr/nodevalue/NodeFunctions.java    |  478 ++
 .../sparql/expr/nodevalue/NodeValueBoolean.java |   52 +
 .../jena/sparql/expr/nodevalue/NodeValueDT.java |   91 +
 .../sparql/expr/nodevalue/NodeValueDecimal.java |   73 +
 .../sparql/expr/nodevalue/NodeValueDouble.java  |   68 +
 .../expr/nodevalue/NodeValueDuration.java       |   55 +
 .../sparql/expr/nodevalue/NodeValueFloat.java   |   64 +
 .../sparql/expr/nodevalue/NodeValueInteger.java |   79 +
 .../sparql/expr/nodevalue/NodeValueNode.java    |   40 +
 .../sparql/expr/nodevalue/NodeValueOps.java     |  316 +
 .../sparql/expr/nodevalue/NodeValueString.java  |   62 +
 .../sparql/expr/nodevalue/NodeValueVisitor.java |   41 +
 .../jena/sparql/expr/nodevalue/NumericType.java |   21 +
 .../jena/sparql/expr/nodevalue/XSDFuncOp.java   | 1413 ++++
 .../apache/jena/sparql/function/CastXSD.java    |  135 +
 .../jena/sparql/function/CastXSD_Boolean.java   |   82 +
 .../jena/sparql/function/CastXSD_DateTime.java  |   54 +
 .../jena/sparql/function/CastXSD_Numeric.java   |   64 +
 .../apache/jena/sparql/function/Function.java   |   50 +
 .../jena/sparql/function/FunctionBase.java      |   87 +
 .../jena/sparql/function/FunctionBase0.java     |   55 +
 .../jena/sparql/function/FunctionBase1.java     |   57 +
 .../jena/sparql/function/FunctionBase2.java     |   59 +
 .../jena/sparql/function/FunctionBase3.java     |   59 +
 .../jena/sparql/function/FunctionBase4.java     |   61 +
 .../jena/sparql/function/FunctionEnv.java       |   41 +
 .../jena/sparql/function/FunctionEnvBase.java   |   83 +
 .../jena/sparql/function/FunctionFactory.java   |   35 +
 .../sparql/function/FunctionFactoryAuto.java    |   45 +
 .../jena/sparql/function/FunctionRegistry.java  |  123 +
 .../jena/sparql/function/StandardFunctions.java |  142 +
 .../jena/sparql/function/library/FN_Abs.java    |   34 +
 .../jena/sparql/function/library/FN_BEV.java    |   34 +
 .../sparql/function/library/FN_Ceiling.java     |   34 +
 .../function/library/FN_DayFromDateTime.java    |   33 +
 .../function/library/FN_DaysFromDuration.java   |   33 +
 .../jena/sparql/function/library/FN_Floor.java  |   35 +
 .../function/library/FN_HoursFromDateTime.java  |   33 +
 .../function/library/FN_HoursFromDuration.java  |   33 +
 .../sparql/function/library/FN_Matches.java     |   74 +
 .../library/FN_MinutesFromDateTime.java         |   33 +
 .../library/FN_MinutesFromDuration.java         |   33 +
 .../function/library/FN_MonthFromDateTime.java  |   33 +
 .../function/library/FN_MonthsFromDuration.java |   33 +
 .../jena/sparql/function/library/FN_Not.java    |   34 +
 .../jena/sparql/function/library/FN_Round.java  |   34 +
 .../library/FN_SecondsFromDateTime.java         |   33 +
 .../library/FN_SecondsFromDuration.java         |   33 +
 .../sparql/function/library/FN_StrAfter.java    |   36 +
 .../sparql/function/library/FN_StrBefore.java   |   36 +
 .../sparql/function/library/FN_StrConcat.java   |   51 +
 .../sparql/function/library/FN_StrContains.java |   36 +
 .../function/library/FN_StrEncodeForURI.java    |   33 +
 .../sparql/function/library/FN_StrEndsWith.java |   36 +
 .../sparql/function/library/FN_StrLength.java   |   36 +
 .../function/library/FN_StrLowerCase.java       |   36 +
 .../function/library/FN_StrStartsWith.java      |   36 +
 .../function/library/FN_StrSubstring.java       |   63 +
 .../function/library/FN_StrUpperCase.java       |   36 +
 .../library/FN_TimezoneFromDateTime.java        |   33 +
 .../function/library/FN_YearFromDateTime.java   |   33 +
 .../function/library/FN_YearsFromDuration.java  |   34 +
 .../jena/sparql/function/library/SystemVar.java |   61 +
 .../jena/sparql/function/library/bnode.java     |   41 +
 .../jena/sparql/function/library/date.java      |   60 +
 .../apache/jena/sparql/function/library/e.java  |   33 +
 .../jena/sparql/function/library/eval.java      |   71 +
 .../sparql/function/library/evenInteger.java    |   42 +
 .../jena/sparql/function/library/langeq.java    |   34 +
 .../library/leviathan/LeviathanConstants.java   |   39 +
 .../function/library/leviathan/cartesian.java   |   62 +
 .../sparql/function/library/leviathan/cos.java  |   31 +
 .../sparql/function/library/leviathan/cos1.java |   31 +
 .../function/library/leviathan/cosec.java       |   32 +
 .../function/library/leviathan/cosec1.java      |   32 +
 .../sparql/function/library/leviathan/cot.java  |   33 +
 .../sparql/function/library/leviathan/cot1.java |   32 +
 .../sparql/function/library/leviathan/cube.java |   49 +
 .../library/leviathan/degreesToRadians.java     |   31 +
 .../sparql/function/library/leviathan/e.java    |   31 +
 .../function/library/leviathan/factorial.java   |   53 +
 .../sparql/function/library/leviathan/ln.java   |   31 +
 .../sparql/function/library/leviathan/log.java  |   57 +
 .../function/library/leviathan/md5hash.java     |   35 +
 .../sparql/function/library/leviathan/pow.java  |   49 +
 .../function/library/leviathan/pythagoras.java  |   34 +
 .../library/leviathan/radiansToDegrees.java     |   31 +
 .../function/library/leviathan/reciprocal.java  |   31 +
 .../sparql/function/library/leviathan/rnd.java  |   69 +
 .../sparql/function/library/leviathan/root.java |   34 +
 .../sparql/function/library/leviathan/sec.java  |   32 +
 .../sparql/function/library/leviathan/sec1.java |   32 +
 .../function/library/leviathan/sha256hash.java  |   35 +
 .../sparql/function/library/leviathan/sin.java  |   31 +
 .../sparql/function/library/leviathan/sin1.java |   31 +
 .../sparql/function/library/leviathan/sq.java   |   49 +
 .../sparql/function/library/leviathan/sqrt.java |   31 +
 .../sparql/function/library/leviathan/tan.java  |   31 +
 .../sparql/function/library/leviathan/tan1.java |   31 +
 .../sparql/function/library/leviathan/ten.java  |   31 +
 .../jena/sparql/function/library/localname.java |   42 +
 .../jena/sparql/function/library/max.java       |   36 +
 .../jena/sparql/function/library/min.java       |   36 +
 .../jena/sparql/function/library/namespace.java |   42 +
 .../jena/sparql/function/library/now.java       |   30 +
 .../apache/jena/sparql/function/library/pi.java |   32 +
 .../jena/sparql/function/library/print.java     |   35 +
 .../jena/sparql/function/library/sha1sum.java   |   48 +
 .../jena/sparql/function/library/sqrt.java      |   35 +
 .../jena/sparql/function/library/strjoin.java   |   69 +
 .../jena/sparql/function/library/strlen.java    |   23 +
 .../jena/sparql/function/library/struuid.java   |   36 +
 .../jena/sparql/function/library/substr.java    |   24 +
 .../jena/sparql/function/library/substring.java |   63 +
 .../jena/sparql/function/library/uuid.java      |   36 +
 .../jena/sparql/function/library/wait.java      |   38 +
 .../function/user/ExprTransformExpand.java      |   90 +
 .../function/user/UserDefinedFunction.java      |   92 +
 .../user/UserDefinedFunctionDefinition.java     |  106 +
 .../user/UserDefinedFunctionFactory.java        |  243 +
 .../apache/jena/sparql/graph/GraphDataBag.java  |  125 +
 .../jena/sparql/graph/GraphDefaultDataBag.java  |   43 +
 .../jena/sparql/graph/GraphDistinctDataBag.java |   44 +
 .../apache/jena/sparql/graph/GraphFactory.java  |   91 +
 .../apache/jena/sparql/graph/GraphMemPlain.java |  181 +
 .../org/apache/jena/sparql/graph/GraphOps.java  |   88 +
 .../sparql/graph/GraphPrefixesProjection.java   |  111 +
 .../apache/jena/sparql/graph/GraphReadOnly.java |   55 +
 .../apache/jena/sparql/graph/GraphSPARQL.java   |  206 +
 .../jena/sparql/graph/GraphSPARQLService.java   |  130 +
 .../jena/sparql/graph/GraphUnionRead.java       |   76 +
 .../apache/jena/sparql/graph/GraphWrapper.java  |  146 +
 .../org/apache/jena/sparql/graph/NodeConst.java |   48 +
 .../apache/jena/sparql/graph/NodeTransform.java |   29 +
 .../jena/sparql/graph/NodeTransformLib.java     |  243 +
 .../jena/sparql/graph/NodeTransformOp.java      |  218 +
 .../jena/sparql/graph/UnmodifiableGraph.java    |   42 +
 .../org/apache/jena/sparql/lang/ParserARQ.java  |  125 +
 .../jena/sparql/lang/ParserARQUpdate.java       |   91 +
 .../org/apache/jena/sparql/lang/ParserBase.java |  563 ++
 .../apache/jena/sparql/lang/ParserSPARQL10.java |  124 +
 .../apache/jena/sparql/lang/ParserSPARQL11.java |  125 +
 .../jena/sparql/lang/ParserSPARQL11Update.java  |   89 +
 .../apache/jena/sparql/lang/SPARQLParser.java   |   55 +
 .../jena/sparql/lang/SPARQLParserBase.java      |  320 +
 .../jena/sparql/lang/SPARQLParserFactory.java   |   30 +
 .../jena/sparql/lang/SPARQLParserRegistry.java  |  145 +
 .../apache/jena/sparql/lang/SyntaxVarScope.java |  311 +
 .../apache/jena/sparql/lang/UpdateParser.java   |   62 +
 .../jena/sparql/lang/UpdateParserFactory.java   |   30 +
 .../jena/sparql/lang/UpdateParserRegistry.java  |  136 +
 .../apache/jena/sparql/lang/arq/ARQParser.java  | 7108 ++++++++++++++++++
 .../jena/sparql/lang/arq/ARQParserBase.java     |   94 +
 .../sparql/lang/arq/ARQParserConstants.java     |  633 ++
 .../sparql/lang/arq/ARQParserTokenManager.java  | 3896 ++++++++++
 .../jena/sparql/lang/arq/JavaCharStream.java    |  617 ++
 .../jena/sparql/lang/arq/ParseException.java    |  187 +
 .../org/apache/jena/sparql/lang/arq/Token.java  |  131 +
 .../jena/sparql/lang/arq/TokenMgrError.java     |  147 +
 .../sparql/lang/sparql_10/JavaCharStream.java   |  635 ++
 .../sparql/lang/sparql_10/ParseException.java   |  209 +
 .../sparql/lang/sparql_10/SPARQLParser10.java   | 2323 ++++++
 .../lang/sparql_10/SPARQLParser10Base.java      |   26 +
 .../lang/sparql_10/SPARQLParser10Constants.java |  351 +
 .../sparql_10/SPARQLParser10TokenManager.java   | 2459 ++++++
 .../jena/sparql/lang/sparql_10/Token.java       |  149 +
 .../sparql/lang/sparql_10/TokenMgrError.java    |  165 +
 .../sparql/lang/sparql_11/JavaCharStream.java   |  617 ++
 .../sparql/lang/sparql_11/ParseException.java   |  187 +
 .../sparql/lang/sparql_11/SPARQLParser11.java   | 5118 +++++++++++++
 .../lang/sparql_11/SPARQLParser11Base.java      |   26 +
 .../lang/sparql_11/SPARQLParser11Constants.java |  612 ++
 .../sparql_11/SPARQLParser11TokenManager.java   | 3830 ++++++++++
 .../jena/sparql/lang/sparql_11/Token.java       |  131 +
 .../sparql/lang/sparql_11/TokenMgrError.java    |  147 +
 .../org/apache/jena/sparql/lib/Metadata.java    |  111 +
 .../java/org/apache/jena/sparql/mgt/ARQMgt.java |   27 +
 .../org/apache/jena/sparql/mgt/ARQMgt_X.java    |  135 +
 .../apache/jena/sparql/mgt/ContextMBean.java    |  132 +
 .../org/apache/jena/sparql/mgt/Explain.java     |  373 +
 .../apache/jena/sparql/mgt/QueryEngineInfo.java |   68 +
 .../jena/sparql/mgt/QueryEngineInfoMBean.java   |   38 +
 .../apache/jena/sparql/mgt/QueryExecMBean.java  |   35 +
 .../org/apache/jena/sparql/mgt/SystemInfo.java  |   70 +
 .../apache/jena/sparql/mgt/SystemInfoMBean.java |   26 +
 .../jena/sparql/modify/GraphStoreAction.java    |   23 +
 .../jena/sparql/modify/GraphStoreBasic.java     |   38 +
 .../jena/sparql/modify/GraphStoreNull.java      |   73 +
 .../modify/GraphStoreNullTransactional.java     |   64 +
 .../jena/sparql/modify/GraphStoreWrapper.java   |   35 +
 .../modify/NodeTransformBNodesToVariables.java  |   53 +
 .../apache/jena/sparql/modify/TemplateLib.java  |  192 +
 .../jena/sparql/modify/UpdateCompare.java       |   57 +
 .../apache/jena/sparql/modify/UpdateEngine.java |   43 +
 .../jena/sparql/modify/UpdateEngineBase.java    |   56 +
 .../jena/sparql/modify/UpdateEngineFactory.java |   35 +
 .../jena/sparql/modify/UpdateEngineMain.java    |   89 +
 .../sparql/modify/UpdateEngineNonStreaming.java |  101 +
 .../sparql/modify/UpdateEngineRegistry.java     |   97 +
 .../jena/sparql/modify/UpdateEngineWorker.java  |  636 ++
 .../jena/sparql/modify/UpdateProcessRemote.java |   82 +
 .../sparql/modify/UpdateProcessRemoteBase.java  |  318 +
 .../sparql/modify/UpdateProcessRemoteForm.java  |   89 +
 .../jena/sparql/modify/UpdateProcessorBase.java |   74 +
 .../modify/UpdateProcessorStreamingBase.java    |   67 +
 .../jena/sparql/modify/UpdateRequestSink.java   |   75 +
 .../apache/jena/sparql/modify/UpdateSink.java   |   41 +
 .../jena/sparql/modify/UpdateVisitorSink.java   |   68 +
 .../apache/jena/sparql/modify/UsingList.java    |   44 +
 .../jena/sparql/modify/UsingUpdateSink.java     |   93 +
 .../jena/sparql/modify/request/QuadAcc.java     |   64 +
 .../jena/sparql/modify/request/QuadAccSink.java |   72 +
 .../jena/sparql/modify/request/QuadDataAcc.java |   83 +
 .../sparql/modify/request/QuadDataAccSink.java  |   57 +
 .../jena/sparql/modify/request/Target.java      |   96 +
 .../jena/sparql/modify/request/UpdateAdd.java   |   30 +
 .../sparql/modify/request/UpdateBinaryOp.java   |   66 +
 .../jena/sparql/modify/request/UpdateClear.java |   36 +
 .../jena/sparql/modify/request/UpdateCopy.java  |   30 +
 .../sparql/modify/request/UpdateCreate.java     |   74 +
 .../jena/sparql/modify/request/UpdateData.java  |   49 +
 .../sparql/modify/request/UpdateDataDelete.java |   28 +
 .../sparql/modify/request/UpdateDataInsert.java |   28 +
 .../sparql/modify/request/UpdateDataWriter.java |   57 +
 .../modify/request/UpdateDeleteInsert.java      |   25 +
 .../modify/request/UpdateDeleteWhere.java       |   51 +
 .../jena/sparql/modify/request/UpdateDrop.java  |   36 +
 .../sparql/modify/request/UpdateDropClear.java  |   63 +
 .../jena/sparql/modify/request/UpdateLoad.java  |   80 +
 .../sparql/modify/request/UpdateModify.java     |  125 +
 .../jena/sparql/modify/request/UpdateMove.java  |   30 +
 .../sparql/modify/request/UpdateSerializer.java |   65 +
 .../sparql/modify/request/UpdateVisitor.java    |   43 +
 .../sparql/modify/request/UpdateWithUsing.java  |   66 +
 .../sparql/modify/request/UpdateWriter.java     |  279 +
 .../modify/request/UpdateWriterVisitor.java     |  294 +
 .../java/org/apache/jena/sparql/path/P_Alt.java |   43 +
 .../org/apache/jena/sparql/path/P_Distinct.java |   50 +
 .../apache/jena/sparql/path/P_FixedLength.java  |   52 +
 .../org/apache/jena/sparql/path/P_Inverse.java  |   50 +
 .../org/apache/jena/sparql/path/P_Link.java     |   52 +
 .../java/org/apache/jena/sparql/path/P_Mod.java |   92 +
 .../org/apache/jena/sparql/path/P_Multi.java    |   51 +
 .../apache/jena/sparql/path/P_NegPropSet.java   |   73 +
 .../apache/jena/sparql/path/P_OneOrMore1.java   |   47 +
 .../apache/jena/sparql/path/P_OneOrMoreN.java   |   47 +
 .../org/apache/jena/sparql/path/P_Path0.java    |   30 +
 .../org/apache/jena/sparql/path/P_Path1.java    |   34 +
 .../org/apache/jena/sparql/path/P_Path2.java    |   57 +
 .../apache/jena/sparql/path/P_ReverseLink.java  |   52 +
 .../java/org/apache/jena/sparql/path/P_Seq.java |   45 +
 .../org/apache/jena/sparql/path/P_Shortest.java |   50 +
 .../apache/jena/sparql/path/P_ZeroOrMore1.java  |   47 +
 .../apache/jena/sparql/path/P_ZeroOrMoreN.java  |   47 +
 .../apache/jena/sparql/path/P_ZeroOrOne.java    |   47 +
 .../java/org/apache/jena/sparql/path/Path.java  |   29 +
 .../org/apache/jena/sparql/path/PathBase.java   |   75 +
 .../apache/jena/sparql/path/PathCompiler.java   |  195 +
 .../apache/jena/sparql/path/PathFactory.java    |   45 +
 .../org/apache/jena/sparql/path/PathLib.java    |  256 +
 .../org/apache/jena/sparql/path/PathParser.java |   74 +
 .../jena/sparql/path/PathPropertyFunction.java  |   49 +
 .../apache/jena/sparql/path/PathVisitor.java    |   44 +
 .../jena/sparql/path/PathVisitorBase.java       |   44 +
 .../jena/sparql/path/PathVisitorByType.java     |   76 +
 .../org/apache/jena/sparql/path/PathWriter.java |  310 +
 .../jena/sparql/path/eval/PathEngine.java       |  248 +
 .../jena/sparql/path/eval/PathEngine1.java      |  244 +
 .../jena/sparql/path/eval/PathEngineN.java      |  225 +
 .../jena/sparql/path/eval/PathEngineSPARQL.java |  267 +
 .../apache/jena/sparql/path/eval/PathEval.java  |   79 +
 .../jena/sparql/path/eval/PathEvaluator.java    |  189 +
 .../jena/sparql/pfunction/PFuncAssignBase.java  |   61 +
 .../sparql/pfunction/PFuncAssignToObject.java   |   29 +
 .../sparql/pfunction/PFuncAssignToSubject.java  |   40 +
 .../jena/sparql/pfunction/PFuncSimple.java      |   58 +
 .../sparql/pfunction/PFuncSimpleAndList.java    |   58 +
 .../jena/sparql/pfunction/ProcedurePF.java      |   72 +
 .../jena/sparql/pfunction/PropFuncArg.java      |  134 +
 .../jena/sparql/pfunction/PropFuncArgType.java  |   38 +
 .../jena/sparql/pfunction/PropertyFunction.java |   57 +
 .../sparql/pfunction/PropertyFunctionBase.java  |  125 +
 .../sparql/pfunction/PropertyFunctionEval.java  |   47 +
 .../pfunction/PropertyFunctionFactory.java      |   27 +
 .../pfunction/PropertyFunctionFactoryAuto.java  |   47 +
 .../pfunction/PropertyFunctionRegistry.java     |  166 +
 .../jena/sparql/pfunction/library/ListBase.java |  148 +
 .../sparql/pfunction/library/ListBase1.java     |   62 +
 .../sparql/pfunction/library/ListBaseList.java  |   58 +
 .../jena/sparql/pfunction/library/alt.java      |   29 +
 .../jena/sparql/pfunction/library/assign.java   |   55 +
 .../jena/sparql/pfunction/library/bag.java      |   29 +
 .../sparql/pfunction/library/blankNode.java     |   52 +
 .../jena/sparql/pfunction/library/bnode.java    |   24 +
 .../jena/sparql/pfunction/library/concat.java   |   54 +
 .../sparql/pfunction/library/container.java     |  182 +
 .../sparql/pfunction/library/listIndex.java     |  156 +
 .../sparql/pfunction/library/listLength.java    |   80 +
 .../sparql/pfunction/library/listMember.java    |   93 +
 .../jena/sparql/pfunction/library/seq.java      |   29 +
 .../jena/sparql/pfunction/library/splitIRI.java |  141 +
 .../jena/sparql/pfunction/library/splitURI.java |   23 +
 .../jena/sparql/pfunction/library/str.java      |   77 +
 .../jena/sparql/pfunction/library/strSplit.java |   70 +
 .../jena/sparql/pfunction/library/version.java  |   79 +
 .../sparql/pfunction/library/versionARQ.java    |   69 +
 .../apache/jena/sparql/procedure/ProcEval.java  |   78 +
 .../apache/jena/sparql/procedure/Procedure.java |   53 +
 .../jena/sparql/procedure/ProcedureBase.java    |   92 +
 .../jena/sparql/procedure/ProcedureEval.java    |   59 +
 .../jena/sparql/procedure/ProcedureFactory.java |   27 +
 .../sparql/procedure/ProcedureFactoryAuto.java  |   45 +
 .../sparql/procedure/ProcedureRegistry.java     |  124 +
 .../sparql/procedure/StandardProcedures.java    |   30 +
 .../jena/sparql/procedure/library/debug.java    |   37 +
 .../apache/jena/sparql/resultset/CSVInput.java  |  139 +
 .../jena/sparql/resultset/CSVInputIterator.java |  201 +
 .../apache/jena/sparql/resultset/CSVOutput.java |  154 +
 .../apache/jena/sparql/resultset/JSONInput.java |  273 +
 .../sparql/resultset/JSONInputIterator.java     |  752 ++
 .../jena/sparql/resultset/JSONOutput.java       |   45 +
 .../jena/sparql/resultset/JSONOutputASK.java    |   57 +
 .../sparql/resultset/JSONOutputResultSet.java   |  271 +
 .../jena/sparql/resultset/JSONResultsKW.java    |   42 +
 .../jena/sparql/resultset/OutputBase.java       |   42 +
 .../jena/sparql/resultset/OutputFormatter.java  |   46 +
 .../jena/sparql/resultset/PlainFormat.java      |   89 +
 .../apache/jena/sparql/resultset/RDFInput.java  |  197 +
 .../apache/jena/sparql/resultset/RDFOutput.java |  286 +
 .../jena/sparql/resultset/ResultSetApply.java   |   61 +
 .../jena/sparql/resultset/ResultSetCompare.java |  330 +
 .../sparql/resultset/ResultSetException.java    |   28 +
 .../jena/sparql/resultset/ResultSetMem.java     |  206 +
 .../sparql/resultset/ResultSetPeekable.java     |   46 +
 .../jena/sparql/resultset/ResultSetPeeking.java |  182 +
 .../sparql/resultset/ResultSetProcessor.java    |   48 +
 .../jena/sparql/resultset/ResultsFormat.java    |  196 +
 .../jena/sparql/resultset/SPARQLResult.java     |  152 +
 .../jena/sparql/resultset/SortedResultSet.java  |  145 +
 .../apache/jena/sparql/resultset/TSVInput.java  |  127 +
 .../jena/sparql/resultset/TSVInputIterator.java |  155 +
 .../apache/jena/sparql/resultset/TSVOutput.java |  122 +
 .../jena/sparql/resultset/TextOutput.java       |  239 +
 .../apache/jena/sparql/resultset/XMLInput.java  |  103 +
 .../jena/sparql/resultset/XMLInputSAX.java      |  377 +
 .../jena/sparql/resultset/XMLInputStAX.java     |  517 ++
 .../apache/jena/sparql/resultset/XMLOutput.java |   77 +
 .../jena/sparql/resultset/XMLOutputASK.java     |   84 +
 .../sparql/resultset/XMLOutputResultSet.java    |  314 +
 .../jena/sparql/resultset/XMLResults.java       |   50 +
 .../jena/sparql/serializer/FmtExprSPARQL.java   |  236 +
 .../jena/sparql/serializer/FmtTemplate.java     |   96 +
 .../jena/sparql/serializer/FormatterBase.java   |   61 +
 .../sparql/serializer/FormatterElement.java     |  604 ++
 .../sparql/serializer/FormatterTemplate.java    |   28 +
 .../sparql/serializer/PrologueSerializer.java   |   81 +
 .../jena/sparql/serializer/QuerySerializer.java |  408 +
 .../serializer/QuerySerializerFactory.java      |   66 +
 .../sparql/serializer/SerializationContext.java |  157 +
 .../sparql/serializer/SerializerRegistry.java   |  235 +
 .../serializer/UpdateSerializerFactory.java     |   43 +
 .../java/org/apache/jena/sparql/sse/Item.java   |  381 +
 .../apache/jena/sparql/sse/ItemException.java   |   25 +
 .../org/apache/jena/sparql/sse/ItemList.java    |  155 +
 .../apache/jena/sparql/sse/ItemLocation.java    |   46 +
 .../apache/jena/sparql/sse/ItemTransform.java   |   29 +
 .../jena/sparql/sse/ItemTransformBase.java      |   43 +
 .../apache/jena/sparql/sse/ItemTransformer.java |   84 +
 .../org/apache/jena/sparql/sse/ItemVisitor.java |   29 +
 .../org/apache/jena/sparql/sse/ItemWalker.java  |   62 +
 .../org/apache/jena/sparql/sse/ItemWriter.java  |  213 +
 .../java/org/apache/jena/sparql/sse/SSE.java    |  513 ++
 .../jena/sparql/sse/SSEParseException.java      |   48 +
 .../java/org/apache/jena/sparql/sse/Tags.java   |  235 +
 .../org/apache/jena/sparql/sse/WriterSSE.java   |   68 +
 .../sparql/sse/builders/BuildException.java     |   29 +
 .../sparql/sse/builders/BuilderBinding.java     |   76 +
 .../jena/sparql/sse/builders/BuilderExec.java   |   48 +
 .../jena/sparql/sse/builders/BuilderExpr.java   | 1419 ++++
 .../jena/sparql/sse/builders/BuilderGraph.java  |  248 +
 .../jena/sparql/sse/builders/BuilderLib.java    |  185 +
 .../jena/sparql/sse/builders/BuilderNode.java   |  182 +
 .../jena/sparql/sse/builders/BuilderOp.java     |  791 ++
 .../jena/sparql/sse/builders/BuilderPath.java   |  338 +
 .../sse/builders/BuilderPrefixMapping.java      |  110 +
 .../sparql/sse/builders/BuilderResultSet.java   |   57 +
 .../jena/sparql/sse/builders/BuilderTable.java  |   89 +
 .../sparql/sse/builders/ExprBuildException.java |   29 +
 .../sparql/sse/builders/OpBuildException.java   |   29 +
 .../jena/sparql/sse/lang/ParseHandler.java      |   41 +
 .../jena/sparql/sse/lang/ParseHandler2.java     |  118 +
 .../jena/sparql/sse/lang/ParseHandlerDebug.java |  118 +
 .../jena/sparql/sse/lang/ParseHandlerForm.java  |  198 +
 .../jena/sparql/sse/lang/ParseHandlerLink.java  |   98 +
 .../jena/sparql/sse/lang/ParseHandlerPlain.java |  224 +
 .../sparql/sse/lang/ParseHandlerResolver.java   |  193 +
 .../sparql/sse/lang/ParseHandlerWrapper.java    |  101 +
 .../jena/sparql/sse/lang/ParserSSEBase.java     |   96 +
 .../apache/jena/sparql/sse/lang/SSE_Parser.java |   75 +
 .../sparql/sse/lang/parser/JavaCharStream.java  |  634 ++
 .../sparql/sse/lang/parser/ParseException.java  |  204 +
 .../sparql/sse/lang/parser/SSE_ParserCore.java  |  559 ++
 .../lang/parser/SSE_ParserCoreConstants.java    |  165 +
 .../lang/parser/SSE_ParserCoreTokenManager.java | 1197 +++
 .../jena/sparql/sse/lang/parser/Token.java      |  148 +
 .../sparql/sse/lang/parser/TokenMgrError.java   |  164 +
 .../sparql/sse/writers/WriterBasePrefix.java    |  115 +
 .../jena/sparql/sse/writers/WriterExpr.java     |  206 +
 .../jena/sparql/sse/writers/WriterGraph.java    |  132 +
 .../jena/sparql/sse/writers/WriterLib.java      |  112 +
 .../jena/sparql/sse/writers/WriterNode.java     |  103 +
 .../jena/sparql/sse/writers/WriterOp.java       |  690 ++
 .../jena/sparql/sse/writers/WriterPath.java     |  304 +
 .../jena/sparql/sse/writers/WriterTable.java    |   72 +
 .../org/apache/jena/sparql/syntax/Element.java  |   64 +
 .../org/apache/jena/sparql/syntax/Element1.java |   36 +
 .../jena/sparql/syntax/ElementAssign.java       |   70 +
 .../apache/jena/sparql/syntax/ElementBind.java  |   70 +
 .../apache/jena/sparql/syntax/ElementData.java  |   93 +
 .../jena/sparql/syntax/ElementDataset.java      |   74 +
 .../jena/sparql/syntax/ElementExists.java       |   47 +
 .../jena/sparql/syntax/ElementFilter.java       |   52 +
 .../apache/jena/sparql/syntax/ElementGroup.java |  121 +
 .../apache/jena/sparql/syntax/ElementMinus.java |   58 +
 .../jena/sparql/syntax/ElementNamedGraph.java   |   73 +
 .../jena/sparql/syntax/ElementNotExists.java    |   47 +
 .../jena/sparql/syntax/ElementOptional.java     |   58 +
 .../jena/sparql/syntax/ElementPathBlock.java    |   90 +
 .../jena/sparql/syntax/ElementService.java      |   79 +
 .../jena/sparql/syntax/ElementSubQuery.java     |   53 +
 .../jena/sparql/syntax/ElementTriplesBlock.java |   90 +
 .../apache/jena/sparql/syntax/ElementUnion.java |   74 +
 .../jena/sparql/syntax/ElementVisitor.java      |   39 +
 .../jena/sparql/syntax/ElementVisitorBase.java  |   74 +
 .../jena/sparql/syntax/ElementWalker.java       |  216 +
 .../apache/jena/sparql/syntax/PatternVars.java  |   63 +
 .../jena/sparql/syntax/PatternVarsVisitor.java  |  105 +
 .../sparql/syntax/RecursiveElementVisitor.java  |  242 +
 .../org/apache/jena/sparql/syntax/Template.java |  195 +
 .../jena/sparql/syntax/TripleCollector.java     |   30 +
 .../jena/sparql/syntax/TripleCollectorBGP.java  |   52 +
 .../jena/sparql/syntax/TripleCollectorMark.java |   34 +
 .../syntaxtransform/ElementTransform.java       |   51 +
 .../ElementTransformCleanGroupsOfOne.java       |  108 +
 .../ElementTransformCopyBase.java               |  145 +
 .../ElementTransformIdentity.java               |   74 +
 .../syntaxtransform/ElementTransformSubst.java  |  109 +
 .../syntaxtransform/ElementTransformer.java     |  289 +
 .../ExprTransformApplyElementTransform.java     |   52 +
 .../ExprTransformNodeElement.java               |   78 +
 .../syntaxtransform/NodeTransformSubst.java     |   42 +
 .../syntaxtransform/QueryTransformOps.java      |  238 +
 .../syntaxtransform/TransformElementLib.java    |   61 +
 .../syntaxtransform/UpdateTransformOps.java     |  209 +
 .../org/apache/jena/sparql/util/Closure.java    |  243 +
 .../apache/jena/sparql/util/ClosureTest.java    |   45 +
 .../org/apache/jena/sparql/util/Context.java    |  381 +
 .../org/apache/jena/sparql/util/Convert.java    |   85 +
 .../apache/jena/sparql/util/DatasetUtils.java   |  190 +
 .../apache/jena/sparql/util/DateTimeStruct.java |  418 +
 .../org/apache/jena/sparql/util/ExprUtils.java  |  273 +
 .../org/apache/jena/sparql/util/FmtUtils.java   |  630 ++
 .../java/org/apache/jena/sparql/util/Iso.java   |  137 +
 .../org/apache/jena/sparql/util/IsoMatcher.java |  264 +
 .../org/apache/jena/sparql/util/IterLib.java    |   45 +
 .../apache/jena/sparql/util/LabelToNodeMap.java |   97 +
 .../org/apache/jena/sparql/util/Loader.java     |  152 +
 .../apache/jena/sparql/util/MappedLoader.java   |   99 +
 .../jena/sparql/util/MappingRegistry.java       |   43 +
 .../org/apache/jena/sparql/util/ModelUtils.java |  141 +
 .../java/org/apache/jena/sparql/util/Named.java |   24 +
 .../apache/jena/sparql/util/NodeComparator.java |   34 +
 .../jena/sparql/util/NodeFactoryExtra.java      |  250 +
 .../jena/sparql/util/NodeIsomorphismMap.java    |   51 +
 .../apache/jena/sparql/util/NodeToLabelMap.java |  102 +
 .../jena/sparql/util/NodeToLabelMapBNode.java   |   42 +
 .../org/apache/jena/sparql/util/NodeUtils.java  |  284 +
 .../jena/sparql/util/NotUniqueException.java    |   46 +
 .../apache/jena/sparql/util/PrefixMapping2.java |  216 +
 .../jena/sparql/util/PrintSerializable.java     |   31 +
 .../jena/sparql/util/PrintSerializableBase.java |   46 +
 .../sparql/util/PropertyRequiredException.java  |   52 +
 .../apache/jena/sparql/util/QueryExecUtils.java |  367 +
 .../jena/sparql/util/QueryOutputUtils.java      |  117 +
 .../org/apache/jena/sparql/util/QueryUtils.java |  119 +
 .../apache/jena/sparql/util/ResultSetUtils.java |   95 +
 .../apache/jena/sparql/util/RomanNumeral.java   |  178 +
 .../jena/sparql/util/RomanNumeralDatatype.java  |   72 +
 .../apache/jena/sparql/util/StringUtils.java    |   78 +
 .../org/apache/jena/sparql/util/Symbol.java     |   63 +
 .../jena/sparql/util/TranslationTable.java      |   73 +
 .../jena/sparql/util/TripleComparator.java      |   44 +
 .../sparql/util/TypeNotUniqueException.java     |   31 +
 .../java/org/apache/jena/sparql/util/Utils.java |   70 +
 .../org/apache/jena/sparql/util/VarUtils.java   |   91 +
 .../apache/jena/sparql/util/graph/Findable.java |   30 +
 .../sparql/util/graph/FindableBasicPattern.java |   89 +
 .../jena/sparql/util/graph/FindableGraph.java   |   50 +
 .../apache/jena/sparql/util/graph/GNode.java    |   42 +
 .../sparql/util/graph/GraphContainerUtils.java  |  202 +
 .../jena/sparql/util/graph/GraphList.java       |  384 +
 .../sparql/util/graph/GraphListenerBase.java    |  123 +
 .../sparql/util/graph/GraphListenerCounter.java |  105 +
 .../sparql/util/graph/GraphLoadMonitor.java     |  148 +
 .../jena/sparql/util/graph/GraphSink.java       |   35 +
 .../jena/sparql/util/graph/GraphUtils.java      |  205 +
 .../org/apache/jena/sparql/vocabulary/DOAP.java |  229 +
 .../org/apache/jena/sparql/vocabulary/EARL.java |  137 +
 .../org/apache/jena/sparql/vocabulary/FOAF.java |  260 +
 .../jena/sparql/vocabulary/ListPFunction.java   |  112 +
 .../sparql/vocabulary/ResultSetGraphVocab.java  |   80 +
 .../apache/jena/sparql/vocabulary/TestDAWG.java |  113 +
 .../jena/sparql/vocabulary/TestManifest.java    |  131 +
 .../vocabulary/TestManifestUpdate_11.java       |   81 +
 .../jena/sparql/vocabulary/TestManifestX.java   |   79 +
 .../jena/sparql/vocabulary/TestManifest_11.java |   68 +
 .../jena/sparql/vocabulary/VocabTestQuery.java  |   59 +
 .../java/org/apache/jena/update/GraphStore.java |   28 +
 .../apache/jena/update/GraphStoreFactory.java   |   76 +
 .../java/org/apache/jena/update/Update.java     |   59 +
 .../org/apache/jena/update/UpdateAction.java    |  433 ++
 .../org/apache/jena/update/UpdateException.java |   30 +
 .../jena/update/UpdateExecutionFactory.java     |  455 ++
 .../org/apache/jena/update/UpdateFactory.java   |  290 +
 .../org/apache/jena/update/UpdateProcessor.java |   53 +
 .../jena/update/UpdateProcessorStreaming.java   |   56 +
 .../org/apache/jena/update/UpdateRequest.java   |  101 +
 .../org/apache/jena/web/DatasetAdapter.java     |   10 +-
 .../apache/jena/web/DatasetGraphAccessor.java   |    4 +-
 .../jena/web/DatasetGraphAccessorBasic.java     |    8 +-
 .../jena/web/DatasetGraphAccessorHTTP.java      |   12 +-
 .../org/apache/jena/web/JenaHttpException.java  |    2 +-
 .../src/main/java/riotcmd/CmdLangParse.java     |  126 +-
 jena-arq/src/main/java/riotcmd/CmdTokens.java   |    3 +-
 jena-arq/src/main/java/riotcmd/dumpthrift.java  |    5 +-
 jena-arq/src/main/java/riotcmd/infer.java       |   12 +-
 jena-arq/src/main/java/riotcmd/nquads.java      |    5 +-
 jena-arq/src/main/java/riotcmd/ntriples.java    |    5 +-
 jena-arq/src/main/java/riotcmd/rdfxml.java      |    5 +-
 jena-arq/src/main/java/riotcmd/riot.java        |    5 +-
 jena-arq/src/main/java/riotcmd/trig.java        |    5 +-
 jena-arq/src/main/java/riotcmd/turtle.java      |    5 +-
 jena-arq/src/main/java/riotcmd/utf8.java        |   48 +-
 jena-arq/src/test/java/arq/TestCmdLine.java     |    5 +-
 jena-arq/src/test/java/arq/qtest.java           |   51 +-
 .../com/hp/hpl/jena/query/TS_ParamString.java   |   31 -
 .../query/TestParameterizedSparqlString.java    | 1883 -----
 .../hp/hpl/jena/sparql/ARQTestRefEngine.java    |   52 -
 .../com/hp/hpl/jena/sparql/ARQTestSuite.java    |   91 -
 .../java/com/hp/hpl/jena/sparql/TC_DAWG.java    |   96 -
 .../java/com/hp/hpl/jena/sparql/TC_General.java |   91 -
 .../com/hp/hpl/jena/sparql/TC_SPARQL11.java     |   36 -
 .../com/hp/hpl/jena/sparql/TC_Scripted.java     |   44 -
 .../hp/hpl/jena/sparql/algebra/TS_Algebra.java  |   40 -
 .../sparql/algebra/TestAlgebraTranslate.java    |  144 -
 .../hpl/jena/sparql/algebra/TestClassify.java   |  208 -
 .../hpl/jena/sparql/algebra/TestOpAsQuery.java  |  355 -
 .../hp/hpl/jena/sparql/algebra/TestOpVars.java  |   82 -
 .../jena/sparql/algebra/TestPattern2Join.java   |  105 -
 .../jena/sparql/algebra/TestTransformOpExt.java |  105 -
 .../jena/sparql/algebra/TestTransformQuads.java |  172 -
 .../hpl/jena/sparql/algebra/TestVarFinder.java  |   91 -
 .../algebra/optimize/AbstractTestTransform.java |  102 -
 .../algebra/optimize/TS_Optimization.java       |   42 -
 .../optimize/TestOptDistinctReduced.java        |  304 -
 .../sparql/algebra/optimize/TestOptimizer.java  |  366 -
 .../sparql/algebra/optimize/TestReorderBGP.java |   88 -
 .../optimize/TestSemanticEquivalence.java       |  297 -
 .../optimize/TestTransformConstantFolding.java  |  173 -
 .../optimize/TestTransformFilterPlacement.java  |  881 ---
 .../algebra/optimize/TestTransformFilters.java  | 1038 ---
 .../optimize/TestTransformMergeBGPs.java        |  104 -
 .../TestTransformPromoteTableEmpty.java         |  167 -
 .../algebra/optimize/TestTransformTopN.java     |  322 -
 .../sparql/algebra/optimize/TestVarRename.java  |  243 -
 .../uniongraph/AbstractTestUnionTransform.java  |   96 -
 .../algebra/uniongraph/Dev_TS_UnionGraph.java   |   35 -
 .../algebra/uniongraph/TestUnionGraph.java      |  107 -
 .../uniongraph/TestUnionTransformQuads.java     |   35 -
 .../uniongraph/TestUnionTransformTriples.java   |   34 -
 .../java/com/hp/hpl/jena/sparql/api/TS_API.java |   34 -
 .../com/hp/hpl/jena/sparql/api/TestAPI.java     |  323 -
 .../sparql/api/TestQueryExecutionCancel.java    |  149 -
 .../sparql/api/TestQueryExecutionTimeout1.java  |  253 -
 .../sparql/api/TestQueryExecutionTimeout2.java  |  103 -
 .../sparql/core/AbstractDatasetGraphTests.java  |  276 -
 .../jena/sparql/core/AbstractTestDataset.java   |  113 -
 .../sparql/core/AbstractTestDynamicDataset.java |  340 -
 .../core/AbstractTestGraphOverDataset.java      |  173 -
 .../com/hp/hpl/jena/sparql/core/TS_Core.java    |   40 -
 .../hp/hpl/jena/sparql/core/TestContext.java    |   81 -
 .../jena/sparql/core/TestDatasetGraphMem.java   |   29 -
 .../core/TestDatasetGraphMemTriplesQuads.java   |   29 -
 .../sparql/core/TestDatasetGraphViewGraphs.java |   81 -
 .../sparql/core/TestDatasetGraphWithLock.java   |  122 -
 .../sparql/core/TestDatasetGraphsRegular.java   |   47 -
 .../hp/hpl/jena/sparql/core/TestDatasetMem.java |   28 -
 .../jena/sparql/core/TestDatasetMonitor.java    |  142 -
 .../jena/sparql/core/TestDynamicDatasetMem.java |   40 -
 .../sparql/core/TestGraphOverDatasetMem.java    |   48 -
 .../hp/hpl/jena/sparql/engine/TS_Engine.java    |   39 -
 .../engine/TestQueryEngineMultiThreaded.java    |  306 -
 .../hp/hpl/jena/sparql/engine/TestTableLib.java |  119 -
 .../jena/sparql/engine/binding/TS_Binding.java  |   32 -
 .../engine/binding/TestBindingStreams.java      |  177 -
 .../sparql/engine/http/TestQueryEngineHTTP.java |   66 -
 .../jena/sparql/engine/http/TestService.java    |  334 -
 .../sparql/engine/index/TestIndexTable.java     |  204 -
 .../engine/iterator/TestQueryIterSort.java      |  363 -
 .../com/hp/hpl/jena/sparql/expr/TS_Expr.java    |   65 -
 .../jena/sparql/expr/TestCustomAggregates.java  |  163 -
 .../hp/hpl/jena/sparql/expr/TestExprLib.java    |   86 -
 .../hpl/jena/sparql/expr/TestExprTransform.java |   53 -
 .../hpl/jena/sparql/expr/TestExpressions.java   |  502 --
 .../hpl/jena/sparql/expr/TestExpressions2.java  |  158 -
 .../hp/hpl/jena/sparql/expr/TestFunctions.java  |  263 -
 .../hp/hpl/jena/sparql/expr/TestFunctions2.java |  556 --
 .../sparql/expr/TestLeviathanFunctions.java     |  281 -
 .../hpl/jena/sparql/expr/TestNodeFunctions.java |  347 -
 .../hp/hpl/jena/sparql/expr/TestNodeValue.java  |  816 --
 .../hpl/jena/sparql/expr/TestNodeValueOps.java  |  201 -
 .../hp/hpl/jena/sparql/expr/TestOrdering.java   |  298 -
 .../com/hp/hpl/jena/sparql/expr/TestRegex.java  |   65 -
 .../hp/hpl/jena/sparql/expr/TestXSDFuncOp.java  |  944 ---
 .../sparql/function/user/TS_UserFunctions.java  |   49 -
 .../function/user/TestFunctionExpansion.java    |  376 -
 .../function/user/TestFunctionNonExpansion.java |   98 -
 .../user/TestUserDefinedFunctionFactory.java    |   87 -
 .../user/TestUserFunctionsInSparql.java         |   80 -
 .../jena/sparql/graph/AbstractTestGraph2.java   |  263 -
 .../graph/AbstractTestPrefixMapping2.java       |  110 -
 .../hp/hpl/jena/sparql/graph/GraphsTests.java   |  236 -
 .../com/hp/hpl/jena/sparql/graph/TS_Graph.java  |   35 -
 .../jena/sparql/graph/TestDatasetGraphMem.java  |   30 -
 .../hp/hpl/jena/sparql/graph/TestDatasets.java  |  315 -
 .../jena/sparql/graph/TestGraphUnionRead.java   |  122 -
 .../jena/sparql/graph/TestGraphsDataBag.java    |  172 -
 .../hp/hpl/jena/sparql/graph/TestGraphsMem.java |   70 -
 .../hp/hpl/jena/sparql/junit/EarlReport.java    |  161 -
 .../hp/hpl/jena/sparql/junit/EarlTestCase.java  |  152 -
 .../com/hp/hpl/jena/sparql/junit/QueryTest.java |  492 --
 .../jena/sparql/junit/QueryTestException.java   |   31 -
 .../sparql/junit/ScriptTestSuiteFactory.java    |  149 -
 .../hpl/jena/sparql/junit/SimpleTestRunner.java |  158 -
 .../hpl/jena/sparql/junit/SurpressedTest.java   |   45 -
 .../hp/hpl/jena/sparql/junit/SyntaxTest.java    |   85 -
 .../hpl/jena/sparql/junit/SyntaxUpdateTest.java |   83 -
 .../com/hp/hpl/jena/sparql/junit/TestItem.java  |  322 -
 .../hpl/jena/sparql/junit/TestQueryUtils.java   |   37 -
 .../jena/sparql/junit/TestSerialization.java    |  109 -
 .../jena/sparql/junit/TextListenerOneLine.java  |  129 -
 .../hp/hpl/jena/sparql/junit/UpdateTest.java    |  222 -
 .../com/hp/hpl/jena/sparql/lang/TS_Lang.java    |   33 -
 .../com/hp/hpl/jena/sparql/lang/TestEsc.java    |   74 -
 .../hp/hpl/jena/sparql/lang/TestVarScope.java   |  136 -
 .../sparql/modify/AbstractTestUpdateBase.java   |   72 -
 .../sparql/modify/AbstractTestUpdateGraph.java  |  399 -
 .../modify/AbstractTestUpdateGraphMgt.java      |  108 -
 .../hp/hpl/jena/sparql/modify/TS_Update.java    |   36 -
 .../jena/sparql/modify/TestUpdateCompare.java   |   99 -
 .../jena/sparql/modify/TestUpdateGraphMem.java  |   32 -
 .../sparql/modify/TestUpdateGraphMgtMem.java    |   32 -
 .../sparql/modify/TestUpdateOperations.java     |   99 -
 .../jena/sparql/modify/TestUpdateWriter.java    |   56 -
 .../hpl/jena/sparql/negation/TS_Negation.java   |   32 -
 .../jena/sparql/negation/TestGraphDeltas.java   |  255 -
 .../com/hp/hpl/jena/sparql/path/TS_Path.java    |   36 -
 .../com/hp/hpl/jena/sparql/path/TestPath.java   |  355 -
 .../com/hp/hpl/jena/sparql/path/TestPath2.java  |  157 -
 .../com/hp/hpl/jena/sparql/path/TestPathPF.java |  163 -
 .../hpl/jena/sparql/resultset/TS_ResultSet.java |   33 -
 .../jena/sparql/resultset/TestResultSet.java    |  593 --
 .../sparql/resultset/TestResultSetFormat1.java  |  188 -
 .../sparql/resultset/TestResultSetFormat2.java  |  405 -
 .../hp/hpl/jena/sparql/solver/TS_Solver.java    |   32 -
 .../hp/hpl/jena/sparql/solver/TestReorder.java  |  233 -
 .../hpl/jena/sparql/solver/TestSolverLib.java   |   64 -
 .../com/hp/hpl/jena/sparql/syntax/TS_SSE.java   |   33 -
 .../jena/sparql/syntax/TS_Serialization.java    |   30 -
 .../hpl/jena/sparql/syntax/TestSSE_Basic.java   |  392 -
 .../hpl/jena/sparql/syntax/TestSSE_Builder.java |  195 -
 .../hpl/jena/sparql/syntax/TestSSE_Forms.java   |  169 -
 .../jena/sparql/syntax/TestSerialization.java   |  285 -
 .../transaction/AbstractTestTransaction.java    |  261 -
 .../jena/sparql/transaction/TS_Transaction.java |   31 -
 .../sparql/transaction/TestTransactionMem.java  |   49 -
 .../com/hp/hpl/jena/sparql/util/TS_Util.java    |   35 -
 .../jena/sparql/util/TestDateTimeParsing.java   |  285 -
 .../hp/hpl/jena/sparql/util/TestFmtUtils.java   |  236 -
 .../com/hp/hpl/jena/sparql/util/TestList.java   |  252 -
 .../com/hp/hpl/jena/sparql/util/TestUtils.java  |   84 -
 .../hp/hpl/jena/sparql/util/TestVersion.java    |   81 -
 .../java/org/apache/jena/atlas/TC_Atlas.java    |   46 -
 .../jena/atlas/data/TestDistinctDataBag.java    |   34 +-
 .../jena/atlas/data/TestDistinctDataNet.java    |   33 +-
 .../jena/atlas/data/TestSortedDataBag.java      |   32 +-
 .../atlas/io/AbstractTestPeekInputStream.java   |  243 -
 .../jena/atlas/io/AbstractTestPeekReader.java   |  243 -
 .../java/org/apache/jena/atlas/io/TS_IO.java    |   45 -
 .../org/apache/jena/atlas/io/TestBlockUTF8.java |  254 -
 .../jena/atlas/io/TestBufferingWriter.java      |   97 -
 .../jena/atlas/io/TestIndentedWriter.java       |   58 -
 .../jena/atlas/io/TestInputStreamBuffered.java  |  109 -
 .../atlas/io/TestPeekInputStreamSource.java     |   44 -
 .../atlas/io/TestPeekReaderCharSequence.java    |   32 -
 .../jena/atlas/io/TestPeekReaderSource.java     |   34 -
 .../apache/jena/atlas/io/TestPrintUtils.java    |   59 -
 .../apache/jena/atlas/io/TestStreamUTF8.java    |  118 -
 .../apache/jena/atlas/iterator/TS_Iterator.java |   38 -
 .../apache/jena/atlas/iterator/TestIter.java    |  539 --
 .../jena/atlas/iterator/TestIteratorArray.java  |  104 -
 .../jena/atlas/iterator/TestIteratorPeek.java   |  107 -
 .../atlas/iterator/TestIteratorPushback.java    |   93 -
 .../atlas/iterator/TestIteratorSlotted.java     |  136 -
 .../atlas/iterator/TestIteratorWithBuffer.java  |   97 -
 .../atlas/iterator/TestIteratorWithHistory.java |   87 -
 .../org/apache/jena/atlas/junit/BaseTest.java   |   80 -
 .../apache/jena/atlas/junit/TextListener2.java  |   69 -
 .../org/apache/jena/atlas/legacy/BaseTest2.java |   60 +
 .../apache/jena/atlas/legacy/TC_Atlas_ARQ.java  |   43 +
 .../java/org/apache/jena/atlas/lib/TS_Lib.java  |   54 -
 .../apache/jena/atlas/lib/TestAlarmClock.java   |   92 -
 .../java/org/apache/jena/atlas/lib/TestAlg.java |  226 -
 .../org/apache/jena/atlas/lib/TestBitsInt.java  |  468 --
 .../org/apache/jena/atlas/lib/TestBitsLong.java |  468 --
 .../org/apache/jena/atlas/lib/TestBytes.java    |  198 -
 .../org/apache/jena/atlas/lib/TestCache.java    |  188 -
 .../org/apache/jena/atlas/lib/TestCache2.java   |   83 -
 .../apache/jena/atlas/lib/TestCacheStats.java   |   84 -
 .../apache/jena/atlas/lib/TestColumnMap.java    |  107 -
 .../org/apache/jena/atlas/lib/TestFileOps.java  |   78 -
 .../jena/atlas/lib/TestFilenameProcessing.java  |  102 -
 .../java/org/apache/jena/atlas/lib/TestHex.java |   81 -
 .../apache/jena/atlas/lib/TestListUtils.java    |   79 -
 .../org/apache/jena/atlas/lib/TestMultiSet.java |  143 -
 .../apache/jena/atlas/lib/TestNumberUtils.java  |  106 -
 .../org/apache/jena/atlas/lib/TestRefLong.java  |   70 -
 .../jena/atlas/lib/TestReverseComparator.java   |   91 -
 .../org/apache/jena/atlas/lib/TestSetUtils.java |  146 -
 .../org/apache/jena/atlas/lib/TestStrUtils.java |   59 -
 .../org/apache/jena/atlas/lib/TestTrie.java     |  346 -
 .../org/apache/jena/atlas/lib/TestXMLLib.java   |   46 -
 .../org/apache/jena/common/TestIsoMatcher.java  |   15 +-
 .../org/apache/jena/query/TS_ParamString.java   |   31 +
 .../query/TestParameterizedSparqlString.java    | 1881 +++++
 .../java/org/apache/jena/riot/TS_LangSuite.java |    2 +-
 .../apache/jena/riot/TestJenaReaderRIOT.java    |   17 +-
 .../java/org/apache/jena/riot/TestLangRIOT.java |    3 +-
 .../java/org/apache/jena/riot/TestReadData.java |   13 +-
 .../org/apache/jena/riot/TestRiotReader.java    |   19 +-
 .../jena/riot/adapters/TestFileManager.java     |    9 +-
 .../jena/riot/lang/ParserTestBaseLib.java       |   76 +
 .../java/org/apache/jena/riot/lang/TS_Lang.java |    6 +-
 .../jena/riot/lang/TestBlankNodeAllocator.java  |    3 +-
 .../jena/riot/lang/TestCollectorStream.java     |   13 +-
 .../java/org/apache/jena/riot/lang/TestIRI.java |   38 +-
 .../apache/jena/riot/lang/TestLabelToNode.java  |    5 +-
 .../org/apache/jena/riot/lang/TestLang.java     |    3 +-
 .../org/apache/jena/riot/lang/TestLangCSV.java  |    5 +-
 .../apache/jena/riot/lang/TestLangNQuads.java   |   83 +-
 .../apache/jena/riot/lang/TestLangNTriples.java |  139 +-
 .../apache/jena/riot/lang/TestLangNTuples.java  |   89 +-
 .../apache/jena/riot/lang/TestLangRdfJson.java  |  285 +-
 .../org/apache/jena/riot/lang/TestLangTrig.java |   37 +-
 .../apache/jena/riot/lang/TestLangTurtle.java   |   84 +-
 .../jena/riot/lang/TestNodeAllocator.java       |    5 +-
 .../apache/jena/riot/lang/TestNodeToLabel.java  |   11 +-
 .../jena/riot/lang/TestParserFactory.java       |   39 +-
 .../jena/riot/lang/TestPipedRDFIterators.java   |   44 +-
 .../jena/riot/lang/TestReaderNTriples.java      |   24 -
 .../apache/jena/riot/lang/TestTriXReader.java   |    9 +-
 .../apache/jena/riot/lang/TestTurtleTerms.java  |    3 +-
 .../jena/riot/langsuite/FactoryTestRiot.java    |   11 +-
 .../jena/riot/langsuite/LangTestCase.java       |   11 +-
 .../jena/riot/langsuite/UnitTestBadEval.java    |   13 +-
 .../jena/riot/langsuite/UnitTestBadSyntax.java  |   17 +-
 .../jena/riot/langsuite/UnitTestEval.java       |   13 +-
 .../jena/riot/langsuite/UnitTestSurpressed.java |    2 +-
 .../jena/riot/langsuite/UnitTestSyntax.java     |   11 +-
 .../jena/riot/langsuite/VocabLangRDF.java       |    6 +-
 .../org/apache/jena/riot/out/TestNodeFmt.java   |    9 +-
 .../apache/jena/riot/out/TestNodeFmtLib.java    |    7 +-
 .../jena/riot/process/TestNormalization.java    |    9 +-
 .../jena/riot/resultset/TestResultSetIO.java    |   13 +-
 .../jena/riot/stream/TestLocationMapper.java    |    7 +-
 .../jena/riot/stream/TestStreamManager.java     |   13 +-
 .../apache/jena/riot/system/TestChecker.java    |    7 +-
 .../jena/riot/system/TestIO_JenaReaders.java    |    7 +-
 .../jena/riot/system/TestIO_JenaWriters.java    |   13 +-
 .../jena/riot/system/TestJsonLDReadWrite.java   |   20 +-
 .../apache/jena/riot/system/TestStreamRDF.java  |    7 +-
 .../apache/jena/riot/thrift/TS_RDFThrift.java   |    1 -
 .../jena/riot/thrift/TestResultSetThrift.java   |   26 +-
 .../jena/riot/thrift/TestStreamRDFThrift.java   |   32 +-
 .../apache/jena/riot/thrift/TestThriftTerm.java |   66 +-
 .../jena/riot/tokens/TestTokenForNode.java      |    8 +-
 .../apache/jena/riot/tokens/TestTokenizer.java  |   93 +-
 .../jena/riot/writer/AbstractWriterTest.java    |    5 +-
 .../apache/jena/riot/writer/TS_RiotWriter.java  |    1 +
 .../jena/riot/writer/TestJenaWriters.java       |   21 +-
 .../apache/jena/riot/writer/TestRDFJSON.java    |   15 +-
 .../jena/riot/writer/TestRiotWriterDataset.java |   12 +-
 .../jena/riot/writer/TestRiotWriterGraph.java   |    6 +-
 .../apache/jena/riot/writer/TestTriXWriter.java |    7 +-
 .../jena/riot/writer/TestTurtleWriter.java      |  105 +
 .../apache/jena/sparql/ARQTestRefEngine.java    |   51 +
 .../org/apache/jena/sparql/ARQTestSuite.java    |   90 +
 .../java/org/apache/jena/sparql/TC_DAWG.java    |   95 +
 .../java/org/apache/jena/sparql/TC_General.java |   87 +
 .../org/apache/jena/sparql/TC_SPARQL11.java     |   36 +
 .../org/apache/jena/sparql/TC_Scripted.java     |   43 +
 .../apache/jena/sparql/algebra/TS_Algebra.java  |   38 +
 .../sparql/algebra/TestAlgebraTranslate.java    |  144 +
 .../jena/sparql/algebra/TestClassify.java       |  211 +
 .../jena/sparql/algebra/TestOpAsQuery.java      |  509 ++
 .../apache/jena/sparql/algebra/TestOpVars.java  |   83 +
 .../jena/sparql/algebra/TestPattern2Join.java   |  104 +
 .../jena/sparql/algebra/TestTransformOpExt.java |  104 +
 .../jena/sparql/algebra/TestTransformQuads.java |  173 +
 .../jena/sparql/algebra/TestVarFinder.java      |   91 +
 .../algebra/optimize/AbstractTestTransform.java |  101 +
 .../algebra/optimize/TS_Optimization.java       |   41 +
 .../optimize/TestOptDistinctReduced.java        |  305 +
 .../sparql/algebra/optimize/TestOptimizer.java  |  366 +
 .../sparql/algebra/optimize/TestReorderBGP.java |   87 +
 .../optimize/TestSemanticEquivalence.java       |  296 +
 .../optimize/TestTransformConstantFolding.java  |  173 +
 .../TestTransformEliminateAssignments.java      |  744 ++
 .../optimize/TestTransformFilterPlacement.java  |  881 +++
 .../algebra/optimize/TestTransformFilters.java  | 1037 +++
 .../optimize/TestTransformMergeBGPs.java        |  104 +
 .../TestTransformPromoteTableEmpty.java         |  167 +
 .../algebra/optimize/TestTransformTopN.java     |  321 +
 .../sparql/algebra/optimize/TestVarRename.java  |  243 +
 .../uniongraph/AbstractTestUnionTransform.java  |   95 +
 .../algebra/uniongraph/Dev_TS_UnionGraph.java   |   35 +
 .../algebra/uniongraph/TestUnionGraph.java      |  106 +
 .../uniongraph/TestUnionTransformQuads.java     |   35 +
 .../uniongraph/TestUnionTransformTriples.java   |   34 +
 .../java/org/apache/jena/sparql/api/TS_API.java |   34 +
 .../org/apache/jena/sparql/api/TestAPI.java     |  566 ++
 .../sparql/api/TestQueryExecutionCancel.java    |  143 +
 .../sparql/api/TestQueryExecutionTimeout1.java  |  245 +
 .../sparql/api/TestQueryExecutionTimeout2.java  |  102 +
 .../sparql/core/AbstractDatasetGraphTests.java  |  277 +
 .../jena/sparql/core/AbstractTestDataset.java   |  112 +
 .../sparql/core/AbstractTestDynamicDataset.java |  342 +
 .../core/AbstractTestGraphOverDataset.java      |  172 +
 .../org/apache/jena/sparql/core/TS_Core.java    |   40 +
 .../apache/jena/sparql/core/TestContext.java    |  109 +
 .../jena/sparql/core/TestDatasetGraphMem.java   |   32 +
 .../core/TestDatasetGraphMemTriplesQuads.java   |   32 +
 .../sparql/core/TestDatasetGraphViewGraphs.java |   83 +
 .../sparql/core/TestDatasetGraphWithLock.java   |  123 +
 .../sparql/core/TestDatasetGraphsRegular.java   |   47 +
 .../apache/jena/sparql/core/TestDatasetMem.java |   28 +
 .../jena/sparql/core/TestDatasetMonitor.java    |  141 +
 .../jena/sparql/core/TestDynamicDatasetMem.java |   35 +
 .../sparql/core/TestGraphOverDatasetMem.java    |   48 +
 .../apache/jena/sparql/engine/TS_Engine.java    |   38 +
 .../engine/TestQueryEngineMultiThreaded.java    |  301 +
 .../apache/jena/sparql/engine/TestTableLib.java |  119 +
 .../engine/binding/TestBindingStreams.java      |  176 +
 .../sparql/engine/http/TestQueryEngineHTTP.java |   67 +
 .../jena/sparql/engine/http/TestService.java    |  336 +
 .../sparql/engine/index/TestIndexTable.java     |  206 +
 .../iterator/AbstractTestDistinctReduced.java   |  107 +
 .../engine/iterator/TS_QueryIterators.java      |   34 +
 .../engine/iterator/TestDistinctDataBag.java    |   36 +
 .../iterator/TestDistinctDataBagLimited.java    |   40 +
 .../sparql/engine/iterator/TestDistinctMem.java |   37 +
 .../engine/iterator/TestQueryIterSort.java      |  362 +
 .../org/apache/jena/sparql/expr/TS_Expr.java    |   67 +
 .../jena/sparql/expr/TestCustomAggregates.java  |  166 +
 .../apache/jena/sparql/expr/TestExprLib.java    |   87 +
 .../jena/sparql/expr/TestExprTransform.java     |   52 +
 .../jena/sparql/expr/TestExpressions.java       |  505 ++
 .../jena/sparql/expr/TestExpressions2.java      |  160 +
 .../apache/jena/sparql/expr/TestFunctions.java  |  265 +
 .../apache/jena/sparql/expr/TestFunctions2.java |  558 ++
 .../sparql/expr/TestLeviathanFunctions.java     |  283 +
 .../jena/sparql/expr/TestNodeFunctions.java     |  349 +
 .../apache/jena/sparql/expr/TestNodeValue.java  |  817 ++
 .../jena/sparql/expr/TestNodeValueOps.java      |  202 +
 .../apache/jena/sparql/expr/TestOrdering.java   |  299 +
 .../org/apache/jena/sparql/expr/TestRegex.java  |   67 +
 .../apache/jena/sparql/expr/TestXSDFuncOp.java  |  943 +++
 .../sparql/function/user/TS_UserFunctions.java  |   50 +
 .../function/user/TestFunctionExpansion.java    |  371 +
 .../function/user/TestFunctionNonExpansion.java |  100 +
 .../user/TestUserDefinedFunctionFactory.java    |   87 +
 .../user/TestUserFunctionsInSparql.java         |   75 +
 .../jena/sparql/graph/AbstractTestGraph2.java   |  262 +
 .../graph/AbstractTestPrefixMapping2.java       |  109 +
 .../apache/jena/sparql/graph/GraphsTests.java   |  238 +
 .../org/apache/jena/sparql/graph/TS_Graph.java  |   35 +
 .../jena/sparql/graph/TestDatasetGraphMem.java  |   30 +
 .../apache/jena/sparql/graph/TestDatasets.java  |  306 +
 .../jena/sparql/graph/TestGraphUnionRead.java   |  121 +
 .../jena/sparql/graph/TestGraphsDataBag.java    |  173 +
 .../apache/jena/sparql/graph/TestGraphsMem.java |   70 +
 .../apache/jena/sparql/junit/EarlReport.java    |  157 +
 .../apache/jena/sparql/junit/EarlTestCase.java  |  151 +
 .../org/apache/jena/sparql/junit/QueryTest.java |  548 ++
 .../jena/sparql/junit/QueryTestException.java   |   31 +
 .../sparql/junit/ScriptTestSuiteFactory.java    |  148 +
 .../jena/sparql/junit/SimpleTestRunner.java     |  158 +
 .../jena/sparql/junit/SurpressedTest.java       |   45 +
 .../apache/jena/sparql/junit/SyntaxTest.java    |   85 +
 .../jena/sparql/junit/SyntaxUpdateTest.java     |   83 +
 .../org/apache/jena/sparql/junit/TestItem.java  |  329 +
 .../jena/sparql/junit/TestQueryUtils.java       |   37 +
 .../jena/sparql/junit/TestSerialization.java    |  108 +
 .../jena/sparql/junit/TextListenerOneLine.java  |  129 +
 .../apache/jena/sparql/junit/UpdateTest.java    |  221 +
 .../org/apache/jena/sparql/lang/TS_Lang.java    |   33 +
 .../org/apache/jena/sparql/lang/TestEsc.java    |   74 +
 .../apache/jena/sparql/lang/TestVarScope.java   |  135 +
 .../sparql/modify/AbstractTestUpdateBase.java   |   63 +
 .../sparql/modify/AbstractTestUpdateGraph.java  |  397 +
 .../modify/AbstractTestUpdateGraphMgt.java      |  107 +
 .../apache/jena/sparql/modify/TS_Update.java    |   36 +
 .../jena/sparql/modify/TestUpdateCompare.java   |   99 +
 .../jena/sparql/modify/TestUpdateGraphMem.java  |   31 +
 .../sparql/modify/TestUpdateGraphMgtMem.java    |   29 +
 .../sparql/modify/TestUpdateOperations.java     |   99 +
 .../jena/sparql/modify/TestUpdateWriter.java    |   55 +
 .../jena/sparql/negation/TS_Negation.java       |   32 +
 .../jena/sparql/negation/TestGraphDeltas.java   |  254 +
 .../org/apache/jena/sparql/path/TS_Path.java    |   36 +
 .../org/apache/jena/sparql/path/TestPath.java   |  357 +
 .../org/apache/jena/sparql/path/TestPath2.java  |  158 +
 .../org/apache/jena/sparql/path/TestPathPF.java |  163 +
 .../jena/sparql/resultset/TS_ResultSet.java     |   33 +
 .../jena/sparql/resultset/TestResultSet.java    |  592 ++
 .../sparql/resultset/TestResultSetFormat1.java  |  188 +
 .../sparql/resultset/TestResultSetFormat2.java  |  406 +
 .../apache/jena/sparql/solver/TS_Solver.java    |   31 +
 .../apache/jena/sparql/solver/TestReorder.java  |  228 +
 .../jena/sparql/solver/TestSolverLib.java       |   63 +
 .../org/apache/jena/sparql/syntax/TS_SSE.java   |   33 +
 .../apache/jena/sparql/syntax/TS_Syntax.java    |   37 +
 .../jena/sparql/syntax/TestSSE_Basic.java       |  391 +
 .../jena/sparql/syntax/TestSSE_Builder.java     |  194 +
 .../jena/sparql/syntax/TestSSE_Forms.java       |  168 +
 .../jena/sparql/syntax/TestSerialization.java   |  284 +
 .../syntaxtransform/TestFlattenSyntax.java      |  120 +
 .../syntax/syntaxtransform/TestQueryOps.java    |   59 +
 .../syntaxtransform/TestSubstitution.java       |   93 +
 .../transaction/AbstractTestTransaction.java    |  260 +
 .../jena/sparql/transaction/TS_Transaction.java |   31 +
 .../sparql/transaction/TestTransactionMem.java  |   48 +
 .../org/apache/jena/sparql/util/TS_Util.java    |   35 +
 .../jena/sparql/util/TestDateTimeParsing.java   |  286 +
 .../apache/jena/sparql/util/TestFmtUtils.java   |  236 +
 .../org/apache/jena/sparql/util/TestList.java   |  251 +
 .../apache/jena/sparql/util/TestVersion.java    |   81 +
 .../web/AbstractTestDatasetGraphAccessor.java   |   17 +-
 .../jena/web/TestDatasetGraphAccessorMem.java   |    6 +-
 jena-arq/src/test/java/riotcmd/rdflangtest.java |   49 +-
 .../src/test/resources/log4j-testing.properties |    9 +-
 jena-arq/src/test/resources/log4j.properties    |    9 +-
 .../testing/ARQ/BasicPatterns/result-B-01.n3    |   29 +-
 jena-arq/testing/ARQ/Construct/dft.ttl          |    2 +
 jena-arq/testing/ARQ/Construct/g1.ttl           |    3 +
 jena-arq/testing/ARQ/Construct/g2.ttl           |    2 +
 jena-arq/testing/ARQ/Construct/manifest.ttl     |  120 +
 .../ARQ/Construct/q-construct-quad-dataset.arq  |    6 +
 .../q-construct-quad-default-graph-1.arq        |    6 +
 .../q-construct-quad-default-graph-2.arq        |    6 +
 .../Construct/q-construct-quad-named-graph.arq  |    6 +
 .../Construct/q-construct-quad-short-form-1.arq |    5 +
 .../Construct/q-construct-quad-short-form-2.arq |    5 +
 .../Construct/q-construct-quad-short-form-3.arq |    5 +
 .../ARQ/Construct/q-construct-quad-syntax-1.arq |    3 +
 .../ARQ/Construct/q-construct-quad-syntax-2.arq |    3 +
 .../ARQ/Construct/q-construct-quad-syntax-3.arq |    4 +
 .../ARQ/Construct/q-construct-quad-syntax-4.arq |    9 +
 .../ARQ/Construct/q-construct-quad-syntax-5.arq |    9 +
 .../ARQ/Construct/q-construct-quad-syntax-6.arq |   14 +
 .../ARQ/Construct/q-construct-quad-syntax-7.arq |    7 +
 .../ARQ/Construct/q-construct-quad-syntax-8.arq |    9 +
 .../Construct/results-construct-quad-data-2.ttl |    2 +
 .../results-construct-quad-dataset.trig         |    4 +
 .../results-construct-quad-default-graph.ttl    |    3 +
 .../results-construct-quad-named-graph.trig     |    3 +
 .../results-construct-quad-short-form-1.trig    |    3 +
 .../results-construct-quad-short-form-2.ttl     |    2 +
 .../results-construct-quad-short-form-3.trig    |    4 +
 .../results-construct-quad-syntax-1.trig        |    2 +
 .../results-construct-quad-syntax-2.trig        |    0
 .../results-construct-quad-syntax-3.ttl         |    2 +
 .../results-construct-quad-syntax-4.trig        |    6 +
 .../results-construct-quad-syntax-5.trig        |    6 +
 .../results-construct-quad-syntax-6.trig        |    6 +
 .../results-construct-quad-syntax-7.ttl         |    2 +
 .../results-construct-quad-syntax-8.trig        |    0
 .../testing/ARQ/Dataset/graph-07-result.ttl     |    1 -
 .../testing/ARQ/Dataset/graph-08-result.ttl     |    1 -
 jena-arq/testing/ARQ/Distinct/distinct-all.srx  |   48 +-
 jena-arq/testing/ARQ/Distinct/distinct-str.srx  |   30 +-
 jena-arq/testing/ARQ/EngineMain/filter-1.rq     |    2 +-
 jena-arq/testing/ARQ/Function/concat-1.arq      |    2 +-
 jena-arq/testing/ARQ/Function/concat-2.arq      |    2 +-
 jena-arq/testing/ARQ/Function/func-03.rq        |    2 +-
 jena-arq/testing/ARQ/Function/func-04.rq        |    2 +-
 jena-arq/testing/ARQ/Function/func-sha1sum-1.rq |    2 +-
 jena-arq/testing/ARQ/Function/func-sha1sum-2.rq |    2 +-
 jena-arq/testing/ARQ/Function/localname-1.rq    |    2 +-
 jena-arq/testing/ARQ/Function/namespace-1.rq    |    2 +-
 jena-arq/testing/ARQ/Function/q-lang-1.rq       |    2 +-
 jena-arq/testing/ARQ/Function/q-lang-2.rq       |    2 +-
 jena-arq/testing/ARQ/Function/strjoin-1.arq     |    2 +-
 jena-arq/testing/ARQ/Function/strjoin-2.arq     |    2 +-
 jena-arq/testing/ARQ/Function/strlen-1.rq       |    2 +-
 jena-arq/testing/ARQ/Function/strlen-2.rq       |    2 +-
 jena-arq/testing/ARQ/Function/substring-1.rq    |    2 +-
 jena-arq/testing/ARQ/Function/substring-2.rq    |    2 +-
 jena-arq/testing/ARQ/Function/substring-3.rq    |    2 +-
 .../testing/ARQ/PropertyFunctions/assign-1.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/assign-2.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/assign-3.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/assign-4.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/assign-5.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/assign-6.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/concat-1.rq   |    2 +-
 .../testing/ARQ/PropertyFunctions/list-1.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-2.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-3.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-4.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-5.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-6.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-7.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-8.rq     |    2 +-
 .../testing/ARQ/PropertyFunctions/list-9.rq     |    2 +-
 .../ARQ/PropertyFunctions/list-index-1.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-2.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-3.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-4.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-5.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-6.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-7.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-8.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-index-9.rq       |    2 +-
 .../ARQ/PropertyFunctions/list-length-1.rq      |    2 +-
 .../ARQ/PropertyFunctions/list-length-2.rq      |    2 +-
 .../ARQ/PropertyFunctions/list-length-3.rq      |    2 +-
 jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-1.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-2.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-3.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-4.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-5.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-6.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-7.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-8.rq |    2 +-
 .../testing/ARQ/PropertyFunctions/splitIRI-9.rq |    2 +-
 jena-arq/testing/ARQ/PropertyFunctions/str-1.rq |    2 +-
 jena-arq/testing/ARQ/README                     |    3 +
 jena-arq/testing/ARQ/SPARQL11_RDF11.txt         |   15 +-
 jena-arq/testing/ARQ/Serialization/func.sh      |    1 -
 jena-arq/testing/ARQ/Serialization/manifest.ttl |  134 +-
 jena-arq/testing/ARQ/Serialization/serial.sh    |    0
 .../testing/ARQ/Serialization/syntax-path-01.rq |    5 +
 .../testing/ARQ/Serialization/syntax-path-02.rq |    5 +
 .../testing/ARQ/Serialization/syntax-path-03.rq |    6 +
 .../testing/ARQ/Serialization/syntax-path-04.rq |    6 +
 .../testing/ARQ/Serialization/syntax-path-05.rq |    7 +
 .../testing/ARQ/Serialization/syntax-path-06.rq |    8 +
 .../ARQ/Serialization/syntax-subselect-01.arq   |    3 -
 .../ARQ/Serialization/syntax-subselect-01.rq    |    3 +
 .../ARQ/Serialization/syntax-subselect-02.arq   |    3 -
 .../ARQ/Serialization/syntax-subselect-02.rq    |    3 +
 .../ARQ/Serialization/syntax-subselect-03.arq   |    7 -
 .../ARQ/Serialization/syntax-subselect-03.rq    |    7 +
 .../ARQ/Serialization/syntax-subselect-04.arq   |    9 -
 .../ARQ/Serialization/syntax-subselect-04.rq    |    7 +
 .../ARQ/Serialization/syntax-subselect-10.arq   |    3 +
 .../ARQ/Serialization/syntax-subselect-11.arq   |    3 +
 .../ARQ/Serialization/syntax-subselect-12.arq   |    7 +
 .../ARQ/Serialization/syntax-subselect-13.arq   |    9 +
 jena-arq/testing/ARQ/Sort/order-3.rq            |    2 +-
 jena-arq/testing/ARQ/Sort/sort-result-2.ttl     |  336 +-
 jena-arq/testing/ARQ/Sort/sort-result-3.ttl     |  336 +-
 .../testing/ARQ/SubQuery/graph-subquery-1.rq    |    2 +-
 .../testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl  |   69 +-
 .../Syntax-ARQ/syntax-quad-construct-01.arq     |    3 +
 .../Syntax-ARQ/syntax-quad-construct-02.arq     |    3 +
 .../Syntax-ARQ/syntax-quad-construct-03.arq     |    3 +
 .../Syntax-ARQ/syntax-quad-construct-04.arq     |    8 +
 .../Syntax-ARQ/syntax-quad-construct-05.arq     |    8 +
 .../Syntax-ARQ/syntax-quad-construct-06.arq     |   13 +
 .../Syntax-ARQ/syntax-quad-construct-07.arq     |    6 +
 .../Syntax-ARQ/syntax-quad-construct-08.arq     |    8 +
 .../Syntax-ARQ/syntax-quad-construct-09.arq     |    7 +
 .../Syntax-ARQ/syntax-quad-construct-10.arq     |    7 +
 .../Syntax-ARQ/syntax-quad-construct-11.arq     |    7 +
 .../Syntax-ARQ/syntax-quad-construct-12.arq     |    7 +
 .../Syntax-ARQ/syntax-quad-construct-bad-01.arq |    7 +
 jena-arq/testing/ARQ/Syntax/syn-arq.sh          |   82 +-
 jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt  |    9 +-
 .../DAWG-Final/distinct/distinct-all.srx        |   48 +-
 .../DAWG-Final/distinct/distinct-str.srx        |   30 +-
 jena-arq/testing/RIOT/Reader/D.json             |    5 -
 jena-arq/testing/RIOT/Reader/D.jsonld           |   10 +
 jena-arq/testing/RIOT/Reader/D.rj               |    5 +
 jena-arq/testing/RIOT/StreamManager/D.json      |    5 -
 jena-arq/testing/RIOT/StreamManager/D.jsonld    |   10 +
 jena-arq/testing/RIOT/StreamManager/D.rj        |    5 +
 jena-arq/testing/RIOT/Writer/writer-rt-18.ttl   |   12 +
 jena-arq/testing/RIOT/Writer/writer-rt-19.ttl   |   15 +
 jena-arq/testing/RIOT/jsonld/graph1.jsonld      |  108 +-
 jena-arq/testing/RIOT/jsonld/graph2.jsonld      |   63 +
 jena-arq/testing/RIOT/jsonld/graph2.ttl         |   15 +
 jena-base/pom.xml                               |  149 +
 jena-base/src/main/java/jena/cmd/Arg.java       |   69 +
 jena-base/src/main/java/jena/cmd/ArgDecl.java   |   93 +
 jena-base/src/main/java/jena/cmd/ArgModule.java |   26 +
 .../main/java/jena/cmd/ArgModuleGeneral.java    |   25 +
 jena-base/src/main/java/jena/cmd/ArgProc.java   |   27 +
 .../src/main/java/jena/cmd/CmdArgModule.java    |   70 +
 .../src/main/java/jena/cmd/CmdException.java    |   30 +
 .../src/main/java/jena/cmd/CmdGeneral.java      |   92 +
 .../src/main/java/jena/cmd/CmdLineArgs.java     |  413 +
 jena-base/src/main/java/jena/cmd/CmdMain.java   |  108 +
 .../src/main/java/jena/cmd/CommandLineBase.java |  136 +
 jena-base/src/main/java/jena/cmd/ModBase.java   |   23 +
 .../src/main/java/jena/cmd/ModGeneral.java      |   57 +
 .../src/main/java/jena/cmd/ModVersion.java      |   67 +
 .../java/jena/cmd/TerminationException.java     |   31 +
 jena-base/src/main/java/jena/cmd/Usage.java     |  102 +
 .../src/main/java/jena/cmd/package-info.java    |    6 +
 .../org/apache/jena/atlas/AtlasException.java   |   27 +
 .../apache/jena/atlas/RuntimeIOException.java   |   34 +
 .../java/org/apache/jena/atlas/io/AWriter.java  |   43 +
 .../org/apache/jena/atlas/io/AWriterBase.java   |   33 +
 .../org/apache/jena/atlas/io/BlockUTF8.java     |  281 +
 .../apache/jena/atlas/io/BufferingWriter.java   |  180 +
 .../org/apache/jena/atlas/io/CharStream.java    |   31 +
 .../apache/jena/atlas/io/CharStreamBasic.java   |   58 +
 .../jena/atlas/io/CharStreamBuffered.java       |  166 +
 .../apache/jena/atlas/io/CharStreamReader.java  |   53 +
 .../jena/atlas/io/CharStreamSequence.java       |   47 +
 .../main/java/org/apache/jena/atlas/io/IO.java  |  330 +
 .../org/apache/jena/atlas/io/InStreamASCII.java |   89 +
 .../org/apache/jena/atlas/io/InStreamUTF8.java  |  253 +
 .../jena/atlas/io/IndentedLineBuffer.java       |   50 +
 .../apache/jena/atlas/io/IndentedWriter.java    |  363 +
 .../jena/atlas/io/InputStreamBuffered.java      |  104 +
 .../apache/jena/atlas/io/NullOutputStream.java  |   40 +
 .../org/apache/jena/atlas/io/OutStreamUTF8.java |  179 +
 .../org/apache/jena/atlas/io/OutputUtils.java   |   77 +
 .../apache/jena/atlas/io/PeekInputStream.java   |  217 +
 .../org/apache/jena/atlas/io/PeekReader.java    |  269 +
 .../org/apache/jena/atlas/io/PrintUtils.java    |   31 +
 .../org/apache/jena/atlas/io/Printable.java     |   24 +
 .../org/apache/jena/atlas/io/PrintableBase.java |   26 +
 .../org/apache/jena/atlas/io/StringWriterI.java |   30 +
 .../java/org/apache/jena/atlas/io/Writer2.java  |   97 +
 .../apache/jena/atlas/iterator/AccString.java   |   66 +
 .../apache/jena/atlas/iterator/Accumulate.java  |   27 +
 .../org/apache/jena/atlas/iterator/Action.java  |   30 +
 .../apache/jena/atlas/iterator/ActionCount.java |   33 +
 .../org/apache/jena/atlas/iterator/Filter.java  |   29 +
 .../atlas/iterator/FilterDistinctAdjacent.java  |   39 +
 .../apache/jena/atlas/iterator/FilterStack.java |   69 +
 .../jena/atlas/iterator/FilterUnique.java       |   35 +
 .../org/apache/jena/atlas/iterator/Iter.java    |  737 ++
 .../jena/atlas/iterator/IteratorArray.java      |   99 +
 .../atlas/iterator/IteratorBlockingQueue.java   |   73 +
 .../jena/atlas/iterator/IteratorConcat.java     |  104 +
 .../jena/atlas/iterator/IteratorCons.java       |  122 +
 .../iterator/IteratorDelayedInitialization.java |   78 +
 .../jena/atlas/iterator/IteratorInteger.java    |   61 +
 .../atlas/iterator/IteratorResourceClosing.java |  107 +
 .../jena/atlas/iterator/IteratorSlotted.java    |  117 +
 .../jena/atlas/iterator/IteratorTruncate.java   |   79 +
 .../jena/atlas/iterator/IteratorWithBuffer.java |  132 +
 .../atlas/iterator/IteratorWithHistory.java     |  109 +
 .../jena/atlas/iterator/IteratorWrapper.java    |   41 +
 .../jena/atlas/iterator/NullIterator.java       |   49 +
 .../jena/atlas/iterator/PeekIterator.java       |  100 +
 .../jena/atlas/iterator/PushbackIterator.java   |   62 +
 .../atlas/iterator/RepeatApplyIterator.java     |   86 +
 .../jena/atlas/iterator/SingletonIterator.java  |   51 +
 .../apache/jena/atlas/iterator/Transform.java   |   28 +
 .../jena/atlas/iterator/WrapperIterator.java    |   45 +
 .../apache/jena/atlas/lib/ActionKeyValue.java   |   29 +
 .../org/apache/jena/atlas/lib/AlarmClock.java   |   69 +
 .../java/org/apache/jena/atlas/lib/Alg.java     |  239 +
 .../org/apache/jena/atlas/lib/ArrayUtils.java   |   64 +
 .../java/org/apache/jena/atlas/lib/BitsInt.java |  309 +
 .../org/apache/jena/atlas/lib/BitsLong.java     |  311 +
 .../apache/jena/atlas/lib/ByteBufferLib.java    |  211 +
 .../java/org/apache/jena/atlas/lib/Bytes.java   |  379 +
 .../java/org/apache/jena/atlas/lib/Cache.java   |   57 +
 .../org/apache/jena/atlas/lib/CacheFactory.java |   67 +
 .../org/apache/jena/atlas/lib/CacheSet.java     |   34 +
 .../org/apache/jena/atlas/lib/CacheStats.java   |   28 +
 .../org/apache/jena/atlas/lib/Callback.java     |   25 +
 .../java/org/apache/jena/atlas/lib/Chars.java   |  261 +
 .../org/apache/jena/atlas/lib/Closeable.java    |   27 +
 .../apache/jena/atlas/lib/CollectionUtils.java  |   29 +
 .../org/apache/jena/atlas/lib/ColumnMap.java    |  254 +
 .../main/java/org/apache/jena/atlas/lib/DS.java |   45 +
 .../apache/jena/atlas/lib/DateTimeUtils.java    |  127 +
 .../org/apache/jena/atlas/lib/EscapeStr.java    |  235 +
 .../java/org/apache/jena/atlas/lib/FileOps.java |  229 +
 .../java/org/apache/jena/atlas/lib/Hex.java     |   97 +
 .../java/org/apache/jena/atlas/lib/IRILib.java  |  239 +
 .../jena/atlas/lib/InternalErrorException.java  |   27 +
 .../java/org/apache/jena/atlas/lib/Lib.java     |  126 +
 .../org/apache/jena/atlas/lib/ListUtils.java    |  110 +
 .../java/org/apache/jena/atlas/lib/Map2.java    |  104 +
 .../apache/jena/atlas/lib/NotImplemented.java   |   27 +
 .../org/apache/jena/atlas/lib/NumberUtils.java  |  133 +
 .../java/org/apache/jena/atlas/lib/Pair.java    |   64 +
 .../java/org/apache/jena/atlas/lib/Pool.java    |   30 +
 .../org/apache/jena/atlas/lib/PoolBase.java     |   57 +
 .../org/apache/jena/atlas/lib/PoolSync.java     |   53 +
 .../apache/jena/atlas/lib/PropertiesSorted.java |   87 +
 .../apache/jena/atlas/lib/PropertyUtils.java    |  144 +
 .../org/apache/jena/atlas/lib/RandomLib.java    |   41 +
 .../java/org/apache/jena/atlas/lib/Ref.java     |   54 +
 .../java/org/apache/jena/atlas/lib/RefLong.java |   38 +
 .../org/apache/jena/atlas/lib/Registry.java     |   39 +
 .../jena/atlas/lib/ReverseComparator.java       |   38 +
 .../org/apache/jena/atlas/lib/SetUtils.java     |   60 +
 .../java/org/apache/jena/atlas/lib/Sink.java    |   29 +
 .../org/apache/jena/atlas/lib/SinkCounting.java |   41 +
 .../org/apache/jena/atlas/lib/SinkLogging.java  |   41 +
 .../org/apache/jena/atlas/lib/SinkNull.java     |   33 +
 .../org/apache/jena/atlas/lib/SinkPrint.java    |   45 +
 .../org/apache/jena/atlas/lib/SinkSplit.java    |   55 +
 .../apache/jena/atlas/lib/SinkToCollection.java |   38 +
 .../org/apache/jena/atlas/lib/SinkToQueue.java  |   52 +
 .../org/apache/jena/atlas/lib/SinkWrapper.java  |   44 +
 .../org/apache/jena/atlas/lib/StrUtils.java     |  273 +
 .../java/org/apache/jena/atlas/lib/Sync.java    |   24 +
 .../org/apache/jena/atlas/lib/SystemUtils.java  |   57 +
 .../java/org/apache/jena/atlas/lib/Timer.java   |   72 +
 .../java/org/apache/jena/atlas/lib/Trie.java    |  407 +
 .../java/org/apache/jena/atlas/lib/Tuple.java   |  141 +
 .../java/org/apache/jena/atlas/lib/Version.java |  139 +
 .../java/org/apache/jena/atlas/lib/XMLLib.java  |   62 +
 .../org/apache/jena/atlas/lib/cache/Cache0.java |   72 +
 .../org/apache/jena/atlas/lib/cache/Cache1.java |  127 +
 .../apache/jena/atlas/lib/cache/CacheGuava.java |  114 +
 .../apache/jena/atlas/lib/cache/CacheOps.java   |   50 +
 .../jena/atlas/lib/cache/CacheSetImpl.java      |   94 +
 .../jena/atlas/lib/cache/CacheSetSync.java      |   66 +
 .../jena/atlas/lib/cache/CacheSetWrapper.java   |   66 +
 .../jena/atlas/lib/cache/CacheSimple.java       |  167 +
 .../jena/atlas/lib/cache/CacheWrapper.java      |   65 +
 .../org/apache/jena/atlas/logging/FmtLog.java   |  162 +
 .../java/org/apache/jena/atlas/logging/Log.java |  127 +
 .../org/apache/jena/atlas/logging/LogCtl.java   |  278 +
 .../jena/atlas/logging/ProgressLogger.java      |  133 +
 .../logging/java/ConsoleHandlerStdout.java      |   75 +
 .../jena/atlas/logging/java/TextFormatter.java  |   53 +
 .../src/main/java/org/apache/jena/base/Sys.java |   27 +
 .../java/org/apache/jena/atlas/TC_Atlas.java    |   41 +
 .../atlas/io/AbstractTestPeekInputStream.java   |  243 +
 .../jena/atlas/io/AbstractTestPeekReader.java   |  243 +
 .../java/org/apache/jena/atlas/io/TS_IO.java    |   45 +
 .../org/apache/jena/atlas/io/TestBlockUTF8.java |  254 +
 .../jena/atlas/io/TestBufferingWriter.java      |   97 +
 .../jena/atlas/io/TestIndentedWriter.java       |   58 +
 .../jena/atlas/io/TestInputStreamBuffered.java  |  109 +
 .../atlas/io/TestPeekInputStreamSource.java     |   44 +
 .../atlas/io/TestPeekReaderCharSequence.java    |   32 +
 .../jena/atlas/io/TestPeekReaderSource.java     |   34 +
 .../apache/jena/atlas/io/TestPrintUtils.java    |   59 +
 .../apache/jena/atlas/io/TestStreamUTF8.java    |  118 +
 .../apache/jena/atlas/iterator/TS_Iterator.java |   38 +
 .../apache/jena/atlas/iterator/TestIter.java    |  425 ++
 .../jena/atlas/iterator/TestIteratorArray.java  |  107 +
 .../jena/atlas/iterator/TestIteratorPeek.java   |  105 +
 .../atlas/iterator/TestIteratorPushback.java    |   93 +
 .../atlas/iterator/TestIteratorSlotted.java     |  136 +
 .../atlas/iterator/TestIteratorWithBuffer.java  |   97 +
 .../atlas/iterator/TestIteratorWithHistory.java |   87 +
 .../org/apache/jena/atlas/junit/BaseTest.java   |   50 +
 .../apache/jena/atlas/junit/TextListener2.java  |   69 +
 .../java/org/apache/jena/atlas/lib/TS_Lib.java  |   58 +
 .../apache/jena/atlas/lib/TestAlarmClock.java   |   92 +
 .../java/org/apache/jena/atlas/lib/TestAlg.java |  226 +
 .../org/apache/jena/atlas/lib/TestBitsInt.java  |  468 ++
 .../org/apache/jena/atlas/lib/TestBitsLong.java |  468 ++
 .../org/apache/jena/atlas/lib/TestBytes.java    |  220 +
 .../org/apache/jena/atlas/lib/TestCache.java    |  149 +
 .../org/apache/jena/atlas/lib/TestCache2.java   |   83 +
 .../apache/jena/atlas/lib/TestColumnMap.java    |  107 +
 .../jena/atlas/lib/TestDateTimeUtils.java       |   82 +
 .../org/apache/jena/atlas/lib/TestFileOps.java  |   78 +
 .../jena/atlas/lib/TestFilenameProcessing.java  |  167 +
 .../java/org/apache/jena/atlas/lib/TestHex.java |   81 +
 .../apache/jena/atlas/lib/TestListUtils.java    |   79 +
 .../apache/jena/atlas/lib/TestNumberUtils.java  |  106 +
 .../org/apache/jena/atlas/lib/TestRefLong.java  |   70 +
 .../jena/atlas/lib/TestReverseComparator.java   |   91 +
 .../org/apache/jena/atlas/lib/TestSetUtils.java |  146 +
 .../org/apache/jena/atlas/lib/TestStrUtils.java |   59 +
 .../org/apache/jena/atlas/lib/TestTrie.java     |  346 +
 .../org/apache/jena/atlas/lib/TestXMLLib.java   |   47 +
 .../jena/atlas/lib/cache/CacheSimpleTest.java   |   43 +
 .../jena/atlas/lib/cache/TestCacheSimple.java   |   57 +
 jena-core/ReleaseNotes.txt                      | 1540 ----
 jena-core/bat/check_root.bat                    |    6 -
 jena-core/bat/make_classpath.bat                |   33 -
 jena-core/bat/n3.bat                            |   13 -
 jena-core/bat/rdfcat.bat                        |   13 -
 jena-core/bat/rdfcompare.bat                    |   13 -
 jena-core/bat/rdfcopy.bat                       |   13 -
 jena-core/bat/rdfparse.bat                      |   13 -
 jena-core/bat/schemagen.bat                     |   13 -
 jena-core/bat/version.bat                       |   13 -
 jena-core/bin/jena_path                         |   11 -
 jena-core/bin/make_classpath                    |   98 -
 jena-core/bin/n3                                |   12 -
 jena-core/bin/rdfcat                            |   12 -
 jena-core/bin/rdfcompare                        |   12 -
 jena-core/bin/rdfcopy                           |   12 -
 jena-core/bin/rdfparse                          |   12 -
 jena-core/bin/schemagen                         |   12 -
 jena-core/bin/version                           |   12 -
 jena-core/pom.xml                               |  136 +-
 .../ontology/classHierarchy/ClassHierarchy.java |    8 +-
 .../examples/ontology/classHierarchy/Main.java  |    4 +-
 .../ontology/describeClass/DescribeClass.java   |    6 +-
 .../examples/ontology/describeClass/Main.java   |    4 +-
 .../jena/examples/rdf/Tutorial01.java           |    4 +-
 .../jena/examples/rdf/Tutorial02.java           |    4 +-
 .../jena/examples/rdf/Tutorial03.java           |    4 +-
 .../jena/examples/rdf/Tutorial04.java           |    4 +-
 .../jena/examples/rdf/Tutorial05.java           |    4 +-
 .../jena/examples/rdf/Tutorial06.java           |    6 +-
 .../jena/examples/rdf/Tutorial07.java           |    6 +-
 .../jena/examples/rdf/Tutorial08.java           |    6 +-
 .../jena/examples/rdf/Tutorial09.java           |    4 +-
 .../jena/examples/rdf/Tutorial10.java           |    6 +-
 .../jena/examples/rdf/Tutorial11.java           |    4 +-
 .../src/main/java/com/hp/hpl/jena/Jena.java     |   47 -
 .../main/java/com/hp/hpl/jena/JenaRuntime.java  |  148 -
 .../com/hp/hpl/jena/assembler/Assembler.java    |  111 -
 .../hp/hpl/jena/assembler/AssemblerHelp.java    |  305 -
 .../hpl/jena/assembler/BadObjectException.java  |   53 -
 .../java/com/hp/hpl/jena/assembler/Content.java |   78 -
 .../hp/hpl/jena/assembler/ImportManager.java    |  112 -
 .../main/java/com/hp/hpl/jena/assembler/JA.java |  197 -
 .../java/com/hp/hpl/jena/assembler/Mode.java    |   77 -
 .../hp/hpl/jena/assembler/ModelExpansion.java   |  308 -
 .../java/com/hp/hpl/jena/assembler/RuleSet.java |   54 -
 .../assembler/assemblers/AssemblerBase.java     |  155 -
 .../assembler/assemblers/AssemblerGroup.java    |  152 -
 .../assembler/assemblers/ContentAssembler.java  |  192 -
 .../assemblers/DefaultModelAssembler.java       |   36 -
 .../assemblers/DocumentManagerAssembler.java    |   56 -
 .../assemblers/FileManagerAssembler.java        |   46 -
 .../assemblers/FileModelAssembler.java          |  110 -
 .../assembler/assemblers/InfModelAssembler.java |   56 -
 .../assemblers/LocationMapperAssembler.java     |   37 -
 .../assemblers/MemoryModelAssembler.java        |   41 -
 .../assembler/assemblers/ModelAssembler.java    |  133 -
 .../assemblers/ModelSourceAssembler.java        |   33 -
 .../assemblers/NamedModelAssembler.java         |   31 -
 .../assembler/assemblers/OntModelAssembler.java |   63 -
 .../assemblers/OntModelSpecAssembler.java       |  133 -
 .../assemblers/PrefixMappingAssembler.java      |   61 -
 .../assemblers/ReasonerFactoryAssembler.java    |  195 -
 .../assembler/assemblers/RuleSetAssembler.java  |   75 -
 .../assemblers/UnionModelAssembler.java         |   60 -
 .../AmbiguousSpecificTypeException.java         |   58 -
 .../exceptions/AssemblerException.java          |  121 -
 .../exceptions/CannotConstructException.java    |   76 -
 .../exceptions/CannotHaveRulesException.java    |   36 -
 .../exceptions/CannotLoadClassException.java    |   50 -
 .../exceptions/NoImplementationException.java   |   50 -
 .../exceptions/NoSpecificTypeException.java     |   29 -
 .../exceptions/NotExpectedTypeException.java    |   44 -
 .../exceptions/NotUniqueException.java          |   43 -
 .../exceptions/PropertyRequiredException.java   |   49 -
 .../exceptions/ReasonerClashException.java      |   31 -
 .../exceptions/TransactionAbortedException.java |   39 -
 .../exceptions/UnknownEncodingException.java    |   49 -
 .../exceptions/UnknownReasonerException.java    |   42 -
 .../com/hp/hpl/jena/datatypes/BaseDatatype.java |  231 -
 .../jena/datatypes/DatatypeFormatException.java |   60 -
 .../com/hp/hpl/jena/datatypes/RDFDatatype.java  |  120 -
 .../com/hp/hpl/jena/datatypes/TypeMapper.java   |  197 -
 .../java/com/hp/hpl/jena/datatypes/package.html |   31 -
 .../jena/datatypes/xsd/AbstractDateTime.java    |  400 -
 .../xsd/IllegalDateTimeFieldException.java      |   34 -
 .../hp/hpl/jena/datatypes/xsd/XSDDatatype.java  |  652 --
 .../hp/hpl/jena/datatypes/xsd/XSDDateTime.java  |  320 -
 .../hp/hpl/jena/datatypes/xsd/XSDDuration.java  |  326 -
 .../hpl/jena/datatypes/xsd/XSDbase64Binary.java |   47 -
 .../hp/hpl/jena/datatypes/xsd/XSDbinary.java    |   66 -
 .../hp/hpl/jena/datatypes/xsd/XSDhexBinary.java |   47 -
 .../jena/datatypes/xsd/impl/RDFLangString.java  |   66 -
 .../jena/datatypes/xsd/impl/XMLLiteralType.java |  154 -
 .../xsd/impl/XSDAbstractDateTimeType.java       |  471 --
 .../datatypes/xsd/impl/XSDBaseNumericType.java  |  196 -
 .../datatypes/xsd/impl/XSDBaseStringType.java   |   69 -
 .../jena/datatypes/xsd/impl/XSDByteType.java    |   46 -
 .../xsd/impl/XSDDateTimeStampType.java          |   57 -
 .../datatypes/xsd/impl/XSDDateTimeType.java     |   60 -
 .../jena/datatypes/xsd/impl/XSDDateType.java    |   58 -
 .../xsd/impl/XSDDayTimeDurationType.java        |   60 -
 .../hpl/jena/datatypes/xsd/impl/XSDDayType.java |   69 -
 .../hpl/jena/datatypes/xsd/impl/XSDDouble.java  |  125 -
 .../datatypes/xsd/impl/XSDDurationType.java     |  139 -
 .../hpl/jena/datatypes/xsd/impl/XSDFloat.java   |  125 -
 .../datatypes/xsd/impl/XSDMonthDayType.java     |   71 -
 .../jena/datatypes/xsd/impl/XSDMonthType.java   |   73 -
 .../jena/datatypes/xsd/impl/XSDPlainType.java   |   56 -
 .../jena/datatypes/xsd/impl/XSDTimeType.java    |   76 -
 .../xsd/impl/XSDYearMonthDurationType.java      |   37 -
 .../datatypes/xsd/impl/XSDYearMonthType.java    |   60 -
 .../jena/datatypes/xsd/impl/XSDYearType.java    |   73 -
 .../hp/hpl/jena/datatypes/xsd/impl/package.html |   30 -
 .../com/hp/hpl/jena/datatypes/xsd/package.html  |   35 -
 .../enhanced/AlreadyLinkedViewException.java    |   35 -
 .../hpl/jena/enhanced/BuiltinPersonalities.java |   98 -
 .../java/com/hp/hpl/jena/enhanced/EnhGraph.java |  188 -
 .../java/com/hp/hpl/jena/enhanced/EnhNode.java  |  181 -
 .../hp/hpl/jena/enhanced/GraphPersonality.java  |   28 -
 .../hp/hpl/jena/enhanced/Implementation.java    |   48 -
 .../hp/hpl/jena/enhanced/NodePersonality.java   |   27 -
 .../com/hp/hpl/jena/enhanced/Personality.java   |  100 -
 .../enhanced/PersonalityConfigException.java    |   42 -
 .../com/hp/hpl/jena/enhanced/Polymorphic.java   |  140 -
 .../UnsupportedPolymorphismException.java       |   62 -
 .../java/com/hp/hpl/jena/enhanced/package.html  |   27 -
 .../hp/hpl/jena/graph/BulkUpdateHandler.java    |  142 -
 .../com/hp/hpl/jena/graph/Capabilities.java     |   79 -
 .../java/com/hp/hpl/jena/graph/Factory.java     |   67 -
 .../java/com/hp/hpl/jena/graph/FrontsNode.java  |   33 -
 .../com/hp/hpl/jena/graph/FrontsTriple.java     |   28 -
 .../java/com/hp/hpl/jena/graph/GetTriple.java   |   37 -
 .../main/java/com/hp/hpl/jena/graph/Graph.java  |  178 -
 .../hp/hpl/jena/graph/GraphEventManager.java    |   81 -
 .../java/com/hp/hpl/jena/graph/GraphEvents.java |  103 -
 .../com/hp/hpl/jena/graph/GraphExtract.java     |   91 -
 .../com/hp/hpl/jena/graph/GraphListener.java    |  126 -
 .../java/com/hp/hpl/jena/graph/GraphMaker.java  |  122 -
 .../hpl/jena/graph/GraphStatisticsHandler.java  |   34 -
 .../java/com/hp/hpl/jena/graph/GraphUtil.java   |  289 -
 .../main/java/com/hp/hpl/jena/graph/Node.java   |  407 -
 .../java/com/hp/hpl/jena/graph/NodeFactory.java |  137 -
 .../java/com/hp/hpl/jena/graph/NodeVisitor.java |   35 -
 .../java/com/hp/hpl/jena/graph/Node_ANY.java    |   55 -
 .../java/com/hp/hpl/jena/graph/Node_Blank.java  |   46 -
 .../com/hp/hpl/jena/graph/Node_Concrete.java    |   33 -
 .../java/com/hp/hpl/jena/graph/Node_Fluid.java  |   33 -
 .../com/hp/hpl/jena/graph/Node_Literal.java     |  108 -
 .../java/com/hp/hpl/jena/graph/Node_NULL.java   |   49 -
 .../java/com/hp/hpl/jena/graph/Node_URI.java    |   83 -
 .../com/hp/hpl/jena/graph/Node_Variable.java    |   91 -
 .../hp/hpl/jena/graph/TransactionHandler.java   |   62 -
 .../main/java/com/hp/hpl/jena/graph/Triple.java |  242 -
 .../com/hp/hpl/jena/graph/TripleBoundary.java   |   47 -
 .../com/hp/hpl/jena/graph/TripleIterator.java   |   33 -
 .../java/com/hp/hpl/jena/graph/TripleMatch.java |   48 -
 .../hp/hpl/jena/graph/TripleMatchFilter.java    |   43 -
 .../hp/hpl/jena/graph/TripleMatchIterator.java  |   35 -
 .../hpl/jena/graph/compose/CompositionBase.java |  178 -
 .../com/hp/hpl/jena/graph/compose/Delta.java    |  112 -
 .../hp/hpl/jena/graph/compose/Difference.java   |   55 -
 .../hpl/jena/graph/compose/DisjointUnion.java   |   48 -
 .../com/hp/hpl/jena/graph/compose/Dyadic.java   |   96 -
 .../hp/hpl/jena/graph/compose/Intersection.java |   56 -
 .../hp/hpl/jena/graph/compose/MultiUnion.java   |  221 -
 .../com/hp/hpl/jena/graph/compose/Polyadic.java |  286 -
 .../compose/PolyadicPrefixMappingImpl.java      |  206 -
 .../com/hp/hpl/jena/graph/compose/Union.java    |   68 -
 .../com/hp/hpl/jena/graph/compose/package.html  |   27 -
 .../hp/hpl/jena/graph/impl/AdhocDatatype.java   |   46 -
 .../hp/hpl/jena/graph/impl/AllCapabilities.java |   48 -
 .../hp/hpl/jena/graph/impl/BaseGraphMaker.java  |   79 -
 .../hp/hpl/jena/graph/impl/CollectionGraph.java |  189 -
 .../com/hp/hpl/jena/graph/impl/FileGraph.java   |  207 -
 .../hp/hpl/jena/graph/impl/FileGraphMaker.java  |  225 -
 .../graph/impl/FileGraphTransactionHandler.java |   81 -
 .../com/hp/hpl/jena/graph/impl/GraphBase.java   |  450 --
 .../hp/hpl/jena/graph/impl/GraphMatcher.java    |  965 ---
 .../hpl/jena/graph/impl/GraphWithPerform.java   |   40 -
 .../hp/hpl/jena/graph/impl/LiteralLabel.java    |  112 -
 .../jena/graph/impl/LiteralLabelFactory.java    |  113 -
 .../hpl/jena/graph/impl/LiteralLabelImpl.java   |  495 --
 .../graph/impl/SimpleBulkUpdateHandler.java     |  192 -
 .../hpl/jena/graph/impl/SimpleEventManager.java |  187 -
 .../hpl/jena/graph/impl/SimpleGraphMaker.java   |  114 -
 .../graph/impl/SimpleTransactionHandler.java    |   45 -
 .../jena/graph/impl/TransactionHandlerBase.java |   47 -
 .../com/hp/hpl/jena/graph/impl/TripleStore.java |   84 -
 .../graph/impl/WrappedBulkUpdateHandler.java    |  144 -
 .../hp/hpl/jena/graph/impl/WrappedGraph.java    |  149 -
 .../com/hp/hpl/jena/graph/impl/package.html     |   29 -
 .../java/com/hp/hpl/jena/graph/package.html     |   27 -
 .../java/com/hp/hpl/jena/mem/ArrayBunch.java    |  145 -
 .../main/java/com/hp/hpl/jena/mem/BunchMap.java |   63 -
 .../main/java/com/hp/hpl/jena/mem/GraphMem.java |  164 -
 .../java/com/hp/hpl/jena/mem/GraphMemBase.java  |  103 -
 .../hpl/jena/mem/GraphMemBulkUpdateHandler.java |   44 -
 .../com/hp/hpl/jena/mem/GraphTripleStore.java   |   42 -
 .../hp/hpl/jena/mem/GraphTripleStoreBase.java   |  173 -
 .../hp/hpl/jena/mem/GraphTripleStoreMem.java    |   45 -
 .../java/com/hp/hpl/jena/mem/HashCommon.java    |  378 -
 .../com/hp/hpl/jena/mem/HashedBunchMap.java     |  113 -
 .../com/hp/hpl/jena/mem/HashedTripleBunch.java  |  108 -
 .../com/hp/hpl/jena/mem/NodeToTriplesMap.java   |  141 -
 .../hp/hpl/jena/mem/NodeToTriplesMapBase.java   |  144 -
 .../hp/hpl/jena/mem/NodeToTriplesMapMem.java    |  141 -
 .../com/hp/hpl/jena/mem/ObjectIterator.java     |   79 -
 .../main/java/com/hp/hpl/jena/mem/SetBunch.java |   88 -
 .../hp/hpl/jena/mem/StoreTripleIterator.java    |   62 -
 .../hp/hpl/jena/mem/TrackingTripleIterator.java |   48 -
 .../java/com/hp/hpl/jena/mem/TripleBunch.java   |   76 -
 .../com/hp/hpl/jena/mem/WrappedHashMap.java     |   56 -
 .../main/java/com/hp/hpl/jena/mem/package.html  |   27 -
 .../java/com/hp/hpl/jena/n3/IRIResolver.java    |  231 -
 .../java/com/hp/hpl/jena/n3/JenaReaderBase.java |  138 -
 .../com/hp/hpl/jena/n3/JenaURIException.java    |   32 -
 .../com/hp/hpl/jena/n3/N3IndentedWriter.java    |   93 -
 .../java/com/hp/hpl/jena/n3/N3JenaWriter.java   |  190 -
 .../com/hp/hpl/jena/n3/N3JenaWriterCommon.java  |  981 ---
 .../java/com/hp/hpl/jena/n3/N3JenaWriterPP.java |  639 --
 .../com/hp/hpl/jena/n3/N3JenaWriterPlain.java   |   29 -
 .../com/hp/hpl/jena/n3/N3JenaWriterTriples.java |   64 -
 .../com/hp/hpl/jena/n3/N3TurtleJenaWriter.java  |   40 -
 .../hp/hpl/jena/n3/RelativeURIException.java    |   24 -
 .../main/java/com/hp/hpl/jena/n3/package.html   |   97 -
 .../hp/hpl/jena/n3/turtle/LabelToNodeMap.java   |   56 -
 .../com/hp/hpl/jena/n3/turtle/ParserBase.java   |  453 --
 .../com/hp/hpl/jena/n3/turtle/ParserTurtle.java |   63 -
 .../hp/hpl/jena/n3/turtle/Turtle2NTriples.java  |  170 -
 .../hp/hpl/jena/n3/turtle/TurtleEventDump.java  |   58 -
 .../hpl/jena/n3/turtle/TurtleEventHandler.java  |   30 -
 .../hp/hpl/jena/n3/turtle/TurtleEventNull.java  |   33 -
 .../jena/n3/turtle/TurtleParseException.java    |   34 -
 .../jena/n3/turtle/TurtleRDFGraphInserter.java  |   60 -
 .../com/hp/hpl/jena/n3/turtle/TurtleReader.java |   35 -
 .../jena/n3/turtle/parser/JavaCharStream.java   |  635 --
 .../jena/n3/turtle/parser/ParseException.java   |  209 -
 .../com/hp/hpl/jena/n3/turtle/parser/Token.java |  149 -
 .../jena/n3/turtle/parser/TokenMgrError.java    |  165 -
 .../hpl/jena/n3/turtle/parser/TurtleParser.java |  925 ---
 .../n3/turtle/parser/TurtleParserConstants.java |  231 -
 .../turtle/parser/TurtleParserTokenManager.java | 1457 ----
 .../com/hp/hpl/jena/ontology/AllDifferent.java  |  108 -
 .../jena/ontology/AllValuesFromRestriction.java |   84 -
 .../hpl/jena/ontology/AnnotationProperty.java   |   50 -
 .../jena/ontology/BooleanClassDescription.java  |  112 -
 .../jena/ontology/CardinalityQRestriction.java  |   80 -
 .../jena/ontology/CardinalityRestriction.java   |   79 -
 .../hp/hpl/jena/ontology/ComplementClass.java   |   59 -
 .../hpl/jena/ontology/ConversionException.java  |   71 -
 .../com/hp/hpl/jena/ontology/DataRange.java     |  107 -
 .../hp/hpl/jena/ontology/DatatypeProperty.java  |   47 -
 .../hp/hpl/jena/ontology/EnumeratedClass.java   |  107 -
 .../hpl/jena/ontology/FunctionalProperty.java   |   48 -
 .../hpl/jena/ontology/HasValueRestriction.java  |   82 -
 .../com/hp/hpl/jena/ontology/Individual.java    |  189 -
 .../hp/hpl/jena/ontology/IntersectionClass.java |   48 -
 .../ontology/InverseFunctionalProperty.java     |   53 -
 .../ontology/LanguageConsistencyException.java  |   65 -
 .../ontology/MaxCardinalityQRestriction.java    |   80 -
 .../ontology/MaxCardinalityRestriction.java     |   80 -
 .../ontology/MinCardinalityQRestriction.java    |   80 -
 .../ontology/MinCardinalityRestriction.java     |   79 -
 .../hp/hpl/jena/ontology/ObjectProperty.java    |   47 -
 .../java/com/hp/hpl/jena/ontology/OntClass.java |  595 --
 .../hpl/jena/ontology/OntDocumentManager.java   | 1177 ---
 .../java/com/hp/hpl/jena/ontology/OntModel.java | 1719 -----
 .../com/hp/hpl/jena/ontology/OntModelSpec.java  |  466 --
 .../com/hp/hpl/jena/ontology/OntProperty.java   |  601 --
 .../com/hp/hpl/jena/ontology/OntResource.java   |  788 --
 .../java/com/hp/hpl/jena/ontology/OntTools.java |  616 --
 .../java/com/hp/hpl/jena/ontology/Ontology.java |  248 -
 .../hp/hpl/jena/ontology/OntologyException.java |   69 -
 .../java/com/hp/hpl/jena/ontology/Profile.java  |  767 --
 .../hp/hpl/jena/ontology/ProfileException.java  |   69 -
 .../hp/hpl/jena/ontology/ProfileRegistry.java   |  141 -
 .../hpl/jena/ontology/QualifiedRestriction.java |   95 -
 .../com/hp/hpl/jena/ontology/Restriction.java   |  237 -
 .../ontology/SomeValuesFromRestriction.java     |   84 -
 .../hp/hpl/jena/ontology/SymmetricProperty.java |   46 -
 .../hpl/jena/ontology/TransitiveProperty.java   |   47 -
 .../com/hp/hpl/jena/ontology/UnionClass.java    |   48 -
 .../hpl/jena/ontology/impl/AbstractProfile.java |  156 -
 .../jena/ontology/impl/AllDifferentImpl.java    |  189 -
 .../impl/AllValuesFromRestrictionImpl.java      |  176 -
 .../ontology/impl/AnnotationPropertyImpl.java   |  124 -
 .../impl/BooleanClassDescriptionImpl.java       |  173 -
 .../impl/CardinalityQRestrictionImpl.java       |  153 -
 .../impl/CardinalityRestrictionImpl.java        |  149 -
 .../jena/ontology/impl/ComplementClassImpl.java |  222 -
 .../hpl/jena/ontology/impl/DataRangeImpl.java   |  190 -
 .../ontology/impl/DatatypePropertyImpl.java     |  103 -
 .../jena/ontology/impl/EnumeratedClassImpl.java |  189 -
 .../ontology/impl/FunctionalPropertyImpl.java   |  103 -
 .../ontology/impl/HasValueRestrictionImpl.java  |  162 -
 .../hpl/jena/ontology/impl/IndividualImpl.java  |  273 -
 .../ontology/impl/IntersectionClassImpl.java    |  110 -
 .../impl/InverseFunctionalPropertyImpl.java     |  103 -
 .../impl/MaxCardinalityQRestrictionImpl.java    |  155 -
 .../impl/MaxCardinalityRestrictionImpl.java     |  149 -
 .../impl/MinCardinalityQRestrictionImpl.java    |  154 -
 .../impl/MinCardinalityRestrictionImpl.java     |  150 -
 .../hp/hpl/jena/ontology/impl/OWLDLProfile.java |  301 -
 .../hpl/jena/ontology/impl/OWLLiteProfile.java  |  307 -
 .../hp/hpl/jena/ontology/impl/OWLProfile.java   |  573 --
 .../jena/ontology/impl/ObjectPropertyImpl.java  |  146 -
 .../hp/hpl/jena/ontology/impl/OntClassImpl.java | 1118 ---
 .../hp/hpl/jena/ontology/impl/OntModelImpl.java | 3216 --------
 .../hpl/jena/ontology/impl/OntPropertyImpl.java |  920 ---
 .../hpl/jena/ontology/impl/OntResourceImpl.java | 1748 -----
 .../hp/hpl/jena/ontology/impl/OntologyImpl.java |  380 -
 .../ontology/impl/QualifiedRestrictionImpl.java |  190 -
 .../hp/hpl/jena/ontology/impl/RDFSProfile.java  |  342 -
 .../hpl/jena/ontology/impl/RestrictionImpl.java |  370 -
 .../impl/SomeValuesFromRestrictionImpl.java     |  176 -
 .../ontology/impl/SymmetricPropertyImpl.java    |  103 -
 .../ontology/impl/TransitivePropertyImpl.java   |  103 -
 .../hpl/jena/ontology/impl/UnionClassImpl.java  |  113 -
 .../com/hp/hpl/jena/ontology/impl/package.html  |   29 -
 .../java/com/hp/hpl/jena/ontology/package.html  |   38 -
 .../hpl/jena/rdf/listeners/ChangedListener.java |   67 -
 .../hp/hpl/jena/rdf/listeners/NullListener.java |   53 -
 .../hpl/jena/rdf/listeners/ObjectListener.java  |   64 -
 .../jena/rdf/listeners/StatementListener.java   |   90 -
 .../com/hp/hpl/jena/rdf/listeners/package.html  |   33 -
 .../java/com/hp/hpl/jena/rdf/model/Alt.java     |  223 -
 .../rdf/model/AltHasNoDefaultException.java     |   30 -
 .../java/com/hp/hpl/jena/rdf/model/AnonId.java  |  117 -
 .../java/com/hp/hpl/jena/rdf/model/Bag.java     |   61 -
 .../com/hp/hpl/jena/rdf/model/Container.java    |  246 -
 .../jena/rdf/model/DoesNotReifyException.java   |   33 -
 .../hpl/jena/rdf/model/EmptyListException.java  |   85 -
 .../rdf/model/EmptyListUpdateException.java     |   75 -
 .../hpl/jena/rdf/model/HasNoModelException.java |   31 -
 .../com/hp/hpl/jena/rdf/model/InfModel.java     |  144 -
 .../jena/rdf/model/InvalidListException.java    |   84 -
 .../hpl/jena/rdf/model/ListIndexException.java  |   84 -
 .../java/com/hp/hpl/jena/rdf/model/Literal.java |  217 -
 .../rdf/model/LiteralRequiredException.java     |   35 -
 .../java/com/hp/hpl/jena/rdf/model/Model.java   | 1019 ---
 .../jena/rdf/model/ModelChangedListener.java    |  111 -
 .../com/hp/hpl/jena/rdf/model/ModelCon.java     |  805 --
 .../com/hp/hpl/jena/rdf/model/ModelExtract.java |   64 -
 .../com/hp/hpl/jena/rdf/model/ModelFactory.java |  317 -
 .../hp/hpl/jena/rdf/model/ModelFactoryBase.java |   44 -
 .../com/hp/hpl/jena/rdf/model/ModelGetter.java  |   46 -
 .../hpl/jena/rdf/model/ModelGraphInterface.java |   51 -
 .../com/hp/hpl/jena/rdf/model/ModelMaker.java   |  113 -
 .../com/hp/hpl/jena/rdf/model/ModelReader.java  |   31 -
 .../com/hp/hpl/jena/rdf/model/ModelSource.java  |   78 -
 .../com/hp/hpl/jena/rdf/model/NodeIterator.java |   70 -
 .../com/hp/hpl/jena/rdf/model/NsIterator.java   |   40 -
 .../com/hp/hpl/jena/rdf/model/Property.java     |   58 -
 .../hp/hpl/jena/rdf/model/RDFErrorHandler.java  |   37 -
 .../java/com/hp/hpl/jena/rdf/model/RDFList.java |  545 --
 .../java/com/hp/hpl/jena/rdf/model/RDFNode.java |  124 -
 .../com/hp/hpl/jena/rdf/model/RDFReader.java    |   94 -
 .../com/hp/hpl/jena/rdf/model/RDFReaderF.java   |   79 -
 .../com/hp/hpl/jena/rdf/model/RDFVisitor.java   |   48 -
 .../com/hp/hpl/jena/rdf/model/RDFWriter.java    |   91 -
 .../com/hp/hpl/jena/rdf/model/RDFWriterF.java   |   73 -
 .../com/hp/hpl/jena/rdf/model/RSIterator.java   |   32 -
 .../hp/hpl/jena/rdf/model/ReifiedStatement.java |   32 -
 .../com/hp/hpl/jena/rdf/model/ResIterator.java  |   34 -
 .../com/hp/hpl/jena/rdf/model/Resource.java     |  364 -
 .../com/hp/hpl/jena/rdf/model/ResourceF.java    |   36 -
 .../hp/hpl/jena/rdf/model/ResourceFactory.java  |  313 -
 .../rdf/model/ResourceRequiredException.java    |   35 -
 .../com/hp/hpl/jena/rdf/model/Selector.java     |   63 -
 .../java/com/hp/hpl/jena/rdf/model/Seq.java     |  517 --
 .../jena/rdf/model/SeqIndexBoundsException.java |   30 -
 .../hp/hpl/jena/rdf/model/SimpleSelector.java   |  287 -
 .../com/hp/hpl/jena/rdf/model/Statement.java    |  417 -
 .../hpl/jena/rdf/model/StatementBoundary.java   |   39 -
 .../jena/rdf/model/StatementBoundaryBase.java   |   63 -
 .../jena/rdf/model/StatementTripleBoundary.java |   51 -
 .../com/hp/hpl/jena/rdf/model/StmtIterator.java |   43 -
 .../com/hp/hpl/jena/rdf/model/impl/AltImpl.java |  206 -
 .../com/hp/hpl/jena/rdf/model/impl/BagImpl.java |   59 -
 .../model/impl/ContNodeIteratorFactoryImpl.java |   33 -
 .../rdf/model/impl/ContNodeIteratorImpl.java    |   78 -
 .../hp/hpl/jena/rdf/model/impl/ContainerI.java  |   33 -
 .../hpl/jena/rdf/model/impl/ContainerImpl.java  |  257 -
 .../com/hp/hpl/jena/rdf/model/impl/IO_Ctl.java  |   71 -
 .../hpl/jena/rdf/model/impl/InfModelImpl.java   |  179 -
 .../jena/rdf/model/impl/IteratorFactory.java    |   84 -
 .../hp/hpl/jena/rdf/model/impl/LiteralImpl.java |  311 -
 .../jena/rdf/model/impl/MemoryModelGetter.java  |   43 -
 .../hp/hpl/jena/rdf/model/impl/ModelCom.java    | 1598 ----
 .../rdf/model/impl/ModelListenerAdapter.java    |  101 -
 .../hpl/jena/rdf/model/impl/ModelMakerImpl.java |  106 -
 .../hpl/jena/rdf/model/impl/ModelReifier.java   |  180 -
 .../hpl/jena/rdf/model/impl/NTripleReader.java  |  494 --
 .../hpl/jena/rdf/model/impl/NTripleWriter.java  |  231 -
 .../rdf/model/impl/NodeIteratorFactory.java     |   31 -
 .../jena/rdf/model/impl/NodeIteratorImpl.java   |   40 -
 .../hpl/jena/rdf/model/impl/NsIteratorImpl.java |   37 -
 .../hpl/jena/rdf/model/impl/PropertyImpl.java   |  155 -
 .../rdf/model/impl/RDFDefaultErrorHandler.java  |   62 -
 .../hp/hpl/jena/rdf/model/impl/RDFListImpl.java | 1238 ---
 .../hpl/jena/rdf/model/impl/RDFReaderFImpl.java |  156 -
 .../hpl/jena/rdf/model/impl/RDFWriterFImpl.java |  174 -
 .../hpl/jena/rdf/model/impl/RSIteratorImpl.java |   35 -
 .../rdf/model/impl/ReifiedStatementImpl.java    |  149 -
 .../hp/hpl/jena/rdf/model/impl/ReifierStd.java  |  294 -
 .../jena/rdf/model/impl/ResIteratorImpl.java    |   44 -
 .../hpl/jena/rdf/model/impl/ResourceImpl.java   |  394 -
 .../hpl/jena/rdf/model/impl/SelectorImpl.java   |  211 -
 .../com/hp/hpl/jena/rdf/model/impl/SeqImpl.java |  380 -
 .../model/impl/SeqNodeIteratorFactoryImpl.java  |   33 -
 .../rdf/model/impl/SeqNodeIteratorImpl.java     |   68 -
 .../hpl/jena/rdf/model/impl/StatementBase.java  |  177 -
 .../hpl/jena/rdf/model/impl/StatementImpl.java  |  227 -
 .../jena/rdf/model/impl/StmtIteratorImpl.java   |   53 -
 .../com/hp/hpl/jena/rdf/model/impl/Util.java    |  238 -
 .../com/hp/hpl/jena/rdf/model/impl/package.html |   29 -
 .../java/com/hp/hpl/jena/rdf/model/package.html |   27 -
 .../hp/hpl/jena/rdfxml/xmlinput/ALiteral.java   |   64 -
 .../com/hp/hpl/jena/rdfxml/xmlinput/ARP.java    |  236 -
 .../hp/hpl/jena/rdfxml/xmlinput/ARPConfig.java  |   84 -
 .../jena/rdfxml/xmlinput/ARPErrorNumbers.java   |  538 --
 .../jena/rdfxml/xmlinput/ARPEventHandler.java   |   36 -
 .../hpl/jena/rdfxml/xmlinput/ARPHandlers.java   |  187 -
 .../hp/hpl/jena/rdfxml/xmlinput/ARPOptions.java |  258 -
 .../hp/hpl/jena/rdfxml/xmlinput/AResource.java  |   65 -
 .../hp/hpl/jena/rdfxml/xmlinput/DOM2Model.java  |  120 -
 .../jena/rdfxml/xmlinput/ExtendedHandler.java   |  112 -
 .../xmlinput/FatalParsingErrorException.java    |   35 -
 .../hpl/jena/rdfxml/xmlinput/JenaHandler.java   |  104 -
 .../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java |  559 --
 .../hp/hpl/jena/rdfxml/xmlinput/NTriple.java    |  656 --
 .../jena/rdfxml/xmlinput/NamespaceHandler.java  |   50 -
 .../jena/rdfxml/xmlinput/ParseException.java    |  209 -
 .../hp/hpl/jena/rdfxml/xmlinput/SAX2Model.java  |  275 -
 .../hp/hpl/jena/rdfxml/xmlinput/SAX2RDF.java    |  187 -
 .../hp/hpl/jena/rdfxml/xmlinput/StAX2Model.java |   58 -
 .../hp/hpl/jena/rdfxml/xmlinput/StAX2SAX.java   |  202 -
 .../jena/rdfxml/xmlinput/StatementHandler.java  |   47 -
 .../hp/hpl/jena/rdfxml/xmlinput/impl/ANode.java |   23 -
 .../xmlinput/impl/ARPDatatypeLiteral.java       |   76 -
 .../jena/rdfxml/xmlinput/impl/ARPLocation.java  |   69 -
 .../jena/rdfxml/xmlinput/impl/ARPResource.java  |  146 -
 .../xmlinput/impl/ARPSaxErrorHandler.java       |   58 -
 .../jena/rdfxml/xmlinput/impl/ARPString.java    |   98 -
 .../rdfxml/xmlinput/impl/AResourceInternal.java |   42 -
 .../rdfxml/xmlinput/impl/AbsXMLContext.java     |  194 -
 .../rdfxml/xmlinput/impl/AttributeLexer.java    |  241 -
 .../rdfxml/xmlinput/impl/CharacterModel.java    |  308 -
 .../xmlinput/impl/DefaultErrorHandler.java      |   56 -
 .../jena/rdfxml/xmlinput/impl/ElementLexer.java |   92 -
 .../xmlinput/impl/LexicalHandlerImpl.java       |   80 -
 .../hp/hpl/jena/rdfxml/xmlinput/impl/Names.java |   81 -
 .../rdfxml/xmlinput/impl/ParserSupport.java     |  238 -
 .../jena/rdfxml/xmlinput/impl/QNameLexer.java   |  231 -
 .../jena/rdfxml/xmlinput/impl/RDFXMLParser.java |  220 -
 .../jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java  |  300 -
 .../hp/hpl/jena/rdfxml/xmlinput/impl/Taint.java |   28 -
 .../jena/rdfxml/xmlinput/impl/TaintImpl.java    |   39 -
 .../jena/rdfxml/xmlinput/impl/URIReference.java |  189 -
 .../xmlinput/impl/UntaintableURIReference.java  |   30 -
 .../rdfxml/xmlinput/impl/WrappedException.java  |   76 -
 .../xmlinput/impl/XMLBaselessContext.java       |  113 -
 .../jena/rdfxml/xmlinput/impl/XMLContext.java   |  123 -
 .../jena/rdfxml/xmlinput/impl/XMLHandler.java   |  546 --
 .../hp/hpl/jena/rdfxml/xmlinput/package.html    |   57 -
 .../AbsWantLiteralValueOrDescription.java       |  100 -
 .../rdfxml/xmlinput/states/AbsXMLLiteral.java   |  256 -
 .../jena/rdfxml/xmlinput/states/Collection.java |   93 -
 .../hpl/jena/rdfxml/xmlinput/states/Frame.java  |  173 -
 .../hpl/jena/rdfxml/xmlinput/states/FrameI.java |   46 -
 .../xmlinput/states/HasSubjectFrameI.java       |   34 -
 .../rdfxml/xmlinput/states/InnerXMLLiteral.java |   40 -
 .../rdfxml/xmlinput/states/LookingForRDF.java   |   55 -
 .../rdfxml/xmlinput/states/OuterXMLLiteral.java |   54 -
 .../rdfxml/xmlinput/states/RDFCollection.java   |   42 -
 .../states/StartStateRDForDescription.java      |   56 -
 .../rdfxml/xmlinput/states/WantDescription.java |  126 -
 .../jena/rdfxml/xmlinput/states/WantEmpty.java  |   44 -
 .../states/WantLiteralValueOrDescription.java   |   92 -
 .../xmlinput/states/WantPropertyElement.java    |  437 --
 .../states/WantTopLevelDescription.java         |   55 -
 .../xmlinput/states/WantTypedLiteral.java       |   60 -
 .../xmlinput/states/WantsObjectFrameI.java      |   22 -
 .../rdfxml/xmlinput/states/WantsObjectI.java    |   25 -
 .../jena/rdfxml/xmloutput/RDFXMLWriterI.java    |  226 -
 .../jena/rdfxml/xmloutput/impl/Abbreviated.java |  163 -
 .../rdfxml/xmloutput/impl/BaseXMLWriter.java    |  907 ---
 .../hpl/jena/rdfxml/xmloutput/impl/Basic.java   |  184 -
 .../jena/rdfxml/xmloutput/impl/PairEntry.java   |   53 -
 .../jena/rdfxml/xmloutput/impl/Relation.java    |  272 -
 .../rdfxml/xmloutput/impl/SimpleLogger.java     |   25 -
 .../jena/rdfxml/xmloutput/impl/Unparser.java    | 1745 -----
 .../hp/hpl/jena/rdfxml/xmloutput/package.html   |   27 -
 .../com/hp/hpl/jena/reasoner/BaseInfGraph.java  |  544 --
 .../com/hp/hpl/jena/reasoner/Derivation.java    |   47 -
 .../java/com/hp/hpl/jena/reasoner/FGraph.java   |   89 -
 .../java/com/hp/hpl/jena/reasoner/Finder.java   |   56 -
 .../com/hp/hpl/jena/reasoner/FinderUtil.java    |  129 -
 .../reasoner/IllegalParameterException.java     |   35 -
 .../java/com/hp/hpl/jena/reasoner/InfGraph.java |  153 -
 .../java/com/hp/hpl/jena/reasoner/Reasoner.java |  145 -
 .../hp/hpl/jena/reasoner/ReasonerException.java |   48 -
 .../hp/hpl/jena/reasoner/ReasonerFactory.java   |   50 -
 .../hp/hpl/jena/reasoner/ReasonerRegistry.java  |  258 -
 .../jena/reasoner/StandardValidityReport.java   |  112 -
 .../com/hp/hpl/jena/reasoner/TriplePattern.java |  354 -
 .../hp/hpl/jena/reasoner/ValidityReport.java    |  132 -
 .../java/com/hp/hpl/jena/reasoner/package.html  |   83 -
 .../reasoner/rulesys/BackwardRuleInfGraphI.java |   68 -
 .../rulesys/BasicForwardRuleInfGraph.java       |  526 --
 .../rulesys/BasicForwardRuleReasoner.java       |  227 -
 .../reasoner/rulesys/BindingEnvironment.java    |   57 -
 .../hp/hpl/jena/reasoner/rulesys/Builtin.java   |   92 -
 .../jena/reasoner/rulesys/BuiltinException.java |   39 -
 .../jena/reasoner/rulesys/BuiltinRegistry.java  |  146 -
 .../hpl/jena/reasoner/rulesys/ClauseEntry.java  |   33 -
 .../jena/reasoner/rulesys/FBRuleInfGraph.java   |  993 ---
 .../jena/reasoner/rulesys/FBRuleReasoner.java   |  420 --
 .../reasoner/rulesys/ForwardRuleInfGraphI.java  |   90 -
 .../hp/hpl/jena/reasoner/rulesys/Functor.java   |  300 -
 .../reasoner/rulesys/GenericRuleReasoner.java   |  441 --
 .../rulesys/GenericRuleReasonerFactory.java     |   84 -
 .../rulesys/LPBackwardRuleInfGraph.java         |  373 -
 .../rulesys/LPBackwardRuleReasoner.java         |  232 -
 .../reasoner/rulesys/Node_RuleVariable.java     |  195 -
 .../reasoner/rulesys/OWLFBRuleReasoner.java     |  149 -
 .../rulesys/OWLFBRuleReasonerFactory.java       |  129 -
 .../jena/reasoner/rulesys/OWLMicroReasoner.java |   98 -
 .../rulesys/OWLMicroReasonerFactory.java        |  126 -
 .../jena/reasoner/rulesys/OWLMiniReasoner.java  |   93 -
 .../rulesys/OWLMiniReasonerFactory.java         |  127 -
 .../reasoner/rulesys/RDFSFBRuleReasoner.java    |   66 -
 .../rulesys/RDFSFBRuleReasonerFactory.java      |   88 -
 .../rulesys/RDFSForwardRuleReasoner.java        |   73 -
 .../jena/reasoner/rulesys/RDFSRuleInfGraph.java |   68 -
 .../jena/reasoner/rulesys/RDFSRuleReasoner.java |  221 -
 .../rulesys/RDFSRuleReasonerFactory.java        |   87 -
 .../jena/reasoner/rulesys/RETERuleInfGraph.java |  111 -
 .../com/hp/hpl/jena/reasoner/rulesys/Rule.java  | 1123 ---
 .../hpl/jena/reasoner/rulesys/RuleContext.java  |   88 -
 .../jena/reasoner/rulesys/RuleDerivation.java   |  169 -
 .../reasoner/rulesys/RulePreprocessHook.java    |   54 -
 .../hpl/jena/reasoner/rulesys/RuleReasoner.java |   42 -
 .../reasoner/rulesys/RuleReasonerFactory.java   |   31 -
 .../hpl/jena/reasoner/rulesys/SilentAddI.java   |   35 -
 .../com/hp/hpl/jena/reasoner/rulesys/Util.java  |  373 -
 .../jena/reasoner/rulesys/builtins/AddOne.java  |   73 -
 .../rulesys/builtins/AssertDisjointPairs.java   |   73 -
 .../reasoner/rulesys/builtins/BaseBuiltin.java  |  118 -
 .../jena/reasoner/rulesys/builtins/Bound.java   |   57 -
 .../rulesys/builtins/CountLiteralValues.java    |   85 -
 .../reasoner/rulesys/builtins/Difference.java   |   84 -
 .../jena/reasoner/rulesys/builtins/Drop.java    |   91 -
 .../jena/reasoner/rulesys/builtins/Equal.java   |   68 -
 .../hpl/jena/reasoner/rulesys/builtins/GE.java  |   66 -
 .../reasoner/rulesys/builtins/GreaterThan.java  |   67 -
 .../jena/reasoner/rulesys/builtins/Hide.java    |   84 -
 .../jena/reasoner/rulesys/builtins/IsBNode.java |   62 -
 .../jena/reasoner/rulesys/builtins/IsDType.java |   90 -
 .../reasoner/rulesys/builtins/IsFunctor.java    |   63 -
 .../reasoner/rulesys/builtins/IsLiteral.java    |   72 -
 .../hpl/jena/reasoner/rulesys/builtins/LE.java  |   66 -
 .../reasoner/rulesys/builtins/LessThan.java     |   67 -
 .../reasoner/rulesys/builtins/ListContains.java |   84 -
 .../reasoner/rulesys/builtins/ListEntry.java    |   96 -
 .../reasoner/rulesys/builtins/ListEqual.java    |   94 -
 .../reasoner/rulesys/builtins/ListLength.java   |   94 -
 .../rulesys/builtins/ListMapAsObject.java       |   73 -
 .../rulesys/builtins/ListMapAsSubject.java      |   72 -
 .../rulesys/builtins/ListNotContains.java       |   64 -
 .../reasoner/rulesys/builtins/ListNotEqual.java |   63 -
 .../reasoner/rulesys/builtins/MakeInstance.java |   77 -
 .../reasoner/rulesys/builtins/MakeSkolem.java   |   89 -
 .../reasoner/rulesys/builtins/MakeTemp.java     |   70 -
 .../hpl/jena/reasoner/rulesys/builtins/Max.java |   82 -
 .../hpl/jena/reasoner/rulesys/builtins/Min.java |   83 -
 .../jena/reasoner/rulesys/builtins/NoValue.java |   81 -
 .../reasoner/rulesys/builtins/NotBNode.java     |   62 -
 .../reasoner/rulesys/builtins/NotDType.java     |   64 -
 .../reasoner/rulesys/builtins/NotEqual.java     |   68 -
 .../reasoner/rulesys/builtins/NotFunctor.java   |   61 -
 .../reasoner/rulesys/builtins/NotLiteral.java   |   62 -
 .../hpl/jena/reasoner/rulesys/builtins/Now.java |   67 -
 .../jena/reasoner/rulesys/builtins/Print.java   |   77 -
 .../jena/reasoner/rulesys/builtins/Product.java |   82 -
 .../reasoner/rulesys/builtins/Quotient.java     |   87 -
 .../jena/reasoner/rulesys/builtins/Regex.java   |   90 -
 .../jena/reasoner/rulesys/builtins/Remove.java  |   78 -
 .../reasoner/rulesys/builtins/StrConcat.java    |   88 -
 .../hpl/jena/reasoner/rulesys/builtins/Sum.java |   82 -
 .../jena/reasoner/rulesys/builtins/Table.java   |   66 -
 .../reasoner/rulesys/builtins/TableAll.java     |   62 -
 .../jena/reasoner/rulesys/builtins/Unbound.java |   58 -
 .../reasoner/rulesys/builtins/UriConcat.java    |   63 -
 .../jena/reasoner/rulesys/builtins/package.html |   30 -
 .../reasoner/rulesys/impl/BBRuleContext.java    |  156 -
 .../reasoner/rulesys/impl/BFRuleContext.java    |  245 -
 .../reasoner/rulesys/impl/BindingStack.java     |  220 -
 .../reasoner/rulesys/impl/BindingVector.java    |  376 -
 .../rulesys/impl/BindingVectorMultiSet.java     |  208 -
 .../reasoner/rulesys/impl/ChoicePointFrame.java |   97 -
 .../rulesys/impl/ConsumerChoicePointFrame.java  |  199 -
 .../reasoner/rulesys/impl/EnvironmentFrame.java |   84 -
 .../impl/EnvironmentFrameWithDerivation.java    |   88 -
 .../jena/reasoner/rulesys/impl/FRuleEngine.java |  672 --
 .../reasoner/rulesys/impl/FRuleEngineI.java     |  100 -
 .../rulesys/impl/FRuleEngineIFactory.java       |   77 -
 .../jena/reasoner/rulesys/impl/FrameObject.java |   60 -
 .../jena/reasoner/rulesys/impl/Generator.java   |  421 --
 .../rulesys/impl/GenericChoiceFrame.java        |   62 -
 .../rulesys/impl/GenericTripleMatchFrame.java   |  121 -
 .../reasoner/rulesys/impl/LPAgendaEntry.java    |   43 -
 .../reasoner/rulesys/impl/LPBRuleEngine.java    |  441 --
 .../rulesys/impl/LPBindingEnvironment.java      |   91 -
 .../reasoner/rulesys/impl/LPInterpreter.java    |  830 --
 .../rulesys/impl/LPInterpreterContext.java      |   43 -
 .../rulesys/impl/LPInterpreterState.java        |   30 -
 .../jena/reasoner/rulesys/impl/LPRuleStore.java |  275 -
 .../rulesys/impl/LPRuleSyntaxException.java     |   49 -
 .../rulesys/impl/LPTopGoalIterator.java         |  268 -
 .../rulesys/impl/MutableTriplePattern.java      |   46 -
 .../impl/OWLExptRuleTranslationHook.java        |  102 -
 .../rulesys/impl/OWLRuleTranslationHook.java    |  140 -
 .../rulesys/impl/RDFSCMPPreprocessHook.java     |   77 -
 .../reasoner/rulesys/impl/RETEClauseFilter.java |  267 -
 .../reasoner/rulesys/impl/RETEConflictSet.java  |  215 -
 .../jena/reasoner/rulesys/impl/RETEEngine.java  |  631 --
 .../jena/reasoner/rulesys/impl/RETENode.java    |   35 -
 .../jena/reasoner/rulesys/impl/RETEQueue.java   |  152 -
 .../reasoner/rulesys/impl/RETERuleContext.java  |  208 -
 .../reasoner/rulesys/impl/RETESinkNode.java     |   35 -
 .../reasoner/rulesys/impl/RETESourceNode.java   |   31 -
 .../reasoner/rulesys/impl/RETETerminal.java     |  101 -
 .../reasoner/rulesys/impl/RuleClauseCode.java   |  844 ---
 .../jena/reasoner/rulesys/impl/RuleStore.java   |  188 -
 .../jena/reasoner/rulesys/impl/SafeGraph.java   |   66 -
 .../jena/reasoner/rulesys/impl/StateFlag.java   |   53 -
 .../reasoner/rulesys/impl/TempNodeCache.java    |  139 -
 .../rulesys/impl/TopLevelTripleMatchFrame.java  |   71 -
 .../reasoner/rulesys/impl/TripleMatchFrame.java |   78 -
 .../rulesys/impl/WrappedReasonerFactory.java    |   84 -
 .../hpl/jena/reasoner/rulesys/impl/package.html |   27 -
 .../hp/hpl/jena/reasoner/rulesys/package.html   |   41 -
 .../reasoner/transitiveReasoner/GraphNode.java  |  474 --
 .../transitiveReasoner/TransitiveEngine.java    |  402 -
 .../TransitiveGraphCache.java                   |  673 --
 .../transitiveReasoner/TransitiveInfGraph.java  |  165 -
 .../transitiveReasoner/TransitiveReasoner.java  |  250 -
 .../TransitiveReasonerFactory.java              |   86 -
 .../reasoner/transitiveReasoner/package.html    |   43 -
 .../hp/hpl/jena/shared/AddDeniedException.java  |   33 -
 .../hpl/jena/shared/AlreadyExistsException.java |   31 -
 .../jena/shared/AlreadyReifiedException.java    |   29 -
 .../jena/shared/AssertionFailureException.java  |   29 -
 .../hp/hpl/jena/shared/BadBooleanException.java |   29 -
 .../jena/shared/BadCharLiteralException.java    |   28 -
 .../jena/shared/BadDescriptionException.java    |   32 -
 .../BadDescriptionMultipleRootsException.java   |   35 -
 .../shared/BadDescriptionNoRootException.java   |   33 -
 .../com/hp/hpl/jena/shared/BadURIException.java |   40 -
 .../com/hp/hpl/jena/shared/BrokenException.java |   34 -
 .../hpl/jena/shared/CannotCreateException.java  |   31 -
 .../shared/CannotEncodeCharacterException.java  |   48 -
 .../hpl/jena/shared/CannotReifyException.java   |   29 -
 .../com/hp/hpl/jena/shared/ClosedException.java |   42 -
 .../java/com/hp/hpl/jena/shared/Command.java    |   31 -
 .../com/hp/hpl/jena/shared/ConfigException.java |   58 -
 .../hpl/jena/shared/DeleteDeniedException.java  |   33 -
 .../hpl/jena/shared/DoesNotExistException.java  |   34 -
 .../shared/InvalidPropertyURIException.java     |   29 -
 .../com/hp/hpl/jena/shared/JenaException.java   |   30 -
 .../main/java/com/hp/hpl/jena/shared/Lock.java  |   97 -
 .../java/com/hp/hpl/jena/shared/LockMRSW.java   |  250 -
 .../java/com/hp/hpl/jena/shared/LockMutex.java  |   37 -
 .../java/com/hp/hpl/jena/shared/LockNone.java   |   32 -
 .../NamespaceEndsWithNameCharException.java     |   30 -
 .../jena/shared/NoReaderForLangException.java   |   28 -
 .../shared/NoReasonerSuppliedException.java     |   28 -
 .../jena/shared/NoSuchReasonerException.java    |   42 -
 .../jena/shared/NoWriterForLangException.java   |   28 -
 .../hp/hpl/jena/shared/NotFoundException.java   |   33 -
 .../com/hp/hpl/jena/shared/PrefixMapping.java   |  229 -
 .../jena/shared/PropertyNotFoundException.java  |   30 -
 .../hp/hpl/jena/shared/RandomOrderGraph.java    |  122 -
 .../jena/shared/RulesetNotFoundException.java   |   36 -
 .../com/hp/hpl/jena/shared/SyntaxError.java     |   28 -
 .../jena/shared/UnknownPropertyException.java   |   29 -
 .../hpl/jena/shared/UpdateDeniedException.java  |   43 -
 .../hp/hpl/jena/shared/WrappedException.java    |   31 -
 .../hp/hpl/jena/shared/WrappedIOException.java  |   33 -
 .../hp/hpl/jena/shared/impl/JenaParameters.java |  115 -
 .../hpl/jena/shared/impl/PrefixMappingImpl.java |  269 -
 .../com/hp/hpl/jena/shared/impl/package.html    |   27 -
 .../java/com/hp/hpl/jena/shared/package.html    |   29 -
 .../java/com/hp/hpl/jena/shared/uuid/Bits.java  |  259 -
 .../com/hp/hpl/jena/shared/uuid/JenaUUID.java   |  252 -
 .../com/hp/hpl/jena/shared/uuid/LibUUID.java    |   76 -
 .../hp/hpl/jena/shared/uuid/UUIDFactory.java    |   26 -
 .../com/hp/hpl/jena/shared/uuid/UUID_V1.java    |  118 -
 .../hp/hpl/jena/shared/uuid/UUID_V1_Gen.java    |  314 -
 .../com/hp/hpl/jena/shared/uuid/UUID_V4.java    |   95 -
 .../hp/hpl/jena/shared/uuid/UUID_V4_Gen.java    |  105 -
 .../com/hp/hpl/jena/shared/uuid/UUID_nil.java   |   68 -
 .../hpl/jena/shared/wg/LazyFileInputStream.java |   46 -
 .../hp/hpl/jena/shared/wg/LazyInputStream.java  |   62 -
 .../hpl/jena/shared/wg/LazyURLInputStream.java  |   50 -
 .../jena/shared/wg/LazyZipEntryInputStream.java |   52 -
 .../jena/shared/wg/TestInputStreamFactory.java  |  192 -
 .../java/com/hp/hpl/jena/shared/wg/package.html |   30 -
 .../java/com/hp/hpl/jena/util/CharEncoding.java |  176 -
 .../com/hp/hpl/jena/util/CollectionFactory.java |   61 -
 .../java/com/hp/hpl/jena/util/FileManager.java  |  534 --
 .../java/com/hp/hpl/jena/util/FileUtils.java    |  416 -
 .../hp/hpl/jena/util/IteratorCollection.java    |   68 -
 .../com/hp/hpl/jena/util/LocationMapper.java    |  399 -
 .../main/java/com/hp/hpl/jena/util/Locator.java |   30 -
 .../hp/hpl/jena/util/LocatorClassLoader.java    |   85 -
 .../java/com/hp/hpl/jena/util/LocatorFile.java  |  150 -
 .../java/com/hp/hpl/jena/util/LocatorURL.java   |  157 -
 .../java/com/hp/hpl/jena/util/LocatorZip.java   |   89 -
 .../java/com/hp/hpl/jena/util/Metadata.java     |   96 -
 .../java/com/hp/hpl/jena/util/MonitorGraph.java |   95 -
 .../java/com/hp/hpl/jena/util/MonitorModel.java |   78 -
 .../java/com/hp/hpl/jena/util/OneToManyMap.java |  533 --
 .../java/com/hp/hpl/jena/util/PrintUtil.java    |  201 -
 .../com/hp/hpl/jena/util/ResourceUtils.java     |  338 -
 .../java/com/hp/hpl/jena/util/SystemUtils.java  |   53 -
 .../java/com/hp/hpl/jena/util/Tokenizer.java    |  172 -
 .../java/com/hp/hpl/jena/util/TypedStream.java  |   49 -
 .../main/java/com/hp/hpl/jena/util/URIref.java  |  170 -
 .../java/com/hp/hpl/jena/util/cache/Cache.java  |   49 -
 .../hp/hpl/jena/util/cache/CacheControl.java    |   70 -
 .../hp/hpl/jena/util/cache/CacheManager.java    |   54 -
 .../hpl/jena/util/cache/EnhancedNodeCache.java  |  120 -
 .../com/hp/hpl/jena/util/cache/RandCache.java   |  162 -
 .../hpl/jena/util/iterator/ArrayIterator.java   |   63 -
 .../jena/util/iterator/ClosableIterator.java    |   47 -
 .../util/iterator/ConcatenatedIterator.java     |  164 -
 .../util/iterator/EarlyBindingIterator.java     |   38 -
 .../jena/util/iterator/ExtendedIterator.java    |   83 -
 .../com/hp/hpl/jena/util/iterator/Filter.java   |   84 -
 .../jena/util/iterator/FilterDropIterator.java  |   34 -
 .../hpl/jena/util/iterator/FilterIterator.java  |   94 -
 .../jena/util/iterator/FilterKeepIterator.java  |   34 -
 .../jena/util/iterator/IteratorIterator.java    |   73 -
 .../jena/util/iterator/LateBindingIterator.java |   75 -
 .../hp/hpl/jena/util/iterator/LazyIterator.java |  104 -
 .../com/hp/hpl/jena/util/iterator/Map1.java     |   30 -
 .../hp/hpl/jena/util/iterator/Map1Iterator.java |   55 -
 .../hp/hpl/jena/util/iterator/MapFilter.java    |   34 -
 .../jena/util/iterator/MapFilterIterator.java   |   94 -
 .../hp/hpl/jena/util/iterator/NiceIterator.java |  220 -
 .../hp/hpl/jena/util/iterator/NullIterator.java |   40 -
 .../jena/util/iterator/RandomOrderIterator.java |   67 -
 .../jena/util/iterator/SingletonIterator.java   |   61 -
 .../util/iterator/UniqueExtendedIterator.java   |   93 -
 .../hp/hpl/jena/util/iterator/UniqueFilter.java |   43 -
 .../hpl/jena/util/iterator/WrappedIterator.java |  116 -
 .../com/hp/hpl/jena/util/iterator/package.html  |   30 -
 .../main/java/com/hp/hpl/jena/util/package.html |   28 -
 .../java/com/hp/hpl/jena/vocabulary/DB.java     |   76 -
 .../java/com/hp/hpl/jena/vocabulary/DC.java     |   27 -
 .../com/hp/hpl/jena/vocabulary/DCTerms.java     |  316 -
 .../com/hp/hpl/jena/vocabulary/DCTypes.java     |   79 -
 .../java/com/hp/hpl/jena/vocabulary/DC_10.java  |   57 -
 .../java/com/hp/hpl/jena/vocabulary/DC_11.java  |   86 -
 .../jena/vocabulary/LocationMappingVocab.java   |   53 -
 .../java/com/hp/hpl/jena/vocabulary/OWL.java    |  148 -
 .../java/com/hp/hpl/jena/vocabulary/OWL2.java   |  195 -
 .../com/hp/hpl/jena/vocabulary/OWLResults.java  |   91 -
 .../com/hp/hpl/jena/vocabulary/OWLTest.java     |  118 -
 .../hpl/jena/vocabulary/OntDocManagerVocab.java |   98 -
 .../hp/hpl/jena/vocabulary/OntEventsVocab.java  |  285 -
 .../java/com/hp/hpl/jena/vocabulary/RDF.java    |   99 -
 .../java/com/hp/hpl/jena/vocabulary/RDFS.java   |   88 -
 .../com/hp/hpl/jena/vocabulary/RDFSyntax.java   |   77 -
 .../com/hp/hpl/jena/vocabulary/RDFTest.java     |  126 -
 .../java/com/hp/hpl/jena/vocabulary/RSS.java    |   48 -
 .../hpl/jena/vocabulary/ReasonerVocabulary.java |  180 -
 .../hp/hpl/jena/vocabulary/TestManifest.java    |   86 -
 .../hp/hpl/jena/vocabulary/TestManifestX.java   |   72 -
 .../java/com/hp/hpl/jena/vocabulary/VCARD.java  |   93 -
 .../java/com/hp/hpl/jena/vocabulary/XSD.java    |  227 -
 .../com/hp/hpl/jena/vocabulary/package.html     |   28 -
 jena-core/src/main/java/jena/InvokingUtil.java  |   66 +
 jena-core/src/main/java/jena/RuleMap.java       |   53 +-
 jena-core/src/main/java/jena/cmdline/Arg.java   |   54 -
 .../src/main/java/jena/cmdline/ArgDecl.java     |  248 -
 .../src/main/java/jena/cmdline/ArgHandler.java  |   29 -
 .../main/java/jena/cmdline/CmdLineUtils.java    |   77 -
 .../src/main/java/jena/cmdline/CommandLine.java |  446 --
 jena-core/src/main/java/jena/qtest.java         |    3 +-
 jena-core/src/main/java/jena/query.java         |    3 +-
 jena-core/src/main/java/jena/rdfcat.java        |  832 +-
 jena-core/src/main/java/jena/rdfcompare.java    |    8 +-
 jena-core/src/main/java/jena/rdfcopy.java       |   10 +-
 jena-core/src/main/java/jena/rdfparse.java      |    8 +-
 jena-core/src/main/java/jena/rset.java          |    3 +-
 jena-core/src/main/java/jena/schemagen.java     |   66 +-
 jena-core/src/main/java/jena/sparql.java        |    3 +-
 jena-core/src/main/java/jena/turtle.java        |    3 +-
 jena-core/src/main/java/jena/version.java       |    7 +-
 .../src/main/java/org/apache/jena/Jena.java     |   47 +
 .../main/java/org/apache/jena/JenaRuntime.java  |  148 +
 .../org/apache/jena/assembler/Assembler.java    |  108 +
 .../apache/jena/assembler/AssemblerHelp.java    |  321 +
 .../jena/assembler/BadObjectException.java      |   53 +
 .../java/org/apache/jena/assembler/Content.java |   78 +
 .../apache/jena/assembler/ImportManager.java    |  112 +
 .../main/java/org/apache/jena/assembler/JA.java |  197 +
 .../java/org/apache/jena/assembler/Mode.java    |   77 +
 .../apache/jena/assembler/ModelExpansion.java   |  308 +
 .../java/org/apache/jena/assembler/RuleSet.java |   54 +
 .../assembler/assemblers/AssemblerBase.java     |  140 +
 .../assembler/assemblers/AssemblerGroup.java    |  152 +
 .../assembler/assemblers/ContentAssembler.java  |  192 +
 .../assemblers/DefaultModelAssembler.java       |   36 +
 .../assemblers/DocumentManagerAssembler.java    |   56 +
 .../assemblers/FileManagerAssembler.java        |   46 +
 .../assembler/assemblers/InfModelAssembler.java |   56 +
 .../assemblers/LocationMapperAssembler.java     |   37 +
 .../assemblers/MemoryModelAssembler.java        |   41 +
 .../assembler/assemblers/ModelAssembler.java    |  123 +
 .../assemblers/ModelSourceAssembler.java        |   33 +
 .../assemblers/NamedModelAssembler.java         |   31 +
 .../assembler/assemblers/OntModelAssembler.java |   63 +
 .../assemblers/OntModelSpecAssembler.java       |  133 +
 .../assemblers/PrefixMappingAssembler.java      |   61 +
 .../assemblers/ReasonerFactoryAssembler.java    |  195 +
 .../assembler/assemblers/RuleSetAssembler.java  |   75 +
 .../assemblers/UnionModelAssembler.java         |   60 +
 .../AmbiguousSpecificTypeException.java         |   58 +
 .../exceptions/AssemblerException.java          |  121 +
 .../exceptions/CannotConstructException.java    |   76 +
 .../exceptions/CannotHaveRulesException.java    |   36 +
 .../exceptions/CannotLoadClassException.java    |   50 +
 .../exceptions/NoImplementationException.java   |   50 +
 .../exceptions/NoSpecificTypeException.java     |   29 +
 .../exceptions/NotExpectedTypeException.java    |   44 +
 .../exceptions/NotUniqueException.java          |   43 +
 .../exceptions/PropertyRequiredException.java   |   49 +
 .../exceptions/ReasonerClashException.java      |   31 +
 .../exceptions/TransactionAbortedException.java |   39 +
 .../exceptions/UnknownEncodingException.java    |   49 +
 .../exceptions/UnknownReasonerException.java    |   42 +
 .../org/apache/jena/datatypes/BaseDatatype.java |  231 +
 .../jena/datatypes/DatatypeFormatException.java |   60 +
 .../org/apache/jena/datatypes/RDFDatatype.java  |  120 +
 .../org/apache/jena/datatypes/TypeMapper.java   |  189 +
 .../java/org/apache/jena/datatypes/package.html |   31 +
 .../jena/datatypes/xsd/AbstractDateTime.java    |  400 +
 .../xsd/IllegalDateTimeFieldException.java      |   34 +
 .../apache/jena/datatypes/xsd/XSDDatatype.java  |  651 ++
 .../apache/jena/datatypes/xsd/XSDDateTime.java  |  320 +
 .../apache/jena/datatypes/xsd/XSDDuration.java  |  326 +
 .../jena/datatypes/xsd/XSDbase64Binary.java     |   46 +
 .../apache/jena/datatypes/xsd/XSDbinary.java    |   66 +
 .../apache/jena/datatypes/xsd/XSDhexBinary.java |   46 +
 .../jena/datatypes/xsd/impl/RDFLangString.java  |   66 +
 .../jena/datatypes/xsd/impl/XMLLiteralType.java |  153 +
 .../xsd/impl/XSDAbstractDateTimeType.java       |  471 ++
 .../datatypes/xsd/impl/XSDBaseNumericType.java  |  196 +
 .../datatypes/xsd/impl/XSDBaseStringType.java   |   69 +
 .../jena/datatypes/xsd/impl/XSDByteType.java    |   46 +
 .../xsd/impl/XSDDateTimeStampType.java          |   57 +
 .../datatypes/xsd/impl/XSDDateTimeType.java     |   60 +
 .../jena/datatypes/xsd/impl/XSDDateType.java    |   58 +
 .../xsd/impl/XSDDayTimeDurationType.java        |   60 +
 .../jena/datatypes/xsd/impl/XSDDayType.java     |   69 +
 .../jena/datatypes/xsd/impl/XSDDouble.java      |  125 +
 .../datatypes/xsd/impl/XSDDurationType.java     |  139 +
 .../jena/datatypes/xsd/impl/XSDFloat.java       |  125 +
 .../datatypes/xsd/impl/XSDMonthDayType.java     |   71 +
 .../jena/datatypes/xsd/impl/XSDMonthType.java   |   73 +
 .../jena/datatypes/xsd/impl/XSDPlainType.java   |   56 +
 .../jena/datatypes/xsd/impl/XSDTimeType.java    |   76 +
 .../xsd/impl/XSDYearMonthDurationType.java      |   37 +
 .../datatypes/xsd/impl/XSDYearMonthType.java    |   60 +
 .../jena/datatypes/xsd/impl/XSDYearType.java    |   73 +
 .../apache/jena/datatypes/xsd/impl/package.html |   30 +
 .../org/apache/jena/datatypes/xsd/package.html  |   35 +
 .../enhanced/AlreadyLinkedViewException.java    |   35 +
 .../jena/enhanced/BuiltinPersonalities.java     |   98 +
 .../java/org/apache/jena/enhanced/EnhGraph.java |  180 +
 .../java/org/apache/jena/enhanced/EnhNode.java  |  181 +
 .../apache/jena/enhanced/GraphPersonality.java  |   28 +
 .../apache/jena/enhanced/Implementation.java    |   48 +
 .../apache/jena/enhanced/NodePersonality.java   |   27 +
 .../org/apache/jena/enhanced/Personality.java   |  101 +
 .../enhanced/PersonalityConfigException.java    |   42 +
 .../org/apache/jena/enhanced/Polymorphic.java   |  140 +
 .../UnsupportedPolymorphismException.java       |   62 +
 .../java/org/apache/jena/enhanced/package.html  |   27 +
 .../java/org/apache/jena/graph/BlankNodeId.java |  156 +
 .../org/apache/jena/graph/Capabilities.java     |   79 +
 .../java/org/apache/jena/graph/Factory.java     |   67 +
 .../java/org/apache/jena/graph/FrontsNode.java  |   33 +
 .../org/apache/jena/graph/FrontsTriple.java     |   28 +
 .../java/org/apache/jena/graph/GetTriple.java   |   37 +
 .../main/java/org/apache/jena/graph/Graph.java  |  161 +
 .../apache/jena/graph/GraphEventManager.java    |   81 +
 .../java/org/apache/jena/graph/GraphEvents.java |  103 +
 .../org/apache/jena/graph/GraphExtract.java     |   91 +
 .../org/apache/jena/graph/GraphListener.java    |  124 +
 .../java/org/apache/jena/graph/GraphMaker.java  |  122 +
 .../jena/graph/GraphStatisticsHandler.java      |   34 +
 .../java/org/apache/jena/graph/GraphUtil.java   |  265 +
 .../main/java/org/apache/jena/graph/Node.java   |  287 +
 .../java/org/apache/jena/graph/NodeFactory.java |  201 +
 .../java/org/apache/jena/graph/NodeVisitor.java |   34 +
 .../java/org/apache/jena/graph/Node_ANY.java    |   55 +
 .../java/org/apache/jena/graph/Node_Blank.java  |   50 +
 .../org/apache/jena/graph/Node_Concrete.java    |   33 +
 .../java/org/apache/jena/graph/Node_Fluid.java  |   33 +
 .../org/apache/jena/graph/Node_Literal.java     |  113 +
 .../java/org/apache/jena/graph/Node_NULL.java   |   49 +
 .../java/org/apache/jena/graph/Node_URI.java    |   88 +
 .../org/apache/jena/graph/Node_Variable.java    |   92 +
 .../apache/jena/graph/TransactionHandler.java   |   62 +
 .../main/java/org/apache/jena/graph/Triple.java |  222 +
 .../org/apache/jena/graph/TripleBoundary.java   |   47 +
 .../org/apache/jena/graph/TripleIterator.java   |   33 +
 .../jena/graph/compose/CompositionBase.java     |  161 +
 .../org/apache/jena/graph/compose/Delta.java    |  112 +
 .../apache/jena/graph/compose/Difference.java   |   55 +
 .../jena/graph/compose/DisjointUnion.java       |   48 +
 .../org/apache/jena/graph/compose/Dyadic.java   |   96 +
 .../apache/jena/graph/compose/Intersection.java |   56 +
 .../apache/jena/graph/compose/MultiUnion.java   |  221 +
 .../org/apache/jena/graph/compose/Polyadic.java |  272 +
 .../compose/PolyadicPrefixMappingImpl.java      |  206 +
 .../org/apache/jena/graph/compose/Union.java    |   68 +
 .../org/apache/jena/graph/compose/package.html  |   27 +
 .../apache/jena/graph/impl/AdhocDatatype.java   |   46 +
 .../apache/jena/graph/impl/AllCapabilities.java |   48 +
 .../apache/jena/graph/impl/BaseGraphMaker.java  |   79 +
 .../apache/jena/graph/impl/CollectionGraph.java |  172 +
 .../org/apache/jena/graph/impl/GraphBase.java   |  398 +
 .../apache/jena/graph/impl/GraphMatcher.java    |  961 +++
 .../jena/graph/impl/GraphWithPerform.java       |   40 +
 .../apache/jena/graph/impl/LiteralLabel.java    |  112 +
 .../jena/graph/impl/LiteralLabelFactory.java    |  113 +
 .../jena/graph/impl/LiteralLabelImpl.java       |  494 ++
 .../jena/graph/impl/SimpleEventManager.java     |  187 +
 .../jena/graph/impl/SimpleGraphMaker.java       |  114 +
 .../graph/impl/SimpleTransactionHandler.java    |   45 +
 .../jena/graph/impl/TransactionHandlerBase.java |   47 +
 .../org/apache/jena/graph/impl/TripleStore.java |   84 +
 .../apache/jena/graph/impl/WrappedGraph.java    |  134 +
 .../org/apache/jena/graph/impl/package.html     |   29 +
 .../java/org/apache/jena/graph/package.html     |   27 +
 .../java/org/apache/jena/mem/ArrayBunch.java    |  145 +
 .../main/java/org/apache/jena/mem/BunchMap.java |   63 +
 .../main/java/org/apache/jena/mem/GraphMem.java |  164 +
 .../java/org/apache/jena/mem/GraphMemBase.java  |   94 +
 .../org/apache/jena/mem/GraphTripleStore.java   |   42 +
 .../apache/jena/mem/GraphTripleStoreBase.java   |  169 +
 .../apache/jena/mem/GraphTripleStoreMem.java    |   45 +
 .../java/org/apache/jena/mem/HashCommon.java    |  378 +
 .../org/apache/jena/mem/HashedBunchMap.java     |  113 +
 .../org/apache/jena/mem/HashedTripleBunch.java  |  108 +
 .../org/apache/jena/mem/NodeToTriplesMap.java   |  138 +
 .../apache/jena/mem/NodeToTriplesMapBase.java   |  144 +
 .../apache/jena/mem/NodeToTriplesMapMem.java    |  142 +
 .../org/apache/jena/mem/ObjectIterator.java     |   79 +
 .../main/java/org/apache/jena/mem/SetBunch.java |   88 +
 .../apache/jena/mem/StoreTripleIterator.java    |   62 +
 .../apache/jena/mem/TrackingTripleIterator.java |   48 +
 .../java/org/apache/jena/mem/TripleBunch.java   |   76 +
 .../org/apache/jena/mem/WrappedHashMap.java     |   56 +
 .../main/java/org/apache/jena/mem/package.html  |   27 +
 .../java/org/apache/jena/n3/IRIResolver.java    |  231 +
 .../java/org/apache/jena/n3/JenaReaderBase.java |  136 +
 .../org/apache/jena/n3/JenaURIException.java    |   28 +
 .../org/apache/jena/n3/N3IndentedWriter.java    |   92 +
 .../java/org/apache/jena/n3/N3JenaWriter.java   |  190 +
 .../org/apache/jena/n3/N3JenaWriterCommon.java  |  967 +++
 .../java/org/apache/jena/n3/N3JenaWriterPP.java |  633 ++
 .../org/apache/jena/n3/N3JenaWriterPlain.java   |   29 +
 .../org/apache/jena/n3/N3JenaWriterTriples.java |   64 +
 .../org/apache/jena/n3/N3TurtleJenaWriter.java  |   40 +
 .../apache/jena/n3/RelativeURIException.java    |   24 +
 .../main/java/org/apache/jena/n3/package.html   |   97 +
 .../apache/jena/n3/turtle/LabelToNodeMap.java   |   56 +
 .../org/apache/jena/n3/turtle/ParserBase.java   |  452 ++
 .../org/apache/jena/n3/turtle/ParserTurtle.java |   63 +
 .../apache/jena/n3/turtle/Turtle2NTriples.java  |  170 +
 .../apache/jena/n3/turtle/TurtleEventDump.java  |   58 +
 .../jena/n3/turtle/TurtleEventHandler.java      |   30 +
 .../apache/jena/n3/turtle/TurtleEventNull.java  |   33 +
 .../jena/n3/turtle/TurtleParseException.java    |   34 +
 .../jena/n3/turtle/TurtleRDFGraphInserter.java  |   60 +
 .../org/apache/jena/n3/turtle/TurtleReader.java |   35 +
 .../jena/n3/turtle/parser/JavaCharStream.java   |  635 ++
 .../jena/n3/turtle/parser/ParseException.java   |  209 +
 .../org/apache/jena/n3/turtle/parser/Token.java |  149 +
 .../jena/n3/turtle/parser/TokenMgrError.java    |  165 +
 .../jena/n3/turtle/parser/TurtleParser.java     |  926 +++
 .../n3/turtle/parser/TurtleParserConstants.java |  231 +
 .../turtle/parser/TurtleParserTokenManager.java | 1457 ++++
 .../org/apache/jena/ontology/AllDifferent.java  |  108 +
 .../jena/ontology/AllValuesFromRestriction.java |   84 +
 .../jena/ontology/AnnotationProperty.java       |   50 +
 .../jena/ontology/BooleanClassDescription.java  |  112 +
 .../jena/ontology/CardinalityQRestriction.java  |   79 +
 .../jena/ontology/CardinalityRestriction.java   |   79 +
 .../apache/jena/ontology/ComplementClass.java   |   59 +
 .../jena/ontology/ConversionException.java      |   71 +
 .../org/apache/jena/ontology/DataRange.java     |  107 +
 .../apache/jena/ontology/DatatypeProperty.java  |   47 +
 .../apache/jena/ontology/EnumeratedClass.java   |  107 +
 .../jena/ontology/FunctionalProperty.java       |   48 +
 .../jena/ontology/HasValueRestriction.java      |   82 +
 .../org/apache/jena/ontology/Individual.java    |  189 +
 .../apache/jena/ontology/IntersectionClass.java |   48 +
 .../ontology/InverseFunctionalProperty.java     |   53 +
 .../ontology/LanguageConsistencyException.java  |   65 +
 .../ontology/MaxCardinalityQRestriction.java    |   80 +
 .../ontology/MaxCardinalityRestriction.java     |   80 +
 .../ontology/MinCardinalityQRestriction.java    |   80 +
 .../ontology/MinCardinalityRestriction.java     |   79 +
 .../apache/jena/ontology/ObjectProperty.java    |   47 +
 .../java/org/apache/jena/ontology/OntClass.java |  595 ++
 .../jena/ontology/OntDocumentManager.java       | 1176 +++
 .../java/org/apache/jena/ontology/OntModel.java | 1719 +++++
 .../org/apache/jena/ontology/OntModelSpec.java  |  466 ++
 .../org/apache/jena/ontology/OntProperty.java   |  601 ++
 .../org/apache/jena/ontology/OntResource.java   |  788 ++
 .../java/org/apache/jena/ontology/OntTools.java |  616 ++
 .../java/org/apache/jena/ontology/Ontology.java |  248 +
 .../apache/jena/ontology/OntologyException.java |   69 +
 .../java/org/apache/jena/ontology/Profile.java  |  767 ++
 .../apache/jena/ontology/ProfileException.java  |   69 +
 .../apache/jena/ontology/ProfileRegistry.java   |  141 +
 .../jena/ontology/QualifiedRestriction.java     |   95 +
 .../org/apache/jena/ontology/Restriction.java   |  237 +
 .../ontology/SomeValuesFromRestriction.java     |   84 +
 .../apache/jena/ontology/SymmetricProperty.java |   46 +
 .../jena/ontology/TransitiveProperty.java       |   47 +
 .../org/apache/jena/ontology/UnionClass.java    |   48 +
 .../jena/ontology/impl/AbstractProfile.java     |  156 +
 .../jena/ontology/impl/AllDifferentImpl.java    |  184 +
 .../impl/AllValuesFromRestrictionImpl.java      |  176 +
 .../ontology/impl/AnnotationPropertyImpl.java   |  124 +
 .../impl/BooleanClassDescriptionImpl.java       |  173 +
 .../impl/CardinalityQRestrictionImpl.java       |  153 +
 .../impl/CardinalityRestrictionImpl.java        |  149 +
 .../jena/ontology/impl/ComplementClassImpl.java |  222 +
 .../jena/ontology/impl/DataRangeImpl.java       |  190 +
 .../ontology/impl/DatatypePropertyImpl.java     |  103 +
 .../jena/ontology/impl/EnumeratedClassImpl.java |  189 +
 .../ontology/impl/FunctionalPropertyImpl.java   |  103 +
 .../ontology/impl/HasValueRestrictionImpl.java  |  162 +
 .../jena/ontology/impl/IndividualImpl.java      |  273 +
 .../ontology/impl/IntersectionClassImpl.java    |  110 +
 .../impl/InverseFunctionalPropertyImpl.java     |  103 +
 .../impl/MaxCardinalityQRestrictionImpl.java    |  155 +
 .../impl/MaxCardinalityRestrictionImpl.java     |  149 +
 .../impl/MinCardinalityQRestrictionImpl.java    |  154 +
 .../impl/MinCardinalityRestrictionImpl.java     |  150 +
 .../apache/jena/ontology/impl/OWLDLProfile.java |  302 +
 .../jena/ontology/impl/OWLLiteProfile.java      |  305 +
 .../apache/jena/ontology/impl/OWLProfile.java   |  573 ++
 .../jena/ontology/impl/ObjectPropertyImpl.java  |  146 +
 .../apache/jena/ontology/impl/OntClassImpl.java | 1113 +++
 .../apache/jena/ontology/impl/OntModelImpl.java | 3173 ++++++++
 .../jena/ontology/impl/OntPropertyImpl.java     |  917 +++
 .../jena/ontology/impl/OntResourceImpl.java     | 1668 ++++
 .../apache/jena/ontology/impl/OntologyImpl.java |  380 +
 .../ontology/impl/QualifiedRestrictionImpl.java |  190 +
 .../apache/jena/ontology/impl/RDFSProfile.java  |  342 +
 .../jena/ontology/impl/RestrictionImpl.java     |  370 +
 .../impl/SomeValuesFromRestrictionImpl.java     |  176 +
 .../ontology/impl/SymmetricPropertyImpl.java    |  103 +
 .../ontology/impl/TransitivePropertyImpl.java   |  103 +
 .../jena/ontology/impl/UnionClassImpl.java      |  113 +
 .../org/apache/jena/ontology/impl/package.html  |   29 +
 .../java/org/apache/jena/ontology/package.html  |   38 +
 .../jena/rdf/listeners/ChangedListener.java     |   67 +
 .../apache/jena/rdf/listeners/NullListener.java |   53 +
 .../jena/rdf/listeners/ObjectListener.java      |   64 +
 .../jena/rdf/listeners/StatementListener.java   |   90 +
 .../org/apache/jena/rdf/listeners/package.html  |   33 +
 .../java/org/apache/jena/rdf/model/Alt.java     |  223 +
 .../rdf/model/AltHasNoDefaultException.java     |   30 +
 .../java/org/apache/jena/rdf/model/AnonId.java  |   92 +
 .../java/org/apache/jena/rdf/model/Bag.java     |   61 +
 .../org/apache/jena/rdf/model/Container.java    |  246 +
 .../jena/rdf/model/DoesNotReifyException.java   |   33 +
 .../jena/rdf/model/EmptyListException.java      |   85 +
 .../rdf/model/EmptyListUpdateException.java     |   75 +
 .../jena/rdf/model/HasNoModelException.java     |   31 +
 .../org/apache/jena/rdf/model/InfModel.java     |  145 +
 .../jena/rdf/model/InvalidListException.java    |   84 +
 .../jena/rdf/model/ListIndexException.java      |   84 +
 .../java/org/apache/jena/rdf/model/Literal.java |  217 +
 .../rdf/model/LiteralRequiredException.java     |   35 +
 .../java/org/apache/jena/rdf/model/Model.java   | 1019 +++
 .../jena/rdf/model/ModelChangedListener.java    |  111 +
 .../org/apache/jena/rdf/model/ModelCon.java     |  805 ++
 .../org/apache/jena/rdf/model/ModelExtract.java |   64 +
 .../org/apache/jena/rdf/model/ModelFactory.java |  305 +
 .../apache/jena/rdf/model/ModelFactoryBase.java |   44 +
 .../org/apache/jena/rdf/model/ModelGetter.java  |   46 +
 .../jena/rdf/model/ModelGraphInterface.java     |   51 +
 .../org/apache/jena/rdf/model/ModelMaker.java   |  113 +
 .../org/apache/jena/rdf/model/ModelReader.java  |   31 +
 .../org/apache/jena/rdf/model/ModelSource.java  |   78 +
 .../org/apache/jena/rdf/model/NodeIterator.java |   71 +
 .../org/apache/jena/rdf/model/NsIterator.java   |   40 +
 .../org/apache/jena/rdf/model/Property.java     |   58 +
 .../apache/jena/rdf/model/RDFErrorHandler.java  |   37 +
 .../java/org/apache/jena/rdf/model/RDFList.java |  546 ++
 .../java/org/apache/jena/rdf/model/RDFNode.java |  124 +
 .../org/apache/jena/rdf/model/RDFReader.java    |   94 +
 .../org/apache/jena/rdf/model/RDFReaderF.java   |   82 +
 .../org/apache/jena/rdf/model/RDFVisitor.java   |   48 +
 .../org/apache/jena/rdf/model/RDFWriter.java    |   90 +
 .../org/apache/jena/rdf/model/RDFWriterF.java   |   76 +
 .../org/apache/jena/rdf/model/RSIterator.java   |   32 +
 .../apache/jena/rdf/model/ReifiedStatement.java |   32 +
 .../org/apache/jena/rdf/model/ResIterator.java  |   34 +
 .../org/apache/jena/rdf/model/Resource.java     |  364 +
 .../org/apache/jena/rdf/model/ResourceF.java    |   36 +
 .../apache/jena/rdf/model/ResourceFactory.java  |  313 +
 .../rdf/model/ResourceRequiredException.java    |   35 +
 .../org/apache/jena/rdf/model/Selector.java     |   60 +
 .../java/org/apache/jena/rdf/model/Seq.java     |  517 ++
 .../jena/rdf/model/SeqIndexBoundsException.java |   30 +
 .../apache/jena/rdf/model/SimpleSelector.java   |  287 +
 .../org/apache/jena/rdf/model/Statement.java    |  392 +
 .../jena/rdf/model/StatementBoundary.java       |   39 +
 .../jena/rdf/model/StatementBoundaryBase.java   |   63 +
 .../jena/rdf/model/StatementTripleBoundary.java |   51 +
 .../org/apache/jena/rdf/model/StmtIterator.java |   44 +
 .../org/apache/jena/rdf/model/impl/AltImpl.java |  206 +
 .../org/apache/jena/rdf/model/impl/BagImpl.java |   58 +
 .../model/impl/ContNodeIteratorFactoryImpl.java |   33 +
 .../rdf/model/impl/ContNodeIteratorImpl.java    |   78 +
 .../apache/jena/rdf/model/impl/ContainerI.java  |   33 +
 .../jena/rdf/model/impl/ContainerImpl.java      |  256 +
 .../org/apache/jena/rdf/model/impl/IO_Ctl.java  |   71 +
 .../jena/rdf/model/impl/InfModelImpl.java       |  180 +
 .../jena/rdf/model/impl/IteratorFactory.java    |   72 +
 .../apache/jena/rdf/model/impl/LiteralImpl.java |  311 +
 .../jena/rdf/model/impl/MemoryModelGetter.java  |   43 +
 .../apache/jena/rdf/model/impl/ModelCom.java    | 1578 ++++
 .../rdf/model/impl/ModelListenerAdapter.java    |  101 +
 .../jena/rdf/model/impl/ModelMakerImpl.java     |  106 +
 .../jena/rdf/model/impl/ModelReifier.java       |  169 +
 .../jena/rdf/model/impl/NTripleReader.java      |  493 ++
 .../jena/rdf/model/impl/NTripleWriter.java      |  230 +
 .../rdf/model/impl/NodeIteratorFactory.java     |   31 +
 .../jena/rdf/model/impl/NodeIteratorImpl.java   |   40 +
 .../jena/rdf/model/impl/NsIteratorImpl.java     |   37 +
 .../jena/rdf/model/impl/PropertyImpl.java       |  154 +
 .../rdf/model/impl/RDFDefaultErrorHandler.java  |   64 +
 .../apache/jena/rdf/model/impl/RDFListImpl.java | 1238 +++
 .../jena/rdf/model/impl/RDFReaderFImpl.java     |  151 +
 .../jena/rdf/model/impl/RDFWriterFImpl.java     |  157 +
 .../jena/rdf/model/impl/RSIteratorImpl.java     |   34 +
 .../rdf/model/impl/ReifiedStatementImpl.java    |  149 +
 .../apache/jena/rdf/model/impl/ReifierStd.java  |  269 +
 .../jena/rdf/model/impl/ResIteratorImpl.java    |   44 +
 .../jena/rdf/model/impl/ResourceImpl.java       |  396 +
 .../jena/rdf/model/impl/SelectorImpl.java       |  211 +
 .../org/apache/jena/rdf/model/impl/SeqImpl.java |  379 +
 .../model/impl/SeqNodeIteratorFactoryImpl.java  |   33 +
 .../rdf/model/impl/SeqNodeIteratorImpl.java     |   68 +
 .../jena/rdf/model/impl/StatementBase.java      |  177 +
 .../jena/rdf/model/impl/StatementImpl.java      |  226 +
 .../jena/rdf/model/impl/StmtIteratorImpl.java   |   53 +
 .../org/apache/jena/rdf/model/impl/Util.java    |  240 +
 .../org/apache/jena/rdf/model/impl/package.html |   29 +
 .../java/org/apache/jena/rdf/model/package.html |   27 +
 .../apache/jena/rdfxml/xmlinput/ALiteral.java   |   64 +
 .../org/apache/jena/rdfxml/xmlinput/ARP.java    |  235 +
 .../apache/jena/rdfxml/xmlinput/ARPConfig.java  |   84 +
 .../jena/rdfxml/xmlinput/ARPErrorNumbers.java   |  538 ++
 .../jena/rdfxml/xmlinput/ARPEventHandler.java   |   36 +
 .../jena/rdfxml/xmlinput/ARPHandlers.java       |  186 +
 .../apache/jena/rdfxml/xmlinput/ARPOptions.java |  258 +
 .../apache/jena/rdfxml/xmlinput/AResource.java  |   65 +
 .../apache/jena/rdfxml/xmlinput/DOM2Model.java  |  119 +
 .../jena/rdfxml/xmlinput/ExtendedHandler.java   |  112 +
 .../xmlinput/FatalParsingErrorException.java    |   35 +
 .../jena/rdfxml/xmlinput/JenaHandler.java       |  104 +
 .../apache/jena/rdfxml/xmlinput/JenaReader.java |  556 ++
 .../apache/jena/rdfxml/xmlinput/NTriple.java    |  656 ++
 .../jena/rdfxml/xmlinput/NamespaceHandler.java  |   50 +
 .../jena/rdfxml/xmlinput/ParseException.java    |  208 +
 .../apache/jena/rdfxml/xmlinput/SAX2Model.java  |  274 +
 .../apache/jena/rdfxml/xmlinput/SAX2RDF.java    |  186 +
 .../apache/jena/rdfxml/xmlinput/StAX2Model.java |   59 +
 .../apache/jena/rdfxml/xmlinput/StAX2SAX.java   |  202 +
 .../jena/rdfxml/xmlinput/StatementHandler.java  |   47 +
 .../apache/jena/rdfxml/xmlinput/impl/ANode.java |   23 +
 .../xmlinput/impl/ARPDatatypeLiteral.java       |   75 +
 .../jena/rdfxml/xmlinput/impl/ARPLocation.java  |   69 +
 .../jena/rdfxml/xmlinput/impl/ARPResource.java  |  146 +
 .../xmlinput/impl/ARPSaxErrorHandler.java       |   57 +
 .../jena/rdfxml/xmlinput/impl/ARPString.java    |   97 +
 .../rdfxml/xmlinput/impl/AResourceInternal.java |   42 +
 .../rdfxml/xmlinput/impl/AbsXMLContext.java     |  186 +
 .../rdfxml/xmlinput/impl/AttributeLexer.java    |  240 +
 .../rdfxml/xmlinput/impl/CharacterModel.java    |  300 +
 .../xmlinput/impl/DefaultErrorHandler.java      |   56 +
 .../jena/rdfxml/xmlinput/impl/ElementLexer.java |   91 +
 .../xmlinput/impl/LexicalHandlerImpl.java       |   80 +
 .../apache/jena/rdfxml/xmlinput/impl/Names.java |   81 +
 .../rdfxml/xmlinput/impl/ParserSupport.java     |  237 +
 .../jena/rdfxml/xmlinput/impl/QNameLexer.java   |  230 +
 .../jena/rdfxml/xmlinput/impl/RDFXMLParser.java |  219 +
 .../jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java  |  299 +
 .../apache/jena/rdfxml/xmlinput/impl/Taint.java |   28 +
 .../jena/rdfxml/xmlinput/impl/TaintImpl.java    |   39 +
 .../jena/rdfxml/xmlinput/impl/URIReference.java |  188 +
 .../xmlinput/impl/UntaintableURIReference.java  |   30 +
 .../rdfxml/xmlinput/impl/WrappedException.java  |   76 +
 .../xmlinput/impl/XMLBaselessContext.java       |  112 +
 .../jena/rdfxml/xmlinput/impl/XMLContext.java   |  122 +
 .../jena/rdfxml/xmlinput/impl/XMLHandler.java   |  545 ++
 .../apache/jena/rdfxml/xmlinput/package.html    |   57 +
 .../AbsWantLiteralValueOrDescription.java       |   99 +
 .../rdfxml/xmlinput/states/AbsXMLLiteral.java   |  255 +
 .../jena/rdfxml/xmlinput/states/Collection.java |   92 +
 .../jena/rdfxml/xmlinput/states/Frame.java      |  172 +
 .../jena/rdfxml/xmlinput/states/FrameI.java     |   45 +
 .../xmlinput/states/HasSubjectFrameI.java       |   34 +
 .../rdfxml/xmlinput/states/InnerXMLLiteral.java |   40 +
 .../rdfxml/xmlinput/states/LookingForRDF.java   |   54 +
 .../rdfxml/xmlinput/states/OuterXMLLiteral.java |   53 +
 .../rdfxml/xmlinput/states/RDFCollection.java   |   42 +
 .../states/StartStateRDForDescription.java      |   55 +
 .../rdfxml/xmlinput/states/WantDescription.java |  125 +
 .../jena/rdfxml/xmlinput/states/WantEmpty.java  |   43 +
 .../states/WantLiteralValueOrDescription.java   |   91 +
 .../xmlinput/states/WantPropertyElement.java    |  436 ++
 .../states/WantTopLevelDescription.java         |   54 +
 .../xmlinput/states/WantTypedLiteral.java       |   59 +
 .../xmlinput/states/WantsObjectFrameI.java      |   22 +
 .../rdfxml/xmlinput/states/WantsObjectI.java    |   25 +
 .../jena/rdfxml/xmloutput/RDFXMLWriterI.java    |  226 +
 .../jena/rdfxml/xmloutput/impl/Abbreviated.java |  161 +
 .../rdfxml/xmloutput/impl/BaseXMLWriter.java    |  906 +++
 .../jena/rdfxml/xmloutput/impl/Basic.java       |  177 +
 .../jena/rdfxml/xmloutput/impl/PairEntry.java   |   53 +
 .../jena/rdfxml/xmloutput/impl/Relation.java    |  249 +
 .../rdfxml/xmloutput/impl/SimpleLogger.java     |   25 +
 .../jena/rdfxml/xmloutput/impl/Unparser.java    | 1726 +++++
 .../apache/jena/rdfxml/xmloutput/package.html   |   27 +
 .../org/apache/jena/reasoner/BaseInfGraph.java  |  532 ++
 .../org/apache/jena/reasoner/Derivation.java    |   47 +
 .../java/org/apache/jena/reasoner/FGraph.java   |   89 +
 .../java/org/apache/jena/reasoner/Finder.java   |   56 +
 .../org/apache/jena/reasoner/FinderUtil.java    |  129 +
 .../reasoner/IllegalParameterException.java     |   35 +
 .../java/org/apache/jena/reasoner/InfGraph.java |  154 +
 .../java/org/apache/jena/reasoner/Reasoner.java |  145 +
 .../apache/jena/reasoner/ReasonerException.java |   48 +
 .../apache/jena/reasoner/ReasonerFactory.java   |   50 +
 .../apache/jena/reasoner/ReasonerRegistry.java  |  254 +
 .../jena/reasoner/StandardValidityReport.java   |  112 +
 .../org/apache/jena/reasoner/TriplePattern.java |  340 +
 .../apache/jena/reasoner/ValidityReport.java    |  132 +
 .../java/org/apache/jena/reasoner/package.html  |   83 +
 .../reasoner/rulesys/BackwardRuleInfGraphI.java |   68 +
 .../rulesys/BasicForwardRuleInfGraph.java       |  519 ++
 .../rulesys/BasicForwardRuleReasoner.java       |  227 +
 .../reasoner/rulesys/BindingEnvironment.java    |   57 +
 .../apache/jena/reasoner/rulesys/Builtin.java   |   92 +
 .../jena/reasoner/rulesys/BuiltinException.java |   39 +
 .../jena/reasoner/rulesys/BuiltinRegistry.java  |  147 +
 .../jena/reasoner/rulesys/ClauseEntry.java      |   33 +
 .../jena/reasoner/rulesys/FBRuleInfGraph.java   |  986 +++
 .../jena/reasoner/rulesys/FBRuleReasoner.java   |  420 ++
 .../reasoner/rulesys/ForwardRuleInfGraphI.java  |   90 +
 .../apache/jena/reasoner/rulesys/Functor.java   |  297 +
 .../reasoner/rulesys/GenericRuleReasoner.java   |  441 ++
 .../rulesys/GenericRuleReasonerFactory.java     |   84 +
 .../rulesys/LPBackwardRuleInfGraph.java         |  371 +
 .../rulesys/LPBackwardRuleReasoner.java         |  232 +
 .../reasoner/rulesys/Node_RuleVariable.java     |  195 +
 .../reasoner/rulesys/OWLFBRuleReasoner.java     |  149 +
 .../rulesys/OWLFBRuleReasonerFactory.java       |  129 +
 .../jena/reasoner/rulesys/OWLMicroReasoner.java |   98 +
 .../rulesys/OWLMicroReasonerFactory.java        |  126 +
 .../jena/reasoner/rulesys/OWLMiniReasoner.java  |   93 +
 .../rulesys/OWLMiniReasonerFactory.java         |  127 +
 .../reasoner/rulesys/RDFSFBRuleReasoner.java    |   66 +
 .../rulesys/RDFSFBRuleReasonerFactory.java      |   88 +
 .../rulesys/RDFSForwardRuleReasoner.java        |   73 +
 .../jena/reasoner/rulesys/RDFSRuleInfGraph.java |   69 +
 .../jena/reasoner/rulesys/RDFSRuleReasoner.java |  221 +
 .../rulesys/RDFSRuleReasonerFactory.java        |   87 +
 .../jena/reasoner/rulesys/RETERuleInfGraph.java |  111 +
 .../org/apache/jena/reasoner/rulesys/Rule.java  | 1117 +++
 .../jena/reasoner/rulesys/RuleContext.java      |   88 +
 .../jena/reasoner/rulesys/RuleDerivation.java   |  170 +
 .../reasoner/rulesys/RulePreprocessHook.java    |   54 +
 .../jena/reasoner/rulesys/RuleReasoner.java     |   42 +
 .../reasoner/rulesys/RuleReasonerFactory.java   |   31 +
 .../jena/reasoner/rulesys/SilentAddI.java       |   35 +
 .../org/apache/jena/reasoner/rulesys/Util.java  |  373 +
 .../jena/reasoner/rulesys/builtins/AddOne.java  |   73 +
 .../rulesys/builtins/AssertDisjointPairs.java   |   74 +
 .../reasoner/rulesys/builtins/BaseBuiltin.java  |  118 +
 .../jena/reasoner/rulesys/builtins/Bound.java   |   56 +
 .../rulesys/builtins/CountLiteralValues.java    |   86 +
 .../reasoner/rulesys/builtins/Difference.java   |   84 +
 .../jena/reasoner/rulesys/builtins/Drop.java    |   90 +
 .../jena/reasoner/rulesys/builtins/Equal.java   |   68 +
 .../jena/reasoner/rulesys/builtins/GE.java      |   66 +
 .../reasoner/rulesys/builtins/GreaterThan.java  |   67 +
 .../jena/reasoner/rulesys/builtins/Hide.java    |   84 +
 .../jena/reasoner/rulesys/builtins/IsBNode.java |   62 +
 .../jena/reasoner/rulesys/builtins/IsDType.java |   90 +
 .../reasoner/rulesys/builtins/IsFunctor.java    |   63 +
 .../reasoner/rulesys/builtins/IsLiteral.java    |   72 +
 .../jena/reasoner/rulesys/builtins/LE.java      |   66 +
 .../reasoner/rulesys/builtins/LessThan.java     |   67 +
 .../reasoner/rulesys/builtins/ListContains.java |   84 +
 .../reasoner/rulesys/builtins/ListEntry.java    |   96 +
 .../reasoner/rulesys/builtins/ListEqual.java    |   94 +
 .../reasoner/rulesys/builtins/ListLength.java   |   94 +
 .../rulesys/builtins/ListMapAsObject.java       |   74 +
 .../rulesys/builtins/ListMapAsSubject.java      |   73 +
 .../rulesys/builtins/ListNotContains.java       |   64 +
 .../reasoner/rulesys/builtins/ListNotEqual.java |   63 +
 .../reasoner/rulesys/builtins/MakeInstance.java |   76 +
 .../reasoner/rulesys/builtins/MakeSkolem.java   |   86 +
 .../reasoner/rulesys/builtins/MakeTemp.java     |   70 +
 .../jena/reasoner/rulesys/builtins/Max.java     |   82 +
 .../jena/reasoner/rulesys/builtins/Min.java     |   83 +
 .../jena/reasoner/rulesys/builtins/NoValue.java |   81 +
 .../reasoner/rulesys/builtins/NotBNode.java     |   62 +
 .../reasoner/rulesys/builtins/NotDType.java     |   64 +
 .../reasoner/rulesys/builtins/NotEqual.java     |   68 +
 .../reasoner/rulesys/builtins/NotFunctor.java   |   61 +
 .../reasoner/rulesys/builtins/NotLiteral.java   |   62 +
 .../jena/reasoner/rulesys/builtins/Now.java     |   67 +
 .../jena/reasoner/rulesys/builtins/Print.java   |   77 +
 .../jena/reasoner/rulesys/builtins/Product.java |   82 +
 .../reasoner/rulesys/builtins/Quotient.java     |   87 +
 .../jena/reasoner/rulesys/builtins/Regex.java   |   90 +
 .../jena/reasoner/rulesys/builtins/Remove.java  |   77 +
 .../reasoner/rulesys/builtins/StrConcat.java    |   88 +
 .../jena/reasoner/rulesys/builtins/Sum.java     |   82 +
 .../jena/reasoner/rulesys/builtins/Table.java   |   66 +
 .../reasoner/rulesys/builtins/TableAll.java     |   62 +
 .../jena/reasoner/rulesys/builtins/Unbound.java |   57 +
 .../reasoner/rulesys/builtins/UriConcat.java    |   63 +
 .../jena/reasoner/rulesys/builtins/package.html |   30 +
 .../reasoner/rulesys/impl/BBRuleContext.java    |  156 +
 .../reasoner/rulesys/impl/BFRuleContext.java    |  245 +
 .../reasoner/rulesys/impl/BindingStack.java     |  220 +
 .../reasoner/rulesys/impl/BindingVector.java    |  376 +
 .../rulesys/impl/BindingVectorMultiSet.java     |  208 +
 .../reasoner/rulesys/impl/ChoicePointFrame.java |   97 +
 .../rulesys/impl/ConsumerChoicePointFrame.java  |  210 +
 .../reasoner/rulesys/impl/EnvironmentFrame.java |   84 +
 .../impl/EnvironmentFrameWithDerivation.java    |   88 +
 .../jena/reasoner/rulesys/impl/FRuleEngine.java |  670 ++
 .../reasoner/rulesys/impl/FRuleEngineI.java     |   99 +
 .../rulesys/impl/FRuleEngineIFactory.java       |   77 +
 .../jena/reasoner/rulesys/impl/FrameObject.java |   63 +
 .../jena/reasoner/rulesys/impl/Generator.java   |  420 ++
 .../rulesys/impl/GenericChoiceFrame.java        |   62 +
 .../rulesys/impl/GenericTripleMatchFrame.java   |  121 +
 .../reasoner/rulesys/impl/LPAgendaEntry.java    |   43 +
 .../reasoner/rulesys/impl/LPBRuleEngine.java    |  441 ++
 .../rulesys/impl/LPBindingEnvironment.java      |   91 +
 .../reasoner/rulesys/impl/LPInterpreter.java    |  831 ++
 .../rulesys/impl/LPInterpreterContext.java      |   43 +
 .../rulesys/impl/LPInterpreterState.java        |   30 +
 .../jena/reasoner/rulesys/impl/LPRuleStore.java |  274 +
 .../rulesys/impl/LPRuleSyntaxException.java     |   49 +
 .../rulesys/impl/LPTopGoalIterator.java         |  269 +
 .../rulesys/impl/MutableTriplePattern.java      |   46 +
 .../impl/OWLExptRuleTranslationHook.java        |  102 +
 .../rulesys/impl/OWLRuleTranslationHook.java    |  140 +
 .../rulesys/impl/RDFSCMPPreprocessHook.java     |   77 +
 .../reasoner/rulesys/impl/RETEClauseFilter.java |  267 +
 .../reasoner/rulesys/impl/RETEConflictSet.java  |  209 +
 .../jena/reasoner/rulesys/impl/RETEEngine.java  |  629 ++
 .../jena/reasoner/rulesys/impl/RETENode.java    |   35 +
 .../jena/reasoner/rulesys/impl/RETEQueue.java   |  152 +
 .../reasoner/rulesys/impl/RETERuleContext.java  |  208 +
 .../reasoner/rulesys/impl/RETESinkNode.java     |   35 +
 .../reasoner/rulesys/impl/RETESourceNode.java   |   31 +
 .../reasoner/rulesys/impl/RETETerminal.java     |  102 +
 .../reasoner/rulesys/impl/RuleClauseCode.java   |  842 +++
 .../jena/reasoner/rulesys/impl/RuleStore.java   |  188 +
 .../jena/reasoner/rulesys/impl/SafeGraph.java   |   59 +
 .../jena/reasoner/rulesys/impl/StateFlag.java   |   53 +
 .../reasoner/rulesys/impl/TempNodeCache.java    |  139 +
 .../rulesys/impl/TopLevelTripleMatchFrame.java  |   73 +
 .../reasoner/rulesys/impl/TripleMatchFrame.java |   79 +
 .../rulesys/impl/WrappedReasonerFactory.java    |   84 +
 .../jena/reasoner/rulesys/impl/package.html     |   27 +
 .../apache/jena/reasoner/rulesys/package.html   |   41 +
 .../reasoner/transitiveReasoner/GraphNode.java  |  474 ++
 .../transitiveReasoner/TransitiveEngine.java    |  402 +
 .../TransitiveGraphCache.java                   |  673 ++
 .../transitiveReasoner/TransitiveInfGraph.java  |  165 +
 .../transitiveReasoner/TransitiveReasoner.java  |  250 +
 .../TransitiveReasonerFactory.java              |   86 +
 .../reasoner/transitiveReasoner/package.html    |   43 +
 .../jena/shared/AccessDeniedException.java      |   56 +
 .../apache/jena/shared/AddDeniedException.java  |   55 +
 .../jena/shared/AlreadyExistsException.java     |   31 +
 .../jena/shared/AlreadyReifiedException.java    |   29 +
 .../jena/shared/AssertionFailureException.java  |   29 +
 .../shared/AuthenticationRequiredException.java |   45 +
 .../apache/jena/shared/BadBooleanException.java |   29 +
 .../jena/shared/BadCharLiteralException.java    |   28 +
 .../jena/shared/BadDescriptionException.java    |   32 +
 .../BadDescriptionMultipleRootsException.java   |   35 +
 .../shared/BadDescriptionNoRootException.java   |   33 +
 .../org/apache/jena/shared/BadURIException.java |   40 +
 .../org/apache/jena/shared/BrokenException.java |   34 +
 .../jena/shared/CannotCreateException.java      |   31 +
 .../shared/CannotEncodeCharacterException.java  |   48 +
 .../jena/shared/CannotReifyException.java       |   29 +
 .../org/apache/jena/shared/ClosedException.java |   42 +
 .../java/org/apache/jena/shared/Command.java    |   31 +
 .../org/apache/jena/shared/ConfigException.java |   58 +
 .../jena/shared/DeleteDeniedException.java      |   55 +
 .../jena/shared/DoesNotExistException.java      |   34 +
 .../shared/InvalidPropertyURIException.java     |   29 +
 .../org/apache/jena/shared/JenaException.java   |   30 +
 .../main/java/org/apache/jena/shared/Lock.java  |   97 +
 .../java/org/apache/jena/shared/LockMRSW.java   |  250 +
 .../java/org/apache/jena/shared/LockMutex.java  |   37 +
 .../java/org/apache/jena/shared/LockNone.java   |   32 +
 .../NamespaceEndsWithNameCharException.java     |   30 +
 .../jena/shared/NoReaderForLangException.java   |   28 +
 .../shared/NoReasonerSuppliedException.java     |   28 +
 .../jena/shared/NoSuchReasonerException.java    |   42 +
 .../jena/shared/NoWriterForLangException.java   |   28 +
 .../apache/jena/shared/NotFoundException.java   |   33 +
 .../jena/shared/OperationDeniedException.java   |   31 +
 .../org/apache/jena/shared/PrefixMapping.java   |  229 +
 .../jena/shared/PropertyNotFoundException.java  |   30 +
 .../apache/jena/shared/RandomOrderGraph.java    |  122 +
 .../apache/jena/shared/ReadDeniedException.java |   57 +
 .../jena/shared/RulesetNotFoundException.java   |   36 +
 .../org/apache/jena/shared/SyntaxError.java     |   28 +
 .../jena/shared/UnknownPropertyException.java   |   29 +
 .../jena/shared/UpdateDeniedException.java      |   57 +
 .../apache/jena/shared/WrappedException.java    |   31 +
 .../apache/jena/shared/WrappedIOException.java  |   33 +
 .../apache/jena/shared/impl/JenaParameters.java |  115 +
 .../jena/shared/impl/PrefixMappingImpl.java     |  268 +
 .../org/apache/jena/shared/impl/package.html    |   27 +
 .../java/org/apache/jena/shared/package.html    |   29 +
 .../java/org/apache/jena/shared/uuid/Bits.java  |  259 +
 .../org/apache/jena/shared/uuid/JenaUUID.java   |  252 +
 .../org/apache/jena/shared/uuid/LibUUID.java    |   76 +
 .../apache/jena/shared/uuid/UUIDFactory.java    |   26 +
 .../org/apache/jena/shared/uuid/UUID_V1.java    |  118 +
 .../apache/jena/shared/uuid/UUID_V1_Gen.java    |  314 +
 .../org/apache/jena/shared/uuid/UUID_V4.java    |   95 +
 .../apache/jena/shared/uuid/UUID_V4_Gen.java    |  105 +
 .../org/apache/jena/shared/uuid/UUID_nil.java   |   68 +
 .../jena/shared/wg/LazyFileInputStream.java     |   46 +
 .../apache/jena/shared/wg/LazyInputStream.java  |   62 +
 .../jena/shared/wg/LazyURLInputStream.java      |   50 +
 .../jena/shared/wg/LazyZipEntryInputStream.java |   52 +
 .../jena/shared/wg/TestInputStreamFactory.java  |  192 +
 .../java/org/apache/jena/shared/wg/package.html |   30 +
 .../java/org/apache/jena/util/CharEncoding.java |  176 +
 .../org/apache/jena/util/CollectionFactory.java |   61 +
 .../java/org/apache/jena/util/FileManager.java  |  533 ++
 .../java/org/apache/jena/util/FileUtils.java    |  416 +
 .../apache/jena/util/IteratorCollection.java    |   68 +
 .../org/apache/jena/util/LocationMapper.java    |  398 +
 .../main/java/org/apache/jena/util/Locator.java |   30 +
 .../apache/jena/util/LocatorClassLoader.java    |   85 +
 .../java/org/apache/jena/util/LocatorFile.java  |  150 +
 .../java/org/apache/jena/util/LocatorURL.java   |  157 +
 .../java/org/apache/jena/util/LocatorZip.java   |   88 +
 .../java/org/apache/jena/util/Metadata.java     |   95 +
 .../java/org/apache/jena/util/MonitorGraph.java |   96 +
 .../java/org/apache/jena/util/MonitorModel.java |   78 +
 .../java/org/apache/jena/util/OneToManyMap.java |  533 ++
 .../java/org/apache/jena/util/PrintUtil.java    |  201 +
 .../org/apache/jena/util/ResourceUtils.java     |  332 +
 .../java/org/apache/jena/util/SplitIRI.java     |  313 +
 .../java/org/apache/jena/util/SystemUtils.java  |   52 +
 .../java/org/apache/jena/util/Tokenizer.java    |  163 +
 .../java/org/apache/jena/util/TypedStream.java  |   49 +
 .../main/java/org/apache/jena/util/URIref.java  |  158 +
 .../jena/util/iterator/ArrayIterator.java       |   63 +
 .../jena/util/iterator/ClosableIterator.java    |   47 +
 .../util/iterator/ConcatenatedIterator.java     |  164 +
 .../jena/util/iterator/ExtendedIterator.java    |   85 +
 .../org/apache/jena/util/iterator/Filter.java   |  126 +
 .../jena/util/iterator/FilterIterator.java      |   88 +
 .../jena/util/iterator/IteratorIterator.java    |   73 +
 .../apache/jena/util/iterator/LazyIterator.java |   84 +
 .../org/apache/jena/util/iterator/Map1.java     |   33 +
 .../apache/jena/util/iterator/Map1Iterator.java |   56 +
 .../apache/jena/util/iterator/MapFilter.java    |   34 +
 .../jena/util/iterator/MapFilterIterator.java   |   94 +
 .../apache/jena/util/iterator/NiceIterator.java |  222 +
 .../apache/jena/util/iterator/NullIterator.java |   40 +
 .../jena/util/iterator/RandomOrderIterator.java |   67 +
 .../jena/util/iterator/SingletonIterator.java   |   61 +
 .../apache/jena/util/iterator/UniqueFilter.java |   44 +
 .../jena/util/iterator/WrappedIterator.java     |  116 +
 .../org/apache/jena/util/iterator/package.html  |   30 +
 .../main/java/org/apache/jena/util/package.html |   28 +
 .../java/org/apache/jena/vocabulary/DB.java     |   76 +
 .../java/org/apache/jena/vocabulary/DC.java     |   27 +
 .../org/apache/jena/vocabulary/DCTerms.java     |  316 +
 .../org/apache/jena/vocabulary/DCTypes.java     |   79 +
 .../java/org/apache/jena/vocabulary/DC_10.java  |   60 +
 .../java/org/apache/jena/vocabulary/DC_11.java  |   86 +
 .../jena/vocabulary/LocationMappingVocab.java   |   53 +
 .../java/org/apache/jena/vocabulary/OWL.java    |  148 +
 .../java/org/apache/jena/vocabulary/OWL2.java   |  195 +
 .../org/apache/jena/vocabulary/OWLResults.java  |   91 +
 .../org/apache/jena/vocabulary/OWLTest.java     |  118 +
 .../jena/vocabulary/OntDocManagerVocab.java     |   98 +
 .../apache/jena/vocabulary/OntEventsVocab.java  |  285 +
 .../java/org/apache/jena/vocabulary/RDF.java    |  102 +
 .../java/org/apache/jena/vocabulary/RDFS.java   |   91 +
 .../org/apache/jena/vocabulary/RDFSyntax.java   |   77 +
 .../org/apache/jena/vocabulary/RDFTest.java     |  126 +
 .../java/org/apache/jena/vocabulary/RSS.java    |   51 +
 .../jena/vocabulary/ReasonerVocabulary.java     |  180 +
 .../java/org/apache/jena/vocabulary/SKOS.java   |   96 +
 .../java/org/apache/jena/vocabulary/SKOSXL.java |   62 +
 .../apache/jena/vocabulary/TestManifest.java    |   86 +
 .../apache/jena/vocabulary/TestManifestX.java   |   72 +
 .../java/org/apache/jena/vocabulary/VCARD.java  |   96 +
 .../java/org/apache/jena/vocabulary/XSD.java    |  231 +
 .../org/apache/jena/vocabulary/package.html     |   28 +
 jena-core/src/main/resources/etc/owl-b.rules    |    2 +-
 .../src/main/resources/jena-log4j.properties    |    8 +-
 .../jena/assembler/acceptance/AllAccept.java    |   68 -
 .../jena/assembler/test/AcceptanceTesting.java  |   57 -
 .../jena/assembler/test/AssemblerTestBase.java  |  177 -
 .../assembler/test/MockTransactionModel.java    |   99 -
 .../jena/assembler/test/TestAssemblerGroup.java |  204 -
 .../test/TestAssemblerGroupTracing.java         |   58 -
 .../jena/assembler/test/TestAssemblerHelp.java  |  220 -
 .../assembler/test/TestAssemblerPackage.java    |   35 -
 .../assembler/test/TestAssemblerVocabulary.java |  121 -
 .../hpl/jena/assembler/test/TestAssemblers.java |   64 -
 .../test/TestBuiltinAssemblerGroup.java         |  101 -
 .../assembler/test/TestContentAssembler.java    |  288 -
 .../test/TestDefaultModelAssembler.java         |   44 -
 .../test/TestDocumentManagerAssembler.java      |  135 -
 .../test/TestFileManagerAssembler.java          |   87 -
 .../assembler/test/TestFileModelAssembler.java  |  283 -
 .../jena/assembler/test/TestImportManager.java  |  140 -
 .../assembler/test/TestInfModelAssembler.java   |  116 -
 .../test/TestLocationMapperAssembler.java       |   81 -
 .../test/TestMemoryModelAssembler.java          |   45 -
 .../hp/hpl/jena/assembler/test/TestMode.java    |   67 -
 .../jena/assembler/test/TestModelAssembler.java |   65 -
 .../jena/assembler/test/TestModelContent.java   |  122 -
 .../jena/assembler/test/TestModelExpansion.java |  150 -
 .../test/TestModelSourceAssembler.java          |   45 -
 .../assembler/test/TestOntModelAssembler.java   |  152 -
 .../test/TestOntModelSpecAssembler.java         |  201 -
 .../test/TestPrefixMappingAssembler.java        |   97 -
 .../test/TestReasonerFactoryAssembler.java      |  218 -
 .../hp/hpl/jena/assembler/test/TestRuleSet.java |   86 -
 .../assembler/test/TestRuleSetAssembler.java    |  135 -
 .../assembler/test/TestUnionModelAssembler.java |  131 -
 .../hp/hpl/jena/datatypes/TestDatatypes.java    |  160 -
 .../com/hp/hpl/jena/datatypes/TestPackage.java  |   40 -
 .../hp/hpl/jena/enhanced/test/TestAllImpl.java  |   89 -
 .../hpl/jena/enhanced/test/TestCommonImpl.java  |   93 -
 .../hp/hpl/jena/enhanced/test/TestModel.java    |   31 -
 .../hpl/jena/enhanced/test/TestModelImpl.java   |   58 -
 .../com/hp/hpl/jena/enhanced/test/TestNode.java |   30 -
 .../hp/hpl/jena/enhanced/test/TestObject.java   |   39 -
 .../hpl/jena/enhanced/test/TestObjectImpl.java  |   74 -
 .../hp/hpl/jena/enhanced/test/TestPackage.java  |  515 --
 .../hp/hpl/jena/enhanced/test/TestProperty.java |   30 -
 .../jena/enhanced/test/TestPropertyImpl.java    |   58 -
 .../hp/hpl/jena/enhanced/test/TestSubject.java  |   30 -
 .../hpl/jena/enhanced/test/TestSubjectImpl.java |   58 -
 .../com/hp/hpl/jena/enhanced/test/package.html  |   26 -
 .../jena/graph/compose/test/TestCaseBasic.java  |   51 -
 .../hpl/jena/graph/compose/test/TestDelta.java  |  137 -
 .../jena/graph/compose/test/TestDifference.java |  115 -
 .../graph/compose/test/TestDisjointUnion.java   |  104 -
 .../hpl/jena/graph/compose/test/TestDyadic.java |   80 -
 .../graph/compose/test/TestIntersection.java    |  121 -
 .../jena/graph/compose/test/TestMultiUnion.java |  332 -
 .../compose/test/TestMultiUnionReifier.java     |   84 -
 .../jena/graph/compose/test/TestPackage.java    |  116 -
 .../compose/test/TestPolyadicPrefixMapping.java |  139 -
 .../hpl/jena/graph/compose/test/TestUnion.java  |  114 -
 .../graph/compose/test/TestUnionStatistics.java |  114 -
 .../hp/hpl/jena/graph/compose/test/package.html |   26 -
 .../jena/graph/impl/TestCollectionGraph.java    |   39 -
 .../hpl/jena/graph/test/AbstractTestGraph.java  | 1028 ---
 .../jena/graph/test/AbstractTestGraphMaker.java |  263 -
 .../jena/graph/test/AbstractTestReifier.java    |  298 -
 .../graph/test/AbstractTestTripleStore.java     |  129 -
 .../hp/hpl/jena/graph/test/GraphTestBase.java   |  443 --
 .../hp/hpl/jena/graph/test/MetaTestGraph.java   |   92 -
 .../hp/hpl/jena/graph/test/NodeCreateUtils.java |  170 -
 .../hpl/jena/graph/test/RecordingListener.java  |  121 -
 .../hpl/jena/graph/test/TestCapabilities.java   |  102 -
 .../hp/hpl/jena/graph/test/TestDateTime.java    |  152 -
 .../com/hp/hpl/jena/graph/test/TestFactory.java |   37 -
 .../hp/hpl/jena/graph/test/TestFileGraph.java   |  195 -
 .../hpl/jena/graph/test/TestFileGraphMaker.java |  112 -
 .../hpl/jena/graph/test/TestFindLiterals.java   |  131 -
 .../com/hp/hpl/jena/graph/test/TestGraph.java   |   80 -
 .../jena/graph/test/TestGraphBaseToString.java  |   89 -
 .../hp/hpl/jena/graph/test/TestGraphEvents.java |   57 -
 .../hpl/jena/graph/test/TestGraphExtract.java   |  119 -
 .../hpl/jena/graph/test/TestGraphListener.java  |  159 -
 .../graph/test/TestGraphMatchWithInference.java |   54 -
 .../jena/graph/test/TestGraphPrefixMapping.java |   49 -
 .../hp/hpl/jena/graph/test/TestGraphUtils.java  |   58 -
 .../graph/test/TestLiteralLabelSameValueAs.java |   99 -
 .../hpl/jena/graph/test/TestLiteralLabels.java  |  131 -
 .../com/hp/hpl/jena/graph/test/TestNode.java    |  726 --
 .../jena/graph/test/TestNodeToTriplesMap.java   |  234 -
 .../com/hp/hpl/jena/graph/test/TestPackage.java |   59 -
 .../graph/test/TestRegisterGraphListener.java   |  168 -
 .../com/hp/hpl/jena/graph/test/TestReifier.java |   70 -
 .../jena/graph/test/TestSimpleGraphMaker.java   |   40 -
 .../com/hp/hpl/jena/graph/test/TestTriple.java  |  268 -
 .../hp/hpl/jena/graph/test/TestTripleField.java |   86 -
 .../hpl/jena/graph/test/TestTypedLiterals.java  | 1414 ----
 .../com/hp/hpl/jena/graph/test/package.html     |   26 -
 .../hpl/jena/mem/test/TestArrayTripleBunch.java |   31 -
 .../com/hp/hpl/jena/mem/test/TestCaseBasic.java |   43 -
 .../com/hp/hpl/jena/mem/test/TestCaseBugs.java  |   60 -
 .../TestConcurrentModificationException.java    |   98 -
 .../com/hp/hpl/jena/mem/test/TestGraphMem.java  |  136 -
 .../com/hp/hpl/jena/mem/test/TestGraphMem2.java |  102 -
 .../hpl/jena/mem/test/TestGraphMemPackage.java  |   34 -
 .../hpl/jena/mem/test/TestGraphTripleStore.java |   39 -
 .../hp/hpl/jena/mem/test/TestHashCommon.java    |  179 -
 .../hpl/jena/mem/test/TestHashedBunchMap.java   |   45 -
 .../jena/mem/test/TestHashedTripleBunch.java    |  161 -
 .../hp/hpl/jena/mem/test/TestMemPackage.java    |   43 -
 .../hp/hpl/jena/mem/test/TestStoreSpeed.java    |   97 -
 .../hp/hpl/jena/mem/test/TestTripleBunch.java   |  157 -
 .../mem/test/TestWrappedSetTripleBunch.java     |   31 -
 .../com/hp/hpl/jena/n3/N3ExternalTestsCom.java  |  100 -
 .../com/hp/hpl/jena/n3/N3JenaWriterTests.java   |  122 -
 .../java/com/hp/hpl/jena/n3/N3TestSuite.java    |   40 -
 .../java/com/hp/hpl/jena/n3/TestResolver.java   |  343 -
 .../test/java/com/hp/hpl/jena/n3/TupleItem.java |   60 -
 .../test/java/com/hp/hpl/jena/n3/TupleSet.java  |  300 -
 .../hp/hpl/jena/n3/turtle/TestBadSyntax.java    |   47 -
 .../com/hp/hpl/jena/n3/turtle/TestSyntax.java   |   47 -
 .../com/hp/hpl/jena/n3/turtle/TestTurtle.java   |   65 -
 .../hp/hpl/jena/n3/turtle/TestTurtleReader.java |   56 -
 .../hpl/jena/n3/turtle/TurtleInternalTests.java |  270 -
 .../hpl/jena/n3/turtle/TurtleTestFactory.java   |   78 -
 .../hp/hpl/jena/n3/turtle/TurtleTestSuite.java  |   39 -
 .../hp/hpl/jena/n3/turtle/TurtleTestVocab.java  |   57 -
 .../hp/hpl/jena/ontology/impl/OntTestBase.java  |  178 -
 .../jena/ontology/impl/TestAllDifferent.java    |  109 -
 .../hp/hpl/jena/ontology/impl/TestAxioms.java   |   81 -
 .../jena/ontology/impl/TestClassExpression.java | 1333 ----
 .../hp/hpl/jena/ontology/impl/TestCreate.java   |  451 --
 .../hpl/jena/ontology/impl/TestFrameView.java   |  391 -
 .../hpl/jena/ontology/impl/TestIndividual.java  |  451 --
 .../ontology/impl/TestListSyntaxCategories.java |  817 --
 .../hp/hpl/jena/ontology/impl/TestOntClass.java |  435 --
 .../ontology/impl/TestOntDocumentManager.java   |  702 --
 .../hp/hpl/jena/ontology/impl/TestOntGraph.java |   43 -
 .../hp/hpl/jena/ontology/impl/TestOntModel.java | 1298 ----
 .../jena/ontology/impl/TestOntModelSpec.java    |   64 -
 .../jena/ontology/impl/TestOntReasoning.java    |  518 --
 .../hp/hpl/jena/ontology/impl/TestOntTools.java |  470 --
 .../hp/hpl/jena/ontology/impl/TestOntology.java |  184 -
 .../hp/hpl/jena/ontology/impl/TestPackage.java  |   61 -
 .../hp/hpl/jena/ontology/impl/TestProperty.java |  624 --
 .../hp/hpl/jena/ontology/impl/TestResource.java |  680 --
 .../model/test/AbstractContainerMethods.java    |  167 -
 .../rdf/model/test/AbstractModelTestBase.java   |  167 -
 .../jena/rdf/model/test/AbstractTestModel.java  |  231 -
 .../rdf/model/test/AbstractTestPackage.java     |  215 -
 .../test/AbstractTestReifiedStatements.java     |  458 --
 .../jena/rdf/model/test/IsomorphicTests.java    |  419 --
 .../hpl/jena/rdf/model/test/ModelTestBase.java  |  277 -
 .../rdf/model/test/RecordingModelListener.java  |  124 -
 .../jena/rdf/model/test/TestAddAndContains.java |  184 -
 .../hpl/jena/rdf/model/test/TestAddModel.java   |   99 -
 .../hpl/jena/rdf/model/test/TestAltMethods.java |   93 -
 .../hp/hpl/jena/rdf/model/test/TestAnonID.java  |  100 -
 .../hpl/jena/rdf/model/test/TestBagMethods.java |   45 -
 .../jena/rdf/model/test/TestConcurrency.java    |  242 -
 .../rdf/model/test/TestConcurrencyNesting.java  |  154 -
 .../rdf/model/test/TestConcurrencyParallel.java |  173 -
 .../model/test/TestContainerConstructors.java   |   81 -
 .../hpl/jena/rdf/model/test/TestContainers.java |   48 -
 .../hpl/jena/rdf/model/test/TestContains.java   |  118 -
 .../rdf/model/test/TestCopyInOutOfModel.java    |  126 -
 .../com/hp/hpl/jena/rdf/model/test/TestGet.java |  112 -
 .../rdf/model/test/TestHiddenStatements.java    |   59 -
 .../hpl/jena/rdf/model/test/TestIterators.java  |  307 -
 .../hp/hpl/jena/rdf/model/test/TestList.java    |  923 ---
 .../jena/rdf/model/test/TestListStatements.java |  135 -
 .../jena/rdf/model/test/TestListSubjects.java   |  276 -
 .../rdf/model/test/TestListSubjectsEtc.java     |  104 -
 .../jena/rdf/model/test/TestLiteralImpl.java    |  178 -
 .../hpl/jena/rdf/model/test/TestLiterals.java   |  289 -
 .../rdf/model/test/TestLiteralsInModel.java     |  106 -
 .../hp/hpl/jena/rdf/model/test/TestModel.java   |  260 -
 .../rdf/model/test/TestModelBulkUpdate.java     |  151 -
 .../jena/rdf/model/test/TestModelEvents.java    |  457 --
 .../jena/rdf/model/test/TestModelExtract.java   |  181 -
 .../jena/rdf/model/test/TestModelFactory.java   |  117 -
 .../jena/rdf/model/test/TestModelMakerImpl.java |  250 -
 .../rdf/model/test/TestModelPolymorphism.java   |   48 -
 .../rdf/model/test/TestModelPrefixMapping.java  |  129 -
 .../hpl/jena/rdf/model/test/TestModelRead.java  |   90 -
 .../rdf/model/test/TestModelSetOperations.java  |  136 -
 .../hpl/jena/rdf/model/test/TestNamespace.java  |  134 -
 .../rdf/model/test/TestObjectOfProperties.java  |  426 --
 .../hp/hpl/jena/rdf/model/test/TestObjects.java |  200 -
 .../hp/hpl/jena/rdf/model/test/TestPackage.java |   68 -
 .../jena/rdf/model/test/TestPropertyImpl.java   |   87 -
 .../hpl/jena/rdf/model/test/TestRDFNodes.java   |  210 -
 .../jena/rdf/model/test/TestRDFWriterMap.java   |  233 -
 .../jena/rdf/model/test/TestReaderEvents.java   |   73 -
 .../hp/hpl/jena/rdf/model/test/TestReaders.java |  117 -
 .../rdf/model/test/TestReifiedStatements.java   |  373 -
 .../hpl/jena/rdf/model/test/TestRemoveBug.java  |  108 -
 .../hpl/jena/rdf/model/test/TestRemoveSPO.java  |   75 -
 .../rdf/model/test/TestResourceFactory.java     |  228 -
 .../jena/rdf/model/test/TestResourceImpl.java   |  248 -
 .../rdf/model/test/TestResourceMethods.java     |  197 -
 .../hpl/jena/rdf/model/test/TestResources.java  |  346 -
 .../jena/rdf/model/test/TestSelectorUse.java    |  334 -
 .../hpl/jena/rdf/model/test/TestSelectors.java  |   60 -
 .../hpl/jena/rdf/model/test/TestSeqMethods.java | 1206 ---
 .../model/test/TestSimpleListStatements.java    |  262 -
 .../jena/rdf/model/test/TestSimpleSelector.java |  144 -
 .../jena/rdf/model/test/TestStandardModels.java |   42 -
 .../rdf/model/test/TestStatementCreation.java   |  190 -
 .../rdf/model/test/TestStatementMethods.java    |  422 --
 .../hpl/jena/rdf/model/test/TestStatements.java |  154 -
 .../rdf/model/test/helpers/ModelHelper.java     |  231 -
 .../test/helpers/RecordingModelListener.java    |  228 -
 .../model/test/helpers/TestingModelFactory.java |   52 -
 .../hp/hpl/jena/rdfxml/xmlinput/ARPTests.java   |  134 -
 .../hpl/jena/rdfxml/xmlinput/DOM2RDFTest.java   |   86 -
 .../jena/rdfxml/xmlinput/ExceptionTests.java    |  217 -
 .../hp/hpl/jena/rdfxml/xmlinput/InFactoryX.java |   27 -
 .../jena/rdfxml/xmlinput/MemoryLeakTest.java    |   74 -
 .../jena/rdfxml/xmlinput/MoreDOM2RDFTest.java   |   95 -
 .../hp/hpl/jena/rdfxml/xmlinput/MoreTests.java  |  632 --
 .../jena/rdfxml/xmlinput/NTripleTestSuite.java  |  316 -
 .../hpl/jena/rdfxml/xmlinput/Performance.java   |  667 --
 .../jena/rdfxml/xmlinput/SAX2RDFMoreTests.java  |   98 -
 .../hpl/jena/rdfxml/xmlinput/SAX2RDFTest.java   | 1299 ----
 .../jena/rdfxml/xmlinput/StAX2ModelTest.java    | 1190 ---
 .../hpl/jena/rdfxml/xmlinput/TaintingTests.java |  247 -
 .../hpl/jena/rdfxml/xmlinput/TestARPMain.java   | 2778 -------
 .../hpl/jena/rdfxml/xmlinput/TestErrorMsg.java  |  127 -
 .../hpl/jena/rdfxml/xmlinput/TestPackage.java   |   48 -
 .../rdfxml/xmlinput/TestPropEltErrorMsg.java    |  496 --
 .../hp/hpl/jena/rdfxml/xmlinput/TestScope.java  |   91 -
 .../hp/hpl/jena/rdfxml/xmlinput/URITests.java   |  115 -
 .../hpl/jena/rdfxml/xmlinput/WGTestSuite.java   | 1046 ---
 .../jena/rdfxml/xmlinput/states/AttrEvent.java  |   59 -
 .../rdfxml/xmlinput/states/ElementEvent.java    |   53 -
 .../hpl/jena/rdfxml/xmlinput/states/Event.java  |   40 -
 .../jena/rdfxml/xmlinput/states/EventList.java  |  192 -
 .../rdfxml/xmlinput/states/EventRecord.java     |   95 -
 .../rdfxml/xmlinput/states/FullEventRecord.java |   78 -
 .../rdfxml/xmlinput/states/InternalEvent.java   |   39 -
 .../hpl/jena/rdfxml/xmlinput/states/QName.java  |   42 -
 .../rdfxml/xmlinput/states/TestARPStates.java   |   64 -
 .../jena/rdfxml/xmlinput/states/TestData.java   |  434 --
 .../rdfxml/xmlinput/states/TestEventList.java   |   94 -
 .../jena/rdfxml/xmlinput/states/TestFrame.java  |   84 -
 .../rdfxml/xmlinput/states/TestHandler.java     |   80 -
 .../rdfxml/xmloutput/BigAbbrevTestPackage.java  |   29 -
 .../jena/rdfxml/xmloutput/PrettyWriterTest.java |  173 -
 .../jena/rdfxml/xmloutput/TestEntityOutput.java |  207 -
 .../rdfxml/xmloutput/TestLiteralEncoding.java   |  136 -
 .../jena/rdfxml/xmloutput/TestMacEncodings.java |  107 -
 .../hpl/jena/rdfxml/xmloutput/TestPackage.java  |   82 -
 .../rdfxml/xmloutput/TestWriterFeatures.java    |   81 -
 .../rdfxml/xmloutput/TestWriterInterface.java   |  102 -
 .../jena/rdfxml/xmloutput/TestXMLAbbrev.java    |  155 -
 .../jena/rdfxml/xmloutput/TestXMLFeatures.java  |  713 --
 .../rdfxml/xmloutput/XMLOutputTestBase.java     |  242 -
 .../rdfxml/xmloutput/testWriterAndReader.java   |  430 --
 .../reasoner/rulesys/test/ConcurrencyTest.java  |  196 -
 .../jena/reasoner/rulesys/test/DebugOWL.java    |  373 -
 .../jena/reasoner/rulesys/test/DebugRules.java  |   70 -
 .../rulesys/test/FRuleEngineIFactoryTest.java   |  232 -
 .../rulesys/test/OWLConsistencyTest.java        |  157 -
 .../jena/reasoner/rulesys/test/OWLUnitTest.java |  273 -
 .../jena/reasoner/rulesys/test/OWLWGTester.java |  263 -
 .../reasoner/rulesys/test/TestBackchainer.java  |  916 ---
 .../jena/reasoner/rulesys/test/TestBasicLP.java | 1381 ----
 .../jena/reasoner/rulesys/test/TestBasics.java  |  586 --
 .../jena/reasoner/rulesys/test/TestBugs.java    |  896 ---
 .../reasoner/rulesys/test/TestCapabilities.java |   73 -
 .../rulesys/test/TestComparatorBuiltins.java    |  209 -
 .../rulesys/test/TestConfigVocabulary.java      |   85 -
 .../jena/reasoner/rulesys/test/TestFBRules.java | 1102 ---
 .../test/TestGenericRuleReasonerConfig.java     |  124 -
 .../reasoner/rulesys/test/TestGenericRules.java |  502 --
 .../rulesys/test/TestInferenceReification.java  |  108 -
 .../reasoner/rulesys/test/TestLPDerivation.java |  217 -
 .../jena/reasoner/rulesys/test/TestLPRDFS.java  |  172 -
 .../rulesys/test/TestOWLConsistency.java        |  141 -
 .../jena/reasoner/rulesys/test/TestOWLMisc.java |  246 -
 .../jena/reasoner/rulesys/test/TestPackage.java |   83 -
 .../jena/reasoner/rulesys/test/TestRDFS9.java   |  113 -
 .../reasoner/rulesys/test/TestRDFSRules.java    |  131 -
 .../jena/reasoner/rulesys/test/TestRETE.java    |  286 -
 .../test/TestRestrictionsDontNeedTyping.java    |   96 -
 .../reasoner/rulesys/test/TestRuleLoader.java   |   41 -
 .../reasoner/rulesys/test/TestSetRules.java     |   90 -
 .../rulesys/test/TestTrialOWLRules.java         |  221 -
 .../rulesys/test/WebOntTestHarness.java         |  598 --
 .../hpl/jena/reasoner/rulesys/test/package.html |   28 -
 .../hpl/jena/reasoner/test/ManualExample.java   |  159 -
 .../com/hp/hpl/jena/reasoner/test/Matcher.java  |  219 -
 .../jena/reasoner/test/ReasonerTestBase.java    |   41 -
 .../hpl/jena/reasoner/test/ReasonerTester.java  |  328 -
 .../jena/reasoner/test/TestCurrentRDFWG.java    |  165 -
 .../hp/hpl/jena/reasoner/test/TestInfGraph.java |   65 -
 .../hp/hpl/jena/reasoner/test/TestInfModel.java |   81 -
 .../reasoner/test/TestInfPrefixMapping.java     |   50 -
 .../hp/hpl/jena/reasoner/test/TestPackage.java  |   52 -
 .../jena/reasoner/test/TestRDFSReasoners.java   |  290 -
 .../hpl/jena/reasoner/test/TestReasoners.java   |  469 --
 .../hpl/jena/reasoner/test/TestSafeModel.java   |   95 -
 .../reasoner/test/TestTransitiveGraphCache.java |  553 --
 .../com/hp/hpl/jena/reasoner/test/TestUtil.java |  151 -
 .../jena/reasoner/test/WGReasonerTester.java    |  400 -
 .../hp/hpl/jena/regression/TestCaseBasic.java   |   78 -
 .../jena/shared/AbstractTestPrefixMapping.java  |  468 --
 .../jena/shared/RandomizedTestCaseBasic.java    |   43 -
 .../hp/hpl/jena/shared/TestJenaException.java   |   43 -
 .../hp/hpl/jena/shared/TestPrefixMapping.java   |   66 -
 .../hp/hpl/jena/shared/TestSharedPackage.java   |   35 -
 .../com/hp/hpl/jena/shared/uuid/TestBits.java   |  458 --
 .../com/hp/hpl/jena/shared/uuid/TestUUID.java   |  202 -
 .../hp/hpl/jena/shared/uuid/TestUUID_JRE.java   |  122 -
 .../hp/hpl/jena/shared/uuid/UUIDTestSuite.java  |   40 -
 .../java/com/hp/hpl/jena/test/JenaTest.java     |   26 -
 .../java/com/hp/hpl/jena/test/JenaTestBase.java |  204 -
 .../java/com/hp/hpl/jena/test/TestPackage.java  |   71 -
 .../com/hp/hpl/jena/test/TestSystemSetup.java   |   39 -
 .../java/com/hp/hpl/jena/util/TestCache.java    |  126 -
 .../hp/hpl/jena/util/TestCollectionFactory.java |   71 -
 .../com/hp/hpl/jena/util/TestFileManager.java   |  239 -
 .../com/hp/hpl/jena/util/TestFileUtils.java     |  229 -
 .../hpl/jena/util/TestIteratorCollection.java   |  135 -
 .../hp/hpl/jena/util/TestLocationMapper.java    |  179 -
 .../java/com/hp/hpl/jena/util/TestLocators.java |   95 -
 .../java/com/hp/hpl/jena/util/TestMonitors.java |  190 -
 .../com/hp/hpl/jena/util/TestOneToManyMap.java  |  356 -
 .../java/com/hp/hpl/jena/util/TestPackage.java  |   60 -
 .../com/hp/hpl/jena/util/TestPrintUtil.java     |   65 -
 .../com/hp/hpl/jena/util/TestTokenizer.java     |   80 -
 .../java/com/hp/hpl/jena/util/TestUtil.java     |  140 -
 .../iterator/test/LoggingClosableIterator.java  |   41 -
 .../jena/util/iterator/test/TestAndThen.java    |  151 -
 .../util/iterator/test/TestAsCollection.java    |   61 -
 .../jena/util/iterator/test/TestFilters.java    |  121 -
 .../util/iterator/test/TestMapIterators.java    |   44 -
 .../util/iterator/test/TestNullIterator.java    |   49 -
 .../jena/util/iterator/test/TestPackage.java    |   39 -
 .../util/iterator/test/TestResourceUtils.java   |  259 -
 .../util/iterator/test/TestWrappedIterator.java |   69 -
 .../com/hp/hpl/jena/util/junit/Manifest.java    |  183 -
 .../jena/util/junit/ManifestItemHandler.java    |   32 -
 .../hp/hpl/jena/util/junit/TestException.java   |   32 -
 .../jena/util/junit/TestFactoryManifest.java    |   96 -
 .../com/hp/hpl/jena/util/junit/TestUtils.java   |  102 -
 .../vocabulary/test/TestOWL2Vocabulary.java     |  170 -
 .../hpl/jena/vocabulary/test/TestVocabDB.java   |   65 -
 .../hpl/jena/vocabulary/test/TestVocabDC10.java |   51 -
 .../hpl/jena/vocabulary/test/TestVocabRDF.java  |   97 -
 .../hpl/jena/vocabulary/test/TestVocabRDFS.java |   72 -
 .../hpl/jena/vocabulary/test/TestVocabRSS.java  |   47 -
 .../jena/vocabulary/test/TestVocabVCARD.java    |   91 -
 .../jena/vocabulary/test/TestVocabularies.java  |   43 -
 .../hpl/jena/vocabulary/test/VocabTestBase.java |   34 -
 .../src/test/java/jena/test/Test_rdfcat.java    |   18 +-
 .../src/test/java/jena/test/Test_schemagen.java |    6 +-
 jena-core/src/test/java/jena/test/rdfparse.java |    4 +-
 .../jena/assembler/acceptance/AllAccept.java    |   67 +
 .../jena/assembler/test/AcceptanceTesting.java  |   57 +
 .../jena/assembler/test/AssemblerTestBase.java  |  177 +
 .../assembler/test/MockTransactionModel.java    |   98 +
 .../jena/assembler/test/TestAssemblerGroup.java |  214 +
 .../test/TestAssemblerGroupTracing.java         |   58 +
 .../jena/assembler/test/TestAssemblerHelp.java  |  224 +
 .../assembler/test/TestAssemblerPackage.java    |   35 +
 .../assembler/test/TestAssemblerVocabulary.java |  121 +
 .../jena/assembler/test/TestAssemblers.java     |   62 +
 .../test/TestBuiltinAssemblerGroup.java         |   99 +
 .../assembler/test/TestContentAssembler.java    |  288 +
 .../test/TestDefaultModelAssembler.java         |   44 +
 .../test/TestDocumentManagerAssembler.java      |  135 +
 .../test/TestFileManagerAssembler.java          |   87 +
 .../jena/assembler/test/TestImportManager.java  |  140 +
 .../assembler/test/TestInfModelAssembler.java   |  116 +
 .../test/TestLocationMapperAssembler.java       |   81 +
 .../test/TestMemoryModelAssembler.java          |   45 +
 .../apache/jena/assembler/test/TestMode.java    |   67 +
 .../jena/assembler/test/TestModelAssembler.java |   65 +
 .../jena/assembler/test/TestModelContent.java   |  122 +
 .../jena/assembler/test/TestModelExpansion.java |  150 +
 .../test/TestModelSourceAssembler.java          |   45 +
 .../assembler/test/TestOntModelAssembler.java   |  151 +
 .../test/TestOntModelSpecAssembler.java         |  200 +
 .../test/TestPrefixMappingAssembler.java        |   97 +
 .../test/TestReasonerFactoryAssembler.java      |  218 +
 .../apache/jena/assembler/test/TestRuleSet.java |   86 +
 .../assembler/test/TestRuleSetAssembler.java    |  135 +
 .../assembler/test/TestUnionModelAssembler.java |  131 +
 .../apache/jena/datatypes/TestDatatypes.java    |  159 +
 .../org/apache/jena/datatypes/TestPackage.java  |   40 +
 .../apache/jena/enhanced/test/TestAllImpl.java  |   89 +
 .../jena/enhanced/test/TestCommonImpl.java      |   93 +
 .../apache/jena/enhanced/test/TestModel.java    |   31 +
 .../jena/enhanced/test/TestModelImpl.java       |   58 +
 .../org/apache/jena/enhanced/test/TestNode.java |   30 +
 .../apache/jena/enhanced/test/TestObject.java   |   39 +
 .../jena/enhanced/test/TestObjectImpl.java      |   74 +
 .../apache/jena/enhanced/test/TestPackage.java  |  487 ++
 .../apache/jena/enhanced/test/TestProperty.java |   30 +
 .../jena/enhanced/test/TestPropertyImpl.java    |   58 +
 .../apache/jena/enhanced/test/TestSubject.java  |   30 +
 .../jena/enhanced/test/TestSubjectImpl.java     |   58 +
 .../apache/jena/graph/GraphContractTest.java    | 1729 +++++
 .../graph/GraphEventManagerContractTest.java    |  500 ++
 .../jena/graph/GraphMakerContractTest.java      |  295 +
 .../graph/GraphWithPerformContractTest.java     |   86 +
 .../jena/graph/RecordingGraphListener.java      |   92 +
 .../graph/TransactionHandlerContractTest.java   |  136 +
 .../apache/jena/graph/compose/DeltaTest.java    |  110 +
 .../jena/graph/compose/DifferenceTest.java      |   97 +
 .../jena/graph/compose/IntersectionTest.java    |  109 +
 .../apache/jena/graph/compose/UnionTest.java    |  185 +
 .../jena/graph/compose/test/TestCaseBasic.java  |   51 +
 .../jena/graph/compose/test/TestDelta.java      |  136 +
 .../jena/graph/compose/test/TestDifference.java |  114 +
 .../graph/compose/test/TestDisjointUnion.java   |  103 +
 .../jena/graph/compose/test/TestDyadic.java     |   79 +
 .../graph/compose/test/TestIntersection.java    |  120 +
 .../jena/graph/compose/test/TestMultiUnion.java |  331 +
 .../compose/test/TestMultiUnionReifier.java     |   84 +
 .../jena/graph/compose/test/TestPackage.java    |  115 +
 .../compose/test/TestPolyadicPrefixMapping.java |  138 +
 .../jena/graph/compose/test/TestUnion.java      |  113 +
 .../graph/compose/test/TestUnionStatistics.java |  114 +
 .../jena/graph/impl/CollectionGraph_CS.java     |   67 +
 .../jena/graph/impl/SimpleEventManager_CS.java  |   54 +
 .../jena/graph/impl/SimpleGraphMaker_CS.java    |   54 +
 .../graph/impl/SimpleTransactionHandler_CS.java |   54 +
 .../graph/impl/TripleStoreContractTest.java     |  160 +
 .../apache/jena/graph/impl/WrappedGraph_CS.java |   63 +
 .../jena/graph/test/AbstractTestGraph.java      | 1018 +++
 .../jena/graph/test/AbstractTestGraphMaker.java |  263 +
 .../jena/graph/test/AbstractTestReifier.java    |  298 +
 .../graph/test/AbstractTestTripleStore.java     |  129 +
 .../apache/jena/graph/test/GraphTestBase.java   |  439 ++
 .../apache/jena/graph/test/MetaTestGraph.java   |   91 +
 .../apache/jena/graph/test/NodeCreateUtils.java |  170 +
 .../jena/graph/test/RecordingListener.java      |  121 +
 .../jena/graph/test/TestCapabilities.java       |  102 +
 .../apache/jena/graph/test/TestDateTime.java    |  151 +
 .../org/apache/jena/graph/test/TestFactory.java |   36 +
 .../jena/graph/test/TestFindLiterals.java       |  123 +
 .../org/apache/jena/graph/test/TestGraph.java   |   79 +
 .../jena/graph/test/TestGraphBaseToString.java  |   89 +
 .../apache/jena/graph/test/TestGraphEvents.java |   57 +
 .../jena/graph/test/TestGraphExtract.java       |  118 +
 .../jena/graph/test/TestGraphListener.java      |  152 +
 .../graph/test/TestGraphMatchWithInference.java |   53 +
 .../jena/graph/test/TestGraphPrefixMapping.java |   48 +
 .../apache/jena/graph/test/TestGraphUtils.java  |   57 +
 .../graph/test/TestLiteralLabelSameValueAs.java |   98 +
 .../jena/graph/test/TestLiteralLabels.java      |  130 +
 .../org/apache/jena/graph/test/TestNode.java    |  725 ++
 .../jena/graph/test/TestNodeToTriplesMap.java   |  233 +
 .../org/apache/jena/graph/test/TestPackage.java |   57 +
 .../graph/test/TestRegisterGraphListener.java   |  168 +
 .../org/apache/jena/graph/test/TestReifier.java |   69 +
 .../jena/graph/test/TestSimpleGraphMaker.java   |   40 +
 .../org/apache/jena/graph/test/TestTriple.java  |  272 +
 .../apache/jena/graph/test/TestTripleField.java |   78 +
 .../jena/graph/test/TestTypedLiterals.java      | 1413 ++++
 .../java/org/apache/jena/mem/ArrayBunch_CS.java |   52 +
 .../apache/jena/mem/BunchMapContractTest.java   |  163 +
 .../java/org/apache/jena/mem/GraphMem_CS.java   |  115 +
 .../apache/jena/mem/GraphTripleStoreMem_CS.java |   51 +
 .../apache/jena/mem/GraphTripleStore_CS.java    |   51 +
 .../org/apache/jena/mem/HashedBunchMap_CS.java  |   52 +
 .../apache/jena/mem/HashedTripleBunch_CS.java   |   50 +
 .../java/org/apache/jena/mem/SetBunch_CS.java   |   50 +
 .../jena/mem/TripleBunchContractTest.java       |  205 +
 .../org/apache/jena/mem/WrappedHashMap_CS.java  |   52 +
 .../jena/mem/test/TestArrayTripleBunch.java     |   31 +
 .../org/apache/jena/mem/test/TestCaseBasic.java |   43 +
 .../org/apache/jena/mem/test/TestCaseBugs.java  |   60 +
 .../TestConcurrentModificationException.java    |   97 +
 .../org/apache/jena/mem/test/TestGraphMem.java  |  135 +
 .../org/apache/jena/mem/test/TestGraphMem2.java |  101 +
 .../jena/mem/test/TestGraphMemPackage.java      |   34 +
 .../jena/mem/test/TestGraphTripleStore.java     |   38 +
 .../apache/jena/mem/test/TestHashCommon.java    |  179 +
 .../jena/mem/test/TestHashedBunchMap.java       |   45 +
 .../jena/mem/test/TestHashedTripleBunch.java    |  161 +
 .../apache/jena/mem/test/TestMemPackage.java    |   43 +
 .../apache/jena/mem/test/TestTripleBunch.java   |  157 +
 .../mem/test/TestWrappedSetTripleBunch.java     |   31 +
 .../org/apache/jena/n3/N3ExternalTestsCom.java  |   99 +
 .../org/apache/jena/n3/N3JenaWriterTests.java   |  123 +
 .../java/org/apache/jena/n3/N3TestSuite.java    |   40 +
 .../java/org/apache/jena/n3/TestResolver.java   |  342 +
 .../test/java/org/apache/jena/n3/TupleItem.java |   60 +
 .../test/java/org/apache/jena/n3/TupleSet.java  |  300 +
 .../apache/jena/n3/turtle/TestBadSyntax.java    |   46 +
 .../org/apache/jena/n3/turtle/TestSyntax.java   |   45 +
 .../org/apache/jena/n3/turtle/TestTurtle.java   |   64 +
 .../apache/jena/n3/turtle/TestTurtleReader.java |   55 +
 .../jena/n3/turtle/TurtleInternalTests.java     |  271 +
 .../jena/n3/turtle/TurtleTestFactory.java       |   77 +
 .../apache/jena/n3/turtle/TurtleTestSuite.java  |   39 +
 .../apache/jena/n3/turtle/TurtleTestVocab.java  |   57 +
 .../apache/jena/ontology/impl/OntTestBase.java  |  177 +
 .../jena/ontology/impl/TestAllDifferent.java    |  108 +
 .../apache/jena/ontology/impl/TestAxioms.java   |   81 +
 .../jena/ontology/impl/TestClassExpression.java | 1332 ++++
 .../apache/jena/ontology/impl/TestCreate.java   |  451 ++
 .../jena/ontology/impl/TestFrameView.java       |  390 +
 .../jena/ontology/impl/TestIndividual.java      |  450 ++
 .../ontology/impl/TestListSyntaxCategories.java |  816 ++
 .../apache/jena/ontology/impl/TestOntClass.java |  435 ++
 .../ontology/impl/TestOntDocumentManager.java   |  700 ++
 .../apache/jena/ontology/impl/TestOntGraph.java |   42 +
 .../apache/jena/ontology/impl/TestOntModel.java | 1302 ++++
 .../jena/ontology/impl/TestOntModelSpec.java    |   64 +
 .../jena/ontology/impl/TestOntReasoning.java    |  517 ++
 .../apache/jena/ontology/impl/TestOntTools.java |  469 ++
 .../apache/jena/ontology/impl/TestOntology.java |  183 +
 .../apache/jena/ontology/impl/TestPackage.java  |   61 +
 .../apache/jena/ontology/impl/TestProperty.java |  623 ++
 .../apache/jena/ontology/impl/TestResource.java |  679 ++
 .../model/test/AbstractContainerMethods.java    |  166 +
 .../rdf/model/test/AbstractModelTestBase.java   |  166 +
 .../jena/rdf/model/test/AbstractTestModel.java  |  231 +
 .../rdf/model/test/AbstractTestPackage.java     |  214 +
 .../test/AbstractTestReifiedStatements.java     |  449 ++
 .../jena/rdf/model/test/IsomorphicTests.java    |  418 +
 .../jena/rdf/model/test/ModelTestBase.java      |  269 +
 .../rdf/model/test/RecordingModelListener.java  |  123 +
 .../jena/rdf/model/test/TestAddAndContains.java |  183 +
 .../jena/rdf/model/test/TestAddModel.java       |   98 +
 .../jena/rdf/model/test/TestAltMethods.java     |   87 +
 .../apache/jena/rdf/model/test/TestAnonID.java  |   99 +
 .../jena/rdf/model/test/TestBagMethods.java     |   45 +
 .../jena/rdf/model/test/TestConcurrency.java    |  240 +
 .../rdf/model/test/TestConcurrencyNesting.java  |  153 +
 .../rdf/model/test/TestConcurrencyParallel.java |  172 +
 .../model/test/TestContainerConstructors.java   |   80 +
 .../jena/rdf/model/test/TestContainers.java     |   47 +
 .../jena/rdf/model/test/TestContains.java       |  113 +
 .../rdf/model/test/TestCopyInOutOfModel.java    |  120 +
 .../org/apache/jena/rdf/model/test/TestGet.java |  107 +
 .../rdf/model/test/TestHiddenStatements.java    |   58 +
 .../jena/rdf/model/test/TestIterators.java      |  299 +
 .../apache/jena/rdf/model/test/TestList.java    |  907 +++
 .../jena/rdf/model/test/TestListStatements.java |  134 +
 .../jena/rdf/model/test/TestListSubjects.java   |  275 +
 .../rdf/model/test/TestListSubjectsEtc.java     |  103 +
 .../jena/rdf/model/test/TestLiteralImpl.java    |  177 +
 .../jena/rdf/model/test/TestLiterals.java       |  288 +
 .../rdf/model/test/TestLiteralsInModel.java     |  105 +
 .../apache/jena/rdf/model/test/TestModel.java   |  253 +
 .../rdf/model/test/TestModelBulkUpdate.java     |  150 +
 .../jena/rdf/model/test/TestModelEvents.java    |  456 ++
 .../jena/rdf/model/test/TestModelExtract.java   |  167 +
 .../jena/rdf/model/test/TestModelFactory.java   |  116 +
 .../jena/rdf/model/test/TestModelMakerImpl.java |  249 +
 .../rdf/model/test/TestModelPolymorphism.java   |   47 +
 .../rdf/model/test/TestModelPrefixMapping.java  |  128 +
 .../jena/rdf/model/test/TestModelRead.java      |   79 +
 .../rdf/model/test/TestModelSetOperations.java  |  135 +
 .../jena/rdf/model/test/TestNamespace.java      |  133 +
 .../rdf/model/test/TestObjectOfProperties.java  |  420 ++
 .../apache/jena/rdf/model/test/TestObjects.java |  194 +
 .../apache/jena/rdf/model/test/TestPackage.java |   67 +
 .../jena/rdf/model/test/TestPropertyImpl.java   |   86 +
 .../jena/rdf/model/test/TestRDFNodes.java       |  201 +
 .../jena/rdf/model/test/TestRDFWriterMap.java   |  228 +
 .../jena/rdf/model/test/TestReaderEvents.java   |   73 +
 .../apache/jena/rdf/model/test/TestReaders.java |   94 +
 .../rdf/model/test/TestReifiedStatements.java   |  364 +
 .../jena/rdf/model/test/TestRemoveBug.java      |  101 +
 .../jena/rdf/model/test/TestRemoveSPO.java      |   74 +
 .../rdf/model/test/TestResourceFactory.java     |  222 +
 .../jena/rdf/model/test/TestResourceImpl.java   |  243 +
 .../rdf/model/test/TestResourceMethods.java     |  196 +
 .../jena/rdf/model/test/TestResources.java      |  337 +
 .../jena/rdf/model/test/TestSelectorUse.java    |  324 +
 .../jena/rdf/model/test/TestSelectors.java      |   55 +
 .../jena/rdf/model/test/TestSeqMethods.java     | 1197 +++
 .../model/test/TestSimpleListStatements.java    |  254 +
 .../jena/rdf/model/test/TestSimpleSelector.java |  139 +
 .../jena/rdf/model/test/TestStandardModels.java |   41 +
 .../rdf/model/test/TestStatementCreation.java   |  183 +
 .../rdf/model/test/TestStatementMethods.java    |  413 +
 .../jena/rdf/model/test/TestStatements.java     |  146 +
 .../rdf/model/test/helpers/ModelHelper.java     |  223 +
 .../test/helpers/RecordingModelListener.java    |  227 +
 .../model/test/helpers/TestingModelFactory.java |   52 +
 .../apache/jena/rdfxml/xmlinput/ARPTests.java   |  134 +
 .../jena/rdfxml/xmlinput/DOM2RDFTest.java       |   85 +
 .../jena/rdfxml/xmlinput/ExceptionTests.java    |  216 +
 .../apache/jena/rdfxml/xmlinput/InFactoryX.java |   27 +
 .../jena/rdfxml/xmlinput/MemoryLeakTest.java    |   73 +
 .../jena/rdfxml/xmlinput/MoreDOM2RDFTest.java   |   94 +
 .../apache/jena/rdfxml/xmlinput/MoreTests.java  |  631 ++
 .../jena/rdfxml/xmlinput/NTripleTestSuite.java  |  315 +
 .../jena/rdfxml/xmlinput/SAX2RDFMoreTests.java  |   97 +
 .../jena/rdfxml/xmlinput/SAX2RDFTest.java       | 1285 ++++
 .../jena/rdfxml/xmlinput/StAX2ModelTest.java    | 1189 +++
 .../jena/rdfxml/xmlinput/TaintingTests.java     |  246 +
 .../jena/rdfxml/xmlinput/TestARPMain.java       | 2777 +++++++
 .../jena/rdfxml/xmlinput/TestErrorMsg.java      |  126 +
 .../jena/rdfxml/xmlinput/TestPackage.java       |   48 +
 .../rdfxml/xmlinput/TestPropEltErrorMsg.java    |  495 ++
 .../apache/jena/rdfxml/xmlinput/TestScope.java  |   90 +
 .../apache/jena/rdfxml/xmlinput/URITests.java   |  115 +
 .../jena/rdfxml/xmlinput/WGTestSuite.java       | 1037 +++
 .../jena/rdfxml/xmlinput/states/AttrEvent.java  |   58 +
 .../rdfxml/xmlinput/states/ElementEvent.java    |   52 +
 .../jena/rdfxml/xmlinput/states/Event.java      |   39 +
 .../jena/rdfxml/xmlinput/states/EventList.java  |  191 +
 .../rdfxml/xmlinput/states/EventRecord.java     |   95 +
 .../rdfxml/xmlinput/states/FullEventRecord.java |   78 +
 .../rdfxml/xmlinput/states/InternalEvent.java   |   39 +
 .../jena/rdfxml/xmlinput/states/QName.java      |   42 +
 .../rdfxml/xmlinput/states/TestARPStates.java   |   64 +
 .../jena/rdfxml/xmlinput/states/TestData.java   |  427 ++
 .../rdfxml/xmlinput/states/TestEventList.java   |   93 +
 .../jena/rdfxml/xmlinput/states/TestFrame.java  |   83 +
 .../rdfxml/xmlinput/states/TestHandler.java     |   79 +
 .../rdfxml/xmloutput/BigAbbrevTestPackage.java  |   29 +
 .../jena/rdfxml/xmloutput/PrettyWriterTest.java |  172 +
 .../jena/rdfxml/xmloutput/TestEntityOutput.java |  207 +
 .../rdfxml/xmloutput/TestLiteralEncoding.java   |  136 +
 .../jena/rdfxml/xmloutput/TestMacEncodings.java |  106 +
 .../jena/rdfxml/xmloutput/TestPackage.java      |   75 +
 .../rdfxml/xmloutput/TestWriterFeatures.java    |   81 +
 .../rdfxml/xmloutput/TestWriterInterface.java   |   82 +
 .../jena/rdfxml/xmloutput/TestXMLAbbrev.java    |  155 +
 .../jena/rdfxml/xmloutput/TestXMLFeatures.java  |  692 ++
 .../rdfxml/xmloutput/XMLOutputTestBase.java     |  242 +
 .../rdfxml/xmloutput/testWriterAndReader.java   |  429 ++
 .../rulesys/impl/TestLPBRuleEngineLeak.java     |  171 +
 .../reasoner/rulesys/test/ConcurrencyTest.java  |  195 +
 .../jena/reasoner/rulesys/test/DebugOWL.java    |  371 +
 .../jena/reasoner/rulesys/test/DebugRules.java  |   70 +
 .../rulesys/test/FRuleEngineIFactoryTest.java   |  223 +
 .../rulesys/test/OWLConsistencyTest.java        |  155 +
 .../jena/reasoner/rulesys/test/OWLUnitTest.java |  273 +
 .../jena/reasoner/rulesys/test/OWLWGTester.java |  261 +
 .../reasoner/rulesys/test/TestBackchainer.java  |  915 +++
 .../jena/reasoner/rulesys/test/TestBasicLP.java | 1379 ++++
 .../jena/reasoner/rulesys/test/TestBasics.java  |  587 ++
 .../jena/reasoner/rulesys/test/TestBugs.java    |  897 +++
 .../reasoner/rulesys/test/TestCapabilities.java |   72 +
 .../rulesys/test/TestComparatorBuiltins.java    |  199 +
 .../rulesys/test/TestConfigVocabulary.java      |   85 +
 .../jena/reasoner/rulesys/test/TestFBRules.java | 1101 +++
 .../test/TestGenericRuleReasonerConfig.java     |  124 +
 .../reasoner/rulesys/test/TestGenericRules.java |  501 ++
 .../rulesys/test/TestInferenceReification.java  |  107 +
 .../reasoner/rulesys/test/TestLPDerivation.java |  216 +
 .../jena/reasoner/rulesys/test/TestLPRDFS.java  |  172 +
 .../rulesys/test/TestOWLConsistency.java        |  142 +
 .../jena/reasoner/rulesys/test/TestOWLMisc.java |  245 +
 .../jena/reasoner/rulesys/test/TestPackage.java |   87 +
 .../jena/reasoner/rulesys/test/TestRDFS9.java   |  112 +
 .../reasoner/rulesys/test/TestRDFSRules.java    |  132 +
 .../jena/reasoner/rulesys/test/TestRETE.java    |  285 +
 .../test/TestRestrictionsDontNeedTyping.java    |   96 +
 .../reasoner/rulesys/test/TestRuleLoader.java   |   40 +
 .../reasoner/rulesys/test/TestSetRules.java     |   89 +
 .../rulesys/test/TestTrialOWLRules.java         |  221 +
 .../rulesys/test/WebOntTestHarness.java         |  598 ++
 .../jena/reasoner/test/ManualExample.java       |  159 +
 .../org/apache/jena/reasoner/test/Matcher.java  |  218 +
 .../jena/reasoner/test/ReasonerTestBase.java    |   41 +
 .../jena/reasoner/test/ReasonerTester.java      |  327 +
 .../jena/reasoner/test/TestCurrentRDFWG.java    |  164 +
 .../apache/jena/reasoner/test/TestInfGraph.java |   64 +
 .../apache/jena/reasoner/test/TestInfModel.java |   80 +
 .../reasoner/test/TestInfPrefixMapping.java     |   49 +
 .../apache/jena/reasoner/test/TestPackage.java  |   52 +
 .../jena/reasoner/test/TestRDFSReasoners.java   |  287 +
 .../jena/reasoner/test/TestReasoners.java       |  470 ++
 .../jena/reasoner/test/TestSafeModel.java       |   87 +
 .../reasoner/test/TestTransitiveGraphCache.java |  552 ++
 .../org/apache/jena/reasoner/test/TestUtil.java |  150 +
 .../jena/reasoner/test/WGReasonerTester.java    |  399 +
 .../apache/jena/regression/TestCaseBasic.java   |   78 +
 .../jena/shared/AbstractTestPrefixMapping.java  |  469 ++
 .../jena/shared/RandomizedTestCaseBasic.java    |   43 +
 .../apache/jena/shared/TestJenaException.java   |   43 +
 .../apache/jena/shared/TestPrefixMapping.java   |   66 +
 .../apache/jena/shared/TestSharedPackage.java   |   35 +
 .../org/apache/jena/shared/uuid/TestBits.java   |  457 ++
 .../org/apache/jena/shared/uuid/TestUUID.java   |  202 +
 .../apache/jena/shared/uuid/TestUUID_JRE.java   |  125 +
 .../apache/jena/shared/uuid/UUIDTestSuite.java  |   42 +
 .../java/org/apache/jena/test/JenaTest.java     |   26 +
 .../java/org/apache/jena/test/JenaTestBase.java |  206 +
 .../java/org/apache/jena/test/TestPackage.java  |   70 +
 .../org/apache/jena/test/TestSystemSetup.java   |   39 +
 .../AbstractGraphProducer.java                  |  105 +
 .../AbstractInfModelProducer.java               |   91 +
 .../AbstractModelProducer.java                  |   89 +
 .../AbstractRecordingListener.java              |  190 +
 .../GraphEventManagerProducerInterface.java     |   35 +
 .../jena/testing_framework/GraphHelper.java     |  508 ++
 .../testing_framework/IContainerProducer.java   |   37 +
 .../testing_framework/IIteratorProducer.java    |   60 +
 .../jena/testing_framework/INodeProducer.java   |   39 +
 .../testing_framework/IResourceProducer.java    |   28 +
 .../testing_framework/IStatementProducer.java   |   45 +
 .../testing_framework/ITripleStoreProducer.java |   35 +
 .../jena/testing_framework/ModelHelper.java     |  401 +
 .../jena/testing_framework/NodeCreateUtils.java |  177 +
 .../NodeProducerInterface.java                  |   32 +
 .../jena/testing_framework/TestFileData.java    |  388 +
 .../jena/testing_framework/TestUtils.java       |  320 +
 .../testing_framework/manifest/Manifest.java    |  228 +
 .../manifest/ManifestException.java             |   48 +
 .../manifest/ManifestFile.java                  |   38 +
 .../manifest/ManifestItem.java                  |   71 +
 .../manifest/ManifestItemHandler.java           |   32 +
 .../manifest/ManifestSuite.java                 |  143 +
 .../manifest/ManifestTest.java                  |   31 +
 .../manifest/ManifestTestRunner.java            |   93 +
 .../jena/testing_framework/package-info.java    |  109 +
 .../testing_framework/tuples/TupleItem.java     |   84 +
 .../jena/testing_framework/tuples/TupleSet.java |  274 +
 .../apache/jena/util/TestCollectionFactory.java |   70 +
 .../org/apache/jena/util/TestFileManager.java   |  238 +
 .../org/apache/jena/util/TestFileUtils.java     |  228 +
 .../jena/util/TestIteratorCollection.java       |  136 +
 .../apache/jena/util/TestLocationMapper.java    |  178 +
 .../java/org/apache/jena/util/TestLocators.java |   99 +
 .../java/org/apache/jena/util/TestMonitors.java |  189 +
 .../org/apache/jena/util/TestOneToManyMap.java  |  355 +
 .../java/org/apache/jena/util/TestPackage.java  |   60 +
 .../org/apache/jena/util/TestPrintUtil.java     |   64 +
 .../org/apache/jena/util/TestSplitIRI_TTL.java  |  160 +
 .../org/apache/jena/util/TestSplitIRI_XML.java  |  138 +
 .../org/apache/jena/util/TestTokenizer.java     |   79 +
 .../iterator/test/LoggingClosableIterator.java  |   41 +
 .../jena/util/iterator/test/TestAndThen.java    |  150 +
 .../util/iterator/test/TestAsCollection.java    |   61 +
 .../jena/util/iterator/test/TestFilters.java    |   48 +
 .../util/iterator/test/TestMapIterators.java    |   38 +
 .../util/iterator/test/TestNullIterator.java    |   48 +
 .../jena/util/iterator/test/TestPackage.java    |   39 +
 .../util/iterator/test/TestResourceUtils.java   |  262 +
 .../util/iterator/test/TestWrappedIterator.java |   70 +
 .../org/apache/jena/util/junit/Manifest.java    |  180 +
 .../jena/util/junit/ManifestItemHandler.java    |   32 +
 .../apache/jena/util/junit/TestException.java   |   32 +
 .../jena/util/junit/TestFactoryManifest.java    |   95 +
 .../org/apache/jena/util/junit/TestUtils.java   |  102 +
 .../vocabulary/test/TestOWL2Vocabulary.java     |  170 +
 .../jena/vocabulary/test/TestVocabDB.java       |   65 +
 .../jena/vocabulary/test/TestVocabDC10.java     |   51 +
 .../jena/vocabulary/test/TestVocabRDF.java      |   97 +
 .../jena/vocabulary/test/TestVocabRDFS.java     |   72 +
 .../jena/vocabulary/test/TestVocabRSS.java      |   46 +
 .../jena/vocabulary/test/TestVocabVCARD.java    |   91 +
 .../jena/vocabulary/test/TestVocabularies.java  |   43 +
 .../jena/vocabulary/test/VocabTestBase.java     |   34 +
 .../test/resources/jena-test-log4j.properties   |   16 +-
 .../reasoners/bugs/layeredValidation.owl        |    2 +-
 .../error001.rdf                                |    1 -
 .../error002.rdf                                |    1 -
 .../rdf-containers-syntax-vs-schema/test001.rdf |    1 -
 .../rdf-containers-syntax-vs-schema/test002.rdf |    1 -
 .../rdf-containers-syntax-vs-schema/test003.rdf |    1 -
 .../rdf-containers-syntax-vs-schema/test004.rdf |    1 -
 .../rdf-containers-syntax-vs-schema/test006.rdf |    1 -
 .../rdf-containers-syntax-vs-schema/test007.rdf |    1 -
 .../rdf-containers-syntax-vs-schema/test008.rdf |    1 -
 .../wg/rdfms-duplicate-member-props/test001.rdf |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test001.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test002.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test003.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test004.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test005.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test006.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test007.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test008.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test009.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test010.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test011.rdf  |    1 -
 .../testing/wg/rdfms-nested-bagIDs/test012.rdf  |    1 -
 .../rdfms-not-id-and-resource-attr/test001.rdf  |    1 -
 .../rdfms-not-id-and-resource-attr/test002.rdf  |    1 -
 .../rdfms-not-id-and-resource-attr/test003.rdf  |    1 -
 .../rdfms-not-id-and-resource-attr/test004.rdf  |    1 -
 .../rdfms-not-id-and-resource-attr/test005.rdf  |    1 -
 jena-core/testing/wg/rdfms-para196/test001.rdf  |    1 -
 jena-csv/ReleaseNotes.txt                       |   14 -
 jena-csv/pom.xml                                |   11 +-
 .../org/apache/jena/propertytable/Column.java   |    2 +-
 .../jena/propertytable/PropertyTable.java       |    6 +-
 .../java/org/apache/jena/propertytable/Row.java |    6 +-
 .../propertytable/graph/GraphPropertyTable.java |   27 +-
 .../graph/QueryIterPropertyTable.java           |   35 +-
 .../graph/QueryIterPropertyTableRow.java        |   32 +-
 .../jena/propertytable/graph/RowMatch.java      |    4 +-
 .../graph/StageGeneratorPropertyTable.java      |   10 +-
 .../jena/propertytable/impl/ColumnImpl.java     |    3 +-
 .../impl/PropertyTableArrayImpl.java            |    9 +-
 .../impl/PropertyTableBuilder.java              |    7 +-
 .../impl/PropertyTableHashMapImpl.java          |   30 +-
 .../apache/jena/propertytable/lang/LangCSV.java |    9 +-
 .../propertytable/lang/ReaderRIOTLangCSV.java   |    3 +-
 .../apache/jena/propertytable/util/IRILib.java  |  264 -
 jena-csv/src/main/java/riotcmdx/csv2rdf.java    |    5 +-
 .../jena/propertytable/AbstractColumnTest.java  |    5 +-
 .../AbstractPropertyTableTest.java              |    3 +-
 .../jena/propertytable/AbstractRowTest.java     |    5 +-
 .../org/apache/jena/propertytable/BaseTest.java |    4 +-
 .../jena/propertytable/graph/GraphCSVTest.java  |   15 +-
 .../impl/AbstractPropertyTableBuilderTest.java  |    5 +-
 .../jena/propertytable/lang/TestLangCSV.java    |    5 +-
 jena-csv/src/test/resources/log4j.properties    |    9 +-
 jena-elephas/jena-elephas-common/pom.xml        |   15 +-
 .../rdf/types/AbstractNodeTupleWritable.java    |    5 +-
 .../rdf/types/CharacteristicSetWritable.java    |    7 +-
 .../rdf/types/CharacteristicWritable.java       |    5 +-
 .../hadoop/rdf/types/NodeTupleWritable.java     |    6 +-
 .../jena/hadoop/rdf/types/NodeWritable.java     |    6 +-
 .../jena/hadoop/rdf/types/QuadWritable.java     |    5 +-
 .../jena/hadoop/rdf/types/TripleWritable.java   |    5 +-
 .../rdf/io/types/CharacteristicTests.java       |    7 +-
 .../jena/hadoop/rdf/io/types/RdfTypesTest.java  |   11 +-
 .../src/test/resources/log4j.properties         |    9 +-
 jena-elephas/jena-elephas-io/pom.xml            |   23 +-
 .../hadoop/rdf/io/input/QuadsInputFormat.java   |    5 +-
 .../hadoop/rdf/io/input/TriplesInputFormat.java |    5 +-
 .../rdf/io/input/TriplesOrQuadsInputFormat.java |    5 +-
 .../io/input/jsonld/JsonLDQuadInputFormat.java  |    5 +-
 .../input/jsonld/JsonLDTripleInputFormat.java   |    5 +-
 .../input/nquads/BlockedNQuadsInputFormat.java  |    5 +-
 .../rdf/io/input/nquads/NQuadsInputFormat.java  |    5 +-
 .../nquads/WholeFileNQuadsInputFormat.java      |    5 +-
 .../ntriples/BlockedNTriplesInputFormat.java    |    5 +-
 .../io/input/ntriples/NTriplesInputFormat.java  |    5 +-
 .../ntriples/WholeFileNTriplesInputFormat.java  |    5 +-
 .../io/input/rdfjson/RdfJsonInputFormat.java    |    5 +-
 .../rdf/io/input/rdfxml/RdfXmlInputFormat.java  |    5 +-
 .../AbstractBlockBasedNodeTupleReader.java      |   10 +-
 .../readers/AbstractBlockBasedQuadReader.java   |    3 +-
 .../readers/AbstractBlockBasedTripleReader.java |    3 +-
 .../AbstractLineBasedNodeTupleReader.java       |   12 +-
 .../readers/AbstractLineBasedQuadReader.java    |    4 +-
 .../readers/AbstractLineBasedTripleReader.java  |    4 +-
 .../AbstractWholeFileNodeTupleReader.java       |   10 +-
 .../readers/AbstractWholeFileQuadReader.java    |    3 +-
 .../readers/AbstractWholeFileTripleReader.java  |    3 +-
 .../rdf/io/input/readers/QuadsReader.java       |    3 +-
 .../io/input/readers/TriplesOrQuadsReader.java  |    5 +-
 .../rdf/io/input/readers/TriplesReader.java     |    3 +-
 .../io/input/readers/TriplesToQuadsReader.java  |    7 +-
 .../io/input/readers/nquads/NQuadsReader.java   |    5 +-
 .../input/readers/ntriples/NTriplesReader.java  |    5 +-
 .../io/input/thrift/ThriftQuadInputFormat.java  |    5 +-
 .../input/thrift/ThriftTripleInputFormat.java   |    5 +-
 .../rdf/io/input/trig/TriGInputFormat.java      |    5 +-
 .../rdf/io/input/trix/TriXInputFormat.java      |    5 +-
 .../rdf/io/input/turtle/TurtleInputFormat.java  |    5 +-
 .../io/input/util/TrackedPipedQuadsStream.java  |    5 +-
 .../input/util/TrackedPipedTriplesStream.java   |    5 +-
 .../rdf/io/output/AbstractNodeOutputFormat.java |    4 +-
 .../output/AbstractNodeTupleOutputFormat.java   |    4 +-
 .../hadoop/rdf/io/output/QuadsOutputFormat.java |    3 +-
 .../io/output/TriplesOrQuadsOutputFormat.java   |    3 +-
 .../rdf/io/output/TriplesOutputFormat.java      |    3 +-
 .../output/jsonld/JsonLDQuadOutputFormat.java   |    3 +-
 .../output/jsonld/JsonLDTripleOutputFormat.java |    3 +-
 .../io/output/nquads/NQuadsOutputFormat.java    |    5 +-
 .../output/ntriples/NTriplesOutputFormat.java   |    5 +-
 .../io/output/rdfjson/RdfJsonOutputFormat.java  |    5 +-
 .../io/output/rdfxml/RdfXmlOutputFormat.java    |    5 +-
 .../output/thrift/ThriftQuadOutputFormat.java   |    2 +-
 .../output/thrift/ThriftTripleOutputFormat.java |    3 +-
 .../io/output/trig/BatchedTriGOutputFormat.java |    3 +-
 .../rdf/io/output/trig/TriGOutputFormat.java    |    3 +-
 .../rdf/io/output/trix/TriXOutputFormat.java    |    2 +-
 .../turtle/BatchedTurtleOutputFormat.java       |    3 +-
 .../io/output/turtle/TurtleOutputFormat.java    |    3 +-
 .../writers/AbstractBatchedNodeTupleWriter.java |    4 +-
 .../writers/AbstractBatchedQuadWriter.java      |   11 +-
 .../writers/AbstractBatchedTripleWriter.java    |    9 +-
 .../AbstractLineBasedNodeTupleWriter.java       |   10 +-
 .../writers/AbstractLineBasedQuadWriter.java    |    7 +-
 .../writers/AbstractLineBasedTripleWriter.java  |    5 +-
 .../io/output/writers/AbstractNodeWriter.java   |   12 +-
 .../AbstractStreamRdfNodeTupleWriter.java       |    6 +-
 .../AbstractWholeFileNodeTupleWriter.java       |    4 +-
 .../writers/AbstractWholeFileQuadWriter.java    |    9 +-
 .../writers/AbstractWholeFileTripleWriter.java  |    9 +-
 .../io/output/writers/StreamRdfQuadWriter.java  |    3 +-
 .../output/writers/StreamRdfTripleWriter.java   |    3 +-
 .../registry/readers/JsonLDReaderFactory.java   |    6 +-
 .../registry/readers/NQuadsReaderFactory.java   |    4 +-
 .../registry/readers/NTriplesReaderFactory.java |    3 +-
 .../registry/readers/RdfJsonReaderFactory.java  |    4 +-
 .../registry/readers/RdfXmlReaderFactory.java   |    4 +-
 .../registry/readers/ThriftReaderFactory.java   |    6 +-
 .../io/registry/readers/TriGReaderFactory.java  |    4 +-
 .../io/registry/readers/TriXReaderFactory.java  |    4 +-
 .../registry/readers/TurtleReaderFactory.java   |    4 +-
 .../registry/writers/JsonLDWriterFactory.java   |    7 +-
 .../registry/writers/NQuadsWriterFactory.java   |    4 +-
 .../registry/writers/NTriplesWriterFactory.java |    4 +-
 .../registry/writers/RdfJsonWriterFactory.java  |    4 +-
 .../registry/writers/RdfXmlWriterFactory.java   |    4 +-
 .../registry/writers/ThriftWriterFactory.java   |    7 +-
 .../io/registry/writers/TriGWriterFactory.java  |    4 +-
 .../io/registry/writers/TriXWriterFactory.java  |    4 +-
 .../registry/writers/TurtleWriterFactory.java   |    4 +-
 .../AbstractNodeTupleInputFormatTests.java      |   32 +-
 .../io/input/AbstractQuadsInputFormatTests.java |    3 +-
 .../input/AbstractTriplesInputFormatTests.java  |    3 +-
 .../AbstractWholeFileQuadInputFormatTests.java  |   19 +-
 ...AbstractWholeFileTripleInputFormatTests.java |   13 +-
 .../io/input/bnodes/AbstractBlankNodeTests.java |    7 +-
 .../bnodes/AbstractTripleBlankNodeTests.java    |    9 +-
 ...AbstractCompressedQuadsInputFormatTests.java |    3 +-
 ...stractCompressedTriplesInputFormatTests.java |    3 +-
 ...CompressedWholeFileQuadInputFormatTests.java |   19 +-
 ...mpressedWholeFileTripleInputFormatTests.java |   11 +-
 .../output/AbstractQuadOutputFormatTests.java   |    7 +-
 .../output/AbstractTripleOutputFormatTests.java |    7 +-
 .../output/trig/TriGBlankNodeOutputTests.java   |   15 +-
 .../turtle/TurtleBlankNodeOutputTests.java      |   15 +-
 jena-elephas/jena-elephas-mapreduce/pom.xml     |   33 +-
 .../QuadCharacteristicSetGeneratingReducer.java |    3 +-
 ...ripleCharacteristicSetGeneratingReducer.java |    3 +-
 .../mapreduce/count/QuadNodeCountMapper.java    |    3 +-
 .../mapreduce/count/TripleNodeCountMapper.java  |    3 +-
 .../datatypes/QuadDataTypeCountMapper.java      |    5 +-
 .../datatypes/TripleDataTypeCountMapper.java    |    5 +-
 .../AbstractNodeTupleNamespaceCountMapper.java  |    5 +-
 .../namespaces/QuadNamespaceCountMapper.java    |    3 +-
 .../namespaces/TripleNamespaceCountMapper.java  |    3 +-
 .../filter/AbstractQuadFilterMapper.java        |    3 +-
 .../filter/AbstractTripleFilterMapper.java      |    3 +-
 .../filter/GroundQuadFilterMapper.java          |    3 +-
 .../filter/GroundTripleFilterMapper.java        |    3 +-
 .../mapreduce/filter/ValidQuadFilterMapper.java |    3 +-
 .../filter/ValidTripleFilterMapper.java         |    3 +-
 .../AbstractQuadFilterByPositionMapper.java     |    5 +-
 .../AbstractTripleFilterByPositionMapper.java   |    5 +-
 .../positional/QuadFilterByGraphUriMapper.java  |    5 +-
 .../positional/QuadFilterByObjectUriMapper.java |    5 +-
 .../positional/QuadFilterByPredicateMapper.java |    5 +-
 .../QuadFilterBySubjectUriMapper.java           |    5 +-
 .../TripleFilterByObjectUriMapper.java          |    5 +-
 .../TripleFilterByPredicateUriMapper.java       |    5 +-
 .../TripleFilterBySubjectUriMapper.java         |    5 +-
 .../group/AbstractQuadGroupingMapper.java       |    3 +-
 .../group/AbstractTripleGroupingMapper.java     |    3 +-
 .../mapreduce/group/QuadGroupByGraphMapper.java |    3 +-
 .../group/QuadGroupByObjectMapper.java          |    3 +-
 .../group/QuadGroupByPredicateMapper.java       |    3 +-
 .../group/QuadGroupBySubjectMapper.java         |    3 +-
 .../group/TripleGroupByObjectMapper.java        |    3 +-
 .../group/TripleGroupByPredicateMapper.java     |    3 +-
 .../group/TripleGroupBySubjectMapper.java       |    3 +-
 .../mapreduce/split/QuadSplitToNodesMapper.java |    3 +-
 .../split/QuadSplitWithNodesMapper.java         |    3 +-
 .../split/TripleSplitToNodesMapper.java         |    3 +-
 .../split/TripleSplitWithNodesMapper.java       |    3 +-
 .../transform/AbstractTriplesToQuadsMapper.java |    9 +-
 .../TriplesToQuadsBySubjectMapper.java          |    4 +-
 .../TriplesToQuadsConstantGraphMapper.java      |    8 +-
 .../rdf/mapreduce/TestDistinctTriples.java      |    7 +-
 ...CharacteristicSetGeneratingReducerTests.java |    5 +-
 .../CharacteristicSetReducerTest.java           |    5 +-
 ...eCharacteristicSetGeneratingReducerTest.java |    7 +-
 .../count/QuadNodeCountMapReduceTest.java       |    9 +-
 .../count/QuadNodeCountMapperTest.java          |    9 +-
 .../count/TripleNodeCountMapReduceTest.java     |    7 +-
 .../count/TripleNodeCountMapperTest.java        |    7 +-
 .../filter/AbstractQuadValidityFilterTests.java |    7 +-
 .../AbstractTripleValidityFilterTests.java      |    7 +-
 .../TripleFilterByPredicateMapperTest.java      |   11 +-
 ...ipleInvertedFilterByPredicateMapperTest.java |   11 +-
 .../group/AbstractQuadGroupingTests.java        |    9 +-
 .../group/AbstractTripleGroupingTests.java      |    7 +-
 .../split/AbstractQuadSplitToNodesTests.java    |    9 +-
 .../split/AbstractQuadSplitWithNodesTests.java  |    9 +-
 .../split/AbstractTripleSplitToNodesTests.java  |    7 +-
 .../AbstractTripleSplitWithNodesTests.java      |    7 +-
 .../transform/QuadsToTriplesMapperTest.java     |   11 +-
 .../TriplesToQuadsBySubjectMapperTest.java      |   11 +-
 .../TriplesToQuadsConstantGraphMapperTest.java  |   11 +-
 jena-elephas/jena-elephas-stats/pom.xml         |    2 +-
 .../apache/jena/hadoop/rdf/stats/RdfStats.java  |   17 +-
 .../jena/hadoop/rdf/stats/jobs/JobFactory.java  |    5 +-
 jena-elephas/pom.xml                            |   58 +-
 .../jena/example/helloworld/HelloWorld.java     |    8 +-
 .../jena/example/pizza/PizzaSparqlNoInf.java    |   16 +-
 jena-extras/jena-querybuilder/pom.xml           |   13 +-
 .../arq/querybuilder/AbstractQueryBuilder.java  |   50 +-
 .../jena/arq/querybuilder/AskBuilder.java       |   19 +-
 .../jena/arq/querybuilder/ConstructBuilder.java |   38 +-
 .../jena/arq/querybuilder/SelectBuilder.java    |   45 +-
 .../querybuilder/clauses/ConstructClause.java   |    5 +-
 .../arq/querybuilder/clauses/PrologClause.java  |    5 +-
 .../arq/querybuilder/clauses/SelectClause.java  |   37 +-
 .../clauses/SolutionModifierClause.java         |    3 +-
 .../arq/querybuilder/clauses/WhereClause.java   |   27 +-
 .../querybuilder/handlers/ConstructHandler.java |   13 +-
 .../querybuilder/handlers/DatasetHandler.java   |   55 +-
 .../jena/arq/querybuilder/handlers/Handler.java |    5 +-
 .../querybuilder/handlers/PrologHandler.java    |    8 +-
 .../querybuilder/handlers/SelectHandler.java    |   61 +-
 .../handlers/SolutionModifierHandler.java       |   47 +-
 .../arq/querybuilder/handlers/WhereHandler.java |  119 +-
 .../rewriters/AbstractRewriter.java             |   18 +-
 .../querybuilder/rewriters/ElementRewriter.java |   34 +-
 .../querybuilder/rewriters/ExprRewriter.java    |   25 +-
 .../rewriters/NodeValueRewriter.java            |   18 +-
 .../arq/querybuilder/rewriters/OpRewriter.java  |   62 +-
 .../querybuilder/rewriters/PathRewriter.java    |   25 +-
 .../jena/arq/AbstractRegexpBasedTest.java       |   11 +-
 .../querybuilder/AbstractQueryBuilderTest.java  |   20 +-
 .../arq/querybuilder/SelectBuilderTest.java     |   37 +-
 .../clauses/AbstractClauseTest.java             |    3 +-
 .../querybuilder/clauses/DatasetClauseTest.java |    6 +-
 .../querybuilder/clauses/PrologClauseTest.java  |    6 +-
 .../querybuilder/clauses/SelectClauseTest.java  |   37 +-
 .../clauses/SolutionModifierTest.java           |    6 +-
 .../querybuilder/clauses/WhereClauseTest.java   |  155 +-
 .../handlers/ConstructHandlerTest.java          |   14 +-
 .../handlers/DatasetHandlerTest.java            |    9 +-
 .../handlers/PrologHandlerTest.java             |   15 +-
 .../handlers/SelectHandlerTest.java             |   30 +-
 .../handlers/SolutionModifierHandlerTest.java   |   11 +-
 .../querybuilder/handlers/WhereHandlerTest.java |  171 +-
 jena-extras/pom.xml                             |    8 +-
 jena-fuseki1/ReleaseNotes.txt                   |  104 -
 jena-fuseki1/pom.xml                            |   32 +-
 jena-fuseki1/soh                                |    2 +-
 jena-fuseki1/src-dev/dev/RunFuseki.java         |   90 -
 .../jena/fuseki/EmbeddedFusekiServer.java       |    7 +-
 .../java/org/apache/jena/fuseki/Fuseki.java     |   23 +-
 .../java/org/apache/jena/fuseki/FusekiCmd.java  |   28 +-
 .../org/apache/jena/fuseki/FusekiException.java |    2 +-
 .../java/org/apache/jena/fuseki/FusekiLib.java  |   23 +-
 .../apache/jena/fuseki/mgt/ActionBackup.java    |   42 +-
 .../apache/jena/fuseki/mgt/MgtCmdServlet.java   |    7 +-
 .../apache/jena/fuseki/mgt/MgtFunctions.java    |   13 +-
 .../org/apache/jena/fuseki/mgt/PingServlet.java |    5 +-
 .../jena/fuseki/migrate/GraphLoadUtils.java     |    9 +-
 .../jena/fuseki/migrate/SinkRDFLimited.java     |    5 +-
 .../apache/jena/fuseki/server/DatasetRef.java   |    5 +-
 .../apache/jena/fuseki/server/FusekiConfig.java |   50 +-
 .../apache/jena/fuseki/server/FusekiVocab.java  |    7 +-
 .../apache/jena/fuseki/server/SPARQLServer.java |    9 +-
 .../apache/jena/fuseki/servlets/HttpAction.java |   28 +-
 .../apache/jena/fuseki/servlets/REST_Quads.java |    9 +-
 .../jena/fuseki/servlets/ResponseModel.java     |    3 +-
 .../jena/fuseki/servlets/ResponseResultSet.java |   25 +-
 .../jena/fuseki/servlets/SPARQL_Protocol.java   |   19 +-
 .../jena/fuseki/servlets/SPARQL_Query.java      |    9 +-
 .../fuseki/servlets/SPARQL_QueryDataset.java    |   12 +-
 .../fuseki/servlets/SPARQL_QueryGeneral.java    |   13 +-
 .../jena/fuseki/servlets/SPARQL_REST.java       |   13 +-
 .../jena/fuseki/servlets/SPARQL_REST_R.java     |    3 +-
 .../jena/fuseki/servlets/SPARQL_REST_RW.java    |    5 +-
 .../fuseki/servlets/SPARQL_ServletBase.java     |    9 +-
 .../jena/fuseki/servlets/SPARQL_Update.java     |   19 +-
 .../jena/fuseki/servlets/SPARQL_Upload.java     |   11 +-
 .../fuseki/servlets/SimpleVelocityServlet.java  |    2 +-
 .../jena/fuseki/validation/DataValidator.java   |   14 +-
 .../jena/fuseki/validation/QueryValidator.java  |   15 +-
 .../jena/fuseki/validation/UpdateValidator.java |    9 +-
 .../java/org/apache/jena/fuseki/ServerTest.java |   26 +-
 .../java/org/apache/jena/fuseki/TestAuth.java   |   31 +-
 .../java/org/apache/jena/fuseki/TestQuery.java  |   17 +-
 .../apache/jena/fuseki/TestSPARQLProtocol.java  |   19 +-
 .../fuseki/http/TestDatasetAccessorHTTP.java    |    9 +-
 .../org/apache/jena/fuseki/http/TestHttpOp.java |    7 +-
 .../src/test/resources/log4j.properties         |    6 +-
 jena-fuseki2/ReleaseNotes.txt                   |   19 -
 .../apache-jena-fuseki/assembly-dist.xml        |    2 -
 jena-fuseki2/apache-jena-fuseki/bin/s-delete    |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/s-get       |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/s-head      |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/s-post      |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/s-put       |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/s-query     |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/s-update    |   16 +-
 .../apache-jena-fuseki/bin/s-update-form        |   16 +-
 jena-fuseki2/apache-jena-fuseki/bin/soh         |   16 +-
 jena-fuseki2/apache-jena-fuseki/fuseki          |   27 +-
 jena-fuseki2/apache-jena-fuseki/pom.xml         |    4 +-
 jena-fuseki2/examples/jetty-fuseki.xml          |   48 -
 jena-fuseki2/jena-fuseki-core/fuseki-dev        |    8 +-
 jena-fuseki2/jena-fuseki-core/pom.xml           |   18 +-
 .../main/java/org/apache/jena/fuseki/DEF.java   |   27 +-
 .../java/org/apache/jena/fuseki/Fuseki.java     |   38 +-
 .../org/apache/jena/fuseki/FusekiException.java |    2 +-
 .../java/org/apache/jena/fuseki/FusekiLib.java  |   35 +-
 .../org/apache/jena/fuseki/FusekiLogging.java   |    1 -
 .../org/apache/jena/fuseki/async/AsyncPool.java |    4 +-
 .../org/apache/jena/fuseki/async/AsyncTask.java |   16 +-
 .../org/apache/jena/fuseki/build/Builder.java   |   31 +-
 .../jena/fuseki/build/DataServiceDesc.java      |  107 -
 .../apache/jena/fuseki/build/FusekiConfig.java  |  117 +-
 .../jena/fuseki/build/TemplateFunctions.java    |    3 +-
 .../org/apache/jena/fuseki/cmd/FusekiCmd.java   |   39 +-
 .../apache/jena/fuseki/jetty/JettyFuseki.java   |    9 +-
 .../apache/jena/fuseki/mgt/ActionAsyncTask.java |   13 +-
 .../apache/jena/fuseki/mgt/ActionBackup.java    |   10 -
 .../jena/fuseki/mgt/ActionBackupList.java       |   94 +
 .../jena/fuseki/mgt/ActionContainerItem.java    |   26 +-
 .../apache/jena/fuseki/mgt/ActionDatasets.java  |  137 +-
 .../org/apache/jena/fuseki/mgt/ActionPing.java  |    5 +-
 .../org/apache/jena/fuseki/mgt/ActionSleep.java |    2 +-
 .../org/apache/jena/fuseki/mgt/ActionStats.java |    7 -
 .../java/org/apache/jena/fuseki/mgt/Async.java  |   17 +-
 .../java/org/apache/jena/fuseki/mgt/Backup.java |   15 +-
 .../org/apache/jena/fuseki/mgt/JsonConst.java   |   49 +-
 .../org/apache/jena/fuseki/mgt/MgtConst.java    |   11 +-
 .../org/apache/jena/fuseki/mgt/TaskBase.java    |    5 +-
 .../fuseki/migrate/DatasetGraphSwitchable.java  |    5 +-
 .../jena/fuseki/migrate/GraphLoadUtils.java     |    9 +-
 .../jena/fuseki/migrate/StreamRDFLimited.java   |    5 +-
 .../fuseki/server/DataAccessPointRegistry.java  |   14 +
 .../apache/jena/fuseki/server/DataService.java  |   32 +-
 .../jena/fuseki/server/DatasetStatus.java       |    2 +-
 .../apache/jena/fuseki/server/FusekiEnv.java    |   55 +-
 .../apache/jena/fuseki/server/FusekiServer.java |   50 +-
 .../fuseki/server/FusekiServerListener.java     |    5 +-
 .../apache/jena/fuseki/server/FusekiVocab.java  |    3 +-
 .../jena/fuseki/server/ServerInitialConfig.java |   26 +-
 .../fuseki/server/ShiroEnvironmentLoader.java   |    3 +-
 .../apache/jena/fuseki/server/SystemState.java  |   34 +-
 .../apache/jena/fuseki/servlets/ActionBase.java |   26 +-
 .../apache/jena/fuseki/servlets/ActionREST.java |    6 +-
 .../jena/fuseki/servlets/ActionSPARQL.java      |    8 +-
 .../fuseki/servlets/ConcurrencyPolicyMRSW.java  |  113 -
 .../jena/fuseki/servlets/CrossOriginFilter.java |  466 ++
 .../jena/fuseki/servlets/FusekiFilter.java      |    2 +-
 .../apache/jena/fuseki/servlets/HttpAction.java |   28 +-
 .../jena/fuseki/servlets/REST_Quads_R.java      |    3 +-
 .../jena/fuseki/servlets/REST_Quads_RW.java     |    5 +-
 .../jena/fuseki/servlets/ResponseDataset.java   |  134 +
 .../jena/fuseki/servlets/ResponseModel.java     |    6 +-
 .../jena/fuseki/servlets/ResponseResultSet.java |   25 +-
 .../apache/jena/fuseki/servlets/SPARQL_GSP.java |    9 +-
 .../jena/fuseki/servlets/SPARQL_GSP_R.java      |    3 +-
 .../jena/fuseki/servlets/SPARQL_GSP_RW.java     |    5 +-
 .../jena/fuseki/servlets/SPARQL_Protocol.java   |   82 +-
 .../jena/fuseki/servlets/SPARQL_Query.java      |   34 +-
 .../fuseki/servlets/SPARQL_QueryDataset.java    |   32 +-
 .../fuseki/servlets/SPARQL_QueryGeneral.java    |  111 +-
 .../fuseki/servlets/SPARQL_UberServlet.java     |   66 +-
 .../jena/fuseki/servlets/SPARQL_Update.java     |   27 +-
 .../jena/fuseki/servlets/SPARQL_Upload.java     |  114 +-
 .../jena/fuseki/validation/QueryValidator.java  |   15 +-
 .../jena/fuseki/validation/UpdateValidator.java |    9 +-
 .../fuseki/validation/ValidatorBaseJson.java    |    7 +-
 .../org/apache/jena/fuseki/log4j.properties     |    2 +-
 .../org/apache/jena/fuseki/server/shiro.ini     |    4 +-
 .../jena/fuseki/server/templates/config-tdb     |    7 +-
 .../jena/fuseki/server/templates/config-tdb-dir |    5 -
 .../jena/fuseki/server/templates/config-tdb-mem |    5 -
 .../src/main/webapp/WEB-INF/web.xml             |   51 +-
 .../src/main/webapp/css/codemirror.css          |  301 +
 .../src/main/webapp/css/jquery.dataTables.css   |  220 +
 .../main/webapp/js/app/models/fuseki-server.js  |    4 +-
 .../js/app/templates/dataset-management.tpl     |    3 +-
 .../webapp/js/app/views/dataset-management.js   |   16 +-
 .../java/org/apache/jena/fuseki/ServerTest.java |   33 +-
 .../java/org/apache/jena/fuseki/TestAdmin.java  |   97 +-
 .../java/org/apache/jena/fuseki/TestAuth.java   |   27 +-
 .../org/apache/jena/fuseki/TestDatasetOps.java  |   23 +-
 .../org/apache/jena/fuseki/TestFileUpload.java  |    9 +-
 .../java/org/apache/jena/fuseki/TestQuery.java  |  258 +-
 .../apache/jena/fuseki/TestSPARQLProtocol.java  |   19 +-
 .../fuseki/http/TestDatasetAccessorHTTP.java    |    9 +-
 .../org/apache/jena/fuseki/http/TestHttpOp.java |    5 +-
 jena-fuseki2/jena-fuseki-server/pom.xml         |    3 +-
 jena-fuseki2/jena-fuseki-war/pom.xml            |    3 +-
 jena-fuseki2/pom.xml                            |    7 +-
 jena-iri/RELEASE_NOTES.txt                      |   30 -
 jena-iri/pom.xml                                |    4 +-
 .../org/apache/jena/iri/TestIRIFactory.java     |    2 +-
 jena-jdbc/jena-jdbc-core/pom.xml                |    4 +-
 .../org/apache/jena/jdbc/JdbcCompatibility.java |    4 +-
 .../java/org/apache/jena/jdbc/JenaDriver.java   |    4 +-
 .../java/org/apache/jena/jdbc/JenaJDBC.java     |    2 +-
 .../jdbc/connections/DatasetConnection.java     |   11 +-
 .../jena/jdbc/connections/JenaConnection.java   |   32 +-
 .../jena/jdbc/metadata/DatasetMetadata.java     |    4 +-
 .../apache/jena/jdbc/metadata/JenaMetadata.java |  297 +-
 .../jdbc/metadata/results/MetaResultSet.java    |   40 +-
 .../postprocessing/ResultsPostProcessor.java    |    5 +-
 .../jdbc/preprocessing/CommandPreProcessor.java |    4 +-
 .../apache/jena/jdbc/results/AskResults.java    |   24 +-
 .../apache/jena/jdbc/results/JenaResultSet.java |   23 +-
 .../jena/jdbc/results/MaterializedResults.java  |   12 +-
 .../jdbc/results/MaterializedSelectResults.java |   23 +-
 .../jdbc/results/QueryExecutionResults.java     |    6 +-
 .../apache/jena/jdbc/results/SelectResults.java |   21 +-
 .../jena/jdbc/results/StreamedResults.java      |   12 +-
 .../jdbc/results/TripleIteratorResults.java     |   13 +-
 .../jena/jdbc/results/TripleListResults.java    |   19 +-
 .../metadata/AbstractResultsMetadata.java       |    9 +-
 .../results/metadata/SelectResultsMetadata.java |   11 +-
 .../results/metadata/TripleResultsMetadata.java |    5 +-
 .../results/metadata/columns/ColumnInfo.java    |    2 +-
 .../metadata/columns/SparqlColumnInfo.java      |    3 +-
 .../statements/DatasetPreparedStatement.java    |   17 +-
 .../jena/jdbc/statements/DatasetStatement.java  |   17 +-
 .../jdbc/statements/JenaPreparedStatement.java  |   29 +-
 .../jena/jdbc/statements/JenaStatement.java     |   59 +-
 .../metadata/JenaParameterMetadata.java         |    7 +-
 .../apache/jena/jdbc/utils/JdbcNodeUtils.java   |    8 +-
 .../main/resources/jena-jdbc-log4j.properties   |    6 +-
 .../jena/jdbc/AbstractJenaDriverTests.java      |    5 +-
 .../org/apache/jena/jdbc/TestCompatibility.java |   15 +-
 .../AbstractJenaConnectionTests.java            |   23 +-
 .../results/AbstractDatabaseMetadataTests.java  |    3 +-
 .../jena/jdbc/postprocessing/ResultsEcho.java   |    8 +-
 .../apache/jena/jdbc/preprocessing/Echo.java    |   11 +-
 .../jdbc/results/AbstractResultSetTests.java    |   19 +-
 .../statements/AbstractJenaStatementTests.java  |   28 +-
 .../org/apache/jena/jdbc/utils/TestUtils.java   |   19 +-
 .../src/test/resources/log4j.properties         |    6 +-
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml       |   20 +-
 .../src/test/resources/log4j.properties         |    6 +-
 jena-jdbc/jena-jdbc-driver-mem/pom.xml          |    6 +-
 .../org/apache/jena/jdbc/mem/MemDriver.java     |    7 +-
 .../jdbc/mem/connections/MemConnection.java     |    5 +-
 .../jdbc/mem/metadata/MemDatasetMetadata.java   |   31 +-
 .../mem/connections/DebugMemConnection.java     |    5 +-
 .../mem/connections/TestDatasetConnection.java  |    5 +-
 .../metadata/TestDatasetConnectionMetadata.java |    3 +-
 .../mem/results/AbstractMemResultSetTests.java  |    3 +-
 .../jena/jdbc/mem/results/TestResultSets.java   |    7 +-
 .../jdbc/mem/statements/TestMemStatements.java  |    3 +-
 .../src/test/resources/log4j.properties         |    6 +-
 jena-jdbc/jena-jdbc-driver-remote/pom.xml       |   10 +-
 .../jena/jdbc/remote/RemoteEndpointDriver.java  |    3 +-
 .../connections/RemoteEndpointConnection.java   |   14 +-
 .../remote/metadata/RemoteEndpointMetadata.java |   35 +-
 .../RemoteEndpointPreparedStatement.java        |   20 +-
 .../statements/RemoteEndpointStatement.java     |   21 +-
 .../TestRemoteEndpointConnection.java           |    4 +-
 .../TestRemoteEndpointConnectionWithAuth.java   |   17 +-
 ...stRemoteEndpointConnectionWithGraphUris.java |    5 +-
 ...oteEndpointConnectionWithResultSetTypes.java |    4 +-
 .../AbstractRemoteEndpointResultSetTests.java   |    3 +-
 .../results/TestRemoteEndpointResults.java      |    9 +-
 .../TestRemoteEndpointResultsWithAuth.java      |   23 +-
 .../TestRemoteEndpointResultsWithGraphUris.java |    9 +-
 ...RemoteEndpointResultsWithResultSetTypes.java |   10 +-
 .../src/test/resources/log4j.properties         |    6 +-
 jena-jdbc/jena-jdbc-driver-tdb/pom.xml          |   10 +-
 .../org/apache/jena/jdbc/tdb/TDBDriver.java     |    9 +-
 .../jdbc/tdb/connections/TDBConnection.java     |    5 +-
 .../jdbc/tdb/metadata/TDBDatasetMetadata.java   |   39 +-
 .../tdb/connections/DebugTdbConnection.java     |    5 +-
 .../tdb/connections/TestTdbDiskConnection.java  |   11 +-
 .../tdb/connections/TestTdbMemConnection.java   |    9 +-
 .../tdb/metadata/TestTdbConnectionMetadata.java |    7 +-
 .../tdb/results/AbstractTdbResultSetTests.java  |    7 +-
 .../jdbc/tdb/results/TestTdbDiskResultSets.java |   15 +-
 .../jdbc/tdb/results/TestTdbMemResultSets.java  |   13 +-
 .../src/test/resources/log4j.properties         |    6 +-
 jena-jdbc/pom.xml                               |    4 +-
 jena-maven-tools/README                         |    2 +-
 jena-maven-tools/demo/pom.xml                   |   18 +-
 jena-maven-tools/pom.xml                        |  293 +-
 .../src/it/schemagen-integration-0/pom.xml      |    2 +-
 .../src/it/schemagen-integration-1/pom.xml      |    2 +-
 .../src/it/schemagen-integration-2/pom.xml      |    2 +-
 .../src/it/schemagen-integration-3/pom.xml      |    2 +-
 .../src/it/schemagen-integration-4/pom.xml      |   66 +
 .../src/main/vocabs/test1.ttl                   |   33 +
 .../src/it/schemagen-integration-4/verify.bsh   |   29 +
 .../jena/tools/schemagen/SchemagenMojo.java     |    6 +-
 .../jena/tools/schemagen/SchemagenOptions.java  |    5 +-
 .../org/apache/jena/tools/schemagen/Source.java |    6 +-
 .../tools/schemagen/SchemagenOptionsTest.java   |    6 +-
 .../tools/schemagen/SourceParameterTest.java    |   14 +-
 jena-parent/pom.xml                             |  127 +-
 jena-permissions/LICENSE                        |  202 +
 jena-permissions/NOTICE                         |    9 +
 jena-permissions/license-header.txt             |   15 +
 jena-permissions/pom.xml                        |  192 +
 jena-permissions/readme.md                      |   30 +
 .../permissions/example/ExampleEvaluator.java   |  155 +
 .../permissions/example/SecurityExample.java    |   93 +
 .../example/ShiroExampleEvaluator.java          |  235 +
 .../apache/jena/security/example/example.ttl    |   49 +
 .../jena/security/example/fuseki/config.ttl     |   98 +
 .../jena/security/example/fuseki/shiro.ini      |   47 +
 .../jena/permissions/AssemblerConstants.java    |   62 +
 .../org/apache/jena/permissions/Factory.java    |   69 +
 .../jena/permissions/SecuredAssembler.java      |  264 +
 .../apache/jena/permissions/SecuredItem.java    |  253 +
 .../jena/permissions/SecurityEvaluator.java     |  424 ++
 .../permissions/SecurityEvaluatorAssembler.java |  183 +
 .../permissions/graph/SecuredCapabilities.java  |  151 +
 .../jena/permissions/graph/SecuredGraph.java    |  204 +
 .../graph/SecuredGraphEventManager.java         |  606 ++
 .../permissions/graph/SecuredPrefixMapping.java |  165 +
 .../jena/permissions/graph/impl/Factory.java    |   95 +
 .../graph/impl/SecuredGraphImpl.java            |  260 +
 .../graph/impl/SecuredPrefixMappingImpl.java    |  168 +
 .../jena/permissions/graph/package-info.java    |   50 +
 .../impl/CachedSecurityEvaluator.java           |  102 +
 .../jena/permissions/impl/ItemHolder.java       |  118 +
 .../jena/permissions/impl/SecuredItemImpl.java  |  844 +++
 .../permissions/impl/SecuredItemInvoker.java    |  148 +
 .../jena/permissions/model/SecuredAlt.java      |  350 +
 .../jena/permissions/model/SecuredBag.java      |   29 +
 .../permissions/model/SecuredContainer.java     |  296 +
 .../jena/permissions/model/SecuredLiteral.java  |  217 +
 .../jena/permissions/model/SecuredModel.java    | 1991 +++++
 .../jena/permissions/model/SecuredProperty.java |   41 +
 .../jena/permissions/model/SecuredRDFList.java  |  524 ++
 .../jena/permissions/model/SecuredRDFNode.java  |   67 +
 .../model/SecuredReifiedStatement.java          |   41 +
 .../jena/permissions/model/SecuredResource.java |  437 ++
 .../jena/permissions/model/SecuredSeq.java      |  564 ++
 .../permissions/model/SecuredStatement.java     |  377 +
 ...SecuredUnsupportedPolymorphismException.java |   41 +
 .../permissions/model/impl/SecuredAltImpl.java  |  304 +
 .../permissions/model/impl/SecuredBagImpl.java  |   81 +
 .../model/impl/SecuredContainerImpl.java        |  389 +
 .../model/impl/SecuredLiteralImpl.java          |  264 +
 .../model/impl/SecuredModelImpl.java            | 2368 ++++++
 .../model/impl/SecuredNodeIterator.java         |  143 +
 .../model/impl/SecuredPropertyImpl.java         |  118 +
 .../model/impl/SecuredRDFListImpl.java          |  810 ++
 .../model/impl/SecuredRDFNodeImpl.java          |  224 +
 .../model/impl/SecuredRSIterator.java           |  172 +
 .../model/impl/SecuredReifiedStatementImpl.java |   94 +
 .../model/impl/SecuredResIterator.java          |  133 +
 .../model/impl/SecuredResourceImpl.java         |  938 +++
 .../permissions/model/impl/SecuredSelector.java |   78 +
 .../permissions/model/impl/SecuredSeqImpl.java  |  512 ++
 .../model/impl/SecuredStatementImpl.java        |  526 ++
 .../model/impl/SecuredStatementIterator.java    |  148 +
 .../apache/jena/permissions/package-info.java   |   48 +
 .../permissions/query/SecuredQueryEngine.java   |  137 +
 .../query/SecuredQueryEngineConfig.java         |   29 +
 .../query/SecuredQueryEngineFactory.java        |  115 +
 .../permissions/query/rewriter/OpRewriter.java  |  619 ++
 .../query/rewriter/SecuredFunction.java         |  117 +
 .../jena/permissions/utils/ContainerFilter.java |   49 +
 .../permissions/utils/PermStatementFilter.java  |  156 +
 .../permissions/utils/PermTripleFilter.java     |  154 +
 .../jena/permissions/utils/RDFListIterator.java |   79 +
 .../permissions/utils/RDFListSecFilter.java     |   53 +
 jena-permissions/src/main/overview.html         |   83 +
 .../apache/jena/permissions/EqualityTester.java |   49 +
 .../jena/permissions/MockPrefixMapping.java     |  105 +
 .../jena/permissions/MockSecurityEvaluator.java |  236 +
 .../ModelBasedSecurityEvaluator.java            |   86 +
 .../jena/permissions/SecuredAssemblerTest.java  |   84 +
 .../SecurityEvaluatorParameters.java            |  135 +
 .../permissions/StaticSecurityEvaluator.java    |   88 +
 .../graph/CachedSecurityEvaluatorTest.java      |   48 +
 .../graph/SecuredGraphContractTests.java        |   51 +
 .../graph/SecuredGraphListenerTest.java         |   51 +
 .../graph/SecuredTDBGraphContractTests.java     |   51 +
 .../contract/model/ModelTestSuite.java          |  132 +
 .../contract/model/SecTestLiterals.java         |   29 +
 .../contract/model/SecTestPackage.java          |  121 +
 .../contract/model/SecTestReaderEvents.java     |   28 +
 .../contract/model/SecTestReaders.java          |   28 +
 .../graph/CrossIDGraphEventManagerTest.java     |   78 +
 .../graph/GraphEventManagerTest.java            |  126 +
 .../jena/permissions/graph/MemGraphTest.java    |  248 +
 .../graph/RecordingGraphListener.java           |  107 +
 .../graph/SecuredPrefixMappingTest.java         |  350 +
 .../jena/permissions/graph/TDBGraphTest.java    |   51 +
 .../permissions/impl/SecuredItemImplTest.java   |  232 +
 .../jena/permissions/model/SecuredAltTest.java  |  515 ++
 .../jena/permissions/model/SecuredBagTest.java  |   43 +
 .../permissions/model/SecuredContainerTest.java |  366 +
 .../permissions/model/SecuredLiteralTest.java   |  346 +
 .../model/SecuredModelDetailTest.java           |  385 +
 .../permissions/model/SecuredModelTest.java     | 1530 ++++
 .../permissions/model/SecuredPropertyTest.java  |   69 +
 .../permissions/model/SecuredRDFListTest.java   |  736 ++
 .../permissions/model/SecuredRDFNodeTest.java   |  177 +
 .../model/SecuredReifiedStatementTest.java      |   70 +
 .../permissions/model/SecuredResourceTest.java  |  626 ++
 .../jena/permissions/model/SecuredSeqTest.java  |  745 ++
 .../permissions/model/SecuredStatementTest.java |  549 ++
 .../jena/permissions/query/DataSetTest.java     |  193 +
 .../jena/permissions/query/QueryEngineTest.java |  237 +
 .../query/rewriter/OpRewriterTest.java          |  120 +
 .../src/test/resources/log4j.properties         |   15 +
 .../jena/permissions/SecuredAssemblerTest.ttl   |   56 +
 .../apache/jena/permissions/model/detail.ttl    |   33 +
 .../org/apache/jena/permissions/model/test.ttl  |    2 +
 .../org/apache/jena/permissions/model/test.xml  |    7 +
 jena-sdb/BUILD                                  |   66 -
 jena-sdb/ChangeLog.txt                          |   86 -
 jena-sdb/README.txt                             |    2 -
 jena-sdb/dist/LICENSE                           |  246 -
 jena-sdb/dist/NOTICE                            |   42 -
 jena-sdb/dist/dist.sh                           |   34 -
 jena-sdb/log4j.properties                       |    8 +-
 jena-sdb/pom.xml                                |   28 +-
 jena-sdb/sdb.ttl                                |    2 +-
 jena-sdb/src-dev/java/dbtest/DB.java            |   59 -
 jena-sdb/src-dev/java/dbtest/Params.java        |   46 -
 jena-sdb/src-dev/java/dbtest/ParamsVocab.java   |   43 -
 jena-sdb/src-dev/java/dbtest/Setup.java         |  192 -
 jena-sdb/src-dev/java/dbtest/TestBinary.java    |  123 -
 jena-sdb/src-dev/java/dbtest/TestDB.java        |   86 -
 jena-sdb/src-dev/java/dbtest/TestLongText.java  |   89 -
 jena-sdb/src-dev/java/dbtest/TestShortText.java |  105 -
 jena-sdb/src-dev/java/dbtest/dbsetuptest.java   |  124 -
 jena-sdb/src-dev/java/dev/Main.java             |   54 -
 .../src-dev/java/dev/ReportSparqlUpdate.java    |   61 -
 jena-sdb/src-dev/java/dev/RunTests.java         |   50 -
 .../java/dev/TestStores2Connections1.java       |   97 -
 jena-sdb/src-dev/java/dev/db/DBSyntax.java      |   94 -
 jena-sdb/src-dev/java/dev/db/FmtStdHash.java    |  131 -
 .../src-dev/java/dev/db/StoreFormatterStd.java  |  101 -
 jena-sdb/src-dev/java/dev/inf/TransGraph.java   |  158 -
 .../src-dev/java/dev/inf/TransGraphNode.java    |   88 -
 .../src-dev/java/dev/inf/sdbRDFSexpand.java     |   66 -
 jena-sdb/src-dev/java/dev/inf/sdbRDFSload.java  |  100 -
 jena-sdb/src-dev/java/dev/pldms/Scratch.java    |  111 -
 .../java/dev/reports/OpenCurosrOracle.java      |   87 -
 .../dev/reports/Report_ReifiedStatements.java   |   63 -
 jena-sdb/src-dev/resources/etc/daml-micro.rules |   99 -
 .../src-dev/resources/etc/dig-daml-axioms.rdf   |  370 -
 .../src-dev/resources/etc/dig-owl-axioms.rdf    |  344 -
 .../src-dev/resources/etc/location-mapping.ex   |   63 -
 .../src-dev/resources/etc/ont-policy-test.rdf   |   75 -
 jena-sdb/src-dev/resources/etc/ont-policy.rdf   |   81 -
 jena-sdb/src-dev/resources/etc/owl-b.rules      |  322 -
 .../src-dev/resources/etc/owl-fb-micro.rules    |  582 --
 .../src-dev/resources/etc/owl-fb-mini.rules     |  748 --
 jena-sdb/src-dev/resources/etc/owl-fb-old.rules |  407 -
 jena-sdb/src-dev/resources/etc/owl-fb.rules     |  786 --
 jena-sdb/src-dev/resources/etc/owl.rules        |  305 -
 .../src-dev/resources/etc/rdfs-b-tuned.rules    |  111 -
 jena-sdb/src-dev/resources/etc/rdfs-b.rules     |   90 -
 .../src-dev/resources/etc/rdfs-fb-lp-expt.rules |   91 -
 .../resources/etc/rdfs-fb-tgc-noresource.rules  |  100 -
 .../resources/etc/rdfs-fb-tgc-simple.rules      |   49 -
 .../src-dev/resources/etc/rdfs-fb-tgc.rules     |  220 -
 jena-sdb/src-dev/resources/etc/rdfs-fb.rules    |   95 -
 .../src-dev/resources/etc/rdfs-noresource.rules |   84 -
 jena-sdb/src-dev/resources/etc/rdfs.rules       |   83 -
 .../src-dev/resources/etc/schemagen_example.rdf |  135 -
 .../src-dev/resources/vocabularies/assembler.n3 |  590 --
 .../vocabularies/daml+oil-2000-12.daml          |  440 --
 .../resources/vocabularies/daml+oil.daml        |  494 --
 .../resources/vocabularies/dublin-core_11.xml   |  236 -
 .../vocabularies/dublin-core_terms.xml          | 1151 ---
 .../vocabularies/dublin-core_types.xml          |  163 -
 .../resources/vocabularies/jena-model-spec.n3   |  105 -
 .../resources/vocabularies/jenavocab.rdf        |   98 -
 .../vocabularies/location-mapping-rdfs.n3       |   33 -
 .../resources/vocabularies/ont-event.rdf        |  284 -
 .../resources/vocabularies/ont-manager.rdf      |  102 -
 jena-sdb/src-dev/resources/vocabularies/owl.owl |  279 -
 .../resources/vocabularies/rdf-schema.rdf       |  235 -
 .../resources/vocabularies/result-set.n3        |   90 -
 .../resources/vocabularies/test-manifest-x.n3   |   64 -
 .../resources/vocabularies/test-manifest.n3     |  106 -
 .../resources/vocabularies/test-query.n3        |   40 -
 jena-sdb/src-examples/sdb/examples/Ex1.java     |    8 +-
 jena-sdb/src-examples/sdb/examples/Ex2.java     |   18 +-
 .../sdb/examples/ExJdbcConnection.java          |   22 +-
 .../src-examples/sdb/examples/ExModelSDB.java   |   12 +-
 .../src/main/java/com/hp/hpl/jena/sdb/SDB.java  |  178 -
 .../java/com/hp/hpl/jena/sdb/SDBException.java  |   31 -
 .../java/com/hp/hpl/jena/sdb/SDBFactory.java    |  403 -
 .../main/java/com/hp/hpl/jena/sdb/Store.java    |   99 -
 .../java/com/hp/hpl/jena/sdb/StoreDesc.java     |  115 -
 .../hpl/jena/sdb/assembler/AssemblerVocab.java  |  129 -
 .../sdb/assembler/BadDescriptionException.java  |   31 -
 .../assembler/CommandAssemblerException.java    |   31 -
 .../sdb/assembler/DatasetStoreAssembler.java    |   57 -
 .../jena/sdb/assembler/MissingException.java    |   31 -
 .../hpl/jena/sdb/assembler/QueryAssembler.java  |   54 -
 .../assembler/SDBConnectionDescAssembler.java   |   58 -
 .../jena/sdb/assembler/SDBModelAssembler.java   |   66 -
 .../jena/sdb/assembler/StoreDescAssembler.java  |  126 -
 .../sdb/assembler/TypeNotUniqueException.java   |   31 -
 .../jena/sdb/compiler/ConditionCompiler.java    |   26 -
 .../sdb/compiler/ConditionCompilerNone.java     |   37 -
 .../com/hp/hpl/jena/sdb/compiler/OpLibSDB.java  |   59 -
 .../com/hp/hpl/jena/sdb/compiler/OpSQL.java     |  132 -
 .../hp/hpl/jena/sdb/compiler/PatternTable.java  |  180 -
 .../com/hp/hpl/jena/sdb/compiler/QuadBlock.java |  196 -
 .../jena/sdb/compiler/QuadBlockCompiler.java    |   27 -
 .../sdb/compiler/QuadBlockCompilerMain.java     |  106 -
 .../hp/hpl/jena/sdb/compiler/QueryCompiler.java |   27 -
 .../jena/sdb/compiler/QueryCompilerFactory.java |   26 -
 .../jena/sdb/compiler/QueryCompilerMain.java    |  278 -
 .../hpl/jena/sdb/compiler/QueryIterOpSQL.java   |   72 -
 .../hp/hpl/jena/sdb/compiler/SDBCompile.java    |  133 -
 .../hp/hpl/jena/sdb/compiler/SDBConstraint.java |   51 -
 .../com/hp/hpl/jena/sdb/compiler/SDB_QC.java    |  157 -
 .../hp/hpl/jena/sdb/compiler/SlotCompiler.java  |   72 -
 .../hp/hpl/jena/sdb/compiler/SqlBuilder.java    |  216 -
 .../com/hp/hpl/jena/sdb/compiler/SqlStage.java  |   27 -
 .../jena/sdb/compiler/SqlStageBasicQuad.java    |  142 -
 .../hp/hpl/jena/sdb/compiler/SqlStageList.java  |   56 -
 .../hp/hpl/jena/sdb/compiler/TransformSDB.java  |  334 -
 .../sdb/compiler/TransformSliceProject.java     |   44 -
 .../sdb/compiler/rewrite/QBR_SubProperty.java   |   59 -
 .../jena/sdb/compiler/rewrite/QBR_SubType.java  |   59 -
 .../sdb/compiler/rewrite/QuadBlockRewrite.java  |   27 -
 .../rewrite/QuadBlockRewriteCompiler.java       |   54 -
 .../com/hp/hpl/jena/sdb/core/AliasesSparql.java |   25 -
 .../com/hp/hpl/jena/sdb/core/AliasesSql.java    |   32 -
 .../com/hp/hpl/jena/sdb/core/Annotation1.java   |   53 -
 .../com/hp/hpl/jena/sdb/core/Annotations.java   |   30 -
 .../hp/hpl/jena/sdb/core/AnnotationsBase.java   |   65 -
 .../com/hp/hpl/jena/sdb/core/ExprCompile.java   |   27 -
 .../com/hp/hpl/jena/sdb/core/ExprPattern.java   |   56 -
 .../com/hp/hpl/jena/sdb/core/Generator.java     |   25 -
 .../java/com/hp/hpl/jena/sdb/core/Gensym.java   |   64 -
 .../java/com/hp/hpl/jena/sdb/core/JoinType.java |   41 -
 .../java/com/hp/hpl/jena/sdb/core/Map2.java     |   45 -
 .../com/hp/hpl/jena/sdb/core/SDBConstants.java  |   37 -
 .../com/hp/hpl/jena/sdb/core/SDBRequest.java    |   97 -
 .../java/com/hp/hpl/jena/sdb/core/Scope.java    |   32 -
 .../java/com/hp/hpl/jena/sdb/core/Scope2.java   |  121 -
 .../com/hp/hpl/jena/sdb/core/ScopeBase.java     |  120 -
 .../com/hp/hpl/jena/sdb/core/ScopeEntry.java    |  107 -
 .../com/hp/hpl/jena/sdb/core/ScopeNull.java     |   40 -
 .../com/hp/hpl/jena/sdb/core/ScopeOptional.java |   76 -
 .../com/hp/hpl/jena/sdb/core/ScopeRename.java   |  137 -
 .../com/hp/hpl/jena/sdb/core/ScopeStatus.java   |   35 -
 .../java/com/hp/hpl/jena/sdb/core/ValScope.java |   38 -
 .../com/hp/hpl/jena/sdb/core/ValueSpace.java    |   21 -
 .../com/hp/hpl/jena/sdb/core/sqlexpr/S_And.java |   27 -
 .../hp/hpl/jena/sdb/core/sqlexpr/S_Equal.java   |   27 -
 .../hpl/jena/sdb/core/sqlexpr/S_IsNotNull.java  |   27 -
 .../hp/hpl/jena/sdb/core/sqlexpr/S_IsNull.java  |   27 -
 .../hp/hpl/jena/sdb/core/sqlexpr/S_Like.java    |   53 -
 .../com/hp/hpl/jena/sdb/core/sqlexpr/S_Not.java |   28 -
 .../hpl/jena/sdb/core/sqlexpr/S_NotEqual.java   |   27 -
 .../com/hp/hpl/jena/sdb/core/sqlexpr/S_Or.java  |   27 -
 .../hp/hpl/jena/sdb/core/sqlexpr/S_Regex.java   |   49 -
 .../hp/hpl/jena/sdb/core/sqlexpr/SqlColumn.java |   69 -
 .../hpl/jena/sdb/core/sqlexpr/SqlConstant.java  |   39 -
 .../hp/hpl/jena/sdb/core/sqlexpr/SqlExpr.java   |   34 -
 .../hp/hpl/jena/sdb/core/sqlexpr/SqlExpr1.java  |   39 -
 .../hp/hpl/jena/sdb/core/sqlexpr/SqlExpr2.java  |   41 -
 .../hpl/jena/sdb/core/sqlexpr/SqlExprBase.java  |   60 -
 .../sdb/core/sqlexpr/SqlExprColumnsUsed.java    |   31 -
 .../sdb/core/sqlexpr/SqlExprGenerateSQL.java    |  162 -
 .../hpl/jena/sdb/core/sqlexpr/SqlExprList.java  |   27 -
 .../jena/sdb/core/sqlexpr/SqlExprVisitor.java   |   37 -
 .../sdb/core/sqlexpr/SqlExprVisitorBase.java    |   47 -
 .../jena/sdb/core/sqlexpr/SqlExprWalker.java    |   76 -
 .../hpl/jena/sdb/core/sqlexpr/SqlFunction1.java |   39 -
 .../hp/hpl/jena/sdb/core/sqlnode/ColAlias.java  |   68 -
 .../hpl/jena/sdb/core/sqlnode/GenerateSQL.java  |   75 -
 .../jena/sdb/core/sqlnode/GenerateSQLDB2.java   |   49 -
 .../jena/sdb/core/sqlnode/GenerateSQLDerby.java |   42 -
 .../jena/sdb/core/sqlnode/GenerateSQLMySQL.java |   69 -
 .../sdb/core/sqlnode/GenerateSQLOracle.java     |   57 -
 .../sdb/core/sqlnode/GenerateSQLVisitor.java    |  536 --
 .../jena/sdb/core/sqlnode/GenerateSQL_MS.java   |  122 -
 .../hpl/jena/sdb/core/sqlnode/SqlCoalesce.java  |  154 -
 .../hpl/jena/sdb/core/sqlnode/SqlDistinct.java  |   63 -
 .../hp/hpl/jena/sdb/core/sqlnode/SqlJoin.java   |   92 -
 .../hpl/jena/sdb/core/sqlnode/SqlJoinInner.java |   50 -
 .../jena/sdb/core/sqlnode/SqlJoinLeftOuter.java |   49 -
 .../hp/hpl/jena/sdb/core/sqlnode/SqlNode.java   |   66 -
 .../hpl/jena/sdb/core/sqlnode/SqlNodeBase.java  |  131 -
 .../hpl/jena/sdb/core/sqlnode/SqlNodeBase0.java |   29 -
 .../hpl/jena/sdb/core/sqlnode/SqlNodeBase1.java |   38 -
 .../hpl/jena/sdb/core/sqlnode/SqlNodeBase2.java |   39 -
 .../sdb/core/sqlnode/SqlNodeTextVisitor.java    |  328 -
 .../jena/sdb/core/sqlnode/SqlNodeVisitor.java   |   39 -
 .../sdb/core/sqlnode/SqlNodeVisitorBase.java    |   61 -
 .../jena/sdb/core/sqlnode/SqlNodeWalker.java    |   96 -
 .../hpl/jena/sdb/core/sqlnode/SqlProject.java   |  127 -
 .../hp/hpl/jena/sdb/core/sqlnode/SqlRename.java |  112 -
 .../hpl/jena/sdb/core/sqlnode/SqlRestrict.java  |  119 -
 .../jena/sdb/core/sqlnode/SqlSelectBlock.java   |  321 -
 .../hp/hpl/jena/sdb/core/sqlnode/SqlSlice.java  |   57 -
 .../hp/hpl/jena/sdb/core/sqlnode/SqlTable.java  |  125 -
 .../hpl/jena/sdb/core/sqlnode/SqlTransform.java |   45 -
 .../jena/sdb/core/sqlnode/SqlTransformCopy.java |   95 -
 .../jena/sdb/core/sqlnode/SqlTransformer.java   |  119 -
 .../hp/hpl/jena/sdb/core/sqlnode/SqlUnion.java  |   54 -
 .../hp/hpl/jena/sdb/engine/QueryEngineSDB.java  |  202 -
 .../hp/hpl/jena/sdb/exprmatch/ActionMatch.java  |   35 -
 .../hpl/jena/sdb/exprmatch/ActionMatchBind.java |   32 -
 .../jena/sdb/exprmatch/ActionMatchExact.java    |   47 -
 .../jena/sdb/exprmatch/ActionMatchNoBind.java   |   29 -
 .../jena/sdb/exprmatch/ActionMatchNumeric.java  |   33 -
 .../jena/sdb/exprmatch/ActionMatchString.java   |   40 -
 .../hpl/jena/sdb/exprmatch/ActionMatchVar.java  |   33 -
 .../hp/hpl/jena/sdb/exprmatch/ActionReject.java |   32 -
 .../hp/hpl/jena/sdb/exprmatch/ExprMatcher.java  |  194 -
 .../hpl/jena/sdb/exprmatch/FunctionAction.java  |   28 -
 .../hp/hpl/jena/sdb/exprmatch/MapAction.java    |   25 -
 .../hp/hpl/jena/sdb/exprmatch/MapCallout.java   |   23 -
 .../hp/hpl/jena/sdb/exprmatch/MapResult.java    |   37 -
 .../hp/hpl/jena/sdb/exprmatch/NoExprMatch.java  |   28 -
 .../hp/hpl/jena/sdb/graph/EventManagerSDB.java  |   49 -
 .../com/hp/hpl/jena/sdb/graph/GraphSDB.java     |  317 -
 .../hp/hpl/jena/sdb/graph/PrefixMappingSDB.java |  219 -
 .../jena/sdb/graph/TransactionHandlerSDB.java   |  122 -
 .../hp/hpl/jena/sdb/graph/UpdateHandlerSDB.java |  113 -
 .../hp/hpl/jena/sdb/layout1/CodecSimple.java    |   67 -
 .../hp/hpl/jena/sdb/layout1/EncoderDecoder.java |   27 -
 .../hpl/jena/sdb/layout1/FormatterSimple.java   |   58 -
 .../jena/sdb/layout1/FormatterSimpleDB2.java    |  147 -
 .../jena/sdb/layout1/FormatterSimpleDerby.java  |  119 -
 .../hpl/jena/sdb/layout1/FormatterSimpleH2.java |  133 -
 .../jena/sdb/layout1/FormatterSimpleHSQL.java   |  123 -
 .../jena/sdb/layout1/FormatterSimpleMySQL.java  |  149 -
 .../jena/sdb/layout1/FormatterSimpleOracle.java |  144 -
 .../jena/sdb/layout1/FormatterSimplePGSQL.java  |  132 -
 .../jena/sdb/layout1/FormatterSimpleSAP.java    |  137 -
 .../sdb/layout1/FormatterSimpleSQLServer.java   |  143 -
 .../hp/hpl/jena/sdb/layout1/QueryCompiler1.java |   53 -
 .../jena/sdb/layout1/QueryCompilerFactory1.java |   40 -
 .../com/hp/hpl/jena/sdb/layout1/SQLBridge1.java |  104 -
 .../hpl/jena/sdb/layout1/SQLBridgeFactory1.java |   45 -
 .../hp/hpl/jena/sdb/layout1/SlotCompiler1.java  |   57 -
 .../com/hp/hpl/jena/sdb/layout1/StoreBase1.java |  134 -
 .../hp/hpl/jena/sdb/layout1/StoreSimpleDB2.java |   44 -
 .../hpl/jena/sdb/layout1/StoreSimpleDerby.java  |   44 -
 .../hp/hpl/jena/sdb/layout1/StoreSimpleH2.java  |   47 -
 .../hpl/jena/sdb/layout1/StoreSimpleHSQL.java   |   57 -
 .../hpl/jena/sdb/layout1/StoreSimpleMySQL.java  |   55 -
 .../hpl/jena/sdb/layout1/StoreSimpleOracle.java |   44 -
 .../hpl/jena/sdb/layout1/StoreSimplePGSQL.java  |   47 -
 .../hp/hpl/jena/sdb/layout1/StoreSimpleSAP.java |   54 -
 .../jena/sdb/layout1/StoreSimpleSQLServer.java  |   46 -
 .../hp/hpl/jena/sdb/layout1/TableDescSPO.java   |   30 -
 .../hpl/jena/sdb/layout1/TupleLoaderSimple.java |   56 -
 .../jena/sdb/layout2/ConditionCompiler2.java    |   55 -
 .../com/hp/hpl/jena/sdb/layout2/FmtLayout2.java |  150 -
 .../com/hp/hpl/jena/sdb/layout2/LoaderFmt.java  |   35 -
 .../hpl/jena/sdb/layout2/LoaderTuplesNodes.java |  377 -
 .../hp/hpl/jena/sdb/layout2/NodeLayout2.java    |  138 -
 .../jena/sdb/layout2/QuadBlockCompiler2.java    |   82 -
 .../hp/hpl/jena/sdb/layout2/QueryCompiler2.java |  181 -
 .../com/hp/hpl/jena/sdb/layout2/SQLBridge2.java |  259 -
 .../hpl/jena/sdb/layout2/SQLBridge2Oracle.java  |   82 -
 .../hpl/jena/sdb/layout2/SQLBridgeFactory2.java |   40 -
 .../sdb/layout2/SQLBridgeFactory2Oracle.java    |   37 -
 .../hp/hpl/jena/sdb/layout2/SlotCompiler2.java  |   45 -
 .../com/hp/hpl/jena/sdb/layout2/StoreBase.java  |  158 -
 .../hp/hpl/jena/sdb/layout2/TableDescNodes.java |   61 -
 .../hp/hpl/jena/sdb/layout2/TableDescQuads.java |   56 -
 .../hpl/jena/sdb/layout2/TableDescTriples.java  |   33 -
 .../hp/hpl/jena/sdb/layout2/TablePrefixes.java  |   31 -
 .../hpl/jena/sdb/layout2/TupleLoaderBase.java   |  498 --
 .../hpl/jena/sdb/layout2/TupleLoaderBasics.java |   31 -
 .../com/hp/hpl/jena/sdb/layout2/ValueType.java  |  166 -
 .../com/hp/hpl/jena/sdb/layout2/VarState.java   |   27 -
 .../jena/sdb/layout2/expr/RegexCompiler.java    |  133 -
 .../sdb/layout2/expr/StringExprCompiler.java    |  134 -
 .../sdb/layout2/hash/FmtLayout2HashDB2.java     |  128 -
 .../sdb/layout2/hash/FmtLayout2HashDerby.java   |  120 -
 .../jena/sdb/layout2/hash/FmtLayout2HashH2.java |  126 -
 .../sdb/layout2/hash/FmtLayout2HashHSQL.java    |  149 -
 .../sdb/layout2/hash/FmtLayout2HashMySQL.java   |  157 -
 .../sdb/layout2/hash/FmtLayout2HashOracle.java  |  130 -
 .../sdb/layout2/hash/FmtLayout2HashPGSQL.java   |  125 -
 .../sdb/layout2/hash/FmtLayout2HashSAP.java     |  129 -
 .../layout2/hash/FmtLayout2HashSQLServer.java   |  121 -
 .../layout2/hash/QueryCompilerFactoryHash.java  |   33 -
 .../sdb/layout2/hash/QueryCompilerHash.java     |   38 -
 .../jena/sdb/layout2/hash/SlotCompilerHash.java |   45 -
 .../jena/sdb/layout2/hash/StoreBaseHash.java    |   90 -
 .../layout2/hash/StoreTriplesNodesHashDB2.java  |   65 -
 .../hash/StoreTriplesNodesHashDerby.java        |   42 -
 .../layout2/hash/StoreTriplesNodesHashH2.java   |   41 -
 .../layout2/hash/StoreTriplesNodesHashHSQL.java |   54 -
 .../hash/StoreTriplesNodesHashMySQL.java        |   49 -
 .../hash/StoreTriplesNodesHashOracle.java       |   41 -
 .../hash/StoreTriplesNodesHashPGSQL.java        |   41 -
 .../layout2/hash/StoreTriplesNodesHashSAP.java  |   48 -
 .../hash/StoreTriplesNodesHashSQLServer.java    |   41 -
 .../jena/sdb/layout2/hash/TableNodesHash.java   |   36 -
 .../sdb/layout2/hash/TupleLoaderHashBase.java   |   82 -
 .../sdb/layout2/hash/TupleLoaderHashDB2.java    |   67 -
 .../sdb/layout2/hash/TupleLoaderHashDerby.java  |   65 -
 .../sdb/layout2/hash/TupleLoaderHashH2.java     |   61 -
 .../sdb/layout2/hash/TupleLoaderHashHSQL.java   |   49 -
 .../sdb/layout2/hash/TupleLoaderHashMySQL.java  |   74 -
 .../sdb/layout2/hash/TupleLoaderHashOracle.java |   59 -
 .../sdb/layout2/hash/TupleLoaderHashPGSQL.java  |   65 -
 .../sdb/layout2/hash/TupleLoaderHashSAP.java    |   54 -
 .../layout2/hash/TupleLoaderHashSQLServer.java  |   59 -
 .../sdb/layout2/hash/TupleLoaderOneHash.java    |  105 -
 .../sdb/layout2/index/FmtLayout2IndexDB2.java   |  144 -
 .../sdb/layout2/index/FmtLayout2IndexDerby.java |  123 -
 .../sdb/layout2/index/FmtLayout2IndexH2.java    |   96 -
 .../sdb/layout2/index/FmtLayout2IndexHSQL.java  |  101 -
 .../sdb/layout2/index/FmtLayout2IndexMySQL.java |  101 -
 .../layout2/index/FmtLayout2IndexOracle.java    |  129 -
 .../sdb/layout2/index/FmtLayout2IndexPGSQL.java |   96 -
 .../sdb/layout2/index/FmtLayout2IndexSAP.java   |  106 -
 .../layout2/index/FmtLayout2IndexSQLServer.java |   96 -
 .../hpl/jena/sdb/layout2/index/IndexCache.java  |   89 -
 .../index/QueryCompilerFactoryIndex.java        |   33 -
 .../sdb/layout2/index/QueryCompilerIndex.java   |   37 -
 .../sdb/layout2/index/SlotCompilerIndex.java    |  163 -
 .../jena/sdb/layout2/index/StoreBaseIndex.java  |  101 -
 .../index/StoreTriplesNodesIndexDB2.java        |   41 -
 .../index/StoreTriplesNodesIndexDerby.java      |   41 -
 .../layout2/index/StoreTriplesNodesIndexH2.java |   40 -
 .../index/StoreTriplesNodesIndexHSQL.java       |   48 -
 .../index/StoreTriplesNodesIndexMySQL.java      |   47 -
 .../index/StoreTriplesNodesIndexOracle.java     |   41 -
 .../index/StoreTriplesNodesIndexPGSQL.java      |   40 -
 .../index/StoreTriplesNodesIndexSAP.java        |   47 -
 .../index/StoreTriplesNodesIndexSQLServer.java  |   40 -
 .../jena/sdb/layout2/index/TableNodesIndex.java |   37 -
 .../sdb/layout2/index/TupleLoaderIndexBase.java |   88 -
 .../sdb/layout2/index/TupleLoaderIndexDB2.java  |  105 -
 .../layout2/index/TupleLoaderIndexDerby.java    |   65 -
 .../sdb/layout2/index/TupleLoaderIndexH2.java   |   62 -
 .../sdb/layout2/index/TupleLoaderIndexHSQL.java |   49 -
 .../layout2/index/TupleLoaderIndexMySQL.java    |  109 -
 .../layout2/index/TupleLoaderIndexOracle.java   |   99 -
 .../layout2/index/TupleLoaderIndexPGSQL.java    |   65 -
 .../sdb/layout2/index/TupleLoaderIndexSAP.java  |   62 -
 .../index/TupleLoaderIndexSQLServer.java        |   58 -
 .../sdb/layout2/index/TupleLoaderOneIndex.java  |  146 -
 .../hp/hpl/jena/sdb/modify/UpdateEngineSDB.java |   58 -
 .../com/hp/hpl/jena/sdb/print/StreamsPrint.java |   56 -
 .../com/hp/hpl/jena/sdb/script/CmdDesc.java     |  126 -
 .../hpl/jena/sdb/script/CmdDescAssembler.java   |  100 -
 .../java/com/hp/hpl/jena/sdb/script/QExec.java  |   45 -
 .../jena/sdb/script/QueryCommandAssembler.java  |   62 -
 .../hp/hpl/jena/sdb/script/ScriptAssembler.java |   63 -
 .../com/hp/hpl/jena/sdb/script/ScriptDesc.java  |   71 -
 .../com/hp/hpl/jena/sdb/script/ScriptVocab.java |   62 -
 .../java/com/hp/hpl/jena/sdb/shared/Access.java |   41 -
 .../java/com/hp/hpl/jena/sdb/shared/Env.java    |   65 -
 .../hpl/jena/sdb/shared/SDBInternalError.java   |   28 -
 .../jena/sdb/shared/SDBNotFoundException.java   |   29 -
 .../hpl/jena/sdb/shared/SDBNotImplemented.java  |   28 -
 .../hp/hpl/jena/sdb/shared/SymbolRegistry.java  |   62 -
 .../com/hp/hpl/jena/sdb/sql/DataSourceSDB.java  |   96 -
 .../com/hp/hpl/jena/sdb/sql/FunctionsSQL.java   |   82 -
 .../main/java/com/hp/hpl/jena/sdb/sql/JDBC.java |  212 -
 .../hp/hpl/jena/sdb/sql/MySQLEngineType.java    |   49 -
 .../main/java/com/hp/hpl/jena/sdb/sql/RS.java   |  238 -
 .../com/hp/hpl/jena/sdb/sql/ResultSetJDBC.java  |   61 -
 .../com/hp/hpl/jena/sdb/sql/SAPStorageType.java |   39 -
 .../com/hp/hpl/jena/sdb/sql/SDBConnection.java  |  349 -
 .../hp/hpl/jena/sdb/sql/SDBConnectionDesc.java  |  161 -
 .../hpl/jena/sdb/sql/SDBConnectionFactory.java  |  131 -
 .../hpl/jena/sdb/sql/SDBConnectionHolder.java   |   33 -
 .../hp/hpl/jena/sdb/sql/SDBExceptionSQL.java    |   30 -
 .../com/hp/hpl/jena/sdb/sql/SQLCommand.java     |   27 -
 .../java/com/hp/hpl/jena/sdb/sql/SQLUtils.java  |   53 -
 .../com/hp/hpl/jena/sdb/sql/SQLUtilsStd.java    |   83 -
 .../java/com/hp/hpl/jena/sdb/sql/TableDump.java |  213 -
 .../com/hp/hpl/jena/sdb/sql/TableUtils.java     |  135 -
 .../com/hp/hpl/jena/sdb/store/ConfigVocab.java  |   34 -
 .../com/hp/hpl/jena/sdb/store/DatabaseType.java |  135 -
 .../hp/hpl/jena/sdb/store/DatasetGraphSDB.java  |  134 -
 .../com/hp/hpl/jena/sdb/store/DatasetStore.java |   46 -
 .../java/com/hp/hpl/jena/sdb/store/Feature.java |  124 -
 .../com/hp/hpl/jena/sdb/store/FeatureSet.java   |   67 -
 .../com/hp/hpl/jena/sdb/store/LayoutType.java   |   95 -
 .../com/hp/hpl/jena/sdb/store/SQLBridge.java    |   44 -
 .../hp/hpl/jena/sdb/store/SQLBridgeBase.java    |  207 -
 .../hp/hpl/jena/sdb/store/SQLBridgeFactory.java |   37 -
 .../com/hp/hpl/jena/sdb/store/SQLGenerator.java |   27 -
 .../com/hp/hpl/jena/sdb/store/StoreBaseH2.java  |   82 -
 .../hp/hpl/jena/sdb/store/StoreBaseHSQL.java    |   83 -
 .../com/hp/hpl/jena/sdb/store/StoreConfig.java  |  326 -
 .../com/hp/hpl/jena/sdb/store/StoreFactory.java |  361 -
 .../hp/hpl/jena/sdb/store/StoreFormatter.java   |   41 -
 .../hpl/jena/sdb/store/StoreFormatterBase.java  |   41 -
 .../com/hp/hpl/jena/sdb/store/StoreHolder.java  |   34 -
 .../com/hp/hpl/jena/sdb/store/StoreLoader.java  |   38 -
 .../hp/hpl/jena/sdb/store/StoreLoaderPlus.java  |   29 -
 .../com/hp/hpl/jena/sdb/store/StoreMaker.java   |   33 -
 .../com/hp/hpl/jena/sdb/store/TableDesc.java    |   67 -
 .../hp/hpl/jena/sdb/store/TupleGraphLoader.java |   94 -
 .../com/hp/hpl/jena/sdb/store/TupleLoader.java  |   65 -
 .../hp/hpl/jena/sdb/store/TupleLoaderBase.java  |   80 -
 .../hp/hpl/jena/sdb/store/TupleLoaderOne.java   |  186 -
 .../com/hp/hpl/jena/sdb/store/TupleTable.java   |  131 -
 .../com/hp/hpl/jena/sdb/util/DerbyUtils.java    |   29 -
 .../java/com/hp/hpl/jena/sdb/util/H2Utils.java  |   51 -
 .../com/hp/hpl/jena/sdb/util/HSQLUtils.java     |   51 -
 .../java/com/hp/hpl/jena/sdb/util/Pair.java     |   61 -
 .../java/com/hp/hpl/jena/sdb/util/PrintSDB.java |  134 -
 .../com/hp/hpl/jena/sdb/util/RegexUtils.java    |  107 -
 .../com/hp/hpl/jena/sdb/util/StoreUtils.java    |  193 -
 .../java/com/hp/hpl/jena/sdb/util/StrUtils.java |   51 -
 .../java/com/hp/hpl/jena/sdb/util/Vocab.java    |   41 -
 .../src/main/java/org/apache/jena/sdb/SDB.java  |  179 +
 .../java/org/apache/jena/sdb/SDBException.java  |   31 +
 .../java/org/apache/jena/sdb/SDBFactory.java    |  462 ++
 .../main/java/org/apache/jena/sdb/Store.java    |   98 +
 .../java/org/apache/jena/sdb/StoreDesc.java     |  112 +
 .../jena/sdb/assembler/AssemblerVocab.java      |  129 +
 .../sdb/assembler/BadDescriptionException.java  |   31 +
 .../assembler/CommandAssemblerException.java    |   31 +
 .../sdb/assembler/DatasetStoreAssembler.java    |   57 +
 .../jena/sdb/assembler/MissingException.java    |   31 +
 .../jena/sdb/assembler/QueryAssembler.java      |   52 +
 .../assembler/SDBConnectionDescAssembler.java   |   56 +
 .../jena/sdb/assembler/SDBModelAssembler.java   |   64 +
 .../jena/sdb/assembler/StoreDescAssembler.java  |  122 +
 .../sdb/assembler/TypeNotUniqueException.java   |   31 +
 .../jena/sdb/compiler/ConditionCompiler.java    |   26 +
 .../sdb/compiler/ConditionCompilerNone.java     |   37 +
 .../org/apache/jena/sdb/compiler/OpLibSDB.java  |   54 +
 .../org/apache/jena/sdb/compiler/OpSQL.java     |  131 +
 .../apache/jena/sdb/compiler/PatternTable.java  |  179 +
 .../org/apache/jena/sdb/compiler/QuadBlock.java |  195 +
 .../jena/sdb/compiler/QuadBlockCompiler.java    |   27 +
 .../sdb/compiler/QuadBlockCompilerMain.java     |  105 +
 .../apache/jena/sdb/compiler/QueryCompiler.java |   27 +
 .../jena/sdb/compiler/QueryCompilerFactory.java |   26 +
 .../jena/sdb/compiler/QueryCompilerMain.java    |  268 +
 .../jena/sdb/compiler/QueryIterOpSQL.java       |   72 +
 .../apache/jena/sdb/compiler/SDBCompile.java    |  133 +
 .../apache/jena/sdb/compiler/SDBConstraint.java |   51 +
 .../org/apache/jena/sdb/compiler/SDB_QC.java    |  147 +
 .../apache/jena/sdb/compiler/SlotCompiler.java  |   71 +
 .../apache/jena/sdb/compiler/SqlBuilder.java    |  215 +
 .../org/apache/jena/sdb/compiler/SqlStage.java  |   27 +
 .../jena/sdb/compiler/SqlStageBasicQuad.java    |  141 +
 .../apache/jena/sdb/compiler/SqlStageList.java  |   56 +
 .../apache/jena/sdb/compiler/TransformSDB.java  |  324 +
 .../sdb/compiler/TransformSliceProject.java     |   44 +
 .../sdb/compiler/rewrite/QBR_SubProperty.java   |   59 +
 .../jena/sdb/compiler/rewrite/QBR_SubType.java  |   59 +
 .../sdb/compiler/rewrite/QuadBlockRewrite.java  |   27 +
 .../rewrite/QuadBlockRewriteCompiler.java       |   54 +
 .../org/apache/jena/sdb/core/AliasesSparql.java |   25 +
 .../org/apache/jena/sdb/core/AliasesSql.java    |   32 +
 .../org/apache/jena/sdb/core/Annotation1.java   |   53 +
 .../org/apache/jena/sdb/core/Annotations.java   |   30 +
 .../apache/jena/sdb/core/AnnotationsBase.java   |   65 +
 .../org/apache/jena/sdb/core/ExprCompile.java   |   27 +
 .../org/apache/jena/sdb/core/ExprPattern.java   |   56 +
 .../org/apache/jena/sdb/core/Generator.java     |   25 +
 .../java/org/apache/jena/sdb/core/Gensym.java   |   64 +
 .../java/org/apache/jena/sdb/core/JoinType.java |   41 +
 .../java/org/apache/jena/sdb/core/Map2.java     |   45 +
 .../org/apache/jena/sdb/core/SDBConstants.java  |   37 +
 .../org/apache/jena/sdb/core/SDBRequest.java    |   97 +
 .../java/org/apache/jena/sdb/core/Scope.java    |   32 +
 .../java/org/apache/jena/sdb/core/Scope2.java   |  121 +
 .../org/apache/jena/sdb/core/ScopeBase.java     |  119 +
 .../org/apache/jena/sdb/core/ScopeEntry.java    |   88 +
 .../org/apache/jena/sdb/core/ScopeNull.java     |   40 +
 .../org/apache/jena/sdb/core/ScopeOptional.java |   75 +
 .../org/apache/jena/sdb/core/ScopeRename.java   |  115 +
 .../org/apache/jena/sdb/core/ScopeStatus.java   |   35 +
 .../java/org/apache/jena/sdb/core/ValScope.java |   38 +
 .../org/apache/jena/sdb/core/ValueSpace.java    |   21 +
 .../org/apache/jena/sdb/core/sqlexpr/S_And.java |   27 +
 .../apache/jena/sdb/core/sqlexpr/S_Equal.java   |   27 +
 .../jena/sdb/core/sqlexpr/S_IsNotNull.java      |   27 +
 .../apache/jena/sdb/core/sqlexpr/S_IsNull.java  |   27 +
 .../apache/jena/sdb/core/sqlexpr/S_Like.java    |   53 +
 .../org/apache/jena/sdb/core/sqlexpr/S_Not.java |   28 +
 .../jena/sdb/core/sqlexpr/S_NotEqual.java       |   27 +
 .../org/apache/jena/sdb/core/sqlexpr/S_Or.java  |   27 +
 .../apache/jena/sdb/core/sqlexpr/S_Regex.java   |   49 +
 .../apache/jena/sdb/core/sqlexpr/SqlColumn.java |   69 +
 .../jena/sdb/core/sqlexpr/SqlConstant.java      |   39 +
 .../apache/jena/sdb/core/sqlexpr/SqlExpr.java   |   34 +
 .../apache/jena/sdb/core/sqlexpr/SqlExpr1.java  |   39 +
 .../apache/jena/sdb/core/sqlexpr/SqlExpr2.java  |   41 +
 .../jena/sdb/core/sqlexpr/SqlExprBase.java      |   60 +
 .../sdb/core/sqlexpr/SqlExprColumnsUsed.java    |   31 +
 .../sdb/core/sqlexpr/SqlExprGenerateSQL.java    |  161 +
 .../jena/sdb/core/sqlexpr/SqlExprList.java      |   27 +
 .../jena/sdb/core/sqlexpr/SqlExprVisitor.java   |   37 +
 .../sdb/core/sqlexpr/SqlExprVisitorBase.java    |   47 +
 .../jena/sdb/core/sqlexpr/SqlExprWalker.java    |   76 +
 .../jena/sdb/core/sqlexpr/SqlFunction1.java     |   39 +
 .../apache/jena/sdb/core/sqlnode/ColAlias.java  |   68 +
 .../jena/sdb/core/sqlnode/GenerateSQL.java      |   75 +
 .../jena/sdb/core/sqlnode/GenerateSQLDB2.java   |   49 +
 .../jena/sdb/core/sqlnode/GenerateSQLDerby.java |   42 +
 .../jena/sdb/core/sqlnode/GenerateSQLMySQL.java |   69 +
 .../sdb/core/sqlnode/GenerateSQLOracle.java     |   57 +
 .../sdb/core/sqlnode/GenerateSQLVisitor.java    |  528 ++
 .../jena/sdb/core/sqlnode/GenerateSQL_MS.java   |  122 +
 .../jena/sdb/core/sqlnode/SqlCoalesce.java      |  149 +
 .../jena/sdb/core/sqlnode/SqlDistinct.java      |   63 +
 .../apache/jena/sdb/core/sqlnode/SqlJoin.java   |   91 +
 .../jena/sdb/core/sqlnode/SqlJoinInner.java     |   50 +
 .../jena/sdb/core/sqlnode/SqlJoinLeftOuter.java |   49 +
 .../apache/jena/sdb/core/sqlnode/SqlNode.java   |   65 +
 .../jena/sdb/core/sqlnode/SqlNodeBase.java      |  131 +
 .../jena/sdb/core/sqlnode/SqlNodeBase0.java     |   29 +
 .../jena/sdb/core/sqlnode/SqlNodeBase1.java     |   38 +
 .../jena/sdb/core/sqlnode/SqlNodeBase2.java     |   39 +
 .../sdb/core/sqlnode/SqlNodeTextVisitor.java    |  327 +
 .../jena/sdb/core/sqlnode/SqlNodeVisitor.java   |   39 +
 .../sdb/core/sqlnode/SqlNodeVisitorBase.java    |   61 +
 .../jena/sdb/core/sqlnode/SqlNodeWalker.java    |   96 +
 .../jena/sdb/core/sqlnode/SqlProject.java       |  127 +
 .../apache/jena/sdb/core/sqlnode/SqlRename.java |  111 +
 .../jena/sdb/core/sqlnode/SqlRestrict.java      |  119 +
 .../jena/sdb/core/sqlnode/SqlSelectBlock.java   |  321 +
 .../apache/jena/sdb/core/sqlnode/SqlSlice.java  |   57 +
 .../apache/jena/sdb/core/sqlnode/SqlTable.java  |  125 +
 .../jena/sdb/core/sqlnode/SqlTransform.java     |   45 +
 .../jena/sdb/core/sqlnode/SqlTransformCopy.java |   95 +
 .../jena/sdb/core/sqlnode/SqlTransformer.java   |  119 +
 .../apache/jena/sdb/core/sqlnode/SqlUnion.java  |   54 +
 .../apache/jena/sdb/engine/QueryEngineSDB.java  |  196 +
 .../apache/jena/sdb/exprmatch/ActionMatch.java  |   35 +
 .../jena/sdb/exprmatch/ActionMatchBind.java     |   32 +
 .../jena/sdb/exprmatch/ActionMatchExact.java    |   47 +
 .../jena/sdb/exprmatch/ActionMatchNoBind.java   |   29 +
 .../jena/sdb/exprmatch/ActionMatchNumeric.java  |   33 +
 .../jena/sdb/exprmatch/ActionMatchString.java   |   40 +
 .../jena/sdb/exprmatch/ActionMatchVar.java      |   33 +
 .../apache/jena/sdb/exprmatch/ActionReject.java |   32 +
 .../apache/jena/sdb/exprmatch/ExprMatcher.java  |  194 +
 .../jena/sdb/exprmatch/FunctionAction.java      |   28 +
 .../apache/jena/sdb/exprmatch/MapAction.java    |   25 +
 .../apache/jena/sdb/exprmatch/MapCallout.java   |   23 +
 .../apache/jena/sdb/exprmatch/MapResult.java    |   37 +
 .../apache/jena/sdb/exprmatch/NoExprMatch.java  |   28 +
 .../apache/jena/sdb/graph/EventManagerSDB.java  |   48 +
 .../org/apache/jena/sdb/graph/GraphSDB.java     |  308 +
 .../apache/jena/sdb/graph/PrefixMappingSDB.java |  218 +
 .../jena/sdb/graph/TransactionHandlerSDB.java   |  121 +
 .../apache/jena/sdb/layout1/CodecSimple.java    |   65 +
 .../apache/jena/sdb/layout1/EncoderDecoder.java |   27 +
 .../jena/sdb/layout1/FormatterSimple.java       |   58 +
 .../jena/sdb/layout1/FormatterSimpleDB2.java    |  146 +
 .../jena/sdb/layout1/FormatterSimpleDerby.java  |  118 +
 .../jena/sdb/layout1/FormatterSimpleH2.java     |  132 +
 .../jena/sdb/layout1/FormatterSimpleHSQL.java   |  122 +
 .../jena/sdb/layout1/FormatterSimpleMySQL.java  |  148 +
 .../jena/sdb/layout1/FormatterSimpleOracle.java |  143 +
 .../jena/sdb/layout1/FormatterSimplePGSQL.java  |  131 +
 .../jena/sdb/layout1/FormatterSimpleSAP.java    |  136 +
 .../sdb/layout1/FormatterSimpleSQLServer.java   |  142 +
 .../apache/jena/sdb/layout1/QueryCompiler1.java |   53 +
 .../jena/sdb/layout1/QueryCompilerFactory1.java |   40 +
 .../org/apache/jena/sdb/layout1/SQLBridge1.java |  104 +
 .../jena/sdb/layout1/SQLBridgeFactory1.java     |   44 +
 .../apache/jena/sdb/layout1/SlotCompiler1.java  |   56 +
 .../org/apache/jena/sdb/layout1/StoreBase1.java |  133 +
 .../apache/jena/sdb/layout1/StoreSimpleDB2.java |   44 +
 .../jena/sdb/layout1/StoreSimpleDerby.java      |   44 +
 .../apache/jena/sdb/layout1/StoreSimpleH2.java  |   47 +
 .../jena/sdb/layout1/StoreSimpleHSQL.java       |   57 +
 .../jena/sdb/layout1/StoreSimpleMySQL.java      |   55 +
 .../jena/sdb/layout1/StoreSimpleOracle.java     |   44 +
 .../jena/sdb/layout1/StoreSimplePGSQL.java      |   47 +
 .../apache/jena/sdb/layout1/StoreSimpleSAP.java |   54 +
 .../jena/sdb/layout1/StoreSimpleSQLServer.java  |   46 +
 .../apache/jena/sdb/layout1/TableDescSPO.java   |   30 +
 .../jena/sdb/layout1/TupleLoaderSimple.java     |   53 +
 .../jena/sdb/layout2/ConditionCompiler2.java    |   53 +
 .../org/apache/jena/sdb/layout2/FmtLayout2.java |  150 +
 .../org/apache/jena/sdb/layout2/LoaderFmt.java  |   35 +
 .../jena/sdb/layout2/LoaderTuplesNodes.java     |  376 +
 .../apache/jena/sdb/layout2/NodeLayout2.java    |  137 +
 .../jena/sdb/layout2/QuadBlockCompiler2.java    |   82 +
 .../apache/jena/sdb/layout2/QueryCompiler2.java |  181 +
 .../org/apache/jena/sdb/layout2/SQLBridge2.java |  257 +
 .../jena/sdb/layout2/SQLBridge2Oracle.java      |   82 +
 .../jena/sdb/layout2/SQLBridgeFactory2.java     |   39 +
 .../sdb/layout2/SQLBridgeFactory2Oracle.java    |   37 +
 .../apache/jena/sdb/layout2/SlotCompiler2.java  |   44 +
 .../org/apache/jena/sdb/layout2/StoreBase.java  |  158 +
 .../apache/jena/sdb/layout2/TableDescNodes.java |   61 +
 .../apache/jena/sdb/layout2/TableDescQuads.java |   56 +
 .../jena/sdb/layout2/TableDescTriples.java      |   33 +
 .../apache/jena/sdb/layout2/TablePrefixes.java  |   31 +
 .../jena/sdb/layout2/TupleLoaderBase.java       |  498 ++
 .../jena/sdb/layout2/TupleLoaderBasics.java     |   31 +
 .../org/apache/jena/sdb/layout2/ValueType.java  |  166 +
 .../org/apache/jena/sdb/layout2/VarState.java   |   27 +
 .../jena/sdb/layout2/expr/RegexCompiler.java    |  132 +
 .../sdb/layout2/expr/StringExprCompiler.java    |  133 +
 .../sdb/layout2/hash/FmtLayout2HashDB2.java     |  124 +
 .../sdb/layout2/hash/FmtLayout2HashDerby.java   |  116 +
 .../jena/sdb/layout2/hash/FmtLayout2HashH2.java |  122 +
 .../sdb/layout2/hash/FmtLayout2HashHSQL.java    |  144 +
 .../sdb/layout2/hash/FmtLayout2HashMySQL.java   |  152 +
 .../sdb/layout2/hash/FmtLayout2HashOracle.java  |  126 +
 .../sdb/layout2/hash/FmtLayout2HashPGSQL.java   |  121 +
 .../sdb/layout2/hash/FmtLayout2HashSAP.java     |  125 +
 .../layout2/hash/FmtLayout2HashSQLServer.java   |  117 +
 .../layout2/hash/QueryCompilerFactoryHash.java  |   33 +
 .../sdb/layout2/hash/QueryCompilerHash.java     |   38 +
 .../jena/sdb/layout2/hash/SlotCompilerHash.java |   45 +
 .../jena/sdb/layout2/hash/StoreBaseHash.java    |   90 +
 .../layout2/hash/StoreTriplesNodesHashDB2.java  |   65 +
 .../hash/StoreTriplesNodesHashDerby.java        |   42 +
 .../layout2/hash/StoreTriplesNodesHashH2.java   |   41 +
 .../layout2/hash/StoreTriplesNodesHashHSQL.java |   54 +
 .../hash/StoreTriplesNodesHashMySQL.java        |   49 +
 .../hash/StoreTriplesNodesHashOracle.java       |   41 +
 .../hash/StoreTriplesNodesHashPGSQL.java        |   41 +
 .../layout2/hash/StoreTriplesNodesHashSAP.java  |   48 +
 .../hash/StoreTriplesNodesHashSQLServer.java    |   41 +
 .../jena/sdb/layout2/hash/TableNodesHash.java   |   36 +
 .../sdb/layout2/hash/TupleLoaderHashBase.java   |   82 +
 .../sdb/layout2/hash/TupleLoaderHashDB2.java    |   66 +
 .../sdb/layout2/hash/TupleLoaderHashDerby.java  |   64 +
 .../sdb/layout2/hash/TupleLoaderHashH2.java     |   61 +
 .../sdb/layout2/hash/TupleLoaderHashHSQL.java   |   49 +
 .../sdb/layout2/hash/TupleLoaderHashMySQL.java  |   74 +
 .../sdb/layout2/hash/TupleLoaderHashOracle.java |   58 +
 .../sdb/layout2/hash/TupleLoaderHashPGSQL.java  |   65 +
 .../sdb/layout2/hash/TupleLoaderHashSAP.java    |   54 +
 .../layout2/hash/TupleLoaderHashSQLServer.java  |   59 +
 .../sdb/layout2/hash/TupleLoaderOneHash.java    |  105 +
 .../sdb/layout2/index/FmtLayout2IndexDB2.java   |  140 +
 .../sdb/layout2/index/FmtLayout2IndexDerby.java |  124 +
 .../sdb/layout2/index/FmtLayout2IndexH2.java    |   96 +
 .../sdb/layout2/index/FmtLayout2IndexHSQL.java  |  101 +
 .../sdb/layout2/index/FmtLayout2IndexMySQL.java |  101 +
 .../layout2/index/FmtLayout2IndexOracle.java    |  129 +
 .../sdb/layout2/index/FmtLayout2IndexPGSQL.java |   96 +
 .../sdb/layout2/index/FmtLayout2IndexSAP.java   |  106 +
 .../layout2/index/FmtLayout2IndexSQLServer.java |   96 +
 .../jena/sdb/layout2/index/IndexCache.java      |   89 +
 .../index/QueryCompilerFactoryIndex.java        |   33 +
 .../sdb/layout2/index/QueryCompilerIndex.java   |   37 +
 .../sdb/layout2/index/SlotCompilerIndex.java    |  158 +
 .../jena/sdb/layout2/index/StoreBaseIndex.java  |  101 +
 .../index/StoreTriplesNodesIndexDB2.java        |   41 +
 .../index/StoreTriplesNodesIndexDerby.java      |   41 +
 .../layout2/index/StoreTriplesNodesIndexH2.java |   40 +
 .../index/StoreTriplesNodesIndexHSQL.java       |   48 +
 .../index/StoreTriplesNodesIndexMySQL.java      |   47 +
 .../index/StoreTriplesNodesIndexOracle.java     |   41 +
 .../index/StoreTriplesNodesIndexPGSQL.java      |   40 +
 .../index/StoreTriplesNodesIndexSAP.java        |   47 +
 .../index/StoreTriplesNodesIndexSQLServer.java  |   40 +
 .../jena/sdb/layout2/index/TableNodesIndex.java |   37 +
 .../sdb/layout2/index/TupleLoaderIndexBase.java |   88 +
 .../sdb/layout2/index/TupleLoaderIndexDB2.java  |  104 +
 .../layout2/index/TupleLoaderIndexDerby.java    |   64 +
 .../sdb/layout2/index/TupleLoaderIndexH2.java   |   62 +
 .../sdb/layout2/index/TupleLoaderIndexHSQL.java |   49 +
 .../layout2/index/TupleLoaderIndexMySQL.java    |  109 +
 .../layout2/index/TupleLoaderIndexOracle.java   |   98 +
 .../layout2/index/TupleLoaderIndexPGSQL.java    |   65 +
 .../sdb/layout2/index/TupleLoaderIndexSAP.java  |   62 +
 .../index/TupleLoaderIndexSQLServer.java        |   58 +
 .../sdb/layout2/index/TupleLoaderOneIndex.java  |  145 +
 .../apache/jena/sdb/modify/UpdateEngineSDB.java |   58 +
 .../org/apache/jena/sdb/print/ActionPrint.java  |   43 +
 .../org/apache/jena/sdb/print/StreamsPrint.java |   54 +
 .../org/apache/jena/sdb/script/CmdDesc.java     |  124 +
 .../jena/sdb/script/CmdDescAssembler.java       |   98 +
 .../java/org/apache/jena/sdb/script/QExec.java  |   44 +
 .../jena/sdb/script/QueryCommandAssembler.java  |   59 +
 .../apache/jena/sdb/script/ScriptAssembler.java |   61 +
 .../org/apache/jena/sdb/script/ScriptDesc.java  |   69 +
 .../org/apache/jena/sdb/script/ScriptVocab.java |   62 +
 .../java/org/apache/jena/sdb/shared/Access.java |   41 +
 .../java/org/apache/jena/sdb/shared/Env.java    |   64 +
 .../jena/sdb/shared/SDBInternalError.java       |   28 +
 .../jena/sdb/shared/SDBNotFoundException.java   |   29 +
 .../jena/sdb/shared/SDBNotImplemented.java      |   28 +
 .../apache/jena/sdb/shared/SymbolRegistry.java  |   62 +
 .../org/apache/jena/sdb/sql/DataSourceSDB.java  |   96 +
 .../org/apache/jena/sdb/sql/FunctionsSQL.java   |   82 +
 .../main/java/org/apache/jena/sdb/sql/JDBC.java |  211 +
 .../apache/jena/sdb/sql/MySQLEngineType.java    |   49 +
 .../main/java/org/apache/jena/sdb/sql/RS.java   |  238 +
 .../org/apache/jena/sdb/sql/ResultSetJDBC.java  |   61 +
 .../org/apache/jena/sdb/sql/SAPStorageType.java |   39 +
 .../org/apache/jena/sdb/sql/SDBConnection.java  |  347 +
 .../apache/jena/sdb/sql/SDBConnectionDesc.java  |  160 +
 .../jena/sdb/sql/SDBConnectionFactory.java      |  129 +
 .../jena/sdb/sql/SDBConnectionHolder.java       |   33 +
 .../apache/jena/sdb/sql/SDBExceptionSQL.java    |   30 +
 .../org/apache/jena/sdb/sql/SQLCommand.java     |   27 +
 .../java/org/apache/jena/sdb/sql/SQLUtils.java  |   53 +
 .../org/apache/jena/sdb/sql/SQLUtilsStd.java    |   83 +
 .../java/org/apache/jena/sdb/sql/TableDump.java |  213 +
 .../org/apache/jena/sdb/sql/TableUtils.java     |  135 +
 .../org/apache/jena/sdb/store/ConfigVocab.java  |   33 +
 .../org/apache/jena/sdb/store/DatabaseType.java |  134 +
 .../apache/jena/sdb/store/DatasetGraphSDB.java  |  115 +
 .../org/apache/jena/sdb/store/DatasetStore.java |   46 +
 .../java/org/apache/jena/sdb/store/Feature.java |  123 +
 .../org/apache/jena/sdb/store/FeatureSet.java   |   66 +
 .../org/apache/jena/sdb/store/LayoutType.java   |   94 +
 .../org/apache/jena/sdb/store/SQLBridge.java    |   44 +
 .../apache/jena/sdb/store/SQLBridgeBase.java    |  207 +
 .../apache/jena/sdb/store/SQLBridgeFactory.java |   36 +
 .../org/apache/jena/sdb/store/SQLGenerator.java |   27 +
 .../org/apache/jena/sdb/store/StoreBaseH2.java  |   82 +
 .../apache/jena/sdb/store/StoreBaseHSQL.java    |   83 +
 .../org/apache/jena/sdb/store/StoreConfig.java  |  323 +
 .../org/apache/jena/sdb/store/StoreFactory.java |  360 +
 .../apache/jena/sdb/store/StoreFormatter.java   |   41 +
 .../jena/sdb/store/StoreFormatterBase.java      |   41 +
 .../org/apache/jena/sdb/store/StoreHolder.java  |   34 +
 .../org/apache/jena/sdb/store/StoreLoader.java  |   38 +
 .../apache/jena/sdb/store/StoreLoaderPlus.java  |   29 +
 .../org/apache/jena/sdb/store/StoreMaker.java   |   33 +
 .../org/apache/jena/sdb/store/TableDesc.java    |   67 +
 .../apache/jena/sdb/store/TupleGraphLoader.java |   94 +
 .../org/apache/jena/sdb/store/TupleLoader.java  |   65 +
 .../apache/jena/sdb/store/TupleLoaderBase.java  |   80 +
 .../apache/jena/sdb/store/TupleLoaderOne.java   |  185 +
 .../org/apache/jena/sdb/store/TupleTable.java   |  128 +
 .../org/apache/jena/sdb/util/DerbyUtils.java    |   29 +
 .../java/org/apache/jena/sdb/util/H2Utils.java  |   51 +
 .../org/apache/jena/sdb/util/HSQLUtils.java     |   51 +
 .../java/org/apache/jena/sdb/util/Pair.java     |   62 +
 .../java/org/apache/jena/sdb/util/PrintSDB.java |  131 +
 .../org/apache/jena/sdb/util/RegexUtils.java    |  107 +
 .../org/apache/jena/sdb/util/StoreUtils.java    |  190 +
 .../java/org/apache/jena/sdb/util/StrUtils.java |   51 +
 .../java/org/apache/jena/sdb/util/Vocab.java    |   41 +
 jena-sdb/src/main/java/sdb/SDBCmd.java          |    6 +-
 jena-sdb/src/main/java/sdb/cmd/CmdArgsDB.java   |   30 +-
 jena-sdb/src/main/java/sdb/cmd/ModConfig.java   |    7 +-
 jena-sdb/src/main/java/sdb/cmd/ModData.java     |   12 +-
 .../src/main/java/sdb/cmd/ModDatasetStore.java  |   14 +-
 jena-sdb/src/main/java/sdb/cmd/ModGraph.java    |   16 +-
 jena-sdb/src/main/java/sdb/cmd/ModLogSQL.java   |   12 +-
 jena-sdb/src/main/java/sdb/cmd/ModStore.java    |   40 +-
 jena-sdb/src/main/java/sdb/query.java           |    5 +-
 jena-sdb/src/main/java/sdb/sdbconfig.java       |   15 +-
 jena-sdb/src/main/java/sdb/sdbdelete.java       |   17 +-
 jena-sdb/src/main/java/sdb/sdbdump.java         |   15 +-
 jena-sdb/src/main/java/sdb/sdbinfo.java         |   17 +-
 jena-sdb/src/main/java/sdb/sdbload.java         |   35 +-
 jena-sdb/src/main/java/sdb/sdbmeta.java         |   27 +-
 jena-sdb/src/main/java/sdb/sdbprint.java        |   31 +-
 jena-sdb/src/main/java/sdb/sdbquery.java        |   23 +-
 jena-sdb/src/main/java/sdb/sdbscript.java       |    3 +-
 jena-sdb/src/main/java/sdb/sdbsql.java          |   19 +-
 jena-sdb/src/main/java/sdb/sdbtruncate.java     |   14 +-
 jena-sdb/src/main/java/sdb/sdbtuple.java        |   22 +-
 jena-sdb/src/main/resources/sdb-properties.xml  |    4 +-
 .../jena/sdb/test/SDBModelGraphTestSuite.java   |   74 -
 .../hp/hpl/jena/sdb/test/SDBQueryTestSuite.java |   55 -
 .../com/hp/hpl/jena/sdb/test/SDBTestAll.java    |   54 -
 .../com/hp/hpl/jena/sdb/test/SDBTestMisc.java   |   43 -
 .../com/hp/hpl/jena/sdb/test/SDBTestSetup.java  |   35 -
 .../hpl/jena/sdb/test/SDBUpdateTestSuite.java   |   41 -
 .../com/hp/hpl/jena/sdb/test/StoreCreator.java  |  350 -
 .../sdb/test/graph/AbstractTestGraphSDB.java    |   30 -
 .../hpl/jena/sdb/test/graph/TestDB2Graph.java   |   92 -
 .../hpl/jena/sdb/test/graph/TestDerbyGraph.java |   92 -
 .../hpl/jena/sdb/test/graph/TestHSQLGraph.java  |   92 -
 .../hpl/jena/sdb/test/graph/TestMySQLGraph.java |   92 -
 .../jena/sdb/test/graph/TestOracleGraph.java    |   92 -
 .../hpl/jena/sdb/test/graph/TestPgSQLGraph.java |   92 -
 .../hpl/jena/sdb/test/graph/TestSAPGraph.java   |   92 -
 .../jena/sdb/test/graph/TestSQLServerGraph.java |   92 -
 .../jena/sdb/test/junit/ParamAllStoreDesc.java  |   69 -
 .../hpl/jena/sdb/test/junit/ParamAllStores.java |   72 -
 .../hpl/jena/sdb/test/junit/QueryTestSDB.java   |  213 -
 .../sdb/test/junit/QueryTestSDBFactory.java     |  113 -
 .../hpl/jena/sdb/test/junit/SDBTestUtils.java   |   44 -
 .../hp/hpl/jena/sdb/test/junit/StoreList.java   |  138 -
 .../hpl/jena/sdb/test/misc/TestAssembler.java   |  182 -
 .../hpl/jena/sdb/test/misc/TestConnection.java  |   80 -
 .../sdb/test/misc/TestConnectionPooled.java     |  110 -
 .../hpl/jena/sdb/test/misc/TestExprMatch.java   |  305 -
 .../sdb/test/misc/TestPrefixMappingSDB.java     |  129 -
 .../hp/hpl/jena/sdb/test/misc/TestRegex.java    |   42 -
 .../hp/hpl/jena/sdb/test/misc/TestRegistry.java |   74 -
 .../sdb/test/model/AbstractTestModelSDB.java    |   28 -
 .../hpl/jena/sdb/test/model/TestDB2Model.java   |   97 -
 .../hpl/jena/sdb/test/model/TestDerbyModel.java |   97 -
 .../hpl/jena/sdb/test/model/TestHSQLModel.java  |   97 -
 .../hpl/jena/sdb/test/model/TestMySQLModel.java |   97 -
 .../jena/sdb/test/model/TestOracleModel.java    |   97 -
 .../hpl/jena/sdb/test/model/TestPgSQLModel.java |   97 -
 .../hpl/jena/sdb/test/model/TestSAPModel.java   |   97 -
 .../jena/sdb/test/model/TestSQLServerModel.java |   97 -
 .../jena/sdb/test/modify/TestSPARQLUpdate.java  |   45 -
 .../sdb/test/modify/TestSPARQLUpdateMgt.java    |   46 -
 .../sdb/test/update/TestStoreUpdateBase.java    |  270 -
 .../sdb/test/update/TestStoreUpdateDB2Hash.java |   37 -
 .../test/update/TestStoreUpdateDB2Index.java    |   37 -
 .../test/update/TestStoreUpdateDerbyHash.java   |   37 -
 .../test/update/TestStoreUpdateDerbyIndex.java  |   37 -
 .../test/update/TestStoreUpdateHSQLHash.java    |   37 -
 .../test/update/TestStoreUpdateHSQLIndex.java   |   37 -
 .../test/update/TestStoreUpdateMySQLHash.java   |   37 -
 .../test/update/TestStoreUpdateMySQLIndex.java  |   37 -
 .../test/update/TestStoreUpdateOracleHash.java  |   37 -
 .../test/update/TestStoreUpdateOracleIndex.java |   37 -
 .../test/update/TestStoreUpdatePgSQLHash.java   |   37 -
 .../test/update/TestStoreUpdatePgSQLIndex.java  |   37 -
 .../sdb/test/update/TestStoreUpdateSAPHash.java |   37 -
 .../test/update/TestStoreUpdateSAPIndex.java    |   37 -
 .../update/TestStoreUpdateSQLServerHash.java    |   37 -
 .../update/TestStoreUpdateSQLServerIndex.java   |   37 -
 .../jena/sdb/test/SDBModelGraphTestSuite.java   |   72 +
 .../apache/jena/sdb/test/SDBQueryTestSuite.java |   54 +
 .../org/apache/jena/sdb/test/SDBTestAll.java    |   54 +
 .../org/apache/jena/sdb/test/SDBTestMisc.java   |   38 +
 .../org/apache/jena/sdb/test/SDBTestSetup.java  |   35 +
 .../jena/sdb/test/SDBUpdateTestSuite.java       |   40 +
 .../org/apache/jena/sdb/test/StoreCreator.java  |  336 +
 .../sdb/test/graph/AbstractTestGraphSDB.java    |   30 +
 .../jena/sdb/test/graph/TestDB2Graph.java       |   91 +
 .../jena/sdb/test/graph/TestDerbyGraph.java     |   91 +
 .../jena/sdb/test/graph/TestHSQLGraph.java      |   91 +
 .../jena/sdb/test/graph/TestMySQLGraph.java     |   91 +
 .../jena/sdb/test/graph/TestOracleGraph.java    |   91 +
 .../jena/sdb/test/graph/TestPgSQLGraph.java     |   91 +
 .../jena/sdb/test/graph/TestSAPGraph.java       |   91 +
 .../jena/sdb/test/graph/TestSQLServerGraph.java |   91 +
 .../jena/sdb/test/junit/ParamAllStoreDesc.java  |   59 +
 .../jena/sdb/test/junit/ParamAllStores.java     |   62 +
 .../jena/sdb/test/junit/QueryTestSDB.java       |  212 +
 .../sdb/test/junit/QueryTestSDBFactory.java     |  112 +
 .../jena/sdb/test/junit/SDBTestUtils.java       |   44 +
 .../apache/jena/sdb/test/junit/StoreList.java   |  117 +
 .../jena/sdb/test/misc/TestAssembler.java       |  181 +
 .../jena/sdb/test/misc/TestConnection.java      |   78 +
 .../sdb/test/misc/TestConnectionPooled.java     |  109 +
 .../jena/sdb/test/misc/TestExprMatch.java       |  304 +
 .../sdb/test/misc/TestPrefixMappingSDB.java     |  128 +
 .../apache/jena/sdb/test/misc/TestRegex.java    |   41 +
 .../apache/jena/sdb/test/misc/TestRegistry.java |   73 +
 .../sdb/test/model/AbstractTestModelSDB.java    |   28 +
 .../jena/sdb/test/model/TestDB2Model.java       |   96 +
 .../jena/sdb/test/model/TestDerbyModel.java     |   96 +
 .../jena/sdb/test/model/TestHSQLModel.java      |   96 +
 .../jena/sdb/test/model/TestMySQLModel.java     |   96 +
 .../jena/sdb/test/model/TestOracleModel.java    |   96 +
 .../jena/sdb/test/model/TestPgSQLModel.java     |   96 +
 .../jena/sdb/test/model/TestSAPModel.java       |   96 +
 .../jena/sdb/test/model/TestSQLServerModel.java |   96 +
 .../jena/sdb/test/modify/TestSPARQLUpdate.java  |   43 +
 .../sdb/test/modify/TestSPARQLUpdateMgt.java    |   43 +
 .../sdb/test/update/TestStoreUpdateBase.java    |  268 +
 .../sdb/test/update/TestStoreUpdateDB2Hash.java |   36 +
 .../test/update/TestStoreUpdateDB2Index.java    |   36 +
 .../test/update/TestStoreUpdateDerbyHash.java   |   36 +
 .../test/update/TestStoreUpdateDerbyIndex.java  |   36 +
 .../test/update/TestStoreUpdateHSQLHash.java    |   36 +
 .../test/update/TestStoreUpdateHSQLIndex.java   |   36 +
 .../test/update/TestStoreUpdateMySQLHash.java   |   36 +
 .../test/update/TestStoreUpdateMySQLIndex.java  |   36 +
 .../test/update/TestStoreUpdateOracleHash.java  |   36 +
 .../test/update/TestStoreUpdateOracleIndex.java |   36 +
 .../test/update/TestStoreUpdatePgSQLHash.java   |   36 +
 .../test/update/TestStoreUpdatePgSQLIndex.java  |   36 +
 .../sdb/test/update/TestStoreUpdateSAPHash.java |   36 +
 .../test/update/TestStoreUpdateSAPIndex.java    |   36 +
 .../update/TestStoreUpdateSQLServerHash.java    |   36 +
 .../update/TestStoreUpdateSQLServerIndex.java   |   36 +
 jena-sdb/src/test/java/sdb/DBTest.java          |   27 +-
 jena-sdb/src/test/java/sdb/sdbtest.java         |   37 +-
 .../src/test/java/sdb/test/TestStringBase.java  |    3 -
 jena-sdb/testing/Assembler/connection.ttl       |    2 +-
 jena-sdb/testing/Assembler/dataset.ttl          |    2 +-
 jena-sdb/testing/Assembler/dataset2.ttl         |    2 +-
 jena-sdb/testing/Assembler/graph-assembler.ttl  |    2 +-
 jena-sdb/testing/Assembler/store.ttl            |    2 +-
 jena-sdb/testing/slist.rq                       |    2 +-
 jena-security/LICENSE                           |  202 -
 jena-security/NOTICE                            |    5 -
 jena-security/license-header.txt                |   15 -
 jena-security/pom.xml                           |  203 -
 jena-security/readme.md                         |   32 -
 .../jena/security/example/ExampleEvaluator.java |  147 -
 .../jena/security/example/SecurityExample.java  |   93 -
 .../security/example/ShiroExampleEvaluator.java |  235 -
 .../apache/jena/security/example/example.ttl    |   49 -
 .../jena/security/example/fuseki/config.ttl     |   98 -
 .../jena/security/example/fuseki/shiro.ini      |   47 -
 .../jena/security/AccessDeniedException.java    |   66 -
 .../jena/security/AssemblerConstants.java       |   62 -
 .../java/org/apache/jena/security/Factory.java  |   70 -
 .../apache/jena/security/SecuredAssembler.java  |  264 -
 .../apache/jena/security/SecurityEvaluator.java |  616 --
 .../security/SecurityEvaluatorAssembler.java    |  186 -
 .../graph/SecuredBulkUpdateHandler.java         |  149 -
 .../security/graph/SecuredCapabilities.java     |  152 -
 .../jena/security/graph/SecuredGraph.java       |  177 -
 .../graph/SecuredGraphEventManager.java         |  609 --
 .../security/graph/SecuredPrefixMapping.java    |  134 -
 .../jena/security/graph/impl/Factory.java       |  130 -
 .../impl/SecuredBulkUpdateHandlerImpl.java      |  243 -
 .../security/graph/impl/SecuredGraphImpl.java   |  304 -
 .../graph/impl/SecuredPrefixMappingImpl.java    |  168 -
 .../jena/security/graph/package-info.java       |   50 -
 .../security/impl/CachedSecurityEvaluator.java  |   90 -
 .../apache/jena/security/impl/ItemHolder.java   |  117 -
 .../apache/jena/security/impl/SecuredItem.java  |  185 -
 .../jena/security/impl/SecuredItemImpl.java     |  843 ---
 .../jena/security/impl/SecuredItemInvoker.java  |  146 -
 .../apache/jena/security/model/SecuredAlt.java  |  265 -
 .../apache/jena/security/model/SecuredBag.java  |   29 -
 .../jena/security/model/SecuredContainer.java   |  219 -
 .../jena/security/model/SecuredLiteral.java     |  166 -
 .../jena/security/model/SecuredModel.java       | 1567 ----
 .../jena/security/model/SecuredProperty.java    |   39 -
 .../jena/security/model/SecuredRDFList.java     |  419 --
 .../jena/security/model/SecuredRDFNode.java     |   60 -
 .../security/model/SecuredReifiedStatement.java |   39 -
 .../jena/security/model/SecuredResource.java    |  338 -
 .../apache/jena/security/model/SecuredSeq.java  |  386 -
 .../jena/security/model/SecuredStatement.java   |  300 -
 ...SecuredUnsupportedPolymorphismException.java |   37 -
 .../security/model/impl/SecuredAltImpl.java     |  344 -
 .../security/model/impl/SecuredBagImpl.java     |   82 -
 .../model/impl/SecuredContainerImpl.java        |  582 --
 .../security/model/impl/SecuredLiteralImpl.java |  278 -
 .../security/model/impl/SecuredModelImpl.java   | 2740 -------
 .../model/impl/SecuredNodeIterator.java         |  144 -
 .../model/impl/SecuredPropertyImpl.java         |  130 -
 .../security/model/impl/SecuredRDFListImpl.java | 1068 ---
 .../security/model/impl/SecuredRDFNodeImpl.java |  254 -
 .../security/model/impl/SecuredRSIterator.java  |  175 -
 .../model/impl/SecuredReifiedStatementImpl.java |  100 -
 .../security/model/impl/SecuredResIterator.java |  134 -
 .../model/impl/SecuredResourceImpl.java         |  894 ---
 .../security/model/impl/SecuredSelector.java    |  100 -
 .../security/model/impl/SecuredSeqImpl.java     |  512 --
 .../model/impl/SecuredStatementImpl.java        |  561 --
 .../model/impl/SecuredStatementIterator.java    |  149 -
 .../org/apache/jena/security/package-info.java  |   48 -
 .../jena/security/query/SecuredQueryEngine.java |  153 -
 .../query/SecuredQueryEngineConfig.java         |   29 -
 .../query/SecuredQueryEngineFactory.java        |  116 -
 .../security/query/rewriter/OpRewriter.java     |  628 --
 .../query/rewriter/SecuredFunction.java         |  143 -
 .../jena/security/utils/ContainerFilter.java    |   48 -
 .../security/utils/PermStatementFilter.java     |  165 -
 .../jena/security/utils/PermTripleFilter.java   |  164 -
 .../jena/security/utils/RDFListIterator.java    |   79 -
 .../jena/security/utils/RDFListSecFilter.java   |   59 -
 jena-security/src/main/overview.html            |   83 -
 .../apache/jena/security/EqualityTester.java    |   49 -
 .../apache/jena/security/MockPrefixMapping.java |  105 -
 .../jena/security/MockSecurityEvaluator.java    |  229 -
 .../security/ModelBasedSecurityEvaluator.java   |   76 -
 .../jena/security/SecuredAssemblerTest.java     |   86 -
 .../security/SecurityEvaluatorParameters.java   |  135 -
 .../jena/security/StaticSecurityEvaluator.java  |   78 -
 .../graph/CachedSecurityEvaluatorTest.java      |   45 -
 .../graph/SecuredGraphContractTests.java        |   52 -
 .../graph/SecuredGraphListenerTest.java         |   52 -
 .../graph/SecuredTDBGraphContractTests.java     |   52 -
 .../security/contract/model/ModelTestSuite.java |  132 -
 .../contract/model/SecTestLiterals.java         |   29 -
 .../security/contract/model/SecTestPackage.java |  123 -
 .../contract/model/SecTestReaderEvents.java     |   28 -
 .../security/contract/model/SecTestReaders.java |   28 -
 .../security/graph/BulkUpdateHandlerTest.java   |  374 -
 .../graph/CrossIDGraphEventManagerTest.java     |   78 -
 .../security/graph/GraphEventManagerTest.java   |  240 -
 .../jena/security/graph/MemGraphTest.java       |  393 -
 .../security/graph/RecordingGraphListener.java  |  124 -
 .../graph/SecuredPrefixMappingTest.java         |  442 --
 .../jena/security/graph/TDBGraphTest.java       |   59 -
 .../jena/security/model/SecuredAltTest.java     |  658 --
 .../jena/security/model/SecuredBagTest.java     |   47 -
 .../security/model/SecuredContainerTest.java    |  481 --
 .../jena/security/model/SecuredLiteralTest.java |  469 --
 .../security/model/SecuredModelDetailTest.java  |  342 -
 .../jena/security/model/SecuredModelTest.java   | 2035 -----
 .../security/model/SecuredPropertyTest.java     |   80 -
 .../jena/security/model/SecuredRDFListTest.java |  976 ---
 .../jena/security/model/SecuredRDFNodeTest.java |  215 -
 .../model/SecuredReifiedStatementTest.java      |   85 -
 .../security/model/SecuredResourceTest.java     |  828 --
 .../jena/security/model/SecuredSeqTest.java     | 1014 ---
 .../security/model/SecuredStatementTest.java    |  714 --
 .../apache/jena/security/query/DataSetTest.java |  250 -
 .../jena/security/query/QueryEngineTest.java    |  260 -
 .../security/query/rewriter/OpRewriterTest.java |  112 -
 .../src/test/resources/log4j.properties         |   15 -
 .../jena/security/SecuredAssemblerTest.ttl      |   56 -
 .../org/apache/jena/security/model/detail.ttl   |   33 -
 .../org/apache/jena/security/model/test.ttl     |    2 -
 .../org/apache/jena/security/model/test.xml     |    7 -
 jena-shaded-guava/.gitignore                    |    1 +
 jena-shaded-guava/DEPENDENCIES                  |    2 +
 jena-shaded-guava/LICENSE                       |  175 +
 jena-shaded-guava/pom.xml                       |  110 +
 jena-spatial/ReleaseNotes.txt                   |   18 -
 jena-spatial/pom.xml                            |   11 +-
 .../main/java/examples/JenaSpatialExample1.java |   11 +-
 .../src/main/java/jena/spatialindexdump.java    |   48 +-
 .../src/main/java/jena/spatialindexer.java      |   12 +-
 .../jena/query/spatial/DatasetGraphSpatial.java |   13 +-
 .../jena/query/spatial/EntityDefinition.java    |   11 +-
 .../query/spatial/SpatialDatasetFactory.java    |   11 +-
 .../jena/query/spatial/SpatialDocProducer.java  |    2 +-
 .../spatial/SpatialDocProducerTriples.java      |   25 +-
 .../apache/jena/query/spatial/SpatialIndex.java |    2 +-
 .../jena/query/spatial/SpatialIndexContext.java |    2 +-
 .../query/spatial/SpatialIndexException.java    |    2 +-
 .../jena/query/spatial/SpatialIndexLucene.java  |    2 +-
 .../jena/query/spatial/SpatialIndexSolr.java    |    4 +-
 .../query/spatial/SpatialPredicatePair.java     |    2 +-
 .../spatial/SpatialPredicatePairValue.java      |    3 +-
 .../apache/jena/query/spatial/SpatialQuery.java |   16 +-
 .../jena/query/spatial/SpatialQueryFuncs.java   |    7 +-
 .../jena/query/spatial/SpatialValueUtil.java    |   10 +-
 .../assembler/EntityDefinitionAssembler.java    |   22 +-
 .../spatial/assembler/SpatialAssembler.java     |    4 +-
 .../assembler/SpatialDatasetAssembler.java      |   14 +-
 .../assembler/SpatialIndexLuceneAssembler.java  |   39 +-
 .../assembler/SpatialIndexSolrAssembler.java    |   11 +-
 .../query/spatial/assembler/SpatialVocab.java   |    6 +-
 .../pfunction/DirectionWithPointPFBase.java     |   15 +-
 .../pfunction/SpatialOperationPFBase.java       |   25 +-
 .../SpatialOperationWithBoxPFBase.java          |   15 +-
 .../SpatialOperationWithCircleBase.java         |   15 +-
 .../AbstractTestDatasetWithSpatialIndex.java    |   12 +-
 .../jena/query/spatial/SpatialSearchUtil.java   |    7 +-
 .../assembler/AbstractTestSpatialAssembler.java |   12 +-
 .../TestEntityDefinitionAssembler.java          |    7 +-
 .../assembler/TestSpatialDatasetAssembler.java  |   12 +-
 .../TestSpatialIndexLuceneAssembler.java        |    4 +-
 .../TestSpatialIndexSolrAssembler.java          |    4 +-
 .../src/test/resources/geoarq-query-1.rq        |    2 +-
 .../src/test/resources/log4j.properties         |    4 +-
 .../src/test/resources/spatial-config.ttl       |    2 +-
 .../src/test/resources/spatial-solr-config.ttl  |    2 +-
 jena-tdb/ReleaseNotes.txt                       |   82 -
 jena-tdb/bin/make_classpath                     |   98 -
 jena-tdb/bin/make_classpath_mvn                 |   68 -
 jena-tdb/bin/tdb                                |   12 -
 jena-tdb/bin/tdb_cmd                            |   35 -
 jena-tdb/bin/tdb_init                           |   32 -
 jena-tdb/bin/tdb_path                           |   33 -
 jena-tdb/bin/tdbbackup                          |   35 -
 jena-tdb/bin/tdbclean                           |   23 -
 jena-tdb/bin/tdbdump                            |   35 -
 jena-tdb/bin/tdbjournal                         |   35 -
 jena-tdb/bin/tdbloader                          |   35 -
 jena-tdb/bin/tdbloader2                         |   47 -
 jena-tdb/bin/tdbloader2worker                   |  154 -
 jena-tdb/bin/tdbloader3                         |   52 -
 jena-tdb/bin/tdbquery                           |   35 -
 jena-tdb/bin/tdbrecovery                        |   35 -
 jena-tdb/bin/tdbstats                           |   35 -
 jena-tdb/bin/tdbupdate                          |   35 -
 jena-tdb/bin/tdbverify                          |   11 -
 jena-tdb/log4j.properties                       |   16 +-
 jena-tdb/pom.xml                                |   20 +-
 jena-tdb/src-dev/dev/Tests.java                 |   32 -
 jena-tdb/src-dev/test/BPlusTreeRun.java         |   74 -
 jena-tdb/src-dev/test/ByteBufferTest.java       |   78 -
 jena-tdb/src-dev/test/ExtHashRun.java           |  200 -
 jena-tdb/src-dev/test/RunnerExecute.java        |  119 -
 jena-tdb/src-dev/test/RunnerRangeIndex.java     |  149 -
 .../src-examples/tdb/examples/ExQuadFilter.java |   20 +-
 jena-tdb/src-examples/tdb/examples/ExTDB1.java  |    6 +-
 jena-tdb/src-examples/tdb/examples/ExTDB2.java  |    4 +-
 jena-tdb/src-examples/tdb/examples/ExTDB3.java  |   18 +-
 jena-tdb/src-examples/tdb/examples/ExTDB4.java  |   16 +-
 jena-tdb/src-examples/tdb/examples/ExTDB5.java  |   16 +-
 jena-tdb/src-examples/tdb/examples/ExTDB6.java  |   16 +-
 .../src-examples/tdb/examples/ExTDB_Txn1.java   |   18 +-
 .../src-examples/tdb/examples/ExTDB_Txn2.java   |   18 +-
 .../src-examples/tdb/examples/ExTDB_Txn3.java   |    8 +-
 .../com/hp/hpl/jena/tdb/StoreConnection.java    |  305 -
 .../src/main/java/com/hp/hpl/jena/tdb/TDB.java  |  283 -
 .../java/com/hp/hpl/jena/tdb/TDBBackup.java     |   63 -
 .../java/com/hp/hpl/jena/tdb/TDBException.java  |   29 -
 .../java/com/hp/hpl/jena/tdb/TDBFactory.java    |  256 -
 .../java/com/hp/hpl/jena/tdb/TDBLoader.java     |  279 -
 .../hp/hpl/jena/tdb/assembler/AssemblerTDB.java |   29 -
 .../jena/tdb/assembler/DatasetAssemblerTDB.java |   79 -
 .../hpl/jena/tdb/assembler/IndexAssembler.java  |   92 -
 .../jena/tdb/assembler/NodeTableAssembler.java  |   62 -
 .../jena/tdb/assembler/SettingAssembler.java    |   52 -
 .../jena/tdb/assembler/TDBGraphAssembler.java   |  126 -
 .../com/hp/hpl/jena/tdb/assembler/Vocab.java    |   41 -
 .../com/hp/hpl/jena/tdb/assembler/VocabTDB.java |   96 -
 .../hp/hpl/jena/tdb/base/StorageException.java  |   27 -
 .../com/hp/hpl/jena/tdb/base/block/Block.java   |  179 -
 .../hpl/jena/tdb/base/block/BlockConverter.java |   33 -
 .../hpl/jena/tdb/base/block/BlockException.java |   29 -
 .../hp/hpl/jena/tdb/base/block/BlockMgr.java    |  105 -
 .../hpl/jena/tdb/base/block/BlockMgrBase.java   |   57 -
 .../hpl/jena/tdb/base/block/BlockMgrCache.java  |  363 -
 .../jena/tdb/base/block/BlockMgrFactory.java    |  152 -
 .../jena/tdb/base/block/BlockMgrFileAccess.java |  159 -
 .../jena/tdb/base/block/BlockMgrFreeChain.java  |   82 -
 .../hpl/jena/tdb/base/block/BlockMgrLogger.java |  211 -
 .../jena/tdb/base/block/BlockMgrReadonly.java   |   53 -
 .../jena/tdb/base/block/BlockMgrSwitcher.java   |   40 -
 .../hpl/jena/tdb/base/block/BlockMgrSync.java   |  197 -
 .../jena/tdb/base/block/BlockMgrTracker.java    |  489 --
 .../jena/tdb/base/block/BlockMgrWrapper.java    |  179 -
 .../hp/hpl/jena/tdb/base/block/BlockParams.java |   27 -
 .../hp/hpl/jena/tdb/base/block/BlockType.java   |   71 -
 .../hp/hpl/jena/tdb/base/block/FileMode.java    |   27 -
 .../hp/hpl/jena/tdb/base/buffer/BufferBase.java |  266 -
 .../jena/tdb/base/buffer/BufferException.java   |   27 -
 .../hp/hpl/jena/tdb/base/buffer/PtrBuffer.java  |  142 -
 .../hpl/jena/tdb/base/buffer/RecordBuffer.java  |  246 -
 .../tdb/base/buffer/RecordBufferIterator.java   |   99 -
 .../hp/hpl/jena/tdb/base/file/BlockAccess.java  |   53 -
 .../hpl/jena/tdb/base/file/BlockAccessBase.java |  161 -
 .../tdb/base/file/BlockAccessByteArray.java     |  124 -
 .../jena/tdb/base/file/BlockAccessDirect.java   |  126 -
 .../jena/tdb/base/file/BlockAccessMapped.java   |  284 -
 .../hpl/jena/tdb/base/file/BlockAccessMem.java  |  164 -
 .../hpl/jena/tdb/base/file/BufferAllocator.java |   43 -
 .../tdb/base/file/BufferAllocatorDirect.java    |   46 -
 .../tdb/base/file/BufferAllocatorMapped.java    |  145 -
 .../jena/tdb/base/file/BufferAllocatorMem.java  |   46 -
 .../hpl/jena/tdb/base/file/BufferChannel.java   |   92 -
 .../jena/tdb/base/file/BufferChannelFile.java   |  174 -
 .../jena/tdb/base/file/BufferChannelMem.java    |  239 -
 .../hpl/jena/tdb/base/file/ChannelManager.java  |  125 -
 .../com/hp/hpl/jena/tdb/base/file/FileBase.java |  114 -
 .../hpl/jena/tdb/base/file/FileException.java   |   29 -
 .../hp/hpl/jena/tdb/base/file/FileFactory.java  |   50 -
 .../com/hp/hpl/jena/tdb/base/file/FileSet.java  |  115 -
 .../com/hp/hpl/jena/tdb/base/file/Location.java |  268 -
 .../hp/hpl/jena/tdb/base/file/LocationLock.java |  282 -
 .../com/hp/hpl/jena/tdb/base/file/MetaFile.java |  373 -
 .../hp/hpl/jena/tdb/base/file/PlainFile.java    |   59 -
 .../hp/hpl/jena/tdb/base/file/PlainFileMem.java |   55 -
 .../jena/tdb/base/file/PlainFilePersistent.java |   68 -
 .../jena/tdb/base/objectfile/ObjectFile.java    |   79 -
 .../tdb/base/objectfile/ObjectFileLogger.java   |  139 -
 .../tdb/base/objectfile/ObjectFileStorage.java  |  482 --
 .../tdb/base/objectfile/ObjectFileSwitcher.java |   46 -
 .../tdb/base/objectfile/ObjectFileWrapper.java  |   77 -
 .../jena/tdb/base/objectfile/StringFile.java    |  143 -
 .../com/hp/hpl/jena/tdb/base/page/Page.java     |   38 -
 .../com/hp/hpl/jena/tdb/base/page/PageBase.java |   59 -
 .../hp/hpl/jena/tdb/base/page/PageBlockMgr.java |  142 -
 .../com/hp/hpl/jena/tdb/base/record/Record.java |  232 -
 .../jena/tdb/base/record/RecordException.java   |   27 -
 .../hpl/jena/tdb/base/record/RecordFactory.java |  180 -
 .../tdb/base/recordbuffer/RecordBufferPage.java |   95 -
 .../base/recordbuffer/RecordBufferPageBase.java |  113 -
 .../base/recordbuffer/RecordBufferPageMgr.java  |  100 -
 .../base/recordbuffer/RecordRangeIterator.java  |  166 -
 .../jena/tdb/graph/BulkUpdateHandlerTDB.java    |   56 -
 .../jena/tdb/graph/TransactionHandlerTDB.java   |   62 -
 .../hp/hpl/jena/tdb/index/BuilderStdIndex.java  |  109 -
 .../java/com/hp/hpl/jena/tdb/index/Index.java   |   68 -
 .../com/hp/hpl/jena/tdb/index/IndexBuilder.java |   26 -
 .../com/hp/hpl/jena/tdb/index/IndexFactory.java |   91 -
 .../com/hp/hpl/jena/tdb/index/IndexLib.java     |   41 -
 .../com/hp/hpl/jena/tdb/index/IndexLogger.java  |   66 -
 .../com/hp/hpl/jena/tdb/index/IndexMap.java     |  172 -
 .../com/hp/hpl/jena/tdb/index/IndexParams.java  |   38 -
 .../com/hp/hpl/jena/tdb/index/IndexWrapper.java |   80 -
 .../com/hp/hpl/jena/tdb/index/RangeIndex.java   |   36 -
 .../hpl/jena/tdb/index/RangeIndexBuilder.java   |   26 -
 .../hp/hpl/jena/tdb/index/RangeIndexLogger.java |   73 -
 .../hpl/jena/tdb/index/RangeIndexWrapper.java   |  101 -
 .../com/hp/hpl/jena/tdb/index/SetupIndex.java   |  173 -
 .../tdb/index/bplustree/BPTreeException.java    |   27 -
 .../jena/tdb/index/bplustree/BPTreeNode.java    | 1543 ----
 .../tdb/index/bplustree/BPTreeNodeBuilder.java  |  176 -
 .../jena/tdb/index/bplustree/BPTreeNodeMgr.java |  272 -
 .../jena/tdb/index/bplustree/BPTreePage.java    |  131 -
 .../jena/tdb/index/bplustree/BPTreePageMgr.java |   38 -
 .../jena/tdb/index/bplustree/BPTreeRecords.java |  349 -
 .../tdb/index/bplustree/BPTreeRecordsMgr.java   |   97 -
 .../hpl/jena/tdb/index/bplustree/BPlusTree.java |  492 --
 .../tdb/index/bplustree/BPlusTreeParams.java    |  285 -
 .../tdb/index/bplustree/BPlusTreeRewriter.java  |  391 -
 .../index/bplustree/BPlusTreeRewriterUtils.java |  111 -
 .../tdb/index/bplustree/BPlusTreeTools.java     |  157 -
 .../index/bplustree/RecordBufferPageLinker.java |   86 -
 .../index/bplustree/RecordBufferPagePacker.java |   94 -
 .../com/hp/hpl/jena/tdb/index/ext/ExtHash.java  |  729 --
 .../hpl/jena/tdb/index/ext/ExtHashIterator.java |   94 -
 .../hpl/jena/tdb/index/ext/ExtHashParams.java   |   31 -
 .../hp/hpl/jena/tdb/index/ext/HashBucket.java   |  183 -
 .../hpl/jena/tdb/index/ext/HashBucketMgr.java   |  129 -
 .../java/com/hp/hpl/jena/tdb/lib/DumpOps.java   |  185 -
 .../main/java/com/hp/hpl/jena/tdb/lib/Lib2.java |   46 -
 .../java/com/hp/hpl/jena/tdb/lib/NodeLib.java   |  234 -
 .../com/hp/hpl/jena/tdb/lib/StringAbbrev.java   |   81 -
 .../java/com/hp/hpl/jena/tdb/lib/TupleLib.java  |  196 -
 .../java/com/hp/hpl/jena/tdb/mgt/TDBMgt.java    |   33 -
 .../com/hp/hpl/jena/tdb/mgt/TDBSystemInfo.java  |   42 -
 .../hp/hpl/jena/tdb/mgt/TDBSystemInfoMBean.java |   54 -
 .../java/com/hp/hpl/jena/tdb/migrate/A2.java    |   38 -
 .../com/hp/hpl/jena/tdb/migrate/CachingPF.java  |   52 -
 .../com/hp/hpl/jena/tdb/migrate/LockTx.java     |   72 -
 .../jena/tdb/migrate/TransformGraphRename.java  |   54 -
 .../hp/hpl/jena/tdb/modify/UpdateEngineTDB.java |   55 -
 .../hp/hpl/jena/tdb/setup/BlockMgrBuilder.java  |   27 -
 .../java/com/hp/hpl/jena/tdb/setup/Build.java   |  150 -
 .../com/hp/hpl/jena/tdb/setup/BuilderStdDB.java |  100 -
 .../hp/hpl/jena/tdb/setup/DatasetBuilder.java   |   33 -
 .../hpl/jena/tdb/setup/DatasetBuilderBasic.java |  198 -
 .../hpl/jena/tdb/setup/DatasetBuilderStd.java   |  496 --
 .../hp/hpl/jena/tdb/setup/NodeTableBuilder.java |   26 -
 .../hpl/jena/tdb/setup/ObjectFileBuilder.java   |   26 -
 .../com/hp/hpl/jena/tdb/setup/StoreParams.java  |  475 --
 .../hpl/jena/tdb/setup/StoreParamsBuilder.java  |  344 -
 .../hp/hpl/jena/tdb/setup/StoreParamsCodec.java |  215 -
 .../hp/hpl/jena/tdb/setup/StoreParamsConst.java |  118 -
 .../hpl/jena/tdb/setup/StoreParamsDynamic.java  |   54 -
 .../hpl/jena/tdb/setup/TupleIndexBuilder.java   |   28 -
 .../com/hp/hpl/jena/tdb/solver/Abortable.java   |   21 -
 .../hp/hpl/jena/tdb/solver/BindingNodeId.java   |  114 -
 .../com/hp/hpl/jena/tdb/solver/BindingTDB.java  |  156 -
 .../hp/hpl/jena/tdb/solver/OpExecutorTDB1.java  |  428 --
 .../java/com/hp/hpl/jena/tdb/solver/QC2.java    |   49 -
 .../hp/hpl/jena/tdb/solver/QueryEngineTDB.java  |  212 -
 .../hp/hpl/jena/tdb/solver/QueryIterTDB.java    |   59 -
 .../jena/tdb/solver/QueryIteratorIdToNode.java  |   68 -
 .../com/hp/hpl/jena/tdb/solver/SolverLib.java   |  374 -
 .../tdb/solver/StageGeneratorDirectTDB.java     |   58 -
 .../hp/hpl/jena/tdb/solver/StageMatchTuple.java |  211 -
 .../com/hp/hpl/jena/tdb/solver/stats/Stats.java |  139 -
 .../jena/tdb/solver/stats/StatsCollector.java   |   36 -
 .../tdb/solver/stats/StatsCollectorBase.java    |   56 -
 .../tdb/solver/stats/StatsCollectorNodeId.java  |   56 -
 .../hpl/jena/tdb/solver/stats/StatsResults.java |   53 -
 .../hp/hpl/jena/tdb/store/DatasetGraphTDB.java  |  304 -
 .../tdb/store/DatasetPrefixStorageLogger.java   |  123 -
 .../hpl/jena/tdb/store/DatasetPrefixesTDB.java  |  181 -
 .../com/hp/hpl/jena/tdb/store/DateTimeNode.java |  265 -
 .../com/hp/hpl/jena/tdb/store/DecimalNode.java  |  152 -
 .../com/hp/hpl/jena/tdb/store/GraphTDB.java     |  309 -
 .../java/com/hp/hpl/jena/tdb/store/Hash.java    |   57 -
 .../com/hp/hpl/jena/tdb/store/IntegerNode.java  |   51 -
 .../java/com/hp/hpl/jena/tdb/store/NodeId.java  |  382 -
 .../com/hp/hpl/jena/tdb/store/NodeType.java     |  200 -
 .../com/hp/hpl/jena/tdb/store/QuadTable.java    |  104 -
 .../com/hp/hpl/jena/tdb/store/SinkProgress.java |  160 -
 .../hp/hpl/jena/tdb/store/StorageConfig.java    |   52 -
 .../com/hp/hpl/jena/tdb/store/TableBase.java    |   61 -
 .../com/hp/hpl/jena/tdb/store/TripleTable.java  |   93 -
 .../bulkloader/BuilderSecondaryIndexes.java     |   26 -
 .../BuilderSecondaryIndexesInterleaved.java     |   46 -
 .../BuilderSecondaryIndexesParallel.java        |   72 -
 .../BuilderSecondaryIndexesSequential.java      |   52 -
 .../jena/tdb/store/bulkloader/BulkLoader.java   |  379 -
 .../tdb/store/bulkloader/BulkStreamRDF.java     |   27 -
 .../jena/tdb/store/bulkloader/LoadMonitor.java  |  279 -
 .../store/bulkloader/LoaderNodeTupleTable.java  |  216 -
 .../tdb/store/bulkloader2/CmdIndexBuild.java    |  136 -
 .../tdb/store/bulkloader2/CmdIndexCopy.java     |  125 -
 .../store/bulkloader2/CmdNodeTableBuilder.java  |  296 -
 .../tdb/store/bulkloader2/RecordsFromInput.java |  155 -
 .../jena/tdb/store/bulkloader2/WriteRows.java   |   86 -
 .../hpl/jena/tdb/store/nodetable/NodeTable.java |   65 -
 .../tdb/store/nodetable/NodeTableCache.java     |  282 -
 .../tdb/store/nodetable/NodeTableInline.java    |   72 -
 .../jena/tdb/store/nodetable/NodeTableLib.java  |   43 -
 .../tdb/store/nodetable/NodeTableLogger.java    |  137 -
 .../tdb/store/nodetable/NodeTableNative.java    |  283 -
 .../tdb/store/nodetable/NodeTableReadonly.java  |   40 -
 .../tdb/store/nodetable/NodeTableWrapper.java   |   88 -
 .../hp/hpl/jena/tdb/store/nodetable/Nodec.java  |   56 -
 .../hpl/jena/tdb/store/nodetable/NodecLib.java  |   97 -
 .../hpl/jena/tdb/store/nodetable/NodecSSE.java  |  210 -
 .../store/nodetupletable/NodeTupleTable.java    |   77 -
 .../nodetupletable/NodeTupleTableConcrete.java  |  258 -
 .../nodetupletable/NodeTupleTableView.java      |  106 -
 .../nodetupletable/NodeTupleTableWrapper.java   |  106 -
 .../jena/tdb/store/tupletable/TupleIndex.java   |   70 -
 .../tdb/store/tupletable/TupleIndexBase.java    |  124 -
 .../tdb/store/tupletable/TupleIndexRecord.java  |  254 -
 .../tdb/store/tupletable/TupleIndexWrapper.java |  104 -
 .../jena/tdb/store/tupletable/TupleTable.java   |  275 -
 .../com/hp/hpl/jena/tdb/sys/DatasetControl.java |   43 -
 .../hp/hpl/jena/tdb/sys/DatasetControlMRSW.java |  161 -
 .../hpl/jena/tdb/sys/DatasetControlMutable.java |   60 -
 .../hp/hpl/jena/tdb/sys/DatasetControlNone.java |   49 -
 .../jena/tdb/sys/DatasetControlReadOnly.java    |   60 -
 .../java/com/hp/hpl/jena/tdb/sys/DebugTDB.java  |  132 -
 .../java/com/hp/hpl/jena/tdb/sys/EnvTDB.java    |   62 -
 .../java/com/hp/hpl/jena/tdb/sys/FileRef.java   |  189 -
 .../com/hp/hpl/jena/tdb/sys/LockMRSWLite.java   |   79 -
 .../java/com/hp/hpl/jena/tdb/sys/Names.java     |  142 -
 .../com/hp/hpl/jena/tdb/sys/ProcessUtils.java   |  157 -
 .../java/com/hp/hpl/jena/tdb/sys/Session.java   |   46 -
 .../java/com/hp/hpl/jena/tdb/sys/SetupTDB.java  |  258 -
 .../java/com/hp/hpl/jena/tdb/sys/SystemTDB.java |  407 -
 .../com/hp/hpl/jena/tdb/sys/TDBInternal.java    |  134 -
 .../java/com/hp/hpl/jena/tdb/sys/TDBMaker.java  |  128 -
 .../jena/tdb/transaction/BlockMgrJournal.java   |  385 -
 .../jena/tdb/transaction/DatasetBuilderTxn.java |  187 -
 .../transaction/DatasetGraphTransaction.java    |  276 -
 .../jena/tdb/transaction/DatasetGraphTxn.java   |   67 -
 .../hp/hpl/jena/tdb/transaction/Journal.java    |  307 -
 .../jena/tdb/transaction/JournalControl.java    |  313 -
 .../hpl/jena/tdb/transaction/JournalEntry.java  |  103 -
 .../jena/tdb/transaction/JournalEntryType.java  |   46 -
 .../jena/tdb/transaction/NodeTableTrans.java    |  412 -
 .../jena/tdb/transaction/ObjectFileTrans.java   |  241 -
 .../hpl/jena/tdb/transaction/SysTxnState.java   |   52 -
 .../transaction/TDBTransactionException.java    |   29 -
 .../hpl/jena/tdb/transaction/Transaction.java   |  331 -
 .../jena/tdb/transaction/TransactionAbort.java  |   27 -
 .../jena/tdb/transaction/TransactionInfo.java   |   69 -
 .../tdb/transaction/TransactionInfoMBean.java   |   47 -
 .../tdb/transaction/TransactionLifecycle.java   |   44 -
 .../tdb/transaction/TransactionManager.java     |  794 --
 .../hp/hpl/jena/tdb/transaction/TxnState.java   |   21 -
 .../org/apache/jena/tdb/StoreConnection.java    |  305 +
 .../src/main/java/org/apache/jena/tdb/TDB.java  |  282 +
 .../java/org/apache/jena/tdb/TDBBackup.java     |   62 +
 .../java/org/apache/jena/tdb/TDBException.java  |   29 +
 .../java/org/apache/jena/tdb/TDBFactory.java    |  176 +
 .../java/org/apache/jena/tdb/TDBLoader.java     |  279 +
 .../apache/jena/tdb/assembler/AssemblerTDB.java |   29 +
 .../jena/tdb/assembler/DatasetAssemblerTDB.java |   78 +
 .../jena/tdb/assembler/IndexAssembler.java      |   91 +
 .../jena/tdb/assembler/NodeTableAssembler.java  |   61 +
 .../jena/tdb/assembler/SettingAssembler.java    |   49 +
 .../jena/tdb/assembler/TDBGraphAssembler.java   |  125 +
 .../org/apache/jena/tdb/assembler/Vocab.java    |   41 +
 .../org/apache/jena/tdb/assembler/VocabTDB.java |   95 +
 .../apache/jena/tdb/base/StorageException.java  |   27 +
 .../org/apache/jena/tdb/base/block/Block.java   |  179 +
 .../jena/tdb/base/block/BlockConverter.java     |   33 +
 .../jena/tdb/base/block/BlockException.java     |   29 +
 .../apache/jena/tdb/base/block/BlockMgr.java    |  105 +
 .../jena/tdb/base/block/BlockMgrBase.java       |   57 +
 .../jena/tdb/base/block/BlockMgrCache.java      |  363 +
 .../jena/tdb/base/block/BlockMgrFactory.java    |  151 +
 .../jena/tdb/base/block/BlockMgrFileAccess.java |  158 +
 .../jena/tdb/base/block/BlockMgrFreeChain.java  |   82 +
 .../jena/tdb/base/block/BlockMgrLogger.java     |  211 +
 .../jena/tdb/base/block/BlockMgrReadonly.java   |   53 +
 .../jena/tdb/base/block/BlockMgrSwitcher.java   |   40 +
 .../jena/tdb/base/block/BlockMgrSync.java       |  197 +
 .../jena/tdb/base/block/BlockMgrTracker.java    |  469 ++
 .../jena/tdb/base/block/BlockMgrWrapper.java    |  179 +
 .../apache/jena/tdb/base/block/BlockParams.java |   27 +
 .../apache/jena/tdb/base/block/BlockType.java   |   70 +
 .../apache/jena/tdb/base/block/FileMode.java    |   27 +
 .../apache/jena/tdb/base/buffer/BufferBase.java |  265 +
 .../jena/tdb/base/buffer/BufferException.java   |   27 +
 .../apache/jena/tdb/base/buffer/PtrBuffer.java  |  142 +
 .../jena/tdb/base/buffer/RecordBuffer.java      |  246 +
 .../tdb/base/buffer/RecordBufferIterator.java   |   99 +
 .../apache/jena/tdb/base/file/BlockAccess.java  |   52 +
 .../jena/tdb/base/file/BlockAccessBase.java     |  160 +
 .../tdb/base/file/BlockAccessByteArray.java     |  124 +
 .../jena/tdb/base/file/BlockAccessDirect.java   |  125 +
 .../jena/tdb/base/file/BlockAccessMapped.java   |  285 +
 .../jena/tdb/base/file/BlockAccessMem.java      |  164 +
 .../jena/tdb/base/file/BufferAllocator.java     |   43 +
 .../tdb/base/file/BufferAllocatorDirect.java    |   46 +
 .../tdb/base/file/BufferAllocatorMapped.java    |  145 +
 .../jena/tdb/base/file/BufferAllocatorMem.java  |   46 +
 .../jena/tdb/base/file/BufferChannel.java       |   92 +
 .../jena/tdb/base/file/BufferChannelFile.java   |  174 +
 .../jena/tdb/base/file/BufferChannelMem.java    |  238 +
 .../jena/tdb/base/file/ChannelManager.java      |  125 +
 .../org/apache/jena/tdb/base/file/FileBase.java |  114 +
 .../jena/tdb/base/file/FileException.java       |   29 +
 .../apache/jena/tdb/base/file/FileFactory.java  |   50 +
 .../org/apache/jena/tdb/base/file/FileSet.java  |  115 +
 .../org/apache/jena/tdb/base/file/Location.java |  266 +
 .../apache/jena/tdb/base/file/LocationLock.java |  282 +
 .../org/apache/jena/tdb/base/file/MetaFile.java |  373 +
 .../apache/jena/tdb/base/file/PlainFile.java    |   59 +
 .../apache/jena/tdb/base/file/PlainFileMem.java |   55 +
 .../jena/tdb/base/file/PlainFilePersistent.java |   68 +
 .../jena/tdb/base/objectfile/ObjectFile.java    |   78 +
 .../tdb/base/objectfile/ObjectFileLogger.java   |  138 +
 .../tdb/base/objectfile/ObjectFileStorage.java  |  481 ++
 .../tdb/base/objectfile/ObjectFileSwitcher.java |   46 +
 .../tdb/base/objectfile/ObjectFileWrapper.java  |   76 +
 .../jena/tdb/base/objectfile/StringFile.java    |  141 +
 .../org/apache/jena/tdb/base/page/Page.java     |   37 +
 .../org/apache/jena/tdb/base/page/PageBase.java |   58 +
 .../apache/jena/tdb/base/page/PageBlockMgr.java |  141 +
 .../org/apache/jena/tdb/base/record/Record.java |  230 +
 .../jena/tdb/base/record/RecordException.java   |   27 +
 .../jena/tdb/base/record/RecordFactory.java     |  180 +
 .../tdb/base/recordbuffer/RecordBufferPage.java |   95 +
 .../base/recordbuffer/RecordBufferPageBase.java |  111 +
 .../base/recordbuffer/RecordBufferPageMgr.java  |  100 +
 .../base/recordbuffer/RecordRangeIterator.java  |  165 +
 .../jena/tdb/graph/TransactionHandlerTDB.java   |   62 +
 .../apache/jena/tdb/index/BuilderStdIndex.java  |  109 +
 .../java/org/apache/jena/tdb/index/Index.java   |   67 +
 .../org/apache/jena/tdb/index/IndexBuilder.java |   26 +
 .../org/apache/jena/tdb/index/IndexFactory.java |   91 +
 .../org/apache/jena/tdb/index/IndexLib.java     |   39 +
 .../org/apache/jena/tdb/index/IndexLogger.java  |   65 +
 .../org/apache/jena/tdb/index/IndexMap.java     |  171 +
 .../org/apache/jena/tdb/index/IndexParams.java  |   38 +
 .../org/apache/jena/tdb/index/IndexWrapper.java |   80 +
 .../org/apache/jena/tdb/index/RangeIndex.java   |   36 +
 .../jena/tdb/index/RangeIndexBuilder.java       |   26 +
 .../apache/jena/tdb/index/RangeIndexLogger.java |   72 +
 .../jena/tdb/index/RangeIndexWrapper.java       |  101 +
 .../org/apache/jena/tdb/index/SetupIndex.java   |  173 +
 .../tdb/index/bplustree/BPTreeException.java    |   27 +
 .../jena/tdb/index/bplustree/BPTreeNode.java    | 1542 ++++
 .../tdb/index/bplustree/BPTreeNodeBuilder.java  |  175 +
 .../jena/tdb/index/bplustree/BPTreeNodeMgr.java |  272 +
 .../jena/tdb/index/bplustree/BPTreePage.java    |  131 +
 .../jena/tdb/index/bplustree/BPTreePageMgr.java |   38 +
 .../jena/tdb/index/bplustree/BPTreeRecords.java |  348 +
 .../tdb/index/bplustree/BPTreeRecordsMgr.java   |   97 +
 .../jena/tdb/index/bplustree/BPlusTree.java     |  491 ++
 .../tdb/index/bplustree/BPlusTreeParams.java    |  284 +
 .../tdb/index/bplustree/BPlusTreeRewriter.java  |  386 +
 .../index/bplustree/BPlusTreeRewriterUtils.java |  110 +
 .../tdb/index/bplustree/BPlusTreeTools.java     |  156 +
 .../index/bplustree/RecordBufferPageLinker.java |   85 +
 .../index/bplustree/RecordBufferPagePacker.java |   94 +
 .../org/apache/jena/tdb/index/ext/ExtHash.java  |  727 ++
 .../jena/tdb/index/ext/ExtHashIterator.java     |   94 +
 .../jena/tdb/index/ext/ExtHashParams.java       |   31 +
 .../apache/jena/tdb/index/ext/HashBucket.java   |  182 +
 .../jena/tdb/index/ext/HashBucketMgr.java       |  129 +
 .../java/org/apache/jena/tdb/lib/DumpOps.java   |  185 +
 .../main/java/org/apache/jena/tdb/lib/Lib2.java |   46 +
 .../java/org/apache/jena/tdb/lib/NodeLib.java   |  226 +
 .../org/apache/jena/tdb/lib/StringAbbrev.java   |   81 +
 .../java/org/apache/jena/tdb/lib/TupleLib.java  |  170 +
 .../java/org/apache/jena/tdb/mgt/TDBMgt.java    |   33 +
 .../org/apache/jena/tdb/mgt/TDBSystemInfo.java  |   42 +
 .../apache/jena/tdb/mgt/TDBSystemInfoMBean.java |   54 +
 .../java/org/apache/jena/tdb/migrate/A2.java    |   38 +
 .../org/apache/jena/tdb/migrate/CachingPF.java  |   51 +
 .../org/apache/jena/tdb/migrate/LockTx.java     |   71 +
 .../jena/tdb/migrate/TransformGraphRename.java  |   54 +
 .../apache/jena/tdb/modify/UpdateEngineTDB.java |   53 +
 .../apache/jena/tdb/setup/BlockMgrBuilder.java  |   27 +
 .../java/org/apache/jena/tdb/setup/Build.java   |  149 +
 .../org/apache/jena/tdb/setup/BuilderStdDB.java |   99 +
 .../apache/jena/tdb/setup/DatasetBuilder.java   |   33 +
 .../jena/tdb/setup/DatasetBuilderStd.java       |  465 ++
 .../apache/jena/tdb/setup/NodeTableBuilder.java |   26 +
 .../jena/tdb/setup/ObjectFileBuilder.java       |   26 +
 .../org/apache/jena/tdb/setup/StoreParams.java  |  474 ++
 .../jena/tdb/setup/StoreParamsBuilder.java      |  344 +
 .../apache/jena/tdb/setup/StoreParamsCodec.java |  214 +
 .../apache/jena/tdb/setup/StoreParamsConst.java |  118 +
 .../jena/tdb/setup/StoreParamsDynamic.java      |   54 +
 .../jena/tdb/setup/TupleIndexBuilder.java       |   27 +
 .../org/apache/jena/tdb/solver/Abortable.java   |   21 +
 .../apache/jena/tdb/solver/BindingNodeId.java   |  113 +
 .../org/apache/jena/tdb/solver/BindingTDB.java  |  155 +
 .../apache/jena/tdb/solver/OpExecutorTDB1.java  |  428 ++
 .../java/org/apache/jena/tdb/solver/QC2.java    |   49 +
 .../apache/jena/tdb/solver/QueryEngineTDB.java  |  211 +
 .../apache/jena/tdb/solver/QueryIterTDB.java    |   59 +
 .../jena/tdb/solver/QueryIteratorIdToNode.java  |   67 +
 .../org/apache/jena/tdb/solver/SolverLib.java   |  349 +
 .../tdb/solver/StageGeneratorDirectTDB.java     |   58 +
 .../apache/jena/tdb/solver/StageMatchTuple.java |  190 +
 .../org/apache/jena/tdb/solver/stats/Stats.java |  138 +
 .../jena/tdb/solver/stats/StatsCollector.java   |   36 +
 .../tdb/solver/stats/StatsCollectorBase.java    |   54 +
 .../tdb/solver/stats/StatsCollectorNodeId.java  |   56 +
 .../jena/tdb/solver/stats/StatsResults.java     |   53 +
 .../apache/jena/tdb/store/DatasetGraphTDB.java  |  277 +
 .../tdb/store/DatasetPrefixStorageLogger.java   |  122 +
 .../jena/tdb/store/DatasetPrefixesTDB.java      |  180 +
 .../org/apache/jena/tdb/store/DateTimeNode.java |  264 +
 .../org/apache/jena/tdb/store/DecimalNode.java  |  152 +
 .../org/apache/jena/tdb/store/GraphTDB.java     |  287 +
 .../java/org/apache/jena/tdb/store/Hash.java    |   57 +
 .../org/apache/jena/tdb/store/IntegerNode.java  |   51 +
 .../java/org/apache/jena/tdb/store/NodeId.java  |  381 +
 .../org/apache/jena/tdb/store/NodeType.java     |  199 +
 .../org/apache/jena/tdb/store/QuadTable.java    |   94 +
 .../org/apache/jena/tdb/store/SinkProgress.java |  159 +
 .../apache/jena/tdb/store/StorageConfig.java    |   52 +
 .../org/apache/jena/tdb/store/TableBase.java    |   60 +
 .../org/apache/jena/tdb/store/TripleTable.java  |   83 +
 .../bulkloader/BuilderSecondaryIndexes.java     |   26 +
 .../BuilderSecondaryIndexesInterleaved.java     |   46 +
 .../BuilderSecondaryIndexesParallel.java        |   72 +
 .../BuilderSecondaryIndexesSequential.java      |   52 +
 .../jena/tdb/store/bulkloader/BulkLoader.java   |  380 +
 .../tdb/store/bulkloader/BulkStreamRDF.java     |   27 +
 .../jena/tdb/store/bulkloader/LoadMonitor.java  |  278 +
 .../store/bulkloader/LoaderNodeTupleTable.java  |  215 +
 .../tdb/store/bulkloader2/CmdIndexBuild.java    |  135 +
 .../tdb/store/bulkloader2/CmdIndexCopy.java     |  123 +
 .../store/bulkloader2/CmdNodeTableBuilder.java  |  301 +
 .../tdb/store/bulkloader2/RecordsFromInput.java |  154 +
 .../jena/tdb/store/bulkloader2/WriteRows.java   |   86 +
 .../jena/tdb/store/nodetable/NodeTable.java     |   64 +
 .../tdb/store/nodetable/NodeTableCache.java     |  289 +
 .../tdb/store/nodetable/NodeTableInline.java    |   72 +
 .../jena/tdb/store/nodetable/NodeTableLib.java  |   42 +
 .../tdb/store/nodetable/NodeTableLogger.java    |  136 +
 .../tdb/store/nodetable/NodeTableNative.java    |  261 +
 .../tdb/store/nodetable/NodeTableReadonly.java  |   40 +
 .../tdb/store/nodetable/NodeTableWrapper.java   |   87 +
 .../apache/jena/tdb/store/nodetable/Nodec.java  |   56 +
 .../jena/tdb/store/nodetable/NodecLib.java      |   95 +
 .../jena/tdb/store/nodetable/NodecSSE.java      |  208 +
 .../store/nodetupletable/NodeTupleTable.java    |   76 +
 .../nodetupletable/NodeTupleTableConcrete.java  |  257 +
 .../nodetupletable/NodeTupleTableView.java      |  105 +
 .../nodetupletable/NodeTupleTableWrapper.java   |  105 +
 .../jena/tdb/store/tupletable/TupleIndex.java   |   69 +
 .../tdb/store/tupletable/TupleIndexBase.java    |  122 +
 .../tdb/store/tupletable/TupleIndexRecord.java  |  246 +
 .../tdb/store/tupletable/TupleIndexWrapper.java |  103 +
 .../jena/tdb/store/tupletable/TupleTable.java   |  274 +
 .../org/apache/jena/tdb/sys/DatasetControl.java |   43 +
 .../apache/jena/tdb/sys/DatasetControlMRSW.java |  161 +
 .../jena/tdb/sys/DatasetControlMutable.java     |   60 +
 .../apache/jena/tdb/sys/DatasetControlNone.java |   49 +
 .../jena/tdb/sys/DatasetControlReadOnly.java    |   60 +
 .../java/org/apache/jena/tdb/sys/DebugTDB.java  |  131 +
 .../java/org/apache/jena/tdb/sys/EnvTDB.java    |   62 +
 .../java/org/apache/jena/tdb/sys/FileRef.java   |  188 +
 .../org/apache/jena/tdb/sys/LockMRSWLite.java   |   79 +
 .../java/org/apache/jena/tdb/sys/Names.java     |  142 +
 .../org/apache/jena/tdb/sys/ProcessUtils.java   |  157 +
 .../java/org/apache/jena/tdb/sys/Session.java   |   46 +
 .../java/org/apache/jena/tdb/sys/SetupTDB.java  |  257 +
 .../java/org/apache/jena/tdb/sys/SystemTDB.java |  406 +
 .../org/apache/jena/tdb/sys/TDBInternal.java    |  162 +
 .../java/org/apache/jena/tdb/sys/TDBMaker.java  |   73 +
 .../jena/tdb/transaction/BlockMgrJournal.java   |  384 +
 .../jena/tdb/transaction/DatasetBuilderTxn.java |  187 +
 .../transaction/DatasetGraphTransaction.java    |  238 +
 .../jena/tdb/transaction/DatasetGraphTxn.java   |   67 +
 .../apache/jena/tdb/transaction/Journal.java    |  306 +
 .../jena/tdb/transaction/JournalControl.java    |  312 +
 .../jena/tdb/transaction/JournalEntry.java      |  103 +
 .../jena/tdb/transaction/JournalEntryType.java  |   46 +
 .../jena/tdb/transaction/NodeTableTrans.java    |  411 +
 .../jena/tdb/transaction/ObjectFileTrans.java   |  240 +
 .../jena/tdb/transaction/SysTxnState.java       |   52 +
 .../transaction/TDBTransactionException.java    |   29 +
 .../jena/tdb/transaction/Transaction.java       |  330 +
 .../jena/tdb/transaction/TransactionAbort.java  |   27 +
 .../jena/tdb/transaction/TransactionInfo.java   |   69 +
 .../tdb/transaction/TransactionInfoMBean.java   |   47 +
 .../tdb/transaction/TransactionLifecycle.java   |   44 +
 .../tdb/transaction/TransactionManager.java     |  793 ++
 .../apache/jena/tdb/transaction/TxnState.java   |   21 +
 jena-tdb/src/main/java/tdb/CmdRewriteIndex.java |   31 +-
 jena-tdb/src/main/java/tdb/cmdline/CmdSub.java  |    2 +-
 jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java  |   23 +-
 .../src/main/java/tdb/cmdline/CmdTDBGraph.java  |   18 +-
 .../src/main/java/tdb/cmdline/ModLocation.java  |   13 +-
 .../src/main/java/tdb/cmdline/ModModel.java     |   14 +-
 .../main/java/tdb/cmdline/ModTDBAssembler.java  |    9 +-
 .../main/java/tdb/cmdline/ModTDBDataset.java    |   31 +-
 .../main/java/tdb/cmdline/ModTDBGraphStore.java |   52 -
 jena-tdb/src/main/java/tdb/tdbbackup.java       |    3 +-
 jena-tdb/src/main/java/tdb/tdbconfig.java       |   33 +-
 jena-tdb/src/main/java/tdb/tdbdump.java         |    3 +-
 jena-tdb/src/main/java/tdb/tdbloader.java       |   29 +-
 jena-tdb/src/main/java/tdb/tdbnode.java         |   15 +-
 jena-tdb/src/main/java/tdb/tdbquery.java        |    3 +-
 jena-tdb/src/main/java/tdb/tdbrecovery.java     |    7 +-
 jena-tdb/src/main/java/tdb/tdbreorder.java      |   31 +-
 jena-tdb/src/main/java/tdb/tdbstats.java        |   21 +-
 jena-tdb/src/main/java/tdb/tdbupdate.java       |   47 +-
 jena-tdb/src/main/java/tdb/tools/dumpbpt.java   |   34 +-
 .../src/main/java/tdb/tools/dumpnodetable.java  |   34 +-
 .../src/main/java/tdb/tools/tdbgenindex.java    |   17 +-
 .../java/com/hp/hpl/jena/tdb/ConfigTest.java    |   97 -
 .../test/java/com/hp/hpl/jena/tdb/TC_TDB.java   |   90 -
 .../java/com/hp/hpl/jena/tdb/TS_Factory.java    |   33 -
 .../com/hp/hpl/jena/tdb/TestTDBFactory.java     |  108 -
 .../hpl/jena/tdb/assembler/TS_TDBAssembler.java |   34 -
 .../jena/tdb/assembler/TestTDBAssembler.java    |  145 -
 .../com/hp/hpl/jena/tdb/base/BufferTestLib.java |   63 -
 .../java/com/hp/hpl/jena/tdb/base/TC_Base.java  |   39 -
 .../tdb/base/block/AbstractTestBlockMgr.java    |  133 -
 .../hp/hpl/jena/tdb/base/block/TS_Block.java    |   34 -
 .../jena/tdb/base/block/TestBlockMgrDirect.java |   47 -
 .../jena/tdb/base/block/TestBlockMgrMapped.java |   63 -
 .../jena/tdb/base/block/TestBlockMgrMem.java    |   28 -
 .../tdb/base/block/TestBlockMgrTracked.java     |  148 -
 .../hpl/jena/tdb/base/buffer/TestPtrBuffer.java |  321 -
 .../jena/tdb/base/buffer/TestRecordBuffer.java  |  346 -
 .../file/AbstractTestBlockAccessFixedSize.java  |  101 -
 .../file/AbstractTestBlockAccessVarSize.java    |   51 -
 .../jena/tdb/base/file/AbstractTestChannel.java |  146 -
 .../com/hp/hpl/jena/tdb/base/file/TS_File.java  |   38 -
 .../tdb/base/file/TestBlockAccessByteArray.java |   30 -
 .../tdb/base/file/TestBlockAccessDirect.java    |   44 -
 .../tdb/base/file/TestBlockAccessMapped.java    |   48 -
 .../jena/tdb/base/file/TestBlockAccessMem.java  |   35 -
 .../hpl/jena/tdb/base/file/TestChannelFile.java |   40 -
 .../hpl/jena/tdb/base/file/TestChannelMem.java  |   35 -
 .../jena/tdb/base/file/TestLocationLock.java    |  148 -
 .../hp/hpl/jena/tdb/base/file/TestMetaFile.java |   75 -
 .../base/objectfile/AbstractTestObjectFile.java |  141 -
 .../base/objectfile/AbstractTestStringFile.java |  147 -
 .../jena/tdb/base/objectfile/TS_ObjectFile.java |   34 -
 .../objectfile/TestObjectFileBuffering.java     |  101 -
 .../tdb/base/objectfile/TestObjectFileDisk.java |   49 -
 .../tdb/base/objectfile/TestObjectFileMem.java  |   39 -
 .../tdb/base/objectfile/TestStringFileDisk.java |   50 -
 .../tdb/base/objectfile/TestStringFileMem.java  |   41 -
 .../hp/hpl/jena/tdb/base/record/RecordLib.java  |  121 -
 .../hp/hpl/jena/tdb/base/record/TS_Record.java  |   36 -
 .../hp/hpl/jena/tdb/base/record/TestRecord.java |   80 -
 .../jena/tdb/base/recordfile/TS_RecordFile.java |   32 -
 .../base/recordfile/TestRecordBufferPage.java   |  126 -
 .../hpl/jena/tdb/extra/T_QuadsObjectIsNull.java |  111 -
 .../jena/tdb/extra/T_TDBWriteTransaction.java   |  152 -
 .../hpl/jena/tdb/extra/T_TimeoutTDBPattern.java |  112 -
 .../hp/hpl/jena/tdb/extra/T_TransSystem.java    |  675 --
 .../tdb/extra/T_TransSystemMultiDatasets.java   |  554 --
 .../hpl/jena/tdb/extra/T_TxnDeadlockTest.java   |  142 -
 .../jena/tdb/graph/AbstractTestGraphsTDB.java   |   60 -
 .../com/hp/hpl/jena/tdb/graph/TS_Graph.java     |   37 -
 .../hpl/jena/tdb/graph/TestBulkUpdateTDB.java   |  103 -
 .../tdb/graph/TestDatasetGraphAccessorTDB.java  |   36 -
 .../hpl/jena/tdb/graph/TestDatasetGraphTDB.java |   38 -
 .../jena/tdb/graph/TestGraphOverDatasetTDB.java |   46 -
 .../hp/hpl/jena/tdb/graph/TestGraphsTDB1.java   |   34 -
 .../hp/hpl/jena/tdb/graph/TestGraphsTDB2.java   |   37 -
 .../jena/tdb/graph/TestPrefixMappingTDB.java    |  149 -
 .../hpl/jena/tdb/index/AbstractTestIndex.java   |  157 -
 .../jena/tdb/index/AbstractTestRangeIndex.java  |  435 --
 .../com/hp/hpl/jena/tdb/index/IndexMaker.java   |   25 -
 .../hpl/jena/tdb/index/IndexTestGenerator.java  |   45 -
 .../com/hp/hpl/jena/tdb/index/IndexTestLib.java |  224 -
 .../hp/hpl/jena/tdb/index/RangeIndexMaker.java  |   28 -
 .../com/hp/hpl/jena/tdb/index/TS_Index.java     |   42 -
 .../com/hp/hpl/jena/tdb/index/TestIndexMem.java |   32 -
 .../tdb/index/bplustree/BPlusTreeMaker.java     |   58 -
 .../bplustree/CmdTestBPlusTreeRewriter.java     |  134 -
 .../tdb/index/bplustree/TestBPTreeRecords.java  |  352 -
 .../jena/tdb/index/bplustree/TestBPlusTree.java |   59 -
 .../index/bplustree/TestBPlusTreeRewriter.java  |  200 -
 .../hpl/jena/tdb/index/ext/ExtHashTestBase.java |  163 -
 .../hp/hpl/jena/tdb/index/ext/TestExtHash.java  |   64 -
 .../jena/tdb/junit/AbstractTestGraphTDB.java    |   34 -
 .../java/com/hp/hpl/jena/tdb/junit/Base_TS.java |   50 -
 .../hp/hpl/jena/tdb/junit/GraphLocation.java    |  108 -
 .../com/hp/hpl/jena/tdb/junit/QueryTestTDB.java |  187 -
 .../hp/hpl/jena/tdb/junit/TDBTestException.java |   29 -
 .../hp/hpl/jena/tdb/junit/TestFactoryTDB.java   |   89 -
 .../java/com/hp/hpl/jena/tdb/lib/TS_LibTDB.java |   36 -
 .../com/hp/hpl/jena/tdb/lib/TestNodeLib.java    |   71 -
 .../hp/hpl/jena/tdb/lib/TestStringAbbrev.java   |   60 -
 .../com/hp/hpl/jena/tdb/setup/TS_TDBSetup.java  |   33 -
 .../hp/hpl/jena/tdb/setup/TestStoreParams.java  |  143 -
 .../jena/tdb/setup/TestStoreParamsChoose.java   |  158 -
 .../jena/tdb/setup/TestStoreParamsCreate.java   |  171 -
 .../hp/hpl/jena/tdb/solver/TS_SolverTDB.java    |   31 -
 .../hp/hpl/jena/tdb/solver/TestSolverTDB.java   |  174 -
 .../com/hp/hpl/jena/tdb/solver/TestStats.java   |  114 -
 .../tdb/store/AbstractStoreConnections.java     |  252 -
 .../com/hp/hpl/jena/tdb/store/TS_Store.java     |   64 -
 .../jena/tdb/store/TestConcurrentAccess.java    |  227 -
 .../hp/hpl/jena/tdb/store/TestDatasetTDB.java   |  312 -
 .../jena/tdb/store/TestDatasetTDBPersist.java   |  148 -
 .../jena/tdb/store/TestDynamicDatasetTDB.java   |   38 -
 .../hpl/jena/tdb/store/TestGraphNamedTDB.java   |   43 -
 .../com/hp/hpl/jena/tdb/store/TestGraphTDB.java |   84 -
 .../com/hp/hpl/jena/tdb/store/TestLoader.java   |  166 -
 .../store/TestLocationLockStoreConnection.java  |   98 -
 .../com/hp/hpl/jena/tdb/store/TestNodeId.java   |  260 -
 .../hp/hpl/jena/tdb/store/TestQuadFilter.java   |  132 -
 .../tdb/store/TestStoreConnectionsDirect.java   |   45 -
 .../tdb/store/TestStoreConnectionsMapped.java   |   45 -
 .../hpl/jena/tdb/store/TestSuiteGraphTDB.java   |   41 -
 .../hp/hpl/jena/tdb/store/TestTripleTable.java  |  133 -
 .../hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java  |  232 -
 .../store/nodetable/AbstractTestNodeTable.java  |  107 -
 .../jena/tdb/store/nodetable/TS_NodeTable.java  |   33 -
 .../hpl/jena/tdb/store/nodetable/TestCodec.java |  125 -
 .../jena/tdb/store/nodetable/TestNodeTable.java |   32 -
 .../store/nodetable/TestNodeTableStored.java    |   32 -
 .../tupletable/AbstractTestTupleIndex.java      |  271 -
 .../tdb/store/tupletable/TS_TupleTable.java     |   32 -
 .../store/tupletable/TestTupleIndexRecord.java  |   45 -
 .../tupletable/TestTupleIndexRecordDirect.java  |  321 -
 .../tdb/store/tupletable/TestTupleTable.java    |  160 -
 .../java/com/hp/hpl/jena/tdb/sys/TS_Sys.java    |   35 -
 .../java/com/hp/hpl/jena/tdb/sys/TestOps.java   |   31 -
 .../java/com/hp/hpl/jena/tdb/sys/TestSys.java   |   34 -
 .../transaction/AbstractTestNodeTableTrans.java |  234 -
 .../AbstractTestObjectFileTrans.java            |  155 -
 .../tdb/transaction/AbstractTestTransSeq.java   |  527 --
 .../AbstractTestTransSequentialDisk.java        |   52 -
 .../jena/tdb/transaction/TS_TransactionTDB.java |   56 -
 .../hpl/jena/tdb/transaction/TestJournal.java   |  215 -
 .../tdb/transaction/TestNodeTableTransDisk.java |   52 -
 .../tdb/transaction/TestNodeTableTransMem.java  |   38 -
 .../tdb/transaction/TestObjectFileTransMem.java |   36 -
 .../transaction/TestObjectFileTransStorage.java |   53 -
 .../tdb/transaction/TestTransDiskDirect.java    |   34 -
 .../tdb/transaction/TestTransDiskMapped.java    |   35 -
 .../jena/tdb/transaction/TestTransIterator.java |   85 -
 .../hpl/jena/tdb/transaction/TestTransMem.java  |   42 -
 .../jena/tdb/transaction/TestTransRestart.java  |  142 -
 .../tdb/transaction/TestTransactionTDB.java     |   90 -
 .../transaction/TestTransactionUnionGraph.java  |  188 -
 .../hpl/jena/tdb/transaction/TransTestLib.java  |   64 -
 .../java/org/apache/jena/tdb/ConfigTest.java    |   96 +
 .../test/java/org/apache/jena/tdb/TC_TDB.java   |   89 +
 .../java/org/apache/jena/tdb/TS_Factory.java    |   33 +
 .../org/apache/jena/tdb/TestTDBFactory.java     |  155 +
 .../jena/tdb/assembler/TS_TDBAssembler.java     |   33 +
 .../jena/tdb/assembler/TestTDBAssembler.java    |  145 +
 .../org/apache/jena/tdb/base/BufferTestLib.java |   63 +
 .../java/org/apache/jena/tdb/base/TC_Base.java  |   38 +
 .../tdb/base/block/AbstractTestBlockMgr.java    |  134 +
 .../apache/jena/tdb/base/block/TS_Block.java    |   34 +
 .../jena/tdb/base/block/TestBlockMgrDirect.java |   49 +
 .../jena/tdb/base/block/TestBlockMgrMapped.java |   64 +
 .../jena/tdb/base/block/TestBlockMgrMem.java    |   31 +
 .../tdb/base/block/TestBlockMgrTracked.java     |  142 +
 .../jena/tdb/base/buffer/TestPtrBuffer.java     |  318 +
 .../jena/tdb/base/buffer/TestRecordBuffer.java  |  346 +
 .../file/AbstractTestBlockAccessFixedSize.java  |  102 +
 .../file/AbstractTestBlockAccessVarSize.java    |   50 +
 .../jena/tdb/base/file/AbstractTestChannel.java |  145 +
 .../org/apache/jena/tdb/base/file/TS_File.java  |   38 +
 .../tdb/base/file/TestBlockAccessByteArray.java |   33 +
 .../tdb/base/file/TestBlockAccessDirect.java    |   45 +
 .../tdb/base/file/TestBlockAccessMapped.java    |   49 +
 .../jena/tdb/base/file/TestBlockAccessMem.java  |   38 +
 .../jena/tdb/base/file/TestChannelFile.java     |   39 +
 .../jena/tdb/base/file/TestChannelMem.java      |   35 +
 .../jena/tdb/base/file/TestLocationLock.java    |  149 +
 .../apache/jena/tdb/base/file/TestMetaFile.java |   75 +
 .../base/objectfile/AbstractTestObjectFile.java |  141 +
 .../base/objectfile/AbstractTestStringFile.java |  146 +
 .../jena/tdb/base/objectfile/TS_ObjectFile.java |   34 +
 .../objectfile/TestObjectFileBuffering.java     |  102 +
 .../tdb/base/objectfile/TestObjectFileDisk.java |   50 +
 .../tdb/base/objectfile/TestObjectFileMem.java  |   40 +
 .../tdb/base/objectfile/TestStringFileDisk.java |   49 +
 .../tdb/base/objectfile/TestStringFileMem.java  |   41 +
 .../apache/jena/tdb/base/record/RecordLib.java  |  112 +
 .../apache/jena/tdb/base/record/TS_Record.java  |   35 +
 .../apache/jena/tdb/base/record/TestRecord.java |   78 +
 .../jena/tdb/base/recordfile/TS_RecordFile.java |   32 +
 .../base/recordfile/TestRecordBufferPage.java   |  125 +
 .../jena/tdb/extra/T_QuadsObjectIsNull.java     |  110 +
 .../jena/tdb/extra/T_TDBWriteTransaction.java   |  151 +
 .../jena/tdb/extra/T_TimeoutTDBPattern.java     |  112 +
 .../apache/jena/tdb/extra/T_TransSystem.java    |  674 ++
 .../tdb/extra/T_TransSystemMultiDatasets.java   |  553 ++
 .../jena/tdb/extra/T_TxnDeadlockTest.java       |  141 +
 .../jena/tdb/graph/AbstractTestGraphsTDB.java   |   59 +
 .../org/apache/jena/tdb/graph/TS_Graph.java     |   36 +
 .../tdb/graph/TestDatasetGraphAccessorTDB.java  |   35 +
 .../jena/tdb/graph/TestDatasetGraphTDB.java     |   37 +
 .../jena/tdb/graph/TestGraphOverDatasetTDB.java |   46 +
 .../apache/jena/tdb/graph/TestGraphsTDB1.java   |   34 +
 .../apache/jena/tdb/graph/TestGraphsTDB2.java   |   36 +
 .../jena/tdb/graph/TestPrefixMappingTDB.java    |  148 +
 .../jena/tdb/index/AbstractTestIndex.java       |  154 +
 .../jena/tdb/index/AbstractTestRangeIndex.java  |  435 ++
 .../org/apache/jena/tdb/index/IndexMaker.java   |   27 +
 .../jena/tdb/index/IndexTestGenerator.java      |   45 +
 .../org/apache/jena/tdb/index/IndexTestLib.java |  225 +
 .../apache/jena/tdb/index/RangeIndexMaker.java  |   28 +
 .../org/apache/jena/tdb/index/TS_Index.java     |   41 +
 .../org/apache/jena/tdb/index/TestIndexMem.java |   34 +
 .../tdb/index/bplustree/BPlusTreeMaker.java     |   58 +
 .../bplustree/CmdTestBPlusTreeRewriter.java     |  134 +
 .../tdb/index/bplustree/TestBPTreeRecords.java  |  351 +
 .../jena/tdb/index/bplustree/TestBPlusTree.java |   60 +
 .../index/bplustree/TestBPlusTreeRewriter.java  |  199 +
 .../jena/tdb/index/ext/ExtHashTestBase.java     |  163 +
 .../apache/jena/tdb/index/ext/TestExtHash.java  |   63 +
 .../jena/tdb/junit/AbstractTestGraphTDB.java    |   34 +
 .../java/org/apache/jena/tdb/junit/Base_TS.java |   49 +
 .../apache/jena/tdb/junit/GraphLocation.java    |  107 +
 .../org/apache/jena/tdb/junit/QueryTestTDB.java |  186 +
 .../apache/jena/tdb/junit/TDBTestException.java |   29 +
 .../apache/jena/tdb/junit/TestFactoryTDB.java   |   88 +
 .../java/org/apache/jena/tdb/lib/TS_LibTDB.java |   35 +
 .../org/apache/jena/tdb/lib/TestNodeLib.java    |   70 +
 .../apache/jena/tdb/lib/TestStringAbbrev.java   |   61 +
 .../org/apache/jena/tdb/setup/TS_TDBSetup.java  |   33 +
 .../apache/jena/tdb/setup/TestStoreParams.java  |  145 +
 .../jena/tdb/setup/TestStoreParamsChoose.java   |  161 +
 .../jena/tdb/setup/TestStoreParamsCreate.java   |  172 +
 .../apache/jena/tdb/solver/TS_SolverTDB.java    |   31 +
 .../apache/jena/tdb/solver/TestSolverTDB.java   |  171 +
 .../org/apache/jena/tdb/solver/TestStats.java   |  113 +
 .../tdb/store/AbstractStoreConnections.java     |  251 +
 .../org/apache/jena/tdb/store/TS_Store.java     |   63 +
 .../jena/tdb/store/TestConcurrentAccess.java    |  214 +
 .../apache/jena/tdb/store/TestDatasetTDB.java   |  311 +
 .../jena/tdb/store/TestDatasetTDBPersist.java   |  148 +
 .../jena/tdb/store/TestDynamicDatasetTDB.java   |   41 +
 .../jena/tdb/store/TestGraphNamedTDB.java       |   43 +
 .../org/apache/jena/tdb/store/TestGraphTDB.java |   83 +
 .../org/apache/jena/tdb/store/TestLoader.java   |  167 +
 .../store/TestLocationLockStoreConnection.java  |   97 +
 .../org/apache/jena/tdb/store/TestNodeId.java   |  260 +
 .../apache/jena/tdb/store/TestQuadFilter.java   |  108 +
 .../tdb/store/TestStoreConnectionsDirect.java   |   44 +
 .../tdb/store/TestStoreConnectionsMapped.java   |   44 +
 .../jena/tdb/store/TestSuiteGraphTDB.java       |   40 +
 .../apache/jena/tdb/store/TestTripleTable.java  |  134 +
 .../apache/jena/tdb/store/Test_SPARQL_TDB.java  |  230 +
 .../store/nodetable/AbstractTestNodeTable.java  |  106 +
 .../jena/tdb/store/nodetable/TS_NodeTable.java  |   33 +
 .../jena/tdb/store/nodetable/TestCodec.java     |  121 +
 .../jena/tdb/store/nodetable/TestNodeTable.java |   33 +
 .../store/nodetable/TestNodeTableStored.java    |   33 +
 .../tupletable/AbstractTestTupleIndex.java      |  270 +
 .../tdb/store/tupletable/TS_TupleTable.java     |   32 +
 .../store/tupletable/TestTupleIndexRecord.java  |   45 +
 .../tupletable/TestTupleIndexRecordDirect.java  |  321 +
 .../tdb/store/tupletable/TestTupleTable.java    |  159 +
 .../java/org/apache/jena/tdb/sys/TS_Sys.java    |   34 +
 .../java/org/apache/jena/tdb/sys/TestOps.java   |   32 +
 .../java/org/apache/jena/tdb/sys/TestSys.java   |   33 +
 .../transaction/AbstractTestNodeTableTrans.java |  235 +
 .../AbstractTestObjectFileTrans.java            |  157 +
 .../tdb/transaction/AbstractTestTransSeq.java   |  527 ++
 .../AbstractTestTransSequentialDisk.java        |   51 +
 .../jena/tdb/transaction/TS_TransactionTDB.java |   56 +
 .../jena/tdb/transaction/TestJournal.java       |  217 +
 .../tdb/transaction/TestNodeTableTransDisk.java |   51 +
 .../tdb/transaction/TestNodeTableTransMem.java  |   38 +
 .../tdb/transaction/TestObjectFileTransMem.java |   36 +
 .../transaction/TestObjectFileTransStorage.java |   53 +
 .../tdb/transaction/TestTransDiskDirect.java    |   33 +
 .../tdb/transaction/TestTransDiskMapped.java    |   34 +
 .../jena/tdb/transaction/TestTransIterator.java |   84 +
 .../jena/tdb/transaction/TestTransMem.java      |   41 +
 .../jena/tdb/transaction/TestTransRestart.java  |  142 +
 .../tdb/transaction/TestTransactionTDB.java     |   89 +
 .../transaction/TestTransactionUnionGraph.java  |  185 +
 .../jena/tdb/transaction/TransTestLib.java      |   59 +
 .../testing/Assembler/tdb-dataset-embed.ttl     |    2 +-
 jena-tdb/testing/Assembler/tdb-dataset.ttl      |    2 +-
 jena-tdb/testing/Assembler/tdb-graph-embed.ttl  |    2 +-
 .../testing/Assembler/tdb-graph-ref-dataset.ttl |    2 +-
 jena-tdb/testing/Assembler/tdb-graph.ttl        |    2 +-
 .../testing/Assembler/tdb-named-graph-1.ttl     |    2 +-
 .../testing/Assembler/tdb-named-graph-2.ttl     |    2 +-
 jena-text/ReleaseNotes.txt                      |   10 -
 jena-text/pom.xml                               |   18 +-
 .../main/java/examples/JenaTextExample1.java    |   15 +-
 jena-text/src/main/java/jena/textindexdump.java |   11 +-
 jena-text/src/main/java/jena/textindexer.java   |   11 +-
 .../jena/query/text/DatasetGraphText.java       |   25 +-
 .../java/org/apache/jena/query/text/Entity.java |   22 +-
 .../jena/query/text/EntityDefinition.java       |   79 +-
 .../jena/query/text/TextDatasetFactory.java     |   88 +-
 .../apache/jena/query/text/TextDocProducer.java |    2 +-
 .../query/text/TextDocProducerEntities.java     |   11 +-
 .../jena/query/text/TextDocProducerTriples.java |   32 +-
 .../org/apache/jena/query/text/TextHit.java     |   47 +
 .../jena/query/text/TextHitConverter.java       |   56 +
 .../org/apache/jena/query/text/TextIndex.java   |   15 +-
 .../apache/jena/query/text/TextIndexConfig.java |   70 +
 .../jena/query/text/TextIndexException.java     |    2 +-
 .../apache/jena/query/text/TextIndexLucene.java |  205 +-
 .../query/text/TextIndexLuceneMultilingual.java |   75 +
 .../query/text/TextIndexParseException.java     |   40 +
 .../apache/jena/query/text/TextIndexSolr.java   |  186 +-
 .../org/apache/jena/query/text/TextQuery.java   |   17 +-
 .../apache/jena/query/text/TextQueryFuncs.java  |   17 +-
 .../org/apache/jena/query/text/TextQueryPF.java |  818 +-
 .../apache/jena/query/text/analyzer/Util.java   |   96 +
 .../assembler/EntityDefinitionAssembler.java    |  166 +-
 .../assembler/KeywordAnalyzerAssembler.java     |   11 +-
 .../assembler/LocalizedAnalyzerAssembler.java   |   60 +
 .../LowerCaseKeywordAnalyzerAssembler.java      |   13 +-
 .../text/assembler/SimpleAnalyzerAssembler.java |   13 +-
 .../assembler/StandardAnalyzerAssembler.java    |   95 +-
 .../query/text/assembler/TextAssembler.java     |   11 +-
 .../text/assembler/TextDatasetAssembler.java    |   73 +-
 .../assembler/TextIndexLuceneAssembler.java     |   66 +-
 .../text/assembler/TextIndexSolrAssembler.java  |   11 +-
 .../jena/query/text/assembler/TextVocab.java    |   13 +-
 .../AbstractTestDatasetWithGraphTextIndex.java  |  245 +-
 ...ractTestDatasetWithLuceneGraphTextIndex.java |   19 +-
 ...tasetWithLuceneTextIndexDeletionSupport.java |   53 +
 .../text/AbstractTestDatasetWithTextIndex.java  |  403 +-
 .../AbstractTestDatasetWithTextIndexBase.java   |  183 +-
 .../org/apache/jena/query/text/TS_Text.java     |    7 +-
 .../jena/query/text/TestBuildTextDataset.java   |   14 +-
 .../TestDatasetWithEmbeddedSolrTextIndex.java   |   44 +-
 .../text/TestDatasetWithKeywordAnalyzer.java    |  209 +-
 .../text/TestDatasetWithLocalizedAnalyzer.java  |  147 +
 ...TestDatasetWithLowerCaseKeywordAnalyzer.java |   50 +-
 .../TestDatasetWithLuceneGraphTextIndex.java    |   12 +-
 ...tDatasetWithLuceneMultilingualTextIndex.java |  238 +
 .../TestDatasetWithLuceneStoredLiterals.java    |  248 +
 .../text/TestDatasetWithLuceneTextIndex.java    |   13 +-
 ...tasetWithLuceneTextIndexDeletionSupport.java |  109 +
 ...DatasetWithLuceneTextIndexWithLangField.java |  126 +
 .../text/TestDatasetWithSimpleAnalyzer.java     |  187 +-
 .../text/TestDatasetWithStandardAnalyzer.java   |  227 +-
 .../text/TestLuceneWithMultipleThreads.java     |   33 +-
 .../org/apache/jena/query/text/TestTextTDB.java |   44 +-
 .../apache/jena/query/text/TextSearchUtil.java  |    4 +-
 .../assembler/AbstractTestTextAssembler.java    |  173 +-
 .../text/assembler/TestEntityMapAssembler.java  |  513 +-
 .../assembler/TestTextDatasetAssembler.java     |  210 +-
 .../assembler/TestTextIndexLuceneAssembler.java |    8 +-
 .../assembler/TestTextIndexSolrAssembler.java   |   81 +-
 jena-text/src/test/resources/log4j.properties   |    4 +-
 jena-text/testing/TextQuery/data.skos           |   36 +
 .../testing/TextQuery/text-config-union.ttl     |    2 +-
 jena-text/testing/TextQuery/text-config.ttl     |    2 +-
 .../testing/TextQuery/text-solr-config.ttl      |    2 +-
 jena-text/text-config.ttl                       |    2 +-
 pom.xml                                         |   26 +-
 8224 files changed, 519441 insertions(+), 528203 deletions(-)
----------------------------------------------------------------------



[31/50] [abbrv] jena git commit: Upgrade from Jetty 9.1.1 to 9.3.3

Posted by rv...@apache.org.
Upgrade from Jetty 9.1.1 to 9.3.3


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

Branch: refs/heads/JENA-507
Commit: 737098902927922f4858c1d878e84e0d32fa9364
Parents: eeb759c
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Sep 2 12:47:21 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Sep 2 12:47:21 2015 +0100

----------------------------------------------------------------------
 jena-fuseki2/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/73709890/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index cf1f897..2bfa165 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -61,8 +61,8 @@
   </licenses>
 
   <properties>
-    <ver.jetty>9.1.1.v20140108</ver.jetty>
-    <!-- <ver.jetty>9.3.2.v20150730</ver.jetty> -->
+    <!--<ver.jetty>9.1.1.v20140108</ver.jetty>-->
+    <ver.jetty>9.3.3.v20150827</ver.jetty>
     <ver.shiro>1.2.2</ver.shiro>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <build.time.xsd>${maven.build.timestamp}</build.time.xsd>  


[49/50] [abbrv] jena git commit: Start implementing Leviathan aggregates (JENA-507)

Posted by rv...@apache.org.
Start implementing Leviathan aggregates (JENA-507)

- Adds initial implementations for all(), any() and none()
- Reworks AccumulatorExpr slightly to be more extensible
- Adds an AccumulatorShortCircuitExpr for aggregates that support short
  circuiting


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

Branch: refs/heads/JENA-507
Commit: 7da685a9434844653e283efb499d2400800d1fdd
Parents: f7a660e
Author: Rob Vesse <rv...@apache.org>
Authored: Mon Sep 7 14:50:05 2015 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Mon Sep 7 14:50:05 2015 +0100

----------------------------------------------------------------------
 .../sparql/expr/aggregate/AccumulatorExpr.java  | 133 +++++++++++++------
 .../aggregate/AccumulatorShortCircuitExpr.java  |  85 ++++++++++++
 .../jena/sparql/expr/aggregate/AggAvg.java      |   3 +-
 .../library/leviathan/aggregates/AggAll.java    | 115 ++++++++++++++++
 .../library/leviathan/aggregates/AggAny.java    | 112 ++++++++++++++++
 .../library/leviathan/aggregates/AggNone.java   | 115 ++++++++++++++++
 6 files changed, 520 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/7da685a9/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
index b94c98b..1203d6a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
@@ -18,58 +18,109 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.expr.Expr ;
-import org.apache.jena.sparql.expr.ExprEvalException ;
-import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.function.FunctionEnv ;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprEvalException;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.function.FunctionEnv;
 
 /** Accumulator that passes down every value of an expression */
-abstract class AccumulatorExpr implements Accumulator
-{
-    private long count = 0 ;
-    protected long errorCount = 0 ; 
-    private final Expr expr ;
-    
-    protected AccumulatorExpr(Expr expr)
-    {
-        this.expr = expr ;
+public abstract class AccumulatorExpr implements Accumulator {
+    private long count = 0;
+    private long errorCount = 0;
+    private final Expr expr;
+
+    protected AccumulatorExpr(Expr expr) {
+        this.expr = expr;
     }
-    
+
     @Override
-    final public void accumulate(Binding binding, FunctionEnv functionEnv)
-    {
-        try { 
-            NodeValue nv = expr.eval(binding, functionEnv) ;
-            accumulate(nv, binding, functionEnv) ;
-            count++ ;
-        } catch (ExprEvalException ex)
-        {
-            errorCount++ ;
-            accumulateError(binding, functionEnv) ;
+    public void accumulate(Binding binding, FunctionEnv functionEnv) {
+        try {
+            NodeValue nv = expr.eval(binding, functionEnv);
+            accumulate(nv, binding, functionEnv);
+            incrementCount();
+        } catch (ExprEvalException ex) {
+            incrementErrorCount();
+            accumulateError(binding, functionEnv);
         }
     }
     
-    
-    // Count(?v) is different
+    /**
+     * Gets the expression
+     * @return Expression
+     */
+    protected final Expr getExpr() {
+        return expr;
+    }
+
+    /**
+     * Increments the count of valid expression evaluations
+     */
+    protected final void incrementCount() {
+        count++;
+    }
+
+    /**
+     * Increments the count of error expression evaluations
+     */
+    protected final void incrementErrorCount() {
+        errorCount++;
+    }
+
+    /**
+     * Gets the value of the accumulator
+     */
     @Override
-    public NodeValue getValue()
-    {
-        if ( errorCount == 0 )
-            return getAccValue() ;  
-        return null ;
+    public NodeValue getValue() {
+        if (errorCount == 0)
+            return getAccValue();
+        return getErrorValue();
+    }
+
+    /**
+     * Gets the value that is returned in the event of any errors (defaults to
+     * {@code null})
+     * 
+     * @return Error value
+     */
+    protected NodeValue getErrorValue() {
+        return null;
+    }
+
+    /**
+     * Gets the count of valid expression evaluations
+     * 
+     * @return Valid expression evaluation count
+     */
+    protected final long getCount() {
+        return count;
+    }
+
+    /**
+     * Gets the count of expression evaluation errors encountered
+     * 
+     * @return Expression evaluation error count
+     */
+    protected final long getErrorCount() {
+        return errorCount;
     }
 
-    protected long getErrorCount() { return errorCount ; }
-    
     /** Called if no errors to get the accumulated result */
-    protected abstract NodeValue getAccValue() ; 
+    protected abstract NodeValue getAccValue();
+
+    /**
+     * Called when the expression being aggregated evaluates OK
+     * <p>
+     * Can throw {@link ExprEvalException} in which case the
+     * {@link #accumulateError} method is called
+     * </p>
+     */
+    protected abstract void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv);
 
-    /** Called when the expression beeing aggregated evaluates OK.
-     * Can throw ExprEvalException - in which case the accumulateError is called */
-    protected abstract void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) ;
-    /** Called when an evaluation of the expression causes an error
-     * or when the accumulation step throws ExprEvalException  
+    /**
+     * Called when an evaluation of the expression causes an error or when the
+     * accumulation step throws {@link ExprEvalException}
      */
-    protected abstract void accumulateError(Binding binding, FunctionEnv functionEnv) ;
+    protected abstract void accumulateError(Binding binding, FunctionEnv functionEnv);
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/7da685a9/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorShortCircuitExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorShortCircuitExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorShortCircuitExpr.java
new file mode 100644
index 0000000..cbaf053
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorShortCircuitExpr.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.expr.aggregate;
+
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprEvalException;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.function.FunctionEnv;
+
+/**
+ * Accumulator that passes down the value of an expression but that allows for
+ * short circuiting.
+ * <p>
+ * Short circuiting handles the case where an accumulator can determine the
+ * final value ahead of seeing all the solutions. In this case it can indicate
+ * as such by calling the {@link #shortCircuit(NodeValue)} method after which
+ * point the evaluation of the expression is skipped for further solutions
+ * </p>
+ * 
+ */
+public abstract class AccumulatorShortCircuitExpr extends AccumulatorExpr {
+    private boolean shortCircuited = false;
+    private NodeValue shortCircuitValue;
+
+    protected AccumulatorShortCircuitExpr(Expr expr) {
+        super(expr);
+    }
+
+    @Override
+    public void accumulate(Binding binding, FunctionEnv functionEnv) {
+        // No need to do any further work if already short circuited
+        if (shortCircuited)
+            return;
+
+        try {
+            NodeValue nv = this.getExpr().eval(binding, functionEnv);
+            accumulate(nv, binding, functionEnv);
+            this.incrementCount();
+        } catch (ExprEvalException ex) {
+            this.incrementErrorCount();
+            accumulateError(binding, functionEnv);
+        }
+    }
+
+    // Count(?v) is different
+    @Override
+    public NodeValue getValue() {
+        if (shortCircuited)
+            return shortCircuitValue;
+        if (this.getErrorCount() == 0)
+            return getAccValue();
+        return getErrorValue();
+    }
+
+    /**
+     * Called when the derived class has been able to determine the final
+     * aggregate value without needing to process further values. Once set
+     * further expression evaluation is skipped and the final value will be the
+     * value given here
+     * 
+     * @param value
+     *            Final aggregate value
+     */
+    protected final void shortCircuit(NodeValue value) {
+        this.shortCircuited = true;
+        this.shortCircuitValue = value;
+    }
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/7da685a9/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
index 57c32c7..d16bd63 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
@@ -100,8 +100,7 @@ public class AggAvg extends AggregatorBase
         public NodeValue getAccValue()
         {
             if ( count == 0 ) return noValuesToAvg ;
-            if ( super.errorCount != 0 )
-                //throw new ExprEvalException("avg: error in group") ; 
+            if ( this.getErrorCount() != 0 )
                 return null ;
             NodeValue nvCount = NodeValue.makeInteger(count) ;
             return XSDFuncOp.numDivide(total, nvCount) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/7da685a9/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAll.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAll.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAll.java
new file mode 100644
index 0000000..1f499d6
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAll.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.sparql.function.library.leviathan.aggregates;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprList;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.expr.aggregate.Accumulator;
+import org.apache.jena.sparql.expr.aggregate.AccumulatorShortCircuitExpr;
+import org.apache.jena.sparql.expr.aggregate.Aggregator;
+import org.apache.jena.sparql.expr.aggregate.AggregatorBase;
+import org.apache.jena.sparql.expr.nodevalue.NodeValueBoolean;
+import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp;
+import org.apache.jena.sparql.function.FunctionEnv;
+import org.apache.jena.sparql.function.library.leviathan.LeviathanConstants;
+
+/**
+ * All aggregate, expression must evaluate to true for all solutions
+ */
+public class AggAll extends AggregatorBase {
+
+    /**
+     * @param expr
+     *            Expression
+     */
+    protected AggAll(Expr expr) {
+        super(LeviathanConstants.LeviathanFunctionLibraryURI + "all", false, expr);
+    }
+
+    @Override
+    public Aggregator copy(ExprList exprs) {
+        return new AggAll(exprs.get(0));
+    }
+
+    @Override
+    public boolean equals(Aggregator other, boolean bySyntax) {
+        if (other == null)
+            return false;
+        if (this == other)
+            return true;
+        if (!(other instanceof AggAll))
+            return false;
+        AggAll agg = (AggAll) other;
+        return getExpr().equals(agg.getExpr(), bySyntax);
+    }
+
+    @Override
+    public Accumulator createAccumulator() {
+        return new AccAll(this.getExpr());
+    }
+
+    @Override
+    public Node getValueEmpty() {
+        return NodeValue.TRUE.asNode();
+    }
+
+    @Override
+    public int hashCode() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    private static class AccAll extends AccumulatorShortCircuitExpr {
+
+        /**
+         * @param expr
+         */
+        protected AccAll(Expr expr) {
+            super(expr);
+        }
+
+        @Override
+        protected NodeValue getAccValue() {
+            return NodeValue.TRUE;
+        }
+
+        @Override
+        protected NodeValue getErrorValue() {
+            return NodeValue.FALSE;
+        }
+
+        @Override
+        protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
+            // If true can't short circuit yet
+            if (XSDFuncOp.booleanEffectiveValue(nv))
+                return;
+
+            // Otherwise can short circuit
+            this.shortCircuit(NodeValue.FALSE);
+        }
+
+        @Override
+        protected void accumulateError(Binding binding, FunctionEnv functionEnv) {
+            this.shortCircuit(NodeValue.FALSE);
+        }
+
+    }
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/7da685a9/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAny.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAny.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAny.java
new file mode 100644
index 0000000..a462098
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggAny.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.sparql.function.library.leviathan.aggregates;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprList;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.expr.aggregate.Accumulator;
+import org.apache.jena.sparql.expr.aggregate.AccumulatorShortCircuitExpr;
+import org.apache.jena.sparql.expr.aggregate.Aggregator;
+import org.apache.jena.sparql.expr.aggregate.AggregatorBase;
+import org.apache.jena.sparql.expr.nodevalue.NodeValueBoolean;
+import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp;
+import org.apache.jena.sparql.function.FunctionEnv;
+import org.apache.jena.sparql.function.library.leviathan.LeviathanConstants;
+
+/**
+ * All aggregate, expression must evaluate to true for at least one solution
+ */
+public class AggAny extends AggregatorBase {
+
+    /**
+     * @param expr
+     *            Expression
+     */
+    protected AggAny(Expr expr) {
+        super(LeviathanConstants.LeviathanFunctionLibraryURI + "any", false, expr);
+    }
+
+    @Override
+    public Aggregator copy(ExprList exprs) {
+        return new AggAny(exprs.get(0));
+    }
+
+    @Override
+    public boolean equals(Aggregator other, boolean bySyntax) {
+        if (other == null)
+            return false;
+        if (this == other)
+            return true;
+        if (!(other instanceof AggAny))
+            return false;
+        AggAny agg = (AggAny) other;
+        return getExpr().equals(agg.getExpr(), bySyntax);
+    }
+
+    @Override
+    public Accumulator createAccumulator() {
+        return new AccAny(this.getExpr());
+    }
+
+    @Override
+    public Node getValueEmpty() {
+        return NodeValue.TRUE.asNode();
+    }
+
+    @Override
+    public int hashCode() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    private static class AccAny extends AccumulatorShortCircuitExpr {
+
+        /**
+         * @param expr
+         */
+        protected AccAny(Expr expr) {
+            super(expr);
+        }
+
+        @Override
+        protected NodeValue getAccValue() {
+            return NodeValue.FALSE;
+        }
+
+        @Override
+        protected NodeValue getErrorValue() {
+            return NodeValue.FALSE;
+        }
+
+        @Override
+        protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
+            // If true can short circuit yet
+            if (XSDFuncOp.booleanEffectiveValue(nv))
+                this.shortCircuit(NodeValue.TRUE);
+        }
+
+        @Override
+        protected void accumulateError(Binding binding, FunctionEnv functionEnv) {
+            // Can't short circuit errors
+        }
+
+    }
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/7da685a9/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggNone.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggNone.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggNone.java
new file mode 100644
index 0000000..a155139
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/aggregates/AggNone.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.sparql.function.library.leviathan.aggregates;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprList;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.expr.aggregate.Accumulator;
+import org.apache.jena.sparql.expr.aggregate.AccumulatorShortCircuitExpr;
+import org.apache.jena.sparql.expr.aggregate.Aggregator;
+import org.apache.jena.sparql.expr.aggregate.AggregatorBase;
+import org.apache.jena.sparql.expr.nodevalue.NodeValueBoolean;
+import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp;
+import org.apache.jena.sparql.function.FunctionEnv;
+import org.apache.jena.sparql.function.library.leviathan.LeviathanConstants;
+
+/**
+ * All aggregate, expression must evaluate to false for all solutions
+ */
+public class AggNone extends AggregatorBase {
+
+    /**
+     * @param expr
+     *            Expression
+     */
+    protected AggNone(Expr expr) {
+        super(LeviathanConstants.LeviathanFunctionLibraryURI + "none", false, expr);
+    }
+
+    @Override
+    public Aggregator copy(ExprList exprs) {
+        return new AggNone(exprs.get(0));
+    }
+
+    @Override
+    public boolean equals(Aggregator other, boolean bySyntax) {
+        if (other == null)
+            return false;
+        if (this == other)
+            return true;
+        if (!(other instanceof AggNone))
+            return false;
+        AggNone agg = (AggNone) other;
+        return getExpr().equals(agg.getExpr(), bySyntax);
+    }
+
+    @Override
+    public Accumulator createAccumulator() {
+        return new AccNone(this.getExpr());
+    }
+
+    @Override
+    public Node getValueEmpty() {
+        return NodeValue.TRUE.asNode();
+    }
+
+    @Override
+    public int hashCode() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    private static class AccNone extends AccumulatorShortCircuitExpr {
+
+        /**
+         * @param expr
+         */
+        protected AccNone(Expr expr) {
+            super(expr);
+        }
+
+        @Override
+        protected NodeValue getAccValue() {
+            return NodeValue.TRUE;
+        }
+
+        @Override
+        protected NodeValue getErrorValue() {
+            return NodeValue.FALSE;
+        }
+
+        @Override
+        protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
+            // If false can't short circuit yet
+            if (!XSDFuncOp.booleanEffectiveValue(nv))
+                return;
+
+            // Otherwise can short circuit
+            this.shortCircuit(NodeValue.FALSE);
+        }
+
+        @Override
+        protected void accumulateError(Binding binding, FunctionEnv functionEnv) {
+            this.shortCircuit(NodeValue.FALSE);
+        }
+
+    }
+}


[29/50] [abbrv] jena git commit: Reformat

Posted by rv...@apache.org.
Reformat

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

Branch: refs/heads/JENA-507
Commit: 08ec3bb6f53a890f37c69d5022f305873a6bca65
Parents: b3846cb
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 31 19:52:01 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 31 19:52:01 2015 +0100

----------------------------------------------------------------------
 .../jena/sparql/engine/main/VarFinder.java      | 275 +++++++++----------
 1 file changed, 126 insertions(+), 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/08ec3bb6/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index fb50694..ccbb100 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -40,19 +40,20 @@ public class VarFinder
     // See also VarUtils and OpVars.
     // This class is specific to the needs of the main query engine and scoping of variables
     
-    public static Set<Var> optDefined(Op op)
-    {
-        return VarUsageVisitor.apply(op).optDefines ;
+    public static Set<Var> optDefined(Op op) {
+        return VarUsageVisitor.apply(op).optDefines;
     }
-    
-    public static Set<Var> fixed(Op op)
-    {
-        return VarUsageVisitor.apply(op).defines ;
+
+    public static Set<Var> fixed(Op op) {
+        return VarUsageVisitor.apply(op).defines;
     }
-    
-    public static Set<Var> filter(Op op)
-    {
-        return VarUsageVisitor.apply(op).filterMentions ;
+
+    public static Set<Var> filter(Op op) {
+        return VarUsageVisitor.apply(op).filterMentions;
+    }
+
+    public static Set<Var> assignMention(Op op) {
+        return VarUsageVisitor.apply(op).assignMentions;
     }
 
     VarUsageVisitor varUsageVisitor ;
@@ -65,196 +66,172 @@ public class VarFinder
     public Set<Var> getAssign() { return varUsageVisitor.assignMentions ; }
     public Set<Var> getFixed() { return varUsageVisitor.defines ; }
     
-    private static class VarUsageVisitor extends OpVisitorBase //implements OpVisitor
+    private static class VarUsageVisitor extends OpVisitorBase // implements
+                                                               // OpVisitor
     {
-        static VarUsageVisitor apply(Op op)
-        {
-            VarUsageVisitor v = new VarUsageVisitor() ;
-            op.visit(v) ;
-            return v ;
+        static VarUsageVisitor apply(Op op) {
+            VarUsageVisitor v = new VarUsageVisitor();
+            op.visit(v);
+            return v;
         }
 
-        Set<Var> defines = null ;
-        Set<Var> optDefines = null ;
-        Set<Var> filterMentions = null ;
-        Set<Var> assignMentions = null ;
-
-        VarUsageVisitor()
-        {
-            defines = new HashSet<>() ;
-            optDefines = new HashSet<>() ;
-            filterMentions = new HashSet<>() ;
-            assignMentions = new HashSet<>() ;
+        Set<Var> defines        = null;
+        Set<Var> optDefines     = null;
+        Set<Var> filterMentions = null;
+        Set<Var> assignMentions = null;
+
+        VarUsageVisitor() {
+            defines = new HashSet<>();
+            optDefines = new HashSet<>();
+            filterMentions = new HashSet<>();
+            assignMentions = new HashSet<>();
         }
-        
-        VarUsageVisitor(Set<Var> _defines, Set<Var> _optDefines, Set<Var> _filterMentions, Set<Var> _assignMentions)
-        {
-            defines = _defines ;
-            optDefines = _optDefines ;
-            filterMentions = _filterMentions ;
-            assignMentions = _assignMentions ;
+
+        VarUsageVisitor(Set<Var> _defines, Set<Var> _optDefines, Set<Var> _filterMentions, Set<Var> _assignMentions) {
+            defines = _defines;
+            optDefines = _optDefines;
+            filterMentions = _filterMentions;
+            assignMentions = _assignMentions;
         }
-        
+
         @Override
-        public void visit(OpQuadPattern quadPattern)
-        {
-            addVar(defines, quadPattern.getGraphNode()) ;
-            BasicPattern triples = quadPattern.getBasicPattern() ;
-            addVars(defines, triples) ;
+        public void visit(OpQuadPattern quadPattern) {
+            addVar(defines, quadPattern.getGraphNode());
+            BasicPattern triples = quadPattern.getBasicPattern();
+            addVars(defines, triples);
         }
 
         @Override
-        public void visit(OpBGP opBGP)
-        {
-            BasicPattern triples = opBGP.getPattern() ;
-            addVars(defines, triples) ;
+        public void visit(OpBGP opBGP) {
+            BasicPattern triples = opBGP.getPattern();
+            addVars(defines, triples);
         }
-        
+
         @Override
-        public void visit(OpExt opExt)
-        {
-            opExt.effectiveOp().visit(this) ;
+        public void visit(OpExt opExt) {
+            opExt.effectiveOp().visit(this);
         }
-        
+
         @Override
-        public void visit(OpJoin opJoin)
-        {
-            joinAcc(opJoin.getLeft()) ;
-            joinAcc(opJoin.getRight()) ;
+        public void visit(OpJoin opJoin) {
+            joinAcc(opJoin.getLeft());
+            joinAcc(opJoin.getRight());
         }
-        
+
         @Override
-        public void visit(OpSequence opSequence)
-        {
+        public void visit(OpSequence opSequence) {
             for ( Op op : opSequence.getElements() )
-                joinAcc(op) ;    
+                joinAcc(op);
         }
-        
-        private void joinAcc(Op op)
-        {
-            VarUsageVisitor usage = VarUsageVisitor.apply(op) ;
-            
-            defines.addAll(usage.defines) ;
-            optDefines.addAll(usage.optDefines) ;
-            filterMentions.addAll(usage.filterMentions) ;
+
+        private void joinAcc(Op op) {
+            VarUsageVisitor usage = VarUsageVisitor.apply(op);
+            defines.addAll(usage.defines);
+            optDefines.addAll(usage.optDefines);
+            filterMentions.addAll(usage.filterMentions);
         }
 
         @Override
-        public void visit(OpLeftJoin opLeftJoin)
-        {
-            leftJoin(opLeftJoin.getLeft(), opLeftJoin.getRight(), opLeftJoin.getExprs()) ;
+        public void visit(OpLeftJoin opLeftJoin) {
+            leftJoin(opLeftJoin.getLeft(), opLeftJoin.getRight(), opLeftJoin.getExprs());
         }
-        
+
         @Override
-        public void visit(OpConditional opLeftJoin)
-        { 
-            leftJoin(opLeftJoin.getLeft(), opLeftJoin.getRight(), null) ;
+        public void visit(OpConditional opLeftJoin) {
+            leftJoin(opLeftJoin.getLeft(), opLeftJoin.getRight(), null);
         }
 
-        private void leftJoin(Op left, Op right, ExprList exprs)
-        {
-            VarUsageVisitor leftUsage = VarUsageVisitor.apply(left) ;
-            VarUsageVisitor rightUsage = VarUsageVisitor.apply(right) ;
-            
-            defines.addAll(leftUsage.defines) ;
-            optDefines.addAll(leftUsage.optDefines) ;
-            filterMentions.addAll(leftUsage.filterMentions) ;
-            assignMentions.addAll(leftUsage.assignMentions) ;
-            
-            optDefines.addAll(rightUsage.defines) ;     // Asymmetric.
-            optDefines.addAll(rightUsage.optDefines) ;
-            filterMentions.addAll(rightUsage.filterMentions) ;
-            assignMentions.addAll(rightUsage.assignMentions) ;
-            
-            // Remove any definites that are in the optionals 
-            // as, overall, they are definites 
-            optDefines.removeAll(leftUsage.defines) ;
+        private void leftJoin(Op left, Op right, ExprList exprs) {
+            VarUsageVisitor leftUsage = VarUsageVisitor.apply(left);
+            VarUsageVisitor rightUsage = VarUsageVisitor.apply(right);
+
+            defines.addAll(leftUsage.defines);
+            optDefines.addAll(leftUsage.optDefines);
+            filterMentions.addAll(leftUsage.filterMentions);
+            assignMentions.addAll(leftUsage.assignMentions);
+
+            optDefines.addAll(rightUsage.defines); // Asymmetric.
+            optDefines.addAll(rightUsage.optDefines);
+            filterMentions.addAll(rightUsage.filterMentions);
+            assignMentions.addAll(rightUsage.assignMentions);
+
+            // Remove any definites that are in the optionals
+            // as, overall, they are definites
+            optDefines.removeAll(leftUsage.defines);
 
             // And the associated filter.
             if ( exprs != null )
                 exprs.varsMentioned(filterMentions);
         }
-        
+
         @Override
-        public void visit(OpUnion opUnion)
-        {
-            VarUsageVisitor leftUsage = VarUsageVisitor.apply(opUnion.getLeft()) ;
-            VarUsageVisitor rightUsage = VarUsageVisitor.apply(opUnion.getRight()) ;
-            
+        public void visit(OpUnion opUnion) {
+            VarUsageVisitor leftUsage = VarUsageVisitor.apply(opUnion.getLeft());
+            VarUsageVisitor rightUsage = VarUsageVisitor.apply(opUnion.getRight());
+
             // defines = union(left.define, right.define) ??
             // Can be both definite and optional (different sides).
-            defines.addAll(leftUsage.defines) ;
-            optDefines.addAll(leftUsage.optDefines) ;
-            filterMentions.addAll(leftUsage.filterMentions) ;
-            assignMentions.addAll(leftUsage.assignMentions) ;
-            defines.addAll(rightUsage.defines) ;
-            optDefines.addAll(rightUsage.optDefines) ;
-            filterMentions.addAll(rightUsage.filterMentions) ;
-            assignMentions.addAll(rightUsage.assignMentions) ;
+            defines.addAll(leftUsage.defines);
+            optDefines.addAll(leftUsage.optDefines);
+            filterMentions.addAll(leftUsage.filterMentions);
+            assignMentions.addAll(leftUsage.assignMentions);
+            defines.addAll(rightUsage.defines);
+            optDefines.addAll(rightUsage.optDefines);
+            filterMentions.addAll(rightUsage.filterMentions);
+            assignMentions.addAll(rightUsage.assignMentions);
         }
 
         @Override
-        public void visit(OpGraph opGraph)
-        {
-            addVar(defines, opGraph.getNode()) ;
-            opGraph.getSubOp().visit(this) ;
+        public void visit(OpGraph opGraph) {
+            addVar(defines, opGraph.getNode());
+            opGraph.getSubOp().visit(this);
         }
-        
-        // @Override
+
         @Override
-        public void visit(OpFilter opFilter)
-        {
+        public void visit(OpFilter opFilter) {
             opFilter.getExprs().varsMentioned(filterMentions);
-            opFilter.getSubOp().visit(this) ;
+            opFilter.getSubOp().visit(this);
         }
-        
+
         @Override
-        public void visit(OpAssign opAssign)
-        {
-            opAssign.getSubOp().visit(this) ;
-            processVarExprList(opAssign.getVarExprList()) ;
+        public void visit(OpAssign opAssign) {
+            opAssign.getSubOp().visit(this);
+            processVarExprList(opAssign.getVarExprList());
         }
-        
+
         @Override
-        public void visit(OpExtend opExtend)
-        {
-            opExtend.getSubOp().visit(this) ;
-            processVarExprList(opExtend.getVarExprList()) ;
+        public void visit(OpExtend opExtend) {
+            opExtend.getSubOp().visit(this);
+            processVarExprList(opExtend.getVarExprList());
         }
-        
-        private void processVarExprList(VarExprList varExprList)
-        {
-            Map<Var, Expr> map = varExprList.getExprs() ;
-            for ( Entry<Var, Expr> e : map.entrySet() )
-            {
-                defines.add(e.getKey()) ;
+
+        private void processVarExprList(VarExprList varExprList) {
+            Map<Var, Expr> map = varExprList.getExprs();
+            for ( Entry<Var, Expr> e : map.entrySet() ) {
+                defines.add(e.getKey());
                 e.getValue().varsMentioned(assignMentions);
             }
         }
-        
+
         @Override
-        public void visit(OpProject opProject)
-        {
-            List<Var> vars = opProject.getVars() ;
-            VarUsageVisitor subUsage = VarUsageVisitor.apply(opProject.getSubOp()) ;
-            
-            subUsage.defines.retainAll(vars) ;
-            subUsage.optDefines.retainAll(vars) ;
-            subUsage.optDefines.retainAll(vars) ;
-            defines.addAll(subUsage.defines) ;
-            optDefines.addAll(subUsage.optDefines) ;
-            filterMentions.addAll(subUsage.filterMentions) ;
-            assignMentions.addAll(subUsage.assignMentions) ;
+        public void visit(OpProject opProject) {
+            List<Var> vars = opProject.getVars();
+            VarUsageVisitor subUsage = VarUsageVisitor.apply(opProject.getSubOp());
+            subUsage.defines.retainAll(vars);
+            subUsage.optDefines.retainAll(vars);
+            subUsage.optDefines.retainAll(vars);
+            defines.addAll(subUsage.defines);
+            optDefines.addAll(subUsage.optDefines);
+            filterMentions.addAll(subUsage.filterMentions);
+            assignMentions.addAll(subUsage.assignMentions);
         }
 
         @Override
-        public void visit(OpTable opTable)
-        { 
-            defines.addAll(opTable.getTable().getVars()) ;
+        public void visit(OpTable opTable) {
+            defines.addAll(opTable.getTable().getVars());
         }
 
         @Override
-        public void visit(OpNull opNull)
-        { }
+        public void visit(OpNull opNull) {}
     }
 }


[47/50] [abbrv] jena git commit: Use default model.

Posted by rv...@apache.org.
Use default model.

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

Branch: refs/heads/JENA-507
Commit: 5bf54c37fe3c8194dd7337f3a922f6ac1c0a4353
Parents: 8bfe1cf
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 7 12:17:30 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 7 12:17:30 2015 +0100

----------------------------------------------------------------------
 .../org/apache/jena/sparql/core/assembler/DatasetAssembler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5bf54c37/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
index e30b7e9..a0aeb0b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
@@ -64,7 +64,7 @@ public class DatasetAssembler extends AssemblerBase implements Assembler {
             dftModel = a.openModel(dftGraph) ;
         else
             // Assembler description did not define one - make a dummy.
-            dftModel = GraphFactory.makePlainModel() ;
+            dftModel = GraphFactory.makeDefaultModel() ;
 
         ds.setDefaultModel(dftModel) ;
 


[20/50] [abbrv] jena git commit: Rename "graphStore" as "dataset"

Posted by rv...@apache.org.
Rename "graphStore" as "dataset"

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

Branch: refs/heads/JENA-507
Commit: a2cc0ee48c466bbcc0d3d021822af1d9bafcf3f2
Parents: 4876989
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 25 12:17:53 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 25 12:17:53 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/arq/cmdline/CmdUpdate.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a2cc0ee4/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
index fd3113b..0baed1b 100644
--- a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
+++ b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
@@ -24,14 +24,14 @@ import org.apache.jena.sparql.core.DatasetGraph ;
 
 public abstract class CmdUpdate extends CmdARQ
 {
-    protected ModDataset modGraphStore = null ;
+    protected ModDataset modDataset = null ;
     protected Syntax updateSyntax = Syntax.defaultUpdateSyntax ;
 
     protected CmdUpdate(String[] argv)
     {
         super(argv) ;
-        modGraphStore = setModGraphStore() ;
-        addModule(modGraphStore) ;
+        modDataset = setModGraphStore() ;
+        addModule(modDataset) ;
     }
     
     protected ModDataset setModGraphStore() {
@@ -49,10 +49,10 @@ public abstract class CmdUpdate extends CmdARQ
     
     @Override
     protected final void exec() {
-        DatasetGraph graphStore = modGraphStore.getDatasetGraph() ;
-        if ( graphStore.getDefaultGraph() == null )
-            graphStore.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()) ;
-        execUpdate(graphStore) ;
+        DatasetGraph dataset = modDataset.getDatasetGraph() ;
+        if ( dataset.getDefaultGraph() == null )
+            dataset.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()) ;
+        execUpdate(dataset) ;
     }
 
     protected abstract void execUpdate(DatasetGraph graphStore) ;


[25/50] [abbrv] jena git commit: jetty 9.3 notes

Posted by rv...@apache.org.
jetty 9.3 notes


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

Branch: refs/heads/JENA-507
Commit: a03b48fb8870fc13c61ff495d07b8572bb81734d
Parents: f62c53e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 27 17:00:50 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 27 17:00:50 2015 +0100

----------------------------------------------------------------------
 jena-fuseki2/pom.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a03b48fb/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 6e46fe1..cf1f897 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -62,6 +62,7 @@
 
   <properties>
     <ver.jetty>9.1.1.v20140108</ver.jetty>
+    <!-- <ver.jetty>9.3.2.v20150730</ver.jetty> -->
     <ver.shiro>1.2.2</ver.shiro>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <build.time.xsd>${maven.build.timestamp}</build.time.xsd>  


[12/50] [abbrv] jena git commit: Format

Posted by rv...@apache.org.
Format

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

Branch: refs/heads/JENA-507
Commit: b1e8b4506781cf71d896857792a404ab7d8bb7d3
Parents: 6cd7e23
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 11:22:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 11:22:10 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/jena/blob/b1e8b450/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index 395119e..b5cf428 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -651,7 +651,7 @@ public class RDFDataMgr
     }
     
     /** Read RDF data.
-     * @param sink     Destination for the RDF read.
+     * @param sink      Destination for the RDF read.
      * @param uri       URI to read from (includes file: and a plain file name).
      * @param base      Base URI (defaults to uri).
      * @param hintLang  Hint for the syntax


[21/50] [abbrv] jena git commit: Deal cleanly with no datasets provide - devolve to individual commands.

Posted by rv...@apache.org.
Deal cleanly with no datasets provide - devolve to individual commands.

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

Branch: refs/heads/JENA-507
Commit: 5c9092d4ff9d556ca1628cdcff67194f6a377aba
Parents: a2cc0ee
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 25 12:31:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 25 12:31:35 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/arq/cmdline/CmdUpdate.java  | 10 +++++++---
 jena-arq/src/main/java/arq/cmdline/ModDataset.java |  7 +++++--
 jena-arq/src/main/java/arq/load.java               |  9 ++++++---
 jena-arq/src/main/java/arq/query.java              | 11 ++++++++++-
 jena-arq/src/main/java/arq/update.java             |  7 ++++++-
 5 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5c9092d4/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
index 0baed1b..9ff706c 100644
--- a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
+++ b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
@@ -30,14 +30,13 @@ public abstract class CmdUpdate extends CmdARQ
     protected CmdUpdate(String[] argv)
     {
         super(argv) ;
-        modDataset = setModGraphStore() ;
+        modDataset = setModeDataset() ;
         addModule(modDataset) ;
     }
     
-    protected ModDataset setModGraphStore() {
+    protected ModDataset setModeDataset() {
         return new ModDatasetGeneralAssembler() ;
     }
-    
 
     @Override
     protected void processModulesAndArgs()
@@ -50,10 +49,15 @@ public abstract class CmdUpdate extends CmdARQ
     @Override
     protected final void exec() {
         DatasetGraph dataset = modDataset.getDatasetGraph() ;
+        if ( dataset == null )
+            dataset = dealWithNoDataset() ;
+        
         if ( dataset.getDefaultGraph() == null )
             dataset.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()) ;
         execUpdate(dataset) ;
     }
 
+    protected abstract DatasetGraph dealWithNoDataset() ;
+
     protected abstract void execUpdate(DatasetGraph graphStore) ;
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/5c9092d4/jena-arq/src/main/java/arq/cmdline/ModDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDataset.java b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
index 089e1f1..01a0bb8 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModDataset.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
@@ -38,8 +38,11 @@ public abstract class ModDataset extends ModBase
         return dataset ;
     }
     
-    public DatasetGraph getDatasetGraph() { 
-        return getDataset().asDatasetGraph() ;
+    public DatasetGraph getDatasetGraph() {
+        Dataset ds = getDataset() ;
+        if ( ds == null )
+            return null ;
+        return ds.asDatasetGraph() ;
     }
 
     public abstract Dataset createDataset() ; 

http://git-wip-us.apache.org/repos/asf/jena/blob/5c9092d4/jena-arq/src/main/java/arq/load.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/load.java b/jena-arq/src/main/java/arq/load.java
index d74de5e..b5d75c8 100644
--- a/jena-arq/src/main/java/arq/load.java
+++ b/jena-arq/src/main/java/arq/load.java
@@ -21,9 +21,9 @@ package arq;
 import java.util.Iterator ;
 import java.util.List ;
 
+import arq.cmdline.CmdUpdate ;
 import jena.cmd.ArgDecl;
 import jena.cmd.CmdException;
-
 import org.apache.jena.atlas.io.IndentedWriter ;
 import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Graph ;
@@ -35,8 +35,6 @@ import org.apache.jena.sparql.util.graph.GraphLoadMonitor ;
 import org.apache.jena.update.UpdateExecutionFactory ;
 import org.apache.jena.update.UpdateRequest ;
 
-import arq.cmdline.CmdUpdate ;
-
 public class load extends CmdUpdate
 {
     static private final ArgDecl graphNameArg = new ArgDecl(ArgDecl.HasValue, "--graph") ;
@@ -114,4 +112,9 @@ public class load extends CmdUpdate
         //m.setSummaryLabel(getCommandName()) ;
         graph.getEventManager().register(m)  ;
     }
+    
+    @Override
+    protected DatasetGraph dealWithNoDataset() {
+        throw new CmdException("No dataset provided") ;
+    }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/5c9092d4/jena-arq/src/main/java/arq/query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/query.java b/jena-arq/src/main/java/arq/query.java
index f119aba..76865e1 100644
--- a/jena-arq/src/main/java/arq/query.java
+++ b/jena-arq/src/main/java/arq/query.java
@@ -174,13 +174,22 @@ public class query extends CmdARQ
     protected String getSummary() { return getCommandName()+" --data=<file> --query=<query>" ; }
     
     protected Dataset getDataset()  { 
-        try { return modDataset.getDataset() ; }
+        try { 
+            Dataset ds = modDataset.getDataset() ;
+            if ( ds == null )
+                ds = dealWithNoDataset() ;
+            return ds ;
+        } 
         catch ( RiotException ex ) { 
             System.err.println("Failed to load data") ;
             throw new TerminationException(1) ;
         }
     }
     
+    protected Dataset dealWithNoDataset()  {
+        throw new CmdException("No dataset provided") ; 
+    }
+    
     protected long totalTime = 0 ;
     protected void queryExec(boolean timed, ResultsFormat fmt)
     {

http://git-wip-us.apache.org/repos/asf/jena/blob/5c9092d4/jena-arq/src/main/java/arq/update.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/update.java b/jena-arq/src/main/java/arq/update.java
index f6bf5fd..650104b 100644
--- a/jena-arq/src/main/java/arq/update.java
+++ b/jena-arq/src/main/java/arq/update.java
@@ -29,6 +29,7 @@ import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.sparql.SystemARQ ;
 import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
 import org.apache.jena.sparql.core.Transactional ;
 import org.apache.jena.sparql.core.TransactionalNull ;
 import org.apache.jena.update.UpdateExecutionFactory ;
@@ -58,7 +59,6 @@ public class update extends CmdUpdate
     protected void processModulesAndArgs() {
         requestFiles = getValues(updateArg) ; // ????
         dump = contains(dumpArg) ;
-
         super.processModulesAndArgs() ;
     }
 
@@ -118,4 +118,9 @@ public class update extends CmdUpdate
         UpdateRequest req = UpdateFactory.create(requestString, updateSyntax) ;
         UpdateExecutionFactory.create(req, store).execute() ;
     }
+
+    @Override
+    protected DatasetGraph dealWithNoDataset() {
+        return DatasetGraphFactory.createMem() ;
+    }
 }


[13/50] [abbrv] jena git commit: Clean defaultRDFAcceptheader.

Posted by rv...@apache.org.
Clean defaultRDFAcceptheader.

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

Branch: refs/heads/JENA-507
Commit: ae00d86113a318cf7d96392eff318899dbd9c039
Parents: b1e8b45
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 11:22:34 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 11:22:34 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/org/apache/jena/riot/WebContent.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/ae00d861/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java b/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
index 8cd1265..bacc6fd 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
@@ -179,8 +179,12 @@ public class WebContent
     /** Accept header when looking for a dataset */
     public static final String defaultDatasetAcceptHeader   =  defaultDatasetAccept+",*/*;q=0.5" ;
     
+    // This is  defaultGraphAccept+","+defaultDatasetAccept+",*/*;q=0.5" ; but cleaned for duplicate JSON-LD.
     /** Accept header when looking for a graph or dataset */
-    public static final String defaultRDFAcceptHeader       =  defaultGraphAccept+","+defaultDatasetAccept+",*/*;q=0.5" ;
+    public static final String defaultRDFAcceptHeader       =  
+            "text/turtle,application/n-triples;q=0.9,application/rdf+xml;q=0.7," +
+            "application/trig,application/n-quads;q=0.9,text/x-nquads;q=0.8,application/x-trig;q=0.7,application/ld+json;q=0.6," +
+            "*/*;q=0.5" ;
     
     /** Return our "canonical" name for a Content Type.
      * This should be the standard one, no X-*


[14/50] [abbrv] jena git commit: JENA-803 : Support AGG(DISTNCT ...)

Posted by rv...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
index c888a7d..dd87d27 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
@@ -1,617 +1,617 @@
-/* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 5.0 */
-/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package org.apache.jena.sparql.lang.sparql_11 ;
-
-/**
- * An implementation of interface CharStream, where the stream is assumed to
- * contain only ASCII characters (with java-like unicode escape processing).
- */
-
-public
-class JavaCharStream
-{
-  /** Whether parser is static. */
-  public static final boolean staticFlag = false;
-
-  static final int hexval(char c) throws java.io.IOException {
-    switch(c)
-    {
-       case '0' :
-          return 0;
-       case '1' :
-          return 1;
-       case '2' :
-          return 2;
-       case '3' :
-          return 3;
-       case '4' :
-          return 4;
-       case '5' :
-          return 5;
-       case '6' :
-          return 6;
-       case '7' :
-          return 7;
-       case '8' :
-          return 8;
-       case '9' :
-          return 9;
-
-       case 'a' :
-       case 'A' :
-          return 10;
-       case 'b' :
-       case 'B' :
-          return 11;
-       case 'c' :
-       case 'C' :
-          return 12;
-       case 'd' :
-       case 'D' :
-          return 13;
-       case 'e' :
-       case 'E' :
-          return 14;
-       case 'f' :
-       case 'F' :
-          return 15;
-    }
-
-    throw new java.io.IOException(); // Should never come here
-  }
-
-/** Position in buffer. */
-  public int bufpos = -1;
-  int bufsize;
-  int available;
-  int tokenBegin;
-  protected int bufline[];
-  protected int bufcolumn[];
-
-  protected int column = 0;
-  protected int line = 1;
-
-  protected boolean prevCharIsCR = false;
-  protected boolean prevCharIsLF = false;
-
-  protected java.io.Reader inputStream;
-
-  protected char[] nextCharBuf;
-  protected char[] buffer;
-  protected int maxNextCharInd = 0;
-  protected int nextCharInd = -1;
-  protected int inBuf = 0;
-  protected int tabSize = 8;
-
-  protected void setTabSize(int i) { tabSize = i; }
-  protected int getTabSize(int i) { return tabSize; }
-
-  protected void ExpandBuff(boolean wrapAround)
-  {
-    char[] newbuffer = new char[bufsize + 2048];
-    int newbufline[] = new int[bufsize + 2048];
-    int newbufcolumn[] = new int[bufsize + 2048];
-
-    try
-    {
-      if (wrapAround)
-      {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-        bufcolumn = newbufcolumn;
-
-        bufpos += (bufsize - tokenBegin);
-    }
-    else
-    {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        bufcolumn = newbufcolumn;
-
-        bufpos -= tokenBegin;
-      }
-    }
-    catch (Throwable t)
-    {
-      throw new Error(t.getMessage());
-    }
-
-    available = (bufsize += 2048);
-    tokenBegin = 0;
-  }
-
-  protected void FillBuff() throws java.io.IOException
-  {
-    int i;
-    if (maxNextCharInd == 4096)
-      maxNextCharInd = nextCharInd = 0;
-
-    try {
-      if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
-                                          4096 - maxNextCharInd)) == -1)
-      {
-        inputStream.close();
-        throw new java.io.IOException();
-      }
-      else
-         maxNextCharInd += i;
-      return;
-    }
-    catch(java.io.IOException e) {
-      if (bufpos != 0)
-      {
-        --bufpos;
-        backup(0);
-      }
-      else
-      {
-        bufline[bufpos] = line;
-        bufcolumn[bufpos] = column;
-      }
-      throw e;
-    }
-  }
-
-  protected char ReadByte() throws java.io.IOException
-  {
-    if (++nextCharInd >= maxNextCharInd)
-      FillBuff();
-
-    return nextCharBuf[nextCharInd];
-  }
-
-/** @return starting character for token. */
-  public char BeginToken() throws java.io.IOException
-  {
-    if (inBuf > 0)
-    {
-      --inBuf;
-
-      if (++bufpos == bufsize)
-        bufpos = 0;
-
-      tokenBegin = bufpos;
-      return buffer[bufpos];
-    }
-
-    tokenBegin = 0;
-    bufpos = -1;
-
-    return readChar();
-  }
-
-  protected void AdjustBuffSize()
-  {
-    if (available == bufsize)
-    {
-      if (tokenBegin > 2048)
-      {
-        bufpos = 0;
-        available = tokenBegin;
-      }
-      else
-        ExpandBuff(false);
-    }
-    else if (available > tokenBegin)
-      available = bufsize;
-    else if ((tokenBegin - available) < 2048)
-      ExpandBuff(true);
-    else
-      available = tokenBegin;
-  }
-
-  protected void UpdateLineColumn(char c)
-  {
-    column++;
-
-    if (prevCharIsLF)
-    {
-      prevCharIsLF = false;
-      line += (column = 1);
-    }
-    else if (prevCharIsCR)
-    {
-      prevCharIsCR = false;
-      if (c == '\n')
-      {
-        prevCharIsLF = true;
-      }
-      else
-        line += (column = 1);
-    }
-
-    switch (c)
-    {
-      case '\r' :
-        prevCharIsCR = true;
-        break;
-      case '\n' :
-        prevCharIsLF = true;
-        break;
-      case '\t' :
-        column--;
-        column += (tabSize - (column % tabSize));
-        break;
-      default :
-        break;
-    }
-
-    bufline[bufpos] = line;
-    bufcolumn[bufpos] = column;
-  }
-
-/** Read a character. */
-  public char readChar() throws java.io.IOException
-  {
-    if (inBuf > 0)
-    {
-      --inBuf;
-
-      if (++bufpos == bufsize)
-        bufpos = 0;
-
-      return buffer[bufpos];
-    }
-
-    char c;
-
-    if (++bufpos == available)
-      AdjustBuffSize();
-
-    if ((buffer[bufpos] = c = ReadByte()) == '\\')
-    {
-      UpdateLineColumn(c);
-
-      int backSlashCnt = 1;
-
-      for (;;) // Read all the backslashes
-      {
-        if (++bufpos == available)
-          AdjustBuffSize();
-
-        try
-        {
-          if ((buffer[bufpos] = c = ReadByte()) != '\\')
-          {
-            UpdateLineColumn(c);
-            // found a non-backslash char.
-            if ((c == 'u') && ((backSlashCnt & 1) == 1))
-            {
-              if (--bufpos < 0)
-                bufpos = bufsize - 1;
-
-              break;
-            }
-
-            backup(backSlashCnt);
-            return '\\';
-          }
-        }
-        catch(java.io.IOException e)
-        {
-	  // We are returning one backslash so we should only backup (count-1)
-          if (backSlashCnt > 1)
-            backup(backSlashCnt-1);
-
-          return '\\';
-        }
-
-        UpdateLineColumn(c);
-        backSlashCnt++;
-      }
-
-      // Here, we have seen an odd number of backslash's followed by a 'u'
-      try
-      {
-        while ((c = ReadByte()) == 'u')
-          ++column;
-
-        buffer[bufpos] = c = (char)(hexval(c) << 12 |
-                                    hexval(ReadByte()) << 8 |
-                                    hexval(ReadByte()) << 4 |
-                                    hexval(ReadByte()));
-
-        column += 4;
-      }
-      catch(java.io.IOException e)
-      {
-        throw new Error("Invalid escape character at line " + line +
-                                         " column " + column + ".");
-      }
-
-      if (backSlashCnt == 1)
-        return c;
-      else
-      {
-        backup(backSlashCnt - 1);
-        return '\\';
-      }
-    }
-    else
-    {
-      UpdateLineColumn(c);
-      return c;
-    }
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndColumn
-   */
-  public int getColumn() {
-    return bufcolumn[bufpos];
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndLine
-   */
-  public int getLine() {
-    return bufline[bufpos];
-  }
-
-/** Get end column. */
-  public int getEndColumn() {
-    return bufcolumn[bufpos];
-  }
-
-/** Get end line. */
-  public int getEndLine() {
-    return bufline[bufpos];
-  }
-
-/** @return column of token start */
-  public int getBeginColumn() {
-    return bufcolumn[tokenBegin];
-  }
-
-/** @return line number of token start */
-  public int getBeginLine() {
-    return bufline[tokenBegin];
-  }
-
-/** Retreat. */
-  public void backup(int amount) {
-
-    inBuf += amount;
-    if ((bufpos -= amount) < 0)
-      bufpos += bufsize;
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.Reader dstream,
-                 int startline, int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    available = bufsize = buffersize;
-    buffer = new char[buffersize];
-    bufline = new int[buffersize];
-    bufcolumn = new int[buffersize];
-    nextCharBuf = new char[4096];
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.Reader dstream,
-                                        int startline, int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.Reader dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.Reader dstream,
-                 int startline, int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    if (buffer == null || buffersize != buffer.length)
-    {
-      available = bufsize = buffersize;
-      buffer = new char[buffersize];
-      bufline = new int[buffersize];
-      bufcolumn = new int[buffersize];
-      nextCharBuf = new char[4096];
-    }
-    prevCharIsLF = prevCharIsCR = false;
-    tokenBegin = inBuf = maxNextCharInd = 0;
-    nextCharInd = bufpos = -1;
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.Reader dstream,
-                                        int startline, int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.Reader dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-                        int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, int startline,
-                        int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, 1, 1, 4096);
-  }
-
-/** Constructor. */
-  public JavaCharStream(java.io.InputStream dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                     int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, startline, startcolumn, 4096);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-                     int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, 1, 1, 4096);
-  }
-
-/** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-
-  /** @return token image as String */
-  public String GetImage()
-  {
-    if (bufpos >= tokenBegin)
-      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
-    else
-      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                              new String(buffer, 0, bufpos + 1);
-  }
-
-  /** @return suffix */
-  public char[] GetSuffix(int len)
-  {
-    char[] ret = new char[len];
-
-    if ((bufpos + 1) >= len)
-      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-    else
-    {
-      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                                                        len - bufpos - 1);
-      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-    }
-
-    return ret;
-  }
-
-  /** Set buffers back to null when finished. */
-  public void Done()
-  {
-    nextCharBuf = null;
-    buffer = null;
-    bufline = null;
-    bufcolumn = null;
-  }
-
-  /**
-   * Method to adjust line and column numbers for the start of a token.
-   */
-  public void adjustBeginLineColumn(int newLine, int newCol)
-  {
-    int start = tokenBegin;
-    int len;
-
-    if (bufpos >= tokenBegin)
-    {
-      len = bufpos - tokenBegin + inBuf + 1;
-    }
-    else
-    {
-      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-    }
-
-    int i = 0, j = 0, k = 0;
-    int nextColDiff = 0, columnDiff = 0;
-
-    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
-    {
-      bufline[j] = newLine;
-      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-      bufcolumn[j] = newCol + columnDiff;
-      columnDiff = nextColDiff;
-      i++;
-    }
-
-    if (i < len)
-    {
-      bufline[j] = newLine++;
-      bufcolumn[j] = newCol + columnDiff;
-
-      while (i++ < len)
-      {
-        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-          bufline[j] = newLine++;
-        else
-          bufline[j] = newLine;
-      }
-    }
-
-    line = bufline[j];
-    column = bufcolumn[j];
-  }
-
-}
-/* JavaCC - OriginalChecksum=a46b9601f1eb7fc99070860ae4df29a9 (do not edit this line) */
+/* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 5.0 */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package org.apache.jena.sparql.lang.sparql_11 ;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (with java-like unicode escape processing).
+ */
+
+public
+class JavaCharStream
+{
+  /** Whether parser is static. */
+  public static final boolean staticFlag = false;
+
+  static final int hexval(char c) throws java.io.IOException {
+    switch(c)
+    {
+       case '0' :
+          return 0;
+       case '1' :
+          return 1;
+       case '2' :
+          return 2;
+       case '3' :
+          return 3;
+       case '4' :
+          return 4;
+       case '5' :
+          return 5;
+       case '6' :
+          return 6;
+       case '7' :
+          return 7;
+       case '8' :
+          return 8;
+       case '9' :
+          return 9;
+
+       case 'a' :
+       case 'A' :
+          return 10;
+       case 'b' :
+       case 'B' :
+          return 11;
+       case 'c' :
+       case 'C' :
+          return 12;
+       case 'd' :
+       case 'D' :
+          return 13;
+       case 'e' :
+       case 'E' :
+          return 14;
+       case 'f' :
+       case 'F' :
+          return 15;
+    }
+
+    throw new java.io.IOException(); // Should never come here
+  }
+
+/** Position in buffer. */
+  public int bufpos = -1;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected java.io.Reader inputStream;
+
+  protected char[] nextCharBuf;
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int nextCharInd = -1;
+  protected int inBuf = 0;
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+    char[] newbuffer = new char[bufsize + 2048];
+    int newbufline[] = new int[bufsize + 2048];
+    int newbufcolumn[] = new int[bufsize + 2048];
+
+    try
+    {
+      if (wrapAround)
+      {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+        bufcolumn = newbufcolumn;
+
+        bufpos += (bufsize - tokenBegin);
+    }
+    else
+    {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        bufcolumn = newbufcolumn;
+
+        bufpos -= tokenBegin;
+      }
+    }
+    catch (Throwable t)
+    {
+      throw new Error(t.getMessage());
+    }
+
+    available = (bufsize += 2048);
+    tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+    int i;
+    if (maxNextCharInd == 4096)
+      maxNextCharInd = nextCharInd = 0;
+
+    try {
+      if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
+                                          4096 - maxNextCharInd)) == -1)
+      {
+        inputStream.close();
+        throw new java.io.IOException();
+      }
+      else
+         maxNextCharInd += i;
+      return;
+    }
+    catch(java.io.IOException e) {
+      if (bufpos != 0)
+      {
+        --bufpos;
+        backup(0);
+      }
+      else
+      {
+        bufline[bufpos] = line;
+        bufcolumn[bufpos] = column;
+      }
+      throw e;
+    }
+  }
+
+  protected char ReadByte() throws java.io.IOException
+  {
+    if (++nextCharInd >= maxNextCharInd)
+      FillBuff();
+
+    return nextCharBuf[nextCharInd];
+  }
+
+/** @return starting character for token. */
+  public char BeginToken() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
+
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      tokenBegin = bufpos;
+      return buffer[bufpos];
+    }
+
+    tokenBegin = 0;
+    bufpos = -1;
+
+    return readChar();
+  }
+
+  protected void AdjustBuffSize()
+  {
+    if (available == bufsize)
+    {
+      if (tokenBegin > 2048)
+      {
+        bufpos = 0;
+        available = tokenBegin;
+      }
+      else
+        ExpandBuff(false);
+    }
+    else if (available > tokenBegin)
+      available = bufsize;
+    else if ((tokenBegin - available) < 2048)
+      ExpandBuff(true);
+    else
+      available = tokenBegin;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+    column++;
+
+    if (prevCharIsLF)
+    {
+      prevCharIsLF = false;
+      line += (column = 1);
+    }
+    else if (prevCharIsCR)
+    {
+      prevCharIsCR = false;
+      if (c == '\n')
+      {
+        prevCharIsLF = true;
+      }
+      else
+        line += (column = 1);
+    }
+
+    switch (c)
+    {
+      case '\r' :
+        prevCharIsCR = true;
+        break;
+      case '\n' :
+        prevCharIsLF = true;
+        break;
+      case '\t' :
+        column--;
+        column += (tabSize - (column % tabSize));
+        break;
+      default :
+        break;
+    }
+
+    bufline[bufpos] = line;
+    bufcolumn[bufpos] = column;
+  }
+
+/** Read a character. */
+  public char readChar() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
+
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      return buffer[bufpos];
+    }
+
+    char c;
+
+    if (++bufpos == available)
+      AdjustBuffSize();
+
+    if ((buffer[bufpos] = c = ReadByte()) == '\\')
+    {
+      UpdateLineColumn(c);
+
+      int backSlashCnt = 1;
+
+      for (;;) // Read all the backslashes
+      {
+        if (++bufpos == available)
+          AdjustBuffSize();
+
+        try
+        {
+          if ((buffer[bufpos] = c = ReadByte()) != '\\')
+          {
+            UpdateLineColumn(c);
+            // found a non-backslash char.
+            if ((c == 'u') && ((backSlashCnt & 1) == 1))
+            {
+              if (--bufpos < 0)
+                bufpos = bufsize - 1;
+
+              break;
+            }
+
+            backup(backSlashCnt);
+            return '\\';
+          }
+        }
+        catch(java.io.IOException e)
+        {
+	  // We are returning one backslash so we should only backup (count-1)
+          if (backSlashCnt > 1)
+            backup(backSlashCnt-1);
+
+          return '\\';
+        }
+
+        UpdateLineColumn(c);
+        backSlashCnt++;
+      }
+
+      // Here, we have seen an odd number of backslash's followed by a 'u'
+      try
+      {
+        while ((c = ReadByte()) == 'u')
+          ++column;
+
+        buffer[bufpos] = c = (char)(hexval(c) << 12 |
+                                    hexval(ReadByte()) << 8 |
+                                    hexval(ReadByte()) << 4 |
+                                    hexval(ReadByte()));
+
+        column += 4;
+      }
+      catch(java.io.IOException e)
+      {
+        throw new Error("Invalid escape character at line " + line +
+                                         " column " + column + ".");
+      }
+
+      if (backSlashCnt == 1)
+        return c;
+      else
+      {
+        backup(backSlashCnt - 1);
+        return '\\';
+      }
+    }
+    else
+    {
+      UpdateLineColumn(c);
+      return c;
+    }
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndColumn
+   */
+  public int getColumn() {
+    return bufcolumn[bufpos];
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndLine
+   */
+  public int getLine() {
+    return bufline[bufpos];
+  }
+
+/** Get end column. */
+  public int getEndColumn() {
+    return bufcolumn[bufpos];
+  }
+
+/** Get end line. */
+  public int getEndLine() {
+    return bufline[bufpos];
+  }
+
+/** @return column of token start */
+  public int getBeginColumn() {
+    return bufcolumn[tokenBegin];
+  }
+
+/** @return line number of token start */
+  public int getBeginLine() {
+    return bufline[tokenBegin];
+  }
+
+/** Retreat. */
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+      bufpos += bufsize;
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+    nextCharBuf = new char[4096];
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream,
+                                        int startline, int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+      nextCharBuf = new char[4096];
+    }
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    nextCharInd = bufpos = -1;
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream,
+                                        int startline, int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
+                        int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+    this(dstream, encoding, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, int startline,
+                        int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+    this(dstream, encoding, 1, 1, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                     int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(dstream, encoding, startline, startcolumn, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, int startline,
+                     int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(dstream, encoding, 1, 1, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+
+  /** @return token image as String */
+  public String GetImage()
+  {
+    if (bufpos >= tokenBegin)
+      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+    else
+      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  /** @return suffix */
+  public char[] GetSuffix(int len)
+  {
+    char[] ret = new char[len];
+
+    if ((bufpos + 1) >= len)
+      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+    else
+    {
+      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                        len - bufpos - 1);
+      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+    }
+
+    return ret;
+  }
+
+  /** Set buffers back to null when finished. */
+  public void Done()
+  {
+    nextCharBuf = null;
+    buffer = null;
+    bufline = null;
+    bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+    int start = tokenBegin;
+    int len;
+
+    if (bufpos >= tokenBegin)
+    {
+      len = bufpos - tokenBegin + inBuf + 1;
+    }
+    else
+    {
+      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+    }
+
+    int i = 0, j = 0, k = 0;
+    int nextColDiff = 0, columnDiff = 0;
+
+    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+    {
+      bufline[j] = newLine;
+      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+      bufcolumn[j] = newCol + columnDiff;
+      columnDiff = nextColDiff;
+      i++;
+    }
+
+    if (i < len)
+    {
+      bufline[j] = newLine++;
+      bufcolumn[j] = newCol + columnDiff;
+
+      while (i++ < len)
+      {
+        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+          bufline[j] = newLine++;
+        else
+          bufline[j] = newLine;
+      }
+    }
+
+    line = bufline[j];
+    column = bufcolumn[j];
+  }
+
+}
+/* JavaCC - OriginalChecksum=d63a793bd614cb11b1bb35c273b7864c (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java
index 60ac059..2c32e0a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java
@@ -1,187 +1,187 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
-/* JavaCCOptions:KEEP_LINE_COL=null */
-package org.apache.jena.sparql.lang.sparql_11 ;
-
-/**
- * This exception is thrown when parse errors are encountered.
- * You can explicitly create objects of this exception type by
- * calling the method generateParseException in the generated
- * parser.
- *
- * You can modify this class to customize your error reporting
- * mechanisms so long as you retain the public fields.
- */
-public class ParseException extends Exception {
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * This constructor is used by the method "generateParseException"
-   * in the generated parser.  Calling this constructor generates
-   * a new object of this type with the fields "currentToken",
-   * "expectedTokenSequences", and "tokenImage" set.
-   */
-  public ParseException(Token currentTokenVal,
-                        int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
-                       )
-  {
-    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
-    currentToken = currentTokenVal;
-    expectedTokenSequences = expectedTokenSequencesVal;
-    tokenImage = tokenImageVal;
-  }
-
-  /**
-   * The following constructors are for use by you for whatever
-   * purpose you can think of.  Constructing the exception in this
-   * manner makes the exception behave in the normal way - i.e., as
-   * documented in the class "Throwable".  The fields "errorToken",
-   * "expectedTokenSequences", and "tokenImage" do not contain
-   * relevant information.  The JavaCC generated code does not use
-   * these constructors.
-   */
-
-  public ParseException() {
-    super();
-  }
-
-  /** Constructor with message. */
-  public ParseException(String message) {
-    super(message);
-  }
-
-
-  /**
-   * This is the last token that has been consumed successfully.  If
-   * this object has been created due to a parse error, the token
-   * followng this token will (therefore) be the first error token.
-   */
-  public Token currentToken;
-
-  /**
-   * Each entry in this array is an array of integers.  Each array
-   * of integers represents a sequence of tokens (by their ordinal
-   * values) that is expected at this point of the parse.
-   */
-  public int[][] expectedTokenSequences;
-
-  /**
-   * This is a reference to the "tokenImage" array of the generated
-   * parser within which the parse error occurred.  This array is
-   * defined in the generated ...Constants interface.
-   */
-  public String[] tokenImage;
-
-  /**
-   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-   * error message and returns it.  If this object has been created
-   * due to a parse error, and you do not catch it (it gets thrown
-   * from the parser) the correct error message
-   * gets displayed.
-   */
-  private static String initialise(Token currentToken,
-                           int[][] expectedTokenSequences,
-                           String[] tokenImage) {
-    String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
-    int maxSize = 0;
-    for (int i = 0; i < expectedTokenSequences.length; i++) {
-      if (maxSize < expectedTokenSequences[i].length) {
-        maxSize = expectedTokenSequences[i].length;
-      }
-      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
-      }
-      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected.append("...");
-      }
-      expected.append(eol).append("    ");
-    }
-    String retval = "Encountered \"";
-    Token tok = currentToken.next;
-    for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += " ";
-      if (tok.kind == 0) {
-        retval += tokenImage[0];
-        break;
-      }
-      retval += " " + tokenImage[tok.kind];
-      retval += " \"";
-      retval += add_escapes(tok.image);
-      retval += " \"";
-      tok = tok.next;
-    }
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    retval += "." + eol;
-    if (expectedTokenSequences.length == 1) {
-      retval += "Was expecting:" + eol + "    ";
-    } else {
-      retval += "Was expecting one of:" + eol + "    ";
-    }
-    retval += expected.toString();
-    return retval;
-  }
-
-  /**
-   * The end of line string for this machine.
-   */
-  protected String eol = System.getProperty("line.separator", "\n");
-
-  /**
-   * Used to convert raw characters to their escaped version
-   * when these raw version cannot be used as part of an ASCII
-   * string literal.
-   */
-  static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
-      }
-      return retval.toString();
-   }
-
-}
-/* JavaCC - OriginalChecksum=7419551656da229f9adc90489da6fc86 (do not edit this line) */
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
+/* JavaCCOptions:KEEP_LINE_COL=null */
+package org.apache.jena.sparql.lang.sparql_11 ;
+
+/**
+ * This exception is thrown when parse errors are encountered.
+ * You can explicitly create objects of this exception type by
+ * calling the method generateParseException in the generated
+ * parser.
+ *
+ * You can modify this class to customize your error reporting
+ * mechanisms so long as you retain the public fields.
+ */
+public class ParseException extends Exception {
+
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal
+                       )
+  {
+    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
+
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
+
+  public ParseException() {
+    super();
+  }
+
+  /** Constructor with message. */
+  public ParseException(String message) {
+    super(message);
+  }
+
+
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
+
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
+
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
+
+  /**
+   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser) the correct error message
+   * gets displayed.
+   */
+  private static String initialise(Token currentToken,
+                           int[][] expectedTokenSequences,
+                           String[] tokenImage) {
+    String eol = System.getProperty("line.separator", "\n");
+    StringBuffer expected = new StringBuffer();
+    int maxSize = 0;
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+      }
+      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+        expected.append("...");
+      }
+      expected.append(eol).append("    ");
+    }
+    String retval = "Encountered \"";
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      if (i != 0) retval += " ";
+      if (tok.kind == 0) {
+        retval += tokenImage[0];
+        break;
+      }
+      retval += " " + tokenImage[tok.kind];
+      retval += " \"";
+      retval += add_escapes(tok.image);
+      retval += " \"";
+      tok = tok.next;
+    }
+    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
+    } else {
+      retval += "Was expecting one of:" + eol + "    ";
+    }
+    retval += expected.toString();
+    return retval;
+  }
+
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
+
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  static String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+}
+/* JavaCC - OriginalChecksum=25807f74c6efb1bcbd3321a6af1d8604 (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
index a6d961f..d5fc8d2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
@@ -2260,7 +2260,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
      if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if (true) return exprAgg ;}
      }
@@ -4653,7 +4653,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if (true) return exprAgg ;}
       }

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
index b427b22..56bcfbd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
@@ -1,612 +1,612 @@
-/* Generated By:JavaCC: Do not edit this line. SPARQLParser11Constants.java */
-package org.apache.jena.sparql.lang.sparql_11 ;
-
-
-/**
- * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGen#start()
- */
-public interface SPARQLParser11Constants {
-
-  /** End of File. */
-  int EOF = 0;
-  /** RegularExpression Id. */
-  int SINGLE_LINE_COMMENT = 6;
-  /** RegularExpression Id. */
-  int WS = 7;
-  /** RegularExpression Id. */
-  int WSC = 8;
-  /** RegularExpression Id. */
-  int BOM = 9;
-  /** RegularExpression Id. */
-  int IRIref = 10;
-  /** RegularExpression Id. */
-  int PNAME_NS = 11;
-  /** RegularExpression Id. */
-  int PNAME_LN = 12;
-  /** RegularExpression Id. */
-  int BLANK_NODE_LABEL = 13;
-  /** RegularExpression Id. */
-  int VAR1 = 14;
-  /** RegularExpression Id. */
-  int VAR2 = 15;
-  /** RegularExpression Id. */
-  int LANGTAG = 16;
-  /** RegularExpression Id. */
-  int A2Z = 17;
-  /** RegularExpression Id. */
-  int A2ZN = 18;
-  /** RegularExpression Id. */
-  int KW_A = 19;
-  /** RegularExpression Id. */
-  int BASE = 20;
-  /** RegularExpression Id. */
-  int PREFIX = 21;
-  /** RegularExpression Id. */
-  int SELECT = 22;
-  /** RegularExpression Id. */
-  int DISTINCT = 23;
-  /** RegularExpression Id. */
-  int REDUCED = 24;
-  /** RegularExpression Id. */
-  int DESCRIBE = 25;
-  /** RegularExpression Id. */
-  int CONSTRUCT = 26;
-  /** RegularExpression Id. */
-  int ASK = 27;
-  /** RegularExpression Id. */
-  int LIMIT = 28;
-  /** RegularExpression Id. */
-  int OFFSET = 29;
-  /** RegularExpression Id. */
-  int ORDER = 30;
-  /** RegularExpression Id. */
-  int BY = 31;
-  /** RegularExpression Id. */
-  int VALUES = 32;
-  /** RegularExpression Id. */
-  int UNDEF = 33;
-  /** RegularExpression Id. */
-  int ASC = 34;
-  /** RegularExpression Id. */
-  int DESC = 35;
-  /** RegularExpression Id. */
-  int NAMED = 36;
-  /** RegularExpression Id. */
-  int FROM = 37;
-  /** RegularExpression Id. */
-  int WHERE = 38;
-  /** RegularExpression Id. */
-  int AND = 39;
-  /** RegularExpression Id. */
-  int GRAPH = 40;
-  /** RegularExpression Id. */
-  int OPTIONAL = 41;
-  /** RegularExpression Id. */
-  int UNION = 42;
-  /** RegularExpression Id. */
-  int MINUS_P = 43;
-  /** RegularExpression Id. */
-  int BIND = 44;
-  /** RegularExpression Id. */
-  int SERVICE = 45;
-  /** RegularExpression Id. */
-  int EXISTS = 46;
-  /** RegularExpression Id. */
-  int NOT = 47;
-  /** RegularExpression Id. */
-  int AS = 48;
-  /** RegularExpression Id. */
-  int GROUP = 49;
-  /** RegularExpression Id. */
-  int HAVING = 50;
-  /** RegularExpression Id. */
-  int SEPARATOR = 51;
-  /** RegularExpression Id. */
-  int AGG = 52;
-  /** RegularExpression Id. */
-  int COUNT = 53;
-  /** RegularExpression Id. */
-  int MIN = 54;
-  /** RegularExpression Id. */
-  int MAX = 55;
-  /** RegularExpression Id. */
-  int SUM = 56;
-  /** RegularExpression Id. */
-  int AVG = 57;
-  /** RegularExpression Id. */
-  int STDDEV = 58;
-  /** RegularExpression Id. */
-  int SAMPLE = 59;
-  /** RegularExpression Id. */
-  int GROUP_CONCAT = 60;
-  /** RegularExpression Id. */
-  int FILTER = 61;
-  /** RegularExpression Id. */
-  int BOUND = 62;
-  /** RegularExpression Id. */
-  int COALESCE = 63;
-  /** RegularExpression Id. */
-  int IN = 64;
-  /** RegularExpression Id. */
-  int IF = 65;
-  /** RegularExpression Id. */
-  int BNODE = 66;
-  /** RegularExpression Id. */
-  int IRI = 67;
-  /** RegularExpression Id. */
-  int URI = 68;
-  /** RegularExpression Id. */
-  int STR = 69;
-  /** RegularExpression Id. */
-  int STRLANG = 70;
-  /** RegularExpression Id. */
-  int STRDT = 71;
-  /** RegularExpression Id. */
-  int DTYPE = 72;
-  /** RegularExpression Id. */
-  int LANG = 73;
-  /** RegularExpression Id. */
-  int LANGMATCHES = 74;
-  /** RegularExpression Id. */
-  int IS_URI = 75;
-  /** RegularExpression Id. */
-  int IS_IRI = 76;
-  /** RegularExpression Id. */
-  int IS_BLANK = 77;
-  /** RegularExpression Id. */
-  int IS_LITERAL = 78;
-  /** RegularExpression Id. */
-  int IS_NUMERIC = 79;
-  /** RegularExpression Id. */
-  int REGEX = 80;
-  /** RegularExpression Id. */
-  int SAME_TERM = 81;
-  /** RegularExpression Id. */
-  int RAND = 82;
-  /** RegularExpression Id. */
-  int ABS = 83;
-  /** RegularExpression Id. */
-  int CEIL = 84;
-  /** RegularExpression Id. */
-  int FLOOR = 85;
-  /** RegularExpression Id. */
-  int ROUND = 86;
-  /** RegularExpression Id. */
-  int CONCAT = 87;
-  /** RegularExpression Id. */
-  int SUBSTR = 88;
-  /** RegularExpression Id. */
-  int STRLEN = 89;
-  /** RegularExpression Id. */
-  int REPLACE = 90;
-  /** RegularExpression Id. */
-  int UCASE = 91;
-  /** RegularExpression Id. */
-  int LCASE = 92;
-  /** RegularExpression Id. */
-  int ENCODE_FOR_URI = 93;
-  /** RegularExpression Id. */
-  int CONTAINS = 94;
-  /** RegularExpression Id. */
-  int STRSTARTS = 95;
-  /** RegularExpression Id. */
-  int STRENDS = 96;
-  /** RegularExpression Id. */
-  int STRBEFORE = 97;
-  /** RegularExpression Id. */
-  int STRAFTER = 98;
-  /** RegularExpression Id. */
-  int YEAR = 99;
-  /** RegularExpression Id. */
-  int MONTH = 100;
-  /** RegularExpression Id. */
-  int DAY = 101;
-  /** RegularExpression Id. */
-  int HOURS = 102;
-  /** RegularExpression Id. */
-  int MINUTES = 103;
-  /** RegularExpression Id. */
-  int SECONDS = 104;
-  /** RegularExpression Id. */
-  int TIMEZONE = 105;
-  /** RegularExpression Id. */
-  int TZ = 106;
-  /** RegularExpression Id. */
-  int NOW = 107;
-  /** RegularExpression Id. */
-  int UUID = 108;
-  /** RegularExpression Id. */
-  int STRUUID = 109;
-  /** RegularExpression Id. */
-  int MD5 = 110;
-  /** RegularExpression Id. */
-  int SHA1 = 111;
-  /** RegularExpression Id. */
-  int SHA224 = 112;
-  /** RegularExpression Id. */
-  int SHA256 = 113;
-  /** RegularExpression Id. */
-  int SHA384 = 114;
-  /** RegularExpression Id. */
-  int SHA512 = 115;
-  /** RegularExpression Id. */
-  int TRUE = 116;
-  /** RegularExpression Id. */
-  int FALSE = 117;
-  /** RegularExpression Id. */
-  int DATA = 118;
-  /** RegularExpression Id. */
-  int INSERT = 119;
-  /** RegularExpression Id. */
-  int DELETE = 120;
-  /** RegularExpression Id. */
-  int INSERT_DATA = 121;
-  /** RegularExpression Id. */
-  int DELETE_DATA = 122;
-  /** RegularExpression Id. */
-  int DELETE_WHERE = 123;
-  /** RegularExpression Id. */
-  int LOAD = 124;
-  /** RegularExpression Id. */
-  int CLEAR = 125;
-  /** RegularExpression Id. */
-  int CREATE = 126;
-  /** RegularExpression Id. */
-  int ADD = 127;
-  /** RegularExpression Id. */
-  int MOVE = 128;
-  /** RegularExpression Id. */
-  int COPY = 129;
-  /** RegularExpression Id. */
-  int META = 130;
-  /** RegularExpression Id. */
-  int SILENT = 131;
-  /** RegularExpression Id. */
-  int DROP = 132;
-  /** RegularExpression Id. */
-  int INTO = 133;
-  /** RegularExpression Id. */
-  int TO = 134;
-  /** RegularExpression Id. */
-  int DFT = 135;
-  /** RegularExpression Id. */
-  int ALL = 136;
-  /** RegularExpression Id. */
-  int WITH = 137;
-  /** RegularExpression Id. */
-  int USING = 138;
-  /** RegularExpression Id. */
-  int DIGITS = 139;
-  /** RegularExpression Id. */
-  int INTEGER = 140;
-  /** RegularExpression Id. */
-  int DECIMAL = 141;
-  /** RegularExpression Id. */
-  int DOUBLE = 142;
-  /** RegularExpression Id. */
-  int INTEGER_POSITIVE = 143;
-  /** RegularExpression Id. */
-  int DECIMAL_POSITIVE = 144;
-  /** RegularExpression Id. */
-  int DOUBLE_POSITIVE = 145;
-  /** RegularExpression Id. */
-  int INTEGER_NEGATIVE = 146;
-  /** RegularExpression Id. */
-  int DECIMAL_NEGATIVE = 147;
-  /** RegularExpression Id. */
-  int DOUBLE_NEGATIVE = 148;
-  /** RegularExpression Id. */
-  int EXPONENT = 149;
-  /** RegularExpression Id. */
-  int QUOTE_3D = 150;
-  /** RegularExpression Id. */
-  int QUOTE_3S = 151;
-  /** RegularExpression Id. */
-  int ECHAR = 152;
-  /** RegularExpression Id. */
-  int STRING_LITERAL1 = 153;
-  /** RegularExpression Id. */
-  int STRING_LITERAL2 = 154;
-  /** RegularExpression Id. */
-  int STRING_LITERAL_LONG1 = 155;
-  /** RegularExpression Id. */
-  int STRING_LITERAL_LONG2 = 156;
-  /** RegularExpression Id. */
-  int LPAREN = 157;
-  /** RegularExpression Id. */
-  int RPAREN = 158;
-  /** RegularExpression Id. */
-  int NIL = 159;
-  /** RegularExpression Id. */
-  int LBRACE = 160;
-  /** RegularExpression Id. */
-  int RBRACE = 161;
-  /** RegularExpression Id. */
-  int LBRACKET = 162;
-  /** RegularExpression Id. */
-  int RBRACKET = 163;
-  /** RegularExpression Id. */
-  int ANON = 164;
-  /** RegularExpression Id. */
-  int SEMICOLON = 165;
-  /** RegularExpression Id. */
-  int COMMA = 166;
-  /** RegularExpression Id. */
-  int DOT = 167;
-  /** RegularExpression Id. */
-  int EQ = 168;
-  /** RegularExpression Id. */
-  int NE = 169;
-  /** RegularExpression Id. */
-  int GT = 170;
-  /** RegularExpression Id. */
-  int LT = 171;
-  /** RegularExpression Id. */
-  int LE = 172;
-  /** RegularExpression Id. */
-  int GE = 173;
-  /** RegularExpression Id. */
-  int BANG = 174;
-  /** RegularExpression Id. */
-  int TILDE = 175;
-  /** RegularExpression Id. */
-  int COLON = 176;
-  /** RegularExpression Id. */
-  int SC_OR = 177;
-  /** RegularExpression Id. */
-  int SC_AND = 178;
-  /** RegularExpression Id. */
-  int PLUS = 179;
-  /** RegularExpression Id. */
-  int MINUS = 180;
-  /** RegularExpression Id. */
-  int STAR = 181;
-  /** RegularExpression Id. */
-  int SLASH = 182;
-  /** RegularExpression Id. */
-  int DATATYPE = 183;
-  /** RegularExpression Id. */
-  int AT = 184;
-  /** RegularExpression Id. */
-  int VBAR = 185;
-  /** RegularExpression Id. */
-  int CARAT = 186;
-  /** RegularExpression Id. */
-  int FPATH = 187;
-  /** RegularExpression Id. */
-  int RPATH = 188;
-  /** RegularExpression Id. */
-  int QMARK = 189;
-  /** RegularExpression Id. */
-  int PN_CHARS_BASE = 190;
-  /** RegularExpression Id. */
-  int PN_CHARS_U = 191;
-  /** RegularExpression Id. */
-  int PN_CHARS = 192;
-  /** RegularExpression Id. */
-  int PN_PREFIX = 193;
-  /** RegularExpression Id. */
-  int PN_LOCAL = 194;
-  /** RegularExpression Id. */
-  int VARNAME = 195;
-  /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 196;
-  /** RegularExpression Id. */
-  int PLX = 197;
-  /** RegularExpression Id. */
-  int HEX = 198;
-  /** RegularExpression Id. */
-  int PERCENT = 199;
-  /** RegularExpression Id. */
-  int UNKNOWN = 200;
-
-  /** Lexical state. */
-  int DEFAULT = 0;
-
-  /** Literal token values. */
-  String[] tokenImage = {
-    "<EOF>",
-    "\" \"",
-    "\"\\t\"",
-    "\"\\n\"",
-    "\"\\r\"",
-    "\"\\f\"",
-    "<SINGLE_LINE_COMMENT>",
-    "<WS>",
-    "<WSC>",
-    "\"\\ufeff\"",
-    "<IRIref>",
-    "<PNAME_NS>",
-    "<PNAME_LN>",
-    "<BLANK_NODE_LABEL>",
-    "<VAR1>",
-    "<VAR2>",
-    "<LANGTAG>",
-    "<A2Z>",
-    "<A2ZN>",
-    "\"a\"",
-    "\"base\"",
-    "\"prefix\"",
-    "\"select\"",
-    "\"distinct\"",
-    "\"reduced\"",
-    "\"describe\"",
-    "\"construct\"",
-    "\"ask\"",
-    "\"limit\"",
-    "\"offset\"",
-    "\"order\"",
-    "\"by\"",
-    "\"values\"",
-    "\"undef\"",
-    "\"asc\"",
-    "\"desc\"",
-    "\"named\"",
-    "\"from\"",
-    "\"where\"",
-    "\"and\"",
-    "\"graph\"",
-    "\"optional\"",
-    "\"union\"",
-    "\"minus\"",
-    "\"bind\"",
-    "\"service\"",
-    "\"exists\"",
-    "\"not\"",
-    "\"as\"",
-    "\"group\"",
-    "\"having\"",
-    "\"separator\"",
-    "\"agg\"",
-    "\"count\"",
-    "\"min\"",
-    "\"max\"",
-    "\"sum\"",
-    "\"avg\"",
-    "\"stdev\"",
-    "\"sample\"",
-    "\"group_concat\"",
-    "\"filter\"",
-    "\"bound\"",
-    "\"coalesce\"",
-    "\"in\"",
-    "\"if\"",
-    "\"bnode\"",
-    "\"iri\"",
-    "\"uri\"",
-    "\"str\"",
-    "\"strlang\"",
-    "\"strdt\"",
-    "\"datatype\"",
-    "\"lang\"",
-    "\"langmatches\"",
-    "\"isURI\"",
-    "\"isIRI\"",
-    "\"isBlank\"",
-    "\"isLiteral\"",
-    "\"isNumeric\"",
-    "\"regex\"",
-    "\"sameTerm\"",
-    "\"RAND\"",
-    "\"ABS\"",
-    "\"CEIL\"",
-    "\"FLOOR\"",
-    "\"ROUND\"",
-    "\"CONCAT\"",
-    "\"SUBSTR\"",
-    "\"STRLEN\"",
-    "\"REPLACE\"",
-    "\"UCASE\"",
-    "\"LCASE\"",
-    "\"ENCODE_FOR_URI\"",
-    "\"CONTAINS\"",
-    "\"STRSTARTS\"",
-    "\"STRENDS\"",
-    "\"STRBEFORE\"",
-    "\"STRAFTER\"",
-    "\"YEAR\"",
-    "\"MONTH\"",
-    "\"DAY\"",
-    "\"HOURS\"",
-    "\"MINUTES\"",
-    "\"SECONDS\"",
-    "\"TIMEZONE\"",
-    "\"TZ\"",
-    "\"NOW\"",
-    "\"UUID\"",
-    "\"STRUUID\"",
-    "\"MD5\"",
-    "\"SHA1\"",
-    "\"SHA224\"",
-    "\"SHA256\"",
-    "\"SHA384\"",
-    "\"SHA512\"",
-    "\"true\"",
-    "\"false\"",
-    "\"data\"",
-    "\"insert\"",
-    "\"delete\"",
-    "<INSERT_DATA>",
-    "<DELETE_DATA>",
-    "<DELETE_WHERE>",
-    "\"load\"",
-    "\"clear\"",
-    "\"create\"",
-    "\"add\"",
-    "\"move\"",
-    "\"copy\"",
-    "\"meta\"",
-    "\"silent\"",
-    "\"drop\"",
-    "\"into\"",
-    "\"to\"",
-    "\"default\"",
-    "\"all\"",
-    "\"with\"",
-    "\"using\"",
-    "<DIGITS>",
-    "<INTEGER>",
-    "<DECIMAL>",
-    "<DOUBLE>",
-    "<INTEGER_POSITIVE>",
-    "<DECIMAL_POSITIVE>",
-    "<DOUBLE_POSITIVE>",
-    "<INTEGER_NEGATIVE>",
-    "<DECIMAL_NEGATIVE>",
-    "<DOUBLE_NEGATIVE>",
-    "<EXPONENT>",
-    "\"\\\"\\\"\\\"\"",
-    "\"\\\'\\\'\\\'\"",
-    "<ECHAR>",
-    "<STRING_LITERAL1>",
-    "<STRING_LITERAL2>",
-    "<STRING_LITERAL_LONG1>",
-    "<STRING_LITERAL_LONG2>",
-    "\"(\"",
-    "\")\"",
-    "<NIL>",
-    "\"{\"",
-    "\"}\"",
-    "\"[\"",
-    "\"]\"",
-    "<ANON>",
-    "\";\"",
-    "\",\"",
-    "\".\"",
-    "\"=\"",
-    "\"!=\"",
-    "\">\"",
-    "\"<\"",
-    "\"<=\"",
-    "\">=\"",
-    "\"!\"",
-    "\"~\"",
-    "\":\"",
-    "\"||\"",
-    "\"&&\"",
-    "\"+\"",
-    "\"-\"",
-    "\"*\"",
-    "\"/\"",
-    "\"^^\"",
-    "\"@\"",
-    "\"|\"",
-    "\"^\"",
-    "\"->\"",
-    "\"<-\"",
-    "\"?\"",
-    "<PN_CHARS_BASE>",
-    "<PN_CHARS_U>",
-    "<PN_CHARS>",
-    "<PN_PREFIX>",
-    "<PN_LOCAL>",
-    "<VARNAME>",
-    "<PN_LOCAL_ESC>",
-    "<PLX>",
-    "<HEX>",
-    "<PERCENT>",
-    "<UNKNOWN>",
-  };
-
-}
+/* Generated By:JavaCC: Do not edit this line. SPARQLParser11Constants.java */
+package org.apache.jena.sparql.lang.sparql_11 ;
+
+
+/**
+ * Token literal values and constants.
+ * Generated by org.javacc.parser.OtherFilesGen#start()
+ */
+public interface SPARQLParser11Constants {
+
+  /** End of File. */
+  int EOF = 0;
+  /** RegularExpression Id. */
+  int SINGLE_LINE_COMMENT = 6;
+  /** RegularExpression Id. */
+  int WS = 7;
+  /** RegularExpression Id. */
+  int WSC = 8;
+  /** RegularExpression Id. */
+  int BOM = 9;
+  /** RegularExpression Id. */
+  int IRIref = 10;
+  /** RegularExpression Id. */
+  int PNAME_NS = 11;
+  /** RegularExpression Id. */
+  int PNAME_LN = 12;
+  /** RegularExpression Id. */
+  int BLANK_NODE_LABEL = 13;
+  /** RegularExpression Id. */
+  int VAR1 = 14;
+  /** RegularExpression Id. */
+  int VAR2 = 15;
+  /** RegularExpression Id. */
+  int LANGTAG = 16;
+  /** RegularExpression Id. */
+  int A2Z = 17;
+  /** RegularExpression Id. */
+  int A2ZN = 18;
+  /** RegularExpression Id. */
+  int KW_A = 19;
+  /** RegularExpression Id. */
+  int BASE = 20;
+  /** RegularExpression Id. */
+  int PREFIX = 21;
+  /** RegularExpression Id. */
+  int SELECT = 22;
+  /** RegularExpression Id. */
+  int DISTINCT = 23;
+  /** RegularExpression Id. */
+  int REDUCED = 24;
+  /** RegularExpression Id. */
+  int DESCRIBE = 25;
+  /** RegularExpression Id. */
+  int CONSTRUCT = 26;
+  /** RegularExpression Id. */
+  int ASK = 27;
+  /** RegularExpression Id. */
+  int LIMIT = 28;
+  /** RegularExpression Id. */
+  int OFFSET = 29;
+  /** RegularExpression Id. */
+  int ORDER = 30;
+  /** RegularExpression Id. */
+  int BY = 31;
+  /** RegularExpression Id. */
+  int VALUES = 32;
+  /** RegularExpression Id. */
+  int UNDEF = 33;
+  /** RegularExpression Id. */
+  int ASC = 34;
+  /** RegularExpression Id. */
+  int DESC = 35;
+  /** RegularExpression Id. */
+  int NAMED = 36;
+  /** RegularExpression Id. */
+  int FROM = 37;
+  /** RegularExpression Id. */
+  int WHERE = 38;
+  /** RegularExpression Id. */
+  int AND = 39;
+  /** RegularExpression Id. */
+  int GRAPH = 40;
+  /** RegularExpression Id. */
+  int OPTIONAL = 41;
+  /** RegularExpression Id. */
+  int UNION = 42;
+  /** RegularExpression Id. */
+  int MINUS_P = 43;
+  /** RegularExpression Id. */
+  int BIND = 44;
+  /** RegularExpression Id. */
+  int SERVICE = 45;
+  /** RegularExpression Id. */
+  int EXISTS = 46;
+  /** RegularExpression Id. */
+  int NOT = 47;
+  /** RegularExpression Id. */
+  int AS = 48;
+  /** RegularExpression Id. */
+  int GROUP = 49;
+  /** RegularExpression Id. */
+  int HAVING = 50;
+  /** RegularExpression Id. */
+  int SEPARATOR = 51;
+  /** RegularExpression Id. */
+  int AGG = 52;
+  /** RegularExpression Id. */
+  int COUNT = 53;
+  /** RegularExpression Id. */
+  int MIN = 54;
+  /** RegularExpression Id. */
+  int MAX = 55;
+  /** RegularExpression Id. */
+  int SUM = 56;
+  /** RegularExpression Id. */
+  int AVG = 57;
+  /** RegularExpression Id. */
+  int STDDEV = 58;
+  /** RegularExpression Id. */
+  int SAMPLE = 59;
+  /** RegularExpression Id. */
+  int GROUP_CONCAT = 60;
+  /** RegularExpression Id. */
+  int FILTER = 61;
+  /** RegularExpression Id. */
+  int BOUND = 62;
+  /** RegularExpression Id. */
+  int COALESCE = 63;
+  /** RegularExpression Id. */
+  int IN = 64;
+  /** RegularExpression Id. */
+  int IF = 65;
+  /** RegularExpression Id. */
+  int BNODE = 66;
+  /** RegularExpression Id. */
+  int IRI = 67;
+  /** RegularExpression Id. */
+  int URI = 68;
+  /** RegularExpression Id. */
+  int STR = 69;
+  /** RegularExpression Id. */
+  int STRLANG = 70;
+  /** RegularExpression Id. */
+  int STRDT = 71;
+  /** RegularExpression Id. */
+  int DTYPE = 72;
+  /** RegularExpression Id. */
+  int LANG = 73;
+  /** RegularExpression Id. */
+  int LANGMATCHES = 74;
+  /** RegularExpression Id. */
+  int IS_URI = 75;
+  /** RegularExpression Id. */
+  int IS_IRI = 76;
+  /** RegularExpression Id. */
+  int IS_BLANK = 77;
+  /** RegularExpression Id. */
+  int IS_LITERAL = 78;
+  /** RegularExpression Id. */
+  int IS_NUMERIC = 79;
+  /** RegularExpression Id. */
+  int REGEX = 80;
+  /** RegularExpression Id. */
+  int SAME_TERM = 81;
+  /** RegularExpression Id. */
+  int RAND = 82;
+  /** RegularExpression Id. */
+  int ABS = 83;
+  /** RegularExpression Id. */
+  int CEIL = 84;
+  /** RegularExpression Id. */
+  int FLOOR = 85;
+  /** RegularExpression Id. */
+  int ROUND = 86;
+  /** RegularExpression Id. */
+  int CONCAT = 87;
+  /** RegularExpression Id. */
+  int SUBSTR = 88;
+  /** RegularExpression Id. */
+  int STRLEN = 89;
+  /** RegularExpression Id. */
+  int REPLACE = 90;
+  /** RegularExpression Id. */
+  int UCASE = 91;
+  /** RegularExpression Id. */
+  int LCASE = 92;
+  /** RegularExpression Id. */
+  int ENCODE_FOR_URI = 93;
+  /** RegularExpression Id. */
+  int CONTAINS = 94;
+  /** RegularExpression Id. */
+  int STRSTARTS = 95;
+  /** RegularExpression Id. */
+  int STRENDS = 96;
+  /** RegularExpression Id. */
+  int STRBEFORE = 97;
+  /** RegularExpression Id. */
+  int STRAFTER = 98;
+  /** RegularExpression Id. */
+  int YEAR = 99;
+  /** RegularExpression Id. */
+  int MONTH = 100;
+  /** RegularExpression Id. */
+  int DAY = 101;
+  /** RegularExpression Id. */
+  int HOURS = 102;
+  /** RegularExpression Id. */
+  int MINUTES = 103;
+  /** RegularExpression Id. */
+  int SECONDS = 104;
+  /** RegularExpression Id. */
+  int TIMEZONE = 105;
+  /** RegularExpression Id. */
+  int TZ = 106;
+  /** RegularExpression Id. */
+  int NOW = 107;
+  /** RegularExpression Id. */
+  int UUID = 108;
+  /** RegularExpression Id. */
+  int STRUUID = 109;
+  /** RegularExpression Id. */
+  int MD5 = 110;
+  /** RegularExpression Id. */
+  int SHA1 = 111;
+  /** RegularExpression Id. */
+  int SHA224 = 112;
+  /** RegularExpression Id. */
+  int SHA256 = 113;
+  /** RegularExpression Id. */
+  int SHA384 = 114;
+  /** RegularExpression Id. */
+  int SHA512 = 115;
+  /** RegularExpression Id. */
+  int TRUE = 116;
+  /** RegularExpression Id. */
+  int FALSE = 117;
+  /** RegularExpression Id. */
+  int DATA = 118;
+  /** RegularExpression Id. */
+  int INSERT = 119;
+  /** RegularExpression Id. */
+  int DELETE = 120;
+  /** RegularExpression Id. */
+  int INSERT_DATA = 121;
+  /** RegularExpression Id. */
+  int DELETE_DATA = 122;
+  /** RegularExpression Id. */
+  int DELETE_WHERE = 123;
+  /** RegularExpression Id. */
+  int LOAD = 124;
+  /** RegularExpression Id. */
+  int CLEAR = 125;
+  /** RegularExpression Id. */
+  int CREATE = 126;
+  /** RegularExpression Id. */
+  int ADD = 127;
+  /** RegularExpression Id. */
+  int MOVE = 128;
+  /** RegularExpression Id. */
+  int COPY = 129;
+  /** RegularExpression Id. */
+  int META = 130;
+  /** RegularExpression Id. */
+  int SILENT = 131;
+  /** RegularExpression Id. */
+  int DROP = 132;
+  /** RegularExpression Id. */
+  int INTO = 133;
+  /** RegularExpression Id. */
+  int TO = 134;
+  /** RegularExpression Id. */
+  int DFT = 135;
+  /** RegularExpression Id. */
+  int ALL = 136;
+  /** RegularExpression Id. */
+  int WITH = 137;
+  /** RegularExpression Id. */
+  int USING = 138;
+  /** RegularExpression Id. */
+  int DIGITS = 139;
+  /** RegularExpression Id. */
+  int INTEGER = 140;
+  /** RegularExpression Id. */
+  int DECIMAL = 141;
+  /** RegularExpression Id. */
+  int DOUBLE = 142;
+  /** RegularExpression Id. */
+  int INTEGER_POSITIVE = 143;
+  /** RegularExpression Id. */
+  int DECIMAL_POSITIVE = 144;
+  /** RegularExpression Id. */
+  int DOUBLE_POSITIVE = 145;
+  /** RegularExpression Id. */
+  int INTEGER_NEGATIVE = 146;
+  /** RegularExpression Id. */
+  int DECIMAL_NEGATIVE = 147;
+  /** RegularExpression Id. */
+  int DOUBLE_NEGATIVE = 148;
+  /** RegularExpression Id. */
+  int EXPONENT = 149;
+  /** RegularExpression Id. */
+  int QUOTE_3D = 150;
+  /** RegularExpression Id. */
+  int QUOTE_3S = 151;
+  /** RegularExpression Id. */
+  int ECHAR = 152;
+  /** RegularExpression Id. */
+  int STRING_LITERAL1 = 153;
+  /** RegularExpression Id. */
+  int STRING_LITERAL2 = 154;
+  /** RegularExpression Id. */
+  int STRING_LITERAL_LONG1 = 155;
+  /** RegularExpression Id. */
+  int STRING_LITERAL_LONG2 = 156;
+  /** RegularExpression Id. */
+  int LPAREN = 157;
+  /** RegularExpression Id. */
+  int RPAREN = 158;
+  /** RegularExpression Id. */
+  int NIL = 159;
+  /** RegularExpression Id. */
+  int LBRACE = 160;
+  /** RegularExpression Id. */
+  int RBRACE = 161;
+  /** RegularExpression Id. */
+  int LBRACKET = 162;
+  /** RegularExpression Id. */
+  int RBRACKET = 163;
+  /** RegularExpression Id. */
+  int ANON = 164;
+  /** RegularExpression Id. */
+  int SEMICOLON = 165;
+  /** RegularExpression Id. */
+  int COMMA = 166;
+  /** RegularExpression Id. */
+  int DOT = 167;
+  /** RegularExpression Id. */
+  int EQ = 168;
+  /** RegularExpression Id. */
+  int NE = 169;
+  /** RegularExpression Id. */
+  int GT = 170;
+  /** RegularExpression Id. */
+  int LT = 171;
+  /** RegularExpression Id. */
+  int LE = 172;
+  /** RegularExpression Id. */
+  int GE = 173;
+  /** RegularExpression Id. */
+  int BANG = 174;
+  /** RegularExpression Id. */
+  int TILDE = 175;
+  /** RegularExpression Id. */
+  int COLON = 176;
+  /** RegularExpression Id. */
+  int SC_OR = 177;
+  /** RegularExpression Id. */
+  int SC_AND = 178;
+  /** RegularExpression Id. */
+  int PLUS = 179;
+  /** RegularExpression Id. */
+  int MINUS = 180;
+  /** RegularExpression Id. */
+  int STAR = 181;
+  /** RegularExpression Id. */
+  int SLASH = 182;
+  /** RegularExpression Id. */
+  int DATATYPE = 183;
+  /** RegularExpression Id. */
+  int AT = 184;
+  /** RegularExpression Id. */
+  int VBAR = 185;
+  /** RegularExpression Id. */
+  int CARAT = 186;
+  /** RegularExpression Id. */
+  int FPATH = 187;
+  /** RegularExpression Id. */
+  int RPATH = 188;
+  /** RegularExpression Id. */
+  int QMARK = 189;
+  /** RegularExpression Id. */
+  int PN_CHARS_BASE = 190;
+  /** RegularExpression Id. */
+  int PN_CHARS_U = 191;
+  /** RegularExpression Id. */
+  int PN_CHARS = 192;
+  /** RegularExpression Id. */
+  int PN_PREFIX = 193;
+  /** RegularExpression Id. */
+  int PN_LOCAL = 194;
+  /** RegularExpression Id. */
+  int VARNAME = 195;
+  /** RegularExpression Id. */
+  int PN_LOCAL_ESC = 196;
+  /** RegularExpression Id. */
+  int PLX = 197;
+  /** RegularExpression Id. */
+  int HEX = 198;
+  /** RegularExpression Id. */
+  int PERCENT = 199;
+  /** RegularExpression Id. */
+  int UNKNOWN = 200;
+
+  /** Lexical state. */
+  int DEFAULT = 0;
+
+  /** Literal token values. */
+  String[] tokenImage = {
+    "<EOF>",
+    "\" \"",
+    "\"\\t\"",
+    "\"\\n\"",
+    "\"\\r\"",
+    "\"\\f\"",
+    "<SINGLE_LINE_COMMENT>",
+    "<WS>",
+    "<WSC>",
+    "\"\\ufeff\"",
+    "<IRIref>",
+    "<PNAME_NS>",
+    "<PNAME_LN>",
+    "<BLANK_NODE_LABEL>",
+    "<VAR1>",
+    "<VAR2>",
+    "<LANGTAG>",
+    "<A2Z>",
+    "<A2ZN>",
+    "\"a\"",
+    "\"base\"",
+    "\"prefix\"",
+    "\"select\"",
+    "\"distinct\"",
+    "\"reduced\"",
+    "\"describe\"",
+    "\"construct\"",
+    "\"ask\"",
+    "\"limit\"",
+    "\"offset\"",
+    "\"order\"",
+    "\"by\"",
+    "\"values\"",
+    "\"undef\"",
+    "\"asc\"",
+    "\"desc\"",
+    "\"named\"",
+    "\"from\"",
+    "\"where\"",
+    "\"and\"",
+    "\"graph\"",
+    "\"optional\"",
+    "\"union\"",
+    "\"minus\"",
+    "\"bind\"",
+    "\"service\"",
+    "\"exists\"",
+    "\"not\"",
+    "\"as\"",
+    "\"group\"",
+    "\"having\"",
+    "\"separator\"",
+    "\"agg\"",
+    "\"count\"",
+    "\"min\"",
+    "\"max\"",
+    "\"sum\"",
+    "\"avg\"",
+    "\"stdev\"",
+    "\"sample\"",
+    "\"group_concat\"",
+    "\"filter\"",
+    "\"bound\"",
+    "\"coalesce\"",
+    "\"in\"",
+    "\"if\"",
+    "\"bnode\"",
+    "\"iri\"",
+    "\"uri\"",
+    "\"str\"",
+    "\"strlang\"",
+    "\"strdt\"",
+    "\"datatype\"",
+    "\"lang\"",
+    "\"langmatches\"",
+    "\"isURI\"",
+    "\"isIRI\"",
+    "\"isBlank\"",
+    "\"isLiteral\"",
+    "\"isNumeric\"",
+    "\"regex\"",
+    "\"sameTerm\"",
+    "\"RAND\"",
+    "\"ABS\"",
+    "\"CEIL\"",
+    "\"FLOOR\"",
+    "\"ROUND\"",
+    "\"CONCAT\"",
+    "\"SUBSTR\"",
+    "\"STRLEN\"",
+    "\"REPLACE\"",
+    "\"UCASE\"",
+    "\"LCASE\"",
+    "\"ENCODE_FOR_URI\"",
+    "\"CONTAINS\"",
+    "\"STRSTARTS\"",
+    "\"STRENDS\"",
+    "\"STRBEFORE\"",
+    "\"STRAFTER\"",
+    "\"YEAR\"",
+    "\"MONTH\"",
+    "\"DAY\"",
+    "\"HOURS\"",
+    "\"MINUTES\"",
+    "\"SECONDS\"",
+    "\"TIMEZONE\"",
+    "\"TZ\"",
+    "\"NOW\"",
+    "\"UUID\"",
+    "\"STRUUID\"",
+    "\"MD5\"",
+    "\"SHA1\"",
+    "\"SHA224\"",
+    "\"SHA256\"",
+    "\"SHA384\"",
+    "\"SHA512\"",
+    "\"true\"",
+    "\"false\"",
+    "\"data\"",
+    "\"insert\"",
+    "\"delete\"",
+    "<INSERT_DATA>",
+    "<DELETE_DATA>",
+    "<DELETE_WHERE>",
+    "\"load\"",
+    "\"clear\"",
+    "\"create\"",
+    "\"add\"",
+    "\"move\"",
+    "\"copy\"",
+    "\"meta\"",
+    "\"silent\"",
+    "\"drop\"",
+    "\"into\"",
+    "\"to\"",
+    "\"default\"",
+    "\"all\"",
+    "\"with\"",
+    "\"using\"",
+    "<DIGITS>",
+    "<INTEGER>",
+    "<DECIMAL>",
+    "<DOUBLE>",
+    "<INTEGER_POSITIVE>",
+    "<DECIMAL_POSITIVE>",
+    "<DOUBLE_POSITIVE>",
+    "<INTEGER_NEGATIVE>",
+    "<DECIMAL_NEGATIVE>",
+    "<DOUBLE_NEGATIVE>",
+    "<EXPONENT>",
+    "\"\\\"\\\"\\\"\"",
+    "\"\\\'\\\'\\\'\"",
+    "<ECHAR>",
+    "<STRING_LITERAL1>",
+    "<STRING_LITERAL2>",
+    "<STRING_LITERAL_LONG1>",
+    "<STRING_LITERAL_LONG2>",
+    "\"(\"",
+    "\")\"",
+    "<NIL>",
+    "\"{\"",
+    "\"}\"",
+    "\"[\"",
+    "\"]\"",
+    "<ANON>",
+    "\";\"",
+    "\",\"",
+    "\".\"",
+    "\"=\"",
+    "\"!=\"",
+    "\">\"",
+    "\"<\"",
+    "\"<=\"",
+    "\">=\"",
+    "\"!\"",
+    "\"~\"",
+    "\":\"",
+    "\"||\"",
+    "\"&&\"",
+    "\"+\"",
+    "\"-\"",
+    "\"*\"",
+    "\"/\"",
+    "\"^^\"",
+    "\"@\"",
+    "\"|\"",
+    "\"^\"",
+    "\"->\"",
+    "\"<-\"",
+    "\"?\"",
+    "<PN_CHARS_BASE>",
+    "<PN_CHARS_U>",
+    "<PN_CHARS>",
+    "<PN_PREFIX>",
+    "<PN_LOCAL>",
+    "<VARNAME>",
+    "<PN_LOCAL_ESC>",
+    "<PLX>",
+    "<HEX>",
+    "<PERCENT>",
+    "<UNKNOWN>",
+  };
+
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java
index c4514db..994d8dc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java
@@ -128,4 +128,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=2e111759cc5d23b5f328692361ef7edf (do not edit this line) */
+/* JavaCC - OriginalChecksum=14a2dd2c56b347f7b769eacf6b50c9b9 (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java
index c3f4585..023874f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java
@@ -144,4 +144,4 @@ public class TokenMgrError extends Error
     this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=2748ab83006aee357b29341477722d1b (do not edit this line) */
+/* JavaCC - OriginalChecksum=0c993d195e89c16550efa6afecdeb1ab (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
index 39a7a54..777df8b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
@@ -1402,7 +1402,7 @@ public class BuilderExpr
             if ( distinct )
                 x = x.cdr();
             ExprList e = buildExprListUntagged(x, 0) ;
-            Aggregator agg = AggregatorFactory.createCustom(z.getNode().getURI(), e) ;
+            Aggregator agg = AggregatorFactory.createCustom(false, distinct, z.getNode().getURI(), e) ;
             return new ExprAggregator(null, agg) ; 
         }
     } ;


[22/50] [abbrv] jena git commit: Deal cleanly with no datasets provide - devolve to individual commands.

Posted by rv...@apache.org.
Deal cleanly with no datasets provide - devolve to individual commands.

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

Branch: refs/heads/JENA-507
Commit: b8aba8b1c88b3784eb6d9e704f1b622f29e38d71
Parents: 5c9092d
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 25 12:31:49 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 25 12:31:49 2015 +0100

----------------------------------------------------------------------
 jena-tdb/src/main/java/tdb/tdbupdate.java | 35 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b8aba8b1/jena-tdb/src/main/java/tdb/tdbupdate.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/tdbupdate.java b/jena-tdb/src/main/java/tdb/tdbupdate.java
index 2d25620..464ec2e 100644
--- a/jena-tdb/src/main/java/tdb/tdbupdate.java
+++ b/jena-tdb/src/main/java/tdb/tdbupdate.java
@@ -18,31 +18,44 @@
 
 package tdb;
 
+import arq.cmdline.ModDataset ;
+import jena.cmd.CmdException ;
+import org.apache.jena.sparql.core.DatasetGraph ;
 import org.apache.jena.tdb.TDB ;
 import org.apache.jena.tdb.transaction.TransactionManager ;
 import tdb.cmdline.CmdTDB ;
+import tdb.cmdline.ModTDBDataset ;
 
 public class tdbupdate extends arq.update
 {
     // Inherits from arq.update so is not a CmdTDB.  Mixins for Java!
     public static void main(String...argv)
-    {
-        CmdTDB.init() ;
+ {
+        CmdTDB.init();
         // Do everything with flushing transactions.
-        TransactionManager.QueueBatchSize = 0 ;
-        new tdbupdate(argv).mainRun() ;
+        TransactionManager.QueueBatchSize = 0;
+        new tdbupdate(argv).mainRun();
     }
-    
-    public tdbupdate(String[] argv) 
-    {
-        super(argv) ;
+
+    public tdbupdate(String[] argv) {
+        super(argv);
         // Because this inherits from an ARQ command
-        CmdTDB.init() ;
-        super.modVersion.addClass(TDB.class) ;
+        CmdTDB.init();
+        super.modVersion.addClass(TDB.class);
     }
 
     @Override
     protected void processModulesAndArgs() {
-        super.processModulesAndArgs() ;
+        super.processModulesAndArgs();
+    }
+
+    @Override
+    protected ModDataset setModeDataset() {
+        return new ModTDBDataset();
+    }
+    
+    @Override
+    protected DatasetGraph dealWithNoDataset() {
+        throw new CmdException("No dataset provided") ;
     }
 }


[46/50] [abbrv] jena git commit: Typo

Posted by rv...@apache.org.
Typo

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

Branch: refs/heads/JENA-507
Commit: 8bfe1cfbcaf7cb610a363698268158ff052f1944
Parents: 0cc6b6b
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Sep 7 12:16:18 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Sep 7 12:16:18 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/sparql/graph/GraphFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/8bfe1cfb/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
index 6032fb0..977eba4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
@@ -71,7 +71,7 @@ public class GraphFactory
     /** Guaranteed call-through to Jena's ModelFactory operation */
     public static Model makeJenaDefaultModel() { return ModelFactory.createDefaultModel() ; }
     
-    /** Create a model over a default graph (ARQ-wide for degault graph type) */ 
+    /** Create a model over a default graph (ARQ-wide for default graph type) */ 
     public static Model makeDefaultModel()
     {
         return ModelFactory.createModelForGraph(createDefaultGraph()) ;


[19/50] [abbrv] jena git commit: Add "--loc" support to tdbupdate.

Posted by rv...@apache.org.
Add "--loc" support to tdbupdate.

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

Branch: refs/heads/JENA-507
Commit: 48769892c1102257ded9a661a358e51ec66a5e44
Parents: bb2e683
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 25 12:12:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 25 12:12:29 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/arq/cmdline/CmdUpdate.java  | 8 +++-----
 jena-arq/src/main/java/arq/cmdline/ModDataset.java | 9 +++++----
 2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/48769892/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
index d06f480..fd3113b 100644
--- a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
+++ b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
@@ -24,7 +24,7 @@ import org.apache.jena.sparql.core.DatasetGraph ;
 
 public abstract class CmdUpdate extends CmdARQ
 {
-    protected ModDatasetGeneralAssembler modGraphStore = new ModDatasetGeneralAssembler() ;
+    protected ModDataset modGraphStore = null ;
     protected Syntax updateSyntax = Syntax.defaultUpdateSyntax ;
 
     protected CmdUpdate(String[] argv)
@@ -32,11 +32,9 @@ public abstract class CmdUpdate extends CmdARQ
         super(argv) ;
         modGraphStore = setModGraphStore() ;
         addModule(modGraphStore) ;
-        
     }
     
-    protected ModDatasetGeneralAssembler setModGraphStore()
-    {
+    protected ModDataset setModGraphStore() {
         return new ModDatasetGeneralAssembler() ;
     }
     
@@ -54,7 +52,7 @@ public abstract class CmdUpdate extends CmdARQ
         DatasetGraph graphStore = modGraphStore.getDatasetGraph() ;
         if ( graphStore.getDefaultGraph() == null )
             graphStore.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()) ;
-   execUpdate(graphStore) ;
+        execUpdate(graphStore) ;
     }
 
     protected abstract void execUpdate(DatasetGraph graphStore) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/48769892/jena-arq/src/main/java/arq/cmdline/ModDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDataset.java b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
index 7a7db0d..089e1f1 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModDataset.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
@@ -31,15 +31,16 @@ public abstract class ModDataset extends ModBase
     public ModDataset() {}
     
     final
-    public Dataset getDataset()
-    { if ( ! createAttempted )
+    public Dataset getDataset() { 
+        if ( ! createAttempted )
             dataset = createDataset() ;
         createAttempted = true ;
         return dataset ;
     }
     
-    public DatasetGraph getDatasetGraph()
-    { return dataset.asDatasetGraph() ; }
+    public DatasetGraph getDatasetGraph() { 
+        return getDataset().asDatasetGraph() ;
+    }
 
     public abstract Dataset createDataset() ; 
 }


[06/50] [abbrv] jena git commit: JENA-1013: reinstate test (passes for different reasons)

Posted by rv...@apache.org.
JENA-1013: reinstate test (passes for different reasons)


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

Branch: refs/heads/JENA-507
Commit: 6a0fee3ca45abd02d9f1105476b5940b93e4ee71
Parents: 93d2d53
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 23 21:14:57 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 23 21:14:57 2015 +0100

----------------------------------------------------------------------
 .../hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java     | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6a0fee3c/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
index 33ba4d4..66a4f03 100644
--- a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
+++ b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
@@ -424,8 +424,6 @@ public abstract class AbstractNodeTupleInputFormatTests<TValue, T extends Abstra
      */
     @Test(expected = IOException.class)
     public final void fail_on_bad_input_02() throws IOException, InterruptedException {
-        Assume.assumeFalse("fail_on_bad_input_02: See JENA-1013 (JSON-LD tests)", this.getFileExtension().contains("jsonld")) ;
-        
         Configuration config = this.prepareConfiguration();
         config.setBoolean(RdfIOConstants.INPUT_IGNORE_BAD_TUPLES, false);
         Assert.assertFalse(config.getBoolean(RdfIOConstants.INPUT_IGNORE_BAD_TUPLES, true));


[35/50] [abbrv] jena git commit: Add Model-based operation.

Posted by rv...@apache.org.
Add Model-based operation.

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

Branch: refs/heads/JENA-507
Commit: 06e1641e2ea214cf5526ef351755dc90f4202246
Parents: a25376a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:09:56 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:09:56 2015 +0100

----------------------------------------------------------------------
 .../org/apache/jena/fuseki/servlets/ResponseDataset.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/06e1641e/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
index f05331d..5a5c7ac 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java
@@ -33,6 +33,8 @@ import org.apache.jena.fuseki.Fuseki;
 import org.apache.jena.fuseki.conneg.ConNeg;
 import org.apache.jena.fuseki.conneg.WebLib;
 import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory ;
+import org.apache.jena.rdf.model.Model ;
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFDataMgr;
 import org.apache.jena.riot.RDFLanguages;
@@ -66,8 +68,12 @@ public class ResponseDataset
         ResponseOps.put(shortNamesModel, contentOutputTriG,     WebContent.contentTypeTriG) ;
     }
 
-    public static void doResponseDataset(HttpAction action, Dataset dataset) 
-    {
+    public static void doResponseModel(HttpAction action, Model model) { 
+        Dataset ds = DatasetFactory.create(model) ;
+        ResponseDataset.doResponseDataset(action, ds);
+    }
+    
+    public static void doResponseDataset(HttpAction action, Dataset dataset) {
         HttpServletRequest request = action.request ;
         HttpServletResponse response = action.response ;
         


[50/50] [abbrv] jena git commit: Add support for specifying base URIs to rdfcompare

Posted by rv...@apache.org.
Add support for specifying base URIs to rdfcompare


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

Branch: refs/heads/master
Commit: 3f9f9f357cc028777e7f429b99fddde281cbac08
Parents: 4105775
Author: Rob Vesse <rv...@apache.org>
Authored: Wed Sep 9 09:43:22 2015 +0200
Committer: Rob Vesse <rv...@apache.org>
Committed: Wed Sep 9 09:43:22 2015 +0200

----------------------------------------------------------------------
 jena-core/src/main/java/jena/rdfcompare.java | 33 ++++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/3f9f9f35/jena-core/src/main/java/jena/rdfcompare.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/rdfcompare.java b/jena-core/src/main/java/jena/rdfcompare.java
index 3851d44..95cc602 100644
--- a/jena-core/src/main/java/jena/rdfcompare.java
+++ b/jena-core/src/main/java/jena/rdfcompare.java
@@ -52,7 +52,7 @@ public class rdfcompare extends java.lang.Object {
     * @param args the command line arguments
     */
     public static void main (String ... args) {
-        if (args.length < 2 || args.length > 4) {
+        if (args.length < 2 || args.length > 6) {
             usage();
             System.exit(-1);
         }
@@ -60,21 +60,29 @@ public class rdfcompare extends java.lang.Object {
         String in1 = args[0];
         String in2 = args[1];
         String lang1 = "RDF/XML";
-        if (args.length > 2) {
+        if (args.length >= 3) {
             lang1 = args[2];
         } 
         String lang2 = "N-TRIPLE";
-        if (args.length == 4) {
+        if (args.length >= 4) {
             lang2 = args[3];
         }
+        String base1 = null;
+        if (args.length >= 5) {
+            base1 = args[4];
+        }
+        String base2 = base1;
+        if (args.length >= 6) {
+            base2 = args[5];
+        }
         
-        System.out.println(in1 + " " + in2 + " " + lang1 + " " + lang2);
+        System.out.println(in1 + " " + in2 + " " + lang1 + " " + lang2 + " " + base1 + " " + base2);
         try {
             Model m1 = ModelFactory.createDefaultModel();
             Model m2 = ModelFactory.createDefaultModel();
         
-            read(m1, in1, lang1);
-            read(m2, in2, lang2);
+            read(m1, in1, lang1, base1);
+            read(m2, in2, lang2, base2);
         
             if (m1.isIsomorphicWith(m2)) {
                 System.out.println("models are equal");
@@ -95,7 +103,7 @@ public class rdfcompare extends java.lang.Object {
     protected static void usage() {
         System.err.println("usage:");
         System.err.println(
-            "    java jena.rdfcompare source1 source2 [lang1 [lang2]]");
+            "    java jena.rdfcompare source1 source2 [lang1 [lang2 [base1 [base2]]]]");
         System.err.println();
         System.err.println("    source1 and source2 can be URL's or filenames");
         System.err.println("    lang1 and lang2 can take values:");
@@ -103,16 +111,21 @@ public class rdfcompare extends java.lang.Object {
         System.err.println("      N-TRIPLE");
         System.err.println("      N3");
         System.err.println("    lang1 defaults to RDF/XML, lang2 to N-TRIPLE");
+        System.err.println("    base1 and base2 are URIs");
+        System.err.println("    base1 defaults to null");
+        System.err.println("    base2 defaults to base1");
+        System.err.println("    If no base URIs are specified Jena determines the base URI based on the input source");
+        
         System.err.println();
     }
     
-    protected static void read(Model model, String in, String lang) 
+    protected static void read(Model model, String in, String lang, String base) 
       throws java.io.FileNotFoundException {
         try {
             URL url = new URL(in);
-            model.read(in, lang);
+            model.read(in, base, lang);
         } catch (java.net.MalformedURLException e) {
-            model.read(new FileInputStream(in), "", lang);
+            model.read(new FileInputStream(in), base, lang);
         }
     }
 }


[11/50] [abbrv] jena git commit: Use general RDF Accept header.

Posted by rv...@apache.org.
Use general RDF Accept header.

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

Branch: refs/heads/JENA-507
Commit: 6cd7e235d5e5047a072f2fd2c29fb272343d9924
Parents: 5cd90aa
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 11:21:57 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 11:21:57 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6cd7e235/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java
index 9639e1e..b540f99 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java
@@ -39,7 +39,7 @@ public class LocatorHTTP extends LocatorURL {
     @Override
     public TypedInputStream performOpen(String uri) {
         if ( uri.startsWith("http://") || uri.startsWith("https://") )
-            return HttpOp.execHttpGet(uri, WebContent.defaultGraphAcceptHeader) ;
+            return HttpOp.execHttpGet(uri, WebContent.defaultRDFAcceptHeader) ;
         return null ;
     }
 


[34/50] [abbrv] jena git commit: DESCRIBE results are models; CONSTRUCT results are datasets.

Posted by rv...@apache.org.
DESCRIBE results are models; CONSTRUCT results are datasets.

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

Branch: refs/heads/JENA-507
Commit: a25376aa8d717ede9720270154def6af343a2e0c
Parents: 0b8c50b
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:09:31 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:09:31 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a25376aa/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
index c43b257..6d7e8a6 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -379,7 +379,11 @@ public abstract class SPARQL_Query extends SPARQL_Protocol
         if ( result.isResultSet() )
             ResponseResultSet.doResponseResultSet(action, result.getResultSet(), qPrologue) ;
         else if ( result.isDataset() )
+            // CONSTRUCT is processed as a extended CONSTRUCT - result is a dataset. 
             ResponseDataset.doResponseDataset(action, result.getDataset());
+        else if ( result.isModel() )
+            // DESCRIBE rsults are models
+            ResponseDataset.doResponseModel(action, result.getModel());
         else if ( result.isBoolean() )
             ResponseResultSet.doResponseResultSet(action, result.getBooleanResult()) ;
         else


[43/50] [abbrv] jena git commit: Catch all unimplemented froms. Add some new forms as processed.

Posted by rv...@apache.org.
Catch all unimplemented froms.  Add some new forms as processed.

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

Branch: refs/heads/JENA-507
Commit: c9760dfa5067cf829f32575571f73b34c9737490
Parents: f4e017a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:52:54 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:52:54 2015 +0100

----------------------------------------------------------------------
 .../jena/sparql/engine/main/VarFinder.java      | 95 ++++++++++++++++++--
 1 file changed, 88 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/c9760dfa/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index b5314da..a1a73fb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -18,7 +18,11 @@
 
 package org.apache.jena.sparql.engine.main;
 
-import static org.apache.jena.sparql.util.VarUtils.* ;
+import static org.apache.jena.sparql.util.VarUtils.addVar ;
+import static org.apache.jena.sparql.util.VarUtils.addVars ;
+import static org.apache.jena.sparql.util.VarUtils.addVarsFromQuad ;
+import static org.apache.jena.sparql.util.VarUtils.addVarsFromTriple ;
+import static org.apache.jena.sparql.util.VarUtils.addVarsFromTriplePath ;
 
 import java.util.HashSet ;
 import java.util.List ;
@@ -26,14 +30,16 @@ import java.util.Map ;
 import java.util.Map.Entry ;
 import java.util.Set ;
 
+import org.apache.jena.atlas.lib.NotImplemented ;
 import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.algebra.OpVisitorBase ;
+import org.apache.jena.sparql.algebra.OpVisitor ;
 import org.apache.jena.sparql.algebra.op.* ;
 import org.apache.jena.sparql.core.BasicPattern ;
 import org.apache.jena.sparql.core.Var ;
 import org.apache.jena.sparql.core.VarExprList ;
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
+import org.apache.jena.sparql.util.VarUtils ;
 
 public class VarFinder
 {
@@ -66,8 +72,9 @@ public class VarFinder
     public Set<Var> getAssign() { return varUsageVisitor.assignMentions ; }
     public Set<Var> getFixed() { return varUsageVisitor.defines ; }
     
-    private static class VarUsageVisitor extends OpVisitorBase // implements
-                                                               // OpVisitor
+    private static class VarUsageVisitor 
+        //extends OpVisitorBase
+        implements OpVisitor
     {
         static VarUsageVisitor apply(Op op) {
             VarUsageVisitor v = new VarUsageVisitor();
@@ -96,9 +103,7 @@ public class VarFinder
 
         @Override
         public void visit(OpQuadPattern quadPattern) {
-            addVar(defines, quadPattern.getGraphNode());
-            BasicPattern triples = quadPattern.getBasicPattern();
-            addVars(defines, triples);
+            addVars(defines, quadPattern.getGraphNode(), quadPattern.getBasicPattern());
         }
 
         @Override
@@ -108,6 +113,26 @@ public class VarFinder
         }
 
         @Override
+        public void visit(OpQuadBlock quadBlock) {
+            addVars(defines, quadBlock.getPattern()) ;
+        }
+
+        @Override
+        public void visit(OpTriple opTriple) {
+            addVarsFromTriple(defines, opTriple.getTriple()) ;
+        }
+
+        @Override
+        public void visit(OpQuad opQuad) {
+            addVarsFromQuad(defines, opQuad.getQuad()) ;
+        }
+
+        @Override
+        public void visit(OpPath opPath) {
+            addVarsFromTriplePath(defines, opPath.getTriplePath()); 
+        }
+
+        @Override
         public void visit(OpExt opExt) {
             opExt.effectiveOp().visit(this);
         }
@@ -235,5 +260,61 @@ public class VarFinder
 
         @Override
         public void visit(OpNull opNull) {}
+
+        @Override
+        public void visit(OpPropFunc opPropFunc) {
+            VarUtils.addVarNodes(defines, opPropFunc.getSubjectArgs().getArgList()) ;
+            VarUtils.addVarNodes(defines, opPropFunc.getObjectArgs().getArgList()) ;
+        }
+        
+        // Not implemented: with checking. 
+
+        private void no() { 
+            throw new NotImplemented() ;
+        }
+        
+        @Override
+        public void visit(OpProcedure opProc) { no() ; }
+
+
+        @Override
+        public void visit(OpService opService) { no(); }
+
+        @Override
+        public void visit(OpDatasetNames dsNames) { no(); }
+
+        @Override
+        public void visit(OpLabel opLabel) { no(); }
+
+        @Override
+        public void visit(OpDiff opDiff) { no(); }
+
+        @Override
+        public void visit(OpMinus opMinus) { no(); }
+
+        @Override
+        public void visit(OpDisjunction opDisjunction) { no(); }
+
+        @Override
+        public void visit(OpList opList) { no(); }
+
+        @Override
+        public void visit(OpOrder opOrder) { no(); }
+
+        @Override
+        public void visit(OpReduced opReduced) { no(); }
+
+        @Override
+        public void visit(OpDistinct opDistinct) { no(); }
+
+        @Override
+        public void visit(OpSlice opSlice) { no(); }
+
+        @Override
+        public void visit(OpGroup opGroup) { no(); }
+
+        @Override
+        public void visit(OpTopN opTop) { no(); }
     }
+
 }


[16/50] [abbrv] jena git commit: JENA-803 : Support AGG(DISTNCT ...)

Posted by rv...@apache.org.
JENA-803 : Support AGG<uri>(DISTNCT ...)

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

Branch: refs/heads/JENA-507
Commit: b93e38988b3b3bb168e04d1f38cadb3650f5ccb2
Parents: ae00d86
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 11:44:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 11:44:29 2015 +0100

----------------------------------------------------------------------
 jena-arq/Grammar/arq.jj                         |   15 +-
 jena-arq/Grammar/master.jj                      |   18 +-
 jena-arq/Grammar/sparql_11.jj                   |    4 +-
 .../jena/sparql/expr/aggregate/AggCustom.java   |    7 +-
 .../expr/aggregate/AggregatorFactory.java       |    2 +-
 .../apache/jena/sparql/lang/arq/ARQParser.java  |  774 ++++++-----
 .../sparql/lang/arq/ARQParserConstants.java     | 1266 +++++++++---------
 .../jena/sparql/lang/arq/JavaCharStream.java    | 1234 ++++++++---------
 .../jena/sparql/lang/arq/ParseException.java    |  374 +++---
 .../org/apache/jena/sparql/lang/arq/Token.java  |    2 +-
 .../jena/sparql/lang/arq/TokenMgrError.java     |    2 +-
 .../sparql/lang/sparql_11/JavaCharStream.java   | 1234 ++++++++---------
 .../sparql/lang/sparql_11/ParseException.java   |  374 +++---
 .../sparql/lang/sparql_11/SPARQLParser11.java   |    4 +-
 .../lang/sparql_11/SPARQLParser11Constants.java | 1224 ++++++++---------
 .../jena/sparql/lang/sparql_11/Token.java       |    2 +-
 .../sparql/lang/sparql_11/TokenMgrError.java    |    2 +-
 .../jena/sparql/sse/builders/BuilderExpr.java   |    2 +-
 18 files changed, 3337 insertions(+), 3203 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/Grammar/arq.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 3e0f9d4..459ed7c 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -760,7 +760,7 @@ Expr FunctionCall() : { String fname ; ExprList a ; }
      if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
      }
@@ -1465,8 +1465,15 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     { agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
     | t = <AGG>
           { String iri ; }
-          iri = iri() a = ExpressionList()
-      { agg = AggregatorFactory.createCustom(iri, a) ; }
+          iri = iri()
+          <LPAREN>
+          ( <DISTINCT> { distinct = true ; } )?
+          (
+             expr = Expression() { a.add(expr) ; }
+             (<COMMA> expr = Expression() { a.add(expr) ; } )*
+          )?
+          <RPAREN>
+      { agg = AggregatorFactory.createCustom(false, distinct, iri, a) ; }
    )
    {
      if ( ! allowAggregatesInExpressions )
@@ -1487,7 +1494,7 @@ Expr iriOrFunction() : { String iri ; ExprList a = null ;
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
       }

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/Grammar/master.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj
index b2ae620..043f745 100644
--- a/jena-arq/Grammar/master.jj
+++ b/jena-arq/Grammar/master.jj
@@ -1075,7 +1075,7 @@ Expr FunctionCall() : { String fname ; ExprList a ; }
          // aggregates
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
      }
@@ -2044,13 +2044,19 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     { agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
 
 #ifdef ARQ
-    /* Explciit syntax (aggregate even if not registered) */
+    /* Explicit syntax (aggregate even if not registered) */
     | t = <AGG>
           { String iri ; }
-          iri = iri() a = ExpressionList()
-      { agg = AggregatorFactory.createCustom(iri, a) ; }
+          iri = iri()
+          <LPAREN>
+          ( <DISTINCT> { distinct = true ; } )?
+          (
+             expr = Expression() { a.add(expr) ; } 
+             (<COMMA> expr = Expression() { a.add(expr) ; } )*            
+          )?
+          <RPAREN>
+      { agg = AggregatorFactory.createCustom(false, distinct, iri, a) ; }
 #endif
-
    )
 
    {
@@ -2078,7 +2084,7 @@ Expr iriOrFunction() : { String iri ; ExprList a = null ;
          // aggregates
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
       }

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/Grammar/sparql_11.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/sparql_11.jj b/jena-arq/Grammar/sparql_11.jj
index df2b3b8..4d3a866 100644
--- a/jena-arq/Grammar/sparql_11.jj
+++ b/jena-arq/Grammar/sparql_11.jj
@@ -689,7 +689,7 @@ Expr FunctionCall() : { String fname ; ExprList a ; }
      if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
      }
@@ -1350,7 +1350,7 @@ Expr iriOrFunction() : { String iri ; ExprList a = null ;
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
       }

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
index c8ff032..ab70376 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
@@ -55,7 +55,7 @@ public class AggCustom extends AggregatorBase
         IndentedLineBuffer x = new IndentedLineBuffer() ;
         if ( ! AggregateRegistry.isRegistered(iri) ) {
             // If not registered and if parsed in again not registered, it becomes a function.
-            // AGG <iri>(...) syntax.  It can;'t have been legal SPARQL 1.1 unless it got
+            // AGG <iri>(...) syntax.  It can't have been legal SPARQL 1.1 unless it got
             // unregistered in which case all bets are off anyway.
             x.append(getName()) ;
             x.append(" ") ;
@@ -63,11 +63,12 @@ public class AggCustom extends AggregatorBase
         x.append("<") ;
         x.append(iri);
         x.append(">") ;
+        x.append("(") ;
         if ( isDistinct )
-            x.append(" DISTINCT ") ;
+            x.append("DISTINCT ") ;
         x.incIndent(); 
-        x.append("(") ;
         ExprUtils.fmtSPARQL(x, getExprList(), sCxt) ;
+        x.decIndent(); 
         x.append(")") ;
         return x.asString() ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
index 4a74c8e..a268f49 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
@@ -63,7 +63,7 @@ public class AggregatorFactory {
         return new AggNull() ;
     }
 
-    public static Aggregator createCustom(String iri, ExprList a) {
+    public static Aggregator createCustom(boolean usedAsFunction, boolean distinct, String iri, ExprList a) {
         if ( ! AggregateRegistry.isRegistered(iri) )
             Log.warn(AggregatorFactory.class, "Not registered: custom aggregate <"+iri+">") ;
         return new AggCustom(iri, a) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/b93e3898/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
index 6a070c2..3718cd6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
@@ -2711,7 +2711,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
      if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if (true) return exprAgg ;}
      }
@@ -5205,11 +5205,131 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
       t = jj_consume_token(AGG);
             String iri ;
       iri = iri();
-      a = ExpressionList();
-        agg = AggregatorFactory.createCustom(iri, a) ;
+      jj_consume_token(LPAREN);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case DISTINCT:
+        jj_consume_token(DISTINCT);
+                         distinct = true ;
+        break;
+      default:
+        jj_la1[163] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case IRIref:
+      case PNAME_NS:
+      case PNAME_LN:
+      case VAR1:
+      case VAR2:
+      case EXISTS:
+      case NOT:
+      case AGG:
+      case COUNT:
+      case MIN:
+      case MAX:
+      case SUM:
+      case AVG:
+      case SAMPLE:
+      case GROUP_CONCAT:
+      case BOUND:
+      case COALESCE:
+      case IF:
+      case BNODE:
+      case IRI:
+      case URI:
+      case CALL:
+      case STR:
+      case STRLANG:
+      case STRDT:
+      case DTYPE:
+      case LANG:
+      case LANGMATCHES:
+      case IS_URI:
+      case IS_IRI:
+      case IS_BLANK:
+      case IS_LITERAL:
+      case IS_NUMERIC:
+      case REGEX:
+      case SAME_TERM:
+      case RAND:
+      case ABS:
+      case CEIL:
+      case FLOOR:
+      case ROUND:
+      case CONCAT:
+      case SUBSTR:
+      case STRLEN:
+      case REPLACE:
+      case UCASE:
+      case LCASE:
+      case ENCODE_FOR_URI:
+      case CONTAINS:
+      case STRSTARTS:
+      case STRENDS:
+      case STRBEFORE:
+      case STRAFTER:
+      case YEAR:
+      case MONTH:
+      case DAY:
+      case HOURS:
+      case MINUTES:
+      case SECONDS:
+      case TIMEZONE:
+      case TZ:
+      case NOW:
+      case UUID:
+      case STRUUID:
+      case VERSION:
+      case MD5:
+      case SHA1:
+      case SHA256:
+      case SHA384:
+      case SHA512:
+      case TRUE:
+      case FALSE:
+      case INTEGER:
+      case DECIMAL:
+      case DOUBLE:
+      case INTEGER_POSITIVE:
+      case DECIMAL_POSITIVE:
+      case DOUBLE_POSITIVE:
+      case INTEGER_NEGATIVE:
+      case DECIMAL_NEGATIVE:
+      case DOUBLE_NEGATIVE:
+      case STRING_LITERAL1:
+      case STRING_LITERAL2:
+      case STRING_LITERAL_LONG1:
+      case STRING_LITERAL_LONG2:
+      case LPAREN:
+      case BANG:
+      case PLUS:
+      case MINUS:
+        expr = Expression();
+                                   a.add(expr) ;
+        label_41:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case COMMA:
+            ;
+            break;
+          default:
+            jj_la1[164] = jj_gen;
+            break label_41;
+          }
+          jj_consume_token(COMMA);
+          expr = Expression();
+                                            a.add(expr) ;
+        }
+        break;
+      default:
+        jj_la1[165] = jj_gen;
+        ;
+      }
+      jj_consume_token(RPAREN);
+        agg = AggregatorFactory.createCustom(false, distinct, iri, a) ;
       break;
     default:
-      jj_la1[163] = jj_gen;
+      jj_la1[166] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5232,7 +5352,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
       a = ArgList();
       break;
     default:
-      jj_la1[164] = jj_gen;
+      jj_la1[167] = jj_gen;
       ;
     }
     if ( a == null )
@@ -5240,7 +5360,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! allowAggregatesInExpressions )
             throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
-         Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
+         Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if (true) return exprAgg ;}
       }
@@ -5265,13 +5385,13 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
         uri = iri();
         break;
       default:
-        jj_la1[165] = jj_gen;
+        jj_la1[168] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[166] = jj_gen;
+      jj_la1[169] = jj_gen;
       ;
     }
       {if (true) return createLiteral(lex, lang, uri) ;}
@@ -5297,7 +5417,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
       n = NumericLiteralNegative();
       break;
     default:
-      jj_la1[167] = jj_gen;
+      jj_la1[170] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5321,7 +5441,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
                  {if (true) return createLiteralDouble(t.image) ;}
       break;
     default:
-      jj_la1[168] = jj_gen;
+      jj_la1[171] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5344,7 +5464,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
                           {if (true) return createLiteralDouble(t.image) ;}
       break;
     default:
-      jj_la1[169] = jj_gen;
+      jj_la1[172] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5367,7 +5487,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
                           {if (true) return createLiteralDouble(t.image) ;}
       break;
     default:
-      jj_la1[170] = jj_gen;
+      jj_la1[173] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5385,7 +5505,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
             {if (true) return XSD_FALSE ;}
       break;
     default:
-      jj_la1[171] = jj_gen;
+      jj_la1[174] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5412,7 +5532,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
                                  lex = stripQuotes3(t.image) ;
       break;
     default:
-      jj_la1[172] = jj_gen;
+      jj_la1[175] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5434,7 +5554,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
                          {if (true) return iri ;}
       break;
     default:
-      jj_la1[173] = jj_gen;
+      jj_la1[176] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5453,7 +5573,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
       {if (true) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
       break;
     default:
-      jj_la1[174] = jj_gen;
+      jj_la1[177] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5472,7 +5592,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
                {if (true) return createBNode(t.beginLine, t.beginColumn) ;}
       break;
     default:
-      jj_la1[175] = jj_gen;
+      jj_la1[178] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5521,273 +5641,243 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     finally { jj_save(4, xla); }
   }
 
-  private boolean jj_3R_71() {
+  private boolean jj_3R_72() {
     if (jj_scan_token(MONTH)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_70() {
+  private boolean jj_3R_71() {
     if (jj_scan_token(YEAR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_171() {
-    if (jj_scan_token(DOUBLE)) return true;
+  private boolean jj_3R_158() {
+    if (jj_3R_169()) return true;
     return false;
   }
 
-  private boolean jj_3R_69() {
+  private boolean jj_3R_157() {
+    if (jj_3R_168()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_70() {
     if (jj_scan_token(STRAFTER)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_170() {
-    if (jj_scan_token(DECIMAL)) return true;
+  private boolean jj_3R_156() {
+    if (jj_3R_167()) return true;
     return false;
   }
 
-  private boolean jj_3R_169() {
-    if (jj_scan_token(INTEGER)) return true;
+  private boolean jj_3R_69() {
+    if (jj_scan_token(STRBEFORE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_166() {
+  private boolean jj_3R_150() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_169()) {
+    if (jj_3R_156()) {
     jj_scanpos = xsp;
-    if (jj_3R_170()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_171()) return true;
+    if (jj_3R_158()) return true;
     }
     }
     return false;
   }
 
   private boolean jj_3R_68() {
-    if (jj_scan_token(STRBEFORE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_67() {
     if (jj_scan_token(STRENDS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_129() {
-    if (jj_3R_135()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_157() {
-    if (jj_3R_168()) return true;
+  private boolean jj_3R_130() {
+    if (jj_3R_136()) return true;
     return false;
   }
 
-  private boolean jj_3R_66() {
+  private boolean jj_3R_67() {
     if (jj_scan_token(STRSTARTS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_156() {
-    if (jj_3R_167()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_115() {
+  private boolean jj_3R_116() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_129()) {
+    if (jj_3R_130()) {
     jj_scanpos = xsp;
-    if (jj_3R_130()) return true;
+    if (jj_3R_131()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_155() {
-    if (jj_3R_166()) return true;
+  private boolean jj_3R_66() {
+    if (jj_scan_token(CONTAINS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_65() {
-    if (jj_scan_token(CONTAINS)) return true;
+    if (jj_scan_token(ENCODE_FOR_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_64() {
-    if (jj_scan_token(ENCODE_FOR_URI)) return true;
+    if (jj_scan_token(LCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_63() {
-    if (jj_scan_token(LCASE)) return true;
+    if (jj_scan_token(UCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_149() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_155()) {
-    jj_scanpos = xsp;
-    if (jj_3R_156()) {
-    jj_scanpos = xsp;
-    if (jj_3R_157()) return true;
-    }
-    }
+  private boolean jj_3R_62() {
+    if (jj_3R_110()) return true;
     return false;
   }
 
-  private boolean jj_3R_62() {
-    if (jj_scan_token(UCASE)) return true;
+  private boolean jj_3R_61() {
+    if (jj_scan_token(STRLEN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_61() {
+  private boolean jj_3R_60() {
     if (jj_3R_109()) return true;
     return false;
   }
 
-  private boolean jj_3R_60() {
-    if (jj_scan_token(STRLEN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_149() {
+    if (jj_3R_155()) return true;
     return false;
   }
 
   private boolean jj_3R_59() {
+    if (jj_scan_token(CONCAT)) return true;
     if (jj_3R_108()) return true;
     return false;
   }
 
   private boolean jj_3R_58() {
-    if (jj_scan_token(CONCAT)) return true;
-    if (jj_3R_107()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_57() {
     if (jj_scan_token(ROUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_56() {
+  private boolean jj_3R_57() {
     if (jj_scan_token(FLOOR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_55() {
+  private boolean jj_3R_56() {
     if (jj_scan_token(CEIL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_54() {
+  private boolean jj_3R_55() {
     if (jj_scan_token(ABS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_53() {
+  private boolean jj_3R_54() {
     if (jj_scan_token(RAND)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_106() {
+  private boolean jj_3R_107() {
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_148() {
-    if (jj_3R_154()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_105() {
+  private boolean jj_3R_106() {
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_52() {
+  private boolean jj_3R_53() {
     if (jj_scan_token(BNODE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_105()) {
+    if (jj_3R_106()) {
     jj_scanpos = xsp;
-    if (jj_3R_106()) return true;
+    if (jj_3R_107()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_51() {
+  private boolean jj_3R_52() {
     if (jj_scan_token(URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_50() {
+  private boolean jj_3R_51() {
     if (jj_scan_token(IRI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_49() {
+  private boolean jj_3R_50() {
     if (jj_scan_token(BOUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_48() {
+  private boolean jj_3R_49() {
     if (jj_scan_token(DTYPE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_126() {
+  private boolean jj_3R_127() {
     if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
   private boolean jj_3_3() {
     if (jj_scan_token(DOT)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  private boolean jj_3R_47() {
+  private boolean jj_3R_48() {
     if (jj_scan_token(LANGMATCHES)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_46() {
+  private boolean jj_3R_47() {
     if (jj_scan_token(LANG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_45() {
+  private boolean jj_3R_46() {
     if (jj_scan_token(STR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_41() {
+  private boolean jj_3R_42() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_44()) {
-    jj_scanpos = xsp;
     if (jj_3R_45()) {
     jj_scanpos = xsp;
     if (jj_3R_46()) {
@@ -5898,7 +5988,9 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     jj_scanpos = xsp;
     if (jj_3R_99()) {
     jj_scanpos = xsp;
-    if (jj_3R_100()) return true;
+    if (jj_3R_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_101()) return true;
     }
     }
     }
@@ -5958,20 +6050,20 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     return false;
   }
 
-  private boolean jj_3R_44() {
-    if (jj_3R_104()) return true;
+  private boolean jj_3R_45() {
+    if (jj_3R_105()) return true;
     return false;
   }
 
-  private boolean jj_3R_124() {
+  private boolean jj_3R_125() {
     if (jj_scan_token(AGG)) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_134()) return true;
     return false;
   }
 
   private boolean jj_3_2() {
     if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_3R_42()) return true;
+    if (jj_3R_43()) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(130)) {
@@ -6023,63 +6115,61 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     return false;
   }
 
-  private boolean jj_3R_137() {
+  private boolean jj_3R_138() {
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_123() {
+  private boolean jj_3R_124() {
     if (jj_scan_token(GROUP_CONCAT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_122() {
+  private boolean jj_3R_123() {
     if (jj_scan_token(SAMPLE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3_1() {
-    if (jj_3R_41()) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3R_121() {
+  private boolean jj_3R_122() {
     if (jj_scan_token(AVG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_120() {
+  private boolean jj_3R_121() {
     if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_119() {
+  private boolean jj_3R_120() {
     if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_118() {
+  private boolean jj_3R_119() {
     if (jj_scan_token(SUM)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_117() {
+  private boolean jj_3R_118() {
     if (jj_scan_token(COUNT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_104() {
+  private boolean jj_3R_105() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_117()) {
-    jj_scanpos = xsp;
     if (jj_3R_118()) {
     jj_scanpos = xsp;
     if (jj_3R_119()) {
@@ -6092,7 +6182,9 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     jj_scanpos = xsp;
     if (jj_3R_123()) {
     jj_scanpos = xsp;
-    if (jj_3R_124()) return true;
+    if (jj_3R_124()) {
+    jj_scanpos = xsp;
+    if (jj_3R_125()) return true;
     }
     }
     }
@@ -6103,136 +6195,161 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     return false;
   }
 
-  private boolean jj_3R_138() {
+  private boolean jj_3R_139() {
     if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_132() {
-    if (jj_3R_138()) return true;
+  private boolean jj_3R_133() {
+    if (jj_3R_139()) return true;
     return false;
   }
 
-  private boolean jj_3R_131() {
-    if (jj_3R_137()) return true;
+  private boolean jj_3R_132() {
+    if (jj_3R_138()) return true;
     return false;
   }
 
-  private boolean jj_3R_116() {
+  private boolean jj_3R_117() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_131()) {
+    if (jj_3R_132()) {
     jj_scanpos = xsp;
-    if (jj_3R_132()) return true;
+    if (jj_3R_133()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_112() {
+  private boolean jj_3R_113() {
     if (jj_scan_token(NOT)) return true;
     if (jj_scan_token(EXISTS)) return true;
     return false;
   }
 
-  private boolean jj_3R_114() {
-    if (jj_3R_128()) return true;
+  private boolean jj_3R_115() {
+    if (jj_3R_129()) return true;
     return false;
   }
 
-  private boolean jj_3R_111() {
+  private boolean jj_3R_112() {
     if (jj_scan_token(EXISTS)) return true;
-    if (jj_3R_126()) return true;
+    if (jj_3R_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_128() {
+  private boolean jj_3R_129() {
     if (jj_scan_token(PREFIX)) return true;
     if (jj_scan_token(PNAME_NS)) return true;
-    if (jj_3R_134()) return true;
+    if (jj_3R_135()) return true;
     return false;
   }
 
-  private boolean jj_3R_127() {
+  private boolean jj_3R_128() {
     if (jj_scan_token(BASE)) return true;
-    if (jj_3R_134()) return true;
+    if (jj_3R_135()) return true;
     return false;
   }
 
-  private boolean jj_3R_113() {
-    if (jj_3R_127()) return true;
+  private boolean jj_3R_114() {
+    if (jj_3R_128()) return true;
     return false;
   }
 
-  private boolean jj_3R_101() {
+  private boolean jj_3R_102() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_113()) {
+    if (jj_3R_114()) {
     jj_scanpos = xsp;
-    if (jj_3R_114()) return true;
+    if (jj_3R_115()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_109() {
+  private boolean jj_3R_110() {
     if (jj_scan_token(REPLACE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_42() {
+  private boolean jj_3R_43() {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_101()) { jj_scanpos = xsp; break; }
+      if (jj_3R_102()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_108() {
+  private boolean jj_3R_109() {
     if (jj_scan_token(SUBSTR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_103() {
-    if (jj_3R_116()) return true;
+  private boolean jj_3R_104() {
+    if (jj_3R_117()) return true;
     return false;
   }
 
-  private boolean jj_3R_43() {
+  private boolean jj_3R_44() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_102()) {
+    if (jj_3R_103()) {
     jj_scanpos = xsp;
-    if (jj_3R_103()) return true;
+    if (jj_3R_104()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_102() {
-    if (jj_3R_115()) return true;
+  private boolean jj_3R_103() {
+    if (jj_3R_116()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_135() {
+    if (jj_scan_token(IRIref)) return true;
     return false;
   }
 
   private boolean jj_3_4() {
     if (jj_scan_token(DOT)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_3R_44()) return true;
     return false;
   }
 
-  private boolean jj_3R_134() {
-    if (jj_scan_token(IRIref)) return true;
+  private boolean jj_3R_162() {
+    if (jj_scan_token(ANON)) return true;
     return false;
   }
 
-  private boolean jj_3R_110() {
+  private boolean jj_3R_161() {
+    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_152() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_161()) {
+    jj_scanpos = xsp;
+    if (jj_3R_162()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_111() {
     if (jj_scan_token(REGEX)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_161() {
-    if (jj_scan_token(ANON)) return true;
+  private boolean jj_3R_154() {
+    if (jj_scan_token(PNAME_NS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_101() {
+    if (jj_3R_113()) return true;
     return false;
   }
 
@@ -6241,227 +6358,241 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     return false;
   }
 
-  private boolean jj_3R_99() {
-    if (jj_3R_111()) return true;
+  private boolean jj_3R_153() {
+    if (jj_scan_token(PNAME_LN)) return true;
     return false;
   }
 
-  private boolean jj_3R_160() {
-    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
+  private boolean jj_3R_99() {
+    if (jj_3R_111()) return true;
     return false;
   }
 
-  private boolean jj_3R_151() {
+  private boolean jj_3R_148() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_160()) {
+    if (jj_3R_153()) {
     jj_scanpos = xsp;
-    if (jj_3R_161()) return true;
+    if (jj_3R_154()) return true;
     }
     return false;
   }
 
   private boolean jj_3R_98() {
-    if (jj_3R_110()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_97() {
     if (jj_scan_token(IS_NUMERIC)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_153() {
-    if (jj_scan_token(PNAME_NS)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_96() {
+  private boolean jj_3R_97() {
     if (jj_scan_token(IS_LITERAL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_152() {
-    if (jj_scan_token(PNAME_LN)) return true;
+  private boolean jj_3R_141() {
+    if (jj_3R_148()) return true;
     return false;
   }
 
-  private boolean jj_3R_95() {
+  private boolean jj_3R_96() {
     if (jj_scan_token(IS_BLANK)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_125() {
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_140() {
+    if (jj_3R_135()) return true;
     return false;
   }
 
-  private boolean jj_3R_147() {
+  private boolean jj_3R_134() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_152()) {
+    if (jj_3R_140()) {
     jj_scanpos = xsp;
-    if (jj_3R_153()) return true;
+    if (jj_3R_141()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_94() {
-    if (jj_scan_token(IS_URI)) return true;
+  private boolean jj_3R_126() {
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_93() {
-    if (jj_scan_token(IS_IRI)) return true;
+  private boolean jj_3R_95() {
+    if (jj_scan_token(IS_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_140() {
-    if (jj_3R_147()) return true;
+  private boolean jj_3R_94() {
+    if (jj_scan_token(IS_IRI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_107() {
+  private boolean jj_3R_108() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(165)) {
     jj_scanpos = xsp;
-    if (jj_3R_125()) return true;
+    if (jj_3R_126()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_92() {
+  private boolean jj_3R_93() {
     if (jj_scan_token(SAME_TERM)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_139() {
-    if (jj_3R_134()) return true;
+  private boolean jj_3R_166() {
+    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
     return false;
   }
 
-  private boolean jj_3R_133() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_139()) {
-    jj_scanpos = xsp;
-    if (jj_3R_140()) return true;
-    }
+  private boolean jj_3R_92() {
+    if (jj_scan_token(STRDT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_91() {
-    if (jj_scan_token(STRDT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_165() {
+    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
     return false;
   }
 
-  private boolean jj_3R_90() {
+  private boolean jj_3R_164() {
+    if (jj_scan_token(STRING_LITERAL2)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_91() {
     if (jj_scan_token(STRLANG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_89() {
-    if (jj_scan_token(IF)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_163() {
+    if (jj_scan_token(STRING_LITERAL1)) return true;
     return false;
   }
 
-  private boolean jj_3R_165() {
-    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
+  private boolean jj_3R_155() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_163()) {
+    jj_scanpos = xsp;
+    if (jj_3R_164()) {
+    jj_scanpos = xsp;
+    if (jj_3R_165()) {
+    jj_scanpos = xsp;
+    if (jj_3R_166()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_164() {
-    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
+  private boolean jj_3R_90() {
+    if (jj_scan_token(IF)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_163() {
-    if (jj_scan_token(STRING_LITERAL2)) return true;
+  private boolean jj_3R_160() {
+    if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  private boolean jj_3R_162() {
-    if (jj_scan_token(STRING_LITERAL1)) return true;
+  private boolean jj_3R_159() {
+    if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  private boolean jj_3R_154() {
+  private boolean jj_3R_151() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_162()) {
+    if (jj_3R_159()) {
     jj_scanpos = xsp;
-    if (jj_3R_163()) {
-    jj_scanpos = xsp;
-    if (jj_3R_164()) {
-    jj_scanpos = xsp;
-    if (jj_3R_165()) return true;
-    }
-    }
+    if (jj_3R_160()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_88() {
+  private boolean jj_3R_89() {
     if (jj_scan_token(CALL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_87() {
+  private boolean jj_3R_178() {
+    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_88() {
     if (jj_scan_token(COALESCE)) return true;
-    if (jj_3R_107()) return true;
+    if (jj_3R_108()) return true;
     return false;
   }
 
-  private boolean jj_3R_159() {
-    if (jj_scan_token(FALSE)) return true;
+  private boolean jj_3R_177() {
+    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_146() {
+  private boolean jj_3R_147() {
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_86() {
+  private boolean jj_3R_87() {
     if (jj_scan_token(VERSION)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_145() {
-    if (jj_3R_151()) return true;
+  private boolean jj_3R_176() {
+    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_85() {
+  private boolean jj_3R_169() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_176()) {
+    jj_scanpos = xsp;
+    if (jj_3R_177()) {
+    jj_scanpos = xsp;
+    if (jj_3R_178()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_146() {
+    if (jj_3R_152()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_86() {
     if (jj_scan_token(SHA512)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_158() {
-    if (jj_scan_token(TRUE)) return true;
+  private boolean jj_3R_145() {
+    if (jj_3R_151()) return true;
     return false;
   }
 
-  private boolean jj_3R_150() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_158()) {
-    jj_scanpos = xsp;
-    if (jj_3R_159()) return true;
-    }
+  private boolean jj_3R_85() {
+    if (jj_scan_token(SHA384)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
@@ -6471,7 +6602,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
   }
 
   private boolean jj_3R_84() {
-    if (jj_scan_token(SHA384)) return true;
+    if (jj_scan_token(SHA256)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -6482,32 +6613,24 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
   }
 
   private boolean jj_3R_83() {
-    if (jj_scan_token(SHA256)) return true;
+    if (jj_scan_token(SHA1)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_142() {
-    if (jj_3R_148()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_82() {
-    if (jj_scan_token(SHA1)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_175() {
+    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_141() {
-    if (jj_3R_133()) return true;
+  private boolean jj_3R_142() {
+    if (jj_3R_134()) return true;
     return false;
   }
 
-  private boolean jj_3R_136() {
+  private boolean jj_3R_137() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_141()) {
-    jj_scanpos = xsp;
     if (jj_3R_142()) {
     jj_scanpos = xsp;
     if (jj_3R_143()) {
@@ -6516,7 +6639,9 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     jj_scanpos = xsp;
     if (jj_3R_145()) {
     jj_scanpos = xsp;
-    if (jj_3R_146()) return true;
+    if (jj_3R_146()) {
+    jj_scanpos = xsp;
+    if (jj_3R_147()) return true;
     }
     }
     }
@@ -6525,53 +6650,48 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     return false;
   }
 
-  private boolean jj_3R_81() {
+  private boolean jj_3R_82() {
     if (jj_scan_token(MD5)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_177() {
-    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+  private boolean jj_3R_174() {
+    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_80() {
+  private boolean jj_3R_81() {
     if (jj_scan_token(STRUUID)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_176() {
-    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_79() {
-    if (jj_scan_token(UUID)) return true;
-    if (jj_scan_token(NIL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_175() {
-    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+  private boolean jj_3R_173() {
+    if (jj_scan_token(INTEGER_POSITIVE)) return true;
     return false;
   }
 
   private boolean jj_3R_168() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_175()) {
+    if (jj_3R_173()) {
     jj_scanpos = xsp;
-    if (jj_3R_176()) {
+    if (jj_3R_174()) {
     jj_scanpos = xsp;
-    if (jj_3R_177()) return true;
+    if (jj_3R_175()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_135() {
+  private boolean jj_3R_80() {
+    if (jj_scan_token(UUID)) return true;
+    if (jj_scan_token(NIL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_136() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(14)) {
@@ -6581,76 +6701,76 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     return false;
   }
 
-  private boolean jj_3R_78() {
+  private boolean jj_3R_79() {
     if (jj_scan_token(NOW)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_77() {
+  private boolean jj_3R_78() {
     if (jj_scan_token(TZ)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_76() {
+  private boolean jj_3R_77() {
     if (jj_scan_token(TIMEZONE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_130() {
-    if (jj_3R_136()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_75() {
-    if (jj_scan_token(SECONDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_172() {
+    if (jj_scan_token(DOUBLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_174() {
-    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+  private boolean jj_3R_131() {
+    if (jj_3R_137()) return true;
     return false;
   }
 
-  private boolean jj_3R_74() {
-    if (jj_scan_token(MINUTES)) return true;
+  private boolean jj_3R_76() {
+    if (jj_scan_token(SECONDS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_173() {
-    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
+  private boolean jj_3R_171() {
+    if (jj_scan_token(DECIMAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_73() {
-    if (jj_scan_token(HOURS)) return true;
+  private boolean jj_3R_75() {
+    if (jj_scan_token(MINUTES)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_172() {
-    if (jj_scan_token(INTEGER_POSITIVE)) return true;
+  private boolean jj_3R_170() {
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
   private boolean jj_3R_167() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_172()) {
+    if (jj_3R_170()) {
     jj_scanpos = xsp;
-    if (jj_3R_173()) {
+    if (jj_3R_171()) {
     jj_scanpos = xsp;
-    if (jj_3R_174()) return true;
+    if (jj_3R_172()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_72() {
+  private boolean jj_3R_74() {
+    if (jj_scan_token(HOURS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_73() {
     if (jj_scan_token(DAY)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
@@ -6667,7 +6787,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[176];
+  final private int[] jj_la1 = new int[179];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -6685,25 +6805,25 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
       jj_la1_init_6();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x1c00,0xc000,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x10000,0
 x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
+      jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x1c00,0xc000,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x800000,0x0,0xdc
 00,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20000,0xb7e18000,0xb7e18000,0xb7e18000,0x20,0x20,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x40000,0x80000,0x0,0x0,0xb7e18000,0x20000,0xb7e18000,0xb7e18000,0xb7e1800c,0xc,0xb7e18000,0xb7e1800c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7e18000,0xb7e18000,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37e00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20000,0xb7e18000,0xb7e18000,0xb7e18000,0x20,0x20,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x40000,0x80000,0x0,0x0,0xb7e18000,0x20000,0xb7e18000,0xb7e18000,0xb7e1800c,0xc,0xb7e18000,0xb7e1800c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7e18000,0xb7e18000,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7e18000,0x37e00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300,0x300,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300,0x300,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0xfbfffff,0xfbfffff,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xe0000000,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0xc000000,0xc000000,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0xfbfffff,0x0,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,};
+      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0xfbfffff,0xfbfffff,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xe0000000,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0xc000000,0xc000000,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0xfbfffff,0x0,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_4() {
-      jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84ff,0x84ff,0x200,0x800,0x200,0x200,0x200,0x200,0x200,0x200,0x8000,0x0,0x0,0x10000,0x0,0x0,0x2000,0x6000,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x200,0x0,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7e00000,0x7e00000,0x0,0x0,0x7e00000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fc0000,0x1c0000,0xe00000,0x7000000,0x0,0x80000
 000,0x0,0x0,0x0,};
+      jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84ff,0x84ff,0x200,0x800,0x200,0x200,0x200,0x200,0x200,0x200,0x8000,0x0,0x0,0x10000,0x0,0x0,0x2000,0x6000,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x200,0x0,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7e00000,0x7e00000,0x0,0x0,0x7e00000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7fc0000,0x1c0000,0xe00000,0x
 7000000,0x0,0x80000000,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_5() {
-      jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0xf,0xf,0x800000f,0x0,0x0,0x40,0x0,0x8000000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f,0x0,0x2000,0x52f,0x52f,0x52f,0x40,0x2000,0x52f,0x0,0x52f,0x2000,0x0,0x52f,0x40,0x2000,0x52f,0x52f,0x2000,0x40,0x0,0x28,0x7,0x0,0x28,0x28,0x7,0x28,0x7,0x0,0x8,0x0,0x1000,0x28,0x1000,0x28,0x2000,0x52f,0x0,0x800,0x0,0x0,0x1000,0x52f,0x100008,0x100008,0x800,0x100008,0x100008,0x1000,0x0,0x10000000,0x10000000,0xa000040,0x100008,0x80,0x1080,0xa001000,0xa000040,0x100008,0x0,0x0,0x8,0x0,0x0,0x108,0x108,0x52f,0x52f,0x52f,0x52f,0x427,0x0,0x400,0x0,0x427,0x800000,0x1000000,0xfc000,0xfc000,0x6000000,0x0,0x18000000,0x18000000,0x6000000,0x18000000,0x18000000,0x610000f,0xf,0x28,0x1000,0x0,0x1000,0x1000,0x1000,0x0,0xe10000f,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x28,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0x0
 ,0x400,};
+      jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0xf,0xf,0x800000f,0x0,0x0,0x40,0x0,0x8000000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f,0x0,0x2000,0x52f,0x52f,0x52f,0x40,0x2000,0x52f,0x0,0x52f,0x2000,0x0,0x52f,0x40,0x2000,0x52f,0x52f,0x2000,0x40,0x0,0x28,0x7,0x0,0x28,0x28,0x7,0x28,0x7,0x0,0x8,0x0,0x1000,0x28,0x1000,0x28,0x2000,0x52f,0x0,0x800,0x0,0x0,0x1000,0x52f,0x100008,0x100008,0x800,0x100008,0x100008,0x1000,0x0,0x10000000,0x10000000,0xa000040,0x100008,0x80,0x1080,0xa001000,0xa000040,0x100008,0x0,0x0,0x8,0x0,0x0,0x108,0x108,0x52f,0x52f,0x52f,0x52f,0x427,0x0,0x400,0x0,0x427,0x800000,0x1000000,0xfc000,0xfc000,0x6000000,0x0,0x18000000,0x18000000,0x6000000,0x18000000,0x18000000,0x610000f,0xf,0x28,0x1000,0x0,0x1000,0x1000,0x1000,0x0,0xe10000f,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x1000,0x610000f,0x0,0x28,0x20000000,0x20000000,0x0,0x0,0x
 0,0x0,0x0,0x7,0x0,0x0,0x400,};
    }
    private static void jj_la1_init_6() {
-      jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x2,0x2,0x0,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x2,0x2,0x0,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[5];
   private boolean jj_rescan = false;
@@ -6720,7 +6840,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 179; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6735,7 +6855,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 179; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6746,7 +6866,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 179; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6757,7 +6877,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 179; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6767,7 +6887,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 179; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6777,7 +6897,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 179; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6894,7 +7014,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 176; i++) {
+    for (int i = 0; i < 179; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {


[09/50] [abbrv] jena git commit: Use Java8 idiom

Posted by rv...@apache.org.
Use Java8 idiom

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

Branch: refs/heads/JENA-507
Commit: abd2ca554d364bcec099cb8cd16ab11895e24aab
Parents: 3895bd4
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 24 11:20:44 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 24 11:20:44 2015 +0100

----------------------------------------------------------------------
 .../constructquads/ExampleConstructQuads.java    | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/abd2ca55/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java b/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
index dab9007..04be8d5 100644
--- a/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
+++ b/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
@@ -18,22 +18,11 @@
 
 package arq.examples.constructquads;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.IOException;
+import java.io.* ;
 import java.util.Iterator;
 
 import org.apache.jena.graph.Triple;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.DatasetFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.Syntax;
+import org.apache.jena.query.* ;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.Property;
@@ -176,13 +165,11 @@ public class ExampleConstructQuads {
 		// run-construct-quad-test
 		System.out.println("run-construct-quad-test:");
 		File[] tests = new File("testing/ARQ/Syntax/Syntax-ARQ")
-				.listFiles(new FilenameFilter() {
-					public boolean accept(File dir, String fname) {
+				.listFiles((dir, fname)->{
 						if (fname.startsWith("syntax-quad-construct-")) {
 							return true;
 						}
 						return false;
-					}
 				});
 		for (File test : tests) {
 			System.out.println("======== File: "+test.getName());


[37/50] [abbrv] jena git commit: Correct private member name.

Posted by rv...@apache.org.
Correct private member name.

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

Branch: refs/heads/JENA-507
Commit: 6ed9cdd595fc3716656a7b23e67b890072ac3fef
Parents: af1697a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:34:53 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:34:53 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/sparql/algebra/op/OpPropFunc.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6ed9cdd5/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
index 03d1257..a124930 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
@@ -34,14 +34,14 @@ public class OpPropFunc extends Op1
     // Safer to have two (Ops are mainly abstract syntax, not executional).
     private Node uri ;
     private PropFuncArg subjectArgs ;
-    private PropFuncArg objectArgs2 ;
+    private PropFuncArg objectArgs ;
 
     public OpPropFunc(Node uri, PropFuncArg args1 , PropFuncArg args2, Op op)
     {
         super(op) ;
         this.uri = uri ;
         this.subjectArgs = args1 ;
-        this.objectArgs2 = args2 ;
+        this.objectArgs = args2 ;
     }
     
     public PropFuncArg getSubjectArgs()
@@ -51,7 +51,7 @@ public class OpPropFunc extends Op1
     
     public PropFuncArg getObjectArgs()
     {
-        return objectArgs2 ;
+        return objectArgs ;
     } 
     
     @Override
@@ -69,7 +69,7 @@ public class OpPropFunc extends Op1
     @Override
     public Op1 copy(Op op)
     {
-        return new OpPropFunc(uri, subjectArgs, objectArgs2, op) ;
+        return new OpPropFunc(uri, subjectArgs, objectArgs, op) ;
     }
 
     @Override


[30/50] [abbrv] jena git commit: JENA-1018 : Scope details merging needs to include assignMentions.

Posted by rv...@apache.org.
JENA-1018 : Scope details merging needs to include assignMentions.

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

Branch: refs/heads/JENA-507
Commit: eeb759c24f985742c9386344f613928d0e26d4b5
Parents: 08ec3bb
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Sep 1 11:45:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Sep 1 11:45:13 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/sparql/engine/main/VarFinder.java | 4 +++-
 .../test/java/org/apache/jena/sparql/algebra/TestClassify.java  | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/eeb759c2/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index ccbb100..b5314da 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -129,6 +129,7 @@ public class VarFinder
             defines.addAll(usage.defines);
             optDefines.addAll(usage.optDefines);
             filterMentions.addAll(usage.filterMentions);
+            assignMentions.addAll(usage.assignMentions);
         }
 
         @Override
@@ -219,7 +220,8 @@ public class VarFinder
             VarUsageVisitor subUsage = VarUsageVisitor.apply(opProject.getSubOp());
             subUsage.defines.retainAll(vars);
             subUsage.optDefines.retainAll(vars);
-            subUsage.optDefines.retainAll(vars);
+            subUsage.filterMentions.retainAll(vars) ;
+            subUsage.assignMentions.retainAll(vars) ;
             defines.addAll(subUsage.defines);
             optDefines.addAll(subUsage.optDefines);
             filterMentions.addAll(subUsage.filterMentions);

http://git-wip-us.apache.org/repos/asf/jena/blob/eeb759c2/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
index ad6c9ae..ac9f6cc 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
@@ -119,6 +119,9 @@ public class TestClassify extends BaseTest
     @Test public void testClassify_Join_43() 
     { classifyJ("{ ?x ?y ?z { LET(?A := ?z+2) } UNION { }}", false) ; }
     
+    @Test public void testClassify_Join_44() 
+    { classifyJ("{ BIND(<x> AS ?typeX) { BIND(?typeX AS ?type) ?s ?p ?o FILTER(?o=?type) } }", false) ; }
+    
     private void classifyJ(String pattern, boolean expected)
     {
         String qs1 = "PREFIX : <http://example/>\n" ;
@@ -126,6 +129,8 @@ public class TestClassify extends BaseTest
         Query query = QueryFactory.create(qs, Syntax.syntaxARQ) ;
         Op op = Algebra.compile(query.getQueryPattern()) ;
         
+        System.out.println(op) ;
+        
         if ( ! ( op instanceof OpJoin ) )
             fail("Not a join: "+pattern) ;
 


[32/50] [abbrv] jena git commit: Making Model attributes private and final in many vocabulary classes.

Posted by rv...@apache.org.
Making Model attributes private and final in many vocabulary classes.

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

Branch: refs/heads/JENA-507
Commit: d0f9daa4b9dcbf7678917cf404debdb8ba1c6485
Parents: 7370989
Author: Ramiro Pereira de Magalhães <ra...@gmail.com>
Authored: Thu Sep 3 18:13:03 2015 -0300
Committer: Ramiro Pereira de Magalhães <ra...@gmail.com>
Committed: Thu Sep 3 18:13:03 2015 -0300

----------------------------------------------------------------------
 jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java      | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java        | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java    | 2 +-
 .../main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java   | 2 +-
 .../src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java   | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java       | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java     | 2 +-
 .../src/main/java/org/apache/jena/vocabulary/TestManifest.java     | 2 +-
 .../src/main/java/org/apache/jena/vocabulary/TestManifestX.java    | 2 +-
 jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java      | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
index 9b4f8a7..9aaed7e 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTerms.java
@@ -24,7 +24,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class DCTerms {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabulary as a string</p> */
     public static final String NS = "http://purl.org/dc/terms/";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
index 7c7f04a..43c1e7c 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DCTypes.java
@@ -24,7 +24,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class DCTypes {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabulary as a string</p> */
     public static final String NS = "http://purl.org/dc/dcmitype/";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
index 70f7c41..3978499 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DC_11.java
@@ -26,7 +26,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class DC_11 {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabalary as a string ({@value})</p> */
     public static final String NS = "http://purl.org/dc/elements/1.1/";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
index 39e861c..4e2df46 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java
@@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class OWL {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabulary as a string ({@value})</p> */
     public static final String NS = "http://www.w3.org/2002/07/owl#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
index 75959e3..44b3ba3 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLResults.java
@@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class OWLResults {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabalary as a string ({@value})</p> */
     public static final String NS = "http://www.w3.org/2002/03owlt/resultsOntology#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
index 7aef9b3..a816ce7 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OWLTest.java
@@ -28,7 +28,7 @@ import org.apache.jena.rdf.model.* ;
 public class OWLTest  {
 
 	/** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabalary as a string ({@value})</p> */
     public static final String NS = "http://www.w3.org/2002/03owlt/testOntology#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
index dfaa5a9..8f752e3 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OntDocManagerVocab.java
@@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class OntDocManagerVocab {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabulary as a string ({@value})</p> */
     public static final String NS = "http://jena.hpl.hp.com/schemas/2003/03/ont-manager#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java b/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
index 12bf1e9..34d92ec 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/OntEventsVocab.java
@@ -33,7 +33,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class OntEventsVocab {
     /** <p>The ontology model that holds the vocabulary terms</p> */
-    private static OntModel m_model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
+    private static final OntModel m_model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
     
     /** <p>The namespace of the vocabulary as a string ({@value})</p> */
     public static final String NS = "http://jena.hpl.hp.com/schemas/2003/03/ont-event#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
index 4df4370..94c542e 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
@@ -28,7 +28,7 @@ import org.apache.jena.rdf.model.* ;
 public class RDFTest {
     
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabalary as a string ({@value})</p> */
     public static final String NS = "http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
index 4f3a40f..426a3a4 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
@@ -32,7 +32,7 @@ public class SKOS {
 	/**
 	 * The RDF model that holds the SKOS entities
 	 */
-	public static Model m = ModelFactory.createDefaultModel();
+	private static final Model m = ModelFactory.createDefaultModel();
 	/**
 	 * The namespace of the SKOS vocabulary as a string
 	 */

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
index c09047b..05f4b0f 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
@@ -31,7 +31,7 @@ public class SKOSXL {
 	/**
 	 * The RDF model that holds the SKOS-XL entities
 	 */
-	public static Model m = ModelFactory.createDefaultModel();
+	private static final Model m = ModelFactory.createDefaultModel();
 	/**
 	 * The namespace of the SKOS-XL vocabulary as a string
 	 */

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
index d918a2f..3527b4e 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifest.java
@@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class TestManifest {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabulary as a string</p> */
     public static final String NS = "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
index b699cdc..5547ec5 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/TestManifestX.java
@@ -27,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
  */
 public class TestManifestX {
     /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
+    private static final Model m_model = ModelFactory.createDefaultModel();
     
     /** <p>The namespace of the vocabulary as a string</p> */
     public static final String NS = "http://jena.hpl.hp.com/2005/05/test-manifest-extra#";

http://git-wip-us.apache.org/repos/asf/jena/blob/d0f9daa4/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java b/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
index 506e1f0..4f2286c 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
@@ -41,7 +41,7 @@ public class VCARD {
           return uri;
     }
 
-    private static Model m = ModelFactory.createDefaultModel();
+    private static final Model m = ModelFactory.createDefaultModel();
     
     public static final Resource ORGPROPERTIES = m.createResource(uri + "ORGPROPERTIES" );
     public static final Resource ADRTYPES = m.createResource(uri + "ADRTYPES" );


[42/50] [abbrv] jena git commit: Remove debug output.

Posted by rv...@apache.org.
Remove debug output.

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

Branch: refs/heads/JENA-507
Commit: f4e017a8fb15f6171325754dcfc1c9278a74e382
Parents: 6993061
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:51:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:51:32 2015 +0100

----------------------------------------------------------------------
 .../test/java/org/apache/jena/sparql/algebra/TestClassify.java    | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f4e017a8/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
index ac9f6cc..d3d4b14 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestClassify.java
@@ -128,9 +128,6 @@ public class TestClassify extends BaseTest
         String qs = qs1+"SELECT * "+pattern;
         Query query = QueryFactory.create(qs, Syntax.syntaxARQ) ;
         Op op = Algebra.compile(query.getQueryPattern()) ;
-        
-        System.out.println(op) ;
-        
         if ( ! ( op instanceof OpJoin ) )
             fail("Not a join: "+pattern) ;
 


[07/50] [abbrv] jena git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena

Posted by rv...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena


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

Branch: refs/heads/JENA-507
Commit: e2a076db500f8d289e087d84e6abc70f6d67e876
Parents: d030947 6a0fee3
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 23 21:15:22 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 23 21:15:22 2015 +0100

----------------------------------------------------------------------
 .../org/apache/jena/riot/lang/JsonLDReader.java | 108 ++++++++++++++++---
 .../AbstractNodeTupleInputFormatTests.java      |   2 -
 2 files changed, 95 insertions(+), 15 deletions(-)
----------------------------------------------------------------------



[05/50] [abbrv] jena git commit: JENA-1013 : Generate triples then parse error.

Posted by rv...@apache.org.
JENA-1013 : Generate triples then parse error.

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

Branch: refs/heads/JENA-507
Commit: 93d2d532da88e356e381b1555f95f64ded6a6065
Parents: 123cf4c
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 23 21:14:06 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 23 21:14:06 2015 +0100

----------------------------------------------------------------------
 .../org/apache/jena/riot/lang/JsonLDReader.java | 108 ++++++++++++++++---
 1 file changed, 95 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/93d2d532/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
index 4c85264..09073c6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
@@ -25,6 +25,7 @@ import java.util.List ;
 import java.util.Map ;
 import java.util.Objects;
 import java.util.Map.Entry;
+import java.util.function.Consumer ;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.InternalErrorException ;
@@ -40,9 +41,11 @@ import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.system.* ;
 import org.apache.jena.sparql.core.Quad ;
 import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.util.FileUtils ;
 
+import com.fasterxml.jackson.core.* ;
+import com.fasterxml.jackson.databind.ObjectMapper ;
 import com.github.jsonldjava.core.* ;
-import com.github.jsonldjava.utils.JsonUtils ;
 
 public class JsonLDReader implements ReaderRIOT
 {
@@ -55,33 +58,113 @@ public class JsonLDReader implements ReaderRIOT
     @Override public ParserProfile getParserProfile()                   { return parserProfile ; }
     @Override public void setParserProfile(ParserProfile parserProfile) { this.parserProfile = parserProfile ; }
     
+    // pre jsonld-java issue #144 code.
+    // Remove at any point.
+//    @Override
+//    public void read(Reader reader, String baseURI, ContentType ct, StreamRDF output, Context context) {
+//        try {
+//            Object jsonObject = JsonUtils.fromReader(reader) ;
+//            read$(jsonObject, baseURI, ct, output, context) ;
+//        }
+//        catch (IOException e) {
+//            IO.exception(e) ;
+//        }
+//    }
+//
+//    @Override
+//    public void read(InputStream in, String baseURI, ContentType ct, StreamRDF output, Context context) {
+//        try {
+//            Object jsonObject = JsonUtils.fromInputStream(in) ;
+//            read$(jsonObject, baseURI, ct, output, context) ;
+//        }
+//        catch (IOException e) {
+//            IO.exception(e) ;
+//        }
+//    }
+    
+    // This addresses jsonld-java issue #144 so that we get triples/quads out
+    // then there is a parse error. Even if it is fixed in jsonld-java, it would
+    // mean that no triples would be produced - all the JSON parsing is done
+    // before JSON-LD processing. Here we process the first JSON object, whch
+    // causes triples to be generated then decide whether to throw a parse
+    // error.  This is more in the style of other syntaxes and stream parsing.
+    
     @Override
     public void read(Reader reader, String baseURI, ContentType ct, StreamRDF output, Context context) {
-        if ( parserProfile == null )
-            parserProfile = RiotLib.profile(RDFLanguages.JSONLD, baseURI, errorHandler) ;
         try {
-            Object jsonObject = JsonUtils.fromReader(reader) ;
-            read$(jsonObject, baseURI, ct, output, context) ;
+            readProcess(reader, 
+                       (jsonObject)->read$(jsonObject, baseURI, ct, output, context)) ;
+        }
+        catch (JsonProcessingException ex) {    
+            // includes JsonParseException
+            // The Jackson JSON parser, or addition JSON-level check, throws up something.
+            JsonLocation loc = ex.getLocation() ;
+            errorHandler.error(ex.getOriginalMessage(), loc.getLineNr(), loc.getColumnNr()); 
+            throw new RiotException(ex.getOriginalMessage()) ;
         }
         catch (IOException e) {
+            errorHandler.error(e.getMessage(), -1, -1); 
             IO.exception(e) ;
         }
     }
 
     @Override
     public void read(InputStream in, String baseURI, ContentType ct, StreamRDF output, Context context) {
-        if ( parserProfile == null )
-            parserProfile = RiotLib.profile(RDFLanguages.JSONLD, baseURI, errorHandler) ;
-        try {
-            Object jsonObject = JsonUtils.fromInputStream(in) ;
-            read$(jsonObject, baseURI, ct, output, context) ;
+        Reader r = FileUtils.asBufferedUTF8(in) ;
+        read(r, baseURI, ct, output, context) ;
+    }
+
+    // From JsonUtils.fromReader in the jsonld-java codebase.
+    // Note that jsonld-java always uses a reader.
+    private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+    private static final JsonFactory JSON_FACTORY = new JsonFactory(JSON_MAPPER);
+    
+    /** Read a JSON object from the reader, acall the prcoessing function, then
+     * check for trailing content. For Jena, this means tripes/quads are generated
+     * from a valid JSON object, then there is a  parse error for trailing junk.   
+     * @param reader
+     * @param function
+     * @throws IOException
+     */
+    private static void readProcess(Reader reader, Consumer<Object> function) throws IOException {
+        final JsonParser jp = JSON_FACTORY.createParser(reader);
+        Object rval ;
+        final JsonToken initialToken = jp.nextToken();
+
+        if (initialToken == JsonToken.START_ARRAY) {
+            rval = jp.readValueAs(List.class);
+        } else if (initialToken == JsonToken.START_OBJECT) {
+            rval = jp.readValueAs(Map.class);
+        } else if (initialToken == JsonToken.VALUE_STRING) {
+            rval = jp.readValueAs(String.class);
+        } else if (initialToken == JsonToken.VALUE_FALSE || initialToken == JsonToken.VALUE_TRUE) {
+            rval = jp.readValueAs(Boolean.class);
+        } else if (initialToken == JsonToken.VALUE_NUMBER_FLOAT
+                || initialToken == JsonToken.VALUE_NUMBER_INT) {
+            rval = jp.readValueAs(Number.class);
+        } else if (initialToken == JsonToken.VALUE_NULL) {
+            rval = null;
+        } else {
+            throw new JsonParseException("document doesn't start with a valid json element : "
+                    + initialToken, jp.getCurrentLocation());
         }
-        catch (IOException e) {
-            IO.exception(e) ;
+        
+        function.accept(rval);
+        
+        JsonToken t ;
+        try { t = jp.nextToken(); }
+        catch (JsonParseException ex) {
+            throw new JsonParseException("Document contains more content after json-ld element - (possible mismatched {}?)",
+                                         jp.getCurrentLocation());
         }
+        if ( t != null )
+            throw new JsonParseException("Document contains possible json content after the json-ld element - (possible mismatched {}?)",
+                                             jp.getCurrentLocation());
     }
     
     private void read$(Object jsonObject, String baseURI, ContentType ct, final StreamRDF output, Context context) {
+        if ( parserProfile == null )
+            parserProfile = RiotLib.profile(RDFLanguages.JSONLD, baseURI, errorHandler) ;
         output.start() ;
         try {       	
             JsonLdTripleCallback callback = new JsonLdTripleCallback() {
@@ -186,5 +269,4 @@ public class JsonLDReader implements ReaderRIOT
         RDFDatatype dt = NodeFactory.getType(datatype) ;
         return NodeFactory.createLiteral(lex, dt) ;
     }
-
 }


[17/50] [abbrv] jena git commit: Print whole datatset for dataset formats.

Posted by rv...@apache.org.
Print whole datatset for dataset formats.

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

Branch: refs/heads/JENA-507
Commit: 5525039e268d655123d8947553922acb3e427792
Parents: b93e389
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 25 09:43:05 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 25 09:43:05 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/riotcmd/CmdLangParse.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5525039e/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index 6c939b8..d961f15 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -317,7 +317,7 @@ public abstract class CmdLangParse extends CmdGeneral
                 // Try as dataset, then as graph.
                 WriterDatasetRIOTFactory w = RDFWriterRegistry.getWriterDatasetFactory(fmt) ;
                 if ( w != null ) {
-                    RDFDataMgr.write(output, dsg.getDefaultGraph(), fmt) ;
+                    RDFDataMgr.write(output, dsg, fmt) ;
                     return ;
                 }
                 WriterGraphRIOTFactory wg = RDFWriterRegistry.getWriterGraphFactory(fmt) ;


[44/50] [abbrv] jena git commit: Debug support - print outcome.

Posted by rv...@apache.org.
Debug support - print outcome.

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

Branch: refs/heads/JENA-507
Commit: e82509b6631e916155d331d4646234e83e8f7278
Parents: c9760df
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:53:17 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:53:17 2015 +0100

----------------------------------------------------------------------
 .../org/apache/jena/sparql/engine/main/JoinClassifier.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/e82509b6/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
index d6115e9..f81eeaf 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
@@ -159,7 +159,12 @@ public class JoinClassifier
             System.err.println("Case 3 = " + bad3) ;
 
         // Linear if all conditions are false
-        return !bad1 && !bad2 && !bad3 ;
+        boolean result = !bad1 && !bad2 && !bad3 ;
+        
+        if ( print ) {
+            System.err.println("Result: "+result) ;
+        }
+        return result ;
     }
 
     /** Find the "effective op" - ie. the one that may be sensitive to linearization */


[36/50] [abbrv] jena git commit: JENA-1022 : Handle models.

Posted by rv...@apache.org.
JENA-1022 : Handle models.

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

Branch: refs/heads/JENA-507
Commit: af1697aca1c0ea9dc9b55966baebb5ee755233d5
Parents: 06e1641
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 17:57:38 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 17:57:38 2015 +0100

----------------------------------------------------------------------
 .../jena/fuseki/servlets/SPARQL_Query.java      |  2 +-
 .../java/org/apache/jena/fuseki/TestQuery.java  | 41 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/af1697ac/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
index 6d7e8a6..55225c9 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -382,7 +382,7 @@ public abstract class SPARQL_Query extends SPARQL_Protocol
             // CONSTRUCT is processed as a extended CONSTRUCT - result is a dataset. 
             ResponseDataset.doResponseDataset(action, result.getDataset());
         else if ( result.isModel() )
-            // DESCRIBE rsults are models
+            // DESCRIBE results are models
             ResponseDataset.doResponseModel(action, result.getModel());
         else if ( result.isBoolean() )
             ResponseResultSet.doResponseResultSet(action, result.getBooleanResult()) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/af1697ac/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
index dabe10d..08c837d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java
@@ -18,7 +18,12 @@
 
 package org.apache.jena.fuseki ;
 
-import static org.apache.jena.fuseki.ServerTest.* ;
+import static org.apache.jena.fuseki.ServerTest.gn1 ;
+import static org.apache.jena.fuseki.ServerTest.gn2 ;
+import static org.apache.jena.fuseki.ServerTest.model1 ;
+import static org.apache.jena.fuseki.ServerTest.model2 ;
+import static org.apache.jena.fuseki.ServerTest.serviceQuery ;
+import static org.apache.jena.fuseki.ServerTest.serviceREST ;
 
 import java.io.IOException ;
 import java.net.HttpURLConnection ;
@@ -190,6 +195,24 @@ public class TestQuery extends BaseTest {
         }
     }
     
+    @Test
+    public void query_describe_01() {
+        String query = "DESCRIBE ?s WHERE {?s ?p ?o}" ;
+        try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+            Model result = qExec.execDescribe();
+            assertFalse(result.isEmpty()) ;
+        }
+    }
+
+    @Test
+    public void query_describe_02() {
+        String query = "DESCRIBE <http://example/somethingelse> WHERE { }" ;
+        try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+            Model result = qExec.execDescribe();
+            assertTrue(result.isEmpty()) ;
+        }
+    }
+
     private static final AcceptList rdfOfferTest = DEF.rdfOffer ;
     private static final AcceptList quadsOfferTest = DEF.quadsOffer ;
     
@@ -223,6 +246,22 @@ public class TestQuery extends BaseTest {
             }
         }
     }
+    
+    @Test
+    public void query_describe_conneg() {
+        String query = "DESCRIBE ?s WHERE {?s ?p ?o}" ;
+        for (MediaType type: rdfOfferTest.entries()){
+            String contentType = type.toHeaderString();
+            try ( QueryEngineHTTP qExec = (QueryEngineHTTP) QueryExecutionFactory.sparqlService(serviceQuery, query) ) {
+                qExec.setModelContentType( contentType );
+                Model m = qExec.execDescribe() ;
+                String x = qExec.getHttpResponseContentType() ;
+                assertEquals( contentType , x ) ;
+                assertFalse(m.isEmpty()) ;
+            }
+        }
+    }
+
 
     private void execQuery(String queryString, int exceptedRowCount) {
         QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, queryString) ;


[02/50] [abbrv] jena git commit: JENA-1013: Ignore "file_on_bad_input_02" if a json test.

Posted by rv...@apache.org.
JENA-1013: Ignore "file_on_bad_input_02" if a json test.

Uses assumeFalse(file extension contains 'json')

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

Branch: refs/heads/JENA-507
Commit: c8427ba75aaa02ec55ba073f87b453581f71ad5f
Parents: 84d40b9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 21 15:35:09 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 21 15:35:09 2015 +0100

----------------------------------------------------------------------
 .../rdf/io/input/AbstractNodeTupleInputFormatTests.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/c8427ba7/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
index e26445e..33ba4d4 100644
--- a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
+++ b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
@@ -43,12 +43,7 @@ import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
 import org.apache.jena.hadoop.rdf.io.HadoopIOConstants;
 import org.apache.jena.hadoop.rdf.io.RdfIOConstants;
 import org.apache.jena.hadoop.rdf.types.AbstractNodeTupleWritable;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.* ;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -429,6 +424,8 @@ public abstract class AbstractNodeTupleInputFormatTests<TValue, T extends Abstra
      */
     @Test(expected = IOException.class)
     public final void fail_on_bad_input_02() throws IOException, InterruptedException {
+        Assume.assumeFalse("fail_on_bad_input_02: See JENA-1013 (JSON-LD tests)", this.getFileExtension().contains("jsonld")) ;
+        
         Configuration config = this.prepareConfiguration();
         config.setBoolean(RdfIOConstants.INPUT_IGNORE_BAD_TUPLES, false);
         Assert.assertFalse(config.getBoolean(RdfIOConstants.INPUT_IGNORE_BAD_TUPLES, true));


[03/50] [abbrv] jena git commit: JENA-1012 : Deprecate createIterator operations (moved to RDFDataMgr)

Posted by rv...@apache.org.
JENA-1012 : Deprecate createIterator operations (moved to RDFDataMgr)

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

Branch: refs/heads/JENA-507
Commit: 123cf4cb390dcc0d182d942a0806fa9d2d1294d3
Parents: c8427ba
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 21 16:20:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 21 16:20:10 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/riot/RDFDataMgr.java   | 47 ++++++++++++++-
 .../java/org/apache/jena/riot/RiotReader.java   | 61 ++++----------------
 .../sparql/engine/http/QueryEngineHTTP.java     |  2 +-
 .../org/apache/jena/riot/TestRiotReader.java    |  8 +--
 4 files changed, 61 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/123cf4cb/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index 851ff5b..395119e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -23,6 +23,7 @@ import java.util.Iterator ;
 import java.util.Objects ;
 
 import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.iterator.IteratorResourceClosing ;
 import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.atlas.web.TypedInputStream ;
@@ -32,6 +33,10 @@ import org.apache.jena.query.Dataset ;
 import org.apache.jena.query.DatasetFactory ;
 import org.apache.jena.rdf.model.Model ;
 import org.apache.jena.rdf.model.ModelFactory ;
+import org.apache.jena.riot.lang.PipedQuadsStream ;
+import org.apache.jena.riot.lang.PipedRDFIterator ;
+import org.apache.jena.riot.lang.PipedTriplesStream ;
+import org.apache.jena.riot.lang.RiotParsers ;
 import org.apache.jena.riot.system.RiotLib ;
 import org.apache.jena.riot.system.StreamRDF ;
 import org.apache.jena.riot.system.StreamRDFLib ;
@@ -1207,5 +1212,45 @@ public class RDFDataMgr
         WriterDatasetRIOT w = createDatasetWriter$(serialization);
         w.write(out, dataset, RiotLib.prefixMap(dataset), null, null);
     }
-}
 
+    /**
+     * Create an iterator over parsing of triples
+     * @param input Input Stream
+     * @param lang Language
+     * @param baseIRI Base IRI
+     * @return Iterator over the triples
+     */
+    public static Iterator<Triple> createIteratorTriples(InputStream input, Lang lang, String baseIRI)
+    {
+        // Special case N-Triples, because the RIOT reader has a pull interface
+        if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
+            return new IteratorResourceClosing<>(RiotParsers.createParserNTriples(input, null), input);
+        // Otherwise, we have to spin up a thread to deal with it
+        PipedRDFIterator<Triple> it = new PipedRDFIterator<>();
+        PipedTriplesStream out = new PipedTriplesStream(it);
+        Thread t = new Thread(()->parse(out, input, baseIRI, lang)) ;
+        t.start();
+        return it;
+    }
+
+    /**
+     * Creates an iterator over parsing of quads
+     * @param input Input Stream
+     * @param lang Language
+     * @param baseIRI Base IRI
+     * @return Iterator over the quads
+     */
+    public static Iterator<Quad> createIteratorQuads(InputStream input, Lang lang, String baseIRI)
+    {
+        // Special case N-Quads, because the RIOT reader has a pull interface
+        if ( RDFLanguages.sameLang(RDFLanguages.NQUADS, lang) )
+            return new IteratorResourceClosing<>(RiotParsers.createParserNQuads(input, null), input);
+        // Otherwise, we have to spin up a thread to deal with it
+        final PipedRDFIterator<Quad> it = new PipedRDFIterator<>();
+        final PipedQuadsStream out = new PipedQuadsStream(it);
+
+        Thread t = new Thread(()->parse(out, input, baseIRI, lang)) ;
+        t.start();
+        return it;
+    }
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/123cf4cb/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index be35fd5..d23c66e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -25,18 +25,17 @@ import java.io.InputStream ;
 import java.util.Iterator ;
 
 import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.iterator.IteratorResourceClosing ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.graph.Triple ;
-import org.apache.jena.riot.lang.* ;
 import org.apache.jena.riot.system.StreamRDF ;
 import org.apache.jena.riot.system.StreamRDFLib ;
 import org.apache.jena.sparql.core.Quad ;
 
 /** Operations to access RIOT parsers and send the output to 
  *  a StreamRDF (triples or quads as appropriate).
- *  This class is probably not what you want to use.
- *  It is public to give maximum compatibility.
+ *  <p>
+ *  <b>This class is probably not what you want to use.</b>
+ *  <p>
  *
  *  @see RDFDataMgr for reading from a location, including web access and content negotation.
  */
@@ -196,32 +195,12 @@ public class RiotReader
      * @param lang Language
      * @param baseIRI Base IRI
      * @return Iterator over the triples
+     * @deprecated Use {@link RDFDataMgr#createIteratorTriples(InputStream,Lang,String)} instead
      */
+    @Deprecated
     public static Iterator<Triple> createIteratorTriples(final InputStream input, final Lang lang, final String baseIRI)
     {
-        // Special case N-Triples, because the RIOT reader has a pull interface
-        if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
-        {
-            return new IteratorResourceClosing<>(RiotParsers.createParserNTriples(input, null), input);
-        }
-        else
-        {
-            // Otherwise, we have to spin up a thread to deal with it
-            final PipedRDFIterator<Triple> it = new PipedRDFIterator<>();
-            final PipedTriplesStream out = new PipedTriplesStream(it);
-            
-            Thread t = new Thread(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    RDFDataMgr.parse(out, input, baseIRI, lang);
-                }
-            });
-            t.start();
-            
-            return it;
-        }
+        return RDFDataMgr.createIteratorTriples(input, lang, baseIRI);
     }
    
     /**
@@ -230,31 +209,11 @@ public class RiotReader
      * @param lang Language
      * @param baseIRI Base IRI
      * @return Iterator over the quads
+     * @deprecated Use {@link RDFDataMgr#createIteratorQuads(InputStream,Lang,String)} instead
      */
-    public static Iterator<Quad> createIteratorQuads(final InputStream input, final Lang lang, final String baseIRI)
+    @Deprecated
+    public static Iterator<Quad> createIteratorQuads(final InputStream input, final Lang lang, final String baseIRI) 
     {
-        // Special case N-Quads, because the RIOT reader has a pull interface
-        if ( RDFLanguages.sameLang(RDFLanguages.NQUADS, lang) )
-        {
-            return new IteratorResourceClosing<>(RiotParsers.createParserNQuads(input, null), input);
-        }
-        else
-        {
-            // Otherwise, we have to spin up a thread to deal with it
-            final PipedRDFIterator<Quad> it = new PipedRDFIterator<>();
-            final PipedQuadsStream out = new PipedQuadsStream(it);
-            
-            Thread t = new Thread(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    RDFDataMgr.parse(out, input, baseIRI, lang);
-                }
-            });
-            t.start();
-            
-            return it;
-        }
+        return RDFDataMgr.createIteratorQuads(input, lang, baseIRI);
     }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/123cf4cb/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index ef9b8f1..e20efd2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@ -456,7 +456,7 @@ public class QueryEngineHTTP implements QueryExecution {
             throw new QueryException("Endpoint returned Content Type: " + actualContentType
                     + " which is not a valid RDF Graph syntax");
 
-        return RiotReader.createIteratorTriples(in, lang, null);
+        return RDFDataMgr.createIteratorTriples(in, lang, null);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/123cf4cb/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java b/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
index e516e65..b54df07 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
@@ -36,7 +36,7 @@ public class TestRiotReader
     @Test
     public void testCreateIteratorTriples_01()
     {
-        Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, "http://example/");
+        Iterator<Triple> it = RDFDataMgr.createIteratorTriples(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, "http://example/");
         
         assertFalse(it.hasNext());
     }
@@ -44,7 +44,7 @@ public class TestRiotReader
     @Test
     public void testEncodedUTF8()
     {
-        Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"\\u263A\" .".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, null);
+        Iterator<Triple> it = RDFDataMgr.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"\\u263A\" .".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, null);
         
         assertTrue(it.hasNext());
         assertEquals("☺", it.next().getObject().getLiteralLexicalForm());
@@ -53,7 +53,7 @@ public class TestRiotReader
     @Test
     public void testRawUTF8()
     {
-        Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"☺\" .".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, null);
+        Iterator<Triple> it = RDFDataMgr.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"☺\" .".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, null);
         
         assertTrue(it.hasNext());
         assertEquals("☺", it.next().getObject().getLiteralLexicalForm());
@@ -71,7 +71,7 @@ public class TestRiotReader
                 "   </rdf:Description>" ,
                 "</rdf:RDF>") ;
         
-        Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream(x.getBytes()), RDFLanguages.RDFXML, "http://example/");
+        Iterator<Triple> it = RDFDataMgr.createIteratorTriples(new ByteArrayInputStream(x.getBytes()), RDFLanguages.RDFXML, "http://example/");
         
         assertTrue(it.hasNext());
         Triple t = it.next();


[18/50] [abbrv] jena git commit: Cleanly handle pasre errors in transactional updates.

Posted by rv...@apache.org.
Cleanly handle pasre errors in transactional updates.

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

Branch: refs/heads/JENA-507
Commit: bb2e683c9184d5f9559ea65df4417d3a121573b8
Parents: 5525039
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 25 12:12:16 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 25 12:12:16 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/arq/update.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/bb2e683c/jena-arq/src/main/java/arq/update.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/update.java b/jena-arq/src/main/java/arq/update.java
index 5e15c93..f6bf5fd 100644
--- a/jena-arq/src/main/java/arq/update.java
+++ b/jena-arq/src/main/java/arq/update.java
@@ -82,9 +82,11 @@ public class update extends CmdUpdate
                 execOneFile(filename, graphStore) ;
                 transactional.commit() ;
             }
-            finally {
-                transactional.end() ;
+            catch (Throwable ex) { 
+                try { transactional.abort() ; } catch (Exception ex2) {}
+                throw ex ;
             }
+            finally { transactional.end() ; }
         }
 
         for ( String requestString : super.getPositional() ) {
@@ -95,10 +97,11 @@ public class update extends CmdUpdate
                 execOne(requestString, graphStore) ;
                 transactional.commit() ;
             }
-            finally {
-                transactional.end() ;
+            catch (Throwable ex) { 
+                try { transactional.abort() ; } catch (Exception ex2) {}
+                throw ex ;
             }
-
+            finally { transactional.end() ; }
         }
         SystemARQ.sync(graphStore) ;
 


[38/50] [abbrv] jena git commit: Fix .equals

Posted by rv...@apache.org.
Fix .equals

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

Branch: refs/heads/JENA-507
Commit: 921062862d974fb228f3f5460c0f4ced10ab9e9f
Parents: 6ed9cdd
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 5 21:42:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 5 21:42:13 2015 +0100

----------------------------------------------------------------------
 .../jena/sparql/algebra/op/OpPropFunc.java      | 21 ++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/92106286/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
index a124930..e79df00 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpPropFunc.java
@@ -18,12 +18,15 @@
 
 package org.apache.jena.sparql.algebra.op;
 
+import java.util.List ;
+
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.algebra.Op ;
 import org.apache.jena.sparql.algebra.OpVisitor ;
 import org.apache.jena.sparql.algebra.Transform ;
 import org.apache.jena.sparql.pfunction.PropFuncArg ;
 import org.apache.jena.sparql.sse.Tags ;
+import org.apache.jena.sparql.util.Iso ;
 import org.apache.jena.sparql.util.NodeIsomorphismMap ;
 
 /** Property functions (or any OpBGP replacement)
@@ -83,11 +86,25 @@ public class OpPropFunc extends Op1
     {
         if ( ! ( other instanceof OpPropFunc ) ) return false ;
         OpPropFunc procFunc = (OpPropFunc)other ;
-        
-        
+        if ( ! isomorphic(getSubjectArgs(), procFunc.getSubjectArgs(), labelMap) )
+            return false ;
+        if ( ! isomorphic(getObjectArgs(), procFunc.getObjectArgs(), labelMap) )
+            return false ;
         return getSubOp().equalTo(procFunc.getSubOp(), labelMap) ;
     }
 
+    private static boolean isomorphic(PropFuncArg pfa1, PropFuncArg pfa2, NodeIsomorphismMap labelMap) {
+        if ( pfa1 == null && pfa2 == null )
+            return true ;
+        if ( pfa1 == null ) return false ;
+        if ( pfa2 == null ) return false ;
+        
+        List<Node> list1 = pfa1.getArgList() ;
+        List<Node> list2 = pfa2.getArgList() ;
+                
+        return Iso.isomorphicNodes(list1, list2, labelMap) ;
+    }
+    
     @Override
     public String getName()
     {