You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/05/14 14:03:36 UTC

[37/42] jena git commit: Merge commit 'refs/pull/143/head' of github.com:apache/jena

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/Vocabularies/test-manifest.ttl
----------------------------------------------------------------------
diff --cc jena-arq/Vocabularies/test-manifest.ttl
index 1d19ccf,1d19ccf..d19ef26
--- a/jena-arq/Vocabularies/test-manifest.ttl
+++ b/jena-arq/Vocabularies/test-manifest.ttl
@@@ -1,154 -1,154 +1,154 @@@
--@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix dc:     <http://purl.org/dc/elements/1.1/> .
--@prefix :       <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
--
--## A Manifest is typically a list (RDF Collection) of manifest entries.
--## The :entries property has an object of the list.
--## There may be more than one list per file.
--
--:   rdfs:comment     "Manifest vocabulary for test cases" ;
--    dc:creator       "Andy Seaborne" ;
--    dc:subject       "" ;
--    dc:publisher     "W3C RDF Data Access Working Group" ;
--    dc:publisher     "W3C SPARQL Working Group" ;
--    dc:title         "Test case manifest vocabulary" ;
--    dc:description   "Test case manifest vocabulary" ;
--    dc:date          "2004-07" ;
--    dc:date          "2010-08" ;
--    dc:format        "RDF" ;
--    dc:identifier    : ;
--    .
--
--## ---- Class declarations ----
--
--:Manifest rdf:type rdfs:Class ;
--    rdfs:comment "The class of manifests" .
--
--:ManifestEntry rdf:type rdfs:Class ;
--    rdfs:comment "One entry in rdf:type list of entries" .
--
--## ---- Property declarations for the manifest ----
--
--:include rdf:type rdf:Property ;
--    rdfs:comment "Connects the manifest resource to rdf:type list of manifests" ;
--    rdfs:domain	 :Manifest ;
--    rdfs:range   rdf:List ;
--    .
--
--:entries rdf:type rdf:Property ;
--    rdfs:comment "Connects the manifest resource to rdf:type list of entries" ;
--    rdfs:domain	 :Manifest ;
--    rdfs:range   rdf:List ;
--    .
--	
--## ---- Property declarations for each test ----
--
--:name rdf:type rdf:Property ;
--    rdfs:comment "Optional name of this entry" ;
--    rdfs:domain	 :ManifestEntry ;
--    rdfs:range   rdfs:Literal ;
--    .	
--    
--:action rdf:type rdf:Property ;
--    rdfs:comment "Action to perform" ;
--    rdfs:domain	 :ManifestEntry ;
--    # rdfs:range   ?? ;
--    .	
--
--:result rdf:type rdf:Property ;
--    rdfs:comment "The expected outcome" ;
--    rdfs:domain	 :ManifestEntry ;
--    # rdfs:range   ?? ;
--    .	
--
--:result rdf:type rdf:Property ;
--    rdfs:comment "The test status" ;
--    rdfs:domain	 :ManifestEntry ;
--    rdfs:range   :TestStatus ;
--    .
--
--:requires rdf:type rdf:Property ;
--    rdfs:comment "Required functionality for execution of this test" ;
--    rdfs:domain :ManifestEntry ;
--    rdfs:range	:Requirement .
--
--:notable rdf:type rdf:Property ;
--    rdfs:comment "Notable feature of this test (advisory)" ;
--    rdfs:domain :ManifestEntry .
--
--## ---- Test Case Type ---
--
--:PositiveSyntaxTest rdf:type rdfs:Class ;
--      rdfs:label "Positive Syntax Test" ;
--      rdfs:comment """A type of test specifically for syntax testing. Syntax
--      tests are not required to have an associated result, only an
--      action.""" .
--
--:NegativeSyntaxTest rdf:type rdfs:Class ;
--      rdfs:label "Negative Syntax Test" ;
--      rdfs:comment """A type of test specifically for syntax testing. Syntax
--      tests are not required to have an associated result, only an
--      action. Negative syntax tests are tests of which the result should
--      be a parser error.""" .
--
--:QueryEvaluationTest rdf:type rdfs:Class ;
--      rdfs:label "Query Evaluation Test" ;
--      rdfs:comment """A type of test specifically for query evaluation
--      testing. Query evaluation tests are required to have an associated
--      input dataset, a query, and an expected output dataset.""" .
--
--:ReducedCardinalityTest  rdf:type rdfs:Class ;
--      rdfs:label "Query Evaluation Test (REDUCDED)" ;
--      rdfs:comment
--"""The given mf:result for a mf:ReducedCardinalityTest is the results as 
--if the REDUCED keyword were omitted. To pass a 
--mf:ReducedCardinalityTest, an implementation must produce a result set 
--with each solution in the expected results appearing at least once and 
--no more than the number of times it appears in the expected results. Of 
--course, there must also be no results produced that are not in the 
--expected results.""" .
--
--## ---- Test Statuses ----
--
--:TestStatus rdf:type rdfs:Class ;
--    rdfs:comment "Statuses a test can have" ;
--    .
--
--:proposed rdf:type :TestStatus ;
--    rdfs:label "proposed" ;
--    .
--
--:accepted rdf:type :TestStatus ;
--    rdfs:label "accepted" ;
--    .
--
--:rejected rdf:type :TestStatus ;
--    rdfs:label "rejected" ;
--    .
--
--## ---- Required functions ----
--
--:Requirement rdf:type rdfs:Class ;
--     rdfs:comment "Requirements for a  particular test" .
--
--:Notable rdf:type rdfs:Class ;
--     rdfs:comment "Requirements for a  particular test" .
--
--
--:XsdDateOperations	rdf:type :Requirement ;
--    rdfs:comment "Tests that require xsd:date operations" .
--	
--:StringSimpleLiteralCmp	rdf:type :Requirement ;
--    rdfs:comment "Tests that require simple literal is the same value as an xsd:string of the same lexicial form" .
--    
--:KnownTypesDefault2Neq	rdf:type :Requirement ;
--    rdfs:comment "Values in disjoint value spaces are not equal" .
--    
--:LangTagAwareness	rdf:type :Requirement ;
--    rdfs:comment "Tests that require language tag handling in FILTERs" .
--
--## ---- Notable features ----
--
--:IllFormedLiterals	rdf:type :Notable ;
++@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix dc:     <http://purl.org/dc/elements/1.1/> .
++@prefix :       <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
++
++## A Manifest is typically a list (RDF Collection) of manifest entries.
++## The :entries property has an object of the list.
++## There may be more than one list per file.
++
++:   rdfs:comment     "Manifest vocabulary for test cases" ;
++    dc:creator       "Andy Seaborne" ;
++    dc:subject       "" ;
++    dc:publisher     "W3C RDF Data Access Working Group" ;
++    dc:publisher     "W3C SPARQL Working Group" ;
++    dc:title         "Test case manifest vocabulary" ;
++    dc:description   "Test case manifest vocabulary" ;
++    dc:date          "2004-07" ;
++    dc:date          "2010-08" ;
++    dc:format        "RDF" ;
++    dc:identifier    : ;
++    .
++
++## ---- Class declarations ----
++
++:Manifest rdf:type rdfs:Class ;
++    rdfs:comment "The class of manifests" .
++
++:ManifestEntry rdf:type rdfs:Class ;
++    rdfs:comment "One entry in rdf:type list of entries" .
++
++## ---- Property declarations for the manifest ----
++
++:include rdf:type rdf:Property ;
++    rdfs:comment "Connects the manifest resource to rdf:type list of manifests" ;
++    rdfs:domain	 :Manifest ;
++    rdfs:range   rdf:List ;
++    .
++
++:entries rdf:type rdf:Property ;
++    rdfs:comment "Connects the manifest resource to rdf:type list of entries" ;
++    rdfs:domain	 :Manifest ;
++    rdfs:range   rdf:List ;
++    .
++	
++## ---- Property declarations for each test ----
++
++:name rdf:type rdf:Property ;
++    rdfs:comment "Optional name of this entry" ;
++    rdfs:domain	 :ManifestEntry ;
++    rdfs:range   rdfs:Literal ;
++    .	
++    
++:action rdf:type rdf:Property ;
++    rdfs:comment "Action to perform" ;
++    rdfs:domain	 :ManifestEntry ;
++    # rdfs:range   ?? ;
++    .	
++
++:result rdf:type rdf:Property ;
++    rdfs:comment "The expected outcome" ;
++    rdfs:domain	 :ManifestEntry ;
++    # rdfs:range   ?? ;
++    .	
++
++:result rdf:type rdf:Property ;
++    rdfs:comment "The test status" ;
++    rdfs:domain	 :ManifestEntry ;
++    rdfs:range   :TestStatus ;
++    .
++
++:requires rdf:type rdf:Property ;
++    rdfs:comment "Required functionality for execution of this test" ;
++    rdfs:domain :ManifestEntry ;
++    rdfs:range	:Requirement .
++
++:notable rdf:type rdf:Property ;
++    rdfs:comment "Notable feature of this test (advisory)" ;
++    rdfs:domain :ManifestEntry .
++
++## ---- Test Case Type ---
++
++:PositiveSyntaxTest rdf:type rdfs:Class ;
++      rdfs:label "Positive Syntax Test" ;
++      rdfs:comment """A type of test specifically for syntax testing. Syntax
++      tests are not required to have an associated result, only an
++      action.""" .
++
++:NegativeSyntaxTest rdf:type rdfs:Class ;
++      rdfs:label "Negative Syntax Test" ;
++      rdfs:comment """A type of test specifically for syntax testing. Syntax
++      tests are not required to have an associated result, only an
++      action. Negative syntax tests are tests of which the result should
++      be a parser error.""" .
++
++:QueryEvaluationTest rdf:type rdfs:Class ;
++      rdfs:label "Query Evaluation Test" ;
++      rdfs:comment """A type of test specifically for query evaluation
++      testing. Query evaluation tests are required to have an associated
++      input dataset, a query, and an expected output dataset.""" .
++
++:ReducedCardinalityTest  rdf:type rdfs:Class ;
++      rdfs:label "Query Evaluation Test (REDUCDED)" ;
++      rdfs:comment
++"""The given mf:result for a mf:ReducedCardinalityTest is the results as 
++if the REDUCED keyword were omitted. To pass a 
++mf:ReducedCardinalityTest, an implementation must produce a result set 
++with each solution in the expected results appearing at least once and 
++no more than the number of times it appears in the expected results. Of 
++course, there must also be no results produced that are not in the 
++expected results.""" .
++
++## ---- Test Statuses ----
++
++:TestStatus rdf:type rdfs:Class ;
++    rdfs:comment "Statuses a test can have" ;
++    .
++
++:proposed rdf:type :TestStatus ;
++    rdfs:label "proposed" ;
++    .
++
++:accepted rdf:type :TestStatus ;
++    rdfs:label "accepted" ;
++    .
++
++:rejected rdf:type :TestStatus ;
++    rdfs:label "rejected" ;
++    .
++
++## ---- Required functions ----
++
++:Requirement rdf:type rdfs:Class ;
++     rdfs:comment "Requirements for a  particular test" .
++
++:Notable rdf:type rdfs:Class ;
++     rdfs:comment "Requirements for a  particular test" .
++
++
++:XsdDateOperations	rdf:type :Requirement ;
++    rdfs:comment "Tests that require xsd:date operations" .
++	
++:StringSimpleLiteralCmp	rdf:type :Requirement ;
++    rdfs:comment "Tests that require simple literal is the same value as an xsd:string of the same lexicial form" .
++    
++:KnownTypesDefault2Neq	rdf:type :Requirement ;
++    rdfs:comment "Values in disjoint value spaces are not equal" .
++    
++:LangTagAwareness	rdf:type :Requirement ;
++    rdfs:comment "Tests that require language tag handling in FILTERs" .
++
++## ---- Notable features ----
++
++:IllFormedLiterals	rdf:type :Notable ;
      rdfs:comment "Tests that involve lexical forms which are illegal for the datatype" .

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/Vocabularies/test-query.ttl
----------------------------------------------------------------------
diff --cc jena-arq/Vocabularies/test-query.ttl
index eb70cd8,eb70cd8..f508a9a
--- a/jena-arq/Vocabularies/test-query.ttl
+++ b/jena-arq/Vocabularies/test-query.ttl
@@@ -1,47 -1,47 +1,47 @@@
--@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix owl:    <http://www.w3.org/2002/07/owl#> .
--@prefix dc:     <http://purl.org/dc/elements/1.1/> .
--
--@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
--@prefix :       <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
--
--## Query-specific test vocabulary for a manifest action.
--
--:   rdfs:comment     "Vocabulary for query test cases" ;
--    dc:creator       "Andy Seaborne" ;
--    dc:subject       "" ;
--    dc:publisher     "W3C RDF Data Access Working Group" ;
--    dc:title         "Query test case vocabulary" ;
--    dc:description   "Query test case vocabulary" ;
--    dc:date          "2004-07" ;
--    dc:format        "RDF" ;
--    dc:identifier    : ;
--    .
--## ---- Class declarations ----
--
--:QueryTest a rdfs:Class ;
--    rdfs:comment "The class of query tests" .
--
--## ---- Property declarations ----
--
--
--:query a rdf:Property ;
--    rdfs:comment "The query to ask" ;
--    rdfs:domain	 :QueryTest ;
--    ## rdfs:range   ?? ;
--    .	
--
--:data a rdf:Property ;
--    rdfs:comment "Optional: data for the query test" ;
--    rdfs:domain	 :QueryTest ;
--    rdfs:range   rdfs:Resource ;
--    .
--
--
--:graphData a rdf:Property ;
--    rdfs:comment "Optional: named-graph only data for the query test" ;
--    rdfs:domain  :QueryTest ;
--    rdfs:range   rdfs:Resource ;
--    .
--
++@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix owl:    <http://www.w3.org/2002/07/owl#> .
++@prefix dc:     <http://purl.org/dc/elements/1.1/> .
++
++@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
++@prefix :       <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
++
++## Query-specific test vocabulary for a manifest action.
++
++:   rdfs:comment     "Vocabulary for query test cases" ;
++    dc:creator       "Andy Seaborne" ;
++    dc:subject       "" ;
++    dc:publisher     "W3C RDF Data Access Working Group" ;
++    dc:title         "Query test case vocabulary" ;
++    dc:description   "Query test case vocabulary" ;
++    dc:date          "2004-07" ;
++    dc:format        "RDF" ;
++    dc:identifier    : ;
++    .
++## ---- Class declarations ----
++
++:QueryTest a rdfs:Class ;
++    rdfs:comment "The class of query tests" .
++
++## ---- Property declarations ----
++
++
++:query a rdf:Property ;
++    rdfs:comment "The query to ask" ;
++    rdfs:domain	 :QueryTest ;
++    ## rdfs:range   ?? ;
++    .	
++
++:data a rdf:Property ;
++    rdfs:comment "Optional: data for the query test" ;
++    rdfs:domain	 :QueryTest ;
++    rdfs:range   rdfs:Resource ;
++    .
++
++
++:graphData a rdf:Property ;
++    rdfs:comment "Optional: named-graph only data for the query test" ;
++    rdfs:domain  :QueryTest ;
++    rdfs:range   rdfs:Resource ;
++    .
++

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset-db.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset-db.ttl
index 7f5a605,7f5a605..a0d265e
--- a/jena-arq/etc/dataset-db.ttl
+++ b/jena-arq/etc/dataset-db.ttl
@@@ -1,48 -1,48 +1,48 @@@
--# 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.
--
--# Dataset which has named graphs and a default graph.
--
--@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    # Database-backed model
--    ja:defaultGraph _:modelDB1 ;
--    # And also a memory model - can mix and match.
--    ja:namedGraph [ ja:graphName <http://example/graph1> ;
--                    ja:graph    :data1 ] ;
--    .
--
--_:modelDB1 rdf:type ja:RDBModel ;
--    ja:connection
--    [
--        ja:dbType       "MySQL" ;
--        ja:dbURL        <jdbc:mysql://localhost/jena-db> ;
--        ja:dbUser       "user" ;
--        ja:dbPassword   "password" ;
--        ja:dbClass      "com.mysql.jdbc.Driver" ;
--    ] ;
--    ## Add a model name - this is the name of the mode in the database
--    ## It is NOT the name in the dataset (that comes from 
--    ## ja:namedGraph/ja:graphName)
--    ja:modelName "DEFAULT"
--    . 
++# 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.
++
++# Dataset which has named graphs and a default graph.
++
++@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    # Database-backed model
++    ja:defaultGraph _:modelDB1 ;
++    # And also a memory model - can mix and match.
++    ja:namedGraph [ ja:graphName <http://example/graph1> ;
++                    ja:graph    :data1 ] ;
++    .
++
++_:modelDB1 rdf:type ja:RDBModel ;
++    ja:connection
++    [
++        ja:dbType       "MySQL" ;
++        ja:dbURL        <jdbc:mysql://localhost/jena-db> ;
++        ja:dbUser       "user" ;
++        ja:dbPassword   "password" ;
++        ja:dbClass      "com.mysql.jdbc.Driver" ;
++    ] ;
++    ## Add a model name - this is the name of the mode in the database
++    ## It is NOT the name in the dataset (that comes from 
++    ## ja:namedGraph/ja:graphName)
++    ja:modelName "DEFAULT"
++    . 

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset-owl-inf.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset-owl-inf.ttl
index 0675a3a,0675a3a..8756c0c
--- a/jena-arq/etc/dataset-owl-inf.ttl
+++ b/jena-arq/etc/dataset-owl-inf.ttl
@@@ -1,48 -1,48 +1,48 @@@
--# 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.
--
--# Setting up a dataset which is a single graph which is an OntModel.
--
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    ja:graph :ontModel
--    . 
--
--:ontModel rdf:type ja:OntModel ;
--    ja:baseModel 
--        [ rdf:type ja:MemoryModel ;
--          ja:content [ja:externalContent <D.ttl>] ] ;
--    ja:reasoner
--    ## Choices include:
--    ## <http://jena.hpl.hp.com/2003/GenericRuleReasoner>
--    ## <http://jena.hpl.hp.com/2003/OWLFBRuleReasoner>
--    ## <http://jena.hpl.hp.com/2003/OWLMicroFBRuleReasoner>
--    ## <http://jena.hpl.hp.com/2003/OWLMiniFBRuleReasoner>
--    ## <http://jena.hpl.hp.com/2003/DIGReasoner>
--        [ ja:reasonerURL <http://jena.hpl.hp.com/2003/OWLFBRuleReasoner> ; ] ;
--        
--## See http://jena.sourceforge.net/assembler/assembler-howto.htm
--##     ja:ontModelSpec
--##         [ rdf:type ja:OntModelSpec ;
--##           ja:reasonerFactory ... ; 
--##           ja:documentManager ... ;
--##         ] ;
--    .
++# 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.
++
++# Setting up a dataset which is a single graph which is an OntModel.
++
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    ja:graph :ontModel
++    . 
++
++:ontModel rdf:type ja:OntModel ;
++    ja:baseModel 
++        [ rdf:type ja:MemoryModel ;
++          ja:content [ja:externalContent <D.ttl>] ] ;
++    ja:reasoner
++    ## Choices include:
++    ## <http://jena.hpl.hp.com/2003/GenericRuleReasoner>
++    ## <http://jena.hpl.hp.com/2003/OWLFBRuleReasoner>
++    ## <http://jena.hpl.hp.com/2003/OWLMicroFBRuleReasoner>
++    ## <http://jena.hpl.hp.com/2003/OWLMiniFBRuleReasoner>
++    ## <http://jena.hpl.hp.com/2003/DIGReasoner>
++        [ ja:reasonerURL <http://jena.hpl.hp.com/2003/OWLFBRuleReasoner> ; ] ;
++        
++## See http://jena.sourceforge.net/assembler/assembler-howto.htm
++##     ja:ontModelSpec
++##         [ rdf:type ja:OntModelSpec ;
++##           ja:reasonerFactory ... ; 
++##           ja:documentManager ... ;
++##         ] ;
++    .

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset-owl.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset-owl.ttl
index f93ae20,f93ae20..de599f1
--- a/jena-arq/etc/dataset-owl.ttl
+++ b/jena-arq/etc/dataset-owl.ttl
@@@ -1,33 -1,33 +1,33 @@@
--# 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.
--
--# Setting up a dataset which is a single graph which is an OntModel.
--
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    ja:graph :ontModel
--    . 
--
--:ontModel rdf:type ja:OntModel ;
--    ja:baseModel 
--        [ rdf:type ja:MemoryModel ;
--          ja:content [ja:externalContent <D.ttl>] ];
--    . 
++# 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.
++
++# Setting up a dataset which is a single graph which is an OntModel.
++
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    ja:graph :ontModel
++    . 
++
++:ontModel rdf:type ja:OntModel ;
++    ja:baseModel 
++        [ rdf:type ja:MemoryModel ;
++          ja:content [ja:externalContent <D.ttl>] ];
++    . 

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset-rdfs.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset-rdfs.ttl
index c1bf88f,c1bf88f..c389cb4
--- a/jena-arq/etc/dataset-rdfs.ttl
+++ b/jena-arq/etc/dataset-rdfs.ttl
@@@ -1,35 -1,35 +1,35 @@@
--# 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.
--
--# Setting up a dataset which is a single graph which is an RDFS-backed model
--
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    ja:graph :ontModel
--    . 
--
--:ontModel rdf:type ja:OntModel ;
--    ja:baseModel 
--        [ rdf:type ja:MemoryModel ;
--          ja:content [ja:externalContent <D.ttl>] ];
--    ja:reasoner
--         [ ja:reasonerURL <http://jena.hpl.hp.com/2003/RDFSExptRuleReasoner> ]
--    . 
++# 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.
++
++# Setting up a dataset which is a single graph which is an RDFS-backed model
++
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    ja:graph :ontModel
++    . 
++
++:ontModel rdf:type ja:OntModel ;
++    ja:baseModel 
++        [ rdf:type ja:MemoryModel ;
++          ja:content [ja:externalContent <D.ttl>] ];
++    ja:reasoner
++         [ ja:reasonerURL <http://jena.hpl.hp.com/2003/RDFSExptRuleReasoner> ]
++    . 

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset-rules.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset-rules.ttl
index fa5d491,fa5d491..92aed59
--- a/jena-arq/etc/dataset-rules.ttl
+++ b/jena-arq/etc/dataset-rules.ttl
@@@ -1,39 -1,39 +1,39 @@@
--# 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.
--
--# Setting up a single graph which is a rule-backed infModel
--
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    ja:graph :inf .
--
--:inf rdf:type ja:InfModel ;
--    ja:baseModel :data ;
--    ja:reasoner
--        [ ja:reasonerURL <http://jena.hpl.hp.com/2003/GenericRuleReasoner> ;
--          ja:rulesFrom <owlax.jena> 
--        ] ;
--    .
--
--:data rdf:type ja:MemoryModel ;
--    ja:content [ja:externalContent <input-data.ttl>] ;
--    .
++# 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.
++
++# Setting up a single graph which is a rule-backed infModel
++
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    ja:graph :inf .
++
++:inf rdf:type ja:InfModel ;
++    ja:baseModel :data ;
++    ja:reasoner
++        [ ja:reasonerURL <http://jena.hpl.hp.com/2003/GenericRuleReasoner> ;
++          ja:rulesFrom <owlax.jena> 
++        ] ;
++    .
++
++:data rdf:type ja:MemoryModel ;
++    ja:content [ja:externalContent <input-data.ttl>] ;
++    .

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset-trans.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset-trans.ttl
index a36d33e,a36d33e..12b793f
--- a/jena-arq/etc/dataset-trans.ttl
+++ b/jena-arq/etc/dataset-trans.ttl
@@@ -1,35 -1,35 +1,35 @@@
--# 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.
--
--# Setting up a single graph which is backed by the transitive reasoner.
--
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    ja:graph :ontModel
--    . 
--
--:ontModel rdf:type ja:OntModel ;
--    ja:baseModel 
--        [ rdf:type ja:MemoryModel ;
--          ja:content [ja:externalContent <D.ttl>] ];
--    ja:reasoner
--         [ ja:reasonerURL <http://jena.hpl.hp.com/2003/TransitiveReasoner> ]
--    . 
++# 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.
++
++# Setting up a single graph which is backed by the transitive reasoner.
++
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    ja:graph :ontModel
++    . 
++
++:ontModel rdf:type ja:OntModel ;
++    ja:baseModel 
++        [ rdf:type ja:MemoryModel ;
++          ja:content [ja:externalContent <D.ttl>] ];
++    ja:reasoner
++         [ ja:reasonerURL <http://jena.hpl.hp.com/2003/TransitiveReasoner> ]
++    . 

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/dataset.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/dataset.ttl
index 1e580fa,1e580fa..5429294
--- a/jena-arq/etc/dataset.ttl
+++ b/jena-arq/etc/dataset.ttl
@@@ -1,43 -1,43 +1,43 @@@
--# 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.
--
--# Dataset which has named graphs and a default graph.
--
--@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Datatset
--
--<> rdf:type         ja:RDFDataset ;
--    ja:defaultGraph
--        [ rdf:type ja:MemoryModel ;
--          ja:content [ja:externalContent <D.ttl>] ] ;
--    ja:namedGraph [ ja:graphName <http://example/graph1> ;
--                    ja:graph    :data1 ] ;
--    ja:namedGraph [ ja:graphName <http://example/graph2> ;
--                    ja:graph    :data2 ] ;
--    . 
--
--:data1 rdf:type ja:MemoryModel ;
--    ja:content [ja:externalContent <D1.ttl>] ;
--    .
--
--:data2 rdf:type ja:MemoryModel ;
--    ja:content [ja:externalContent <D2.ttl>] ;
--    .
++# 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.
++
++# Dataset which has named graphs and a default graph.
++
++@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Datatset
++
++<> rdf:type         ja:RDFDataset ;
++    ja:defaultGraph
++        [ rdf:type ja:MemoryModel ;
++          ja:content [ja:externalContent <D.ttl>] ] ;
++    ja:namedGraph [ ja:graphName <http://example/graph1> ;
++                    ja:graph    :data1 ] ;
++    ja:namedGraph [ ja:graphName <http://example/graph2> ;
++                    ja:graph    :data2 ] ;
++    . 
++
++:data1 rdf:type ja:MemoryModel ;
++    ja:content [ja:externalContent <D1.ttl>] ;
++    .
++
++:data2 rdf:type ja:MemoryModel ;
++    ja:content [ja:externalContent <D2.ttl>] ;
++    .

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/graphstore.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/graphstore.ttl
index 1274f81,1274f81..e2373e5
--- a/jena-arq/etc/graphstore.ttl
+++ b/jena-arq/etc/graphstore.ttl
@@@ -1,42 -1,42 +1,42 @@@
--# 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.
--
--# Graph store -- for SPARQL/Update
--
--@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
--@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
--@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
--@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
--@prefix :       <#> .
--
--## Graphstore - one default graph, two named graphs, all empty.
--
--<> rdf:type         ja:GraphStore ;
--    ja:defaultGraph
--        [ rdf:type ja:MemoryModel ] ;
--    ja:namedGraph [ ja:graphName <http://example/graph1> ;
--                    ja:graph    :data1 ] ;
--    ja:namedGraph [ ja:graphName <http://example/graph2> ;
--                    ja:graph    :data2 ] ;
--    . 
--
--# Empty
--:data1 rdf:type ja:MemoryModel ;
--    .
--
--# Empty
--:data2 rdf:type ja:MemoryModel ;
--    .
++# 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.
++
++# Graph store -- for SPARQL/Update
++
++@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
++@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
++@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
++@prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
++@prefix :       <#> .
++
++## Graphstore - one default graph, two named graphs, all empty.
++
++<> rdf:type         ja:GraphStore ;
++    ja:defaultGraph
++        [ rdf:type ja:MemoryModel ] ;
++    ja:namedGraph [ ja:graphName <http://example/graph1> ;
++                    ja:graph    :data1 ] ;
++    ja:namedGraph [ ja:graphName <http://example/graph2> ;
++                    ja:graph    :data2 ] ;
++    . 
++
++# Empty
++:data1 rdf:type ja:MemoryModel ;
++    .
++
++# Empty
++:data2 rdf:type ja:MemoryModel ;
++    .

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/etc/update-data.ttl
----------------------------------------------------------------------
diff --cc jena-arq/etc/update-data.ttl
index 8dd8852,8dd8852..359a169
--- a/jena-arq/etc/update-data.ttl
+++ b/jena-arq/etc/update-data.ttl
@@@ -1,19 -1,19 +1,19 @@@
--# 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.
--
--@prefix : <http://example/> .
--
--:x :p 123 .
++# 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.
++
++@prefix : <http://example/> .
++
++:x :p 123 .

http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
----------------------------------------------------------------------
diff --cc jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
index febd328,febd328..e8f8b4a
--- a/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
+++ b/jena-arq/src-examples/arq/examples/constructquads/ExampleConstructQuads.java
@@@ -1,191 -1,191 +1,191 @@@
--/*
-- * 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 arq.examples.constructquads;
--
--import java.io.* ;
--import java.util.Iterator;
--
--import org.apache.jena.graph.Triple;
--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;
--import org.apache.jena.rdf.model.Resource;
--import org.apache.jena.riot.Lang;
--import org.apache.jena.riot.RDFDataMgr;
--import org.apache.jena.sparql.core.Quad;
--import org.apache.jena.util.PrintUtil;
--
--public class ExampleConstructQuads {
--	public static void main(String[] args) throws FileNotFoundException, IOException {
--
--		// create testing data :
--		// 1) default graph data
--		Model model = ModelFactory.createDefaultModel();
--		Resource s = model.createResource("http://eg.com/s");
--		Property p = model.createProperty("http://eg.com/p");
--		Resource o = model.createResource("http://eg.com/o");
--		model.add(s, p, o);
--		Dataset dataset = DatasetFactory.create(model);
--		// 2) named graph data
--		Model model1 = ModelFactory.createDefaultModel();
--		Resource s1 = model.createResource("http://eg.com/s1");
--		Property p1 = model.createProperty("http://eg.com/p1");
--		Resource o1 = model.createResource("http://eg.com/o1");
--		model1.add(s1, p1, o1);
--		dataset.addNamedModel("http://eg.com/g1", model1);
--		
--		PrintUtil.printOut(dataset.asDatasetGraph().find());
--
--		// construct named graph
--		System.out.println("construct named graph:");
--		String queryString = "CONSTRUCT { GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		Query query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Quad> quads = qexec.execConstructQuads();
--			PrintUtil.printOut(quads);
--		}
--		System.out.println(query);
--
--		// construct default graph 1
--		System.out.println("construct default graph 1:");
--		queryString = "CONSTRUCT {  {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Quad> quads = qexec.execConstructQuads();
--			PrintUtil.printOut(quads);
--		}
--        System.out.println(query);
--
--		// construct default graph 2
--		System.out.println("construct default graph 2:");
--		queryString = "CONSTRUCT {<http://eg.com/s1> <http://eg.com/p1> ?o}  WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Quad> quads = qexec.execConstructQuads();
--			PrintUtil.printOut(quads);
--		}
--        System.out.println(query);
--
--		// construct triples
--		System.out.println("construct default graph 2:");
--		queryString = "CONSTRUCT {<http://eg.com/s1> <http://eg.com/p1> ?o}  WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Triple> triples = qexec.execConstructTriples();
--			PrintUtil.printOut(triples);
--		}
--        System.out.println(query);
--
--		// construct dataset
--		System.out.println("construct dataset:");
--		queryString = "CONSTRUCT { GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Dataset d = qexec.execConstructDataset();
--			RDFDataMgr.write(System.out, d, Lang.TRIG);
--		}
--        System.out.println(query);
--
--		// short form 1
--		System.out.println("short form 1:");
--		queryString = "CONSTRUCT WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Quad> quads = qexec.execConstructQuads();
--			PrintUtil.printOut(quads);
--		}
--		System.out.println(query);
--
--		// short form 2
--		System.out.println("short form 2:");
--		queryString = "CONSTRUCT WHERE{ <http://eg.com/s> <http://eg.com/p> ?o }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Quad> quads = qexec.execConstructQuads();
--			PrintUtil.printOut(quads);
--		}
--		System.out.println(query);
--
--		// short form 3
--		System.out.println("short form 3:");
--		queryString = "CONSTRUCT WHERE{ <http://eg.com/s> <http://eg.com/p> ?o }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Triple> triples = qexec.execConstructTriples();
--			PrintUtil.printOut(triples);
--		}
--		System.out.println(query);
--
--		// short form 4
--		System.out.println("short form 4:");
--		queryString = "CONSTRUCT WHERE{ {<http://eg.com/s> <http://eg.com/p> ?o} }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Quad> quads = qexec.execConstructQuads();
--			PrintUtil.printOut(quads);
--		}
--		System.out.println(query);
--		
--		// short form 4
--		System.out.println("default graph projection:");
--		queryString = "CONSTRUCT { {<http://eg.com/s> <http://eg.com/p> ?o} GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
--		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
--		try (QueryExecution qexec = QueryExecutionFactory
--				.create(query, dataset)) {
--			Iterator<Triple> triples = qexec.execConstructTriples();
--			PrintUtil.printOut(triples);
--		}
--		System.out.println(query);
--
--		// run-construct-quad-test
--		System.out.println("run-construct-quad-test:");
--		File[] tests = new File("testing/ARQ/Syntax/Syntax-ARQ")
--				.listFiles((dir, fname)->{
--						if (fname.startsWith("syntax-quad-construct-")) {
--							return true;
--						}
--						return false;
--				});
--		for (File test : tests) {
--			System.out.println("======== File: "+test.getName());
--			try (BufferedReader br = new BufferedReader(new FileReader(test))) {
--				String line = null;
--				while( (line = br.readLine()) != null){
--					System.out.println(line);
--				}
--			}
--			System.out.println("==== Output of parse/print file "+ test.getName());
--			try {
--			    Query q = QueryFactory.read(test.getAbsolutePath(), Syntax.syntaxARQ) ;
--			    System.out.println(q);
--			} catch (QueryParseException ex) {
--			    System.out.println("File "+test.getAbsolutePath()+ " : "+ex.getMessage()) ;
--			}
--		}
--	}
--}
++/*
++ * 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 arq.examples.constructquads;
++
++import java.io.* ;
++import java.util.Iterator;
++
++import org.apache.jena.graph.Triple;
++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;
++import org.apache.jena.rdf.model.Resource;
++import org.apache.jena.riot.Lang;
++import org.apache.jena.riot.RDFDataMgr;
++import org.apache.jena.sparql.core.Quad;
++import org.apache.jena.util.PrintUtil;
++
++public class ExampleConstructQuads {
++	public static void main(String[] args) throws FileNotFoundException, IOException {
++
++		// create testing data :
++		// 1) default graph data
++		Model model = ModelFactory.createDefaultModel();
++		Resource s = model.createResource("http://eg.com/s");
++		Property p = model.createProperty("http://eg.com/p");
++		Resource o = model.createResource("http://eg.com/o");
++		model.add(s, p, o);
++		Dataset dataset = DatasetFactory.create(model);
++		// 2) named graph data
++		Model model1 = ModelFactory.createDefaultModel();
++		Resource s1 = model.createResource("http://eg.com/s1");
++		Property p1 = model.createProperty("http://eg.com/p1");
++		Resource o1 = model.createResource("http://eg.com/o1");
++		model1.add(s1, p1, o1);
++		dataset.addNamedModel("http://eg.com/g1", model1);
++		
++		PrintUtil.printOut(dataset.asDatasetGraph().find());
++
++		// construct named graph
++		System.out.println("construct named graph:");
++		String queryString = "CONSTRUCT { GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		Query query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Quad> quads = qexec.execConstructQuads();
++			PrintUtil.printOut(quads);
++		}
++		System.out.println(query);
++
++		// construct default graph 1
++		System.out.println("construct default graph 1:");
++		queryString = "CONSTRUCT {  {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Quad> quads = qexec.execConstructQuads();
++			PrintUtil.printOut(quads);
++		}
++        System.out.println(query);
++
++		// construct default graph 2
++		System.out.println("construct default graph 2:");
++		queryString = "CONSTRUCT {<http://eg.com/s1> <http://eg.com/p1> ?o}  WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Quad> quads = qexec.execConstructQuads();
++			PrintUtil.printOut(quads);
++		}
++        System.out.println(query);
++
++		// construct triples
++		System.out.println("construct default graph 2:");
++		queryString = "CONSTRUCT {<http://eg.com/s1> <http://eg.com/p1> ?o}  WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Triple> triples = qexec.execConstructTriples();
++			PrintUtil.printOut(triples);
++		}
++        System.out.println(query);
++
++		// construct dataset
++		System.out.println("construct dataset:");
++		queryString = "CONSTRUCT { GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Dataset d = qexec.execConstructDataset();
++			RDFDataMgr.write(System.out, d, Lang.TRIG);
++		}
++        System.out.println(query);
++
++		// short form 1
++		System.out.println("short form 1:");
++		queryString = "CONSTRUCT WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Quad> quads = qexec.execConstructQuads();
++			PrintUtil.printOut(quads);
++		}
++		System.out.println(query);
++
++		// short form 2
++		System.out.println("short form 2:");
++		queryString = "CONSTRUCT WHERE{ <http://eg.com/s> <http://eg.com/p> ?o }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Quad> quads = qexec.execConstructQuads();
++			PrintUtil.printOut(quads);
++		}
++		System.out.println(query);
++
++		// short form 3
++		System.out.println("short form 3:");
++		queryString = "CONSTRUCT WHERE{ <http://eg.com/s> <http://eg.com/p> ?o }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Triple> triples = qexec.execConstructTriples();
++			PrintUtil.printOut(triples);
++		}
++		System.out.println(query);
++
++		// short form 4
++		System.out.println("short form 4:");
++		queryString = "CONSTRUCT WHERE{ {<http://eg.com/s> <http://eg.com/p> ?o} }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Quad> quads = qexec.execConstructQuads();
++			PrintUtil.printOut(quads);
++		}
++		System.out.println(query);
++		
++		// short form 4
++		System.out.println("default graph projection:");
++		queryString = "CONSTRUCT { {<http://eg.com/s> <http://eg.com/p> ?o} GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} } WHERE{ GRAPH ?g {<http://eg.com/s1> <http://eg.com/p1> ?o} }";
++		query = QueryFactory.create(queryString, Syntax.syntaxARQ);
++		try (QueryExecution qexec = QueryExecutionFactory
++				.create(query, dataset)) {
++			Iterator<Triple> triples = qexec.execConstructTriples();
++			PrintUtil.printOut(triples);
++		}
++		System.out.println(query);
++
++		// run-construct-quad-test
++		System.out.println("run-construct-quad-test:");
++		File[] tests = new File("testing/ARQ/Syntax/Syntax-ARQ")
++				.listFiles((dir, fname)->{
++						if (fname.startsWith("syntax-quad-construct-")) {
++							return true;
++						}
++						return false;
++				});
++		for (File test : tests) {
++			System.out.println("======== File: "+test.getName());
++			try (BufferedReader br = new BufferedReader(new FileReader(test))) {
++				String line = null;
++				while( (line = br.readLine()) != null){
++					System.out.println(line);
++				}
++			}
++			System.out.println("==== Output of parse/print file "+ test.getName());
++			try {
++			    Query q = QueryFactory.read(test.getAbsolutePath(), Syntax.syntaxARQ) ;
++			    System.out.println(q);
++			} catch (QueryParseException ex) {
++			    System.out.println("File "+test.getAbsolutePath()+ " : "+ex.getMessage()) ;
++			}
++		}
++	}
++}