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 17:22:24 UTC
[28/40] jena git commit: Fix line endings (part 2)
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/ManifestRestriction001.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/ManifestRestriction001.rdf b/jena-core/testing/wg/localtests/ManifestRestriction001.rdf
index 1cee138..b125d17 100644
--- a/jena-core/testing/wg/localtests/ManifestRestriction001.rdf
+++ b/jena-core/testing/wg/localtests/ManifestRestriction001.rdf
@@ -1,30 +1,30 @@
-<!--
- Local test files use in Jena2 development
--->
-<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
- xmlns:rdfs='http://www.w3.org/2000/01/rdf-schema#'
- xmlns:rtest='http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#'
- xmlns:otest='http://www.w3.org/2002/03owlt/testOntology#'
- xmlns:dc='http://purl.org/dc/elements/1.0/'
- xmlns='http://www.w3.org/2002/03owlt/localtests/ManifestRestriction001#'
- xmlns:owl='http://www.w3.org/2002/07/owl#'
- xml:base='http://www.w3.org/2002/03owlt/localtests/ManifestRestriction001'
->
-<otest:PositiveEntailmentTest rdf:ID='intersection1'>
- <rtest:status>Jena internal</rtest:status>
- <dc:creator>Dave Reynolds</dc:creator>
- <rtest:description rdf:parseType='Literal'>
- Test core intersectionOf processing - 'if' direction.
- </rtest:description>
- <rtest:premiseDocument>
- <rtest:RDF-XML-Document rdf:about='premisesRestriction001' >
- <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
- </rtest:RDF-XML-Document>
- </rtest:premiseDocument>
- <rtest:conclusionDocument>
- <rtest:RDF-XML-Document rdf:about='conclusionsRestriction001' >
- <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
- </rtest:RDF-XML-Document>
- </rtest:conclusionDocument>
-</otest:PositiveEntailmentTest >
-</rdf:RDF>
+<!--
+ Local test files use in Jena2 development
+-->
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns:rdfs='http://www.w3.org/2000/01/rdf-schema#'
+ xmlns:rtest='http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#'
+ xmlns:otest='http://www.w3.org/2002/03owlt/testOntology#'
+ xmlns:dc='http://purl.org/dc/elements/1.0/'
+ xmlns='http://www.w3.org/2002/03owlt/localtests/ManifestRestriction001#'
+ xmlns:owl='http://www.w3.org/2002/07/owl#'
+ xml:base='http://www.w3.org/2002/03owlt/localtests/ManifestRestriction001'
+>
+<otest:PositiveEntailmentTest rdf:ID='intersection1'>
+ <rtest:status>Jena internal</rtest:status>
+ <dc:creator>Dave Reynolds</dc:creator>
+ <rtest:description rdf:parseType='Literal'>
+ Test core intersectionOf processing - 'if' direction.
+ </rtest:description>
+ <rtest:premiseDocument>
+ <rtest:RDF-XML-Document rdf:about='premisesRestriction001' >
+ <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
+ </rtest:RDF-XML-Document>
+ </rtest:premiseDocument>
+ <rtest:conclusionDocument>
+ <rtest:RDF-XML-Document rdf:about='conclusionsRestriction001' >
+ <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
+ </rtest:RDF-XML-Document>
+ </rtest:conclusionDocument>
+</otest:PositiveEntailmentTest >
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/ManifestSubclass001.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/ManifestSubclass001.rdf b/jena-core/testing/wg/localtests/ManifestSubclass001.rdf
index b91aa4a..603a183 100644
--- a/jena-core/testing/wg/localtests/ManifestSubclass001.rdf
+++ b/jena-core/testing/wg/localtests/ManifestSubclass001.rdf
@@ -1,30 +1,30 @@
-<!--
- Local test files use in Jena2 development
--->
-<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
- xmlns:rdfs='http://www.w3.org/2000/01/rdf-schema#'
- xmlns:rtest='http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#'
- xmlns:otest='http://www.w3.org/2002/03owlt/testOntology#'
- xmlns:dc='http://purl.org/dc/elements/1.0/'
- xmlns='http://www.w3.org/2002/03owlt/localtests/ManifestSubclass001#'
- xmlns:owl='http://www.w3.org/2002/07/owl#'
- xml:base='http://www.w3.org/2002/03owlt/localtests/ManifestSubclass001'
->
-<otest:PositiveEntailmentTest rdf:ID='intersection1'>
- <rtest:status>Jena internal</rtest:status>
- <dc:creator>Dave Reynolds</dc:creator>
- <rtest:description rdf:parseType='Literal'>
- Basic subclass closure checking.
- </rtest:description>
- <rtest:premiseDocument>
- <rtest:RDF-XML-Document rdf:about='premisesSubclass001' >
- <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
- </rtest:RDF-XML-Document>
- </rtest:premiseDocument>
- <rtest:conclusionDocument>
- <rtest:RDF-XML-Document rdf:about='conclusionsSubclass001' >
- <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
- </rtest:RDF-XML-Document>
- </rtest:conclusionDocument>
-</otest:PositiveEntailmentTest >
-</rdf:RDF>
+<!--
+ Local test files use in Jena2 development
+-->
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns:rdfs='http://www.w3.org/2000/01/rdf-schema#'
+ xmlns:rtest='http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#'
+ xmlns:otest='http://www.w3.org/2002/03owlt/testOntology#'
+ xmlns:dc='http://purl.org/dc/elements/1.0/'
+ xmlns='http://www.w3.org/2002/03owlt/localtests/ManifestSubclass001#'
+ xmlns:owl='http://www.w3.org/2002/07/owl#'
+ xml:base='http://www.w3.org/2002/03owlt/localtests/ManifestSubclass001'
+>
+<otest:PositiveEntailmentTest rdf:ID='intersection1'>
+ <rtest:status>Jena internal</rtest:status>
+ <dc:creator>Dave Reynolds</dc:creator>
+ <rtest:description rdf:parseType='Literal'>
+ Basic subclass closure checking.
+ </rtest:description>
+ <rtest:premiseDocument>
+ <rtest:RDF-XML-Document rdf:about='premisesSubclass001' >
+ <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
+ </rtest:RDF-XML-Document>
+ </rtest:premiseDocument>
+ <rtest:conclusionDocument>
+ <rtest:RDF-XML-Document rdf:about='conclusionsSubclass001' >
+ <otest:level rdf:resource='http://www.w3.org/2002/03owlt/testOntology#Lite' />
+ </rtest:RDF-XML-Document>
+ </rtest:conclusionDocument>
+</otest:PositiveEntailmentTest >
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/conclusions008.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/conclusions008.rdf b/jena-core/testing/wg/localtests/conclusions008.rdf
index 394347b..4aec7e5 100644
--- a/jena-core/testing/wg/localtests/conclusions008.rdf
+++ b/jena-core/testing/wg/localtests/conclusions008.rdf
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
-<!--
- Local test files use in Jena2 development
-
- Infer domain/range from inverseof
--->
-
-<!DOCTYPE rdf:RDF [
- <!ENTITY eg 'urn:x-hp:eg'>
- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
- <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
- <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
- <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
-]>
-
-<rdf:RDF xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:xsd="&xsd;" xmlns:owl="&owl;"
- xml:base="⪚" xmlns="⪚#">
-
- <owl:ObjectProperty rdf:about="#q">
- <rdfs:domain rdf:resource="⪚#B" />
- <rdfs:range rdf:resource="⪚#A" />
- </owl:ObjectProperty>
-
-</rdf:RDF>
+<?xml version="1.0"?>
+<!--
+ Local test files use in Jena2 development
+
+ Infer domain/range from inverseof
+-->
+
+<!DOCTYPE rdf:RDF [
+ <!ENTITY eg 'urn:x-hp:eg'>
+ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
+ <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
+ <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
+]>
+
+<rdf:RDF xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:xsd="&xsd;" xmlns:owl="&owl;"
+ xml:base="⪚" xmlns="⪚#">
+
+ <owl:ObjectProperty rdf:about="#q">
+ <rdfs:domain rdf:resource="⪚#B" />
+ <rdfs:range rdf:resource="⪚#A" />
+ </owl:ObjectProperty>
+
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/conclusionsRestriction001.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/conclusionsRestriction001.rdf b/jena-core/testing/wg/localtests/conclusionsRestriction001.rdf
index 90a6ff9..20de9e2 100644
--- a/jena-core/testing/wg/localtests/conclusionsRestriction001.rdf
+++ b/jena-core/testing/wg/localtests/conclusionsRestriction001.rdf
@@ -1,17 +1,17 @@
-<!--
- Local test files use in Jena2 development
-
- Test core intersectionOf processing - 'if' direction.
--->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesRestriction001" >
-
- <owl:Class rdf:ID="c1">
- <!-- <owl:equivalentClass rdf:resource="#c2" /> -->
- <rdfs:subClassOf rdf:resource="#c2" />
- </owl:Class>
-
-</rdf:RDF>
+<!--
+ Local test files use in Jena2 development
+
+ Test core intersectionOf processing - 'if' direction.
+-->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesRestriction001" >
+
+ <owl:Class rdf:ID="c1">
+ <!-- <owl:equivalentClass rdf:resource="#c2" /> -->
+ <rdfs:subClassOf rdf:resource="#c2" />
+ </owl:Class>
+
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/conclusionsSubclass001.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/conclusionsSubclass001.rdf b/jena-core/testing/wg/localtests/conclusionsSubclass001.rdf
index 269c1d3..fa2fe3a 100644
--- a/jena-core/testing/wg/localtests/conclusionsSubclass001.rdf
+++ b/jena-core/testing/wg/localtests/conclusionsSubclass001.rdf
@@ -1,20 +1,20 @@
-<!--
- Local test files use in Jena2 development
-
- Test core intersectionOf processing - 'if' direction.
--->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesSubclass001" >
-
- <rdf:Description rdf:about="#a">
- <rdfs:subClassOf rdf:resource="#c"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
- <owl:equivalentClass rdf:resource="#d"/>
- </rdf:Description>
-
-</rdf:RDF>
+<!--
+ Local test files use in Jena2 development
+
+ Test core intersectionOf processing - 'if' direction.
+-->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesSubclass001" >
+
+ <rdf:Description rdf:about="#a">
+ <rdfs:subClassOf rdf:resource="#c"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
+ <owl:equivalentClass rdf:resource="#d"/>
+ </rdf:Description>
+
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/premises008.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/premises008.rdf b/jena-core/testing/wg/localtests/premises008.rdf
index 9df8af7..f85c1f5 100644
--- a/jena-core/testing/wg/localtests/premises008.rdf
+++ b/jena-core/testing/wg/localtests/premises008.rdf
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
-<!--
- Local test files use in Jena2 development
-
- Infer domain/range from inverseof
--->
-
-<!DOCTYPE rdf:RDF [
- <!ENTITY eg 'urn:x-hp:eg'>
- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
- <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
- <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
- <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
-]>
-
-<rdf:RDF xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:xsd="&xsd;" xmlns:owl="&owl;"
- xml:base="⪚" xmlns="⪚#">
-
- <owl:Class rdf:about="#A" />
- <owl:Class rdf:about="#B" />
-
- <owl:ObjectProperty rdf:about="#p">
- <rdfs:domain rdf:resource="⪚#A" />
- <rdfs:range rdf:resource="⪚#B" />
- </owl:ObjectProperty>
-
- <owl:ObjectProperty rdf:about="#q">
- <owl:inverseOf rdf:resource="⪚#p"/>
- </owl:ObjectProperty>
-
-</rdf:RDF>
+<?xml version="1.0"?>
+<!--
+ Local test files use in Jena2 development
+
+ Infer domain/range from inverseof
+-->
+
+<!DOCTYPE rdf:RDF [
+ <!ENTITY eg 'urn:x-hp:eg'>
+ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
+ <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
+ <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
+]>
+
+<rdf:RDF xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:xsd="&xsd;" xmlns:owl="&owl;"
+ xml:base="⪚" xmlns="⪚#">
+
+ <owl:Class rdf:about="#A" />
+ <owl:Class rdf:about="#B" />
+
+ <owl:ObjectProperty rdf:about="#p">
+ <rdfs:domain rdf:resource="⪚#A" />
+ <rdfs:range rdf:resource="⪚#B" />
+ </owl:ObjectProperty>
+
+ <owl:ObjectProperty rdf:about="#q">
+ <owl:inverseOf rdf:resource="⪚#p"/>
+ </owl:ObjectProperty>
+
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/premisesRestriction001.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/premisesRestriction001.rdf b/jena-core/testing/wg/localtests/premisesRestriction001.rdf
index 1ecf367..2e724bc 100644
--- a/jena-core/testing/wg/localtests/premisesRestriction001.rdf
+++ b/jena-core/testing/wg/localtests/premisesRestriction001.rdf
@@ -1,33 +1,33 @@
-<!--
- Local test files use in Jena2 development
-
- Test core intersectionOf processing - 'if' direction.
--->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesRestriction001" >
-
- <owl:Class rdf:about="#d" />
- <owl:ObjectProperty rdf:about="#p" />
-
- <owl:Class rdf:ID="c1">
- <owl:equivalentClass>
- <owl:Restriction>
- <owl:onProperty rdf:resource="#p"/>
- <owl:someValuesFrom rdf:resource="#d" />
- </owl:Restriction>
- </owl:equivalentClass>
- </owl:Class>
-
- <owl:Class rdf:ID="c2">
- <owl:equivalentClass>
- <owl:Restriction>
- <owl:onProperty rdf:resource="#p"/>
- <owl:someValuesFrom rdf:resource="#d" />
- </owl:Restriction>
- </owl:equivalentClass>
- </owl:Class>
-
-</rdf:RDF>
+<!--
+ Local test files use in Jena2 development
+
+ Test core intersectionOf processing - 'if' direction.
+-->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesRestriction001" >
+
+ <owl:Class rdf:about="#d" />
+ <owl:ObjectProperty rdf:about="#p" />
+
+ <owl:Class rdf:ID="c1">
+ <owl:equivalentClass>
+ <owl:Restriction>
+ <owl:onProperty rdf:resource="#p"/>
+ <owl:someValuesFrom rdf:resource="#d" />
+ </owl:Restriction>
+ </owl:equivalentClass>
+ </owl:Class>
+
+ <owl:Class rdf:ID="c2">
+ <owl:equivalentClass>
+ <owl:Restriction>
+ <owl:onProperty rdf:resource="#p"/>
+ <owl:someValuesFrom rdf:resource="#d" />
+ </owl:Restriction>
+ </owl:equivalentClass>
+ </owl:Class>
+
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-core/testing/wg/localtests/premisesSubclass001.rdf
----------------------------------------------------------------------
diff --git a/jena-core/testing/wg/localtests/premisesSubclass001.rdf b/jena-core/testing/wg/localtests/premisesSubclass001.rdf
index d61c3b9..e80bf40 100644
--- a/jena-core/testing/wg/localtests/premisesSubclass001.rdf
+++ b/jena-core/testing/wg/localtests/premisesSubclass001.rdf
@@ -1,31 +1,31 @@
-<!--
- Local test files use in Jena2 development
-
- Test core intersectionOf processing - 'if' direction.
--->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesSubclass001" >
-
- <owl:Class rdf:about="#a">
- <rdfs:subClassOf rdf:resource="#b"/>
- </owl:Class>
-
- <owl:Class rdf:about="#b">
- <rdfs:subClassOf rdf:resource="#c"/>
- </owl:Class>
-
- <owl:Class rdf:about="#c">
- <rdfs:subClassOf rdf:resource="#d"/>
- </owl:Class>
-
- <owl:Class rdf:about="#d">
- </owl:Class>
-
- <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
- <rdfs:subClassOf rdf:resource="#d"/>
- </rdf:Description>
-
-</rdf:RDF>
+<!--
+ Local test files use in Jena2 development
+
+ Test core intersectionOf processing - 'if' direction.
+-->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xml:base="http://www.w3.org/2002/03owlt/equivalentClass/premisesSubclass001" >
+
+ <owl:Class rdf:about="#a">
+ <rdfs:subClassOf rdf:resource="#b"/>
+ </owl:Class>
+
+ <owl:Class rdf:about="#b">
+ <rdfs:subClassOf rdf:resource="#c"/>
+ </owl:Class>
+
+ <owl:Class rdf:about="#c">
+ <rdfs:subClassOf rdf:resource="#d"/>
+ </owl:Class>
+
+ <owl:Class rdf:about="#d">
+ </owl:Class>
+
+ <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#Thing">
+ <rdfs:subClassOf rdf:resource="#d"/>
+ </rdf:Description>
+
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/Data/data.ttl
----------------------------------------------------------------------
diff --git a/jena-sdb/Data/data.ttl b/jena-sdb/Data/data.ttl
index 423ea6d..42217da 100644
--- a/jena-sdb/Data/data.ttl
+++ b/jena-sdb/Data/data.ttl
@@ -1,34 +1,34 @@
-# 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 1 .
-:x :p 2 .
-:x :p 3 .
-
-:x :p :a .
-:x :p :b .
-:x :p :z .
-
-:a :q1 :z1 .
-:a :q2 :z2 .
-
-:b :q1 :z1 .
-
-:z :p1 "abc" .
-:z :p2 "def" .
-:z :p3 "g" .
+# 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 1 .
+:x :p 2 .
+:x :p 3 .
+
+:x :p :a .
+:x :p :b .
+:x :p :z .
+
+:a :q1 :z1 .
+:a :q2 :z2 .
+
+:b :q1 :z1 .
+
+:z :p1 "abc" .
+:z :p2 "def" .
+:z :p3 "g" .
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/Data/data2.ttl
----------------------------------------------------------------------
diff --git a/jena-sdb/Data/data2.ttl b/jena-sdb/Data/data2.ttl
index b570f9d..08194b6 100644
--- a/jena-sdb/Data/data2.ttl
+++ b/jena-sdb/Data/data2.ttl
@@ -1,20 +1,20 @@
-# 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.
-
-# Some international stuff
-@prefix : <http://example/> .
-
-:x :p "Unicode: 03 B1 \u03b1" .
+# 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.
+
+# Some international stuff
+@prefix : <http://example/> .
+
+:x :p "Unicode: 03 B1 \u03b1" .
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/Reports/explain.rb
----------------------------------------------------------------------
diff --git a/jena-sdb/Reports/explain.rb b/jena-sdb/Reports/explain.rb
index 49004be..1ae3b30 100644
--- a/jena-sdb/Reports/explain.rb
+++ b/jena-sdb/Reports/explain.rb
@@ -1,29 +1,29 @@
-#!/bin/env ruby
-# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-require 'format'
-
-columns=nil
-data=[]
-
-#ARGF.each do |line|
-# line.chomp!
-# v = line.split("\t")
-# if !columns
-# columns = v
-# else
-# data << v
-# end
-#end
-
-# Ruby has CSV
-require 'csv.rb'
-CSV::Reader.parse(ARGF) do |row|
- if !columns
- columns = row
- else
- data << row
- end
-end
-
-Fmt::table(columns, data)
+#!/bin/env ruby
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+require 'format'
+
+columns=nil
+data=[]
+
+#ARGF.each do |line|
+# line.chomp!
+# v = line.split("\t")
+# if !columns
+# columns = v
+# else
+# data << v
+# end
+#end
+
+# Ruby has CSV
+require 'csv.rb'
+CSV::Reader.parse(ARGF) do |row|
+ if !columns
+ columns = row
+ else
+ data << row
+ end
+end
+
+Fmt::table(columns, data)
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/Reports/format.rb
----------------------------------------------------------------------
diff --git a/jena-sdb/Reports/format.rb b/jena-sdb/Reports/format.rb
index 682710e..acc5b0c 100644
--- a/jena-sdb/Reports/format.rb
+++ b/jena-sdb/Reports/format.rb
@@ -1,41 +1,41 @@
-# Formatting utilities
-# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-module Fmt
- def Fmt.table(headings, body)
- widths = calc_widths(headings, body)
- widths = calc_widths(headings, body)
- # Make lines like column names
- lines = []
- headings.each_index { |i| lines<<"-"*(widths[i]) ; }
- lines2 = []
- headings.each_index { |i| lines2<<"="*(widths[i]) ; }
- print_row(lines, widths, "-", "+", "-", "+")
- print_row(headings, widths, " ", "|", "|", "|")
- print_row(lines2, widths, "=", "|", "|", "|")
- body.each { |row| print_row(row, widths, " ", "|", "|", "|") }
- print_row(lines, widths, "-", "+", "-", "+")
- end
-
- private
- def Fmt.calc_widths(columns, data)
- x = []
- columns.each { |c| x << c.length }
- data.each do |row|
- row.each_index { |i| x[i] = row[i].length if row[i].length > x[i] }
- end
- return x
- end
-
- def Fmt.print_row(items, widths, sep, left, mid, right)
- print left
- items.each_index do |i|
- print mid if i != 0
- print sep
- printf("%-*s",widths[i],items[i])
- print sep
- end
- print right
- print "\n"
- end
-end
+# Formatting utilities
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+module Fmt
+ def Fmt.table(headings, body)
+ widths = calc_widths(headings, body)
+ widths = calc_widths(headings, body)
+ # Make lines like column names
+ lines = []
+ headings.each_index { |i| lines<<"-"*(widths[i]) ; }
+ lines2 = []
+ headings.each_index { |i| lines2<<"="*(widths[i]) ; }
+ print_row(lines, widths, "-", "+", "-", "+")
+ print_row(headings, widths, " ", "|", "|", "|")
+ print_row(lines2, widths, "=", "|", "|", "|")
+ body.each { |row| print_row(row, widths, " ", "|", "|", "|") }
+ print_row(lines, widths, "-", "+", "-", "+")
+ end
+
+ private
+ def Fmt.calc_widths(columns, data)
+ x = []
+ columns.each { |c| x << c.length }
+ data.each do |row|
+ row.each_index { |i| x[i] = row[i].length if row[i].length > x[i] }
+ end
+ return x
+ end
+
+ def Fmt.print_row(items, widths, sep, left, mid, right)
+ print left
+ items.each_index do |i|
+ print mid if i != 0
+ print sep
+ printf("%-*s",widths[i],items[i])
+ print sep
+ end
+ print right
+ print "\n"
+ end
+end
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/Reports/jdbc.rb
----------------------------------------------------------------------
diff --git a/jena-sdb/Reports/jdbc.rb b/jena-sdb/Reports/jdbc.rb
index f90a16c..8b84f9a 100644
--- a/jena-sdb/Reports/jdbc.rb
+++ b/jena-sdb/Reports/jdbc.rb
@@ -1,139 +1,139 @@
-# = Module for handling JDBC Result Sets
-# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-require 'java'
-require 'format'
-include_class 'java.sql.DriverManager'
-
-module JDBC
-
-# == Class DB: a connection to a database / tablespace
- class DB
- attr_reader :conn
-
- def initialize(connection)
- @conn = connection ;
- end
-
- def DB.connect(url, driver, user, password)
- Java::JavaClass.for_name(driver) ;
- c = new(DriverManager.getConnection(url, user, password))
- return c
- end
-
- def query(queryString)
- s = @conn.createStatement()
- return Results.new(s.executeQuery(queryString))
- end
-
- def query_print(queryString)
- s = @conn.createStatement()
- rs = Results.new(s.executeQuery(queryString))
- rs.dump
- rs.close
- return nil
- end
-
- def close
- @conn.close()
- end
- end
-
- class Results
-
- def initialize(jdbcResultSet)
- @rs = jdbcResultSet
- end
-
- def each
- while(@rs.next)
- yield Row.new(@rs)
- end
- close
- end
-
- def close
- @rs.close
- end
-
- # All the cols (via their display name)
- def cols
- if !@columns
- md = @rs.getMetaData
- @columns=[]
- 1.upto(md.getColumnCount) { |i| @columns << md.getColumnLabel(i) }
- end
- return @columns
- end
-
- # All the rows, as an array of hashes (values are strings)
- def all_rows_hash
- x = []
- columns = cols
- each {|row| x << row.data(columns)}
- close
- return x
- end
-
- # All the rows, as an array of arrays
- def all_rows_array
- x = []
- each {|row| x << row.as_array }
- close
- return x
- end
-
- def dump
- # Order matters - must get columns before exhausting data and closing ResultSet
- columns = cols
- data = all_rows_array
- Fmt.table(columns, data)
- end
- end
-
- class Row
- def initialize(row)
- @row = row
- end
-
- # and it works for string name or integer index
- def [](name)
- return @row.getString(name)
- end
-
- def next
- raise "Error: calling close on a Row object"
- end
-
- def each
- len = @row.getMetaData.getColumnCount
- (1..len).each { |i| yield @row.getString(i) }
- end
-
- def as_array
- len = @row.getMetaData.getColumnCount
- x = []
- (1..len).each { |i| x << @row.getString(i) }
- return x
- end
-
- # Needs column names
- def data(cols)
- x = {}
- cols.each do |col|
- x[col] = @row.getString(col)
- if @row.wasNull
- x[col] = nil
- end
- end
- return x
- end
-
- # Direct any missing methods to the wrapped object
- def method_missing(methId, *args)
- meth = @row.method(methId)
- meth.call *args
- end
-
- end
-end
+# = Module for handling JDBC Result Sets
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+require 'java'
+require 'format'
+include_class 'java.sql.DriverManager'
+
+module JDBC
+
+# == Class DB: a connection to a database / tablespace
+ class DB
+ attr_reader :conn
+
+ def initialize(connection)
+ @conn = connection ;
+ end
+
+ def DB.connect(url, driver, user, password)
+ Java::JavaClass.for_name(driver) ;
+ c = new(DriverManager.getConnection(url, user, password))
+ return c
+ end
+
+ def query(queryString)
+ s = @conn.createStatement()
+ return Results.new(s.executeQuery(queryString))
+ end
+
+ def query_print(queryString)
+ s = @conn.createStatement()
+ rs = Results.new(s.executeQuery(queryString))
+ rs.dump
+ rs.close
+ return nil
+ end
+
+ def close
+ @conn.close()
+ end
+ end
+
+ class Results
+
+ def initialize(jdbcResultSet)
+ @rs = jdbcResultSet
+ end
+
+ def each
+ while(@rs.next)
+ yield Row.new(@rs)
+ end
+ close
+ end
+
+ def close
+ @rs.close
+ end
+
+ # All the cols (via their display name)
+ def cols
+ if !@columns
+ md = @rs.getMetaData
+ @columns=[]
+ 1.upto(md.getColumnCount) { |i| @columns << md.getColumnLabel(i) }
+ end
+ return @columns
+ end
+
+ # All the rows, as an array of hashes (values are strings)
+ def all_rows_hash
+ x = []
+ columns = cols
+ each {|row| x << row.data(columns)}
+ close
+ return x
+ end
+
+ # All the rows, as an array of arrays
+ def all_rows_array
+ x = []
+ each {|row| x << row.as_array }
+ close
+ return x
+ end
+
+ def dump
+ # Order matters - must get columns before exhausting data and closing ResultSet
+ columns = cols
+ data = all_rows_array
+ Fmt.table(columns, data)
+ end
+ end
+
+ class Row
+ def initialize(row)
+ @row = row
+ end
+
+ # and it works for string name or integer index
+ def [](name)
+ return @row.getString(name)
+ end
+
+ def next
+ raise "Error: calling close on a Row object"
+ end
+
+ def each
+ len = @row.getMetaData.getColumnCount
+ (1..len).each { |i| yield @row.getString(i) }
+ end
+
+ def as_array
+ len = @row.getMetaData.getColumnCount
+ x = []
+ (1..len).each { |i| x << @row.getString(i) }
+ return x
+ end
+
+ # Needs column names
+ def data(cols)
+ x = {}
+ cols.each do |col|
+ x[col] = @row.getString(col)
+ if @row.wasNull
+ x[col] = nil
+ end
+ end
+ return x
+ end
+
+ # Direct any missing methods to the wrapped object
+ def method_missing(methId, *args)
+ meth = @row.method(methId)
+ meth.call *args
+ end
+
+ end
+end
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/bin2/sdbscript
----------------------------------------------------------------------
diff --git a/jena-sdb/bin2/sdbscript b/jena-sdb/bin2/sdbscript
index 0b20a3b..82b1692 100755
--- a/jena-sdb/bin2/sdbscript
+++ b/jena-sdb/bin2/sdbscript
@@ -1,10 +1,10 @@
-#!/bin/bash
-# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if [ "$SDBROOT" = "" ]
-then
- echo "SDBROOT not set" 1>&2
- exit 1
- fi
-
+#!/bin/bash
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+if [ "$SDBROOT" = "" ]
+then
+ echo "SDBROOT not set" 1>&2
+ exit 1
+ fi
+
exec "${SDBROOT}/bin/sdbscript" "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml b/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
index bca78a9..b33d25b 100644
--- a/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
+++ b/jena-sdb/src/main/resources/org/apache/jena/sdb/sdb-properties.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<!-- Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<properties version="1.0">
- <comment>SDB System Properties</comment>
- <entry key="org.apache.jena.sdb.version">${project.version}</entry>
- <entry key="org.apache.jena.sdb.build.datetime">${build.time.xsd}</entry>
-</properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!-- Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -->
+
+<properties version="1.0">
+ <comment>SDB System Properties</comment>
+ <entry key="org.apache.jena.sdb.version">${project.version}</entry>
+ <entry key="org.apache.jena.sdb.build.datetime">${build.time.xsd}</entry>
+</properties>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/schema.xml
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/schema.xml b/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/schema.xml
index a5848ff..c6137a2 100644
--- a/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/schema.xml
+++ b/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/schema.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-<schema name="spatial" version="1.0">
-
- <fields>
-
- <field name="uri" type="string" indexed="true" stored="true" required="true" multiValued="false" />
-
- <field name="geo" type="location_rpt" indexed="true" stored="true" multiValued="true" />
-
- <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
- </fields>
-
-
- <!-- Field to use to determine and enforce document uniqueness.
- Unless this field is marked with required="false", it will be a required field
- -->
- <uniqueKey>uri</uniqueKey>
-
- <types>
- <!-- field type definitions. The "name" attribute is
- just a label to be used by field definitions. The "class"
- attribute and any other attributes determine the real
- behavior of the fieldType.
- Class names starting with "solr" refer to java classes in a
- standard package such as org.apache.solr.analysis
- -->
-
- <!-- The StrField type is not analyzed, but indexed/stored verbatim.
- It supports doc values but in that case the field needs to be
- single-valued and either required or have a default value.
- -->
- <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
-
- <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
- geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
-
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- </types>
-
-</schema>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<schema name="spatial" version="1.0">
+
+ <fields>
+
+ <field name="uri" type="string" indexed="true" stored="true" required="true" multiValued="false" />
+
+ <field name="geo" type="location_rpt" indexed="true" stored="true" multiValued="true" />
+
+ <field name="_version_" type="long" indexed="true" stored="true" multiValued="false" />
+ </fields>
+
+
+ <!-- Field to use to determine and enforce document uniqueness.
+ Unless this field is marked with required="false", it will be a required field
+ -->
+ <uniqueKey>uri</uniqueKey>
+
+ <types>
+ <!-- field type definitions. The "name" attribute is
+ just a label to be used by field definitions. The "class"
+ attribute and any other attributes determine the real
+ behavior of the fieldType.
+ Class names starting with "solr" refer to java classes in a
+ standard package such as org.apache.solr.analysis
+ -->
+
+ <!-- The StrField type is not analyzed, but indexed/stored verbatim.
+ It supports doc values but in that case the field needs to be
+ single-valued and either required or have a default value.
+ -->
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
+
+ <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
+ geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ </types>
+
+</schema>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/solrconfig.xml b/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/solrconfig.xml
index 55e4e46..01967fb 100644
--- a/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/solrconfig.xml
+++ b/jena-spatial/src/test/resources/SolrHome/SolrARQCollection/conf/solrconfig.xml
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<config>
-
- <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
-
-
-
- <!-- Request Handlers
-
- http://wiki.apache.org/solr/SolrRequestHandler
-
- Incoming queries will be dispatched to a specific handler by name
- based on the path specified in the request.
-
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
- If a Request Handler is declared with startup="lazy", then it will
- not be initialized until the first request that uses it.
-
- -->
- <!-- SearchHandler
-
- http://wiki.apache.org/solr/SearchHandler
-
- For processing Search Queries, the primary Request Handler
- provided with Solr is "SearchHandler" It delegates to a sequent
- of SearchComponents (see below) and supports distributed
- queries across multiple shards
- -->
- <requestHandler name="/select" class="solr.SearchHandler">
- </requestHandler>
-
- <!-- Update Request Handler.
-
- http://wiki.apache.org/solr/UpdateXmlMessages
-
- The canonical Request Handler for Modifying the Index through
- commands specified using XML, JSON, CSV, or JAVABIN
-
- Note: Since solr1.1 requestHandlers requires a valid content
- type header if posted in the body. For example, curl now
- requires: -H 'Content-type:text/xml; charset=utf-8'
-
- To override the request content type and force a specific
- Content-type, use the request parameter:
- ?update.contentType=text/csv
-
- This handler will pick a response format to match the input
- if the 'wt' parameter is not explicit
- -->
- <requestHandler name="/update" class="solr.UpdateRequestHandler">
- </requestHandler>
-
-</config>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+
+<config>
+
+ <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
+
+
+
+ <!-- Request Handlers
+
+ http://wiki.apache.org/solr/SolrRequestHandler
+
+ Incoming queries will be dispatched to a specific handler by name
+ based on the path specified in the request.
+
+ Legacy behavior: If the request path uses "/select" but no Request
+ Handler has that name, and if handleSelect="true" has been specified in
+ the requestDispatcher, then the Request Handler is dispatched based on
+ the qt parameter. Handlers without a leading '/' are accessed this way
+ like so: http://host/app/[core/]select?qt=name If no qt is
+ given, then the requestHandler that declares default="true" will be
+ used or the one named "standard".
+
+ If a Request Handler is declared with startup="lazy", then it will
+ not be initialized until the first request that uses it.
+
+ -->
+ <!-- SearchHandler
+
+ http://wiki.apache.org/solr/SearchHandler
+
+ For processing Search Queries, the primary Request Handler
+ provided with Solr is "SearchHandler" It delegates to a sequent
+ of SearchComponents (see below) and supports distributed
+ queries across multiple shards
+ -->
+ <requestHandler name="/select" class="solr.SearchHandler">
+ </requestHandler>
+
+ <!-- Update Request Handler.
+
+ http://wiki.apache.org/solr/UpdateXmlMessages
+
+ The canonical Request Handler for Modifying the Index through
+ commands specified using XML, JSON, CSV, or JAVABIN
+
+ Note: Since solr1.1 requestHandlers requires a valid content
+ type header if posted in the body. For example, curl now
+ requires: -H 'Content-type:text/xml; charset=utf-8'
+
+ To override the request content type and force a specific
+ Content-type, use the request parameter:
+ ?update.contentType=text/csv
+
+ This handler will pick a response format to match the input
+ if the 'wt' parameter is not explicit
+ -->
+ <requestHandler name="/update" class="solr.UpdateRequestHandler">
+ </requestHandler>
+
+</config>
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/SolrHome/solr.xml
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/SolrHome/solr.xml b/jena-spatial/src/test/resources/SolrHome/solr.xml
index 212e4b6..8d364d9 100644
--- a/jena-spatial/src/test/resources/SolrHome/solr.xml
+++ b/jena-spatial/src/test/resources/SolrHome/solr.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<solr persistent="true">
-<cores adminPath="/admin/cores" defaultCoreName="SolrARQCollection">
-<core name="SolrARQCollection" instanceDir="SolrARQCollection" >
-<property name="dataDir" value="../../../../../target/test/SolrARQCollection/data" />
-</core>
-</cores>
+<?xml version="1.0" encoding="UTF-8" ?>
+<solr persistent="true">
+<cores adminPath="/admin/cores" defaultCoreName="SolrARQCollection">
+<core name="SolrARQCollection" instanceDir="SolrARQCollection" >
+<property name="dataDir" value="../../../../../target/test/SolrARQCollection/data" />
+</core>
+</cores>
</solr>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/geoarq-data-1.ttl
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/geoarq-data-1.ttl b/jena-spatial/src/test/resources/geoarq-data-1.ttl
index 50242d7..f3b3ea2 100644
--- a/jena-spatial/src/test/resources/geoarq-data-1.ttl
+++ b/jena-spatial/src/test/resources/geoarq-data-1.ttl
@@ -1,86 +1,86 @@
-@prefix : <http://localhost/jena_example/#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-@prefix dbp: <http://dbpedia.org/resource/> .
-@prefix airports: <http://airports.dataincubator.org/airports/> .
-@prefix airports_sc: <http://airports.dataincubator.org/schema/> .
-
-@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-@prefix wkt: <http://www.opengis.net/ont/geosparql#> .
-
-airports:EGBB rdf:type airports_sc:LargeAirport ;
- geo:lat "52.4539"^^xsd:float ;
- geo:long "-1.74803"^^xsd:float ;
- rdfs:label "Birmingham International Airport"
- .
-
-airports:EGBB__Pair_1 rdf:type airports_sc:LargeAirport ;
- :latitude_1 "52.4539"^^xsd:float ;
- :longitude_1 "-1.74803"^^xsd:float ;
- rdfs:label "Birmingham International Airport (Pair_1)"
- .
-
-airports:EGBB_Pair_2 rdf:type airports_sc:LargeAirport ;
- :latitude_2 "52.4539"^^xsd:float ;
- :longitude_2 "-1.74803"^^xsd:float ;
- rdfs:label "Birmingham International Airport (Pair_2)"
- .
-
-airports:EGBB_WKT rdf:type airports_sc:LargeAirport ;
- wkt:asWKT "POINT(-1.74803 52.4539)"^^wkt:wktLiteral ;
- rdfs:label "Birmingham International Airport (wktLiteral)"
- .
-
-airports:EGBB_WKT_1 rdf:type airports_sc:LargeAirport ;
- :wkt_1 "POINT(-1.74803 52.4539)"^^wkt:wktLiteral ;
- rdfs:label "Birmingham International Airport (wktLiteral_1)"
- .
-
-airports:EGBB_WKT_2 rdf:type airports_sc:LargeAirport ;
- :wkt_2 "POINT(-1.74803 52.4539)"^^wkt:wktLiteral ;
- rdfs:label "Birmingham International Airport (wktLiteral_2)"
- .
-
-airports:EGBB_String rdf:type airports_sc:LargeAirport ;
- geo:lat "52.4539" ;
- geo:long "-1.74803" ;
- rdfs:label "Birmingham International Airport (String)"
- .
-
-airports:EGFF rdf:type airports_sc:LargeAirport ;
- geo:lat "51.3967"^^xsd:float ;
- geo:long "-3.34333"^^xsd:float ;
- rdfs:label "Cardiff International Airport"
- .
-
-airports:EGGD rdf:type airports_sc:LargeAirport ;
- geo:lat "51.3827"^^xsd:float ;
- geo:long "-2.71909"^^xsd:float ;
- rdfs:label "Bristol International Airport"
- .
-
-airports:EGKK rdf:type airports_sc:LargeAirport ;
- geo:lat "51.1481"^^xsd:float ;
- geo:long "-0.190278"^^xsd:float ;
- rdfs:label "London Gatwick Airport"
- .
-
-airports:EGSS rdf:type airports_sc:LargeAirport ;
- geo:lat "51.885"^^xsd:float ;
- geo:long "0.235"^^xsd:float ;
- rdfs:label "London Stansted Airport"
- .
-
-airports:EGBB_Fake_In_Box rdf:type airports_sc:LargeAirport ;
- wkt:asWKT "Polygon ((-2.0000 51.2000, 1.0000 51.2000, 1.0000 51.8000, -2.0000 51.8000, -2.0000 51.2000))"^^wkt:wktLiteral ;
- rdfs:label "Fake in Box Airport (wktLiteral)"
- .
-
-airports:EGBB_Fake_out_of_Box rdf:type airports_sc:LargeAirport ;
- wkt:asWKT "Polygon ((-2.0000 50.2000, 1.0000 50.2000, 1.0000 50.8000, -2.0000 50.8000, -2.0000 50.2000))"^^wkt:wktLiteral ;
- rdfs:label "Fake out of Box Airport (wktLiteral)"
- .
-
-
+@prefix : <http://localhost/jena_example/#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+@prefix dbp: <http://dbpedia.org/resource/> .
+@prefix airports: <http://airports.dataincubator.org/airports/> .
+@prefix airports_sc: <http://airports.dataincubator.org/schema/> .
+
+@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
+@prefix wkt: <http://www.opengis.net/ont/geosparql#> .
+
+airports:EGBB rdf:type airports_sc:LargeAirport ;
+ geo:lat "52.4539"^^xsd:float ;
+ geo:long "-1.74803"^^xsd:float ;
+ rdfs:label "Birmingham International Airport"
+ .
+
+airports:EGBB__Pair_1 rdf:type airports_sc:LargeAirport ;
+ :latitude_1 "52.4539"^^xsd:float ;
+ :longitude_1 "-1.74803"^^xsd:float ;
+ rdfs:label "Birmingham International Airport (Pair_1)"
+ .
+
+airports:EGBB_Pair_2 rdf:type airports_sc:LargeAirport ;
+ :latitude_2 "52.4539"^^xsd:float ;
+ :longitude_2 "-1.74803"^^xsd:float ;
+ rdfs:label "Birmingham International Airport (Pair_2)"
+ .
+
+airports:EGBB_WKT rdf:type airports_sc:LargeAirport ;
+ wkt:asWKT "POINT(-1.74803 52.4539)"^^wkt:wktLiteral ;
+ rdfs:label "Birmingham International Airport (wktLiteral)"
+ .
+
+airports:EGBB_WKT_1 rdf:type airports_sc:LargeAirport ;
+ :wkt_1 "POINT(-1.74803 52.4539)"^^wkt:wktLiteral ;
+ rdfs:label "Birmingham International Airport (wktLiteral_1)"
+ .
+
+airports:EGBB_WKT_2 rdf:type airports_sc:LargeAirport ;
+ :wkt_2 "POINT(-1.74803 52.4539)"^^wkt:wktLiteral ;
+ rdfs:label "Birmingham International Airport (wktLiteral_2)"
+ .
+
+airports:EGBB_String rdf:type airports_sc:LargeAirport ;
+ geo:lat "52.4539" ;
+ geo:long "-1.74803" ;
+ rdfs:label "Birmingham International Airport (String)"
+ .
+
+airports:EGFF rdf:type airports_sc:LargeAirport ;
+ geo:lat "51.3967"^^xsd:float ;
+ geo:long "-3.34333"^^xsd:float ;
+ rdfs:label "Cardiff International Airport"
+ .
+
+airports:EGGD rdf:type airports_sc:LargeAirport ;
+ geo:lat "51.3827"^^xsd:float ;
+ geo:long "-2.71909"^^xsd:float ;
+ rdfs:label "Bristol International Airport"
+ .
+
+airports:EGKK rdf:type airports_sc:LargeAirport ;
+ geo:lat "51.1481"^^xsd:float ;
+ geo:long "-0.190278"^^xsd:float ;
+ rdfs:label "London Gatwick Airport"
+ .
+
+airports:EGSS rdf:type airports_sc:LargeAirport ;
+ geo:lat "51.885"^^xsd:float ;
+ geo:long "0.235"^^xsd:float ;
+ rdfs:label "London Stansted Airport"
+ .
+
+airports:EGBB_Fake_In_Box rdf:type airports_sc:LargeAirport ;
+ wkt:asWKT "Polygon ((-2.0000 51.2000, 1.0000 51.2000, 1.0000 51.8000, -2.0000 51.8000, -2.0000 51.2000))"^^wkt:wktLiteral ;
+ rdfs:label "Fake in Box Airport (wktLiteral)"
+ .
+
+airports:EGBB_Fake_out_of_Box rdf:type airports_sc:LargeAirport ;
+ wkt:asWKT "Polygon ((-2.0000 50.2000, 1.0000 50.2000, 1.0000 50.8000, -2.0000 50.8000, -2.0000 50.2000))"^^wkt:wktLiteral ;
+ rdfs:label "Fake out of Box Airport (wktLiteral)"
+ .
+
+
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/spatial-config-spatialindexer.ttl
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/spatial-config-spatialindexer.ttl b/jena-spatial/src/test/resources/spatial-config-spatialindexer.ttl
index 8655092..e1fae4d 100644
--- a/jena-spatial/src/test/resources/spatial-config-spatialindexer.ttl
+++ b/jena-spatial/src/test/resources/spatial-config-spatialindexer.ttl
@@ -1,52 +1,52 @@
-## Example of a TDB dataset and spatial index
-
-@prefix : <http://localhost/jena_example/#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
-@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-@prefix spatial: <http://jena.apache.org/spatial#> .
-
-# Spatial
-[] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
-spatial:SpatialtDataset rdfs:subClassOf ja:RDFDataset .
-#spatial:SpatialIndexSolr rdfs:subClassOf spatial:SpatialIndex .
-spatial:SpatialIndexLucene rdfs:subClassOf spatial:SpatialIndex .
-
-## ---------------------------------------------------------------
-## This URI must be fixed - it's used to assemble the spatial dataset.
-
-:spatial_dataset rdf:type spatial:SpatialDataset ;
- spatial:dataset <#dataset> ;
- ##spaital:index <#indexSolr> ;
- spatial:index <#indexLucene> ;
- .
-
-<#dataset> rdf:type ja:RDFDataset ;
- ja:defaultGraph <#graph>;
- .
-
-<#graph> rdf:type ja:MemoryModel ;
- ja:content [ja:externalContent <file:geoarq-data-1.ttl> ] ;
- .
-
-<#indexLucene> a spatial:SpatialIndexLucene ;
- spatial:directory <file:Lucene> ;
- #spatial:directory "mem" ;
- spatial:definition <#definition> ;
- .
-
-<#definition> a spatial:EntityDefinition ;
- spatial:entityField "uri" ;
- spatial:geoField "geo" ;
- # custom geo predicates for 1) latitude/longitude
- spatial:hasSpatialPredicatePairs (
- [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
- [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
- ) ;
- # custom geo predicates for 2) Well Known Text Literal
- spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
- # custom SpatialContextFactory for 2) Well Known Text Literal
- spatial:spatialContextFactory
- "com.spatial4j.core.context.jts.JtsSpatialContextFactory"
- .
+## Example of a TDB dataset and spatial index
+
+@prefix : <http://localhost/jena_example/#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
+@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
+@prefix spatial: <http://jena.apache.org/spatial#> .
+
+# Spatial
+[] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
+spatial:SpatialtDataset rdfs:subClassOf ja:RDFDataset .
+#spatial:SpatialIndexSolr rdfs:subClassOf spatial:SpatialIndex .
+spatial:SpatialIndexLucene rdfs:subClassOf spatial:SpatialIndex .
+
+## ---------------------------------------------------------------
+## This URI must be fixed - it's used to assemble the spatial dataset.
+
+:spatial_dataset rdf:type spatial:SpatialDataset ;
+ spatial:dataset <#dataset> ;
+ ##spaital:index <#indexSolr> ;
+ spatial:index <#indexLucene> ;
+ .
+
+<#dataset> rdf:type ja:RDFDataset ;
+ ja:defaultGraph <#graph>;
+ .
+
+<#graph> rdf:type ja:MemoryModel ;
+ ja:content [ja:externalContent <file:geoarq-data-1.ttl> ] ;
+ .
+
+<#indexLucene> a spatial:SpatialIndexLucene ;
+ spatial:directory <file:Lucene> ;
+ #spatial:directory "mem" ;
+ spatial:definition <#definition> ;
+ .
+
+<#definition> a spatial:EntityDefinition ;
+ spatial:entityField "uri" ;
+ spatial:geoField "geo" ;
+ # custom geo predicates for 1) latitude/longitude
+ spatial:hasSpatialPredicatePairs (
+ [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
+ [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
+ ) ;
+ # custom geo predicates for 2) Well Known Text Literal
+ spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
+ # custom SpatialContextFactory for 2) Well Known Text Literal
+ spatial:spatialContextFactory
+ "com.spatial4j.core.context.jts.JtsSpatialContextFactory"
+ .
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/spatial-config.ttl
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/spatial-config.ttl b/jena-spatial/src/test/resources/spatial-config.ttl
index 0c90874..258c965 100644
--- a/jena-spatial/src/test/resources/spatial-config.ttl
+++ b/jena-spatial/src/test/resources/spatial-config.ttl
@@ -1,54 +1,54 @@
-## Example of a TDB dataset and spatial index
-
-@prefix : <http://localhost/jena_example/#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
-@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-@prefix spatial: <http://jena.apache.org/spatial#> .
-
-# TDB
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
-tdb:GraphTDB rdfs:subClassOf ja:Model .
-
-# Spatial
-[] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
-spatial:SpatialtDataset rdfs:subClassOf ja:RDFDataset .
-#spatial:SpatialIndexSolr rdfs:subClassOf spatial:SpatialIndex .
-spatial:SpatialIndexLucene rdfs:subClassOf spatial:SpatialIndex .
-
-## ---------------------------------------------------------------
-## This URI must be fixed - it's used to assemble the spatial dataset.
-
-:spatial_dataset rdf:type spatial:SpatialDataset ;
- spatial:dataset <#dataset> ;
- ##spaital:index <#indexSolr> ;
- spatial:index <#indexLucene> ;
- .
-
-<#dataset> rdf:type tdb:DatasetTDB ;
- tdb:location "--mem--" ;
- tdb:unionDefaultGraph true ;
- .
-
-<#indexLucene> a spatial:SpatialIndexLucene ;
- #spatial:directory <file:Lucene> ;
- spatial:directory "mem" ;
- spatial:definition <#definition> ;
- .
-
-<#definition> a spatial:EntityDefinition ;
- spatial:entityField "uri" ;
- spatial:geoField "geo" ;
- # custom geo predicates for 1) latitude/longitude
- spatial:hasSpatialPredicatePairs (
- [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
- [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
- ) ;
- # custom geo predicates for 2) Well Known Text Literal
- spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
- # custom SpatialContextFactory for 2) Well Known Text Literal
- spatial:spatialContextFactory
- "com.spatial4j.core.context.jts.JtsSpatialContextFactory"
- .
+## Example of a TDB dataset and spatial index
+
+@prefix : <http://localhost/jena_example/#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
+@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
+@prefix spatial: <http://jena.apache.org/spatial#> .
+
+# TDB
+[] ja:loadClass "org.apache.jena.tdb.TDB" .
+tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
+tdb:GraphTDB rdfs:subClassOf ja:Model .
+
+# Spatial
+[] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
+spatial:SpatialtDataset rdfs:subClassOf ja:RDFDataset .
+#spatial:SpatialIndexSolr rdfs:subClassOf spatial:SpatialIndex .
+spatial:SpatialIndexLucene rdfs:subClassOf spatial:SpatialIndex .
+
+## ---------------------------------------------------------------
+## This URI must be fixed - it's used to assemble the spatial dataset.
+
+:spatial_dataset rdf:type spatial:SpatialDataset ;
+ spatial:dataset <#dataset> ;
+ ##spaital:index <#indexSolr> ;
+ spatial:index <#indexLucene> ;
+ .
+
+<#dataset> rdf:type tdb:DatasetTDB ;
+ tdb:location "--mem--" ;
+ tdb:unionDefaultGraph true ;
+ .
+
+<#indexLucene> a spatial:SpatialIndexLucene ;
+ #spatial:directory <file:Lucene> ;
+ spatial:directory "mem" ;
+ spatial:definition <#definition> ;
+ .
+
+<#definition> a spatial:EntityDefinition ;
+ spatial:entityField "uri" ;
+ spatial:geoField "geo" ;
+ # custom geo predicates for 1) latitude/longitude
+ spatial:hasSpatialPredicatePairs (
+ [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
+ [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
+ ) ;
+ # custom geo predicates for 2) Well Known Text Literal
+ spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
+ # custom SpatialContextFactory for 2) Well Known Text Literal
+ spatial:spatialContextFactory
+ "com.spatial4j.core.context.jts.JtsSpatialContextFactory"
+ .
http://git-wip-us.apache.org/repos/asf/jena/blob/587c66ae/jena-spatial/src/test/resources/spatial-solr-config.ttl
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/resources/spatial-solr-config.ttl b/jena-spatial/src/test/resources/spatial-solr-config.ttl
index dfa0a33..b8f16ed 100644
--- a/jena-spatial/src/test/resources/spatial-solr-config.ttl
+++ b/jena-spatial/src/test/resources/spatial-solr-config.ttl
@@ -1,51 +1,51 @@
- ## Example of a TDB dataset and spatial index
-
-@prefix : <http://localhost/jena_example/#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
-@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
-@prefix spatial: <http://jena.apache.org/spatial#> .
-
-# TDB
-[] ja:loadClass "org.apache.jena.tdb.TDB" .
-tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
-tdb:GraphTDB rdfs:subClassOf ja:Model .
-
-# Spatial
-[] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
-spatial:SpatialDataset rdfs:subClassOf ja:RDFDataset .
-spatial:SpatialIndexSolr rdfs:subClassOf spatial:SpatialIndex .
-
-## ---------------------------------------------------------------
-## This URI must be fixed - it's used to assemble the spatial dataset.
-
-:spatial_dataset rdf:type spatial:SpatialDataset ;
- spatial:dataset <#dataset> ;
- spatial:index <#indexSolr> ;
- .
-
-<#dataset> rdf:type tdb:DatasetTDB ;
- tdb:location "--mem--" ;
- .
-
-<#indexSolr> a spatial:SpatialIndexSolr ;
- spatial:server <embedded:SolrARQCollection> ;
- spatial:solrHome <file:SolrHome> ;
- spatial:definition <#definition> ;
- .
-
-<#definition> a spatial:EntityDefinition ;
- spatial:entityField "uri" ;
- spatial:geoField "geo" ;
- # custom geo predicates for 1) latitude/longitude
- spatial:hasSpatialPredicatePairs (
- [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
- [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
- ) ;
- # custom geo predicates for 2) Well Known Text Literal
- spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
- # custom SpatialContextFactory for 2) Well Known Text Literal
- spatial:spatialContextFactory
- "com.spatial4j.core.context.jts.JtsSpatialContextFactory"
+ ## Example of a TDB dataset and spatial index
+
+@prefix : <http://localhost/jena_example/#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix tdb: <http://jena.hpl.hp.com/2008/tdb#> .
+@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
+@prefix spatial: <http://jena.apache.org/spatial#> .
+
+# TDB
+[] ja:loadClass "org.apache.jena.tdb.TDB" .
+tdb:DatasetTDB rdfs:subClassOf ja:RDFDataset .
+tdb:GraphTDB rdfs:subClassOf ja:Model .
+
+# Spatial
+[] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
+spatial:SpatialDataset rdfs:subClassOf ja:RDFDataset .
+spatial:SpatialIndexSolr rdfs:subClassOf spatial:SpatialIndex .
+
+## ---------------------------------------------------------------
+## This URI must be fixed - it's used to assemble the spatial dataset.
+
+:spatial_dataset rdf:type spatial:SpatialDataset ;
+ spatial:dataset <#dataset> ;
+ spatial:index <#indexSolr> ;
+ .
+
+<#dataset> rdf:type tdb:DatasetTDB ;
+ tdb:location "--mem--" ;
+ .
+
+<#indexSolr> a spatial:SpatialIndexSolr ;
+ spatial:server <embedded:SolrARQCollection> ;
+ spatial:solrHome <file:SolrHome> ;
+ spatial:definition <#definition> ;
+ .
+
+<#definition> a spatial:EntityDefinition ;
+ spatial:entityField "uri" ;
+ spatial:geoField "geo" ;
+ # custom geo predicates for 1) latitude/longitude
+ spatial:hasSpatialPredicatePairs (
+ [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
+ [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
+ ) ;
+ # custom geo predicates for 2) Well Known Text Literal
+ spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
+ # custom SpatialContextFactory for 2) Well Known Text Literal
+ spatial:spatialContextFactory
+ "com.spatial4j.core.context.jts.JtsSpatialContextFactory"
.
\ No newline at end of file