You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by le...@apache.org on 2013/02/08 04:43:45 UTC
svn commit: r1443836 - in /any23/trunk:
api/src/main/java/org/apache/any23/vocab/
core/src/main/java/org/apache/any23/extractor/html/
core/src/main/java/org/apache/any23/extractor/microdata/
core/src/test/java/org/apache/any23/ core/src/test/java/org/a...
Author: lewismc
Date: Fri Feb 8 03:43:44 2013
New Revision: 1443836
URL: http://svn.apache.org/r1443836
Log:
ANY23-144 Implement comprehensive naming of o.a.a.api.vocab classes
Added:
any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTerms.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTERMS.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/GeoNames.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/GEO.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/HListing.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/HLISTING.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/HRecipe.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/HRECIPE.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ACTION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_EXPRESSION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ACTION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ROLE.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_MEREOLOGY.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_NORM.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_PROCESS.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RELATIVE_PLACES.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ROLE.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RULES.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME_MODIFICATION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TOP.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/Review.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/REVIEW.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/SchemaOrg.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/SCHEMAORG.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/VCard.java
- copied, changed from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/VCARD.java
Removed:
any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTERMS.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/GEO.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/HLISTING.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/HRECIPE.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ACTION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_EXPRESSION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ACTION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ROLE.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_MEREOLOGY.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_NORM.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_PROCESS.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RELATIVE_PLACES.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ROLE.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RULES.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME_MODIFICATION.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TOP.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/REVIEW.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/SCHEMAORG.java
any23/trunk/api/src/main/java/org/apache/any23/vocab/VCARD.java
Modified:
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java
any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java
any23/trunk/core/src/test/java/org/apache/any23/Any23Test.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/SingleDocumentExtractionTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTerms.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTERMS.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTerms.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTerms.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTERMS.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTERMS.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/DCTerms.java Fri Feb 8 03:43:44 2013
@@ -23,15 +23,15 @@ import org.openrdf.model.URI;
* The <i>DCTERMS</code> vocabulary.
* See <a href="http://dublincore.org/">Dublin Core</a>.
*/
-public class DCTERMS extends Vocabulary {
+public class DCTerms extends Vocabulary {
public static final String NS = "http://purl.org/dc/terms/";
- private static DCTERMS instance;
+ private static DCTerms instance;
- public static DCTERMS getInstance() {
+ public static DCTerms getInstance() {
if(instance == null) {
- instance = new DCTERMS();
+ instance = new DCTerms();
}
return instance;
}
@@ -44,7 +44,7 @@ public class DCTERMS extends Vocabulary
public final URI date = createProperty(NS, "date" );
public final URI source = createProperty(NS, "source" );
- private DCTERMS(){
+ private DCTerms(){
super(NS);
}
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/GeoNames.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/GEO.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/GeoNames.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/GeoNames.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/GEO.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/GEO.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/GeoNames.java Fri Feb 8 03:43:44 2013
@@ -22,7 +22,7 @@ import org.openrdf.model.URI;
/**
* The <a href="http://www.geonames.org/ontology/">GEO Names</a> vocabulary.
*/
-public class GEO extends Vocabulary {
+public class GeoNames extends Vocabulary {
public static final String NS = "http://www.w3.org/2003/01/geo/wgs84_pos#";
@@ -30,7 +30,7 @@ public class GEO extends Vocabulary {
public static Vocabulary getInstance() {
if(instance == null) {
- instance = new GEO();
+ instance = new GeoNames();
}
return instance;
}
@@ -42,7 +42,7 @@ public class GEO extends Vocabulary {
public final URI lat = createProperty(NS, "lat" );
public final URI lon = createProperty(NS, "long");
- private GEO(){
+ private GeoNames(){
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/HListing.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/HLISTING.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/HListing.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/HListing.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/HLISTING.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/HLISTING.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/HListing.java Fri Feb 8 03:43:44 2013
@@ -25,15 +25,15 @@ import org.openrdf.model.URI;
* @author Davide Palmisano (dpalmisano@gmail.com)
*
*/
-public class HLISTING extends Vocabulary {
+public class HListing extends Vocabulary {
public static final String NS = "http://sindice.com/hlisting/0.1/";
- private static HLISTING instance;
+ private static HListing instance;
- public static HLISTING getInstance() {
+ public static HListing getInstance() {
if(instance == null) {
- instance = new HLISTING();
+ instance = new HListing();
}
return instance;
}
@@ -58,7 +58,7 @@ public class HLISTING extends Vocabulary
public final URI event = createClass("event" );
public final URI service = createClass("service" );
- public final URI tel = VCARD.getInstance().tel;
+ 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" );
@@ -67,13 +67,13 @@ public class HLISTING extends Vocabulary
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 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");
@@ -91,7 +91,7 @@ public class HLISTING extends Vocabulary
return createClass(NS, localName);
}
- private HLISTING(){
+ private HListing(){
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/HRecipe.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/HRECIPE.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/HRecipe.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/HRecipe.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/HRECIPE.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/HRECIPE.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/HRecipe.java Fri Feb 8 03:43:44 2013
@@ -24,15 +24,15 @@ import org.openrdf.model.URI;
*
* @author Michele Mostarda (mostarda@fbk.eu)
*/
-public class HRECIPE extends Vocabulary {
+public class HRecipe extends Vocabulary {
public static final String NS = SINDICE.NS + "hrecipe/";
- private static HRECIPE instance;
+ private static HRecipe instance;
- public static HRECIPE getInstance() {
+ public static HRecipe getInstance() {
if(instance == null) {
- instance = new HRECIPE();
+ instance = new HRecipe();
}
return instance;
}
@@ -63,7 +63,7 @@ public class HRECIPE extends Vocabulary
public URI instructions = createProperty(NS, "instructions");
public URI yield = createProperty(NS, "yield");
- private HRECIPE() {
+ private HRecipe() {
super(NS);
}
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ACTION.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ACTION.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ACTION.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_ACTION extends Vocabulary {
+public class LKIFCoreAction extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/action.owl#";
- private static LKIF_CORE_ACTION instance;
+ private static LKIFCoreAction instance;
- public static LKIF_CORE_ACTION getInstance() {
+ public static LKIFCoreAction getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_ACTION();
+ instance = new LKIFCoreAction();
}
return instance;
}
@@ -75,7 +75,7 @@ public class LKIF_CORE_ACTION extends Vo
public final URI participant_in = createProperty(NS, "participant_in");
public final URI result_of = createProperty(NS, "result_of");
- private LKIF_CORE_ACTION() {
+ private LKIFCoreAction() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_EXPRESSION.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_EXPRESSION.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_EXPRESSION.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_EXPRESSION extends Vocabulary {
+public class LKIFCoreExpression extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/expression.owl#";
- private static LKIF_CORE_EXPRESSION instance;
+ private static LKIFCoreExpression instance;
- public static LKIF_CORE_EXPRESSION getInstance() {
+ public static LKIFCoreExpression getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_EXPRESSION();
+ instance = new LKIFCoreExpression();
}
return instance;
}
@@ -115,7 +115,7 @@ public class LKIF_CORE_EXPRESSION extend
public final URI played_by = createProperty(NS, "played_by");
public final URI plays = createProperty(NS, "plays");
- private LKIF_CORE_EXPRESSION() {
+ private LKIFCoreExpression() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ACTION.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ACTION.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ACTION.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_LEGAL_ACTION extends Vocabulary {
+public class LKIFCoreLegalAction extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/legal-action.owl#";
- private static LKIF_CORE_LEGAL_ACTION instance;
+ private static LKIFCoreLegalAction instance;
- public static LKIF_CORE_LEGAL_ACTION getInstance() {
+ public static LKIFCoreLegalAction getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_LEGAL_ACTION();
+ instance = new LKIFCoreLegalAction();
}
return instance;
}
@@ -72,7 +72,7 @@ public class LKIF_CORE_LEGAL_ACTION exte
// PROPERTIES
- private LKIF_CORE_LEGAL_ACTION() {
+ private LKIFCoreLegalAction() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ROLE.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ROLE.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_LEGAL_ROLE.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_LEGAL_ROLE extends Vocabulary {
+public class LKIFCoreLegalRole extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/legal-role.owl#";
- private static LKIF_CORE_LEGAL_ROLE instance;
+ private static LKIFCoreLegalRole instance;
- public static LKIF_CORE_LEGAL_ROLE getInstance() {
+ public static LKIFCoreLegalRole getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_LEGAL_ROLE();
+ instance = new LKIFCoreLegalRole();
}
return instance;
}
@@ -53,7 +53,7 @@ public class LKIF_CORE_LEGAL_ROLE extend
// PROPERTIES
- private LKIF_CORE_LEGAL_ROLE() {
+ private LKIFCoreLegalRole() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_MEREOLOGY.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_MEREOLOGY.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_MEREOLOGY.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_MEREOLOGY extends Vocabulary {
+public class LKIFCoreMereology extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/mereology.owl#";
- private static LKIF_CORE_MEREOLOGY instance;
+ private static LKIFCoreMereology instance;
- public static LKIF_CORE_MEREOLOGY getInstance() {
+ public static LKIFCoreMereology getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_MEREOLOGY();
+ instance = new LKIFCoreMereology();
}
return instance;
}
@@ -69,7 +69,7 @@ public class LKIF_CORE_MEREOLOGY extends
public final URI strict_part = createProperty(NS, "strict_part");
public final URI strict_part_of = createProperty(NS, "strict_part_of");
- private LKIF_CORE_MEREOLOGY() {
+ private LKIFCoreMereology() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_NORM.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_NORM.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_NORM.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_NORM extends Vocabulary {
+public class LKIFCoreNorm extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/norm.owl#";
- private static LKIF_CORE_NORM instance;
+ private static LKIFCoreNorm instance;
- public static LKIF_CORE_NORM getInstance() {
+ public static LKIFCoreNorm getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_NORM();
+ instance = new LKIFCoreNorm();
}
return instance;
}
@@ -116,7 +116,7 @@ public class LKIF_CORE_NORM extends Voca
public final URI commanded_by = createProperty(NS, "commanded_by");
public final URI strictly_equivalent = createProperty(NS, "strictly_equivalent");
- private LKIF_CORE_NORM() {
+ private LKIFCoreNorm() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_PROCESS.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_PROCESS.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_PROCESS.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_PROCESS extends Vocabulary {
+public class LKIFCoreProcess extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/process.owl#";
- private static LKIF_CORE_PROCESS instance;
+ private static LKIFCoreProcess instance;
- public static LKIF_CORE_PROCESS getInstance() {
+ public static LKIFCoreProcess getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_PROCESS();
+ instance = new LKIFCoreProcess();
}
return instance;
}
@@ -68,7 +68,7 @@ public class LKIF_CORE_PROCESS extends V
public final URI result = createProperty(NS, "result");
public final URI result_of = createProperty(NS, "result_of");
- private LKIF_CORE_PROCESS() {
+ private LKIFCoreProcess() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RELATIVE_PLACES.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RELATIVE_PLACES.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RELATIVE_PLACES.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_RELATIVE_PLACES extends Vocabulary {
+public class LKIFCoreRelativePlaces extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/relative-places.owl#";
- private static LKIF_CORE_RELATIVE_PLACES instance;
+ private static LKIFCoreRelativePlaces instance;
- public static LKIF_CORE_RELATIVE_PLACES getInstance() {
+ public static LKIFCoreRelativePlaces getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_RELATIVE_PLACES();
+ instance = new LKIFCoreRelativePlaces();
}
return instance;
}
@@ -70,7 +70,7 @@ public class LKIF_CORE_RELATIVE_PLACES e
public final URI spatial_reference = createProperty(NS, "spatial_reference");
public final URI spatial_relation = createProperty(NS, "spatial_relation");
- private LKIF_CORE_RELATIVE_PLACES() {
+ private LKIFCoreRelativePlaces() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ROLE.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ROLE.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_ROLE.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_ROLE extends Vocabulary {
+public class LKIFCoreRole extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/role.owl#";
- private static LKIF_CORE_ROLE instance;
+ private static LKIFCoreRole instance;
- public static LKIF_CORE_ROLE getInstance() {
+ public static LKIFCoreRole getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_ROLE();
+ instance = new LKIFCoreRole();
}
return instance;
}
@@ -62,7 +62,7 @@ public class LKIF_CORE_ROLE extends Voca
public final URI played_by = createProperty(NS, "played_by");
public final URI plays = createProperty(NS, "plays");
- private LKIF_CORE_ROLE() {
+ private LKIFCoreRole() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RULES.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RULES.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_RULES.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_RULES extends Vocabulary {
+public class LKIFCoreRules extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/lkif-rules.owl#";
- private static LKIF_CORE_RULES instance;
+ private static LKIFCoreRules instance;
- public static LKIF_CORE_RULES getInstance() {
+ public static LKIFCoreRules getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_RULES();
+ instance = new LKIFCoreRules();
}
return instance;
}
@@ -57,7 +57,7 @@ public class LKIF_CORE_RULES extends Voc
public final URI applies = createProperty(NS, "applies");
public final URI rebuts = createProperty(NS, "rebuts");
- private LKIF_CORE_RULES() {
+ private LKIFCoreRules() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_TIME extends Vocabulary {
+public class LKIFCoreTime extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/time.owl#";
- private static LKIF_CORE_TIME instance;
+ private static LKIFCoreTime instance;
- public static LKIF_CORE_TIME getInstance() {
+ public static LKIFCoreTime getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_TIME();
+ instance = new LKIFCoreTime();
}
return instance;
}
@@ -65,7 +65,7 @@ public class LKIF_CORE_TIME extends Voca
public final URI starts = createProperty(NS, "starts");
public final URI temporal_relation = createProperty(NS, "temporal_relation");
- private LKIF_CORE_TIME() {
+ private LKIFCoreTime() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME_MODIFICATION.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME_MODIFICATION.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TIME_MODIFICATION.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_TIME_MODIFICATION extends Vocabulary {
+public class LKIFCoreTimeModification extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/time-modification.owl#";
- private static LKIF_CORE_TIME_MODIFICATION instance;
+ private static LKIFCoreTimeModification instance;
- public static LKIF_CORE_TIME_MODIFICATION getInstance() {
+ public static LKIFCoreTimeModification getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_TIME_MODIFICATION();
+ instance = new LKIFCoreTimeModification();
}
return instance;
}
@@ -106,7 +106,7 @@ public class LKIF_CORE_TIME_MODIFICATION
public final URI produce_textual_modification = createProperty(NS, "produce_textual_modification");
public final URI produce_inforce_modification = createProperty(NS, "produce_inforce_modification");
- private LKIF_CORE_TIME_MODIFICATION() {
+ private LKIFCoreTimeModification() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TOP.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TOP.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIF_CORE_TOP.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java Fri Feb 8 03:43:44 2013
@@ -26,18 +26,18 @@ import org.openrdf.model.URI;
* related concepts from both legal and commonsense domains.
*
*/
-public class LKIF_CORE_TOP extends Vocabulary {
+public class LKIFCoreTop extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.estrellaproject.org/lkif-core/lkif-top.owl#";
- private static LKIF_CORE_TOP instance;
+ private static LKIFCoreTop instance;
- public static LKIF_CORE_TOP getInstance() {
+ public static LKIFCoreTop getInstance() {
if(instance == null) {
- instance = new LKIF_CORE_TOP();
+ instance = new LKIFCoreTop();
}
return instance;
}
@@ -56,7 +56,7 @@ public class LKIF_CORE_TOP extends Vocab
// PROPERTIES
- private LKIF_CORE_TOP() {
+ private LKIFCoreTop() {
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/Review.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/REVIEW.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/Review.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/Review.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/REVIEW.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/REVIEW.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/Review.java Fri Feb 8 03:43:44 2013
@@ -22,13 +22,13 @@ import org.openrdf.model.URI;
/**
* Vocabulary definitions from vocabularies/review.rdf
*/
-public class REVIEW extends Vocabulary {
+public class Review extends Vocabulary {
- private static REVIEW instance;
+ private static Review instance;
- public static REVIEW getInstance() {
+ public static Review getInstance() {
if(instance == null) {
- instance = new REVIEW();
+ instance = new Review();
}
return instance;
}
@@ -127,7 +127,7 @@ public class REVIEW extends Vocabulary {
return createProperty(NS, localName);
}
- private REVIEW(){
+ private Review(){
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/SchemaOrg.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/SCHEMAORG.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/SchemaOrg.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/SchemaOrg.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/SCHEMAORG.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/SCHEMAORG.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/SchemaOrg.java Fri Feb 8 03:43:44 2013
@@ -22,23 +22,23 @@ package org.apache.any23.vocab;
*
* @author Michele Mostarda (mostarda@fbk.eu)
*/
-public class SCHEMAORG extends Vocabulary {
+public class SchemaOrg extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://schema.org/";
- private static SCHEMAORG instance;
+ private static SchemaOrg instance;
- public static SCHEMAORG getInstance() {
+ public static SchemaOrg getInstance() {
if(instance == null) {
- instance = new SCHEMAORG();
+ instance = new SchemaOrg();
}
return instance;
}
- private SCHEMAORG(){
+ private SchemaOrg(){
super(NS);
}
Copied: any23/trunk/api/src/main/java/org/apache/any23/vocab/VCard.java (from r1443811, any23/trunk/api/src/main/java/org/apache/any23/vocab/VCARD.java)
URL: http://svn.apache.org/viewvc/any23/trunk/api/src/main/java/org/apache/any23/vocab/VCard.java?p2=any23/trunk/api/src/main/java/org/apache/any23/vocab/VCard.java&p1=any23/trunk/api/src/main/java/org/apache/any23/vocab/VCARD.java&r1=1443811&r2=1443836&rev=1443836&view=diff
==============================================================================
--- any23/trunk/api/src/main/java/org/apache/any23/vocab/VCARD.java (original)
+++ any23/trunk/api/src/main/java/org/apache/any23/vocab/VCard.java Fri Feb 8 03:43:44 2013
@@ -22,18 +22,18 @@ import org.openrdf.model.URI;
/**
* Vocabulary definitions from vcard.owl
*/
-public class VCARD extends Vocabulary {
+public class VCard extends Vocabulary {
/**
* The namespace of the vocabulary as a string.
*/
public static final String NS = "http://www.w3.org/2006/vcard/ns#";
- private static VCARD instance;
+ private static VCard instance;
- public static VCARD getInstance() {
+ public static VCard getInstance() {
if(instance == null) {
- instance = new VCARD();
+ instance = new VCard();
}
return instance;
}
@@ -352,7 +352,7 @@ public class VCARD extends Vocabulary {
return createProperty(NS, localName);
}
- public VCARD(){
+ public VCard(){
super(NS);
}
}
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/AdrExtractor.java Fri Feb 8 03:43:44 2013
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.openrdf.model.BNode;
import org.openrdf.model.vocabulary.RDF;
import org.w3c.dom.Node;
@@ -33,7 +33,7 @@ import org.w3c.dom.Node;
*/
public class AdrExtractor extends EntityBasedMicroformatExtractor {
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
private static final String[] addressFields = {
"post-office-box",
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/GeoExtractor.java Fri Feb 8 03:43:44 2013
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.openrdf.model.BNode;
import org.openrdf.model.vocabulary.RDF;
import org.w3c.dom.Node;
@@ -33,7 +33,7 @@ import org.w3c.dom.Node;
*/
public class GeoExtractor extends EntityBasedMicroformatExtractor {
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
@Override
public ExtractorDescription getDescription() {
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HCardExtractor.java Fri Feb 8 03:43:44 2013
@@ -23,7 +23,7 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.IssueReport;
import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.extractor.html.annotations.Includes;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.apache.commons.lang.StringUtils;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
@@ -48,7 +48,7 @@ import static org.apache.any23.extractor
@Includes( extractors = AdrExtractor.class )
public class HCardExtractor extends EntityBasedMicroformatExtractor {
- private static final VCARD vCARD = VCARD.getInstance();
+ private static final VCard vCARD = VCard.getInstance();
private HCardName name = new HCardName();
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HListingExtractor.java Fri Feb 8 03:43:44 2013
@@ -22,7 +22,7 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.vocab.FOAF;
-import org.apache.any23.vocab.HLISTING;
+import org.apache.any23.vocab.HListing;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
@@ -45,7 +45,7 @@ import static org.apache.any23.extractor
*/
public class HListingExtractor extends EntityBasedMicroformatExtractor {
- private static final HLISTING hLISTING = HLISTING.getInstance();
+ private static final HListing hLISTING = HListing.getInstance();
private static final FOAF foaf = FOAF.getInstance();
private static final Set<String> ActionClasses = new HashSet<String>() {
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HRecipeExtractor.java Fri Feb 8 03:43:44 2013
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractionException;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.apache.any23.vocab.HRECIPE;
+import org.apache.any23.vocab.HRecipe;
import org.openrdf.model.BNode;
import org.openrdf.model.URI;
import org.openrdf.model.vocabulary.RDF;
@@ -34,7 +34,7 @@ import org.w3c.dom.Node;
*/
public class HRecipeExtractor extends EntityBasedMicroformatExtractor {
- private static final HRECIPE vHRECIPE = HRECIPE.getInstance();
+ private static final HRecipe vHRECIPE = HRecipe.getInstance();
@Override
public ExtractorDescription getDescription() {
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/HReviewExtractor.java Fri Feb 8 03:43:44 2013
@@ -21,9 +21,9 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
-import org.apache.any23.vocab.DCTERMS;
-import org.apache.any23.vocab.REVIEW;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.DCTerms;
+import org.apache.any23.vocab.Review;
+import org.apache.any23.vocab.VCard;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.vocabulary.RDF;
@@ -41,9 +41,9 @@ import static org.apache.any23.extractor
*/
public class HReviewExtractor extends EntityBasedMicroformatExtractor {
- private static final REVIEW vREVIEW = REVIEW.getInstance();
- private static final VCARD vVCARD = VCARD.getInstance();
- private static final DCTERMS vDCTERMS = DCTERMS.getInstance();
+ private static final Review vREVIEW = Review.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
+ private static final DCTerms vDCTERMS = DCTerms.getInstance();
@Override
public ExtractorDescription getDescription() {
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/html/TitleExtractor.java Fri Feb 8 03:43:44 2013
@@ -23,7 +23,7 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.rdf.Any23ValueFactoryWrapper;
-import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.DCTerms;
import org.apache.any23.extractor.Extractor.TagSoupDOMExtractor;
import org.openrdf.model.impl.ValueFactoryImpl;
import org.w3c.dom.Document;
@@ -38,7 +38,7 @@ import java.io.IOException;
*/
public class TitleExtractor implements TagSoupDOMExtractor {
- private static final DCTERMS vDCTERMS = DCTERMS.getInstance();
+ private static final DCTerms vDCTERMS = DCTerms.getInstance();
@Override
public void run(
Modified: any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java (original)
+++ any23/trunk/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java Fri Feb 8 03:43:44 2013
@@ -26,7 +26,7 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.html.DomUtils;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.DCTerms;
import org.apache.any23.vocab.XHTML;
import org.openrdf.model.Literal;
import org.openrdf.model.Resource;
@@ -189,7 +189,7 @@ public class MicrodataExtractor implemen
}
out.writeTriple(
documentURI,
- DCTERMS.getInstance().title,
+ DCTerms.getInstance().title,
object
);
}
@@ -407,7 +407,7 @@ public class MicrodataExtractor implemen
if (item.getAttributes().getNamedItem("cite") != null) {
out.writeTriple(
documentURI,
- DCTERMS.getInstance().source,
+ DCTerms.getInstance().source,
RDFUtils.uri(item.getAttributes().getNamedItem("cite").getTextContent())
);
}
Modified: any23/trunk/core/src/test/java/org/apache/any23/Any23Test.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/Any23Test.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/Any23Test.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/Any23Test.java Fri Feb 8 03:43:44 2013
@@ -34,7 +34,7 @@ import org.apache.any23.source.StringDoc
import org.apache.any23.util.FileUtils;
import org.apache.any23.util.StreamUtils;
import org.apache.any23.util.StringUtils;
-import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.DCTerms;
import org.apache.any23.writer.CompositeTripleHandler;
import org.apache.any23.writer.CountingTripleHandler;
import org.apache.any23.writer.NTriplesWriter;
@@ -72,7 +72,7 @@ import static org.apache.any23.extractor
@SuppressWarnings("unchecked")
public class Any23Test extends Any23OnlineTestBase {
- private static final DCTERMS vDCTERMS = DCTERMS.getInstance();
+ private static final DCTerms vDCTERMS = DCTerms.getInstance();
private static final String PAGE_URL = "http://bob.com";
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/SingleDocumentExtractionTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/SingleDocumentExtractionTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/SingleDocumentExtractionTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/SingleDocumentExtractionTest.java Fri Feb 8 03:43:44 2013
@@ -24,9 +24,9 @@ import org.apache.any23.extractor.html.H
import org.apache.any23.mime.TikaMIMETypeDetector;
import org.apache.any23.mime.purifier.WhiteSpacesPurifier;
import org.apache.any23.vocab.ICAL;
-import org.apache.any23.vocab.REVIEW;
+import org.apache.any23.vocab.Review;
import org.apache.any23.vocab.SINDICE;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.apache.any23.writer.CompositeTripleHandler;
import org.apache.any23.writer.RDFXMLWriter;
import org.apache.any23.writer.RepositoryWriter;
@@ -65,8 +65,8 @@ public class SingleDocumentExtractionTes
private static final SINDICE vSINDICE = SINDICE.getInstance();
private static final ICAL vICAL = ICAL.getInstance();
- private static final REVIEW vREVIEW = REVIEW.getInstance();
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final Review vREVIEW = Review.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
private static final Logger logger = LoggerFactory.getLogger(SingleDocumentExtractionTest.class);
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/AdrExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -18,7 +18,7 @@
package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.junit.Assert;
import org.junit.Test;
import org.openrdf.model.Resource;
@@ -35,7 +35,7 @@ import java.util.List;
*/
public class AdrExtractorTest extends AbstractExtractorTestCase {
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
protected ExtractorFactory<?> getExtractorFactory() {
return new AdrExtractorFactory();
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HCardExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -22,7 +22,7 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.extractor.IssueReport;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.junit.Ignore;
import org.junit.Test;
import org.openrdf.model.Resource;
@@ -41,7 +41,7 @@ import java.util.List;
*/
public class HCardExtractorTest extends AbstractExtractorTestCase {
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
protected ExtractorFactory<?> getExtractorFactory() {
return new HCardExtractorFactory();
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HListingExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.vocab.FOAF;
-import org.apache.any23.vocab.HLISTING;
+import org.apache.any23.vocab.HListing;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
import org.openrdf.model.Resource;
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
public class HListingExtractorTest extends AbstractExtractorTestCase {
private static final SINDICE vSINDICE = SINDICE.getInstance();
- private static final HLISTING vHLISTING = HLISTING.getInstance();
+ private static final HListing vHLISTING = HListing.getInstance();
private static final FOAF vFOAF = FOAF.getInstance();
private static final Logger logger = LoggerFactory.getLogger(HListingExtractorTest.class);
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HRecipeExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -18,7 +18,7 @@
package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
-import org.apache.any23.vocab.HRECIPE;
+import org.apache.any23.vocab.HRecipe;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
import org.openrdf.model.vocabulary.RDF;
@@ -32,7 +32,7 @@ import org.openrdf.repository.Repository
public class HRecipeExtractorTest extends AbstractExtractorTestCase {
private static final SINDICE vSINDICE = SINDICE.getInstance();
- private static final HRECIPE vHRECIPE = HRECIPE.getInstance();
+ private static final HRecipe vHRECIPE = HRecipe.getInstance();
@Override
protected ExtractorFactory<?> getExtractorFactory() {
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HResumeExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -21,7 +21,7 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.vocab.DOAC;
import org.apache.any23.vocab.FOAF;
import org.apache.any23.vocab.SINDICE;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.junit.Assert;
import org.junit.Test;
import org.openrdf.model.Resource;
@@ -46,7 +46,7 @@ public class HResumeExtractorTest extend
private static final SINDICE vSINDICE = SINDICE.getInstance();
private static final FOAF vFOAF = FOAF.getInstance();
private static final DOAC vDOAC = DOAC.getInstance();
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
private static final Logger logger = LoggerFactory.getLogger(HReviewExtractorTest.class);
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/HReviewExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -19,10 +19,10 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.vocab.DCTERMS;
-import org.apache.any23.vocab.REVIEW;
+import org.apache.any23.vocab.DCTerms;
+import org.apache.any23.vocab.Review;
import org.apache.any23.vocab.SINDICE;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.VCard;
import org.junit.Test;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
@@ -40,10 +40,10 @@ import org.slf4j.LoggerFactory;
*/
public class HReviewExtractorTest extends AbstractExtractorTestCase {
- private static final DCTERMS vDCTERMS = DCTERMS.getInstance();
- private static final REVIEW vREVIEW = REVIEW.getInstance();
+ private static final DCTerms vDCTERMS = DCTerms.getInstance();
+ private static final Review vREVIEW = Review.getInstance();
private static final SINDICE vSINDICE = SINDICE.getInstance();
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
private static final Logger logger = LoggerFactory.getLogger(HReviewExtractorTest.class);
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/RDFMergerTest.java Fri Feb 8 03:43:44 2013
@@ -23,10 +23,10 @@ import org.apache.any23.extractor.Extrac
import org.apache.any23.extractor.ExtractionResultImpl;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.DCTerms;
import org.apache.any23.vocab.FOAF;
-import org.apache.any23.vocab.REVIEW;
-import org.apache.any23.vocab.VCARD;
+import org.apache.any23.vocab.Review;
+import org.apache.any23.vocab.VCard;
import org.apache.any23.writer.RepositoryWriter;
import org.junit.Test;
import org.openrdf.model.Resource;
@@ -58,10 +58,10 @@ import java.util.Map;
*/
public class RDFMergerTest extends AbstractExtractorTestCase {
- private static final DCTERMS vDCTERMS = DCTERMS.getInstance();
+ private static final DCTerms vDCTERMS = DCTerms.getInstance();
private static final FOAF vFOAF = FOAF.getInstance();
- private static final REVIEW vREVIEW = REVIEW.getInstance();
- private static final VCARD vVCARD = VCARD.getInstance();
+ private static final Review vREVIEW = Review.getInstance();
+ private static final VCard vVCARD = VCard.getInstance();
@Override
protected ExtractorFactory<?> getExtractorFactory() {
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/html/TitleExtractorTest.java Fri Feb 8 03:43:44 2013
@@ -19,7 +19,7 @@ package org.apache.any23.extractor.html;
import org.apache.any23.extractor.ExtractorFactory;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.DCTerms;
import org.apache.any23.vocab.SINDICE;
import org.junit.Test;
import org.openrdf.model.Literal;
@@ -31,7 +31,7 @@ import org.openrdf.repository.Repository
*/
public class TitleExtractorTest extends AbstractExtractorTestCase {
- private static final DCTERMS vDCTERMS = DCTERMS.getInstance();
+ private static final DCTerms vDCTERMS = DCTerms.getInstance();
private static final SINDICE vSINDICE = SINDICE.getInstance();
private Literal helloLiteral = RDFUtils.literal("Hello World!");
Modified: any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java
URL: http://svn.apache.org/viewvc/any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java?rev=1443836&r1=1443835&r2=1443836&view=diff
==============================================================================
--- any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java (original)
+++ any23/trunk/core/src/test/java/org/apache/any23/extractor/rdfa/AbstractRDFaExtractorTestCase.java Fri Feb 8 03:43:44 2013
@@ -19,7 +19,7 @@ package org.apache.any23.extractor.rdfa;
import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.vocab.DCTERMS;
+import org.apache.any23.vocab.DCTerms;
import org.apache.any23.vocab.FOAF;
import org.junit.Test;
import org.openrdf.repository.RepositoryException;
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class AbstractRDFaExtractorTestCase extends AbstractExtractorTestCase {
- protected static final DCTERMS vDCTERMS = DCTERMS.getInstance();
+ protected static final DCTerms vDCTERMS = DCTerms.getInstance();
protected static final FOAF vFOAF = FOAF.getInstance();
Logger logger = LoggerFactory.getLogger(RDFaExtractorTest.class);