You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by an...@apache.org on 2017/01/13 22:25:51 UTC
[12/25] any23 git commit: ANY23-276 : Convert from Sesame to RDF4J
ANY23-276 : Convert from Sesame to RDF4J
Signed-off-by: Peter Ansell <p_...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/445d13ab
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/445d13ab
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/445d13ab
Branch: refs/heads/master
Commit: 445d13ab978d2fd327cc3f726a8c6b5edadcbd90
Parents: bb55685
Author: Peter Ansell <p_...@yahoo.com>
Authored: Mon Aug 1 20:50:17 2016 -0400
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Thu Dec 15 10:58:46 2016 +1100
----------------------------------------------------------------------
api/pom.xml | 10 +-
.../main/java/org/apache/any23/cli/Tool.java | 1 +
.../any23/configuration/Configuration.java | 2 +-
.../apache/any23/encoding/EncodingDetector.java | 2 +-
.../any23/extractor/ExtractionContext.java | 28 +-
.../any23/extractor/ExtractionParameters.java | 2 +-
.../any23/extractor/ExtractionResult.java | 14 +-
.../org/apache/any23/extractor/Extractor.java | 4 +-
.../any23/extractor/ExtractorFactory.java | 2 +-
.../org/apache/any23/extractor/IssueReport.java | 16 +-
.../apache/any23/plugin/Any23PluginManager.java | 2 +-
.../java/org/apache/any23/rdf/Prefixes.java | 50 +-
.../org/apache/any23/source/DocumentSource.java | 6 +-
.../main/java/org/apache/any23/vocab/CSV.java | 18 +-
.../java/org/apache/any23/vocab/DCTerms.java | 18 +-
.../main/java/org/apache/any23/vocab/DOAC.java | 68 +-
.../main/java/org/apache/any23/vocab/DOAP.java | 100 +--
.../main/java/org/apache/any23/vocab/FOAF.java | 132 ++--
.../java/org/apache/any23/vocab/GeoNames.java | 8 +-
.../main/java/org/apache/any23/vocab/HCard.java | 80 +--
.../java/org/apache/any23/vocab/HEntry.java | 32 +-
.../java/org/apache/any23/vocab/HEvent.java | 24 +-
.../main/java/org/apache/any23/vocab/HItem.java | 10 +-
.../java/org/apache/any23/vocab/HListing.java | 90 +--
.../java/org/apache/any23/vocab/HProduct.java | 22 +-
.../java/org/apache/any23/vocab/HRecipe.java | 46 +-
.../java/org/apache/any23/vocab/HResume.java | 18 +-
.../main/java/org/apache/any23/vocab/ICAL.java | 340 +++++-----
.../org/apache/any23/vocab/LKIFCoreAction.java | 52 +-
.../apache/any23/vocab/LKIFCoreExpression.java | 132 ++--
.../apache/any23/vocab/LKIFCoreLegalAction.java | 46 +-
.../apache/any23/vocab/LKIFCoreLegalRole.java | 8 +-
.../apache/any23/vocab/LKIFCoreMereology.java | 40 +-
.../org/apache/any23/vocab/LKIFCoreNorm.java | 134 ++--
.../org/apache/any23/vocab/LKIFCoreProcess.java | 38 +-
.../any23/vocab/LKIFCoreRelativePlaces.java | 42 +-
.../org/apache/any23/vocab/LKIFCoreRole.java | 26 +-
.../org/apache/any23/vocab/LKIFCoreRules.java | 16 +-
.../org/apache/any23/vocab/LKIFCoreTime.java | 32 +-
.../any23/vocab/LKIFCoreTimeModification.java | 114 ++--
.../org/apache/any23/vocab/LKIFCoreTop.java | 14 +-
.../main/java/org/apache/any23/vocab/OGP.java | 62 +-
.../java/org/apache/any23/vocab/Programme.java | 178 ++---
.../java/org/apache/any23/vocab/Review.java | 40 +-
.../org/apache/any23/vocab/ReviewAggregate.java | 20 +-
.../java/org/apache/any23/vocab/SINDICE.java | 22 +-
.../main/java/org/apache/any23/vocab/VCard.java | 132 ++--
.../java/org/apache/any23/vocab/Vocabulary.java | 101 ++-
.../main/java/org/apache/any23/vocab/WO.java | 178 ++---
.../main/java/org/apache/any23/vocab/XFN.java | 62 +-
.../main/java/org/apache/any23/vocab/XHTML.java | 10 +-
.../org/apache/any23/writer/TripleHandler.java | 16 +-
.../org/apache/any23/writer/WriterFactory.java | 2 +-
.../resources/default-configuration.properties | 8 +-
core/pom.xml | 56 +-
core/src/main/java/org/apache/any23/Any23.java | 64 +-
.../org/apache/any23/cli/MicrodataParser.java | 4 +-
.../java/org/apache/any23/cli/MimeDetector.java | 4 +-
.../org/apache/any23/cli/PluginVerifier.java | 2 -
.../main/java/org/apache/any23/cli/Rover.java | 16 +-
.../java/org/apache/any23/cli/VocabPrinter.java | 11 +-
.../any23/extractor/ExampleInputOutput.java | 6 +-
.../any23/extractor/ExtractionResultImpl.java | 28 +-
.../any23/extractor/ExtractorRegistryImpl.java | 11 +-
.../extractor/SingleDocumentExtraction.java | 69 +-
.../extractor/TagSoupExtractionResult.java | 6 +-
.../any23/extractor/csv/CSVExtractor.java | 93 ++-
.../any23/extractor/html/AdrExtractor.java | 4 +-
.../extractor/html/EmbeddedJSONLDExtractor.java | 46 +-
.../html/EntityBasedMicroformatExtractor.java | 4 +-
.../any23/extractor/html/GeoExtractor.java | 4 +-
.../extractor/html/HCalendarExtractor.java | 18 +-
.../any23/extractor/html/HCardExtractor.java | 32 +-
.../any23/extractor/html/HListingExtractor.java | 26 +-
.../any23/extractor/html/HRecipeExtractor.java | 16 +-
.../any23/extractor/html/HResumeExtractor.java | 6 +-
.../html/HReviewAggregateExtractor.java | 12 +-
.../any23/extractor/html/HReviewExtractor.java | 10 +-
.../any23/extractor/html/HTMLDocument.java | 30 +-
.../any23/extractor/html/HTMLMetaExtractor.java | 88 +--
.../any23/extractor/html/HeadLinkExtractor.java | 14 +-
.../any23/extractor/html/ICBMExtractor.java | 14 +-
.../any23/extractor/html/LicenseExtractor.java | 10 +-
.../extractor/html/MicroformatExtractor.java | 52 +-
.../any23/extractor/html/SpeciesExtractor.java | 12 +-
.../any23/extractor/html/TagSoupParser.java | 28 +-
.../any23/extractor/html/TitleExtractor.java | 6 +-
.../extractor/html/TurtleHTMLExtractor.java | 30 +-
.../any23/extractor/html/XFNExtractor.java | 30 +-
.../html/microformats2/HAdrExtractor.java | 8 +-
.../html/microformats2/HCardExtractor.java | 29 +-
.../html/microformats2/HEntryExtractor.java | 22 +-
.../html/microformats2/HEventExtractor.java | 17 +-
.../html/microformats2/HGeoExtractor.java | 4 +-
.../html/microformats2/HItemExtractor.java | 12 +-
.../html/microformats2/HProductExtractor.java | 18 +-
.../html/microformats2/HRecipeExtractor.java | 10 +-
.../html/microformats2/HResumeExtractor.java | 14 +-
.../extractor/microdata/ItemPropValue.java | 2 +-
.../extractor/microdata/MicrodataExtractor.java | 155 +++--
.../any23/extractor/rdf/BaseRDFExtractor.java | 12 +-
.../any23/extractor/rdf/JSONLDExtractor.java | 2 +-
.../any23/extractor/rdf/NQuadsExtractor.java | 2 +-
.../any23/extractor/rdf/NTriplesExtractor.java | 2 +-
.../any23/extractor/rdf/RDFHandlerAdapter.java | 14 +-
.../any23/extractor/rdf/RDFParserFactory.java | 51 +-
.../any23/extractor/rdf/RDFXMLExtractor.java | 2 +-
.../any23/extractor/rdf/TriXExtractor.java | 2 +-
.../any23/extractor/rdf/TurtleExtractor.java | 2 +-
.../any23/extractor/rdfa/RDFa11Extractor.java | 2 +-
.../any23/extractor/rdfa/RDFa11Parser.java | 272 ++++----
.../any23/extractor/rdfa/RDFaExtractor.java | 2 +-
.../any23/extractor/rdfa/XSLTStylesheet.java | 2 +-
.../any23/extractor/xpath/QuadTemplate.java | 10 +-
.../any23/extractor/xpath/TemplateGraph.java | 12 +-
.../any23/extractor/xpath/TemplateObject.java | 15 +-
.../extractor/xpath/TemplatePredicate.java | 12 +-
.../any23/extractor/xpath/TemplateSubject.java | 10 +-
.../xpath/TemplateXPathExtractionRuleImpl.java | 4 +-
.../org/apache/any23/extractor/xpath/Term.java | 2 +-
.../extractor/xpath/XPathExtractionRule.java | 8 +-
.../any23/extractor/xpath/XPathExtractor.java | 6 +-
.../any23/filter/ExtractionContextBlocker.java | 24 +-
.../any23/filter/IgnoreAccidentalRDFa.java | 17 +-
.../filter/IgnoreTitlesOfEmptyDocuments.java | 16 +-
.../apache/any23/http/DefaultHTTPClient.java | 14 +-
.../java/org/apache/any23/http/HTTPClient.java | 20 +-
.../any23/rdf/Any23ValueFactoryWrapper.java | 77 ++-
.../org/apache/any23/rdf/PopularPrefixes.java | 12 +-
.../java/org/apache/any23/rdf/RDFUtils.java | 238 ++++---
.../any23/source/ByteArrayDocumentSource.java | 14 +-
.../apache/any23/source/FileDocumentSource.java | 6 +-
.../apache/any23/source/HTTPDocumentSource.java | 6 +-
.../org/apache/any23/source/MemCopyFactory.java | 2 +-
.../any23/source/StringDocumentSource.java | 2 +-
.../org/apache/any23/validator/DOMDocument.java | 4 +-
.../any23/validator/DefaultDOMDocument.java | 14 +-
.../any23/validator/DefaultValidator.java | 4 +-
.../org/apache/any23/validator/Validator.java | 5 +-
.../any23/validator/rule/AboutNotURIRule.java | 4 +-
.../org/apache/any23/vocab/RDFSchemaUtils.java | 26 +-
.../any23/writer/BenchmarkTripleHandler.java | 16 +-
.../any23/writer/CompositeTripleHandler.java | 16 +-
.../any23/writer/CountingTripleHandler.java | 12 +-
.../org/apache/any23/writer/JSONWriter.java | 41 +-
.../apache/any23/writer/JSONWriterFactory.java | 2 +-
.../any23/writer/LoggingTripleHandler.java | 20 +-
.../org/apache/any23/writer/NQuadsWriter.java | 4 +-
.../any23/writer/NQuadsWriterFactory.java | 2 +-
.../org/apache/any23/writer/NTriplesWriter.java | 2 +-
.../any23/writer/NTriplesWriterFactory.java | 2 +-
.../any23/writer/RDFWriterTripleHandler.java | 18 +-
.../org/apache/any23/writer/RDFXMLWriter.java | 2 +-
.../any23/writer/RDFXMLWriterFactory.java | 2 +-
.../any23/writer/ReportingTripleHandler.java | 18 +-
.../apache/any23/writer/RepositoryWriter.java | 32 +-
.../org/apache/any23/writer/TriXWriter.java | 2 +-
.../apache/any23/writer/TriXWriterFactory.java | 2 +-
.../org/apache/any23/writer/TurtleWriter.java | 2 +-
.../any23/writer/TurtleWriterFactory.java | 2 +-
.../org/apache/any23/writer/URIListWriter.java | 14 +-
.../any23/writer/URIListWriterFactory.java | 2 +-
.../org/apache/any23/extractor/rdfa/rdfa.xslt | 12 +-
.../test/java/org/apache/any23/Any23Test.java | 25 +-
.../test/java/org/apache/any23/SesameTest.java | 12 +-
.../java/org/apache/any23/cli/RoverTest.java | 6 +-
.../any23/extractor/ExtractionAPITest.java | 4 +-
.../extractor/ExtractionResultImplTest.java | 20 +-
.../any23/extractor/MockTripleHandler.java | 40 +-
.../extractor/SingleDocumentExtractionTest.java | 38 +-
.../any23/extractor/csv/CSVExtractorTest.java | 39 +-
.../extractor/example/ExampleExtractor.java | 8 +-
.../html/AbstractExtractorTestCase.java | 94 +--
.../any23/extractor/html/AdrExtractorTest.java | 6 +-
.../html/EmbeddedJSONLDExtractorTest.java | 3 -
.../extractor/html/HCalendarExtractorTest.java | 55 +-
.../extractor/html/HCardExtractorTest.java | 90 ++-
.../extractor/html/HListingExtractorTest.java | 51 +-
.../extractor/html/HRecipeExtractorTest.java | 3 +-
.../extractor/html/HResumeExtractorTest.java | 11 +-
.../extractor/html/HReviewExtractorTest.java | 20 +-
.../any23/extractor/html/HTMLFixture.java | 4 +-
.../extractor/html/HTMLMetaExtractorTest.java | 19 +-
.../extractor/html/HeadLinkExtractorTest.java | 26 +-
.../extractor/html/LicenseExtractorTest.java | 30 +-
.../any23/extractor/html/RDFMergerTest.java | 44 +-
.../extractor/html/SpeciesExtractorTest.java | 4 +-
.../any23/extractor/html/TagSoupParserTest.java | 4 +-
.../extractor/html/TitleExtractorTest.java | 14 +-
.../extractor/html/TurtleHTMLExtractorTest.java | 5 +-
.../any23/extractor/html/XFNExtractorTest.java | 44 +-
.../html/microformats2/HAdrExtractorTest.java | 4 +-
.../html/microformats2/HCardExtractorTest.java | 4 +-
.../html/microformats2/HEntryExtractorTest.java | 4 +-
.../html/microformats2/HEventExtractorTest.java | 4 +-
.../html/microformats2/HGeoExtractorTest.java | 10 +-
.../html/microformats2/HItemExtractorTest.java | 4 +-
.../microformats2/HProductExtractorTest.java | 4 +-
.../microformats2/HRecipeExtractorTest.java | 4 +-
.../microformats2/HResumeExtractorTest.java | 4 +-
.../microdata/MicrodataExtractorTest.java | 20 +-
.../microdata/MicrodataParserTest.java | 9 +-
.../extractor/rdf/JSONLDExtractorTest.java | 7 +-
.../extractor/rdf/TurtleExtractorTest.java | 4 +-
.../rdfa/AbstractRDFaExtractorTestCase.java | 60 +-
.../extractor/rdfa/ExtractionExceptionTest.java | 11 +-
.../extractor/rdfa/RDFa11ExtractorTest.java | 64 +-
.../any23/extractor/rdfa/RDFa11ParserTest.java | 8 +-
.../any23/extractor/rdfa/RDFaExtractorTest.java | 14 +-
.../TemplateXPathExtractorRuleImplTest.java | 32 +-
.../filter/ExtractionContextBlockerTest.java | 24 +-
.../any23/filter/IgnoreAccidentalRDFaTest.java | 28 +-
.../any23/plugin/Any23PluginManagerTest.java | 1 -
.../java/org/apache/any23/rdf/PrefixesTest.java | 44 +-
.../java/org/apache/any23/rdf/RDFUtilsTest.java | 20 +-
.../apache/any23/util/DiscoveryUtilsTest.java | 4 +-
.../any23/validator/DefaultValidatorTest.java | 10 +-
.../apache/any23/vocab/RDFSchemaUtilsTest.java | 2 +-
.../org/apache/any23/vocab/VocabularyTest.java | 42 +-
.../org/apache/any23/writer/JSONWriterTest.java | 39 +-
.../apache/any23/writer/WriterRegistryTest.java | 1 -
csvutils/pom.xml | 2 +-
encoding/pom.xml | 2 +-
mime/pom.xml | 19 +-
.../any23/mime/NaiveMIMETypeDetector.java | 11 +-
.../apache/any23/mime/TikaMIMETypeDetector.java | 22 +-
.../org/apache/any23/mime/mimetypes.xml | 3 +-
.../any23/mime/TikaMIMETypeDetectorTest.java | 4 +-
nquads/pom.xml | 131 ----
.../apache/any23/io/nquads/NQuadsParser.java | 52 --
.../any23/io/nquads/NQuadsParserFactory.java | 43 --
.../apache/any23/io/nquads/NQuadsWriter.java | 40 --
.../any23/io/nquads/NQuadsWriterFactory.java | 49 --
.../apache/any23/io/nquads/package-info.java | 22 -
.../any23/io/nquads/NQuadsParserTest.java | 654 -------------------
.../any23/io/nquads/NQuadsWriterTest.java | 177 -----
nquads/src/test/resources/log4j.properties | 35 -
plugins/basic-crawler/pom.xml | 10 +-
.../main/java/org/apache/any23/cli/Crawler.java | 4 +-
.../java/org/apache/any23/cli/CrawlerTest.java | 8 +-
plugins/html-scraper/pom.xml | 8 +-
.../htmlscraper/HTMLScraperExtractor.java | 32 +-
.../htmlscraper/HTMLScraperExtractorTest.java | 18 +-
.../html-scraper-extractor-test.html | 6 +-
plugins/integration-test/pom.xml | 2 +-
plugins/office-scraper/pom.xml | 8 +-
.../plugin/officescraper/ExcelExtractor.java | 86 ++-
.../main/java/org/apache/any23/vocab/Excel.java | 32 +-
.../officescraper/ExcelExtractorTest.java | 18 +-
pom.xml | 91 ++-
service/pom.xml | 7 +-
.../java/org/apache/any23/servlet/Servlet.java | 28 +-
service/src/main/resources/form.html | 12 +-
.../org/apache/any23/servlet/ServletTest.java | 62 +-
src/site/apt/configuration.apt | 2 +-
src/site/apt/dev-csv-extractor.apt | 6 +-
src/site/apt/dev-data-conversion.apt | 6 +-
src/site/apt/dev-microformat-extractors.apt | 2 +-
src/site/apt/getting-started.apt | 4 +-
src/site/apt/service.apt | 8 +-
test-resources/pom.xml | 2 +-
.../application/rdfa/london-gazette.html | 2 +-
.../test/resources/application/rdfa/mic.xhtml | 2 +-
.../src/test/resources/application/rdfn3/test1 | 2 +-
.../src/test/resources/application/rdfxml/test1 | 2 +-
.../src/test/resources/application/turtle/test1 | 2 +-
.../test/resources/application/xhtml/index.html | 4 +-
.../src/test/resources/application/xhtml/test1 | 4 +-
.../test/resources/html/mixed/01-xfn-foaf.html | 2 +-
.../html/rdfa/ansa_2010-02-26_12645863.html | 2 +-
.../resources/html/rdfa/rdfa-issue186-2.xhtml | 4 +-
.../microformats/hcard/infinite-loop.html | 2 +-
.../microformats/hcard/performance.html | 2 +-
.../any23/extractor/rdf/embedded_json-ld.html | 2 +-
274 files changed, 3409 insertions(+), 4555 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index ca4e6f5..f467ac8 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>apache-any23</artifactId>
<groupId>org.apache.any23</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -36,12 +36,12 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-model</artifactId>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-model</artifactId>
</dependency>
<dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-rio-api</artifactId>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-rio-api</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/cli/Tool.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/cli/Tool.java b/api/src/main/java/org/apache/any23/cli/Tool.java
index e4d6dc2..b25a029 100644
--- a/api/src/main/java/org/apache/any23/cli/Tool.java
+++ b/api/src/main/java/org/apache/any23/cli/Tool.java
@@ -26,6 +26,7 @@ public interface Tool {
/**
* Runs the tool and retrieves the exit code.
+ * @throws Exception if there is an error running the tool.
*/
void run() throws Exception;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/configuration/Configuration.java b/api/src/main/java/org/apache/any23/configuration/Configuration.java
index 83e0685..d280f37 100644
--- a/api/src/main/java/org/apache/any23/configuration/Configuration.java
+++ b/api/src/main/java/org/apache/any23/configuration/Configuration.java
@@ -33,7 +33,7 @@ public interface Configuration {
* Checks whether a property is defined or not in configuration.
*
* @param propertyName name of property to check.
- * @return <i>true</i> if defined, <i>false</i> otherwise.
+ * @return <code>true</code> if defined, <code>false</code> otherwise.
*/
boolean defineProperty(String propertyName);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/encoding/EncodingDetector.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/encoding/EncodingDetector.java b/api/src/main/java/org/apache/any23/encoding/EncodingDetector.java
index 28faa9c..9e4cf2b 100644
--- a/api/src/main/java/org/apache/any23/encoding/EncodingDetector.java
+++ b/api/src/main/java/org/apache/any23/encoding/EncodingDetector.java
@@ -33,7 +33,7 @@ public interface EncodingDetector {
* @param input the input stream containing the data.
* @return a string compliant to
* <a href="http://www.iana.org/assignments/character-sets">IANA Charset Specification</a>.
- * @throws IOException if there is an errorwhilst guessing the encoding.
+ * @throws IOException if there is an error whilst guessing the encoding.
*/
String guessEncoding(InputStream input) throws IOException;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/extractor/ExtractionContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/extractor/ExtractionContext.java b/api/src/main/java/org/apache/any23/extractor/ExtractionContext.java
index 77e5672..b144b5b 100644
--- a/api/src/main/java/org/apache/any23/extractor/ExtractionContext.java
+++ b/api/src/main/java/org/apache/any23/extractor/ExtractionContext.java
@@ -17,7 +17,7 @@
package org.apache.any23.extractor;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* This class provides the context for the processing of
@@ -33,9 +33,9 @@ public class ExtractionContext {
private final String extractorName;
/**
- * URI of the document.
+ * IRI of the document.
*/
- private final URI documentURI;
+ private final IRI documentIRI;
/**
* The document default language.
@@ -47,29 +47,29 @@ public class ExtractionContext {
*/
private final String uniqueID;
- public ExtractionContext(String extractorName, URI documentURI, String defaultLanguage, String localID) {
+ public ExtractionContext(String extractorName, IRI documentIRI, String defaultLanguage, String localID) {
checkNotNull(extractorName , "extractor name");
- checkNotNull(documentURI , "document URI");
+ checkNotNull(documentIRI , "document IRI");
this.extractorName = extractorName;
- this.documentURI = documentURI;
+ this.documentIRI = documentIRI;
this.defaultLanguage = defaultLanguage;
this.uniqueID =
"urn:x-any23:" + extractorName + ":" +
- (localID == null ? "" : localID) + ":" + documentURI;
+ (localID == null ? "" : localID) + ":" + documentIRI;
}
- public ExtractionContext(String extractorName, URI documentURI, String defaultLanguage) {
- this(extractorName, documentURI, defaultLanguage, ROOT_EXTRACTION_RESULT_ID);
+ public ExtractionContext(String extractorName, IRI documentIRI, String defaultLanguage) {
+ this(extractorName, documentIRI, defaultLanguage, ROOT_EXTRACTION_RESULT_ID);
}
- public ExtractionContext(String extractorName, URI documentURI) {
- this(extractorName, documentURI, null);
+ public ExtractionContext(String extractorName, IRI documentIRI) {
+ this(extractorName, documentIRI, null);
}
public ExtractionContext copy(String localID) {
return new ExtractionContext(
getExtractorName(),
- getDocumentURI(),
+ getDocumentIRI(),
getDefaultLanguage(),
localID
);
@@ -79,8 +79,8 @@ public class ExtractionContext {
return extractorName;
}
- public URI getDocumentURI() {
- return documentURI;
+ public IRI getDocumentIRI() {
+ return documentIRI;
}
public String getDefaultLanguage() {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/extractor/ExtractionParameters.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/extractor/ExtractionParameters.java b/api/src/main/java/org/apache/any23/extractor/ExtractionParameters.java
index 6189686..2bd7e2b 100644
--- a/api/src/main/java/org/apache/any23/extractor/ExtractionParameters.java
+++ b/api/src/main/java/org/apache/any23/extractor/ExtractionParameters.java
@@ -44,7 +44,7 @@ public class ExtractionParameters {
public static final String METADATA_TIMESIZE_FLAG = "any23.extraction.metadata.timesize";
- public static final String EXTRACTION_CONTEXT_URI_PROPERTY = "any23.extraction.context.uri";
+ public static final String EXTRACTION_CONTEXT_IRI_PROPERTY = "any23.extraction.context.iri";
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/extractor/ExtractionResult.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/extractor/ExtractionResult.java b/api/src/main/java/org/apache/any23/extractor/ExtractionResult.java
index 6c0a06b..22ebf08 100644
--- a/api/src/main/java/org/apache/any23/extractor/ExtractionResult.java
+++ b/api/src/main/java/org/apache/any23/extractor/ExtractionResult.java
@@ -17,9 +17,9 @@
package org.apache.any23.extractor;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Value;
/**
* Interface defining the methods that a representation of an extraction result must have.
@@ -35,7 +35,7 @@ public interface ExtractionResult extends IssueReport {
* @param o object
* @param g graph
*/
- void writeTriple(Resource s, URI p, Value o, URI g);
+ void writeTriple(Resource s, IRI p, Value o, IRI g);
/**
* Write a triple.
@@ -45,15 +45,15 @@ public interface ExtractionResult extends IssueReport {
* @param p predicate
* @param o object
*/
- void writeTriple(Resource s, URI p, Value o);
+ void writeTriple(Resource s, IRI p, Value o);
/**
* Write a namespace.
*
* @param prefix the prefix of the namespace
- * @param uri the long URI identifying the namespace
+ * @param IRI the long IRI identifying the namespace
*/
- void writeNamespace(String prefix, String uri);
+ void writeNamespace(String prefix, String IRI);
/**
* <p>Close the result.</p>
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/extractor/Extractor.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/extractor/Extractor.java b/api/src/main/java/org/apache/any23/extractor/Extractor.java
index 016d898..2d34084 100644
--- a/api/src/main/java/org/apache/any23/extractor/Extractor.java
+++ b/api/src/main/java/org/apache/any23/extractor/Extractor.java
@@ -17,7 +17,7 @@
package org.apache.any23.extractor;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
import org.w3c.dom.Document;
import java.io.IOException;
@@ -34,7 +34,7 @@ public interface Extractor<Input> {
* This interface specializes an {@link Extractor} able to handle
* {@link java.net.URI} as input format. Use it if you need to fetch a document before the extraction
*/
- public interface BlindExtractor extends Extractor<URI> {
+ public interface BlindExtractor extends Extractor<IRI> {
}
/**
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/extractor/ExtractorFactory.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/extractor/ExtractorFactory.java b/api/src/main/java/org/apache/any23/extractor/ExtractorFactory.java
index fd42324..6746490 100644
--- a/api/src/main/java/org/apache/any23/extractor/ExtractorFactory.java
+++ b/api/src/main/java/org/apache/any23/extractor/ExtractorFactory.java
@@ -44,7 +44,7 @@ public interface ExtractorFactory<T extends Extractor<?>> extends ExtractorDescr
/**
* An example input file for the extractor, to be used in auto-generated
* documentation. For the {@link Extractor.BlindExtractor},
- * this is an arbitrary URI.
+ * this is an arbitrary IRI.
* For extractors that require content, it is the name of a file, relative
* to the factory's class file's location, it will be opened using
* factory.getClass().getResourceAsStream(filename). The example should be
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/extractor/IssueReport.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/extractor/IssueReport.java b/api/src/main/java/org/apache/any23/extractor/IssueReport.java
index 6a2615c..04cb998 100644
--- a/api/src/main/java/org/apache/any23/extractor/IssueReport.java
+++ b/api/src/main/java/org/apache/any23/extractor/IssueReport.java
@@ -35,7 +35,7 @@ public interface IssueReport {
* @param row issue row.
* @param col issue column.
*/
- void notifyIssue(IssueLevel level, String msg, int row, int col);
+ void notifyIssue(IssueLevel level, String msg, long row, long col);
/**
* Prints out the content of the report.
@@ -55,9 +55,9 @@ public interface IssueReport {
* Possible issue levels.
*/
enum IssueLevel {
- Warning,
- Error,
- Fatal
+ WARNING,
+ ERROR,
+ FATAL
}
/**
@@ -67,9 +67,9 @@ public interface IssueReport {
private IssueLevel level;
private String message;
- private int row, col;
+ private long row, col;
- Issue(IssueLevel l, String msg, int r, int c) {
+ Issue(IssueLevel l, String msg, long r, long c) {
level = l;
message = msg;
row = r;
@@ -84,11 +84,11 @@ public interface IssueReport {
return message;
}
- public int getRow() {
+ public long getRow() {
return row;
}
- public int getCol() {
+ public long getCol() {
return col;
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/plugin/Any23PluginManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/plugin/Any23PluginManager.java b/api/src/main/java/org/apache/any23/plugin/Any23PluginManager.java
index 16ccc29..5898210 100644
--- a/api/src/main/java/org/apache/any23/plugin/Any23PluginManager.java
+++ b/api/src/main/java/org/apache/any23/plugin/Any23PluginManager.java
@@ -352,7 +352,7 @@ public class Any23PluginManager {
/**
* Returns an extractor group containing both the default extractors declared by the
* {@link org.apache.any23.extractor.ExtractorRegistry} and the {@link ExtractorPlugin}s.
- * @param registry TODO
+ * @param registry an {@link org.apache.any23.extractor.ExtractorRegistry}
* @param pluginLocations optional list of plugin locations.
*
* @return a not <code>null</code> and not empty extractor group.
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/rdf/Prefixes.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/rdf/Prefixes.java b/api/src/main/java/org/apache/any23/rdf/Prefixes.java
index 0da4ce2..706dc69 100644
--- a/api/src/main/java/org/apache/any23/rdf/Prefixes.java
+++ b/api/src/main/java/org/apache/any23/rdf/Prefixes.java
@@ -17,8 +17,8 @@
package org.apache.any23.rdf;
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.ValueFactoryImpl;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import java.util.Collections;
import java.util.HashMap;
@@ -28,7 +28,7 @@ import java.util.Map.Entry;
import java.util.Set;
/**
- * A mapping from prefixes to namespace URIs. Supports "volatile mappings",
+ * A mapping from prefixes to namespace IRIs. Supports "volatile mappings",
* which will be overwritten without notice when mappings are merged,
* while for normal mappings this causes an exception. This allows
* combining "hard" mappings (which must be retained or something breaks)
@@ -39,15 +39,15 @@ import java.util.Set;
*/
public class Prefixes {
- public static Prefixes create1(String prefix, String namespaceURI) {
+ public static Prefixes create1(String prefix, String namespaceIRI) {
Prefixes result = new Prefixes();
- result.add(prefix, namespaceURI);
+ result.add(prefix, namespaceIRI);
return result;
}
- public static Prefixes createFromMap(Map<String, String> prefixesToNamespaceURIs, boolean areVolatile) {
+ public static Prefixes createFromMap(Map<String, String> prefixesToNamespaceIRIs, boolean areVolatile) {
Prefixes result = new Prefixes();
- for (Entry<String, String> entry : prefixesToNamespaceURIs.entrySet()) {
+ for (Entry<String, String> entry : prefixesToNamespaceIRIs.entrySet()) {
if (areVolatile) {
result.addVolatile(entry.getKey(), entry.getValue());
} else {
@@ -75,13 +75,13 @@ public class Prefixes {
this.mappings = mappings;
}
- public URI expand(String curie) {
+ public IRI expand(String curie) {
String prefix = parsePrefix(curie);
if (prefix == null || !hasPrefix(prefix)) {
return null;
}
- return ValueFactoryImpl.getInstance().createURI(
- getNamespaceURIFor(prefix) + parseLocalName(curie));
+ return SimpleValueFactory.getInstance().createIRI(
+ getNamespaceIRIFor(prefix) + parseLocalName(curie));
}
public String abbreviate(String uri) {
@@ -108,11 +108,11 @@ public class Prefixes {
return false;
}
- public String getNamespaceURIFor(String prefix) {
+ public String getNamespaceIRIFor(String prefix) {
return mappings.get(prefix);
}
- public boolean hasNamespaceURI(String uri) {
+ public boolean hasNamespaceIRI(String uri) {
return mappings.containsValue(uri);
}
@@ -128,28 +128,28 @@ public class Prefixes {
return mappings.isEmpty();
}
- public void add(String prefix, String namespaceURI) {
+ public void add(String prefix, String namespaceIRI) {
if (isVolatile(prefix)) {
volatilePrefixes.remove(prefix);
} else {
if (hasPrefix(prefix)) {
- if (getNamespaceURIFor(prefix).equals(namespaceURI)) {
- return; // re-assigned same prefix to same URI, let's just ignore it
+ if (getNamespaceIRIFor(prefix).equals(namespaceIRI)) {
+ return; // re-assigned same prefix to same IRI, let's just ignore it
}
throw new IllegalStateException("Attempted to re-assign prefix '" + prefix +
- "'; clashing values '" + getNamespaceURIFor(prefix) + "' and '" +
- namespaceURI);
+ "'; clashing values '" + getNamespaceIRIFor(prefix) + "' and '" +
+ namespaceIRI);
}
}
- mappings.put(prefix, namespaceURI);
+ mappings.put(prefix, namespaceIRI);
}
public void add(Prefixes other) {
for (String otherPrefix : other.allPrefixes()) {
if (other.isVolatile(otherPrefix)) {
- addVolatile(otherPrefix, other.getNamespaceURIFor(otherPrefix));
+ addVolatile(otherPrefix, other.getNamespaceIRIFor(otherPrefix));
} else {
- add(otherPrefix, other.getNamespaceURIFor(otherPrefix));
+ add(otherPrefix, other.getNamespaceIRIFor(otherPrefix));
}
}
}
@@ -163,24 +163,24 @@ public class Prefixes {
Prefixes result = new Prefixes();
for (String prefix : prefixes) {
if (!hasPrefix(prefix)) {
- throw new IllegalArgumentException("No namespace URI declared for prefix " + prefix);
+ throw new IllegalArgumentException("No namespace IRI declared for prefix " + prefix);
}
- result.add(prefix, getNamespaceURIFor(prefix));
+ result.add(prefix, getNamespaceIRIFor(prefix));
}
return result;
}
- public void addVolatile(String prefix, String namespaceURI) {
+ public void addVolatile(String prefix, String namespaceIRI) {
if (hasPrefix(prefix)) {
return; // new prefix is volatile, so we don't overwrite the old one
}
- mappings.put(prefix, namespaceURI);
+ mappings.put(prefix, namespaceIRI);
volatilePrefixes.add(prefix);
}
public void addVolatile(Prefixes other) {
for (String otherPrefix : other.allPrefixes()) {
- addVolatile(otherPrefix, other.getNamespaceURIFor(otherPrefix));
+ addVolatile(otherPrefix, other.getNamespaceIRIFor(otherPrefix));
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/source/DocumentSource.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/source/DocumentSource.java b/api/src/main/java/org/apache/any23/source/DocumentSource.java
index 7c180a3..9980da8 100644
--- a/api/src/main/java/org/apache/any23/source/DocumentSource.java
+++ b/api/src/main/java/org/apache/any23/source/DocumentSource.java
@@ -49,12 +49,12 @@ public interface DocumentSource {
public long getContentLength();
/**
- * @return the actual, final, canonical URI if redirects occur.
+ * @return the actual, final, canonical IRI if redirects occur.
*/
- public String getDocumentURI();
+ public String getDocumentIRI();
/**
- * A value of <tt>false</tt> indicates that the document
+ * A value of <i>false</i> indicates that the document
* resides remotely, and that multiple successive accesses
* to it should be avoided by copying it to local storage.
* This can also be used for sources that do not support
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/CSV.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/CSV.java b/api/src/main/java/org/apache/any23/vocab/CSV.java
index 180d1e6..4325bf6 100644
--- a/api/src/main/java/org/apache/any23/vocab/CSV.java
+++ b/api/src/main/java/org/apache/any23/vocab/CSV.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* This vocabulary models the structure of a <i>CSV</i> file
@@ -43,32 +43,32 @@ public class CSV extends Vocabulary {
* This property links the identifier of a <i>CSV</i> to an entity representing
* a row.
*/
- public final URI row = createProperty(ROW);
+ public final IRI row = createProperty(ROW);
/**
* This property expresses the index of a row in a <i>CSV</i> file.
*/
- public final URI rowPosition = createProperty(ROW_POSITION);
+ public final IRI rowPosition = createProperty(ROW_POSITION);
/**
* This property expresses the number of rows in a <i>CSV</i> file.
*/
- public final URI numberOfRows = createProperty(NUMBER_OF_ROWS);
+ public final IRI numberOfRows = createProperty(NUMBER_OF_ROWS);
/**
* This property expresses the number of columns in a <i>CSV</i> file.
*/
- public final URI numberOfColumns = createProperty(NUMBER_OF_COLUMNS);
+ public final IRI numberOfColumns = createProperty(NUMBER_OF_COLUMNS);
/**
* This resource identifies a <i>Row</i>.
*/
- public final URI rowType = createResource(ROW_TYPE);
+ public final IRI rowType = createResource(ROW_TYPE);
/**
* This property expresses the index of a column in a <i>CSV</i> file.
*/
- public final URI columnPosition = createProperty(COLUMN_POSITION);
+ public final IRI columnPosition = createProperty(COLUMN_POSITION);
/**
* The namespace of the vocabulary as a string.
@@ -88,7 +88,7 @@ public class CSV extends Vocabulary {
return instance;
}
- public URI createResource(String localName) {
+ public IRI createResource(String localName) {
return createProperty(NS, localName);
}
@@ -97,7 +97,7 @@ public class CSV extends Vocabulary {
* @param localName name to assign to namespace.
* @return the new URI instance.
*/
- public URI createProperty(String localName) {
+ public IRI createProperty(String localName) {
return createProperty(NS, localName);
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/DCTerms.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/DCTerms.java b/api/src/main/java/org/apache/any23/vocab/DCTerms.java
index 5e1fffc..eff8cfe 100644
--- a/api/src/main/java/org/apache/any23/vocab/DCTerms.java
+++ b/api/src/main/java/org/apache/any23/vocab/DCTerms.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* The <i>DCTERMS</i> vocabulary.
@@ -28,19 +28,19 @@ public class DCTerms extends Vocabulary {
public static final String NS = "http://purl.org/dc/terms/";
// Properties
- public final URI license = createProperty(NS, "license");
- public final URI title = createProperty(NS, "title" );
- public final URI creator = createProperty(NS, "creator");
- public final URI related = createProperty(NS, "related");
- public final URI date = createProperty(NS, "date" );
- public final URI source = createProperty(NS, "source" );
-
- private static DCTerms instance;
+ public final IRI license = createProperty(NS, "license");
+ public final IRI title = createProperty(NS, "title" );
+ public final IRI creator = createProperty(NS, "creator");
+ public final IRI related = createProperty(NS, "related");
+ public final IRI date = createProperty(NS, "date" );
+ public final IRI source = createProperty(NS, "source" );
private DCTerms(){
super(NS);
}
+ private static DCTerms instance;
+
public static DCTerms getInstance() {
if(instance == null) {
instance = new DCTerms();
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/DOAC.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/DOAC.java b/api/src/main/java/org/apache/any23/vocab/DOAC.java
index 75b008d..fcb00c4 100644
--- a/api/src/main/java/org/apache/any23/vocab/DOAC.java
+++ b/api/src/main/java/org/apache/any23/vocab/DOAC.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* The <a href="http://ramonantonio.net/doac/0.1/">Description Of A Career</a> vocabulary.
@@ -36,41 +36,41 @@ public class DOAC extends Vocabulary {
}
// Properties.
- public final URI summary = createProperty(NS, "summary");
- public final URI end_date = createProperty(NS, "end-date");
- public final URI publication = createProperty(NS, "publication");
- public final URI title = createProperty(NS, "title");
- public final URI reference = createProperty(NS, "reference");
- public final URI language = createProperty(NS, "language");
- public final URI experience = createProperty(NS, "experience");
- public final URI organization = createProperty(NS, "organization");
- public final URI affiliation = createProperty(NS, "affiliation");
- public final URI writes = createProperty(NS, "writes");
- public final URI start_date = createProperty(NS, "start-date");
- public final URI education = createProperty(NS, "education");
- public final URI skill = createProperty(NS, "skill");
- public final URI referer = createProperty(NS, "referer");
- public final URI isco88_code = createProperty(NS, "isco88-code");
- public final URI speaks = createProperty(NS, "speaks");
- public final URI reads = createProperty(NS, "reads");
- public final URI reference_type = createProperty(NS, "reference-type");
+ public final IRI summary = createProperty(NS, "summary");
+ public final IRI end_date = createProperty(NS, "end-date");
+ public final IRI publication = createProperty(NS, "publication");
+ public final IRI title = createProperty(NS, "title");
+ public final IRI reference = createProperty(NS, "reference");
+ public final IRI language = createProperty(NS, "language");
+ public final IRI experience = createProperty(NS, "experience");
+ public final IRI organization = createProperty(NS, "organization");
+ public final IRI affiliation = createProperty(NS, "affiliation");
+ public final IRI writes = createProperty(NS, "writes");
+ public final IRI start_date = createProperty(NS, "start-date");
+ public final IRI education = createProperty(NS, "education");
+ public final IRI skill = createProperty(NS, "skill");
+ public final IRI referer = createProperty(NS, "referer");
+ public final IRI isco88_code = createProperty(NS, "isco88-code");
+ public final IRI speaks = createProperty(NS, "speaks");
+ public final IRI reads = createProperty(NS, "reads");
+ public final IRI reference_type = createProperty(NS, "reference-type");
// Resources.
- public final URI Publication = createClass(NS, "Publication");
- public final URI Education = createClass(NS, "Education");
- public final URI OrganisationalSkill = createClass(NS, "OrganisationalSkill");
- public final URI PrimarySchool = createClass(NS, "PrimarySchool");
- public final URI Reference = createClass(NS, "Reference");
- public final URI DrivingSkill = createClass(NS, "DrivingSkill");
- public final URI Degree = createClass(NS, "Degree");
- public final URI LanguageSkill = createClass(NS, "LanguageSkill");
- public final URI Skill = createClass(NS, "Skill");
- public final URI SecondarySchool = createClass(NS, "SecondarySchool");
- public final URI Course = createClass(NS, "Course");
- public final URI Experience = createClass(NS, "Experience");
- public final URI SocialSkill = createClass(NS, "SocialSkill");
- public final URI ComputerSkill = createClass(NS, "ComputerSkill");
- public final URI LanguageLevel = createClass(NS, "LanguageLevel");
+ public final IRI Publication = createClass(NS, "Publication");
+ public final IRI Education = createClass(NS, "Education");
+ public final IRI OrganisationalSkill = createClass(NS, "OrganisationalSkill");
+ public final IRI PrimarySchool = createClass(NS, "PrimarySchool");
+ public final IRI Reference = createClass(NS, "Reference");
+ public final IRI DrivingSkill = createClass(NS, "DrivingSkill");
+ public final IRI Degree = createClass(NS, "Degree");
+ public final IRI LanguageSkill = createClass(NS, "LanguageSkill");
+ public final IRI Skill = createClass(NS, "Skill");
+ public final IRI SecondarySchool = createClass(NS, "SecondarySchool");
+ public final IRI Course = createClass(NS, "Course");
+ public final IRI Experience = createClass(NS, "Experience");
+ public final IRI SocialSkill = createClass(NS, "SocialSkill");
+ public final IRI ComputerSkill = createClass(NS, "ComputerSkill");
+ public final IRI LanguageLevel = createClass(NS, "LanguageLevel");
private DOAC(){
super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/DOAP.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/DOAP.java b/api/src/main/java/org/apache/any23/vocab/DOAP.java
index 4735a81..485ca15 100644
--- a/api/src/main/java/org/apache/any23/vocab/DOAP.java
+++ b/api/src/main/java/org/apache/any23/vocab/DOAP.java
@@ -16,7 +16,7 @@
*/
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* The <a href="https://github.com/edumbill/doap/wiki">Description Of A Project</a> vocabulary.
@@ -37,57 +37,57 @@ public class DOAP extends Vocabulary {
}
//Resources
- public final URI Project = createClass(NS, "Project");
- public final URI Version = createClass(NS, "Version");
- public final URI Specification = createClass(NS, "Specification");
- public final URI Repository = createClass(NS, "Repository");
- public final URI SVNRepository = createClass(NS, "SVNRepository");
- public final URI BKRepository = createClass(NS, "BKRepository");
- public final URI CVSRepository = createClass(NS, "CVSRepository");
- public final URI ArchRepository = createClass(NS, "ArchRepository");
- public final URI BazaarBranch = createClass(NS, "BazaarBranch");
- public final URI GitRepository = createClass(NS, "GitRepository");
- public final URI HgRepository = createClass(NS, "HgRepository");
- public final URI DarcsRepository = createClass(NS, "DarcsRepository");
+ public final IRI Project = createClass(NS, "Project");
+ public final IRI Version = createClass(NS, "Version");
+ public final IRI Specification = createClass(NS, "Specification");
+ public final IRI Repository = createClass(NS, "Repository");
+ public final IRI SVNRepository = createClass(NS, "SVNRepository");
+ public final IRI BKRepository = createClass(NS, "BKRepository");
+ public final IRI CVSRepository = createClass(NS, "CVSRepository");
+ public final IRI ArchRepository = createClass(NS, "ArchRepository");
+ public final IRI BazaarBranch = createClass(NS, "BazaarBranch");
+ public final IRI GitRepository = createClass(NS, "GitRepository");
+ public final IRI HgRepository = createClass(NS, "HgRepository");
+ public final IRI DarcsRepository = createClass(NS, "DarcsRepository");
//Properties
- public final URI name = createProperty(NS, "name");
- public final URI homepage = createProperty(NS, "homepage");
- public final URI old_homepage = createProperty(NS, "old-homepage");
- public final URI created = createProperty(NS, "created");
- public final URI shortdesc = createProperty(NS, "shortdesc");
- public final URI description = createProperty(NS, "description");
- public final URI release = createProperty(NS, "release");
- public final URI mailing_list = createProperty(NS, "mailing-list");
- public final URI category = createProperty(NS, "category");
- public final URI license = createProperty(NS, "license");
- public final URI repository = createProperty(NS, "repository");
- public final URI anon_root = createProperty(NS, "anon-root");
- public final URI browse = createProperty(NS, "browse");
- public final URI module = createProperty(NS, "module");
- public final URI location = createProperty(NS, "location");
- public final URI download_page = createProperty(NS, "download-page");
- public final URI download_mirror = createProperty(NS, "download-mirror");
- public final URI revision = createProperty(NS, "revision");
- public final URI file_release = createProperty(NS, "file-release");
- public final URI wiki = createProperty(NS, "wiki");
- public final URI bug_database = createProperty(NS, "bug-database");
- public final URI screenshots = createProperty(NS, "screenshots");
- public final URI maintainer = createProperty(NS, "maintainer");
- public final URI developer = createProperty(NS, "developer");
- public final URI documenter = createProperty(NS, "documenter");
- public final URI translator = createProperty(NS, "translator");
- public final URI tester = createProperty(NS, "tester");
- public final URI helper = createProperty(NS, "helper");
- public final URI programming_language = createProperty(NS, "programming-language");
- public final URI os = createProperty(NS, "os");
- public final URI implement = createProperty(NS, "implement");
- public final URI service_endpoint = createProperty(NS, "service-endpoint");
- public final URI language = createProperty(NS, "language");
- public final URI vendor = createProperty(NS, "vendor");
- public final URI platform = createProperty(NS, "platform");
- public final URI audience = createProperty(NS, "audience");
- public final URI blog = createProperty(NS, "blog");
+ public final IRI name = createProperty(NS, "name");
+ public final IRI homepage = createProperty(NS, "homepage");
+ public final IRI old_homepage = createProperty(NS, "old-homepage");
+ public final IRI created = createProperty(NS, "created");
+ public final IRI shortdesc = createProperty(NS, "shortdesc");
+ public final IRI description = createProperty(NS, "description");
+ public final IRI release = createProperty(NS, "release");
+ public final IRI mailing_list = createProperty(NS, "mailing-list");
+ public final IRI category = createProperty(NS, "category");
+ public final IRI license = createProperty(NS, "license");
+ public final IRI repository = createProperty(NS, "repository");
+ public final IRI anon_root = createProperty(NS, "anon-root");
+ public final IRI browse = createProperty(NS, "browse");
+ public final IRI module = createProperty(NS, "module");
+ public final IRI location = createProperty(NS, "location");
+ public final IRI download_page = createProperty(NS, "download-page");
+ public final IRI download_mirror = createProperty(NS, "download-mirror");
+ public final IRI revision = createProperty(NS, "revision");
+ public final IRI file_release = createProperty(NS, "file-release");
+ public final IRI wiki = createProperty(NS, "wiki");
+ public final IRI bug_database = createProperty(NS, "bug-database");
+ public final IRI screenshots = createProperty(NS, "screenshots");
+ public final IRI maintainer = createProperty(NS, "maintainer");
+ public final IRI developer = createProperty(NS, "developer");
+ public final IRI documenter = createProperty(NS, "documenter");
+ public final IRI translator = createProperty(NS, "translator");
+ public final IRI tester = createProperty(NS, "tester");
+ public final IRI helper = createProperty(NS, "helper");
+ public final IRI programming_language = createProperty(NS, "programming-language");
+ public final IRI os = createProperty(NS, "os");
+ public final IRI implement = createProperty(NS, "implement");
+ public final IRI service_endpoint = createProperty(NS, "service-endpoint");
+ public final IRI language = createProperty(NS, "language");
+ public final IRI vendor = createProperty(NS, "vendor");
+ public final IRI platform = createProperty(NS, "platform");
+ public final IRI audience = createProperty(NS, "audience");
+ public final IRI blog = createProperty(NS, "blog");
private DOAP(){
super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/FOAF.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/FOAF.java b/api/src/main/java/org/apache/any23/vocab/FOAF.java
index b4544a4..6162923 100644
--- a/api/src/main/java/org/apache/any23/vocab/FOAF.java
+++ b/api/src/main/java/org/apache/any23/vocab/FOAF.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* The <a href="http://xmlns.com/foaf/spec/">Friend Of A Friend</a> vocabulary.
@@ -36,73 +36,73 @@ public class FOAF extends Vocabulary {
}
// Properties.
- public final URI topic_interest = createProperty(NS, "topic_interest");
- public final URI phone = createProperty(NS, "phone");
- public final URI icqChatID = createProperty(NS, "icqChatID");
- public final URI yahooChatID = createProperty(NS, "yahooChatID");
- public final URI member = createProperty(NS, "member");
- public final URI givenname = createProperty(NS, "givenname");
- public final URI birthday = createProperty(NS, "birthday");
- public final URI img = createProperty(NS, "img");
- public final URI name = createProperty(NS, "name");
- public final URI maker = createProperty(NS, "maker");
- public final URI tipjar = createProperty(NS, "tipjar");
- public final URI membershipClass = createProperty(NS, "membershipClass");
- public final URI accountName = createProperty(NS, "accountName");
- public final URI mbox_sha1sum = createProperty(NS, "mbox_sha1sum");
- public final URI geekcode = createProperty(NS, "geekcode");
- public final URI interest = createProperty(NS, "interest");
- public final URI depicts = createProperty(NS, "depicts");
- public final URI knows = createProperty(NS, "knows");
- public final URI homepage = createProperty(NS, "homepage");
- public final URI firstName = createProperty(NS, "firstName");
- public final URI surname = createProperty(NS, "surname");
- public final URI isPrimaryTopicOf = createProperty(NS, "isPrimaryTopicOf");
- public final URI page = createProperty(NS, "page");
- public final URI accountServiceHomepage = createProperty(NS, "accountServiceHomepage");
- public final URI depiction = createProperty(NS, "depiction");
- public final URI fundedBy = createProperty(NS, "fundedBy");
- public final URI title = createProperty(NS, "title");
- public final URI weblog = createProperty(NS, "weblog");
- public final URI logo = createProperty(NS, "logo");
- public final URI workplaceHomepage = createProperty(NS, "workplaceHomepage");
- public final URI based_near = createProperty(NS, "based_near");
- public final URI thumbnail = createProperty(NS, "thumbnail");
- public final URI primaryTopic = createProperty(NS, "primaryTopic");
- public final URI aimChatID = createProperty(NS, "aimChatID");
- public final URI made = createProperty(NS, "made");
- public final URI workInfoHomepage = createProperty(NS, "workInfoHomepage");
- public final URI currentProject = createProperty(NS, "currentProject");
- public final URI holdsAccount = createProperty(NS, "holdsAccount");
- public final URI publications = createProperty(NS, "publications");
- public final URI sha1 = createProperty(NS, "sha1");
- public final URI gender = createProperty(NS, "gender");
- public final URI mbox = createProperty(NS, "mbox");
- public final URI myersBriggs = createProperty(NS, "myersBriggs");
- public final URI plan = createProperty(NS, "plan");
- public final URI pastProject = createProperty(NS, "pastProject");
- public final URI schoolHomepage = createProperty(NS, "schoolHomepage");
- public final URI family_name = createProperty(NS, "family_name");
- public final URI msnChatID = createProperty(NS, "msnChatID");
- public final URI theme = createProperty(NS, "theme");
- public final URI topic = createProperty(NS, "topic");
- public final URI dnaChecksum = createProperty(NS, "dnaChecksum");
- public final URI nick = createProperty(NS, "nick");
- public final URI jabberID = createProperty(NS, "jabberID");
+ public final IRI topic_interest = createProperty(NS, "topic_interest");
+ public final IRI phone = createProperty(NS, "phone");
+ public final IRI icqChatID = createProperty(NS, "icqChatID");
+ public final IRI yahooChatID = createProperty(NS, "yahooChatID");
+ public final IRI member = createProperty(NS, "member");
+ public final IRI givenname = createProperty(NS, "givenname");
+ public final IRI birthday = createProperty(NS, "birthday");
+ public final IRI img = createProperty(NS, "img");
+ public final IRI name = createProperty(NS, "name");
+ public final IRI maker = createProperty(NS, "maker");
+ public final IRI tipjar = createProperty(NS, "tipjar");
+ public final IRI membershipClass = createProperty(NS, "membershipClass");
+ public final IRI accountName = createProperty(NS, "accountName");
+ public final IRI mbox_sha1sum = createProperty(NS, "mbox_sha1sum");
+ public final IRI geekcode = createProperty(NS, "geekcode");
+ public final IRI interest = createProperty(NS, "interest");
+ public final IRI depicts = createProperty(NS, "depicts");
+ public final IRI knows = createProperty(NS, "knows");
+ public final IRI homepage = createProperty(NS, "homepage");
+ public final IRI firstName = createProperty(NS, "firstName");
+ public final IRI surname = createProperty(NS, "surname");
+ public final IRI isPrimaryTopicOf = createProperty(NS, "isPrimaryTopicOf");
+ public final IRI page = createProperty(NS, "page");
+ public final IRI accountServiceHomepage = createProperty(NS, "accountServiceHomepage");
+ public final IRI depiction = createProperty(NS, "depiction");
+ public final IRI fundedBy = createProperty(NS, "fundedBy");
+ public final IRI title = createProperty(NS, "title");
+ public final IRI weblog = createProperty(NS, "weblog");
+ public final IRI logo = createProperty(NS, "logo");
+ public final IRI workplaceHomepage = createProperty(NS, "workplaceHomepage");
+ public final IRI based_near = createProperty(NS, "based_near");
+ public final IRI thumbnail = createProperty(NS, "thumbnail");
+ public final IRI primaryTopic = createProperty(NS, "primaryTopic");
+ public final IRI aimChatID = createProperty(NS, "aimChatID");
+ public final IRI made = createProperty(NS, "made");
+ public final IRI workInfoHomepage = createProperty(NS, "workInfoHomepage");
+ public final IRI currentProject = createProperty(NS, "currentProject");
+ public final IRI holdsAccount = createProperty(NS, "holdsAccount");
+ public final IRI publications = createProperty(NS, "publications");
+ public final IRI sha1 = createProperty(NS, "sha1");
+ public final IRI gender = createProperty(NS, "gender");
+ public final IRI mbox = createProperty(NS, "mbox");
+ public final IRI myersBriggs = createProperty(NS, "myersBriggs");
+ public final IRI plan = createProperty(NS, "plan");
+ public final IRI pastProject = createProperty(NS, "pastProject");
+ public final IRI schoolHomepage = createProperty(NS, "schoolHomepage");
+ public final IRI family_name = createProperty(NS, "family_name");
+ public final IRI msnChatID = createProperty(NS, "msnChatID");
+ public final IRI theme = createProperty(NS, "theme");
+ public final IRI topic = createProperty(NS, "topic");
+ public final IRI dnaChecksum = createProperty(NS, "dnaChecksum");
+ public final IRI nick = createProperty(NS, "nick");
+ public final IRI jabberID = createProperty(NS, "jabberID");
// Resources.
- public final URI Person = createClass(NS, "Person");
- public final URI PersonalProfileDocument = createClass(NS, "PersonalProfileDocument");
- public final URI Project = createClass(NS, "Project");
- public final URI OnlineChatAccount = createClass(NS, "OnlineChatAccount");
- public final URI OnlineAccount = createClass(NS, "OnlineAccount");
- public final URI Agent = createClass(NS, "Agent");
- public final URI Group = createClass(NS, "Group");
- public final URI OnlineGamingAccount = createClass(NS, "OnlineGamingAccount");
- public final URI OnlineEcommerceAccount = createClass(NS, "OnlineEcommerceAccount");
- public final URI Document = createClass(NS, "Document");
- public final URI Organization = createClass(NS, "Organization");
- public final URI Image = createClass(NS, "Image");
+ public final IRI Person = createClass(NS, "Person");
+ public final IRI PersonalProfileDocument = createClass(NS, "PersonalProfileDocument");
+ public final IRI Project = createClass(NS, "Project");
+ public final IRI OnlineChatAccount = createClass(NS, "OnlineChatAccount");
+ public final IRI OnlineAccount = createClass(NS, "OnlineAccount");
+ public final IRI Agent = createClass(NS, "Agent");
+ public final IRI Group = createClass(NS, "Group");
+ public final IRI OnlineGamingAccount = createClass(NS, "OnlineGamingAccount");
+ public final IRI OnlineEcommerceAccount = createClass(NS, "OnlineEcommerceAccount");
+ public final IRI Document = createClass(NS, "Document");
+ public final IRI Organization = createClass(NS, "Organization");
+ public final IRI Image = createClass(NS, "Image");
private FOAF(){
super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/GeoNames.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/GeoNames.java b/api/src/main/java/org/apache/any23/vocab/GeoNames.java
index a8a54a8..0c4a486 100644
--- a/api/src/main/java/org/apache/any23/vocab/GeoNames.java
+++ b/api/src/main/java/org/apache/any23/vocab/GeoNames.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* The <a href="http://www.geonames.org/ontology/">GEO Names</a> vocabulary.
@@ -36,11 +36,11 @@ public class GeoNames extends Vocabulary {
}
// Resources.
- public final URI Point = createClass(NS, "Point");
+ public final IRI Point = createClass(NS, "Point");
// Properties
- public final URI lat = createProperty(NS, "lat" );
- public final URI lon = createProperty(NS, "long");
+ public final IRI lat = createProperty(NS, "lat" );
+ public final IRI lon = createProperty(NS, "long");
private GeoNames(){
super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HCard.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HCard.java b/api/src/main/java/org/apache/any23/vocab/HCard.java
index b22e58c..75ba514 100644
--- a/api/src/main/java/org/apache/any23/vocab/HCard.java
+++ b/api/src/main/java/org/apache/any23/vocab/HCard.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* Vocabulary to map the <a href="http://microformats.org/wiki/hcard">h-card</a> microformat.
@@ -36,49 +36,49 @@ public class HCard extends Vocabulary {
return instance;
}
- public URI Card = createClass(NS, "Card");
- public URI Address = createClass(NS, "Address");
- public URI Geo = createClass(NS, "Geo");
+ public IRI Card = createClass(NS, "Card");
+ public IRI Address = createClass(NS, "Address");
+ public IRI Geo = createClass(NS, "Geo");
- public URI name = createProperty(NS, "name");
- public URI honorific_prefix = createProperty(NS, "honorific-prefix");
- public URI given_name = createProperty(NS, "given-name");
- public URI additional_name = createProperty(NS, "additional-name");
- public URI family_name = createProperty(NS, "family-name");
- public URI sort_string = createProperty(NS, "sort-string");
- public URI honorific_suffix = createProperty(NS, "honorific-suffix");
- public URI nickname = createProperty(NS, "nickname");
- public URI email = createProperty(NS, "email");
- public URI logo = createProperty(NS, "logo");
- public URI photo = createProperty(NS, "photo");
- public URI url = createProperty(NS, "url");
- public URI uid = createProperty(NS, "uid");
- public URI category = createProperty(NS, "category");
- public URI tel = createProperty(NS, "tel");
- public URI note = createProperty(NS, "note");
- public URI bday = createProperty(NS, "bday");
- public URI key = createProperty(NS, "key");
- public URI org = createProperty(NS, "org");
- public URI job_title = createProperty(NS, "job-title");
- public URI role = createProperty(NS, "role");
- public URI impp = createProperty(NS, "impp");
- public URI sex = createProperty(NS, "sex");
- public URI gender_identity = createProperty(NS, "gender-identity");
- public URI anniversary = createProperty(NS, "anniversary");
- public URI geo = createProperty(NS, "geo");
- public URI adr = createProperty(NS, "adr");
+ public IRI name = createProperty(NS, "name");
+ public IRI honorific_prefix = createProperty(NS, "honorific-prefix");
+ public IRI given_name = createProperty(NS, "given-name");
+ public IRI additional_name = createProperty(NS, "additional-name");
+ public IRI family_name = createProperty(NS, "family-name");
+ public IRI sort_string = createProperty(NS, "sort-string");
+ public IRI honorific_suffix = createProperty(NS, "honorific-suffix");
+ public IRI nickname = createProperty(NS, "nickname");
+ public IRI email = createProperty(NS, "email");
+ public IRI logo = createProperty(NS, "logo");
+ public IRI photo = createProperty(NS, "photo");
+ public IRI url = createProperty(NS, "url");
+ public IRI uid = createProperty(NS, "uid");
+ public IRI category = createProperty(NS, "category");
+ public IRI tel = createProperty(NS, "tel");
+ public IRI note = createProperty(NS, "note");
+ public IRI bday = createProperty(NS, "bday");
+ public IRI key = createProperty(NS, "key");
+ public IRI org = createProperty(NS, "org");
+ public IRI job_title = createProperty(NS, "job-title");
+ public IRI role = createProperty(NS, "role");
+ public IRI impp = createProperty(NS, "impp");
+ public IRI sex = createProperty(NS, "sex");
+ public IRI gender_identity = createProperty(NS, "gender-identity");
+ public IRI anniversary = createProperty(NS, "anniversary");
+ public IRI geo = createProperty(NS, "geo");
+ public IRI adr = createProperty(NS, "adr");
- public URI street_address = createProperty(NS, "street-address");
- public URI extended_address = createProperty(NS, "extended-address");
- public URI locality = createProperty(NS, "locality");
- public URI region = createProperty(NS, "region");
- public URI postal_code = createProperty(NS, "postal-code");
- public URI country_name = createProperty(NS, "country-name");
+ public IRI street_address = createProperty(NS, "street-address");
+ public IRI extended_address = createProperty(NS, "extended-address");
+ public IRI locality = createProperty(NS, "locality");
+ public IRI region = createProperty(NS, "region");
+ public IRI postal_code = createProperty(NS, "postal-code");
+ public IRI country_name = createProperty(NS, "country-name");
- public URI latitude = createProperty(NS, "latitude");
- public URI longitude = createProperty(NS, "longitude");
- public URI altitude = createProperty(NS, "altitude");
+ public IRI latitude = createProperty(NS, "latitude");
+ public IRI longitude = createProperty(NS, "longitude");
+ public IRI altitude = createProperty(NS, "altitude");
private HCard() {
super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HEntry.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HEntry.java b/api/src/main/java/org/apache/any23/vocab/HEntry.java
index e63907b..a5e6db9 100644
--- a/api/src/main/java/org/apache/any23/vocab/HEntry.java
+++ b/api/src/main/java/org/apache/any23/vocab/HEntry.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* Vocabulary to map the <a href="http://microformats.org/wiki/hentry">h-entry</a> microformat.
@@ -37,21 +37,21 @@ public class HEntry extends Vocabulary {
return instance;
}
- public URI Entry = createClass(NS, "Entry");
- public URI author = createClass(NS, "author");
- public URI location = createClass(NS, "location");
-
-
- public URI name = createProperty(NS, "name");
- public URI summary = createProperty(NS, "summary");
- public URI content = createProperty(NS, "content");
- public URI published = createProperty(NS, "published");
- public URI updated = createProperty(NS, "updated");
- public URI category = createProperty(NS, "category");
- public URI url = createProperty(NS, "url");
- public URI uid = createProperty(NS, "uid");
- public URI syndication = createProperty(NS, "syndication");
- public URI in_reply_to = createProperty(NS, "in-reply-to");
+ public IRI Entry = createClass(NS, "Entry");
+ public IRI author = createClass(NS, "author");
+ public IRI location = createClass(NS, "location");
+
+
+ public IRI name = createProperty(NS, "name");
+ public IRI summary = createProperty(NS, "summary");
+ public IRI content = createProperty(NS, "content");
+ public IRI published = createProperty(NS, "published");
+ public IRI updated = createProperty(NS, "updated");
+ public IRI category = createProperty(NS, "category");
+ public IRI url = createProperty(NS, "url");
+ public IRI uid = createProperty(NS, "uid");
+ public IRI syndication = createProperty(NS, "syndication");
+ public IRI in_reply_to = createProperty(NS, "in-reply-to");
private HEntry() {
super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HEvent.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HEvent.java b/api/src/main/java/org/apache/any23/vocab/HEvent.java
index b936c3e..b90fde2 100644
--- a/api/src/main/java/org/apache/any23/vocab/HEvent.java
+++ b/api/src/main/java/org/apache/any23/vocab/HEvent.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* Vocabulary to map the <a href="http://microformats.org/wiki/h-event">h-event</a> microformat.
@@ -36,19 +36,19 @@ public class HEvent extends Vocabulary {
return instance;
}
- public URI event = createClass(NS, "Event");
+ public IRI event = createClass(NS, "Event");
- public URI name = createProperty(NS, "name");
- public URI summary = createProperty(NS, "summary");
- public URI start = createProperty(NS, "start");
- public URI end = createProperty(NS, "end");
- public URI duration = createProperty(NS, "duration");
- public URI description = createProperty(NS, "description");
- public URI url = createProperty(NS, "url");
- public URI category = createProperty(NS, "category");
- public URI location = createProperty(NS, "location");
- public URI attendee = createProperty(NS, "attendee");
+ public IRI name = createProperty(NS, "name");
+ public IRI summary = createProperty(NS, "summary");
+ public IRI start = createProperty(NS, "start");
+ public IRI end = createProperty(NS, "end");
+ public IRI duration = createProperty(NS, "duration");
+ public IRI description = createProperty(NS, "description");
+ public IRI url = createProperty(NS, "url");
+ public IRI category = createProperty(NS, "category");
+ public IRI location = createProperty(NS, "location");
+ public IRI attendee = createProperty(NS, "attendee");
private HEvent() {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HItem.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HItem.java b/api/src/main/java/org/apache/any23/vocab/HItem.java
index 01bc5a2..0843ead 100644
--- a/api/src/main/java/org/apache/any23/vocab/HItem.java
+++ b/api/src/main/java/org/apache/any23/vocab/HItem.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* Vocabulary to map the <a href="http://microformats.org/wiki/hitem">h-item</a> microformat.
@@ -37,10 +37,10 @@ public class HItem extends Vocabulary {
return instance;
}
- public URI Item = createClass(NS, "Item");
- public URI name = createProperty(NS, "name");
- public URI url = createProperty(NS, "url");
- public URI photo = createProperty(NS, "photo");
+ public IRI Item = createClass(NS, "Item");
+ public IRI name = createProperty(NS, "name");
+ public IRI url = createProperty(NS, "url");
+ public IRI photo = createProperty(NS, "photo");
private HItem() {
super(NS);
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HListing.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HListing.java b/api/src/main/java/org/apache/any23/vocab/HListing.java
index 6caea24..5ef1286 100644
--- a/api/src/main/java/org/apache/any23/vocab/HListing.java
+++ b/api/src/main/java/org/apache/any23/vocab/HListing.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* Class modeling the <a href="http://microformats.org/wiki/hlisting-proposal">hListing</a> vocabulary.
@@ -39,55 +39,55 @@ public class HListing extends Vocabulary {
}
// Resources.
- public final URI Listing = createClass("Listing");
- public final URI Lister = createClass("Lister" ); // isa FOAF.Person
- public final URI Item = createClass("Item" ); // isa ?
+ public final IRI Listing = createClass("Listing");
+ public final IRI Lister = createClass("Lister" ); // isa FOAF.Person
+ public final IRI Item = createClass("Item" ); // isa ?
// Properties.
- public final URI action = createProperty("action");
- public final URI lister = createProperty("lister"); // ranges over Lister
- public final URI item = createProperty("item" );
-
- public final URI sell = createClass("sell" );
- public final URI rent = createClass("rent" );
- public final URI trade = createClass("trade" );
- public final URI meet = createClass("meet" );
- public final URI announce = createClass("announce");
- public final URI offer = createClass("offer" );
- public final URI wanted = createClass("wanted" );
- public final URI event = createClass("event" );
- public final URI service = createClass("service" );
-
- public final URI tel = VCard.getInstance().tel;
- public final URI dtlisted = createProperty("dtlisted" );
- public final URI dtexpired = createProperty("dtexpired");
- public final URI price = createProperty("price" );
-
- public final URI description = createProperty("description");
- public final URI summary = createProperty("summary" );
- public final URI permalink = createProperty("permalink" );
-
- public final URI region = VCard.getInstance().region;
- public final URI postOfficeBox = VCard.getInstance().post_office_box;
- public final URI locality = VCard.getInstance().locality;
- public final URI extendedAddress = VCard.getInstance().extended_address;
- public final URI streetAddress = VCard.getInstance().street_address;
- public final URI postalCode = VCard.getInstance().postal_code;
- public final URI countryName = VCard.getInstance().country_name;
-
- public final URI listerUrl = createProperty("listerUrl" );
- public final URI listerName = createProperty("listerName");
- public final URI itemName = createProperty("itemName" );
- public final URI itemUrl = createProperty("itemUrl" );
- public final URI itemPhoto = createProperty("itemPhoto" );
- public final URI listerOrg = createProperty("listerOrg" );
- public final URI listerLogo = createProperty("listerLogo");
-
- private URI createProperty(String localName) {
+ public final IRI action = createProperty("action");
+ public final IRI lister = createProperty("lister"); // ranges over Lister
+ public final IRI item = createProperty("item" );
+
+ public final IRI sell = createClass("sell" );
+ public final IRI rent = createClass("rent" );
+ public final IRI trade = createClass("trade" );
+ public final IRI meet = createClass("meet" );
+ public final IRI announce = createClass("announce");
+ public final IRI offer = createClass("offer" );
+ public final IRI wanted = createClass("wanted" );
+ public final IRI event = createClass("event" );
+ public final IRI service = createClass("service" );
+
+ public final IRI tel = VCard.getInstance().tel;
+ public final IRI dtlisted = createProperty("dtlisted" );
+ public final IRI dtexpired = createProperty("dtexpired");
+ public final IRI price = createProperty("price" );
+
+ public final IRI description = createProperty("description");
+ public final IRI summary = createProperty("summary" );
+ public final IRI permalink = createProperty("permalink" );
+
+ public final IRI region = VCard.getInstance().region;
+ public final IRI postOfficeBox = VCard.getInstance().post_office_box;
+ public final IRI locality = VCard.getInstance().locality;
+ public final IRI extendedAddress = VCard.getInstance().extended_address;
+ public final IRI streetAddress = VCard.getInstance().street_address;
+ public final IRI postalCode = VCard.getInstance().postal_code;
+ public final IRI countryName = VCard.getInstance().country_name;
+
+ public final IRI listerUrl = createProperty("listerUrl" );
+ public final IRI listerName = createProperty("listerName");
+ public final IRI itemName = createProperty("itemName" );
+ public final IRI itemUrl = createProperty("itemUrl" );
+ public final IRI itemPhoto = createProperty("itemPhoto" );
+ public final IRI listerOrg = createProperty("listerOrg" );
+ public final IRI listerLogo = createProperty("listerLogo");
+
+ private IRI createProperty(String localName) {
return createProperty(NS, localName);
}
- private URI createClass(String localName) {
+ private IRI createClass(String localName) {
return createClass(NS, localName);
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HProduct.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HProduct.java b/api/src/main/java/org/apache/any23/vocab/HProduct.java
index bbbaf32..ec251b2 100644
--- a/api/src/main/java/org/apache/any23/vocab/HProduct.java
+++ b/api/src/main/java/org/apache/any23/vocab/HProduct.java
@@ -17,7 +17,7 @@
package org.apache.any23.vocab;
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
/**
* Vocabulary to map the <a href="http://microformats.org/wiki/h-product">h-product</a> microformat.
@@ -37,18 +37,18 @@ public class HProduct extends Vocabulary {
return instance;
}
- public URI product = createClass(NS, "Product");
+ public IRI product = createClass(NS, "Product");
- public URI name = createProperty(NS, "name");
- public URI photo = createProperty(NS, "photo");
- public URI brand = createProperty(NS, "brand");
- public URI category = createProperty(NS, "category");
- public URI description = createProperty(NS, "description");
- public URI url = createProperty(NS, "url");
- public URI identifier = createProperty(NS, "identifier");
- public URI price = createProperty(NS, "price");
- public URI review = createProperty(NS, "review");
+ public IRI name = createProperty(NS, "name");
+ public IRI photo = createProperty(NS, "photo");
+ public IRI brand = createProperty(NS, "brand");
+ public IRI category = createProperty(NS, "category");
+ public IRI description = createProperty(NS, "description");
+ public IRI url = createProperty(NS, "url");
+ public IRI identifier = createProperty(NS, "identifier");
+ public IRI price = createProperty(NS, "price");
+ public IRI review = createProperty(NS, "review");
private HProduct() {