Repository: any23 Updated Branches: refs/heads/master 099076755 -> 04ea22f4c
ANY23-274 Change any23.microdata.ns.default configuration value to http://schema.org Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/a3631de0 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/a3631de0 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/a3631de0 Branch: refs/heads/master Commit: a3631de0e957424dab3cf1d0c1833017d7ccc6fc Parents: 73ce0c2 Author: Lewis John McGibbney <[email protected]> Authored: Fri Feb 19 11:16:12 2016 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Fri Feb 19 11:16:12 2016 -0800 ---------------------------------------------------------------------- api/src/main/resources/default-configuration.properties | 2 +- .../org/apache/any23/extractor/rdfa/example-rdfa11.html | 10 +++++----- .../apache/any23/extractor/ExtractionParametersTest.java | 2 +- src/site/apt/configuration.apt | 2 +- .../resources/application/xhtml/blank-file-header.xhtml | 2 +- .../resources/html/rdfa/ansa_2010-02-26_12645863.html | 2 +- .../resources/html/rdfa/goodrelations-rdfa10-expected.nq | 8 ++++---- .../test/resources/html/rdfa/goodrelations-rdfa10.html | 2 +- .../test/resources/html/rdfa/goodrelations-rdfa11.html | 2 +- .../resources/microdata/microdata-nested-expected.nquads | 8 ++++---- .../org/apache/any23/validator/invalid-rdfa-about.html | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/api/src/main/resources/default-configuration.properties ---------------------------------------------------------------------- diff --git a/api/src/main/resources/default-configuration.properties b/api/src/main/resources/default-configuration.properties index 21fda6f..ed0c7ca 100644 --- a/api/src/main/resources/default-configuration.properties +++ b/api/src/main/resources/default-configuration.properties @@ -62,7 +62,7 @@ any23.plugin.dirs=./plugins # to build URIs for anonymous properties any23.microdata.strict=off # ---- Microdata default namespace. -any23.microdata.ns.default=http://rdf.data-vocabulary.org/ +any23.microdata.ns.default=http://schema.org/ # Allows to enable(on)/disable(off) the registration # of HTMLMetaExtractor.java to http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/core/src/main/resources/org/apache/any23/extractor/rdfa/example-rdfa11.html ---------------------------------------------------------------------- diff --git a/core/src/main/resources/org/apache/any23/extractor/rdfa/example-rdfa11.html b/core/src/main/resources/org/apache/any23/extractor/rdfa/example-rdfa11.html index b559c24..f6504a4 100644 --- a/core/src/main/resources/org/apache/any23/extractor/rdfa/example-rdfa11.html +++ b/core/src/main/resources/org/apache/any23/extractor/rdfa/example-rdfa11.html @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. --> -<div xmlns:v="http://rdf.data-vocabulary.org/#"; typeof="v:Review"> +<div xmlns:v="http://schema.org/"; typeof="v:Review"> <span property="v:itemreviewed">LâAmourita Pizza</span> Reviewed by - <span property="v:reviewer">Ulysses Grant</span> on - <span property="v:dtreviewed" content="2009-01-06">Jan 6</span>. + <span property="v:author">Ulysses Grant</span> on + <span property="v:dateCreated" content="2009-01-06">Jan 6</span>. <span property="v:summary">Delicious, tasty pizza on Eastlake!</span> - <span property="v:description">L'Amourita serves up traditional wood-fired + <span property="v:about">L'Amourita serves up traditional wood-fired Neapolitan-style pizza, brought to your table promptly and without fuss. An ideal neighborhood pizza joint.</span> Rating: - <span property="v:rating">4.5</span> + <span property="v:reviewRating">4.5</span> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/core/src/test/java/org/apache/any23/extractor/ExtractionParametersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/any23/extractor/ExtractionParametersTest.java b/core/src/test/java/org/apache/any23/extractor/ExtractionParametersTest.java index 507d29e..eabbb88 100644 --- a/core/src/test/java/org/apache/any23/extractor/ExtractionParametersTest.java +++ b/core/src/test/java/org/apache/any23/extractor/ExtractionParametersTest.java @@ -33,7 +33,7 @@ public class ExtractionParametersTest { extractionParameters.getFlag("any23.microdata.strict") ); Assert.assertEquals( - "http://rdf.data-vocabulary.org/";, + "http://schema.org/";, extractionParameters.getProperty("any23.microdata.ns.default") ); } http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/src/site/apt/configuration.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/configuration.apt b/src/site/apt/configuration.apt index 7685cdf..a6b532d 100644 --- a/src/site/apt/configuration.apt +++ b/src/site/apt/configuration.apt @@ -119,7 +119,7 @@ any23.extract(extractionParameters, "http://path/to/doc";, tripleHandler); *-------------------------------------------+-------------------------------+------------------------------------------------------------------------------------+ |any23.microdata.strict |on (possible values: on/off) |Activates/deactivates the microdata strict validation. | *-------------------------------------------+-------------------------------+------------------------------------------------------------------------------------+ -|any23.microdata.ns.default |http://rdf.data-vocabulary.org/|Microdata default namespace. | +|any23.microdata.ns.default |http://schema.org/|Microdata default namespace. | *-------------------------------------------+-------------------------------+------------------------------------------------------------------------------------+ |any23.extraction.head.meta |on (possible values: on/off) |Activates/deactivates the HTMLMetaExtractor. | *-------------------------------------------+-------------------------------+------------------------------------------------------------------------------------+ http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/application/xhtml/blank-file-header.xhtml ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/application/xhtml/blank-file-header.xhtml b/test-resources/src/test/resources/application/xhtml/blank-file-header.xhtml index c619624..ef24fef 100644 --- a/test-resources/src/test/resources/application/xhtml/blank-file-header.xhtml +++ b/test-resources/src/test/resources/application/xhtml/blank-file-header.xhtml @@ -1292,7 +1292,7 @@ document.write('<scr'+'ipt src="http://ad.doubleclick.net/adj/rt.movies/movielan <div class="template_wrapper"> - <div xmlns:v="http://rdf.data-vocabulary.org/#"; typeof="v:Movie"> + <div xmlns:v="http://schema.org/#"; typeof="v:Movie"> <div class="col_679 col_left main"> <div id="movie_info_main" class="content "> http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/html/rdfa/ansa_2010-02-26_12645863.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/html/rdfa/ansa_2010-02-26_12645863.html b/test-resources/src/test/resources/html/rdfa/ansa_2010-02-26_12645863.html index 3924479..edcb03c 100644 --- a/test-resources/src/test/resources/html/rdfa/ansa_2010-02-26_12645863.html +++ b/test-resources/src/test/resources/html/rdfa/ansa_2010-02-26_12645863.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";><html xml:lang="en" version="XHTML+RDFa 1.0" xmlns:ni="http://iptc.org/std/nar/2006-10-01/"; xmlns:okkam="http://models.okkam.org/ENS-core-vocabulary.owl#"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:foaf="http://xmlns.com/foaf/0.1/"; xmlns:ansa="http://bdm.ansa.it/NewsML-G2/ns/content"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; xmlns:v="http://rdf.data-vocabulary.org/#"; xmlns:dc="http://purl.org/dc/terms/"; xmlns:ninitf="http://iptc.org/std/NITF/2006-10-18/"; xmlns="http://www.w3.org/1999/xhtml";> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";><html xml:lang="en" version="XHTML+RDFa 1.0" xmlns:ni="http://iptc.org/std/nar/2006-10-01/"; xmlns:okkam="http://models.okkam.org/ENS-core-vocabulary.owl#"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:foaf="http://xmlns.com/foaf/0.1/"; xmlns:ansa="http://bdm.ansa.it/NewsML-G2/ns/content"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; xmlns:v="http://schema.org/#"; xmlns:dc="http://purl.org/dc/terms/"; xmlns:ninitf="http://iptc.org/std/NITF/2006-10-18/"; xmlns="http://www.w3.org/1999/xhtml";> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10-expected.nq ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10-expected.nq b/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10-expected.nq index eb24cd3..cb141b9 100644 --- a/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10-expected.nq +++ b/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10-expected.nq @@ -16,10 +16,10 @@ # <http://bob.example.com/#offer> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://purl.org/goodrelations/v1#Offering> <http://bob.example.com/> . -_:node16dssb0gtx1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://rdf.data-vocabulary.org/#Review-aggregate> <http://bob.example.com/> . -<http://bob.example.com/#offer> <http://rdf.data-vocabulary.org/#hasReview> _:node16dssb0gtx1 <http://bob.example.com/> . -_:node16dssb0gtx1 <http://rdf.data-vocabulary.org/#rating> "4.4"@en <http://bob.example.com/> . -_:node16dssb0gtx1 <http://rdf.data-vocabulary.org/#count> "89"@en <http://bob.example.com/> . +_:node16dssb0gtx1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/#Review-aggregate> <http://bob.example.com/> . +<http://bob.example.com/#offer> <http://schema.org/#hasReview> _:node16dssb0gtx1 <http://bob.example.com/> . +_:node16dssb0gtx1 <http://schema.org/#rating> "4.4"@en <http://bob.example.com/> . +_:node16dssb0gtx1 <http://schema.org/#count> "89"@en <http://bob.example.com/> . <http://www.heppnetz.de/rdfa4google/company.html#business> <http://purl.org/goodrelations/v1#offers> <http://bob.example.com/#offer> <http://bob.example.com/> . <http://bob.example.com/#offer> <http://purl.org/goodrelations/v1#name> "Canon Rebel T2i (EOS 550D)"@en <http://bob.example.com/> . <http://bob.example.com/#offer> <http://purl.org/goodrelations/v1#description> "The Rebel T2i EOS 550D is Canon's top-of-the-line digital SLR camera."@en <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10.html b/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10.html index 6ba3168..69c5873 100644 --- a/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10.html +++ b/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa10.html @@ -31,7 +31,7 @@ xmlns:gr="http://purl.org/goodrelations/v1#"; xmlns:xsd="http://www.w3.org/2001/XMLSchema#"; xmlns:review="http://purl.org/stuff/rev#"; - xmlns:v="http://rdf.data-vocabulary.org/#";> + xmlns:v="http://schema.org/#";> <h1>Canon Offer</h1> <span about="#offer" typeof="gr:Offering"> http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa11.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa11.html b/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa11.html index 08a758d..3743b48 100644 --- a/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa11.html +++ b/test-resources/src/test/resources/html/rdfa/goodrelations-rdfa11.html @@ -25,7 +25,7 @@ <p><strong>Expected behavior in Google Rich Snippets:</strong> RENDER, SHOULD VALIDATE (ignore additional content)</p> <p>This page contains several additional elements from GoodRelations and uses proper RDFa datatyping. It should be as valid as the official rich snippets example.</p> -<div prefix="foaf: http://xmlns.com/foaf/0.1/ gr: http://purl.org/goodrelations/v1# xsd: http://www.w3.org/2001/XMLSchema# review: http://purl.org/stuff/rev# v: http://rdf.data-vocabulary.org/#";> +<div prefix="foaf: http://xmlns.com/foaf/0.1/ gr: http://purl.org/goodrelations/v1# xsd: http://www.w3.org/2001/XMLSchema# review: http://purl.org/stuff/rev# v: http://schema.org/#";> <h1>Canon Offer</h1> <span about="#offer" typeof="gr:Offering"> http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads b/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads index 2626def..fa6686d 100644 --- a/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads +++ b/test-resources/src/test/resources/microdata/microdata-nested-expected.nquads @@ -15,10 +15,10 @@ # limitations under the License. # -_:node3e103839c5eaa86c975e26a96157bf2 <http://rdf.data-vocabulary.org/name> "Jazz Band" <http://bob.example.com/> . -_:node3e103839c5eaa86c975e26a96157bf2 <http://rdf.data-vocabulary.org/size> "12" <http://bob.example.com/> . -_:node70664686c06639b5211a24a9cf34f99 <http://rdf.data-vocabulary.org/band> _:node3e103839c5eaa86c975e26a96157bf2 <http://bob.example.com/> . -_:node70664686c06639b5211a24a9cf34f99 <http://rdf.data-vocabulary.org/name> "Amanda" <http://bob.example.com/> . +_:node3e103839c5eaa86c975e26a96157bf2 <http://schema.org/name> "Jazz Band" <http://bob.example.com/> . +_:node3e103839c5eaa86c975e26a96157bf2 <http://schema.org/size> "12" <http://bob.example.com/> . +_:node70664686c06639b5211a24a9cf34f99 <http://schema.org/band> _:node3e103839c5eaa86c975e26a96157bf2 <http://bob.example.com/> . +_:node70664686c06639b5211a24a9cf34f99 <http://schema.org/name> "Amanda" <http://bob.example.com/> . <http://bob.example.com/> <http://www.w3.org/1999/xhtml/microdata#item> _:node70664686c06639b5211a24a9cf34f99 <http://bob.example.com/> . _:nodea2c65a1b5a43d4ac4bd93b3216f5f7d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Movie> <http://bob.example.com/> . _:nodea2c65a1b5a43d4ac4bd93b3216f5f7d <http://schema.org/Movie/name> "Avatar" <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/a3631de0/test-resources/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html b/test-resources/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html index 9420b31..39ce144 100644 --- a/test-resources/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html +++ b/test-resources/src/test/resources/org/apache/any23/validator/invalid-rdfa-about.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";><html xml:lang="en" version="XHTML+RDFa 1.0" xmlns:ni="http://iptc.org/std/nar/2006-10-01/"; xmlns:okkam="http://models.okkam.org/ENS-core-vocabulary.owl#"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:foaf="http://xmlns.com/foaf/0.1/"; xmlns:ansa="http://bdm.ansa.it/NewsML-G2/ns/content"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; xmlns:v="http://rdf.data-vocabulary.org/#"; xmlns:dc="http://purl.org/dc/terms/"; xmlns:ninitf="http://iptc.org/std/NITF/2006-10-18/"; xmlns="http://www.w3.org/1999/xhtml";> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";><html xml:lang="en" version="XHTML+RDFa 1.0" xmlns:ni="http://iptc.org/std/nar/2006-10-01/"; xmlns:okkam="http://models.okkam.org/ENS-core-vocabulary.owl#"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:foaf="http://xmlns.com/foaf/0.1/"; xmlns:ansa="http://bdm.ansa.it/NewsML-G2/ns/content"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; xmlns:v="http://schema.org/#"; xmlns:dc="http://purl.org/dc/terms/"; xmlns:ninitf="http://iptc.org/std/NITF/2006-10-18/"; xmlns="http://www.w3.org/1999/xhtml";> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with
